Peter M. Groen / knowledgetree

Commit 5d52f577e1181b916a9f34ed2c7b031d96523902

Authored by Jarrett Jordaan
1 parent e9c6a366

Updated navigation links to buttons 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 7 changed files with 40 additions and 49 deletions
setup/migrate/templates/complete.tpl
  View file @5d52f57
... ... @@ -19,15 +19,9 @@
19 19 In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>).
20 20 <br /><br />
21 21 <?php if(!empty($errors)) { ?>
22   -<!-- <span class='<?php //echo $ktmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
23   - <?php //echo $ktmysql['name']; ?>
24   - <?php //echo $ktmysql['msg']; ?>
25   -<!-- <br /><br />-->
26   - <?php //if (WINDOWS_OS) { ?>
27   - <span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
28   - <?php echo $zmysql['name']; ?>
29   - <?php echo $zmysql['msg']; ?>
30   - <?php //} ?>
  22 + <span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
  23 + <?php echo $zmysql['name']; ?>
  24 + <?php echo $zmysql['msg']; ?>
31 25 <?php } ?>
32 26 </div>
33 27 <!-- <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>-->
... ...
setup/upgrade/steps/upgradeComplete.php
  View file @5d52f57
... ... @@ -55,6 +55,7 @@ class upgradeComplete extends Step {
55 55 $this->temp_variables['isCE'] = true;
56 56 $this->doRun();
57 57 $this->storeSilent();
  58 + $this->util->deleteMigrateFile();
58 59 return 'landing';
59 60 }
60 61  
... ...
setup/upgrade/templates/complete.tpl
  View file @5d52f57
... ... @@ -51,5 +51,6 @@
51 51 </a>
52 52 </div>
53 53 </div>
54   - <a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
  54 +<!-- <a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
  55 + <input type="submit" name="Next" value="Finish" class="button_next"/>
55 56 </form>
56 57 \ No newline at end of file
... ...
setup/upgrade/upgradeWizard.php
  View file @5d52f57
... ... @@ -227,6 +227,8 @@ class UpgradeWizard {
227 227 $response = $this->systemChecks();
228 228 if($this->util->installationSpecified()) { // Check if the migrator needs to be accessed
229 229 $this->util->redirect('../wizard/index.php?step_name=install_type');
  230 + } elseif ($this->util->finishInstall()) { // Check if the installer has completed
  231 + $this->util->redirect('../../login.php');
230 232 }
231 233 if($response === true) {
232 234 $this->displayUpgrader();
... ...
setup/wizard/installUtil.php
  View file @5d52f57
... ... @@ -522,23 +522,6 @@ class InstallUtil {
522 522 }
523 523 }
524 524  
525   - /**
526   - * Check if system needs to be accessed
527   - *
528   - * @author KnowledgeTree Team
529   - * @access public
530   - * @param none
531   - * @return boolean
532   - */
533   - public function finishSpecified() {
534   - if(isset($_GET['Finish'])) {
535   - if($_GET['Finish'] == "Finish") {
536   - return true;
537   - }
538   - }
539   -
540   - return false;
541   - }
542 525  
543 526 /**
544 527 * Check if system needs to be migrated
... ... @@ -559,7 +542,10 @@ class InstallUtil {
559 542 }
560 543  
561 544 public function upgradeInstall() {
562   - if(isset($_POST['Next'])) {
  545 + if(isset($_GET['Upgrade'])) {
  546 + return true;
  547 + }
  548 + if(isset($_GET['Next'])) {
563 549 if($_POST['Next'] == "Upgrade") {
564 550 return true;
565 551 }
... ... @@ -569,6 +555,24 @@ class InstallUtil {
569 555 }
570 556  
571 557 /**
  558 + * Check if system needs to be accessed
  559 + *
  560 + * @author KnowledgeTree Team
  561 + * @access public
  562 + * @param none
  563 + * @return boolean
  564 + */
  565 + public function finishInstall() {
  566 + if(isset($_GET['Next'])) {
  567 + if($_GET['Next'] == "Finish") {
  568 + return true;
  569 + }
  570 + }
  571 +
  572 + return false;
  573 + }
  574 +
  575 + /**
572 576 * Check if system needs to be migrated
573 577 *
574 578 * @author KnowledgeTree Team
... ...
setup/wizard/installWizard.php
  View file @5d52f57
... ... @@ -104,18 +104,6 @@ class InstallWizard {
104 104 public function __construct(){}
105 105  
106 106 /**
107   - * Check if system has been install
108   - *
109   - * @author KnowledgeTree Team
110   - * @access private
111   - * @param none
112   - * @return boolean
113   - */
114   - private function isSystemInstalled() {
115   - return $this->util->isSystemInstalled();
116   - }
117   -
118   - /**
119 107 * Display the wizard
120 108 *
121 109 * @author KnowledgeTree Team
... ... @@ -280,17 +268,18 @@ class InstallWizard {
280 268 } elseif ($this->getBypass() === "0") {
281 269 $this->createInstallFile();
282 270 }
283   - if(!$this->isSystemInstalled()) { // Check if the systems not installed
  271 + if ($this->util->finishInstall()) { // Check if the installer has completed
  272 + $this->util->redirect('../../login.php');
  273 + } elseif ($this->util->upgradeInstall()) { // Check if the upgrader needs to be accessed
  274 + $this->util->redirect('../upgrade/index.php');
  275 + }
  276 + if(!$this->util->isSystemInstalled()) { // Check if the systems not installed
284 277 if($this->util->loginSpecified()) { // Back to wizard from upgrader
285 278 $this->util->redirect('../../control.php');
286 279 } elseif($this->util->migrationSpecified()) { // Check if the migrator needs to be accessed
287 280 $this->util->redirect('../migrate/index.php?');
288 281 } elseif ($this->util->upgradeSpecified()) { // Check if the upgrader needs to be accessed
289 282 $this->util->redirect('../upgrade/index.php?action=installer');
290   - } elseif ($this->util->finishSpecified()) { // Check if the installer has completed
291   - $this->util->redirect('../../login.php');
292   - } elseif ($this->util->upgradeInstall()) { // Check if the upgrader needs to be accessed
293   - $this->util->redirect('../upgrade/index.php');
294 283 }
295 284 $response = $this->systemChecks();
296 285 if($response === true) {
... ...
setup/wizard/templates/complete.tpl
  View file @5d52f57
... ... @@ -199,11 +199,11 @@
199 199 $redirect = "http://".$_SERVER['SERVER_NAME'].":$port".$root_url."/admin.php";
200 200 ?>
201 201 <?php if($migrate_check) { ?>
202   - <a href="../upgrade/index.php" class="back button_next" style="width:30px;" onclick="javascript:{w.clearSessions();}">Next</a>
203   -<!-- <input type="submit" name="Upgrade" value="Next" class="button_next"/>-->
  202 +<!-- <a href="../upgrade/index.php" class="back button_next" style="width:30px;" onclick="javascript:{w.clearSessions();}">Next</a>-->
  203 + <input type="submit" name="Upgrade" value="Next" class="button_next"/>
204 204 <?php } else { ?>
205   - <a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
206   -<!-- <input type="submit" name="Finish" value="Finish" class="button_next"/>-->
  205 +<!-- <a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
  206 + <input type="submit" name="Next" value="Finish" class="button_next"/>
207 207 <?php } ?>
208 208 </form>
209 209 <?php if (AJAX) { echo $html->js('form.js'); } ?>
210 210 \ No newline at end of file
... ...