Merged in from STABLE trunk...

KTC-220 "There is no Baobab setting in the config.ini file, when doing a fresh commercial installation of KT server." Fixed. Added BaobabSettings section. Committed By: Kevin Fourie Reviewed By: Isaac Lundall BBS-1036 "Option to turn off request for metadata on document upload" Added a function to the web services API to retrieve KTtools configuration from the server. Committed By: Isaac Lundall Reviewed By: Martin Kirsten KTS-2317 "There is a duplicate entry in the knowledgetree.pot file" Fixed. Removed duplicate entries. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen KTS-2268 "When selecting "Action Restriction" for a workflow, the actions are not restricted" Fixed. Removed broken actions check. This will still need to be investigated more but for now it works. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.3-Release-Branch@7111 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTC-220 "There is no Baobab setting in the config.ini file, when doing a fresh commercial installation of KT server." Fixed. Added BaobabSettings section. Committed By: Kevin Fourie Reviewed By: Isaac Lundall BBS-1036 "Option to turn off request for metadata on document upload" Added a function to the web services API to retrieve KTtools configuration from the server. Committed By: Isaac Lundall Reviewed By: Martin Kirsten KTS-2317 "There is a duplicate entry in the knowledgetree.pot file" Fixed. Removed duplicate entries. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen KTS-2268 "When selecting "Action Restriction" for a workflow, the actions are not restricted" Fixed. Removed broken actions check. This will still need to be investigated more but for now it works. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.3-Release-Branch@7111 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent df53c42c
Showing 8 changed files with 106 additions and 60 deletions
config/config.ini
config/dmsDefaults.php
docs/VERSION-NAME.txt
docs/VERSION-OSS.txt
i18n/knowledgeTree.pot
ktapi/ktapi.inc.php
ktwebservice/webservice.php
lib/workflow/workflowutil.inc.php
@@ -72,7 +72,7 @@ useNewDashboard = default
 [dashboard]
 ; Display the "Your Checked-out Documents" dashlet even when empty.
 ; Defaults to false
-alwayShowYCOD = default
+alwaysShowYCOD = default
 [storage]
 ; By default uses KTOnDiskHashedStorageManager
@@ -270,6 +270,14 @@ cacheEnabled = true
 cacheDirectory = ${varDirectory}/cache
 [KTWebDAVSettings]
+; This section is for KTWebDAV  only
+; _LOTS_ of debug info will be logged if the following is "on"
+debug = off
+; To allow write access to WebDAV clients set safe mode to "off" below
+safemode = on
+
+[BaobabSettings]
+; This section is for Baobab only
 ; _LOTS_ of debug info will be logged if the following is "on"
 debug = off
 ; To allow write access to WebDAV clients set safe mode to "off" below
@@ -282,3 +290,9 @@ safemode = on
 ; Identify the location of the mysql.exe and mysqldump.exe
 ;mysqlDirectory=c:/program files/ktdms/mysql/bin
