Merged in from STABLE trunk...

KTS-2126 "Cannot compare the current version of a document to the older version" Fixed. Base version was NEVER being passed! This never could have worked as base would always be NULL! KTS-2125 "Double negative message "cannot not" in non-editable fields when comparing meta data versions" Fixed. Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6845 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTS-2126 "Cannot compare the current version of a document to the older version" Fixed. Base version was NEVER being passed! This never could have worked as base would always be NULL! KTS-2125 "Double negative message "cannot not" in non-editable fields when comparing meta data versions" Fixed. Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6845 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent e28c2d79
Showing 6 changed files with 16 additions and 15 deletions
i18n/knowledgeTree.pot
plugins/ktcore/KTDocumentActions.php
plugins/ktstandard/KTDiscussion.php
search/simpleSearch.php
templates/kt3/fieldsets/generic_versioned.smarty
view.php
@@ -10551,7 +10551,7 @@ msgid &quot;the user who did the check-out is not currently available to check it bac
 msgstr ""
 #: i18n/templates.c:1061 i18n/templates.c:1067 i18n/templates.c:1088
-msgid "this cannot not change between versions"
+msgid "this cannot change between versions"
 msgstr ""
 #: i18n/templates.c:1022
@@ -182,6 +182,7 @@ class KTDocumentVersionHistoryAction extends KTDocumentAction {
         $QS = array(
             'action' => 'viewComparison',
             'fDocumentId' => $this->oDocument->getId(),
+            'fBaseVersion' => $_REQUEST['fBaseVersion'],
             'fComparisonVersion' => $_REQUEST['fComparisonVersion'],
         );
@@ -177,8 +177,8 @@ class KTDocumentDiscussionAction extends KTDocumentAction {
         $oComment = DiscussionComment::createFromArray(array(
             'threadid' => $oThread->getId(),
             'userid' => $this->oUser->getId(),
-            'subject' => sanitize($sSubject),
-            'body' => sanitize(KTUtil::formatPlainText($sBody)),
+            'subject' => sanitizeForSQL($sSubject),
+            'body' => sanitizeForSQL(KTUtil::formatPlainText($sBody)),
         ));
         $aErrorOptions['message'] = _kt("There was an error adding the comment to the thread");
         $this->oValidator->notError($oComment, $aErrorOptions);
@@ -306,8 +306,8 @@ class KTDocumentDiscussionAction extends KTDocumentAction {
         $oComment = DiscussionComment::createFromArray(array(
             'threadid' => $oThread->getId(),
             'userid' => $this->oUser->getId(),
-            'subject' => sanitize($sSubject),
-            'body' => sanitize(KTUtil::formatPlainText($sBody)),
+            'subject' => sanitizeForSQL($sSubject),
+            'body' => sanitizeForSQL(KTUtil::formatPlainText($sBody)),
         ));
         $aErrorOptions['message'] = _kt("There was an error adding the comment to the thread");
         $this->oValidator->notError($oComment, $aErrorOptions);
@@ -387,7 +387,7 @@ class KTDocumentDiscussionAction extends KTDocumentAction {
 	}
 	$aErrorOptions['message'] = _kt("No reason provided");
-	$sReason = sanitize($this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'reason'), $aErrorOptions));
+	$sReason = sanitizeForSQL($this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'reason'), $aErrorOptions));
 	if($iStateId > $oThread->getState()) {
 	    $sTransactionNamespace = 'ktcore.transactions.collaboration_step_approve';
@@ -142,7 +142,7 @@ class SimpleSearchDispatcher extends KTStandardDispatcher {
         $aErrorOptions = array(
             "message" => _kt("Please provide a search term"),
         );
-        $searchable_text = sanitize(KTUtil::arrayGet($_REQUEST, "fSearchableText"));
+        $searchable_text = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, "fSearchableText"));
         $this->oValidator->notEmpty($searchable_text, $aErrorOptions);
@@ -41,12 +41,12 @@
     <tr class="odd">
         <th>{i18n}Created by{/i18n}</th>
-        <td colspan="2">{$creator} ({$creation_date}) <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</td>
+        <td colspan="2">{$creator} ({$creation_date}) <span class="descriptiveText">({i18n}this cannot change between versions{/i18n})</td>
     </tr>
     <tr class="even">
         <th>{i18n}Owned by{/i18n}</th>
-        <td colspan="2">{$owner} <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</td>
+        <td colspan="2">{$owner} <span class="descriptiveText">({i18n}this cannot change between versions{/i18n})</td>
     </tr>
 {capture assign="oldval"}{$comparison_last_modified_by} ({$comparison_last_modified_date}){/capture}
@@ -83,7 +83,7 @@
     <tr class="even">
         <th>{i18n}Document ID{/i18n}</th>
-        <td colspan="2">{$document->getId()} <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</span></td>
+        <td colspan="2">{$document->getId()} <span class="descriptiveText">({i18n}this cannot change between versions{/i18n})</span></td>
     </tr>
     </table>
@@ -95,12 +95,12 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
     function do_main() {
         // fix legacy, broken items.
         if (KTUtil::arrayGet($_REQUEST, "fDocumentID", true) !== true) {
-            $_REQUEST["fDocumentId"] = sanitize(KTUtil::arrayGet($_REQUEST, "fDocumentID"));
+            $_REQUEST["fDocumentId"] = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, "fDocumentID"));
             unset($_REQUEST["fDocumentID"]);
         }
         $document_data = array();
-        $document_id = sanitize(KTUtil::arrayGet($_REQUEST, 'fDocumentId'));
+        $document_id = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fDocumentId'));
         if ($document_id === null) {
             $this->oPage->addError(sprintf(_kt("No document was requested.  Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
             return $this->do_error();
@@ -252,7 +252,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
     function do_viewComparison() {
         $document_data = array();
-        $document_id = sanitize(KTUtil::arrayGet($_REQUEST, 'fDocumentId'));
+        $document_id = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fDocumentId'));
         if ($document_id === null) {
             $this->oPage->addError(sprintf(_kt("No document was requested.  Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
             return $this->do_error();
@@ -260,7 +260,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
         $document_data["document_id"] = $document_id;
-        $base_version = sanitize(KTUtil::arrayGet($_REQUEST, 'fBaseVersion'));
+        $base_version = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fBaseVersion'));
         // try get the document.
         $oDocument =& Document::get($document_id, $base_version);
@@ -285,7 +285,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
         $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
         $this->oPage->setBreadcrumbDetails(_kt("compare versions"));
-        $comparison_version = sanitize(KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'));
+        $comparison_version = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'));
         if ($comparison_version=== null) {
             $this->oPage->addError(sprintf(_kt("No comparison version was requested.  Please <a href=\"%s\">select a version</a>."), KTUtil::addQueryStringSelf('action=history&fDocumentId=' . $document_id)));
             return $this->do_error();