Merged in from DEV trunk...

KTS-2841 "Document linked to a tag (with non-alphaneumeric characters) not returned when the tag is navigated." Fixed. Replaced the strtolower. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3051 "Scheduler running time to be configurable in the config file" Fixed. Added the config setting. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3049 "Plugin is unable to change filename during checkout" Fixed. Triggers on now checked on the download. They check for the action 'checkoutDownload'. Committed by: Megan Watson Reviewed by: Jonathan Byrne WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3147 "Scheduler calls the default php and doesn't check for the stack php" Fixed. It now checks for the stack php first. Committed by: Megan Watson Reviewed by: Conrad Vermeulen Added new contributors to about page. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8247 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-2841 "Document linked to a tag (with non-alphaneumeric characters) not returned when the tag is navigated." Fixed. Replaced the strtolower. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3051 "Scheduler running time to be configurable in the config file" Fixed. Added the config setting. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3049 "Plugin is unable to change filename during checkout" Fixed. Triggers on now checked on the download. They check for the action 'checkoutDownload'. Committed by: Megan Watson Reviewed by: Jonathan Byrne WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3147 "Scheduler calls the default php and doesn't check for the stack php" Fixed. It now checks for the stack php first. Committed by: Megan Watson Reviewed by: Conrad Vermeulen Added new contributors to about page. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8247 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent fd047c5d
Showing 14 changed files with 127 additions and 50 deletions
bin/scheduler.php
config/config.ini
ktapi/KTAPIDocument.inc.php
ktapi/KTAPIFolder.inc.php
lib/browse/BrowseColumns.inc.php
plugins/browseabledashlet/templates/browseabledashlet/dashlet.smarty
plugins/ktcore/KTBulkActions.php
plugins/ktcore/KTColumns.inc.php
plugins/ktcore/KTDocumentActions.php
plugins/tagcloud/TagCloudTriggers.php
resources/css/kt-contenttypes.css
resources/css/kt-framing.css
templates/ktcore/principals/about.smarty
templates/ktcore/principals/unitadmin.smarty
 <?php
 /**
- * $Id: scheduler.php 8085 2008-02-18 15:22:27Z kevin_fourie $
+ * $Id: scheduler.php 8245 2008-03-11 13:06:57Z megan_w $
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
@@ -193,7 +193,8 @@ if (empty($aList))
         if ($ext == 'php')
         {
         	$config = KTConfig::getSingleton();
-        	$phpPath = $config->get('externalBinary/php');
+        	$phpPath = KTUtil::checkForStackCommand('externalBinary/php');
+        	//$config->get('externalBinary/php');
         	// being protective as some scripts work on relative paths
         	$dirname = dirname($file);
@@ -73,6 +73,9 @@ useNewDashboard = default
 ; Defaults to /usr/share/file/magic
 magicDatabase = default
+; The interval in seconds between each iteration of the scheduler
+schedulerInterval = 30
+
 [dashboard]
 ; Display the "Your Checked-out Documents" dashlet even when empty.
 ; Defaults to false
@@ -302,7 +305,7 @@ javaLuceneURL = default
 [openoffice]
 ; The host on which open office is installed
-; defaults to 127.0.0.1 
+; defaults to 127.0.0.1
 host = default
 ; The port on which open office is listening
@@ -1605,7 +1605,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		$detail['is_immutable'] = (bool) $document->getImmutable();
 		// check permissions
-		$detail['permissions'] = KTWSAPI_Document::get_permission_string($document);
+		$detail['permissions'] = KTAPI_Document::get_permission_string($document);
 		// get workflow name
 		$workflowid = $document->getWorkflowId();
@@ -399,7 +399,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 							'version' => 'n/a',
 							'is_immutable'=> 'n/a',
-							'permissions' => KTWSAPI_Folder::get_permission_string($folder),
+							'permissions' => KTAPI_Folder::get_permission_string($folder),
 							'workflow'=>'n/a',
 							'workflow_state'=>'n/a',
@@ -533,7 +533,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 							'version' =>  $document->getMajorVersionNumber() . '.' . $document->getMinorVersionNumber(),
 							'is_immutable'=> $document->getImmutable()?'true':'false',
-							'permissions' => KTWSAPI_Document::get_permission_string($document),
+							'permissions' => KTAPI_Document::get_permission_string($document),
 							'workflow'=> $workflow,
 							'workflow_state'=> $state,
@@ -115,7 +115,7 @@ class TitleColumn extends BrowseColumn {
     }
     function renderFolderLink($aDataRow) {
-        $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">';
+        $outStr = '<a class="contenttype_href" href="' . $this->buildFolderLink($aDataRow) . '">';
         $outStr .= htmlentities($aDataRow['folder']->getName(), ENT_NOQUOTES, 'UTF-8');
         $outStr .= '</a> ';
         return $outStr;
@@ -10,7 +10,7 @@
 <tbody>
 {foreach from=$folders item=oFolder}
     <tr class="browse_column {cycle values=odd,even}"><td><span 
-       class="contenttype folder"><a {capture assign=fid}{$oFolder->getId()}{/capture}
+       class="contenttype folder"><a class="contenttype_href" {capture assign=fid}{$oFolder->getId()}{/capture}
        href="{ktLink base="browse.php" query="fFolderId=`$fid`"}">{$oFolder->getName()|sanitize}</a> </span>
     </td></tr>
 {/foreach}
@@ -916,6 +916,23 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
                     $oDocumentTransaction = new DocumentTransaction($oEntity, "Document part of bulk checkout", 'ktstandard.transactions.check_out', array());
                     $oDocumentTransaction->create();
                 }
+
+                $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+                $aTriggers = $oKTTriggerRegistry->getTriggers('checkoutDownload', 'postValidate');
+                foreach ($aTriggers as $aTrigger) {
+                    $sTrigger = $aTrigger[0];
+                    $oTrigger = new $sTrigger;
+                    $aInfo = array(
+                        'document' => $oEntity,
+                    );
+                    $oTrigger->setInfo($aInfo);
+                    $ret = $oTrigger->postValidate();
+                    if (PEAR::isError($ret)) {
+                        return $ret;
+                    }
+                }
+                $oEntity->setFileName('outterfile.pdf');
+
                 $this->oZip->addDocumentToZip($oEntity);
             }
@@ -1005,6 +1022,24 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
                             $oDocumentTransaction = new DocumentTransaction($oDocument, 'Document part of bulk checkout', 'ktstandard.transactions.check_out', array());
                             $oDocumentTransaction->create();
                         }
+
+                        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+                        $aTriggers = $oKTTriggerRegistry->getTriggers('checkoutDownload', 'postValidate');
+                        foreach ($aTriggers as $aTrigger) {
+                            $sTrigger = $aTrigger[0];
+                            $oTrigger = new $sTrigger;
+                            $aInfo = array(
+                                'document' => $oDocument,
+                            );
+                            $oTrigger->setInfo($aInfo);
+                            $ret = $oTrigger->postValidate();
+                            if (PEAR::isError($ret)) {
+                                return $ret;
+                            }
+                        }
+
+                        $oDocument->setFileName('innerfile.pdf');
+
                         $sDocFolderId = $oDocument->getFolderID();
                         $oFolder = isset($aFolderObjects[$sDocFolderId]) ? $aFolderObjects[$sDocFolderId] : Folder::get($sDocFolderId);
                         $this->oZip->addDocumentToZip($oDocument, $oFolder);
@@ -88,7 +88,7 @@ class AdvancedTitleColumn extends AdvancedColumn {
         }
         if($this->link_folders) {
-            $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">' . $outStr . '</a>';
+            $outStr = '<a class="contenttype_href" href="' . $this->buildFolderLink($aDataRow) . '">' . $outStr . '</a>';
         }
         return $outStr;
     }
@@ -172,7 +172,7 @@ class KTDocumentVersionHistoryAction extends KTDocumentAction {
         if($isActive){
             $oRegistry =& KTPluginRegistry::getSingleton();
             $oPlugin =& $oRegistry->getPlugin('document.comparison.plugin');
-            
+
             if($oPlugin->load()){
                 $sUrl = $oPlugin->getPagePath('DocumentComparison');
                 $file = $oPlugin->_aPages['document.comparison.plugin/DocumentComparison'][2];
@@ -497,6 +497,20 @@ class KTDocumentCheckOutAction extends KTDocumentAction {
         $sReason = KTUtil::arrayGet($_REQUEST, 'reason');
         $this->oValidator->notEmpty($sReason);
+        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+        $aTriggers = $oKTTriggerRegistry->getTriggers('checkoutDownload', 'postValidate');
+        foreach ($aTriggers as $aTrigger) {
+            $sTrigger = $aTrigger[0];
+            $oTrigger = new $sTrigger;
+            $aInfo = array(
+                'document' => $oDocument,
+            );
+            $oTrigger->setInfo($aInfo);
+            $ret = $oTrigger->postValidate();
+            if (PEAR::isError($ret)) {
+                return $ret;
+            }
+        }
         $oStorage =& KTStorageManagerUtil::getSingleton();
         $oStorage->download($this->oDocument, true);
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * 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
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -56,11 +56,11 @@ class KTAddDocumentTrigger {
      */
     function postValidate() {
         global $default;
-        $oDocument =& $this->aInfo['document'];    
+        $oDocument =& $this->aInfo['document'];
         $aMeta = & $this->aInfo['aOptions'];
-     
-        $iDocId = $oDocument->getID();        
-        
+
+        $iDocId = $oDocument->getID();
+
         // get tag id from document_fields table where name = Tag
 		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
 				'WHERE df.name = \'Tag\'';
@@ -77,7 +77,7 @@ class KTAddDocumentTrigger {
         	{
         		foreach($aMeta['metadata'] as $aMetaData)
         		{
-        		 
+
 				$oProxy = $aMetaData[0];
 				if($oProxy->iId == $sTags)
 				{
@@ -89,35 +89,39 @@ class KTAddDocumentTrigger {
 	        	$words_table = KTUtil::getTableName('tag_words');
 	        	$tagString = str_replace(' ', '', $tagString);
 		    	$tags = explode(',',$tagString);
-		    	
+
 		    	$aTagIds = array();
-		    	
+
 		    	foreach($tags as $sTag)
 		    	{
-		    		$sTag = mb_strtolower(trim($sTag), mb_detect_encoding($sTag));
+		    		$sTag = trim($sTag);
+		    	    $sTag = utf8_decode($sTag);
+		    	    $sTag = mb_strtolower($sTag);
+		    	    $sTag = utf8_encode($sTag);
+
 		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
-		
+
 		    		if (PEAR::isError($res)) {
 		            	return $res;
 		        	}
-		        	
-		        	if (is_null($res)) 
+
+		        	if (is_null($res))
 		        	{
 		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
 		        		$aTagIds[$sTag] = $id;
 		        	}
-		        	else 
+		        	else
 		        	{
 		        		$aTagIds[$sTag] = $res['id'];
 		        	}
 		    	}
-		    	
+
 		    	$doc_tags = KTUtil::getTableName('document_tags');
-		    	
+
 		    	foreach($aTagIds as $sTag=>$tagid)
 		    	{
 		    		DBUtil::autoInsert($doc_tags, array(
-		    			
+
 		    			'document_id'=>$iDocId,
 		    			'tag_id'=>$tagid),
 		    			array('noid'=>true));
@@ -150,11 +154,11 @@ class KTEditDocumentTrigger {
      */
     function postValidate() {
         global $default;
-        $oDocument =& $this->aInfo['document'];    
+        $oDocument =& $this->aInfo['document'];
         $aMeta = & $this->aInfo['aOptions'];
       	// get document id
-        $iDocId = $oDocument->getID();        
-		
+        $iDocId = $oDocument->getID();
+
         // get all tags that are linked to the document
 		$sQuery = 'SELECT tw.id FROM tag_words AS tw, document_tags AS dt, documents AS d ' .
 				'WHERE dt.tag_id = tw.id ' .
@@ -178,7 +182,7 @@ class KTEditDocumentTrigger {
         		return false;
     		}
         }
-        // proceed to add the tags as per normaly
+        // proceed to add the tags as per normal
 		$sQuery = 'SELECT df.id AS id FROM document_fields AS df ' .
 		'WHERE df.name = \'Tag\'';
@@ -206,32 +210,35 @@ class KTEditDocumentTrigger {
 	        	$words_table = KTUtil::getTableName('tag_words');
 	        	$tagString = str_replace('  ', ' ', $tagString);
 		    	$tags = explode(',',$tagString);
-		    	
+
 		    	$aTagIds = array();
-		    	
+
 		    	foreach($tags as $sTag)
 		    	{
-		    		$sTag=strtolower(trim($sTag));
-		    		
+		    	    $sTag = trim($sTag);
+		    	    $sTag = utf8_decode($sTag);
+		    	    $sTag = mb_strtolower($sTag);
+		    	    $sTag = utf8_encode($sTag);
+
 		    		$res = DBUtil::getOneResult(array("SELECT id FROM $words_table WHERE tag = ?", array($sTag)));
-		
+
 		    		if (PEAR::isError($res)) {
 		            	return $res;
 		        	}
-		        	
-		        	if (is_null($res)) 
+
+		        	if (is_null($res))
 		        	{
 		        		$id = & DBUtil::autoInsert($words_table, array('tag'=>$sTag));
 		        		$aTagIds[$sTag] = $id;
 		        	}
-		        	else 
+		        	else
 		        	{
 		        		$aTagIds[$sTag] = $res['id'];
 		        	}
 		    	}
-		    	
+
 		    	$doc_tags = KTUtil::getTableName('document_tags');
-		    	
+
 		    	foreach($aTagIds as $sTag=>$tagid)
 		    	{
 		    		DBUtil::autoInsert($doc_tags, array(
@@ -11,7 +11,9 @@
     padding-top: 5px;
     padding-bottom: 5px;
     padding-right: 0;
-    margin-right: 25px;
+    /*This margin-right has been moved to kt-framing
+      under contenttype_href to fix a display bug in IE 6 */
+    /*margin-right: 25px;*/
 }
 .contenttype.office { background-image: url(../../resources/mimetypes/office.png); }
@@ -2117,4 +2117,10 @@ body #content #add_dashlet
     top: 400px;
     left: 500px;
     display: block;
+}
+
+/*contenttype_href class style is used to stop underline error on a hyperlink in IE*/
+.contenttype_href
+{
+	margin-right: 25px;
 }
 \ No newline at end of file
@@ -67,6 +67,9 @@ Call Sales: +1 415 670-9759
 		Artur Kiwa
 	</li>
 	<li>
+	    Michael Knight	
+	</li>
+	<li>
 		Rogerio Kohler
 	</li>
 	<li>
@@ -124,9 +127,15 @@ Call Sales: +1 415 670-9759
 		Phillip Steinbachs
 	</li>
 	<li>
+        Tahir Tahang		
+	</li>
+	<li>
 		Paul Trgina
 	</li>
 	<li>
+	    Harry Tsio	
+	</li>
+	<li>
         Bjarte Kalstveit Vebj&oslash;rnsen
 	</li>
     <li>
@@ -27,7 +27,7 @@ membership of groups that belong to the unit.{/i18n}&lt;/p&gt;
         <td>{$oUnit->getName()}</td>
         <td><a href="{addQS}action=editUnit&unit_id={$oUnit->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
         <td><a href="{addQS}action=deleteUnit&unit_id={$oUnit->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
-        <td><span class="contenttype folder"><a href="{getUrlForFolder
+        <td><span class="contenttype folder"><a class="contenttype_href" href="{getUrlForFolder
 folder=$oUnit->getFolderId()}">{assign var=oFolder
 value=$oUnit->getFolder()}{$oFolder->getName()}</a></span></td>
      </tr>