Fixed problems with htmlspecialchars() function for not dupported encodings on newer...

[fa-stable.git] / install / isession.inc

diff --git a/install/isession.inc b/install/isession.inc
index e4d915388aeabd4414b8520b681d1bdad0f8c1f3..acf14202d4b5f37e77c287ef48c56d60e792888e 100644 (file)
--- a/install/isession.inc
+++ b/install/isession.inc
@@ -39,6 +39,22 @@ function strip_quotes($data)
        return $data;
 }
 
+function html_specials_encode($str)
+{
+       return htmlspecialchars($str, ENT_QUOTES, $_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding);
+}
+
+function html_cleanup(&$parms)
+{
+       foreach($parms as $name => $value) {
+               if (is_array($value))
+                       html_cleanup($parms[$name]);
+               else
+                       $parms[$name] = html_specials_encode($value);
+       }
+       reset($parms); // needed for direct key() usage later throughout the sources
+}
+
 function check_page_security($page_security)
 {
 }
@@ -52,8 +68,12 @@ if (!isset($path_to_root))
 if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
 
+include_once($path_to_root . "/includes/errors.inc");
+// collect all error msgs
+set_error_handler('error_handler' /*, errtypes */);
+
 include_once($path_to_root . "/includes/current_user.inc");
-include_once($path_to_root . "/includes/lang/language.php");
+include_once($path_to_root . "/includes/lang/language.inc");
 include_once($path_to_root . "/includes/ajax.inc");
 include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
@@ -72,11 +92,15 @@ $inst_langs = array(
   'da_DK' => array ( 'name' => 'Dansk',        'code' => 'da_DK',      'encoding' => 'iso-8859-1'),
   'de_DE' => array ( 'name' => 'Deutsch',      'code' => 'de_DE',      'encoding' => 'iso-8859-1'),
   'el_GR' => array ( 'name' => 'Greek',        'code' => 'el_GR',      'encoding' => 'utf-8'),
+  'es_MX' => array ( 'name' => 'Spanish',      'code' => 'es_MX',      'encoding' => 'iso-8859-1'),
   'fr_FR' => array ( 'name' => 'Français',     'code' => 'fr_FR',      'encoding' => 'iso-8859-1'),
   'id_ID' => array ( 'name' => 'Indonesian','code' => 'id_ID', 'encoding' => 'iso-8859-1'),
+  'it_IT' => array ( 'name' => 'Italian','code' => 'it_IT',    'encoding' => 'iso-8859-1'),
+  'ka_GE' => array ( 'name' => 'Georgian','code' => 'ka_GE',   'encoding' => 'utf-8'),
   'nl_BE' => array ( 'name' => 'Nederlands','code' => 'nl_BE', 'encoding' => 'iso-8859-1'),
   'pl_PL' => array ( 'name' => 'Polski',       'code' => 'pl_PL',      'encoding' => 'iso-8859-2'),
-  'pt_BR' => array ( 'name' => 'Português','code' => 'pt_BR',  'encoding' => 'iso-8859-1'),
+  'pt_BR' => array ( 'name' => 'Português (Brasilia)','code' => 'pt_BR',       'encoding' => 'iso-8859-1'),
+  'pt_PT' => array ( 'name' => 'Português','code' => 'pt_PT',  'encoding' => 'iso-8859-1'),
   'sv_SE' => array ( 'name' => 'Svenska',      'code' => 'sv_SE',      'encoding' => 'iso-8859-1'),
   'zh_CN' => array ( 'name' => 'Chinese Simplifed',    'code' => 'zh_CN',      'encoding' => 'utf-8'),
 );
@@ -86,7 +110,7 @@ $Ajax = new Ajax();
 get_text_init();
 
 $i_lang = isset($_POST['inst_lang']) ? $_POST['inst_lang'] : 
-       (isset($_SESSION['inst_set']['inst_lang']) ? $_SESSION['inst_set']['inst_lang'] : 'C');
+       (isset($_SESSION['inst_set']['inst_lang']) ? $_SESSION['inst_set']['inst_lang'] : array('C'));
 
 // Page Initialisation
 if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')
@@ -96,9 +120,11 @@ if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_
        $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
         isset($l['rtl']) ? 'rtl' : 'ltr');
 }
+if (!isset($installed_languages))
+       $installed_languages = array();
 
 $_SESSION['language']->set_language($_SESSION['language']->code);
-$_SESSION['get_text']->add_domain( $_SESSION['language']->code, $path_to_root."/install/lang");
+$GetText->add_domain( $_SESSION['language']->code, $path_to_root."/install/lang");
 
 include_once($path_to_root . "/version.php");
 include_once($path_to_root . "/includes/main.inc");
@@ -116,16 +142,17 @@ $Pagehelp = array();
 register_shutdown_function('end_flush');
 ob_start('output_html',0);
 
-// colect all error msgs
-set_error_handler('error_handler' /*, errtypes */);
-
 if (!isset($_SESSION["wa_current_user"]))
        $_SESSION["wa_current_user"] = new current_user();
 
+html_cleanup($_GET);
+html_cleanup($_POST);
+html_cleanup($_REQUEST);
+html_cleanup($_SERVER);
+
 $SysPrefs = &$_SESSION['SysPrefs'];
 
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
        $_POST = strip_quotes($_POST);
 
-?>