diff options
author | Elan Ruusamäe | 2006-07-17 00:38:18 (GMT) |
---|---|---|
committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
commit | 2da350f0cc7639cdafc82b52ee6c1cf22abe3263 (patch) | |
tree | 9d2851b5440fa831b0f700aa936f38d2015c233d | |
parent | ce4c3f12ccdb336075cff2b4bcfe0d8dd29e3f48 (diff) | |
download | uebimiau-2da350f0cc7639cdafc82b52ee6c1cf22abe3263.zip uebimiau-2da350f0cc7639cdafc82b52ee6c1cf22abe3263.tar.gz |
- undos
Changed files:
uebimiau-folders.patch -> 1.2
uebimiau-header.patch -> 1.3
uebimiau-language.patch -> 1.2
uebimiau-smarty.patch -> 1.4
-rw-r--r-- | uebimiau-folders.patch | 18 | ||||
-rw-r--r-- | uebimiau-header.patch | 22 | ||||
-rw-r--r-- | uebimiau-language.patch | 32 | ||||
-rw-r--r-- | uebimiau-smarty.patch | 64 |
4 files changed, 68 insertions, 68 deletions
diff --git a/uebimiau-folders.patch b/uebimiau-folders.patch index 26b1728..9a253ae 100644 --- a/uebimiau-folders.patch +++ b/uebimiau-folders.patch @@ -2,15 +2,15 @@ diff -ur uebimiau-2.7.8-RC1-any/folders.php uebimiau-2.7.8-RC1-any_/folders.php --- 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); + } -
-
-
+ + + diff --git a/uebimiau-header.patch b/uebimiau-header.patch index a0731a6..2579d3a 100644 --- a/uebimiau-header.patch +++ b/uebimiau-header.patch @@ -2,14 +2,14 @@ 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 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\"> diff --git a/uebimiau-language.patch b/uebimiau-language.patch index 4ea1076..613c313 100644 --- a/uebimiau-language.patch +++ b/uebimiau-language.patch @@ -2,20 +2,20 @@ diff -burN webmail.orig/inc/config.languages.php webmail/inc/config.languages.ph --- 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" + ); diff --git a/uebimiau-smarty.patch b/uebimiau-smarty.patch index f7ca0b5..c4395c3 100644 --- a/uebimiau-smarty.patch +++ b/uebimiau-smarty.patch @@ -2,47 +2,47 @@ diff -burN webmail.orig/badlogin.php webmail/badlogin.php --- 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); |