projects / acontent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c17a81a)
Enable and polish upgrader
authorCindy Li <cli@ocad.ca>
Fri, 19 Nov 2010 20:40:27 +0000 (20:40 -0000)
committerCindy Li <cli@ocad.ca>
Fri, 19 Nov 2010 20:40:27 +0000 (20:40 -0000)
docs/install/include/upgrade_header.php patch | blob | history
docs/install/include/ustep2.php patch | blob | history
docs/install/include/ustep5.php patch | blob | history
docs/install/index.php patch | blob | history

diff --git a/docs/install/include/upgrade_header.php b/docs/install/include/upgrade_header.php
index 926f153..3d939aa 100644 (file)
--- a/docs/install/include/upgrade_header.php
+++ b/docs/install/include/upgrade_header.php
@@ -40,15 +40,15 @@ $install_steps[7] = array('name' => 'Done!');
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="utf-8"> \r
 <head>\r
-<title>AChecher Upgrade</title>\r
+<title>AContent Upgrade</title>\r
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
 <link rel="stylesheet" href="stylesheet.css" type="text/css" />\r
 </head>\r
 \r
 <body>\r
 <div style="height: 70px; vertical-align: bottom; background: #354A81">\r
-       <h1 id="header">AChecher <?php echo $new_version; ?> Upgrade</h1>\r
-       <img src="../images/header_logo_checker.gif" height="29" width="84" alt="AChecher Logo" id="logo" />\r
+       <h1 id="header">AContent <?php echo $new_version; ?> Upgrade</h1>\r
+       <img src="../images/AC_Logo1_sm.png" height="29" width="84" alt="AContent Logo" id="logo" />\r
 </div>\r
 <div style="clear: all"></div>\r
 <div class="content">
\ No newline at end of file
diff --git a/docs/install/include/ustep2.php b/docs/install/include/ustep2.php
index f85ae12..0fbecda 100644 (file)
--- a/docs/install/include/ustep2.php
+++ b/docs/install/include/ustep2.php
@@ -77,10 +77,13 @@ $_POST['db_password'] = urldecode($_POST['db_password']);
                        }
                        
                        $curr_ver = $_POST['old_version'];
-                       ksort($update_files);
-                       foreach ($update_files as $up_file) {
-                               if(version_compare($curr_ver, $up_file[4], '<')) {
-                                       update_one_ver($up_file);
+                       
+                       if (is_array($update_files)) {
+                               ksort($update_files);
+                               foreach ($update_files as $up_file) {
+                                       if(version_compare($curr_ver, $up_file[4], '<')) {
+                                               update_one_ver($up_file);
+                                       }
                                }
                        }
                        
diff --git a/docs/install/include/ustep5.php b/docs/install/include/ustep5.php
index 873b2fc..f86298b 100644 (file)
--- a/docs/install/include/ustep5.php
+++ b/docs/install/include/ustep5.php
@@ -23,7 +23,7 @@ print_progress($step);
 
 <br />
 
-<form method="get" action="../checker/index.php">
+<form method="get" action="../index.php">
        <div align="center">
                <input type="submit" name="submit" value="&raquo; Go To AContent!" class="button" />
        </div>
diff --git a/docs/install/index.php b/docs/install/index.php
index 03c40d8..2202a82 100644 (file)
--- a/docs/install/index.php
+++ b/docs/install/index.php
@@ -275,7 +275,6 @@ $not_as_good = FALSE;
        </tr>
        </table>
        
-<!-- 
        <table cellspacing="0" cellpadding="10" align="center" width="45%">
        <tr>
                <td align="center"><b>Or</b></td>
@@ -290,7 +289,6 @@ $not_as_good = FALSE;
                </form></td>
        </tr>
        </table>
- -->
 <?php endif; ?>
 
 <?php require(TR_INCLUDE_PATH.'footer.inc.php'); ?>
AContent learning content authoring system