Changeset 103 for dev/install

Show
Ignore:
Timestamp:
11/28/06 20:20:08 (14 years ago)
Author:
exi
Message:

Fixed kill_export to allow corporation export.
Fixed installer config to not contain several php ending tags.
The sql importer now only executes lines which does not only contain whitespaces and will wait 20s on error for next importstep.

Location:
dev/install
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • dev/install/config.tpl

    r99 r103  
    6262define('DB_PASS', '{$pass}'); 
    6363 
    64 // please make sure that there is no space behind ?> 
     64// please make sure that there is no space behind the closing tag 
    6565?> 
  • dev/install/install_step4.php

    r88 r103  
    8282    $i = 0; 
    8383    $did = false; 
     84    $errors = false; 
    8485    if (!isset($_SESSION['doopt'])) 
    8586    { 
     
    9798                foreach ($querys as $query) 
    9899                { 
    99                     $id = mysql_query($query); 
     100                    if (trim($query)) 
     101                    { 
     102                        $id = mysql_query($query); 
     103                    } 
    100104                } 
    101105                if ($id) 
    102106                { 
    103107                    echo 'done<br/>'; 
     108                    echo '<meta http-equiv="refresh" content="1; URL=?step=4&sub=data" />'; 
     109                    echo 'Automatic reload in 1s for next chunk. <a href="?step=4&sub=data">Manual Link</a><br/>'; 
    104110                } 
    105111                else 
    106112                { 
    107113                    echo 'error: '.mysql_error().'<br/>'; 
     114                    echo '<meta http-equiv="refresh" content="20; URL=?step=4&sub=data" />'; 
     115                    echo 'Automatic reload in 20s for next chunk because of the error occured. <a href="?step=4&sub=data">Manual Link</a><br/>'; 
    108116                } 
    109117                $_SESSION['sqlinsert']++; 
    110                 echo '<meta http-equiv="refresh" content="1; URL=?step=4&sub=data" />'; 
    111                 echo 'Automatic reload in 1s for next chunk. <a href="?step=4&sub=data">Manual Link</a><br/>'; 
     118 
    112119                $did = true; 
    113120                break 2;