rpms/gallery2/F-9 gallery2-2.3-captcha.patch, NONE, 1.1 gallery2-2.3-smtp.patch, NONE, 1.1

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13297

Added Files:
	gallery2-2.3-captcha.patch gallery2-2.3-smtp.patch 
Log Message:
Patches.


gallery2-2.3-captcha.patch:

--- NEW FILE gallery2-2.3-captcha.patch ---
--- modules/core/classes/GallerySession.class~	2009-05-21 09:03:54.000000000 -0500
+++ modules/core/classes/GallerySession.class	2009-05-21 09:03:54.000000000 -0500
@@ -27,0 +28,3 @@
+//BZ 501871, captcha fix.
+GalleryCoreApi::requireOnce('modules/core/classes/GalleryTranslator.class');  
+

gallery2-2.3-smtp.patch:

--- NEW FILE gallery2-2.3-smtp.patch ---
--- lib/smtp/smtp.php~	2008-10-18 02:15:42.000000000 -0500
+++ lib/smtp/smtp.php	2009-05-21 07:14:59.000000000 -0500
@@ -42,14 +42,15 @@
-    if (isset($headers)) {
-	$headers = rtrim($headers);
-
-	// Make sure there are no bare linefeeds in the headers
-	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
-
-	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $cc = split(', *', $match[1]);
-	}
-	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $bcc = split(', *', $match[1]);
-	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
-	}
-    }
+    /// JOEL
+//    if (isset($headers)) {
+//	$headers = rtrim($headers);
+//
+//	// Make sure there are no bare linefeeds in the headers
+//	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
+//
+//	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $cc = split(', *', $match[1]);
+//	}
+//	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $bcc = split(', *', $match[1]);
+//	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
+//	}
+//    }
@@ -68 +69,10 @@
-    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+//    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+// JDY JOEL YOUNG FIX FROM http://blog.bonetree.net/2008/10/configuring-gallery2-to-send-email-using-gmail/
+    $url_info = parse_url($config['smtp.host']);
+    $config['smtp.host'] = '';
+    if( isset($url_info['scheme']) ) {
+       $config['smtp.host'] = $url_info['scheme'].'://';
+       }
+    $config['smtp.host'] .= $url_info['host'];
+    $port = ( isset($url_info['port']) ) ? $url_info['port'] : 25;
+