PHP 5.4 fixes for Notice Errors

xaver

2012-03-19 b9ce1a88f5f945c6f7ac0ba675048e75471421c6

PHP 5.4 fixes for Notice Errors

 interface/lib/classes/listform_actions.inc.php

@@ -267,6 +267,8 @@
        $limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');

        //* create options and set selected, if default -> 15 is selected

        $options = '';
        foreach($limits as $key => $val){
          $options .= '<option value="'.$key.'" '.(isset($_SESSION['search']['limit']) &&  $_SESSION['search']['limit'] == $key ? 'selected="selected"':'' ).(!isset($_SESSION['search']['limit']) && $key == '15' ? 'selected="selected"':'').'>'.$val.'</option>';
        }

 interface/web/client/client_edit.php

@@ -142,7 +142,7 @@
        $username = $app->db->quote($this->dataRecord["username"]);
        $password = $app->db->quote($this->dataRecord["password"]);
        $modules = $conf['interface_modules_enabled'];
        if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
        if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] > 0) $modules .= ',client';
        $startmodule = (stristr($modules,'dashboard'))?'dashboard':'client';
        $usertheme = $app->db->quote($this->dataRecord["usertheme"]);
        $type = 'user';
@@ -194,9 +194,8 @@
    */
    function onAfterUpdate() {
        global $app;
		
        // username changed
        if($conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
        if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
            $username = $app->db->quote($this->dataRecord["username"]);
            $client_id = $this->id;
            $sql = "UPDATE sys_user SET username = '$username' WHERE client_id = $client_id";
@@ -208,7 +207,7 @@
        }
        
        // password changed
        if($conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
        if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
            $password = $app->db->quote($this->dataRecord["password"]);
            $salt="$1$";
            $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -223,7 +222,7 @@
        }
        
        // language changed
        if($conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
        if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
            $language = $app->db->quote($this->dataRecord["language"]);
            $client_id = $this->id;
            $sql = "UPDATE sys_user SET language = '$language' WHERE client_id = $client_id";

 interface/web/client/form/client.tform.php

@@ -220,7 +220,7 @@
            'datatype'    => 'VARCHAR',

            'formtype'    => 'SELECT',
            'default'    => $conf["country"],
            'default'    => (isset($conf["country"]) ? $conf["country"] : ''),
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
                                        'keyfield'=> 'iso',

 interface/web/client/form/reseller.tform.php

@@ -220,7 +220,7 @@
            'datatype'    => 'VARCHAR',

            'formtype'    => 'SELECT',
            'default'    => $conf["country"],
            'default'    => (isset($conf["country"]) ? $conf["country"] : ''),
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
                                        'keyfield'=> 'iso',