- KTS-445: view.php should boot non-admin-mode users out on deleted and archived docs

- KTS-473: final place where a MD object wasn't checked for error. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5016 c91229c3-7414-0410-bfa2-8a42b809f60b

- KTS-445: view.php should boot non-admin-mode users out on deleted and archived docs
- KTS-473: final place where a MD object wasn't checked for error. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5016 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 0a663b22
Showing 3 changed files with 30 additions and 1 deletions
lib/actions/documentaction.inc.php
plugins/ktcore/admin/documentFields.php
view.php
@@ -53,6 +53,9 @@ class KTDocumentAction extends KTStandardDispatcher {
         if (!KTWorkflowUtil::actionEnabledForDocument($this->oDocument, $this->sName)) {
             return false;
         }
+		// be nasty in archive/delete status.
+		$status = $this->oDocument->getStatusID();
+		if (($status == DELETED) || ($status == ARCHIVED)) { return false; } 
         return KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oDocument);
     }
@@ -300,6 +300,9 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         }
         foreach ($_REQUEST['metadata'] as $iMetaDataId) {
             $oMetaData =& MetaData::get($iMetaDataId);
+			if (PEAR::isError($oMetaData)) {
+			    $this->errorRedirectTo('editField', _('Invalid lookup selected'), 'fFieldsetId=' . $oFieldset->getId() . '&fFieldId=' .  $oField->getId());
+			}
             $oMetaData->delete();
         }
         $this->successRedirectTo('editField', _('Lookups removed'), 'fFieldsetId=' . $oFieldset->getId() . '&fFieldId=' .  $oField->getId());
@@ -723,6 +726,9 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
     function subact_unlinkKeyword(&$constructedTree, $keyword) {
         $oKW = MetaData::get($keyword);
+		if (PEAR::isError($oKW)) {
+		    return true;
+		}
         $constructedTree->reparentKeyword($oKW->getId(), 0);
         return true;
     }
@@ -37,6 +37,14 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
         parent::KTStandardDispatcher();
     }
+	
+	function check() {
+	    if (!parent::check()) { return false; }
+	
+		
+	
+	    return true;
+	}
     // FIXME identify the current location somehow.
     function addPortlets($currentaction = null) {
@@ -69,10 +77,22 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		}
         if (!KTBrowseUtil::inAdminMode($this->oUser, $oDocument->getFolderId())) {
-            if (!Permission::userHasDocumentReadPermission($oDocument)) {
+		    if ($oDocument->getStatusID() == ARCHIVED) {
+			    $this->oPage->addError(_('This document has been archived.  Please contact the system administrator to have it restored if it is still needed.'));
+				return $this->do_error();
+			} else if ($oDocument->getStatusID() == DELETED) {
+			    $this->oPage->addError(_('This document has been deleted.  Please contact the system administrator to have it restored if it is still needed.'));
+				return $this->do_error();
+            } else if (!Permission::userHasDocumentReadPermission($oDocument)) {
                 $this->oPage->addError(_('You are not allowed to view this document'));
                 return $this->do_error();
             }
+        } 
+		
+		if ($oDocument->getStatusID() == ARCHIVED) {
+		    $this->oPage->addError(_('This document has been archived.'));
+        } else if ($oDocument->getStatusID() == DELETED) {
+			$this->oPage->addError(_('This document has been deleted.'));
         }
 		$this->oPage->setSecondaryTitle($oDocument->getName());