[evolvis-commits] r9569: * moved escapingUtils from pages to pre. php↵ * fixed a bug in mailing lists↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:27:43 CET 2011


Author: mirabilos
Date: 2011-02-24 17:27:43 +0100 (Thu, 24 Feb 2011)
New Revision: 9569

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/pre.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/search/index.php
Log:
* moved escapingUtils from pages to pre.php
* fixed a bug in mailing lists


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/pre.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/pre.php	2011-02-24 16:27:40 UTC (rev 9568)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/pre.php	2011-02-24 16:27:43 UTC (rev 9569)
@@ -83,6 +83,9 @@
 //permission functions
 require_once('common/include/Permission.class');
 
+// escaping lib
+require_once('common/include/escapingUtils.php');
+
 //library to set up context help
 require_once('www/include/help.php');
 
@@ -92,7 +95,6 @@
 //various html libs like button bar, themable
 require_once('www/include/html.php');
 
-
 // #### Connect to db
 
 db_connect();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php	2011-02-24 16:27:40 UTC (rev 9568)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php	2011-02-24 16:27:43 UTC (rev 9569)
@@ -12,7 +12,6 @@
 require_once('pre.php');
 require_once('../mail_utils.php');
 
-require_once('common/include/escapingUtils.php');
 require_once('common/mail/MailingList.class');
 require_once('common/mail/MailingListFactory.class');
 
@@ -207,7 +206,7 @@
 					htmlspecialchars($currentList->getDescription()).'</td>'.
 					'<td width="20%" align="center"><a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&group_list_id='.$currentList->getID().'&change_status=1">'.$Language->getText('mail_admin', 'update_list').'</a></td>'.
 					'<td width="20%" align="center">';
-					if($currentList->getStatus() != MAIL__MAILING_LIST_IS_CREATED) {
+					if($currentList->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
 						echo $Language->getText('mail_common', 'list_not_activated');
 					} else {
 						echo '<a href="'.$currentList->getExternalAdminUrl().'">'.$Language->getText('mail_admin', 'admin_in_mailman').'</a></td>';

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/index.php	2011-02-24 16:27:40 UTC (rev 9568)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/index.php	2011-02-24 16:27:43 UTC (rev 9569)
@@ -11,7 +11,6 @@
 require_once('pre.php');
 require_once('../mail/mail_utils.php');
 
-require_once('common/include/escapingUtils.php');
 require_once('common/mail/MailingList.class');
 require_once('common/mail/MailingListFactory.class');
 
@@ -24,9 +23,9 @@
 	}
 	
 	$mlFactory = new MailingListFactory($Group);
-   if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
-       exit_error($Language->getText('general', 'error'), $mlFactory->getErrorMessage());
-   }
+	if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
+		exit_error($Language->getText('general', 'error'), $mlFactory->getErrorMessage());
+	}
 
 	mail_header(array(
 		'title' => $Language->getText('mail', 'mailinglists_for', array($Group->getPublicName())),
@@ -66,7 +65,7 @@
 		echo '<tr '. $HTML->boxGetAltRowStyle($j) .'>';
 		if ($currentList->isError()) {
 			echo '<td colspan="2">'.$currentList->getErrorMessage().'</td></tr>';
-		} else if($currentList->getStatus() != MAIL__MAILING_LIST_IS_CREATED) {
+		} else if($currentList->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
 			echo '<td width="60%">'.
 				'<strong>'.$currentList->getName().'</strong><br />'.
 				htmlspecialchars($currentList->getDescription()). '</td>'.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/search/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/search/index.php	2011-02-24 16:27:40 UTC (rev 9568)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/search/index.php	2011-02-24 16:27:43 UTC (rev 9569)
@@ -28,7 +28,6 @@
 }
 
 require_once('pre.php');
-require_once('common/include/escapingUtils.php');
 require_once('www/tracker/include/ArtifactTypeHtml.class');
 
 $offset = getIntFromGet('offset');
@@ -74,4 +73,4 @@
 	exit();
 }
 
-?>
\ No newline at end of file
+?>



More information about the evolvis-commits mailing list