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

Jarrett Jordaan
2 parents b85c5254 3ab26ce1
Showing 9 changed files with 57 additions and 18 deletions
kthelp/ktcore/EN/welcome.html
kthelp/ktcore/EN/welcomeCommercial.html
plugins/ktstandard/documentpreview/documentPreview.php
search2/indexing/extractors/OpenXmlTextExtractor.inc.php
setup/wizard/installUtil.php
setup/wizard/resources/css/wizard.css
setup/wizard/steps/install.php
var/cache/.empty
webservice/clienttools/ajaxhandler.php
@@ -4,7 +4,7 @@
 </head>
 <body>
 <p class="descriptiveText"><b>#APP_NAME# is Document Management Made Simple.</b></p><br>
-<a href="http://www.youtube.com/watch?v=adTzHbk3SLU" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
+<a href="http://www.knowledgetree.com/video/gettingstarted" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
 <p class="descriptiveText">Easily and securely
 	manage your company's document creation, editing, versioning, and sharing - all from
 	a powerful Web interface and Microsoft&#0174 Office&#0174 and Windows&#0174 Explorer&#0174 tools.</p>
@@ -5,7 +5,7 @@
 <body>
 <p class="descriptiveText"><b>#APP_NAME# is Document Management Made Simple.</b></p> <br>
  
-<a href="http://www.youtube.com/watch?v=adTzHbk3SLU" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
+<a href="http://www.knowledgetree.com/video/gettingstarted" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
 <p class="descriptiveText">Easily and securely manage your company's document creation, editing, versioning, and sharing - all from a powerful Web interface and Microsoft&#0174 Office and Windows&#0174 Explorer tools.</p> <br>
  
 <p class="descriptiveText">A subscription to #APP_NAME# provides your organization with product updates, enhanced document management features, and commercial support.  Please view your welcome mailer for information on accessing these services.</p> <br>
@@ -176,7 +176,11 @@ class DocumentPreview {
  
         $sInfo = $this->getMetadata();
  
-        return '<div id="preview" class="preview" onclick="javascript: destroyPanel();">'.$sInfo.'</div>';
+        $sInfo = '<div id="preview" class="preview" onclick="javascript: destroyPanel();">'.$sInfo.'</div>';
+
+        $sInfo .= $this->getThumbnail();
+
+        return $sInfo;
     }
  
     /**
@@ -280,8 +284,6 @@ class DocumentPreview {
         $sInfo .= "<tr><td>{$sIdLb}</td><td><b>{$sId}</b></td></tr>";
         $sInfo .= " </table></div>";
  
-        $sInfo .= $this->getThumbnail();
-
         return $sInfo;
     }
  
@@ -219,6 +219,9 @@ class OpenXmlTextExtractor extends ExternalDocumentExtractor
 		}
 		$filename = str_replace('\\','/',$filename);
  
+		/*
+		// Removing the unzip command as the whole document gets unzipped at the start
+
 		$cmd = '"' .$this->unzip . '"' . ' ' . str_replace(
 			array('{source}','{part}', '{target_dir}'),
 			array($this->sourcefile, $filename,$this->openxml_dir), $this->unzip_params);
@@ -228,6 +231,7 @@ class OpenXmlTextExtractor extends ExternalDocumentExtractor
 			$this->output = _kt('Failed to execute command: ') . $cmd;
 			return false;
 		}
+		*/
  
 		$filename = $this->openxml_dir . "/$filename";
 		if (!file_exists($filename))
