Peter M. Groen / knowledgetree

Commit 8b7301d2a42e48af6850124595f0d301eb7d98fe

Authored by Brad Shuttleworth
1 parent d241a7e1

add admin mode logging. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5317 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 32 additions and 0 deletions
lib/documentmanagement/DocumentTransaction.inc
  View file @8b7301d
@@ -33,6 +33,9 @@ require_once(KT_LIB_DIR . "/documentmanagement/documentutil.inc.php"); @@ -33,6 +33,9 @@ require_once(KT_LIB_DIR . "/documentmanagement/documentutil.inc.php");
33 require_once(KT_LIB_DIR . '/users/User.inc'); 33 require_once(KT_LIB_DIR . '/users/User.inc');
34 require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransactionType.inc.php'); 34 require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransactionType.inc.php');
35 35
  36 +require_once(KT_LIB_DIR . '/foldermanagement/Folder.inc');
  37 +require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
  38 +
36 class DocumentTransaction { 39 class DocumentTransaction {
37 40
38 /** primary key of document transaction */ 41 /** primary key of document transaction */
@@ -45,6 +48,7 @@ class DocumentTransaction { @@ -45,6 +48,7 @@ class DocumentTransaction {
45 var $sFileName; 48 var $sFileName;
46 var $sComment; 49 var $sComment;
47 var $sTransactionNS; 50 var $sTransactionNS;
  51 + var $bAdminMode = 0;
48 52
49 /** 53 /**
50 * Constructor 54 * Constructor
@@ -82,6 +86,18 @@ class DocumentTransaction { @@ -82,6 +86,18 @@ class DocumentTransaction {
82 } 86 }
83 $this->dDateTime = getCurrentDateTime(); 87 $this->dDateTime = getCurrentDateTime();
84 $this->sIP = KTUtil::arrayGet($_SERVER, "REMOTE_ADDR", '0.0.0.0'); 88 $this->sIP = KTUtil::arrayGet($_SERVER, "REMOTE_ADDR", '0.0.0.0');
  89 +
  90 + $oFolder = Folder::get($oDocument->getFolderID());
  91 + // head off the certain breakage down the line.
  92 + if (PEAR::isError($oFolder) || ($oFolder === false)) {
  93 + $this->bAdminMode = 0;
  94 + } else {
  95 + if (KTBrowseUtil::inAdminMode($oUser, $oFolder)) {
  96 + $this->bAdminMode = 1;
  97 + } else {
  98 + $this->bAdminMode = 0;
  99 + }
  100 + }
85 } 101 }
86 102
87 function getVersion() { return $this->sVersion; } 103 function getVersion() { return $this->sVersion; }
@@ -121,6 +137,7 @@ class DocumentTransaction { @@ -121,6 +137,7 @@ class DocumentTransaction {
121 'comment' => $this->sComment, 137 'comment' => $this->sComment,
122 'transaction_namespace' => $this->sTransactionNS, 138 'transaction_namespace' => $this->sTransactionNS,
123 'session_id' => $this->iSessionId, 139 'session_id' => $this->iSessionId,
  140 + 'admin_mode' => $this->bAdminMode,
124 ); 141 );
125 $id =& DBUtil::autoInsert($this->_table(), $aFieldValues); 142 $id =& DBUtil::autoInsert($this->_table(), $aFieldValues);
126 143
@@ -177,6 +194,7 @@ class DocumentTransaction { @@ -177,6 +194,7 @@ class DocumentTransaction {
177 $oDocumentTransaction->dDateTime = $sql->f("datetime"); 194 $oDocumentTransaction->dDateTime = $sql->f("datetime");
178 $oDocumentTransaction->sIP = $sql->f("ip"); 195 $oDocumentTransaction->sIP = $sql->f("ip");
179 $oDocumentTransaction->sFileName = $sql->f("filename"); 196 $oDocumentTransaction->sFileName = $sql->f("filename");
  197 + $oDocumentTransaction->bAdminMode = $sql->f("admin_mode");
180 return $oDocumentTransaction; 198 return $oDocumentTransaction;
181 } 199 }
182 $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iDocumentTransactionID . " table = document_transactions"; 200 $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iDocumentTransactionID . " table = document_transactions";
lib/foldermanagement/foldertransaction.inc.php
  View file @8b7301d
@@ -38,6 +38,7 @@ class KTFolderTransaction extends KTEntity { @@ -38,6 +38,7 @@ class KTFolderTransaction extends KTEntity {
38 'sComment' => 'comment', 38 'sComment' => 'comment',
39 'sTransactionNS' => 'transaction_namespace', 39 'sTransactionNS' => 'transaction_namespace',
40 'iSessionId' => 'session_id', 40 'iSessionId' => 'session_id',
  41 + 'bAdminMode' => 'admin_mode',
41 ); 42 );
42 43
43 var $_bUsePearError = true; 44 var $_bUsePearError = true;
@@ -53,6 +54,17 @@ class KTFolderTransaction extends KTEntity { @@ -53,6 +54,17 @@ class KTFolderTransaction extends KTEntity {
53 if (empty($this->iSessionId)) { 54 if (empty($this->iSessionId)) {
54 $this->iSessionId = $_SESSION['sessionID']; 55 $this->iSessionId = $_SESSION['sessionID'];
55 } 56 }
  57 + $oFolder = Folder::get($this->iFolderId);
  58 + // head off the certain breakage down the line.
  59 + if (PEAR::isError($oFolder) || ($oFolder === false)) {
  60 + $this->bAdminMode = 0;
  61 + } else {
  62 + if (KTBrowseUtil::inAdminMode($oUser, $oFolder)) {
  63 + $this->bAdminMode = 1;
  64 + } else {
  65 + $this->bAdminMode = 0;
  66 + }
  67 + }
56 return parent::_fieldValues(); 68 return parent::_fieldValues();
57 } 69 }
58 70
sql/mysql/upgrade/3.0.1.8/admin-mode-logging.sql 0 → 100644
  View file @8b7301d
  1 +ALTER TABLE `folder_transactions` ADD admin_mode TINYINT(1) NOT NULL default 0;
  2 +ALTER TABLE `document_transactions` ADD admin_mode TINYINT(1) NOT NULL default 0;
0 \ No newline at end of file 3 \ No newline at end of file