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

Paul Barrett
2 parents 80071044 e9c6a366
Showing 16 changed files with 110 additions and 106 deletions
lib/widgets/portlet.inc.php
resources/css/kt-framing.css
resources/graphics/btn_right_down.gif
resources/graphics/btn_right_ro_down.gif
resources/graphics/btn_right_ro_up.gif
resources/graphics/btn_right_up.gif
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateServices.php
setup/upgrade/steps/upgradeComplete.php
setup/upgrade/templates/complete.tpl
setup/upgrade/templates/database.tpl
setup/wizard/resources/css/wizard.css
setup/wizard/resources/graphics/facebookbutton.png
setup/wizard/resources/graphics/twitterbutton.png
setup/wizard/steps/database.php
setup/wizard/templates/complete.tpl
@@ -5,7 +5,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -153,13 +153,12 @@ class KTActionPortlet extends KTPortlet {
         // Create button html
         $button = "<div class='portlet_button'>
-            <a href='$link'>
+            <a href='{$link}'>
                 <div class='big_btn_left'></div>
                 <div class='big_btn_middle'>
                     <div class='btn_text'>{$text}</div>
-                    <div class='{$class}'></div>
                 </div>
-                <div class='big_btn_right'></div>
+                <div class='big_btn_right {$class}'></div>
             </a>
         </div>";
@@ -1218,20 +1218,6 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     text-decoration: none;
 }
-.portlet_button a .arrow_download {
-    background: transparent url(../../resources/graphics/download_arrow.gif) center right no-repeat;
-    width: 20px;
-    height: 47px;
-    float: right;
-}
-
-.portlet_button a .arrow_upload {
-    background: transparent url(../../resources/graphics/upload_arrow.gif) center right no-repeat;
-    width: 20px;
-    height: 47px;
-    float: right;
-}
-
 .portlet_button a .big_btn_left {
     background: transparent url(../../resources/graphics/btn_left.gif) top left no-repeat;
     width: 10px;
@@ -1246,16 +1232,23 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     text-align: center;
     vertical-align: middle;
     align: center;
-    width: 89%;
+    width: 80%;
 }
 .portlet_button a .big_btn_right {
-    background: transparent url(../../resources/graphics/btn_right.gif) top right no-repeat;
     float: left;
-    width: 10px;
+    width: 25px;
     height: 47px;
 }
+.portlet_button a .arrow_upload{
+    background: transparent url(../../resources/graphics/btn_right_up.gif) top right no-repeat;
+}
+
+.portlet_button a .arrow_download{
+    background: transparent url(../../resources/graphics/btn_right_down.gif) top right no-repeat;
+}
+
 .portlet_button a:hover .big_btn_left {
     background: transparent url(../../resources/graphics/btn_left_ro.gif) top left no-repeat;
 }
@@ -1264,8 +1257,12 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     background: transparent url(../../resources/graphics/btn_middle_ro.gif) repeat-x;
 }
