Merged in from DEV trunk...

Version change to 3.5.2a for bugfix release. KTS-3150 "WebDAV Interface - "&" in folder names causes error" Fixed. Replaced the & with %26. Committed by: Megan Watson Reviewed by: Isaac Lundall KTS-3156 "Fix incorrect fonts in 3.5.2" Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3157 "Fieldset fields aren't being sorted alphabetically when editing the metadata" Fixed. Added the sort into the getByFieldset function that gets used everywhere. Committed By: Megan Watson Reviewed By: Conrad Vermeulen KTS-3022 "Change the plugins to use relative paths" Fixed. On setup the plugins and plugin helpers now call fixfilename which finds the correct relative paths. Fixed the ktutil function isAbsolutePath. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8253 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
Version change to 3.5.2a for bugfix release. KTS-3150 "WebDAV Interface - "&" in folder names causes error" Fixed. Replaced the & with %26. Committed by: Megan Watson Reviewed by: Isaac Lundall KTS-3156 "Fix incorrect fonts in 3.5.2" Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3157 "Fieldset fields aren't being sorted alphabetically when editing the metadata" Fixed. Added the sort into the getByFieldset function that gets used everywhere. Committed By: Megan Watson Reviewed By: Conrad Vermeulen KTS-3022 "Change the plugins to use relative paths" Fixed. On setup the plugins and plugin helpers now call fixfilename which finds the correct relative paths. Fixed the ktutil function isAbsolutePath. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8253 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 4d6f1784
Showing 10 changed files with 96 additions and 75 deletions
docs/VERSION-NAME.txt
docs/VERSION-OSS.txt
docs/VERSION.txt
ktwebdav/lib/KTWebDAVServer.inc.php
lib/documentmanagement/DocumentField.inc
lib/plugins/plugin.inc.php
lib/plugins/pluginregistry.inc.php
lib/plugins/pluginutil.inc.php
lib/util/ktutil.inc
thirdpartyjs/extjs/examples/examples.css
-3.5.3 beta1
+3.5.2a
-3.5.3 beta1
+3.5.2a
-3.5.3 beta1
+3.5.2
@@ -585,6 +585,8 @@ class KTWebDAVServer extends HTTP_WebDAV_Server
             if($this->dav_client == 'MC'){
                 $path = str_replace('%2F', '/', urlencode($path));
             }
+            $path = str_replace('&', '%26', $path);
+
             $info = array();
             $info["path"]  = $path;
             $info["props"] = array();
@@ -666,6 +668,8 @@ class KTWebDAVServer extends HTTP_WebDAV_Server
             if($this->dav_client == 'MC'){
                 $path = str_replace('%2F', '/', urlencode(utf8_encode($path)));
             }
+            $path = str_replace('&', '%26', $path);
+
             // create result array
             $info = array();
             $info["path"] = $path;
