SOURCES: uebimiau-folders.patch, uebimiau-smarty.patch, uebimiau-h...

glen glen at pld-linux.org
Mon Jul 17 02:38:23 CEST 2006 

Author: glen                         Date: Mon Jul 17 00:38:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- undos

---- Files affected:
SOURCES:
   uebimiau-folders.patch (1.1 -> 1.2) , uebimiau-smarty.patch (1.3 -> 1.4) , uebimiau-header.patch (1.2 -> 1.3) , uebimiau-language.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/uebimiau-folders.patch
diff -u SOURCES/uebimiau-folders.patch:1.1 SOURCES/uebimiau-folders.patch:1.2
--- SOURCES/uebimiau-folders.patch:1.1	Mon Nov 15 18:09:52 2004
+++ SOURCES/uebimiau-folders.patch	Mon Jul 17 02:38:18 2006
@@ -2,15 +2,15 @@
 --- uebimiau-2.7.8-RC1-any/folders.php	2003-06-28 23:03:06.000000000 +0200
 +++ uebimiau-2.7.8-RC1-any_/folders.php	2004-11-15 18:07:33.125961256 +0100
 @@ -171,7 +171,11 @@
- unset($SS,$UM);
- array_qsort2 ($system,"name");
- 
--$umFolderList = array_merge($system, $personal);
+ unset($SS,$UM);
+ array_qsort2 ($system,"name");
+ 
+-$umFolderList = array_merge($system, $personal);
 +if (isset($personal)) {
-+    $umFolderList = array_merge($system, $personal);
++    $umFolderList = array_merge($system, $personal);
 +    } else {
-+    $umFolderList = array_merge($system);
++    $umFolderList = array_merge($system);
 +    }
- 
- 
- 
+ 
+ 
+ 

================================================================
Index: SOURCES/uebimiau-smarty.patch
diff -u SOURCES/uebimiau-smarty.patch:1.3 SOURCES/uebimiau-smarty.patch:1.4
--- SOURCES/uebimiau-smarty.patch:1.3	Sun Jul 16 23:03:38 2006
+++ SOURCES/uebimiau-smarty.patch	Mon Jul 17 02:38:18 2006
@@ -2,47 +2,47 @@
 --- webmail.orig/badlogin.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/badlogin.php	2006-07-16 21:59:17.000000000 +0200
 @@ -21,6 +21,8 @@
- 
- $smarty = new Smarty;
- $smarty->compile_dir = $temporary_directory;
-+$smarty->template_dir = 'themes';
-+$smarty->config_dir = 'langs';
- $smarty->security=true;
- $smarty->secure_dir=array("./");
- 
+ 
+ $smarty = new Smarty;
+ $smarty->compile_dir = $temporary_directory;
++$smarty->template_dir = 'themes';
++$smarty->config_dir = 'langs';
+ $smarty->security=true;
+ $smarty->secure_dir=array("./");
+ 
 diff -burN webmail.orig/error.php webmail/error.php
 --- webmail.orig/error.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/error.php	2006-07-16 21:59:26.000000000 +0200
 @@ -19,6 +19,8 @@
- require_once(SMARTY_DIR."Smarty.class.php");
- $smarty = new Smarty;
- $smarty->compile_dir = $temporary_directory;
-+$smarty->template_dir = 'themes';
-+$smarty->config_dir = 'langs';
- $smarty->security=true;
- $smarty->secure_dir=array("./");
- $smarty->assign("umLanguageFile",$selected_language.".txt");
+ require_once(SMARTY_DIR."Smarty.class.php");
+ $smarty = new Smarty;
+ $smarty->compile_dir = $temporary_directory;
++$smarty->template_dir = 'themes';
++$smarty->config_dir = 'langs';
+ $smarty->security=true;
+ $smarty->secure_dir=array("./");
+ $smarty->assign("umLanguageFile",$selected_language.".txt");
 diff -burN webmail.orig/inc/inc.php webmail/inc/inc.php
 --- webmail.orig/inc/inc.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/inc/inc.php	2006-07-16 21:58:47.000000000 +0200
 @@ -24,6 +24,8 @@