-.portlet_button a:hover .big_btn_right {
-    background: transparent url(../../resources/graphics/btn_right_ro.gif) top right no-repeat;
+.portlet_button a:hover .arrow_upload {
+    background: transparent url(../../resources/graphics/btn_right_ro_up.gif) top right no-repeat;
+}
+
+.portlet_button a:hover .arrow_download {
+    background: transparent url(../../resources/graphics/btn_right_ro_down.gif) top right no-repeat;
 }
@@ -86,7 +86,6 @@ class migrateComplete extends Step {
 		}
         if($this->next()) {
         	$this->checkZendMysql();
-        	//if($this->checkMysql()) {
         	if($this->checkZendMysql()) {
         		return 'binstall';
         	} else {
@@ -134,8 +133,17 @@ class migrateComplete extends Step {
 			if($response['out']) {
 				$state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key
 			}
-			if($state == "STARTED")
+			if($state == "STARTED") {
 				$running = true;
+    		} else {
+    			$installation = $this->getDataFromSession("database"); // Get installation directory
+    			$dbConf = $installation;
+//    			$this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname);
+//    			$res = @mysql_connect(null, 'root', '');
+//    			if($res) {
+//    				$running = true;
+//    			}
+    		}
     	} else {
     		$installation = $this->getDataFromSession("installation"); // Get installation directory
     		$mysqlPid = $installation['location'].DS."mysql".DS."data".DS."mysqld.pid";
@@ -156,6 +156,8 @@ class migrateServices extends Step
 	* @return boolean
 	*/
     private function doRun() {
+    	$installation = $this->getDataFromSession("installation"); // Get installation directory
+    	$this->conf = $installation['location'];
 		if(!$this->alreadyUninstalled()) { // Pre-check if services are uninstalled
 			$this->uninstallServices();
 		}
@@ -49,6 +49,10 @@ class upgradeComplete extends Step {
     public function doStep() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
+    	$this->temp_variables['isCE'] = false;
+		$type = $this->util->getVersionType();
+		if($type == "community")
+		 	$this->temp_variables['isCE'] = true;
         $this->doRun();
         $this->storeSilent();
     	return 'landing';
@@ -86,7 +90,7 @@ class upgradeComplete extends Step {
      */
     protected function storeSilent() {
     	$v = $this->getDataFromSession('upgradeProperties');
-    	$this->temp_variables['sysVersion'] = $v['upgrade_version'];
+    	$this->temp_variables['sysVersion'] = $this->util->readVersion();
     	$this->temp_variables['migrateCheck'] = $this->migrateCheck;
     	$this->temp_variables['servicesCheck'] = $this->servicesCheck;
     }
-<?php //global $default; ?>
 <form>
 	<p class="title">Database Upgrade Completed</p>
-
 	<div id="step_content_complete" class="step">
 <!--	Services	-->
-	<br/><br/>
 	<div>
 	    Your database has been upgraded to <?php echo $sysVersion; ?>
 	</div>
-<br/><br/>
 	<?php if($migrateCheck) { ?>
-			<h3>Services</h3>
-			The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
-			<?php if(!WINDOWS_OS) { ?>
-			To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
+		<br/>
+		<h3>Services</h3>
+		The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
+		<?php if(!WINDOWS_OS) { ?>
+		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
+		<br/>
+		<br/>
+		<?php } else { ?>
+		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
+		<br/>
+		<br/>
+		<?php } ?>
+		<p class="disclaimer">
+		<?php if(WINDOWS_OS) { ?>
+			[START MENU] => [Programs] => [KnowledgeTree]
 			<br/>
+			Click [Start Services] 
 			<br/>
-			<?php } else { ?>
-			To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
 			<br/>
+			Alternatively:
 			<br/>
-			<?php } ?>
-			<p class="disclaimer">
-			<?php if(WINDOWS_OS) { ?>
-				cd <?php echo "\"".SYSTEM_DIR."knowledgetree\""; ?> <br/>
-				dmsctl.bat install<br/>
-				dmsctl.bat start
-			<?php } else { ?>
+			Open a command prompt and enter the following:
+			<br/>
+			cd <?php echo "\"".SYSTEM_DIR."\""; ?> <br/>
+			dmsctl.bat install<br/>
+			dmsctl.bat start
+		<?php } else { ?>
+			<?php if ($isCE) { ?>
 				cd /usr/share/knowledgetree-ce<br/>
-				sudo ./dmsctl.sh start
+			<?php } else { ?>
+				cd /usr/share/knowledgetree<br/>
 			<?php } ?>
-			</p>
-			<br/>
+			sudo ./dmsctl.sh start
 		<?php } ?>
+		</p>
+		<br/>
+	<?php } else { ?>
+	<br>
+	<?php } ?>
+	<div>
+		<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">
+			Click Here for help on overcoming post install issues
+		</a>
+	</div>
 	</div>
 	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
 </form>
 \ No newline at end of file
@@ -50,10 +50,12 @@
     <?php }
     else if ($action == 'runUpgrade') { ?>
 		<?php if ($backupSuccessful) { ?>
-		<script type="text/javascript">
 		<?php if($migrateCheck) { ?>
-		alert("To complete the upgrade please do the following before continuing:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n\n\nSelect 'Finish' at the bottom of this page to continue.");
+		<script type="text/javascript">
+		alert("To complete the upgrade please do the following before continuing:\n\n1. Hard refresh your browser (CTRL-F5) on first view of the Dashboard.\n\n\nSelect 'Finish' at the bottom of this page to continue.");
+		</script>
 		<?php } else { ?>
+		<script type="text/javascript">
         alert("To complete the upgrade please do the following before continuing:\n\n1. Restart the services as appropriate for your environment.\n\n\nOn first run of your upgraded installaton please do the following:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n2. Enable the new plugins you wish to use.\n\n\nSelect 'Finish' at the bottom of this page to continue.")
     </script>
     	<?php } ?>
@@ -601,4 +601,12 @@ td.dir_description {
 	font-size:100%;
 	line-height:150%;
 	font-family:sans-serif;
+}
+
+.twitter {
+
+}
+
+.facebook {
+
 }
 \ No newline at end of file
@@ -309,11 +309,7 @@ class database extends Step
     		$this->error['dmsuserpassword'] = "Passwords do not match: " . $this->dmsuserpassword." ". $this->getPassword2();
     		return false;
     	}
-//    	if($this->dport == '')  {
-//    		$this->util->dbUtilities->load($this->dhost, $this->duname, $this->dpassword, $this->dname);
-//    	} else {
-    		$this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname);
-//    	}
+    	$this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname);
         if (!$this->util->dbUtilities->getDatabaseLink()) {
             $this->error['con'] = "Could not connect to the database, please check username and password";
             return false;
@@ -4,9 +4,7 @@
 	</p>
 	<p class="description">
 		This step allows you to check that your KnowledgeTree configuration is set up correctly.
-<!--		<br/>-->
 		Click <b>Finish</b> to browse to the KnowledgeTree Web Interface. Default login credentials are <b>username:</b> <i>admin</i> and <b>password:</b> <i>admin</i>.
-<!--		You can run this at any time after configuration to check	that things are still set up correctly.-->
 	</p>
 	<div>
 		<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">
@@ -15,6 +13,16 @@
 	</div>
 	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
+	<div style="padding: 0pt 0pt 40px 15px; float: right;">
+	<a class="twitter" href="http://www.twitter.com/knowledgetreesw" style="color:#FFFFFF;" target="_blank">
+		<?php echo $html->image('twitterbutton.png'); ?>
+	</a>
+	<br/>
+	<br/>
+	<a class="facebook" href="http://www.facebook.com/pages/KnowledgeTree-Document-Management-Made-Simple/59248880725" style="color:#FFFFFF;" target="_blank">
+		<?php echo $html->image('facebookbutton.png'); ?>
+	</a>
+	</div>
 	<?php if(!$servicesValidation) { ?>
 		<?php if(!$migrate_check) { ?>
 			<h3>Services</h3>
@@ -29,11 +37,20 @@
 			<br/>
 			<?php } ?>
 			<p class="disclaimer">
-			<?php if(WINDOWS_OS) { ?>
-				cd <?php echo "\"".SYSTEM_DIR."\""; ?> <br/>
-				dmsctl.bat install<br/>
-				dmsctl.bat start
-			<?php } else { ?>
+				<?php if(WINDOWS_OS) { ?>
+					[START MENU] => [Programs] => [KnowledgeTree]
+					<br/>
+					Click [Start Services] 
+					<br/>
+					<br/>
+					Alternatively:
+					<br/>
+					Open a command prompt and enter the following:
+					<br/>
+					cd <?php echo "\"".SYSTEM_DIR."\""; ?> <br/>
+					dmsctl.bat install<br/>
+					dmsctl.bat start
+				<?php } else { ?>
 				<?php if ($isCE) { ?>
 					cd /usr/share/knowledgetree-ce<br/>
 				<?php } else { ?>
@@ -50,7 +67,6 @@
 		$iconFlag = "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
 		$checkHeading = "<h3 style='width:35%; float:left;'>".$iconFlag."Paths and Permissions</h3>";
 	?>
-<!--		<div>-->
 			<?php if($pathsSection) {
 				$details = 'Show Details';
 				$display = 'none';
@@ -58,11 +74,6 @@
 				$details = 'Hide Details';
 				$display = 'block';
 			}?>
-<!--		    <h3><?php //echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>-->
-		<?php if($silent) { ?>
-<!--			<div id="option8" class="onclick" onclick="javascript:{w.toggleClass('paths_check', 'option8');}">Show Details</div>-->
-<!--			<div class="paths_check" style="display:none">-->
-		<?php } ?>
 			<?php
 				$pathsCheck = $checkHeading;
 				$pathsCheck .= "<div id='option8' class='onclick' onclick='javascript:{w.toggleClass(\"paths_check\", \"option8\");}'>";
@@ -71,7 +82,6 @@
 				echo $pathsCheck;
 			?>
 		    <table class="description_complete">
-<!--			<table class="description">-->
 				<tr></tr>
 		        <?php if (!empty($varDirectory)) echo '<tr>' . $varDirectory . '</tr>'; ?>
 		        <?php if (!empty($documentRoot)) echo '<tr>' . $documentRoot . '</tr>'; ?>
@@ -84,10 +94,8 @@
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
-<!--		</div>-->
 		<br/>
 		<br/>
-<!--		<div>-->
 	<!--	Database connectivity	-->
 	<?php
 		$iconFlag = "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
@@ -100,10 +108,7 @@
 				$details = 'Hide Details';
 				$display = 'block';
 			}?>
-<!--		    <h3><?php //echo "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Database connectivity</h3>-->
 		<?php if($silent) { ?>
-<!--			<div id="option9" class="onclick" onclick="javascript:{w.toggleClass('database_check', 'option9');}">Show Details</div>-->
-<!--			<div class="database_check" style="display:none">-->
 			<?php
 				$databaseCheck = $checkHeading;
 				$databaseCheck .= "<div id='option9' class='onclick' onclick='javascript:{w.toggleClass(\"database_check\", \"option9\");}'>";
@@ -133,10 +138,7 @@
 				$details = 'Hide Details';
 				$display = 'block';
 			}?>
-<!--		    <h3><?php //echo "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Privileges</h3>-->
 		<?php if($silent) { ?>
-<!--			<div id="option1" class="onclick" onclick="javascript:{w.toggleClass('privileges_check', 'option1');}">Show Details</div>-->
-<!--			<div class="privileges_check" style="display:none">-->
 			<?php
 				$privilegesCheck = $checkHeading;
 				$privilegesCheck .= "<div id='option1' class='onclick' onclick='javascript:{w.toggleClass(\"privileges_check\", \"option1\");}'>";
@@ -152,7 +154,6 @@
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
-<!--		</div>-->
 	<!--	Services	-->
 		<br/>
 <!--		<br/>-->
@@ -164,46 +165,18 @@
 			<div id="option2" class="onclick" onclick="javascript:{w.toggleClass('services_check', 'option2');}">Show Details</div>
 			<div class="services_check" style="display:none">
 		<?php } ?>
-<!--		    <table class="description_complete">-->
 			<table class="description">
 		        <tr>
 		        	<td style="width:15px;"> <?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
 		        	<td style="width:640px;"> Lucene Service <?php if ($LuceneStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($LuceneStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
 		        </tr>
 		        <tr>
 		        	<td> <?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
 		        	<td> Scheduler Service <?php if ($SchedulerStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($SchedulerStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
 		        </tr>
 		        <tr>
 		        	<td> <?php echo "<span class='{$OpenOfficeStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
 		        	<td> OpenOffice Service <?php if ($OpenOfficeStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($OpenOfficeStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
 		        </tr>
 		    </table>
 		<?php if($silent) { ?>
@@ -218,8 +191,6 @@
         $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);
         if($port == '')