diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php index a151635..770d4cc 100644 --- a/ktapi/KTAPIDocument.inc.php +++ b/ktapi/KTAPIDocument.inc.php @@ -1109,6 +1109,7 @@ class KTAPI_Document extends KTAPI_FolderItem */ function update_sysdata($sysdata) { + global $default; if (empty($sysdata)) { return; @@ -1182,10 +1183,12 @@ class KTAPI_Document extends KTAPI_FolderItem $value = DBUtil::getResultArray($sql); if (PEAR::isError($value)) { + $default->log->error("Problem resolving mime type '$value' for document id $this->documentid. Reason: " . $value->getMessage()); return $value; } if (count($value) == 0) { + $default->log->error("Problem resolving mime type '$value' for document id $this->documentid. None found."); break; } $value = $value[0]['id']; @@ -1198,6 +1201,7 @@ class KTAPI_Document extends KTAPI_FolderItem $userId = DBUtil::getResultArray($sql); if (PEAR::isError($userId)) { + $default->log->error("Problem resolving user '$value' for document id $this->documentid. Reason: " . $userId->getMessage()); return $userId; } if (empty($userId)) @@ -1206,11 +1210,13 @@ class KTAPI_Document extends KTAPI_FolderItem $userId = DBUtil::getResultArray($sql); if (PEAR::isError($userId)) { + $default->log->error("Problem resolving username '$value' for document id $this->documentid. Reason: " . $userId->getMessage()); return $userId; } } if (empty($userId)) { + $default->log->error("Problem resolving user based on '$value' for document id $this->documentid. No user found"); // if not found, not much we can do break; } @@ -1221,6 +1227,7 @@ class KTAPI_Document extends KTAPI_FolderItem $documents[$name] = $userId; break; default: + $default->log->error("Problem updating field '$name' with value '$value' for document id $this->documentid. Field is unknown."); // TODO: we should do some logging //return new PEAR_Error('Unexpected field: ' . $name); } @@ -1272,7 +1279,15 @@ class KTAPI_Document extends KTAPI_FolderItem if (!is_null($indexContent)) { $indexer = Indexer::get(); - $indexer->updateDocumentIndex($this->documentid, $indexContent); + $result = $indexer->diagnose(); + if (empty($result)) + { + $indexer->updateDocumentIndex($this->documentid, $indexContent); + } + else + { + $default->log->error("Problem updating index with value '$value' for document id $this->documentid. Problem with indexer."); + } } } diff --git a/lib/discussions/DiscussionComment.inc b/lib/discussions/DiscussionComment.inc index 334e7e6..455aef7 100644 --- a/lib/discussions/DiscussionComment.inc +++ b/lib/discussions/DiscussionComment.inc @@ -7,38 +7,38 @@ * KnowledgeTree Open Source Edition * Document Management Made Simple * Copyright (C) 2004 - 2007 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 . - * + * * 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): ______________________________________ */ class DiscussionComment extends KTEntity { var $_bUsePearError = true; - + var $iThreadId; var $iUserId; var $sSubject; @@ -66,12 +66,12 @@ class DiscussionComment extends KTEntity { function getThreadId(){ return $this->iThreadId; } function setThreadId($iThreadId){ $this->iThreadId = $iThreadId; } - function getUserId(){ return $this->iUserId; } + function getUserId(){ return $this->iUserId; } function setUserId($iNewUserId){ $this->iUserId = $iNewUserId; } - function getSubject(){ return sanitizeForSQLtoHTML($this->sSubject); } - function setSubject($sNewSubject){ $this->sSubject = sanitizeForSQL($sNewSubject); } - function getBody(){ return sanitizeForSQLtoHTML($this->sBody); } - function setBody($sNewBody){ $this->sBody = sanitizeForSQL($sNewBody); } + function getSubject(){ return $this->sSubject; } + function setSubject($sNewSubject){ $this->sSubject = $sNewSubject; } + function getBody(){ return $this->sBody; } + function setBody($sNewBody){ $this->sBody = $sNewBody; } function getDate(){ return $this->dDate; } function getInReplyTo(){ return $this->iInReplyTo; } function setInReplyTo($sNewCommentId){ $this->iInReplyTo = $sNewCommentId; } diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index b8f0793..3f7e23d 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -104,7 +104,13 @@ class KTPage { $aCSS = Array( "resources/css/kt-framing.css", "resources/css/kt-contenttypes.css", - "resources/css/kt-headings.css" + "resources/css/kt-headings.css", +// "thirdpartyjs/extjs/resources/css/xtheme-kt.css", + "thirdpartyjs/extjs/resources/css/ext-all.css", + "thirdpartyjs/extjs/examples/examples.css", + // "thirdpartyjs/extjs/examples/menu/menu.css", + "thirdpartyjs/extjs/examples/lib.css", +// "skins/kt-toolbar.css" ); $this->requireCSSResources($aCSS); @@ -134,9 +140,12 @@ class KTPage { $aJS[] = 'thirdpartyjs/curvycorners/rounded_corners.inc.js'; $aJS[] = 'resources/js/loader.js'; $aJS[] = 'thirdpartyjs/yui/tools/tools.js'; - $aJS[] = 'thirdpartyjs/yui/connection/connection.js'; - + $aJS[] = 'thirdpartyjs/yui/connection/connection-min.js'; + $aJS[] = 'thirdpartyjs/extjs/adapter/ext/ext-base.js'; + $aJS[] = 'thirdpartyjs/extjs/ext-all.js'; + $aJS[] = 'thirdpartyjs/extjs/examples/examples.js'; + $aJS[] = 'resources/js/search2widget.js'; //$aJS[] = 'thirdpartyjs/MochiKit/.js'; //$aJS[] = 'resources/js/translate.js'; diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php index 34dadcc..1d21484 100644 --- a/lib/templating/smartytemplate.inc.php +++ b/lib/templating/smartytemplate.inc.php @@ -90,14 +90,14 @@ class KTSmartyTemplate extends KTTemplate { $search2_quickQuery = trim($_SESSION['search2_quickQuery']); if ($search2_quickQuery == '') { - $search2_quickQuery = _kt('Enter search criteria'); + $search2_quickQuery = ''; } } else { $search2_quick=0; $search2_general=1; - $search2_quickQuery = _kt('Enter search criteria'); + $search2_quickQuery = ''; $_SESSION['search2_quick'] = $search2_quick; $_SESSION['search2_general'] = $search2_general; $_SESSION['search2_quickQuery'] = ''; diff --git a/plugins/housekeeper/FolderUsageDashlet.inc.php b/plugins/housekeeper/FolderUsageDashlet.inc.php index d8644e3..abf1959 100644 --- a/plugins/housekeeper/FolderUsageDashlet.inc.php +++ b/plugins/housekeeper/FolderUsageDashlet.inc.php @@ -151,7 +151,15 @@ class FolderUsageDashlet extends KTBaseDashlet $oRegistry =& KTPluginRegistry::getSingleton(); $oPlugin =& $oRegistry->getPlugin('ktcore.housekeeper.plugin'); + $config = KTConfig::getSingleton(); + $rootUrl = $config->get('KnowledgeTree/rootUrl'); + $dispatcherURL = $oPlugin->getURLPath('HouseKeeperDispatcher.php'); + if (!empty($rootUrl)) $dispatcherURL .= $rootUrl . $dispatcherURL; + if (substr($dispatcherURL, 0,1 ) == '/') + { + $dispatcherURL = substr($dispatcherURL,1); + } $this->getUsage(); diff --git a/plugins/ktcore/KTBulkActions.php b/plugins/ktcore/KTBulkActions.php index d8d84f3..d9a84bf 100644 --- a/plugins/ktcore/KTBulkActions.php +++ b/plugins/ktcore/KTBulkActions.php @@ -606,9 +606,9 @@ class KTBrowseBulkExportAction extends KTBulkAction { $this->commitTransaction(); $url = KTUtil::addQueryStringSelf(sprintf('action=downloadZipFile&fFolderId=%d&exportcode=%s', $this->oFolder->getId(), $sExportCode)); - $str = sprintf('

' . _kt('Go here to download the zip file if you are not automatically redirected there') . "

\n", $url); + $str = sprintf('

' . _kt('Your download will begin shortly. If you are not automatically redirected to your download, please click here ') . "

\n", $url); $folderurl = KTBrowseUtil::getUrlForFolder($this->oFolder); - $str .= sprintf('

' . _kt('Once downloaded, return to the original folder') . "

\n", $folderurl); + $str .= sprintf('

' . _kt('Once your download is complete, click here to return to the original folder') . "

\n", $folderurl); //$str .= sprintf("\n"); $str .= sprintf(' {/foreach} @@ -90,123 +92,40 @@
    • {/foreach} - {literal} + - {/literal} + {literal} + + {/literal}
  • {if ($page->user)} @@ -231,28 +150,18 @@
  • - - - + +
    + +
    + + +
    • @@ -332,13 +241,13 @@
    {foreach item=sError from=$page->errStack} - + {if ($page->booleanLink == '0')}

    {$sError|sanitize}

    {else}

    {$sError}

    - {/if} - + {/if} + {/foreach}
    diff --git a/templates/ktcore/assist/assist_notification.smarty b/templates/ktcore/assist/assist_notification.smarty index c734fb6..5ebc91e 100644 --- a/templates/ktcore/assist/assist_notification.smarty +++ b/templates/ktcore/assist/assist_notification.smarty @@ -13,11 +13,11 @@  |  - {i18n}Clear Alert{/i18n} - {i18n}Clear Alert{/i18n} diff --git a/templates/ktcore/assist/assist_notification_details.smarty b/templates/ktcore/assist/assist_notification_details.smarty index f2c14eb..befd3e4 100644 --- a/templates/ktcore/assist/assist_notification_details.smarty +++ b/templates/ktcore/assist/assist_notification_details.smarty @@ -13,15 +13,15 @@
    - {i18n}View Document{/i18n} + {i18n}View Document{/i18n}  | 
    - {i18n}Clear Alert{/i18n} - {i18n}Clear Alert{/i18n}
    diff --git a/templates/ktcore/search2/adv_query_builder.smarty b/templates/ktcore/search2/adv_query_builder.smarty index 540a5e1..79b0869 100644 --- a/templates/ktcore/search2/adv_query_builder.smarty +++ b/templates/ktcore/search2/adv_query_builder.smarty @@ -1,7 +1,3 @@ -{$context->oPage->requireCSSResource("thirdpartyjs/extjs/resources/css/ext-all.css")} - -{$context->oPage->requireJSResource("thirdpartyjs/extjs/adapter/ext/ext-base.js")} -{$context->oPage->requireJSResource("thirdpartyjs/extjs/ext-all.js")} {literal} @@ -320,7 +316,7 @@ function createFilesize(groupid, fid) html += "