includes/sessions.php
changeset 268 58477ab3937f
parent 263 d57af0b0302e
child 270 5bcdee999015
equal deleted inserted replaced
267:43add2be1371 268:58477ab3937f
   258    */
   258    */
   259    
   259    
   260   function __construct()
   260   function __construct()
   261   {
   261   {
   262     global $db, $session, $paths, $template, $plugins; // Common objects
   262     global $db, $session, $paths, $template, $plugins; // Common objects
   263     include(ENANO_ROOT.'/config.php');
   263     
       
   264     if ( defined('IN_ENANO_INSTALL') )
       
   265     {
       
   266       @include(ENANO_ROOT.'/config.new.php');
       
   267     }
       
   268     else
       
   269     {
       
   270       @include(ENANO_ROOT.'/config.php');
       
   271     }
       
   272     
   264     unset($dbhost, $dbname, $dbuser, $dbpasswd);
   273     unset($dbhost, $dbname, $dbuser, $dbpasswd);
   265     if(isset($crypto_key))
   274     if(isset($crypto_key))
   266     {
   275     {
   267       $this->private_key = $crypto_key;
   276       $this->private_key = $crypto_key;
   268       $this->private_key = hexdecode($this->private_key);
   277       $this->private_key = hexdecode($this->private_key);