[evolvis-commits] r13724: Merged a handful of fixes from 4.8

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 02:56:21 CET 2011


Author: mirabilos
Date: 2011-02-28 02:56:21 +0100 (Mon, 28 Feb 2011)
New Revision: 13724

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/SCMPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/common/search/SearchQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-postfix.sh
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/bg.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/ca.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/el.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/en.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/eo.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/es.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/eu.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/fr.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/gforge.pot
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/he.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/id.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/it.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/ja.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/ko.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/la.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/nb.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/nl.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/pl.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/pt.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/pt_BR.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/ru.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/sv.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/th.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/zh_CN.po
   trunk/gforge_base/evolvisforge-5.1/gforge/translations/zh_TW.po
   trunk/gforge_base/evolvisforge-5.1/gforge/www/register/projectinfo.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/SearchRenderer.class.php
Log:
Merged a handful of fixes from 4.8

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/search/SearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/search/SearchQuery.class.php	2011-02-28 01:56:13 UTC (rev 13723)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/search/SearchQuery.class.php	2011-02-28 01:56:21 UTC (rev 13724)
@@ -93,8 +93,14 @@
 	 * @param int $rowsPerPage number of rows per page
 	 */
 	function SearchQuery($words, $offset, $isExact, $rowsPerPage = SEARCH__DEFAULT_ROWS_PER_PAGE) {
+		if (get_magic_quotes_gpc()) {
+			$words = stripslashes($words);
+		}
 		$this->cleanSearchWords($words);
-		
+		//We manual escap because every Query in Search escap parameters
+		$words = addslashes($words);
+		$this->words = array_map('addslashes',$this->words);
+		$this->phrases = array_map('addslashes',$this->phrases);
 		$this->rowsPerPage = $rowsPerPage;
 		$this->offset = $offset;
 		$this->isExact = $isExact;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-postfix.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-postfix.sh	2011-02-28 01:56:13 UTC (rev 13723)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-postfix.sh	2011-02-28 01:56:21 UTC (rev 13724)
@@ -46,10 +46,18 @@
 while (($l = <>) !~ /^\s*mydestination/) { print $l; };
 chomp $l;
 $l .= ", users.$domain_name" unless ($l =~ /^[^#]*users.$domain_name/);
+print "$l\n";
+while ($l = <>) { print $l; };
+' < /etc/postfix/main.cf.gforge-new > $tmp1
+	perl -i -e '
+require ("/etc/gforge/local.pl") ;
+my $l;
+while (($l = <>) !~ /^\s*relay_domains/) { print $l; };
+chomp $l;
 $l .= ", $sys_lists_host" unless ($l =~ /^[^#]*$sys_lists_host/);
 print "$l\n";
 while ($l = <>) { print $l; };
-' < /etc/postfix/main.cf.gforge-new > $tmp1
+' $tmp1
 	tmp2=$(mktemp /tmp/$pattern)
 	# Second, insinuate our forwarding rules in the directors section
 	perl -e '
@@ -169,6 +177,20 @@
 print "$l\n" ;
 while ($l = <>) { print $l; };
 ' < /etc/postfix/main.cf.gforge-new > $tmp1
+	perl -i -e '
+require ("/etc/gforge/local.pl") ;
+while (($l = <>) !~ /^\s*relay_domains/) {
+  print $l;
+};
+chomp $l ;
+$l =~ /^(\s*relay_domains\s*=\s*)(\S.*)/ ;
+$head = $1 ;
+$dests = $2 ;
+$dests =~ s/, $sys_lists_host// ;
+$l = $head . $dests ;
+print "$l\n" ;
+while ($l = <>) { print $l; };
+' $tmp1
 	tmp2=$(mktemp /tmp/$pattern)
 	# Second, kill our forwarding rules
 	perl -e '

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:56:13 UTC (rev 13723)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:56:21 UTC (rev 13724)
@@ -39,6 +39,12 @@
 
  -- Roland Mas <lolando at debian.org>  Sun, 16 Aug 2009 15:39:23 +0200
 
+gforge (4.8-3+1) UNRELEASED; urgency=low
+
+  * Fixed Postfix configuration for mailing lists.
+
+ -- Roland Mas <lolando at debian.org>  Fri, 04 Sep 2009 19:15:03 +0200
+
 gforge (4.8-3) unstable; urgency=low
 
   * New upstream snapshot as of SVN r7960.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/SearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/SearchRenderer.class.php	2011-02-28 01:56:13 UTC (rev 13723)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/SearchRenderer.class.php	2011-02-28 01:56:21 UTC (rev 13724)
@@ -27,7 +27,11 @@
 	function SearchRenderer($typeOfSearch, $words, $isExact, $searchQuery) {
 		$this->query['typeOfSearch'] = $typeOfSearch;
 		$this->query['isExact'] = $isExact;
-		$this->query['words'] = $words;
+		if (get_magic_quotes_gpc()) {
+			$this->query['words'] = stripslashes($words);
+		}else{
+			$this->query['words'] = $words;
+		}
 		
 		$this->searchQuery = $searchQuery;
 	}



More information about the evolvis-commits mailing list