e-smith-horde/sme8/e-smith-horde-4.2.0-85HordeAccess-whitespace.patch

diff -ruN e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess
--- e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess       2013-12-20 20:35:57.000000000 -0800
+++ e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess      2013-12-20 20:08:40.000000000 -0800
@@ -9,34 +9,33 @@
 
     if (!defined $PHPStatus or $PHPStatus ne 'enabled')
     {
-       $OUT .= "# Error: horde is enabled but PHP is not enabled.";
+        $OUT .= "# Error: horde is enabled but PHP is not enabled.";
     }
     elsif (defined $status && $status eq 'enabled')
     {
-       $OUT .= qq(
+        $OUT .= qq(
 # Horde specific configuration files.
 
 <Directory /home/httpd/html/horde>
     <FilesMatch "test.php\$">
-       Order Deny,Allow
-       Deny from all
+    Order Deny,Allow
+    Deny from all
     </FilesMatch>
     Options Indexes Includes FollowSymLinks
     AllowOverride None
     order deny,allow
     deny from all
 );
-       $OUT .= "     allow from ";
+       $OUT .= "    allow from ";
        $OUT .= ( $horde{access} eq "public" ) ? "all" : $localAccess;
        $OUT .= "\n";
        $OUT .= qq(
     AddType application/x-httpd-php .php .php3
-    php_value include_path     '/usr/share/pear-addons:/usr/share/pear'
-#    php_value auto_prepend_file /home/httpd/horde-phplib/prepend.php3
-    php_flag  magic_quotes_gpc off
-    php_flag  track_vars       on
-    php_flag   session.use_trans_sid   off
-    php_admin_flag     allow_url_fopen on
+    php_value include_path           '/usr/share/pear-addons:/usr/share/pear'
+    php_flag  magic_quotes_gpc       off
+    php_flag  track_vars             on
+    php_flag  session.use_trans_sid  off
+    php_admin_flag  allow_url_fopen  on
 </Directory>
 
 <Directory /home/httpd/html/horde/config>
@@ -68,6 +67,6 @@
     }
     else
     {
-       $OUT .= "# horde not configured as it is disabled in the config db";
+        $OUT .= "# horde not configured as it is disabled in the config db";
     }
 }
1	burnat	1.1	diff -ruN e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess
2			--- e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2013-12-20 20:35:57.000000000 -0800
3			+++ e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2013-12-20 20:08:40.000000000 -0800
4			@@ -9,34 +9,33 @@
5
6			if (!defined $PHPStatus or $PHPStatus ne 'enabled')
7			{
8			- $OUT .= "# Error: horde is enabled but PHP is not enabled.";
9			+ $OUT .= "# Error: horde is enabled but PHP is not enabled.";
10			}
11			elsif (defined $status && $status eq 'enabled')
12			{
13			- $OUT .= qq(
14			+ $OUT .= qq(
15			# Horde specific configuration files.
16
17			<Directory /home/httpd/html/horde>
18			<FilesMatch "test.php\$">
19			- Order Deny,Allow
20			- Deny from all
21			+ Order Deny,Allow
22			+ Deny from all
23			</FilesMatch>
24			Options Indexes Includes FollowSymLinks
25			AllowOverride None
26			order deny,allow
27			deny from all
28			);
29			- $OUT .= " allow from ";
30			+ $OUT .= " allow from ";
31			$OUT .= ( $horde{access} eq "public" ) ? "all" : $localAccess;
32			$OUT .= "\n";
33			$OUT .= qq(
34			AddType application/x-httpd-php .php .php3
35			- php_value include_path '/usr/share/pear-addons:/usr/share/pear'
36			-# php_value auto_prepend_file /home/httpd/horde-phplib/prepend.php3
37			- php_flag magic_quotes_gpc off
38			- php_flag track_vars on
39			- php_flag session.use_trans_sid off
40			- php_admin_flag allow_url_fopen on
41			+ php_value include_path '/usr/share/pear-addons:/usr/share/pear'
42			+ php_flag magic_quotes_gpc off
43			+ php_flag track_vars on
44			+ php_flag session.use_trans_sid off
45			+ php_admin_flag allow_url_fopen on
46			</Directory>
47
48			<Directory /home/httpd/html/horde/config>
49			@@ -68,6 +67,6 @@
50			}
51			else
52			{
53			- $OUT .= "# horde not configured as it is disabled in the config db";
54			+ $OUT .= "# horde not configured as it is disabled in the config db";
55			}
56			}