Peter M. Groen / knowledgetree

Commit a3974c888680bca582534d5fb876c9f5221d47b9

Authored by michael
1 parent 470b4673

(#2824) overhauled website editing 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2473 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 85 additions and 309 deletions
lib/web/WebSite.inc
  View file @a3974c8
... ... @@ -239,43 +239,8 @@ class WebSite {
239 239 $_SESSION["errorMessage"] = $lang_err_database;
240 240 return false;
241 241 }
242   -
243   -
244   - /*
245   - * static function
246   - *
247   - * sets the id of the groupunit using their groupid
248   - *
249   - * @param String
250   - * The unit_ID
251   - *
252   - */
253   -
254   - function setWebSiteID($iWebMasterID,$sWebSiteName) {
255   - global $default;
256   - $sql = $default->db;
257   - $result = $sql->query("SELECT id FROM $default->owl_web_sites_table WHERE web_master_id = $iWebMasterID and web_site_name = '" . $sWebSiteName . "' ");
258   - if ($result) {
259   - if ($sql->next_record()) {
260   - $id = $sql->f("id");
261   -
262   - } else {
263   - $_SESSION["errorMessage"] = $lang_err_database;
264   - return false;
265   - }
266   -
267   - } else {
268   - $_SESSION["errorMessage"] = $lang_err_database;
269   - return false;
270   - }
271   -
272   - $this->iId = $id;
273   -
274   - }
275 242 }
276 243  
277   -
278   -
279 244 /**
280 245 * Static function
281 246 *
... ...
presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
  View file @a3974c8
... ... @@ -24,38 +24,32 @@ if (checkSession()) {
24 24  
25 25 $oPatternCustom = & new PatternCustom();
26 26  
27   - if(isset($fUserID)) {
28   - // post back on User select from manual edit page
29   - $oPatternCustom->setHtml(getSelectWebSitePage($fUserID,$fWebSiteID));
30   - $main->setFormAction($_SERVER["PHP_SELF"] . "?fSelected=1");
31   - } else {
32   - // if nothing happens...just reload edit page
33   - $oPatternCustom->setHtml(getSelectWebMasterPage(null));
34   - $main->setFormAction($_SERVER["PHP_SELF"]);
35   - }
36   -
37   - if(isset($fSelected)) {
38   - $oPatternCustom->setHtml(getEditWebSitePage($fUserID,$fWebSiteID));
39   - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
40   - }
41   -
42   - if(isset($fForStore)) {
43   - if($fWebSiteName != "") {
44   - $oWebSite = new WebSite($fWebSiteName,$fWebSiteURL, $fUserID);
45   - $oWebSite->setWebSiteID($fUserID,$fOldWebSiteName);
46   -
47   - if($oWebSite->update()) {
48   - $oPatternCustom->setHtml(getSuccessPage());
49   - } else {
50   - $oPatternCustom->setHtml(getFailPage());
51   - }
52   - } else {
53   - $oPatternCustom->setHtml(getTextPage());
54   - }
55   - }
  27 + if ($fWebSiteID) {
  28 + $oWebSite = WebSite::get($fWebSiteID);
  29 + if ($oWebSite) {
  30 + if ($fForStore) {
  31 + $oWebSite->setWebSiteName($fWebSiteName);
  32 + $oWebSite->setWebMasterID($fWebMasterID);
  33 + $oWebSite->setWebSiteURL($fWebSiteURL);
  34 + if ($oWebSite->update()) {
  35 + $oPatternCustom->setHtml(getSuccessPage());
  36 + } else {
  37 + $oPatternCustom->setHtml(getFailPage());
  38 + }
  39 + } else {
  40 + $oPatternCustom->setHtml(getEditWebSitePage($oWebSite));
  41 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
  42 + }
  43 + } else {
  44 + $oPatternCustom->setHtml(statusPage("Edit Website", "", "The selected website no longer exists in the database.", "listWebsites"));
  45 + }
  46 + } else {
  47 + $oPatternCustom->setHtml(statusPage("Edit Website", "", "No website has been selected for editing.", "listWebsites"));
  48 + }
  49 +
56 50 //render the page
57 51 $main->setCentralPayload($oPatternCustom);
58 52 $main->setHasRequiredFields(true);
59 53 $main->render();
60 54 }
61 55 -?>
  56 +?>
62 57 \ No newline at end of file
... ...
presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
  View file @a3974c8
1 1 <?php
2 2  
3   -// if its the manual edit page..then display normally
4   -function getSelectWebMasterPage($iUserID) {
  3 +function getEditWebSitePage($oWebSite) {
5 4 global $default;
6   - $oUser = null;
7   - if (isset($iUserID)) {
8   - $oUser = User::get($iUserID);
9   - }
10   -
11   - $sToRender .= renderHeading("Edit Website");
12   - $sToRender .= "<table>\n";
13   - $sToRender .= "<tr><td>Please Select a WebMaster</td></tr>\n";
14   - $sToRender .= "<tr>\n";
15   - $sToRender .= "<td>User: </td><td>" . getUserDisplay($oUser) . "</td>\n";
16   - $sToRender .= "</tr>\n";
17   - $sToRender .= "<tr>\n";
18   - $sToRender .= "</tr>\n";
19   - $sToRender .= "<tr>\n";
20   - $sToRender .= "</tr>\n";
21   - $sToRender .= "</table>\n";
22   -
23   - return $sToRender;
24   -}
25   -
26   -// if its the manual edit page..then display normally
27   -function getSelectWebSitePage($iUserID, $iWebSiteID) {
28   - global $default;
29   - $oUser = null;
30   - $oWebSite = null;
31   -
32   - if (isset($iUserID)) {
33   - $oUser = User::get($iUserID);
34   - }
35   -
36   - if (isset($iWebSiteID)) {
37   - $oWebSite = WebSite::get($iWebSiteID);
38   - }
39   -
40   - $sToRender .= renderHeading("Edit Website");
41   - $sToRender .= "<table>\n";
42   - $sToRender .= "<tr><td>Please Select the WebSite you wish to Edit:</td></tr>\n";
43   - $sToRender .= "<tr>\n";
44   - $sToRender .= "</tr>\n";
45   - $sToRender .= "<tr>\n";
46   - $sToRender .= "</tr>\n";
47   - $sToRender .= "<tr>\n";
48   - $sToRender .= "<td>User: " . getUserDisplay($oUser) . "</td>\n";
49   - $sToRender .= "</tr>\n";
50   - $sToRender .= "<tr>\n";
51   - $sToRender .= "<td>WebSite: " . getWebSiteDisplay($oWebSite,$iUserID) . "</td>\n";
52   - $sToRender .= "</tr>\n";
53   - $sToRender .= "<tr>" . getCancelButton($oUser);
54   - $sToRender .= "</tr>\n";
55   - $sToRender .= "</table>\n";
56   -
57   - return $sToRender;
58   -}
59   -
60   -// if its the manual edit page..then display normally
61   -function getEditWebSitePage($iUserID, $iWebSiteID) {
62   - global $default;
63   - $oUser = null;
64   - $oWebSite = null;
65   -
66   - if (isset($iUserID)) {
67   - $oUser = User::get($iUserID);
68   - }
69   -
70   - if (isset($iWebSiteID)) {
71   - $oWebSite = WebSite::get($iWebSiteID);
72   - }
  5 +
  6 + $oUser = User::get($oWebSite->getWebMasterID());
73 7  
74 8 $sToRender .= renderHeading("Edit Website");
75 9 $sToRender .= "<table>\n";
76   - $sToRender .= "<tr><td>Enter WebSite Properties</td></tr>\n";
  10 + $sToRender .= "<tr><td>Update WebSite Properties</td></tr>\n";
77 11 $sToRender .= "<tr></tr>\n";
78 12 $sToRender .= "<tr></tr>\n";
79 13 $sToRender .= "<tr>\n";
80   - $sToRender .= "<td>Webmaster:</td><td>" . getUserChangedDisplay($oUser) . "</td>\n";
  14 + $sToRender .= "<td>Webmaster:</td><td>" . getUserDisplay($oUser) . "</td>\n";
81 15 $sToRender .= "</tr>\n";
82 16 $sToRender .= "<tr>\n";
83   - $sToRender .= "<td>WebSite Name: </td><td>" . getWebSiteDisplay($oWebSite,$iUserID) . "</td>\n";
  17 + $sToRender .= "<td>WebSite Name: </td><td>" . getWebSiteName($oWebSite) . "</td>\n";
84 18 $sToRender .= "<tr>\n";
85 19 $sToRender .= "<td>WebSite URL: </td><td>" . getWebSiteUrl($oWebSite,$iUserID) . "</td>\n";
86 20 $sToRender .= "</tr>\n";
  21 + $sToRender .= "<input type=\"hidden\" name=\"fWebSiteID\" value=\"" . $oWebSite->getID() . "\">\n";
87 22 $sToRender .= "<tr></tr>\n";
88 23 $sToRender .= "<tr>\n";
89 24 $sToRender .= "<td></td>" . getUpdateButton($oUser);
... ... @@ -105,154 +40,47 @@ function getEditWebSitePage($iUserID, $iWebSiteID) {
105 40 return $sToRender;
106 41 }
107 42  
108   -
109   -
110   -// if edition is successful print otu success page
111   -function getSuccessPage() {
112   - global $default;
113   -
114   - $sToRender .= renderHeading("Edit Website");
115   - $sToRender .= "<table>\n";
116   - $sToRender .= "<b>Success!</b>\n";
117   - $sToRender .= "<table>\n";
118   - $sToRender .= "<br></br>\n";
119   - $sToRender .= "<tr></tr>\n";
120   - $sToRender .= "<tr><td>The WebSite was successfully edited</td></tr>\n";
121   - $sToRender .= "<tr></tr>\n";
122   - $sToRender .= "<tr></tr>\n";
123   - $sToRender .= "<tr>\n";
124   - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listWebsites\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
125   - $sToRender .= "</tr>\n";
126   - $sToRender .= "</table>\n";
127   -
128   -
129   - return $sToRender;
130   -}
131   -
132   -// if edition is successful print otu success page
133   -function getFailPage() {
134   - global $default;
135   -
136   - $sToRender .= renderHeading("Edit Website");
137   - $sToRender .= "<table>\n";
138   - $sToRender .= "<b>FAILURE!</b>\n";
139   - $sToRender .= "<table>\n";
140   - $sToRender .= "<br></br>\n";
141   - $sToRender .= "<tr></tr>\n";
142   - $sToRender .= "<tr><td>The WebSite was not updated</td></tr>\n";
143   - $sToRender .= "<tr></tr>\n";
144   - $sToRender .= "<tr></tr>\n";
145   - $sToRender .= "<tr>\n";
146   - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listWebsites\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
147   - $sToRender .= "</tr>\n";
148   - $sToRender .= "</table>\n";
149   -
150   -
151   - return $sToRender;
152   -}
153   -
154   -
155   -// if edition is successful print otu success page
156   -function getTextPage() {
157   - global $default;
158   -
159   - $sToRender .= renderHeading("Edit Website");
160   - $sToRender .= "<table>\n";
161   - $sToRender .= "<b>FAILURE!</b>\n";
162   - $sToRender .= "<table>\n";
163   - $sToRender .= "<br></br>\n";
164   - $sToRender .= "<tr></tr>\n";
165   - $sToRender .= "<tr><td>Please Enter a Value in the Text Box</td></tr>\n";
166   - $sToRender .= "<tr></tr>\n";
167   - $sToRender .= "<tr></tr>\n";
168   - $sToRender .= "<tr>\n";
169   - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listWebsites\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
170   - $sToRender .= "</tr>\n";
171   - $sToRender .= "</table>\n";
172   -
173   -
174   - return $sToRender;
175   -}
176   -
177   -// gets the updatebutton when a User is selected
178   -function getUpdateButton($oUser) {
179   - global $default;
180   - if (isset($oUser)) {
181   - return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/></td>\n";
182   - }
183   -}
184   -
185 43 // gets the cancel button when a User is selected
186 44 function getCancelButton($oUser) {
187 45 global $default;
188   - if (isset($oUser)) {
189   - return "<td align = right><a href=\"$default->rootUrl/control.php?action=listWebsites\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
190   - }
  46 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=listWebsites\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
191 47 }
192 48  
193 49 // show the list box when no User selected
194 50 // then shows a text box with the User's name
195 51 function getUserDisplay($oUser) {
196 52 global $default;
197   - if (!isset($oUser)) {
198   -
199   - //$sWhereClause = " ST.has_lookup = 1" ;
200   - $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
201   -
202   - $sFromClause = "," . $default->owl_web_sites_table ." aS WB ";
203   - $sWhereClause = "ST.id = WB.web_master_id" ;
204   - $oPatternListBox->setFromClause($sFromClause);
205   - $oPatternListBox->setWhereClause($sWhereClause);
206   - //$oPatternListBox->setIncludeDefaultValue(true);
207   - //$oPatternListBox->setWhereClause($sWhereClause);
208   - $oPatternListBox->setPostBackOnChange(true);
209   - return $oPatternListBox->render();
210   - } else {
211   - return "<input type=\"hidden\" name=\"fUserID\" value=\"" . $oUser->iId . "\">\n" .
212   - $oUser->getUserName();
  53 + $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fWebMasterID");
  54 + if ($oUser) {
  55 + $oPatternListBox->setSelectedValue($oUser->getID());
213 56 }
  57 + return $oPatternListBox->render();
214 58 }
215 59  
216   -// show the list box when no User selected
217   -// then shows a text box with the User's name
218   -function getUserChangedDisplay($oUser) {
219   - global $default;
220   -
221   - $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
222   - $oPatternListBox->setSelectedValue($oUser->getID());
223   - $oPatternListBox->setIncludeDefaultValue(false) ;
224 60  
225   - return $oPatternListBox->render();
  61 +function getWebSiteName($oWebSite) {
  62 + return "<input type=\"text\" name=\"fWebSiteName\" value=\"" . $oWebSite->getWebSiteName() . "\">\n";
226 63 }
227 64  
228 65 // show the list box when no User selected
229 66 // then shows a text box with the User's name
230   -function getWebSiteDisplay($oWebSite,$iUserID) {
231   - global $default;
232   - if (!isset($oWebSite)) {
233   - $sWhereClause = " ST.web_master_id = " . $iUserID;
234   - $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID");
235   - $oPatternListBox->setWhereClause($sWhereClause);
236   - $oPatternListBox->setPostBackOnChange(true);
237   - return $oPatternListBox->render();
238   - } else {
239   - return "<input type=\"hidden\" name=\"fWebSiteID\" value=\"" . $oWebSite->iId . "\">\n" .
240   - "<input type=\"text\" name=\"fWebSiteName\" value=\"" . $oWebSite->getWebSiteName() . "\">\n" .
241   - "<input type=\"hidden\" name=\"fOldWebSiteName\" value=\"" . $oWebSite->getWebSiteName() . "\">\n" ;
242   - }
  67 +function getWebSiteUrl($oWebSite) {
  68 + return "<input type=\"text\" name=\"fWebSiteURL\" value=\"" . $oWebSite->getWebSiteURL() . "\">\n";
243 69 }
244 70  
  71 +function getSuccessPage() {
  72 + return statusPage("Edit Website", "Website update success!", "The website has been updated.", "listWebsites");
  73 +}
245 74  
  75 +function getFailPage() {
  76 + return statusPage("Edit Website", "Website update failure!", "There was an error updating the website, please try again later.", "listWebsites");
  77 + return $sToRender;
  78 +}
246 79  
247   -// show the list box when no User selected
248   -// then shows a text box with the User's name
249   -function getWebSiteUrl($oWebSite,$iUserID) {
  80 +function getUpdateButton($oUser) {
250 81 global $default;
251   - if (!isset($oWebSite)) {
252   - return "";
253   - } else {
254   - return "<input type=\"text\" name=\"fWebSiteURL\" value=\"" . $oWebSite->getWebSiteURL() . "\">\n" .
255   - "<input type=\"hidden\" name=\"fOldWebSiteURL\" value=\"" . $oWebSite->getWebSiteURL() . "\">\n" ;
  82 + if (isset($oUser)) {
  83 + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/></td>\n";
256 84 }
257 85 }
258 86 ?>
259 87 \ No newline at end of file
... ...
presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
  View file @a3974c8
... ... @@ -8,56 +8,45 @@
8 8 *
9 9 */
10 10  
11   - require_once("../../../../../config/dmsDefaults.php");
12   -
13   -if (checkSession()) {
14   - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
15   - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
16   - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
17   - require_once("$default->fileSystemRoot/lib/users/User.inc");
18   - require_once("$default->fileSystemRoot/lib/security/permission.inc");
19   - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
20   - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
21   - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
22   - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
23   - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
24   - require_once("$default->fileSystemRoot/presentation/Html.inc");
25   -
26   -
27   - $oPatternCustom = & new PatternCustom();
  11 +require_once("../../../../../config/dmsDefaults.php");
  12 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
  13 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  14 +require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  15 +require_once("$default->fileSystemRoot/lib/users/User.inc");
  16 +require_once("$default->fileSystemRoot/lib/security/permission.inc");
  17 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
  18 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
  19 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
  20 +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
  21 +require_once("$default->fileSystemRoot/presentation/Html.inc");
28 22  
29 23 if(checkSession()) {
30   - global $default;
31   -
32   - $oPatternCustom->addHtml(renderHeading("Website Management")); // Create the Heading
33   -
34   - $main->setFormAction($_SERVER['PHP_SELF']);
35   -
36   -
37   - $sQuery = "SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " .
38   - "'Edit', 'Delete' " .
39   - "FROM " . $default->owl_web_sites_table . " " .
40   - "ORDER BY web_site_name";
41   -
42   - $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
43   - $aColumnNames = array("Link Name","URL", "Edit", "Delete");
44   - $aColumnTypes = array(1,1,3,3);
45   - $aDBColumnArray = array("WebmasterID", "WebsiteID");
46   - $aQueryStringVariableNames = array("fUserID","fWebSiteID");
47   -
48   - $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editWebSite&fSelected=1",
49   - 3=> "$default->rootUrl/control.php?action=removeWebSite");
50   -
51   -
52   - $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
53   - $oSearchResults->setDisplayColumnHeadings(true);
54   - $htmlTables = $oSearchResults->render() ;
  24 + $oPatternCustom = & new PatternCustom();
55 25  
56   - $oPatternCustom->addHtml($htmlTables);
57   -
58   - } // end of if checksession
  26 + $sQuery = "SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " .
  27 + "'Edit', 'Delete' " .
  28 + "FROM " . $default->owl_web_sites_table . " " .
  29 + "ORDER BY web_site_name";
59 30  
  31 + $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
  32 + $aColumnNames = array("Link Name","URL", "Edit", "Delete");
  33 + $aColumnTypes = array(1,1,3,3);
  34 + $aDBColumnArray = array("WebsiteID");
  35 + $aQueryStringVariableNames = array("fWebSiteID");
  36 +
  37 + $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editWebSite",
  38 + 3=> "$default->rootUrl/control.php?action=removeWebSite");
  39 +
  40 +
  41 + $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
  42 + $oSearchResults->setDisplayColumnHeadings(true);
  43 + $htmlTables = $oSearchResults->render() ;
  44 +
  45 + $oPatternCustom->addHtml(renderHeading("Website Management"));
  46 + $oPatternCustom->addHtml($htmlTables);
  47 + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
60 48 $main->setCentralPayload($oPatternCustom);
  49 + $main->setFormAction($_SERVER['PHP_SELF']);
61 50 $main->render();
62 51 }
63 52 -?>
  53 +?>
64 54 \ No newline at end of file
... ...