- require_once(SMARTY_DIR."Smarty.class.php");
- $smarty = new Smarty;
- $smarty->compile_dir = $temporary_directory;
-+$smarty->template_dir = 'themes';
-+$smarty->config_dir = 'langs';
- $smarty->security=true;
- //$smarty->secure_dir=array("./");
- 
+ require_once(SMARTY_DIR."Smarty.class.php");
+ $smarty = new Smarty;
+ $smarty->compile_dir = $temporary_directory;
++$smarty->template_dir = 'themes';
++$smarty->config_dir = 'langs';
+ $smarty->security=true;
+ //$smarty->secure_dir=array("./");
+ 
 diff -burN webmail.orig/index.php webmail/index.php
 --- webmail.orig/index.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/index.php	2006-07-16 21:59:04.000000000 +0200
 @@ -22,6 +22,8 @@
- $smarty->security=true;
- $smarty->secure_dir=array("./");
- $smarty->compile_dir = $temporary_directory;
-+$smarty->template_dir = 'themes';
-+$smarty->config_dir = 'langs';
- $smarty->assign("umLanguageFile",$selected_language.".txt");
- 
- $smarty->assign("umEmail",$f_email);
+ $smarty->security=true;
+ $smarty->secure_dir=array("./");
+ $smarty->compile_dir = $temporary_directory;
++$smarty->template_dir = 'themes';
++$smarty->config_dir = 'langs';
+ $smarty->assign("umLanguageFile",$selected_language.".txt");
+ 
+ $smarty->assign("umEmail",$f_email);

================================================================
Index: SOURCES/uebimiau-header.patch
diff -u SOURCES/uebimiau-header.patch:1.2 SOURCES/uebimiau-header.patch:1.3
--- SOURCES/uebimiau-header.patch:1.2	Mon Jul 17 02:36:16 2006
+++ SOURCES/uebimiau-header.patch	Mon Jul 17 02:38:18 2006
@@ -2,14 +2,14 @@
 --- webmail.orig/inc/inc.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/inc/inc.php	2006-07-16 22:25:05.000000000 +0200
 @@ -151,9 +151,8 @@
- Don't remove the fallowing lines, or you will be problems with browser's cache 
- */
- 
--Header("Expires: Wed, 11 Nov 1998 11:11:11 GMT\r\n".
--"Cache-Control: no-cache\r\n".
--"Cache-Control: must-revalidate");
-+header("Expires: Wed, 11 Nov 1998 11:11:11 GMT");
-+header("Cache-Control: no-cache, must-revalidate");
- 
- $nocache = "
- <META HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\">
+ Don't remove the fallowing lines, or you will be problems with browser's cache 
+ */
+ 
+-Header("Expires: Wed, 11 Nov 1998 11:11:11 GMT\r\n".
+-"Cache-Control: no-cache\r\n".
+-"Cache-Control: must-revalidate");
++header("Expires: Wed, 11 Nov 1998 11:11:11 GMT");
++header("Cache-Control: no-cache, must-revalidate");
+ 
+ $nocache = "
+ <META HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\">

================================================================
Index: SOURCES/uebimiau-language.patch
diff -u SOURCES/uebimiau-language.patch:1.1 SOURCES/uebimiau-language.patch:1.2
--- SOURCES/uebimiau-language.patch:1.1	Sun Jul 16 23:05:54 2006
+++ SOURCES/uebimiau-language.patch	Mon Jul 17 02:38:18 2006
@@ -2,20 +2,20 @@
 --- webmail.orig/inc/config.languages.php	2006-07-16 21:57:53.000000000 +0200
 +++ webmail/inc/config.languages.php	2006-07-16 22:36:11.000000000 +0200
 @@ -7,7 +7,7 @@
- $default_theme						= 'default';
- 
- $allow_user_change_language			= yes; 
--$default_language					= 'pt_BR';
-+$default_language					= 'en_UK';
- 
- $themes['default'] = Array(
- 	"name" 		=> "UebiMiau Default",
+ $default_theme						= 'default';
+ 
+ $allow_user_change_language			= yes; 
+-$default_language					= 'pt_BR';
++$default_language					= 'en_UK';
+ 
+ $themes['default'] = Array(
+ 	"name" 		=> "UebiMiau Default",
 @@ -101,7 +101,7 @@
- 	"path" 		=> "nb"
- );
- 
--$languages['bg'] = Array(
-+$languages['pl'] = Array(
- 	"name" 		=> "Polish",
- 	"path" 		=> "pl"
- );
+ 	"path" 		=> "nb"
+ );
+ 
+-$languages['bg'] = Array(
++$languages['pl'] = Array(
+ 	"name" 		=> "Polish",
+ 	"path" 		=> "pl"
+ );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/uebimiau-folders.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/uebimiau-smarty.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/uebimiau-header.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/uebimiau-language.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list