Changeset 10032

Show
Ignore:
Timestamp:
11/28/08 16:46:50 (1 month ago)
Author:
afz
Message:

providing upgrade for 0.8.7

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/0.8/jaws/html/upgrade/JawsUpgrader.php

    r7925 r10032  
    1717     * @var string 
    1818     */ 
    19     var $Path = ''; 
     19    var $_db_file_config; 
    2020 
    2121    /** 
    …… 
    3030     * @param string The path this upgrader is running from. 
    3131     */ 
    32     function JawsUpgrader($path) 
     32    function JawsUpgrader($db_config) 
    3333    { 
    34         $this->Path = $path; 
     34        $this->_db_file_config = $db_config; 
    3535    } 
    3636 
    …… 
    5959        if ($instance) { 
    6060            include_once $file; 
    61             $class = 'Upgrader_' . $stage['file']; 
    62             $ce = version_compare(PHP_VERSION, '5.0', '>=') ? class_exists($class, false) : class_exists($class); 
    63             if ($ce) { 
    64                 $stage = new $class; 
     61            $classname = 'Upgrader_' . $stage['file']; 
     62            $classExists = version_compare(PHP_VERSION, '5.0', '>=') ? 
     63                           class_exists($classname, false) : class_exists($classname); 
     64            if ($classExists) { 
     65                if (isset($stage['options'])) { 
     66                    $stage = new $classname($stage['options']); 
     67                } else { 
     68                    $stage = new $classname; 
     69                } 
     70 
    6571                return $stage; 
    6672            } 
    6773 
    68             Jaws_Error::Fatal("The ".$stage['name']." stage couldn't be loaded, because the class ".$stage['file']." couldn't be found.", __FILE__, __LINE__); 
     74            Jaws_Error::Fatal("The ".$stage['name']." stage couldn't be loaded, because the class ". 
     75                              $stage['file']." couldn't be found.", __FILE__, __LINE__); 
    6976        } 
    7077 
    …… 
    9198     * @return  bool|Jaws_Error 
    9299     */ 
    93     function LoadStages($list) 
     100    function LoadStages(&$stages) 
    94101    { 
    95         if (!file_exists($list)) { 
    96             Jaws_Error::Fatal("The stage list couldn't be found at <strong>${list}</strong>.", __FILE__, __LINE__); 
    97         } 
    98  
    99         include_once $list; 
    100102        foreach ($stages as $stage) { 
    101103            if (isset($stage['name']) && isset($stage['file'])) { 

  • branches/0.8/jaws/html/upgrade/index.php

    r8838 r10032  
    3737} 
    3838 
    39 define('JAWS_PATH', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR); 
    40 define('JAWS_IPATH', JAWS_PATH); //temporary 
    41  
     39require dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'config/JawsConfig.php'; 
    4240// lets setup the include_path 
    4341set_include_path('.' . PATH_SEPARATOR . JAWS_PATH . 'libraries/pear'); 
    …… 
    9391} 
    9492 
     93require_once 'stagelist.php'; 
    9594require_once 'JawsUpgrader.php'; 
    9695require_once 'JawsUpgraderStage.php'; 
    97  
    98 // this variables currently temporary util we complete multible instance installing 
    99 define('JAWS_DATA', JAWS_PATH . 'data'. DIRECTORY_SEPARATOR); 
    10096define('UPGRADE_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR); 
    10197 
    102 $upgrader = new JawsUpgrader(JAWS_PATH); 
    103 $upgrader->loadStages('stagelist.php'); 
     98$upgrader = new JawsUpgrader($db); 
     99$upgrader->loadStages($stages); 
    104100$stages = $upgrader->getStages(); 
    105101$stage = $stages[$_SESSION['upgrade']['stage']]; 

  • branches/0.8/jaws/html/upgrade/stagelist.php

    r9813 r10032  
    3232// Database setup and population. 
    3333$stages[] = array( 
    34     'name'  => _t('UPGRADE_DATABASE'), 
    35     'file'  => 'Database', 
     34    'name'    => _t('UPGRADE_DATABASE'), 
     35    'file'    => 'Database', 
     36    'options' => $db, 
    3637); 
    3738 
    …… 
    7879); 
    7980 
     81// Upgrade from 0.8.6 to 0.8.7 
     82$stages[] = array( 
     83    'name'  => _t('UPGRADE_VER_TO_VER', '0.8.6', '0.8.7'), 
     84    'file'  => '086To087', 
     85); 
     86 
    8087// Saves the config file. 
    8188$stages[] = array( 

  • branches/0.8/jaws/html/upgrade/stages/07To080.php

    r9883 r10032  
    4343        // Connect to database 
    4444        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    45         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4645        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4746        if (Jaws_Error::IsError($GLOBALS['db'])) { 

  • branches/0.8/jaws/html/upgrade/stages/082To083.php

    r9608 r10032  
    4242        // Connect to database 
    4343        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    44         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4544        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4645        if (Jaws_Error::IsError($GLOBALS['db'])) { 

  • branches/0.8/jaws/html/upgrade/stages/083To084.php

    r9608 r10032  
    4242        // Connect to database 
    4343        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    44         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4544        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4645        if (Jaws_Error::IsError($GLOBALS['db'])) { 

  • branches/0.8/jaws/html/upgrade/stages/084To085.php

    r9813 r10032  
    4242        // Connect to database 
    4343        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    44         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4544        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4645        if (Jaws_Error::IsError($GLOBALS['db'])) { 

  • branches/0.8/jaws/html/upgrade/stages/085To086.php

    r9857 r10032  
    4242        // Connect to database 
    4343        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    44         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4544        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4645        if (Jaws_Error::IsError($GLOBALS['db'])) { 
    …… 
    9998        } 
    10099 
    101         // don't overwrite config file, for fix problem in 0.7.x database charset connection 
    102         if ($_SESSION['upgrade']['versions_to_upgrade'] < 7) { 
    103             $_SESSION['upgrade']['stage']++; 
    104         } 
    105  
    106100        return true; 
    107101    } 

  • branches/0.8/jaws/html/upgrade/stages/08To081.php

    r9391 r10032  
    4242        // Connect to database 
    4343        require_once JAWS_PATH . 'include/Jaws/DB.php'; 
    44         $_SESSION['upgrade']['Database']['charset'] = ''; 
    4544        $GLOBALS['db'] = new Jaws_DB($_SESSION['upgrade']['Database']); 
    4645        if (Jaws_Error::IsError($GLOBALS['db'])) { 

  • branches/0.8/jaws/html/upgrade/stages/Database.php

    r10012 r10032  
    2626        'port'     => '', 
    2727    ); 
     28 
     29    /** 
     30     * Default values. 
     31     * @var string 
     32     * @access protected 
     33     */ 
     34    var $_db_charset = 'UTF8'; 
     35 
     36    /** 
     37     * Constructor 
     38     * 
     39     * @param array The database configuration 
     40     */ 
     41    function Upgrader_Database($db_config) 
     42    { 
     43        $this->_Defaults['host']     = $db_config['host']; 
     44        $this->_Defaults['user']     = $db_config['user']; 
     45        $this->_Defaults['isdba']    = $db_config['isdba']; 
     46        $this->_Defaults['path']     = isset($db_config['path'])? $db_config['path'] : ''; 
     47        $this->_Defaults['database'] = $db_config['name']; 
     48        $this->_Defaults['prefix']   = $db_config['prefix']; 
     49        $this->_Defaults['port']     = $db_config['port']; 
     50 
     51        // for fix bug in Jaws 0.7.x 
     52        $this->_db_charset = ($db_config['charset'] == 'UTF-8')? '' : $db_config['charset']; 
     53    } 
    2854 
    2955    /** 
    …… 
    282308            'prefix'   => $prefix, 
    283309            'driver'   => $post['driver'], 
    284             'charset'  => 'UTF8', 
     310            'charset'  => $this->_db_charset, 
    285311        ); 
    286312 

  • branches/0.8/jaws/html/upgrade/stages/Report.php

    r9813 r10032  
    3131 
    3232        $supportedversions = array( 
     33                                   array( 
     34                                         'version'   => '0.8.7', 
     35                                         'stage'     => '11', 
     36                                         ), 
    3337                                   array( 
    3438                                         'version'   => '0.8.6',