Peter M. Groen / knowledgetree

Commit 07a07ffe402d1f64c370199c080b82e9c0ce125a

Authored by nbm
1 parent 04129d89

Use KTBrowseUtil::getBrowseBaseUrl for browse URLs. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4520 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 9 additions and 8 deletions
view.php
  View file @07a07ff
@@ -20,6 +20,7 @@ require_once(KT_LIB_DIR . "/widgets/portlet.inc.php"); @@ -20,6 +20,7 @@ require_once(KT_LIB_DIR . "/widgets/portlet.inc.php");
20 require_once(KT_LIB_DIR . "/widgets/fieldsetDisplay.inc.php"); 20 require_once(KT_LIB_DIR . "/widgets/fieldsetDisplay.inc.php");
21 require_once(KT_LIB_DIR . "/widgets/FieldsetDisplayRegistry.inc.php"); 21 require_once(KT_LIB_DIR . "/widgets/FieldsetDisplayRegistry.inc.php");
22 require_once(KT_LIB_DIR . "/actions/documentaction.inc.php"); 22 require_once(KT_LIB_DIR . "/actions/documentaction.inc.php");
  23 +require_once(KT_LIB_DIR . "/browse/browseutil.inc.php");
23 24
24 25
25 class ViewDocumentDispatcher extends KTStandardDispatcher { 26 class ViewDocumentDispatcher extends KTStandardDispatcher {
@@ -52,7 +53,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -52,7 +53,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
52 $document_data = array(); 53 $document_data = array();
53 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 54 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
54 if ($document_id === null) { 55 if ($document_id === null) {
55 - $this->oPage->addError('No document was requested. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 56 + $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
56 return $this->do_error(); 57 return $this->do_error();
57 } 58 }
58 $document_data["document_id"] = $document_id; 59 $document_data["document_id"] = $document_id;
@@ -60,7 +61,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -60,7 +61,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
60 // try get the document. 61 // try get the document.
61 $oDocument =& Document::get($document_id); 62 $oDocument =& Document::get($document_id);
62 if (PEAR::isError($oDocument)) { 63 if (PEAR::isError($oDocument)) {
63 - $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 64 + $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
64 return $this->do_error(); 65 return $this->do_error();
65 } 66 }
66 if (!Permission::userHasDocumentReadPermission($oDocument)) { 67 if (!Permission::userHasDocumentReadPermission($oDocument)) {
@@ -138,7 +139,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -138,7 +139,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
138 $document_data = array(); 139 $document_data = array();
139 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 140 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
140 if ($document_id === null) { 141 if ($document_id === null) {
141 - $this->oPage->addError('No document was requested. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 142 + $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
142 return $this->do_error(); 143 return $this->do_error();
143 } 144 }
144 $document_data["document_id"] = $document_id; 145 $document_data["document_id"] = $document_id;
@@ -146,7 +147,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -146,7 +147,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
146 // try get the document. 147 // try get the document.
147 $oDocument =& Document::get($document_id); 148 $oDocument =& Document::get($document_id);
148 if (PEAR::isError($oDocument)) { 149 if (PEAR::isError($oDocument)) {
149 - $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 150 + $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
150 return $this->do_error(); 151 return $this->do_error();
151 } 152 }
152 // fixme check perms 153 // fixme check perms
@@ -194,7 +195,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -194,7 +195,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
194 $document_data = array(); 195 $document_data = array();
195 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 196 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
196 if ($document_id === null) { 197 if ($document_id === null) {
197 - $this->oPage->addError('No document was requested. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 198 + $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
198 return $this->do_error(); 199 return $this->do_error();
199 } 200 }
200 $document_data["document_id"] = $document_id; 201 $document_data["document_id"] = $document_id;
@@ -202,7 +203,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -202,7 +203,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
202 // try get the document. 203 // try get the document.
203 $oDocument =& Document::get($document_id); 204 $oDocument =& Document::get($document_id);
204 if (PEAR::isError($oDocument)) { 205 if (PEAR::isError($oDocument)) {
205 - $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 206 + $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
206 return $this->do_error(); 207 return $this->do_error();
207 } 208 }
208 // fixme check perms 209 // fixme check perms
@@ -242,7 +243,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -242,7 +243,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
242 $document_data = array(); 243 $document_data = array();
243 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 244 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
244 if ($document_id === null) { 245 if ($document_id === null) {
245 - $this->oPage->addError('No document was requested. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 246 + $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
246 return $this->do_error(); 247 return $this->do_error();
247 } 248 }
248 $document_data["document_id"] = $document_id; 249 $document_data["document_id"] = $document_id;
@@ -250,7 +251,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -250,7 +251,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
250 // try get the document. 251 // try get the document.
251 $oDocument =& Document::get($document_id); 252 $oDocument =& Document::get($document_id);
252 if (PEAR::isError($oDocument)) { 253 if (PEAR::isError($oDocument)) {
253 - $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . $GLOBALS['KTRootUrl'] . '/browse.php">browse</a> for one.'); 254 + $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
254 return $this->do_error(); 255 return $this->do_error();
255 } 256 }
256 if (!Permission::userHasDocumentReadPermission($oDocument)) { 257 if (!Permission::userHasDocumentReadPermission($oDocument)) {