@@ -41,6 +41,21 @@ require_once(KT_LIB_DIR . &#39;/metadata/metadatautil.inc.php&#39;);
 require_once(KT_LIB_DIR . '/documentmanagement/DocumentType.inc');
 require_once(KT_LIB_DIR . "/util/sanitize.inc");
+/**
+ * Compare the fields within a fieldset for alphabetising.
+ *
+ * @param object $a
+ * @param object $b
+ * @return integer
+ */
+function compareFields($a, $b)
+{
+    if ($a->getName() == $b->getName()) return 0;
+    if ($a->getName() < $b->getName()) return -1;
+    return 1;
+}
+
+
 class DocumentField extends KTEntity {
     /** primary key value */
@@ -130,11 +145,20 @@ class DocumentField extends KTEntity {
         } else {
             $iFieldsetId = $oFieldset;
         }
-        return KTEntityUtil::getByDict('DocumentField', array(
+        $aFields = KTEntityUtil::getByDict('DocumentField', array(
             'parent_fieldset' => $iFieldsetId,
         ), array(
             'multi' => true,
         ));
+
+        // Alphabetise the metadata fields within a fieldset if set in config
+        $oKTConfig =& KTConfig::getSingleton();
+        $use_sort = $oKTConfig->get('ui/metadata_sort', false);
+
+        if($use_sort){
+            usort($aFields, 'compareFields');
+        }
+        return $aFields;
     }
     function &getByFieldsetAndName($oFieldset, $sName) {
@@ -213,11 +213,12 @@ class KTPlugin {
     }
     function registerHelpLanguage($sPlugin, $sLanguage, $sBasedir) {
+        $sBasedir = (!empty($sBasedir)) ? $this->_fixFilename($sBasedir) : '';
         $this->_aHelpLanguage[$sLanguage] = array($sPlugin, $sLanguage, $sBasedir);
         // Register helper in DB
         $params = $sPlugin.'|'.$sLanguage.'|'.$sBasedir;
-        $this->registerPluginHelper($sLanguage, $sClassName, $sFilename, $params, 'general', 'help_language');
+        $this->registerPluginHelper($sLanguage, $sClassName, '', $params, 'general', 'help_language');
     }
     function registerColumn($sName, $sNamespace, $sClassName, $sFile) {
@@ -363,7 +364,11 @@ class KTPlugin {
                 $sFilename = sprintf("%s/%s", $sDirPath, $sFilename);
             }
         }
+
+        $sKtDir = str_replace('\\', '/', KT_DIR);
+        $sFilename = realpath($sFilename);
         $sFilename = str_replace('\\', '/', $sFilename);
+        $sFilename = str_replace($sKtDir.'/', '', $sFilename);
         return $sFilename;
     }
@@ -652,7 +657,7 @@ class KTPlugin {
     function run_setup() {
         return true;
     }
-    
+
     function setAvailability($sNamespace, $bAvailable = true){
     	$aValues = array('unavailable' => $bAvailable);
     	$aWhere = array('namespace' => $sNamespace);
@@ -767,6 +772,7 @@ class KTPlugin {
 		}
 		return $path;
     }
+
 }
 ?>
 \ No newline at end of file
@@ -54,6 +54,7 @@ class KTPluginRegistry {
      * @param unknown_type $sFilename
      */
     function registerPlugin($sClassName, $sNamespace, $sFilename = null) {
+        $sFilename = (!empty($sFilename)) ? KTPlugin::_fixFilename($sFilename) : '';
         $this->_aPluginDetails[$sNamespace] = array($sClassName, $sNamespace, $sFilename);
         $object = $sClassName.'|'.$sNamespace.'|'.$sFilename;
@@ -66,15 +67,9 @@ class KTPluginRegistry {
         }
         $aDetails = KTUtil::arrayGet($this->_aPluginDetails, $sNamespace);
         if (empty($aDetails)) {
-            // plugin hasn't been registered - check the DB
-//            $query = "SELECT * FROM plugin_helper WHERE namespace = '{$sNamespace}'";
-//            $plugin = DBUtil::getOneResult($query);
-//            if(empty($plugin)){
                 return null;
-//            }
-//            $aDetails = explode('|', $plugin['object']);
         }
-        $sFilename = $aDetails[2];
+        $sFilename = KT_DIR.'/'.$aDetails[2];
         if (!empty($sFilename)) {
             require_once($sFilename);
         }
@@ -178,7 +178,7 @@ class KTPluginUtil {
         	$query = "SELECT h.classname, h.pathname, h.plugin FROM plugin_helper h
         	   INNER JOIN plugins p ON (p.namespace = h.plugin)
-        	   WHERE p.disabled = 0 AND h.viewtype='{$sType}' AND h.classtype='plugin' ORDER BY p.orderby";
+        	   WHERE p.disabled = 0 AND h.classtype='plugin' ORDER BY p.orderby";
         	$aPluginHelpers = DBUtil::getResultArray($query);
         }
@@ -188,15 +188,16 @@ class KTPluginUtil {
             $path = $aItem['pathname'];
             if (!empty($path)) {
+                $path = KT_DIR.'/'.$path;
                 require_once($path);
-            }
-        	$oPlugin = new $classname($path);
-        	if($oPlugin->load()){
-        	   $aPlugins[] = $oPlugin;
-        	}else{
-        	    $aDisabled[] = "'{$aItem['plugin']}'";
-        	}
+            	$oPlugin = new $classname($path);
+            	if($oPlugin->load()){
+            	   $aPlugins[] = $oPlugin;
+            	}else{
+            	    $aDisabled[] = "'{$aItem['plugin']}'";
+            	}
+            }
         }
         $sDisabled = implode(',', $aDisabled);
@@ -795,6 +795,10 @@ class KTUtil {
         $sPath = str_replace('\\', '/', $sPath);
         $sReal = str_replace('\\', '/', realpath($sPath));
+        if(substr($sPath, -1, 1) == '/'){
+            $sReal .= '/';
+        }
+
         return (strtolower($sReal) == strtolower($sPath));
         if (substr($sPath, 0, 1) == '/') {
-/*
- * Ext JS Library 1.1 Beta 1
- * Copyright(c) 2006-2007, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://www.extjs.com/license
- */
-
-body {
-	font-family:verdana,tahoma,helvetica;
-	padding:20px;
-    padding-top:32px;
-    font-size:13px;
-	background-color:#fff !important;
-}
-p {
-	margin-bottom:15px;
-}
-h1 {
-	font-size:large; 
-	margin-bottom:20px;
-}
-.example-info{
-	width:150px;
-	border:1px solid #c3daf9;
-	border-top:1px solid #DCEAFB;
-	border-left:1px solid #DCEAFB;
-	background:#ecf5fe url(info-bg.gif) repeat-x;
-	font-size:10px;
-	padding:8px;
-}
-pre.code{
-	background: #F8F8F8;
-	border: 1px solid #e8e8e8;
-	padding:10px;
-	margin:10px;
-	margin-left:0px;
-	border-left:5px solid #e8e8e8;
-	font-size: 12px !important;
-	line-height:14px !important;
-}
-.msg .x-box-mc {
-    font-size:14px;
-}
-#msg-div {
-    position:absolute;
-    left:35%;
-    top:10px;
-    width:250px;
-    z-index:20000;
-}
-.x-grid3-row-body p {
-    margin:5px 5px 10px 5px !important;
-}
+/*
+ * Ext JS Library 1.1 Beta 1
+ * Copyright(c) 2006-2007, Ext JS, LLC.
+ * licensing@extjs.com
+ *
+ * http://www.extjs.com/license
+ */
+
+
+.example-info{
+	width:150px;
+	border:1px solid #c3daf9;
+	border-top:1px solid #DCEAFB;
+	border-left:1px solid #DCEAFB;
+	background:#ecf5fe url(info-bg.gif) repeat-x;
+	font-size:10px;
+	padding:8px;
+}
+pre.code{
+	background: #F8F8F8;
+	border: 1px solid #e8e8e8;
+	padding:10px;
+	margin:10px;
+	margin-left:0px;
+	border-left:5px solid #e8e8e8;
+	font-size: 12px !important;
+	line-height:14px !important;
+}
+.msg .x-box-mc {
+    font-size:14px;
+}
+#msg-div {
+    position:absolute;
+    left:35%;
+    top:10px;
+    width:250px;
+    z-index:20000;
+}
+.x-grid3-row-body p {
+    margin:5px 5px 10px 5px !important;
+}