steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include config.php.in, NONE, 1.1 mysmarty.php, 1.2, 1.3 locale.php, 1.1, 1.2 mysmarty.php.in, 1.5, NONE

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv15911/kolab-webadmin/php/admin/include

Modified Files:
	locale.php 
Added Files:
	config.php.in mysmarty.php 
Removed Files:
	mysmarty.php.in 
Log Message:
moved substitutions to config.php.in, changed language selector to be a combobox

--- NEW FILE: config.php.in ---
(This appears to be a binary file; contents omitted.)


Index: locale.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- locale.php	10 Mar 2005 21:58:19 -0000	1.1
+++ locale.php	11 Mar 2005 12:02:14 -0000	1.2
@@ -18,7 +18,7 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-require_once("mysmarty.php");
+  //require_once("mysmarty.php");
 
 // PENDING(romain,steffen): Clean up so this is not a mix of code and global functions
 
@@ -36,22 +36,6 @@
     }
 }
 
-// Check if language was changed
-if(!empty($_REQUEST["lang"])) {
-    setLanguage($_REQUEST["lang"]);
-}
-
-// I18N support information
-$language = getLanguage();
-putenv("LANG=$language"); 
-setlocale(LC_ALL, $language);
-
-$domain = "messages";
-$tmpSmarty = new MySmarty();
-bindtextdomain($domain, $locale_dir); 
-bind_textdomain_codeset($domain, "UTF-8");
-textdomain($domain);
-
 # Returns the currently selected language
 function getLanguage()
 {
@@ -82,4 +66,20 @@
     
     $_SESSION["lang"] = $lang;
 }
+
+// Check if language was changed
+if(!empty($_REQUEST["lang"])) {
+    setLanguage($_REQUEST["lang"]);
+}
+
+// I18N support information
+$language = getLanguage();
+putenv("LANG=$language"); 
+setlocale(LC_ALL, $language);
+
+$domain = "messages";
+//$tmpSmarty = new MySmarty();
+bindtextdomain($domain, $locale_dir); 
+bind_textdomain_codeset($domain, "UTF-8");
+textdomain($domain);
 ?>

--- mysmarty.php.in DELETED ---