Peter M. Groen / knowledgetree

Commit 334f54279518198b234676d9a9cf01a80573c2b6

Authored by michaeljoseph
1 parent 3e506dba

Changed to standard usage of controller link helper function. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2901 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 7 additions and 7 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
  View file @334f542
@@ -30,7 +30,7 @@ function getPage($iFolderID, $iDocumentTypeID) { @@ -30,7 +30,7 @@ function getPage($iFolderID, $iDocumentTypeID) {
30 $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); 30 $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
31 $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); 31 $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
32 $sToRender = renderHeading("Add Folder Document Type"); 32 $sToRender = renderHeading("Add Folder Document Type");
33 - $sToRender .= renderFolderPath($iFolderID, "/control.php?action=browse"); 33 + $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("browse", "", false));
34 $sToRender .= "<table border=\"0\">\n"; 34 $sToRender .= "<table border=\"0\">\n";
35 $sToRender .= "<tr>\n"; 35 $sToRender .= "<tr>\n";
36 $sToRender .= "<td bgcolor=\"$sTDBGColour\">Document type</td>\n"; 36 $sToRender .= "<td bgcolor=\"$sTDBGColour\">Document type</td>\n";
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
  View file @334f542
@@ -29,13 +29,13 @@ function renderBrowseAddPage($iFolderID) { @@ -29,13 +29,13 @@ function renderBrowseAddPage($iFolderID) {
29 global $default; 29 global $default;
30 $sToRender = "<table border=\"0\" width=\"100%\">\n"; 30 $sToRender = "<table border=\"0\" width=\"100%\">\n";
31 $sToRender .= "<tr>\n"; 31 $sToRender .= "<tr>\n";
32 - $sToRender .= "\t<td>" . renderFolderPath($iFolderID, "$default->uiUrl/foldermanagement/addFolderBL.php") . "</td>\n"; 32 + $sToRender .= "\t<td>" . renderFolderPath($iFolderID, generateControllerUrl("addFolder", "", false)) . "</td>\n";
33 $sToRender .= "</tr>\n"; 33 $sToRender .= "</tr>\n";
34 $sToRender .= "</table>\n"; 34 $sToRender .= "</table>\n";
35 $sToRender .= "<table border=\"0\">\n"; 35 $sToRender .= "<table border=\"0\">\n";
36 $sToRender .= "<tr>\n"; 36 $sToRender .= "<tr>\n";
37 $sToRender .= "<td valign=\"top\" width=\"300\">\n"; 37 $sToRender .= "<td valign=\"top\" width=\"300\">\n";
38 - $sToRender .= wrapInTable(renderFolderList($iFolderID, "/control.php?action=addFolder")); 38 + $sToRender .= wrapInTable(renderFolderList($iFolderID, generateControllerUrl("addFolder", "", false)));
39 $sToRender .= "</td>\n"; 39 $sToRender .= "</td>\n";
40 $sToRender .= "<td valign=\"top\">\n"; 40 $sToRender .= "<td valign=\"top\">\n";
41 $sToRender .= getRightSide($iFolderID); 41 $sToRender .= getRightSide($iFolderID);
@@ -86,12 +86,12 @@ function renderBrowsePage($fFolderID) { @@ -86,12 +86,12 @@ function renderBrowsePage($fFolderID) {
86 global $default; 86 global $default;
87 $sToRender = "<table border=\"0\">\n"; 87 $sToRender = "<table border=\"0\">\n";
88 $sToRender .= "<tr>\n"; 88 $sToRender .= "<tr>\n";
89 - $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->uiUrl/foldermanagement/addFolderBL.php") . "</td>\n"; 89 + $sToRender .= "\t<td>" . renderFolderPath($fFolderID, generateControllerUrl("addFolder", "", false)) . "</td>\n";
90 $sToRender .= "</tr>\n"; 90 $sToRender .= "</tr>\n";
91 $sToRender .= "</table>\n"; 91 $sToRender .= "</table>\n";
92 $sToRender .= "<table border=\"0\">\n"; 92 $sToRender .= "<table border=\"0\">\n";
93 $sToRender .= "<tr>\n"; 93 $sToRender .= "<tr>\n";
94 - $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n"; 94 + $sToRender .= "\t<td>" . renderFolderList($fFolderID, generateControllerUrl("addFolder", "", false)) . "<td>\n";
95 $sToRender .= "</tr>\n"; 95 $sToRender .= "</tr>\n";
96 $sToRender .= "</table><br>\n"; 96 $sToRender .= "</table><br>\n";
97 97
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
  View file @334f542
@@ -29,7 +29,7 @@ function getPage($iFolderID) { @@ -29,7 +29,7 @@ function getPage($iFolderID) {
29 global $default; 29 global $default;
30 $sToRender = "<table border=\"0\" width=\"100%\">\n"; 30 $sToRender = "<table border=\"0\" width=\"100%\">\n";
31 $sToRender .= "<tr>\n"; 31 $sToRender .= "<tr>\n";
32 - $sToRender .= "\t<td>" . renderFolderPath($iFolderID, "/control.php?action=editFolder&fFolderID=$iFolderID&fShowSection=documentTypes", false) . "</td>\n"; 32 + $sToRender .= "\t<td>" . renderFolderPath($iFolderID, generateControllerUrl("editFolder", "fFolderID=$iFolderID&fShowSection=documentTypes", false), false) . "</td>\n";
33 $sToRender .= "</tr>\n"; 33 $sToRender .= "</tr>\n";
34 $sToRender .= "</table>\n"; 34 $sToRender .= "</table>\n";
35 $sToRender .= "<table border=\"0\">\n"; 35 $sToRender .= "<table border=\"0\">\n";
presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
  View file @334f542
@@ -37,7 +37,7 @@ function getFolderData($iFolderID, $sStatusMessage = &quot;&quot;) { @@ -37,7 +37,7 @@ function getFolderData($iFolderID, $sStatusMessage = &quot;&quot;) {
37 $sql->query($sQuery); 37 $sql->query($sQuery);
38 38
39 $sToRender .= renderHeading("Modify Folder Properties"); 39 $sToRender .= renderHeading("Modify Folder Properties");
40 - $sToRender .= renderFolderPath($iFolderID, "/control.php?action=browse"); 40 + $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("browse", "", false));
41 $sToRender .= "<table>"; 41 $sToRender .= "<table>";
42 $sToRender .= "<tr><td>"; 42 $sToRender .= "<tr><td>";
43 $sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n"; 43 $sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n";