@@ -1061,9 +1061,6 @@ class InstallUtil {
  
     // {{{ copyDirectory
     function copyDirectory($sSrc, $sDst, $bMove = false) {
-        if (file_exists($sDst)) {
-            return false; //PEAR::raiseError(_kt("Destination directory already exists."));
-        }
         if (!WINDOWS_OS) {
             if ($bMove && file_exists('/bin/mv')) {
                 $this->pexec(array('/bin/mv', $sSrc, $sDst));
@@ -1081,15 +1078,13 @@ class InstallUtil {
         if ($hSrc === false) {
             return false; //PEAR::raiseError(sprintf(_kt("Could not open source directory: %s"), $sSrc));
         }
-        if (@mkdir($sDst, 0777) === false) {
-            return false; //PEAR::raiseError(sprintf(_kt("Could not create destination directory: %s"), $sDst));
-        }
+        @mkdir($sDst, 0777);
         while (($sFilename = readdir($hSrc)) !== false) {
             if (in_array($sFilename, array('.', '..'))) {
                 continue;
             }
-            $sOldFile = sprintf("%s/%s", $sSrc, $sFilename);
-            $sNewFile = sprintf("%s/%s", $sDst, $sFilename);
+            $sOldFile = sprintf("%s"  . DS . "%s", $sSrc, $sFilename);
+            $sNewFile = sprintf("%s" . DS . "%s", $sDst, $sFilename);
             if (is_dir($sOldFile)) {
                 $this->copyDirectory($sOldFile, $sNewFile, $bMove);
                 continue;
@@ -64,7 +64,7 @@ select {
 /* *** Layout Styles *** */
  
 #wrapper {
-	background: white; min-height:410px;
+	background: white; min-height:500px;
 }
  
 #outer-wrapper {
@@ -87,12 +87,12 @@ select {
 #container {
 	background: white url("../graphics/left.png") repeat-y left;
 	overflow:auto;
-	/*min-height:630px;height:410px;*/min-height:410px;
+	/*min-height:630px;height:410px;*/min-height:500px;
 }
  
 #content {
     margin-left: 220px;
-    /*height:515px;*/height:400px;
+    /*height:515px;*/height:500px;
 }
  
 #content_container {
@@ -104,6 +104,14 @@ class install extends step
     public function installStep()
     {
 		$this->callHome();
+		// copy indexing directory if this is a migration
+		$this->setDataFromSession();
+		if ($this->util->isMigration()) {
+			$migrateSessionData = $this->getDataFromPackage('migrate', 'installation'); 
+			$src = $migrateSessionData['location'] . DS . 'var' . DS .  'indexes';
+			$dst = SYSTEM_DIR . 'var'  . DS . 'indexes';
+			$this->util->copyDirectory($src, $dst);
+		}
     }
  
     /**
@@ -94,8 +94,8 @@ class ajaxHandler{
  
  
 		//TODO: Get rid of this service
-		$this->loadService('auth');
-		$this->authenticator=new auth($this,$this->ret,$this->kt,$this->request,$this->auth);
+//		$this->loadService('auth');
+//		$this->authenticator=new auth($this,$this->ret,$this->kt,$this->request,$this->auth);
  
  
  
@@ -273,6 +273,9 @@ class ajaxHandler{
  
 		$kt=$this->kt;
  
+		/*
+		 * User Check
+		 */
         $o_user=$kt->get_user_object_by_username($user);
  
         if(PEAR::isError($o_user)){
@@ -281,6 +284,33 @@ class ajaxHandler{
         	return false;
         }
  
+        /*
+         * BAOBAB Licence Check
+         */
+       if ($user != 'admin') {
+        	try{
+        		if(class_exists('BaobabKeyUtil')){
+		            if (!BaobabKeyUtil::checkIfLicensed(true)) {
+		                $this->ret->setResponse(array('authenticated'=> false, 'message'=> 'license_expired'));
+		                $this->ret->addError('Licence Expired');
+		                return false;
+		            }
+        		}else{
+        			$this->ret->addError('Licence Utility could not be loaded. Appears to be a Community version.');
+        			$this->ret->setResponse(array('authenticated'=> false, 'message'=> 'Licence Utility could not be loaded. Appears to be a Community version.'));
+        			return false;
+				}
+        	}catch(Exception $e){
+        		$this->ret->addError('could not execute BaobabKeyUtil::checkIfLicensed');
+        		$this->ret->setResponse(array('authenticated'=> false, 'message'=> 'BaobabKeyUtil::checkIfLicensed error'));
+        		return;
+        	}
+        }
+        
+        
+        /*
+         * Password Check
+         */
         try{
         	$l_pass=$o_user->getPassword();
         	$l_passHash=md5($l_pass.$this->auth['token']);