Changeset 270

Show
Ignore:
Timestamp:
05/28/07 09:31:26
Author:
danfreak
Message:

fixed some images not displaying and hopefully ticket #52. In particular the installer was not adding the first userprofile in DB for the superadmin n.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • FreakAuth/trunk/www/system/application/controllers/installer.php

    r257 r270  
    2828                $install_data['superadmin'] = $this->_insert_SuperAdmin(); 
    2929                $install_data['ins_superadmin']=TRUE; 
    30                 $install_data['superadmin_msg'] = 'Enter the data for the system administrator. <img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/error.png" alt="please correct this config setting"/>  Take note of your username and password!';           
     30                $install_data['superadmin_msg'] = 'Enter the data for the system administrator. <img src="'.base_url().$this->config->item('FAL_assets_shared').'/'.$this->config->item('FAL_images').'/error.png" alt="please correct this config setting"/>  Take note of your username and password!';              
    3131                } 
    3232                elseif (!in_array('0', $install_data['installer']['check']) AND $how_many_superadmins>0) 
    3333                {       $install_data['superadmin'] = FALSE; 
    3434                        $install_data['ins_superadmin']=FALSE; 
    35                         $install_data['superadmin_msg'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  there is a superadmin in DB'; 
     35                        $install_data['superadmin_msg'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  there is a superadmin in DB'; 
    3636                } 
    3737                else  
    …… 
    3939                        $install_data['superadmin'] = FALSE; 
    4040                        $install_data['ins_superadmin']=FALSE; 
    41                         $install_data['superadmin_msg'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/error.png" alt="please correct this config setting"/>  When all settings will be OK, a form to enter the superadmin will be displayed'; 
     41                        $install_data['superadmin_msg'] = '<img src="'.base_url().$this->config->item('FAL_assets_shared').'/'.$this->config->item('FAL_images').'/error.png" alt="please correct this config setting"/>  When all settings will be OK, a form to enter the superadmin will be displayed'; 
    4242                } 
    4343         
    …… 
    7979                foreach ($necessary_tables as $key=>$table) 
    8080                { 
    81                         in_array($table, $tables[0]) ? $data['missing_tb'][$table]='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  ok' : $data['missing_tb'][$table]='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/error.png" alt="please correct this config setting"/> missing' ; 
    82  
    83                 } 
    84  
    85                 if (in_array('<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/error.png" alt="please correct this config setting"/> missing', $data['missing_tb'])==FALSE) 
    86                 { 
    87                         $data['tables']='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  ok'; 
     81                        in_array($table, $tables[0]) ? $data['missing_tb'][$table]='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  ok' : $data['missing_tb'][$table]='<img src="'.base_url().$this->config->item('FAL_assets_shared').'/'.$this->config->item('FAL_images').'/error.png" alt="please correct this config setting"/> missing' ; 
     82 
     83                } 
     84 
     85                if (in_array('<img src="'.base_url().$this->config->item('FAL_assets_shared').'/'.$this->config->item('FAL_images').'/error.png" alt="please correct this config setting"/> missing', $data['missing_tb'])==FALSE) 
     86                { 
     87                        $data['tables']='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  ok'; 
    8888                        $data['check'][1] = 1; 
    8989                } 
    …… 
    9797                if ($this->config->item('sess_use_database')) 
    9898                { 
    99                         $data['DB_session'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  DB_session ON'; 
     99                        $data['DB_session'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  DB_session ON'; 
    100100                        $data['check'][2] = 1; 
    101101                } 
    …… 
    109109                if ($this->config->item('FAL')) 
    110110                { 
    111                         $data['system_on'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  FreakAuth_light ON'; 
     111                        $data['system_on'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  FreakAuth_light ON'; 
    112112                        $data['check'][3] = 1; 
    113113                } 
    …… 
    121121                if (strlen($this->config->item('encryption_key')) AND  $this->config->item('encryption_key')!='ciao') 
    122122                { 
    123                         $data['enc_key']='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  encryption key OK'; 
     123                        $data['enc_key']='<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  encryption key OK'; 
    124124                        $data['check'][4] = 1; 
    125125                } 
    …… 
    133133                if ($this->config->item('FAL_website_name')!='' AND $this->config->item('FAL_website_name')!='YOUR_DOMAIN.com') 
    134134                { 
    135                         $data['w_name'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  OK -> '.$this->config->item('FAL_website_name'); 
     135                        $data['w_name'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  OK -> '.$this->config->item('FAL_website_name'); 
    136136                        $data['check'][5] = 1; 
    137137                } 
    …… 
    146146                if ($this->config->item('FAL_user_support')!='' AND $this->config->item('FAL_user_support')!='you@your-email.com') 
    147147                { 
    148                         $data['email'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_css').'/images/tick.png" alt="this config setting is ok"/>  email OK-> '.$this->config->item('FAL_user_support'); 
     148                        $data['email'] = '<img src="'.base_url().$this->config->item('FAL_assets_front').'/'.$this->config->item('FAL_images').'/tick.png" alt="this config setting is ok"/>  email OK-> '.$this->config->item('FAL_user_support'); 
    149149                        $data['check'][6] = 1; 
    150150                } 
    …… 
    203203                $this->load->model('FreakAuth_light/usermodel'); 
    204204                //insert data in DB 
    205                 $this->usermodel->insertUser($values);           
     205                $this->usermodel->insertUser($values); 
     206                 
     207                //if we want the user profile as well 
     208                if($this->config->item('FAL_create_user_profile')) 
     209                { 
     210                    //let's get the last insert id 
     211                    $data_profile['id'] = $this->db->insert_id(); 
     212 
     213                $this->load->model('Userprofile', 'userprofile'); 
     214                    $this->userprofile->insertUserProfile($data_profile); 
     215                } 
    206216                 
    207217                        //set a flash message