Peter M. Groen / knowledgetree

Commit 143b8a440ed9dcb34ec130ae53bc03e635320a3b

Authored by Megan Watson
2 parents c87fd9ff 8eea4c57

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

Inline Side-by-side
Showing 5 changed files with 22 additions and 16 deletions
resources/js/kt_tinymce_init.js
  View file @143b8a4
... ... @@ -8,10 +8,9 @@ theme : "advanced",
8 8 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",
9 9  
10 10 // Theme options
11   -theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
12   -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",
13   -theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
14   -theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
  11 +theme_advanced_buttons1 : "bold,italic,underline,|,forecolor,backcolor,|,bullist,numlist,|,link,unlink,anchor,|,pagebreak,|,insertdate,inserttime,preview,help",
  12 +theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,cleanup,removeformat,print,fullscreen,spellchecker",
  13 +theme_advanced_buttons3 : "",
15 14 theme_advanced_toolbar_location : "top",
16 15 theme_advanced_toolbar_align : "left",
17 16 theme_advanced_statusbar_location : "bottom",
... ...
setup/wizard/iniUtilities.php
  View file @143b8a4
... ... @@ -43,7 +43,7 @@ class iniUtilities {
43 43 private $lineNum = 0;
44 44 private $exists = '';
45 45  
46   - function Ini($iniFile = '../../config.ini') {
  46 + function iniUtilities($iniFile = '../../config.ini') {
47 47 $this->iniFile = $iniFile;
48 48 $this->backupIni($iniFile);
49 49 $this->read($iniFile);
... ... @@ -71,7 +71,6 @@ class iniUtilities {
71 71 }
72 72  
73 73 function read($iniFile) {
74   -
75 74 $iniArray = file($iniFile);
76 75 $section = '';
77 76 foreach($iniArray as $iniLine) {
... ...
setup/wizard/installWizard.php
  View file @143b8a4
... ... @@ -287,14 +287,14 @@ class InstallWizard {
287 287 $this->util->redirect('../migrate');
288 288 } elseif ($this->util->upgradeSpecified()) {
289 289 $this->util->redirect('../upgrade/index.php?action=installer');
290   - } elseif ($this->util->loginSpecified()) {
  290 + }/* elseif ($this->util->loginSpecified()) {
291 291 header("Cache-Control: no-cache");
292 292 $this->util->redirect('../../admin.php');
293 293 } elseif ($this->util->zendSpecified()) {
294 294 $zend = "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index";
295 295 header("Cache-Control: no-cache");
296 296 $this->util->redirect($zend);
297   - }
  297 + }*/
298 298 $response = $this->systemChecks();
299 299 if($response === true) {
300 300 $this->displayInstaller();
... ...
setup/wizard/steps/configuration.php
  View file @143b8a4
... ... @@ -410,7 +410,7 @@ class configuration extends Step
410 410  
411 411 $pos = strpos($script, '/setup/wizard/');
412 412 $root_url = substr($script, 0, $pos);
413   -
  413 +echo $root_url;
414 414 $root_url = (isset($_POST['root_url'])) ? $_POST['root_url'] : $root_url;
415 415 $file_system_root = (isset($_POST['file_system_root'])) ? $_POST['file_system_root'] : $file_system_root.$root_url;
416 416 $host = (isset($_POST['host'])) ? $_POST['host'] : $host;
... ...
setup/wizard/templates/complete.tpl
  View file @143b8a4
... ... @@ -119,19 +119,27 @@
119 119 </div>
120 120 <?php } ?>
121 121 </div>
122   -
  122 + <?php
  123 + $script = $_SERVER['SCRIPT_NAME'];
  124 + $file_system_root = $_SERVER['DOCUMENT_ROOT'];
  125 + $host = $_SERVER['SERVER_NAME'];
  126 + $port = $_SERVER['SERVER_PORT'];
  127 + //$ssl_enabled = isset($_SERVER['HTTPS']) ? (strtolower($_SERVER['HTTPS']) === 'on' ? 'yes' : 'no') : 'no';
  128 +
  129 + $pos = strpos($script, '/setup/wizard/');
  130 + $root_url = substr($script, 0, $pos);
  131 + $redirect = "http://".$_SERVER['SERVER_NAME'].$root_url."/admin.php";
  132 + ?>
123 133 <?php if($migrate_check) { ?>
124   - <input type="submit" name="completeType" value="Login" class="button_next"/>
125   -<!-- <a href="../../admin.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>-->
  134 + <a href="../../login.php?redirect=<?php echo $redirect; ?>" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
126 135 <?php } else { ?>
127   - <input type="submit" name="completeType" value="Login" class="button_next"/>
128   -<!-- <a href="../../admin.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>-->
  136 + <a href="../../login.php?redirect=<?php echo $redirect; ?>" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
129 137 <?php } ?>
130 138 <?php
131 139 if ($install_environment == 'Zend') {
132 140 ?>
133   - <input type="submit" name="type" value="Zend Server Configuration" class="button_previous"/>
134   -<!-- <a href="<?php //echo "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; ?>" class="back" target="_blank" onclick="javascript:{w.clearSessions();}">Zend Server Configuration</a>-->
  141 +<!-- <input type="submit" name="type" value="Zend Server Configuration" class="button_previous"/>-->
  142 + <a href="<?php echo "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; ?>" class="back" target="_blank" onclick="javascript:{w.clearSessions();}">Zend Server Configuration</a>
135 143 <?php
136 144 }
137 145 ?>
... ...