+
+[KTtoolsSettings]
+;These two settings control whether or not the client is prompted for metadata when a 
+;document is added to knowledgetree via KTtools. They default to true.
+explorerMetadataCapture = true
+officeMetadataCapture = true
@@ -450,6 +450,10 @@ class KTInit {
             $oKTConfig->setdefaultns('webservice', 'uploadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'downloadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'randomKeyText', 'bkdfjhg23yskjdhf2iu');
+	    
+            $oKTConfig->setdefaultns('KTtoolsSettings', 'explorerMetadataCapture', true);
+            $oKTConfig->setdefaultns('KTtoolsSettings', 'officeMetadataCapture', true);
+
             $res = $this->readConfig();
             if (PEAR::isError($res)) { return $res; }
-OSS 3.4.2
+OSS 3.4.3
-3.4.2
+3.4.3
@@ -135,6 +135,7 @@ msgstr &quot;&quot;
 #: plugins/ktcore/folder/BulkImport.php:63
 #: plugins/ktcore/folder/BulkUpload.php:70
+#: plugins/ktcore/folder/addDocument.php:105
 msgid "- Please select a document type -"
 msgstr ""
@@ -150,10 +151,6 @@ msgstr &quot;&quot;
 msgid "(e.g. which transitions lead to which states)"
 msgstr ""
-#: plugins/ktcore/folder/addDocument.php:105
-msgid "- Please select a document type -"
-msgstr ""
-
 #: plugins/ktcore/admin/groupManagement.php:277
 #: plugins/ktcore/admin/groupManagement.php:420
 #: plugins/ktcore/admin/userManagement.php:367
@@ -4074,6 +4071,8 @@ msgstr &quot;&quot;
 #: i18n/templates.c:1334 i18n/templates.c:4064 i18n/templates.c:4298
 #: i18n/templates.c:4316
+#: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
+#: i18n/templates.c:4922
 msgid "Group"
 msgstr ""
@@ -4126,15 +4125,12 @@ msgstr &quot;&quot;
 msgid "Group's name"
 msgstr ""
-#: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
-#: i18n/templates.c:4922
-msgid "Group"
-msgstr ""
-
 #: plugins/ktcore/admin/groupManagement.php:398
 #: plugins/ktcore/admin/userManagement.php:343
 #: plugins/ktstandard/KTEmail.php:273 i18n/templates.c:3233
 #: i18n/templates.c:3269
+#: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
+#: i18n/templates.c:4586
 msgid "Groups"
 msgstr ""
@@ -4154,11 +4150,6 @@ msgstr &quot;&quot;
 msgid "Groups without units cannot be Unit Administrators."
 msgstr ""
-#: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
-#: i18n/templates.c:4586
-msgid "Groups"
-msgstr ""
-
 #: plugins/ktcore/admin/workflowsv2.php:1418
 #: plugins/ktcore/admin/workflowsv2.php:1640
 msgid "Guard"
@@ -6873,6 +6864,8 @@ msgid &quot;Return to where you came from.&quot;
 msgstr ""
 #: i18n/templates.c:4106 i18n/templates.c:4577
+#: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
+#: i18n/templates.c:4913
 msgid "Role"
 msgstr ""
@@ -6916,21 +6909,8 @@ msgstr &quot;&quot;
 msgid "Role now uses parent."
 msgstr ""
-#: i18n/templates.c:3320 i18n/templates.c:4031 i18n/templates.c:4403
-#: i18n/templates.c:4910
-msgid "Role or Group"
-msgstr ""
-
-#: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
-#: i18n/templates.c:4913
-msgid "Role"
-msgstr ""
-
 #: plugins/ktcore/KTCorePlugin.php:218 i18n/templates.c:3230
 #: i18n/templates.c:3266
-msgid "Roles"
-msgstr ""
-
 #: plugins/ktcore/admin/workflowsv2.php:1921
 msgid "Roles"
 msgstr ""
@@ -7719,9 +7699,6 @@ msgid &quot;The document must match condition \&quot;&lt;strong&gt;%s&lt;/strong&gt;\&quot;.&quot;
 msgstr ""
 #: lib/widgets/fieldsetDisplay.inc.php:335
-msgid "The document title is used as the main name of a document throughout %s&trade;."
-msgstr ""
-
 #: plugins/ktcore/document/edit.php:91
 #: plugins/ktcore/folder/addDocument.php:95
 msgid "The document title is used as the main name of a document throughout %s&trade;."
@@ -8593,9 +8570,6 @@ msgid &quot;Transitions from this state&quot;
 msgstr ""
 #: i18n/templates.c:3290
-msgid "Transitions to this state"
-msgstr ""
-
 #: i18n/templates.c:3503 i18n/templates.c:3617
 msgid "Transitions to this state"
 msgstr ""
@@ -9176,6 +9150,8 @@ msgstr &quot;&quot;
 #: i18n/templates.c:1385 i18n/templates.c:2966 i18n/templates.c:4352
 #: i18n/templates.c:4883 i18n/templates.c:4949 i18n/templates.c:5003
 #: i18n/templates.c:5027
+#: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
+#: i18n/templates.c:4886 i18n/templates.c:4931
 msgid "User"
 msgstr ""
@@ -9252,11 +9228,6 @@ msgstr &quot;&quot;
 msgid "User's name"
 msgstr ""
-#: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
-#: i18n/templates.c:4886 i18n/templates.c:4931
-msgid "User"
-msgstr ""
-
 #: i18n/templates.c:443
 msgid "User: #username# &lt;br /&gt;           Action: #action# &lt;br /&gt;           #reason#"
 msgstr ""
@@ -9276,6 +9247,8 @@ msgstr &quot;&quot;
 #: plugins/ktcore/admin/groupManagement.php:254
 #: plugins/ktstandard/KTEmail.php:280
+#: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
+#: i18n/templates.c:4583
 msgid "Users"
 msgstr ""
@@ -9311,11 +9284,6 @@ msgstr &quot;&quot;
 msgid "Users updated"
 msgstr ""
-#: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
-#: i18n/templates.c:4583
-msgid "Users"
-msgstr ""
-
 #: lib/documentmanagement/documentutil.inc.php:983
 msgid "Validation Failed"
 msgstr ""
@@ -10641,11 +10609,11 @@ msgstr &quot;&quot;
 msgid "Browse by..."
 msgstr ""
-#: plugins/ktstandard/KTEmail.php:126 
+#: plugins/ktstandard/KTEmail.php:126
 msgid "Your colleague, %s, wishes you to view the attached document entitled '%s'."
 msgstr ""
-#: plugins/browseabledashlet/templates/browseabledashlet/dashlet.smarty:8 
+#: plugins/browseabledashlet/templates/browseabledashlet/dashlet.smarty:8
 msgid "You have no orphaned folders."
 msgstr ""
@@ -10666,6 +10634,8 @@ msgid &quot;Add Dashlets&quot;
 msgstr ""
 #: resources/js/permissions.js:106
+#: i18n/templates.c:3320 i18n/templates.c:4031 i18n/templates.c:4403
+#: i18n/templates.c:4910
 msgid "Role or Group"
 msgstr ""
@@ -10674,9 +10644,6 @@ msgid &quot;Available Transitions&quot;
 msgstr ""
 #: about.php:39
-msgid "About"
-msgstr ""
-
 #: lib/templating/kt3template.inc.php:356
 msgid "About"
 msgstr ""
@@ -10705,3 +10672,11 @@ msgstr &quot;&quot;
 #: plugins\network\extendedtransactioninfo\templates\extendedtransactioninfo\dashlet.smarty:2
 msgid "There are no recent items."
 msgstr ""
+
+#: templates\ktstandard\adminversion\dashlet.smarty:24
+msgid "We have further information on our website."
+msgstr ""
+
+#: plugins\ktcore\admin\documentTypes.php:103
+msgid "The system default document type can not be disabled. You may, however, rename it."
+msgstr ""
-<?
+<?php
 /**
  * $Id$
  *
@@ -575,7 +575,13 @@ class KTAPI
 		}
 		return $results;
 	}
+	
+	function get_dms_defaults()
+	{
+		global $default;
+		return $default;
+	}
 }
-?>
 \ No newline at end of file
+?>
-<?
+<?php
 /**
  *
@@ -323,6 +323,19 @@ class KTWebService
             	'document_types' => "{urn:$this->namespace}kt_document_types_array"
             );
+        $this->__typedef["{urn:$this->namespace}kt_server_settings"] =
+			array(
+            	'explorer_metadata_capture' => 'boolean',
+            	'office_metadata_capture' => 'boolean'
+            );
+
+	$this->__typedef["{urn:$this->namespace}kt_server_settings_response"] =
+			array(
+            	'status_code' => 'int',
+            	'message' => 'string',
+            	'settings' => "{urn:$this->namespace}kt_server_settings"
+            );
+
          /* methods */
          // login
@@ -420,19 +433,19 @@ class KTWebService
           //  checkin_document
          $this->__dispatch_map['checkin_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','tempfilename' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
             );
           //  checkin_small_document
          $this->__dispatch_map['checkin_small_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
             );
           //  checkin_base64_document
          $this->__dispatch_map['checkin_base64_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
               'alias' => 'checkin_small_document'
             );
@@ -615,12 +628,19 @@ class KTWebService
             array('in' => array('session_id'=>'string' ),
              'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
             );
+	    
          // get_document_link_types
          $this->__dispatch_map['get_document_link_types'] =
             array('in' => array('session_id'=>'string' ),
              'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
             );
+         // get_server_settings
+         $this->__dispatch_map['get_server_settings'] =
+            array('in' => array('session_id'=>'string' ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_server_settings_response" ),
+            );
+
     }
@@ -2954,6 +2974,31 @@ class KTWebService
     	return $response;
 	}
