Merged in from DEV trunk...

"KTS-1880" "Upgrading from 3.0.3 to 3.3.5, has lost the information on who created the folders" Fixed. Reviewed By: Kevin Fourie "KTS-2056" "Hard-coded on-screen text refers to a button that does not exist." Fixed. Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6776 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
"KTS-1880" "Upgrading from 3.0.3 to 3.3.5, has lost the information on who created the folders" Fixed. Reviewed By: Kevin Fourie "KTS-2056" "Hard-coded on-screen text refers to a button that does not exist." Fixed. Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6776 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent bd79732d
Showing 5 changed files with 8 additions and 16 deletions
bin/expungeall.php
plugins/ktcore/KTColumns.inc.php
plugins/ktstandard/contents/RtfIndexer.php
resources/css/kt-login.css
setup/upgrade.php
@@ -51,10 +51,10 @@ $password = $config-&gt;get(&#39;autoexpunge/password&#39;,&#39;admin&#39;);
 $maximum = $config->get('autoexpunge/maximum',50);
 $ktapi = new KTAPI();
-$result = $ktapi->start_session($user, $password);
-if (PEAR::isError($result))
+$session = $ktapi->start_session($user, $password);
+if (PEAR::isError($session))
 {
-	print $result->getMessage() . "\n";
+	print $session->getMessage() . "\n";
 	return;
 }
@@ -68,6 +68,7 @@ $count = count($rows);
 if ($count == 0)
 {
 	print "Nothing to do.\n";
+	$session->logout();
 	return;
 }
@@ -93,4 +94,5 @@ $end_time = time();
 $diff = $end_time - $start_time;
 print "\ndone. $diff seconds.\n";
+$session->logout();
 ?>
 \ No newline at end of file
@@ -279,22 +279,13 @@ class AdvancedUserColumn extends AdvancedColumn {
 class CreatorColumn extends AdvancedUserColumn {
     var $document_field_function = "getCreatorID";
-    var $folder_field_function = null;
+    var $folder_field_function = "getCreatorID";
     var $sortable = true; // by default    
     var $namespace = 'ktcore.columns.creator';
     function CreatorColumn() {
         $this->label = _kt("Creator"); // abstract.        
     }
-
-    function addToFolderQuery() {
-        return array(null, null, null);
-    }
-    function addToDocumentQuery() {
-        $sUsersTable = KTUtil::getTableName('users');
-        $sJoinSQL = "LEFT JOIN $sUsersTable AS users_order_join ON (D.creator_id = users_order_join.id)";
-        return array($sJoinSQL, null, "users_order_join.name"); 
-    }
 }
 class AdvancedSelectionColumn extends AdvancedColumn {
@@ -54,7 +54,7 @@ class KTRtfIndexerTrigger extends KTBaseIndexerTrigger {
         // can't find the local command.
         if (empty($sCommand)) {
-            return sprintf(_kt('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the %d Path.  For more information on indexers and helper applications, please <a href="%s">visit the %d site</a>.'), $this->command, $this->support_url, APP_NAME);
+            return sprintf(_kt('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the %s Path.  For more information on indexers and helper applications, please <a href="%s">visit the %s site</a>.'), $this->command, APP_NAME, $this->support_url, APP_NAME);
         }
         return null;
@@ -70,6 +70,7 @@
             padding-left: 0px;
             border-left: 1px solid #eee;
             margin-left: -1px;
+            overflow: auto;
         }
         #disclaimerbox p { 
@@ -510,8 +510,6 @@ You can continue to do the backup manually using the following process:
 <nobr><?=$stmt['display']?>
 </table>
 <P>
-Press <i>continue to backup</i> to attempt the command(s) above.
-<P>
 &nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('home')"> &nbsp;&nbsp; &nbsp; &nbsp;