Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Megan Watson
2 parents c87fd9ff 8eea4c57
Showing 5 changed files with 22 additions and 16 deletions
resources/js/kt_tinymce_init.js
setup/wizard/iniUtilities.php
setup/wizard/installWizard.php
setup/wizard/steps/configuration.php
setup/wizard/templates/complete.tpl
@@ -8,10 +8,9 @@ theme : &quot;advanced&quot;,
 plugins : "safari,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,imagemanager,filemanager", 
 // Theme options 
-theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", 
-theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", 
-theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen", 
-theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", 
+theme_advanced_buttons1 : "bold,italic,underline,|,forecolor,backcolor,|,bullist,numlist,|,link,unlink,anchor,|,pagebreak,|,insertdate,inserttime,preview,help", 
+theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,cleanup,removeformat,print,fullscreen,spellchecker", 
+theme_advanced_buttons3 : "",
 theme_advanced_toolbar_location : "top", 
 theme_advanced_toolbar_align : "left", 
 theme_advanced_statusbar_location : "bottom", 
@@ -43,7 +43,7 @@ class iniUtilities {
     private $lineNum = 0;
     private $exists = '';
-    function Ini($iniFile = '../../config.ini') {
+    function iniUtilities($iniFile = '../../config.ini') {
        $this->iniFile = $iniFile;
        $this->backupIni($iniFile);
        $this->read($iniFile);
@@ -71,7 +71,6 @@ class iniUtilities {
     }
     function read($iniFile) {
-
         $iniArray = file($iniFile);
         $section = '';
         foreach($iniArray as $iniLine) {
@@ -287,14 +287,14 @@ class InstallWizard {
 				$this->util->redirect('../migrate');
 			} elseif ($this->util->upgradeSpecified()) {
 				$this->util->redirect('../upgrade/index.php?action=installer');
-			} elseif ($this->util->loginSpecified()) {
+			}/* elseif ($this->util->loginSpecified()) {
 				header("Cache-Control: no-cache");
 				$this->util->redirect('../../admin.php');
 			} elseif ($this->util->zendSpecified()) {
 				$zend = "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index";
 				header("Cache-Control: no-cache");
 				$this->util->redirect($zend);
-			}
+			}*/
 			$response = $this->systemChecks();
 			if($response === true) {
 				$this->displayInstaller();
@@ -410,7 +410,7 @@ class configuration extends Step
         $pos = strpos($script, '/setup/wizard/');
         $root_url = substr($script, 0, $pos);
-
+echo $root_url;
         $root_url = (isset($_POST['root_url'])) ? $_POST['root_url'] : $root_url;
         $file_system_root = (isset($_POST['file_system_root'])) ? $_POST['file_system_root'] : $file_system_root.$root_url;
         $host = (isset($_POST['host'])) ? $_POST['host'] : $host;
@@ -119,19 +119,27 @@
 		</div>
 		<?php } ?>
 	</div>
-	
+	<?php
+        $script = $_SERVER['SCRIPT_NAME'];
+        $file_system_root = $_SERVER['DOCUMENT_ROOT'];
+        $host = $_SERVER['SERVER_NAME'];
+        $port = $_SERVER['SERVER_PORT'];
+        //$ssl_enabled = isset($_SERVER['HTTPS']) ? (strtolower($_SERVER['HTTPS']) === 'on' ? 'yes' : 'no') : 'no';
+
+        $pos = strpos($script, '/setup/wizard/');
+        $root_url = substr($script, 0, $pos);
+        $redirect = "http://".$_SERVER['SERVER_NAME'].$root_url."/admin.php";	
+	?>
 	<?php if($migrate_check) { ?>
-    	<input type="submit" name="completeType" value="Login" class="button_next"/>
-<!--		<a href="../../admin.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>-->
+		<a href="../../login.php?redirect=<?php echo $redirect; ?>" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
     <?php } else { ?>
-    	<input type="submit" name="completeType" value="Login" class="button_next"/>
-<!--    	<a href="../../admin.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>-->
+    	<a href="../../login.php?redirect=<?php echo $redirect; ?>" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
     <?php } ?>
     <?php
         if ($install_environment == 'Zend') {
         	?>
-        	<input type="submit" name="type" value="Zend Server Configuration" class="button_previous"/>
-<!--            <a href="<?php //echo "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; ?>" class="back" target="_blank" onclick="javascript:{w.clearSessions();}">Zend Server Configuration</a>-->
+<!--        	<input type="submit" name="type" value="Zend Server Configuration" class="button_previous"/>-->
+            <a href="<?php echo "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; ?>" class="back" target="_blank" onclick="javascript:{w.clearSessions();}">Zend Server Configuration</a>
             <?php
         }
     ?>