[evolvis-commits] r6689: now make things work↵ ↵ • /etc/gforge/local.inc not / etc/ gforge is a config file ☺↵ • in cronjobs /mm_quicksubscribe. sh not having to do anything↵ is not fatal and not worth displaying an error↵ • I don’t can Perl , whatever “use vars” is should work now , ↵ and @ $foo is… evil , escaping the @ is needed↵ • fix quick subscription links↵ • fix XHTML validity for non-logged-in users↵

Thorsten Glaser t.glaser at tarent.de
Wed Jun 2 16:43:22 CEST 2010


Author: Thorsten Glaser <t.glaser at tarent.de>
Date: 2010-06-02 16:43:22 +0200 (Wed, 02 Jun 2010)
New Revision: 6689

Modified:
   trunk/gforge_base/evolvisforge/gforge/cronjobs/mm_quicksubscribe.sh
   trunk/gforge_base/evolvisforge/gforge/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/mail/index.php
Log:
now make things work

• /etc/gforge/local.inc not /etc/gforge is a config file ☺
• in cronjobs/mm_quicksubscribe.sh not having to do anything
  is not fatal and not worth displaying an error
• I don’t can Perl, whatever “use vars” is should work now,
  and @$foo is… evil, escaping the @ is needed
• fix quick subscription links
• fix XHTML validity for non-logged-in users


Modified: trunk/gforge_base/evolvisforge/gforge/cronjobs/mm_quicksubscribe.sh
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/cronjobs/mm_quicksubscribe.sh	2010-06-02 14:43:18 UTC (rev 6688)
+++ trunk/gforge_base/evolvisforge/gforge/cronjobs/mm_quicksubscribe.sh	2010-06-02 14:43:22 UTC (rev 6689)
@@ -23,14 +23,14 @@
 #-
 # Processes subscription requests from /var/lib/gforge/mmsubscribe
 
-vlg=$(php -r 'require "'"$ETCGFORGE"'"; echo $var_lib_gforge;')
+vlg=$(php -r 'require "'"$ETCGFORGE"'/local.inc"; echo $sys_var_lib_gforge_path;')
 
 cd "$vlg"
 rm -rf tmp/mm
 mkdir -p tmp/mm
 
 # mv is atomic
-mv -f mmsubscribe/* tmp/mm/
+mv -f mmsubscribe/* tmp/mm/ 2>/dev/null
 
 cd tmp/mm
 for listname in *; do

Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/create-mailing-lists.pl	2010-06-02 14:43:18 UTC (rev 6688)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/create-mailing-lists.pl	2010-06-02 14:43:22 UTC (rev 6689)
@@ -10,7 +10,7 @@
 use diagnostics ;
 use File::Temp qw/ :mktemp  /;
 
-use vars qw/ $dbh $sys_lists_host $sys_users_host $sys_use_ssl / ;
+use vars qw/ $dbh $sys_lists_host $sys_users_host $sys_use_ssl $sys_default_domain / ;
 
 use vars qw// ;
 
@@ -80,7 +80,7 @@
 		# for commit lists
 		print CONFIG "max_message_size = 0\n";
 		# Accept commits from svn from everyone by default
-		print CONFIG "accept_these_nonmembers = ['^\\\\w+@$sys_default_domain']\n";
+		print CONFIG "accept_these_nonmembers = ['^\\\\w+\@$sys_default_domain']\n";
 	}
 	if (!$is_public) {
 	    print CONFIG "archive_private = True\n" ;

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-06-02 14:43:18 UTC (rev 6688)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-06-02 14:43:22 UTC (rev 6689)
@@ -20,7 +20,7 @@
     group’s -commits mailing list automatically as well
   * Add Forge-Identification Meta Header (Version 1.0) to most pages
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 02 Jun 2010 15:56:25 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 02 Jun 2010 16:34:05 +0200
 
 gforge (4.8.3+evolvis16) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/mail/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/mail/index.php	2010-06-02 14:43:18 UTC (rev 6688)
+++ trunk/gforge_base/evolvisforge/gforge/www/mail/index.php	2010-06-02 14:43:22 UTC (rev 6689)
@@ -105,7 +105,7 @@
 		$currentList =& $mlArray[$j];
 		echo '<tr '. $HTML->boxGetAltRowStyle($j) .'>';
 		if ($currentList->isError()) {
-			echo '<td colspan="4">'.$currentList->getErrorMessage().'</td></tr>';
+			echo '<td colspan="4">'.$currentList->getErrorMessage().'</td>';
 		} else if($currentList->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
 			echo '<td width="33%">'.
 				'<strong>'.$currentList->getName().'</strong></td>'.
@@ -116,6 +116,7 @@
 				$c = '<td><a href="' .
 				    getStringFromServer('PHP_SELF') .
 				    '?thelist=' . $currentList->getName() .
+				    '&amp;group_id=' . $group_id .
 				    '">' . _('Subscribe') . '</a></td><td>' .
 				    '<a href="'.$currentList->getExternalInfoUrl().'">'._('Unsubscribe/Preferences').'</a>';
 			} else {




More information about the evolvis-commits mailing list