+	/**
+	 * Retrieves the server settings for this server
+	 *
+	 * @param string $session_id
+	 * @return kt_server_settings_response
+	 */
+	function get_server_settings($session_id)
+	{
+		$kt = &$this->get_ktapi($session_id );
+		if (is_array($kt))
+		{
+			return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $kt);
+		}
+		
+		$dms_defaults = $kt->get_dms_defaults();
+		$response['settings'] = array(
+						'explorer_metadata_capture' => $dms_defaults->explorerMetadataCapture,
+						'office_metadata_capture' => $dms_defaults->officeMetadataCapture
+						);
+		$response['message'] = 'Knowledgetree server settings retrieval succeeded.';
+		$response['status_code'] = KTWS_SUCCESS;
+
+		return $response;
+	}
+
     /**
      * This runs the web service
      *
@@ -385,9 +385,11 @@ class KTWorkflowUtil {
         if (is_null($oWorkflow)) {
             return true;
         }
-        if (!in_array($sName, KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow))) {
-            return true;
-        }
+        // FIXME: The workflow_actions table that the method below uses is always empty!
+        //        It seems the new method was never followed though to completion.
+        //if (!in_array($sName, KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow))) {
+        //    return true;
+        //}
         $oState =& KTWorkflowState::getByDocument($oDocument);
         if (in_array($sName, KTWorkflowUtil::getDisabledActionsForState($oState))) {
             return false;