- release 10 (by relup.sh)

[packages/squirrelmail.git] / squirrelmail-config.patch

diff --git a/squirrelmail-config.patch b/squirrelmail-config.patch
index 03fdc3180df9693a752eec563191c5fe04592a8b..1797303944eb47b948aec5bf6304e126d81d6190 100644 (file)
--- a/squirrelmail-config.patch
+++ b/squirrelmail-config.patch
@@ -1,7 +1,7 @@
-diff -urN ./squirrelmail-1.4.4-rc1.orig/config/config_default.php squirrelmail-1.4.4-rc1/config/config_default.php
---- ./squirrelmail-1.4.4-rc1.orig/config/config_default.php    2004-12-24 16:55:39.000000000 +0100
-+++ squirrelmail-1.4.4-rc1/config/config_default.php   2005-01-05 23:35:46.743683304 +0100
-@@ -84,7 +84,7 @@
+diff -urN squirrelmail-1.4.4-rc1.orig/config/config_default.php squirrelmail-1.4.4-rc1/config/config_default.php
+--- squirrelmail-1.4.4-rc1.orig/config/config_default.php      2004-12-24 16:55:39.000000000 +0100
++++ squirrelmail-1.4.4-rc1/config/config_default.php   2005-01-06 16:20:04.648183416 +0100
+@@ -92,7 +92,7 @@
   * option set to true.
   * @global string $provider_name
   */
@@ -10,44 +10,53 @@ diff -urN ./squirrelmail-1.4.4-rc1.orig/config/config_default.php squirrelmail-1
  
  /**
   * Provider URI
-@@ -95,7 +95,7 @@
+@@ -103,7 +103,7 @@
   * option set to true.
   * @global string $provider_uri
   */
--$provider_uri = 'http://www.squirrelmail.org/';
+-$provider_uri = 'http://squirrelmail.org/';
 +$provider_uri = 'http://www.pld-linux.org/';
  
  /*** Server Settings ***/
  /**
-@@ -418,7 +418,7 @@
-  *   $data_dir = SM_PATH . 'data/';
+@@ -339,7 +339,7 @@
+  * If you do not use this, set it to the empty string.
+  * @global string $default_folder_prefix
+  */
+-$default_folder_prefix = '';
++$default_folder_prefix = 'mail/';
+ 
+ /**
+  * User level prefix control
+@@ -496,7 +496,7 @@
+  *
   * @global string $data_dir
   */
--$data_dir = SM_PATH . 'data/';
-+$data_dir = SM_PATH . '/var/lib/squirrelmail/prefs/';
+-$data_dir = '/var/local/squirrelmail/data/';
++$data_dir = '/var/lib/squirrelmail/prefs/';
  
  /**
   * Attachments directory
-@@ -436,7 +436,7 @@
+@@ -514,7 +514,7 @@
   *    + It should probably be another directory than data_dir.
   * @global string $attachment_dir
   */
--$attachment_dir = $data_dir;
+-$attachment_dir = '/var/local/squirrelmail/attach/';
 +$attachment_dir = '/var/lib/squirrelmail/data/';
  
  /**
   * Hash level used for data directory.
-diff -urN ./squirrelmail-1.4.4-rc1.orig/config/conf.pl squirrelmail-1.4.4-rc1/config/conf.pl
---- ./squirrelmail-1.4.4-rc1.orig/config/conf.pl       2004-12-30 00:19:35.000000000 +0100
-+++ squirrelmail-1.4.4-rc1/config/conf.pl      2005-01-05 23:41:06.230113984 +0100
+diff -urN squirrelmail-1.4.4-rc1.orig/config/conf.pl squirrelmail-1.4.4-rc1/config/conf.pl
+--- squirrelmail-1.4.4-rc1.orig/config/conf.pl 2004-12-30 00:19:35.000000000 +0100
++++ squirrelmail-1.4.4-rc1/config/conf.pl      2005-01-06 16:21:18.747918544 +0100
 @@ -286,8 +286,8 @@
  $noselect_fix_enable = "false"         if ( !$noselect_fix_enable );
  $frame_top = "_top"                    if ( !$frame_top );
  
--$provider_uri = "http://www.squirrelmail.org/" if ( !$provider_uri );
+-$provider_uri = "http://squirrelmail.org/" if ( !$provider_uri );
 -$provider_name = "SquirrelMail"        if ( !$provider_name );
 +$provider_uri = "http://www.pld-linux.org/" if ( !$provider_uri );
-+$provider_name = "PLD Linux"           if ( !$provider_name );
++$provider_name = "PLD Linux"        if ( !$provider_name );
  
  $edit_identity = "true"                if ( !$edit_identity );
  $edit_name = "true"                    if ( !$edit_name );