diff --git a/lib/web/WebSite.inc b/lib/web/WebSite.inc
index e358bb5..a8223d7 100644
--- a/lib/web/WebSite.inc
+++ b/lib/web/WebSite.inc
@@ -239,43 +239,8 @@ class WebSite {
$_SESSION["errorMessage"] = $lang_err_database;
return false;
}
-
-
- /*
- * static function
- *
- * sets the id of the groupunit using their groupid
- *
- * @param String
- * The unit_ID
- *
- */
-
- function setWebSiteID($iWebMasterID,$sWebSiteName) {
- global $default;
- $sql = $default->db;
- $result = $sql->query("SELECT id FROM $default->owl_web_sites_table WHERE web_master_id = $iWebMasterID and web_site_name = '" . $sWebSiteName . "' ");
- if ($result) {
- if ($sql->next_record()) {
- $id = $sql->f("id");
-
- } else {
- $_SESSION["errorMessage"] = $lang_err_database;
- return false;
- }
-
- } else {
- $_SESSION["errorMessage"] = $lang_err_database;
- return false;
- }
-
- $this->iId = $id;
-
- }
}
-
-
/**
* Static function
*
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
index 1e4fa88..4f568ed 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteBL.php
@@ -24,38 +24,32 @@ if (checkSession()) {
$oPatternCustom = & new PatternCustom();
- if(isset($fUserID)) {
- // post back on User select from manual edit page
- $oPatternCustom->setHtml(getSelectWebSitePage($fUserID,$fWebSiteID));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fSelected=1");
- } else {
- // if nothing happens...just reload edit page
- $oPatternCustom->setHtml(getSelectWebMasterPage(null));
- $main->setFormAction($_SERVER["PHP_SELF"]);
- }
-
- if(isset($fSelected)) {
- $oPatternCustom->setHtml(getEditWebSitePage($fUserID,$fWebSiteID));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
- }
-
- if(isset($fForStore)) {
- if($fWebSiteName != "") {
- $oWebSite = new WebSite($fWebSiteName,$fWebSiteURL, $fUserID);
- $oWebSite->setWebSiteID($fUserID,$fOldWebSiteName);
-
- if($oWebSite->update()) {
- $oPatternCustom->setHtml(getSuccessPage());
- } else {
- $oPatternCustom->setHtml(getFailPage());
- }
- } else {
- $oPatternCustom->setHtml(getTextPage());
- }
- }
+ if ($fWebSiteID) {
+ $oWebSite = WebSite::get($fWebSiteID);
+ if ($oWebSite) {
+ if ($fForStore) {
+ $oWebSite->setWebSiteName($fWebSiteName);
+ $oWebSite->setWebMasterID($fWebMasterID);
+ $oWebSite->setWebSiteURL($fWebSiteURL);
+ if ($oWebSite->update()) {
+ $oPatternCustom->setHtml(getSuccessPage());
+ } else {
+ $oPatternCustom->setHtml(getFailPage());
+ }
+ } else {
+ $oPatternCustom->setHtml(getEditWebSitePage($oWebSite));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+ }
+ } else {
+ $oPatternCustom->setHtml(statusPage("Edit Website", "", "The selected website no longer exists in the database.", "listWebsites"));
+ }
+ } else {
+ $oPatternCustom->setHtml(statusPage("Edit Website", "", "No website has been selected for editing.", "listWebsites"));
+ }
+
//render the page
$main->setCentralPayload($oPatternCustom);
$main->setHasRequiredFields(true);
$main->render();
}
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
index fd31597..3f4d855 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc
@@ -1,89 +1,24 @@
\n";
- $sToRender .= "
Please Select a WebMaster \n";
- $sToRender .= "\n";
- $sToRender .= "User: " . getUserDisplay($oUser) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
-
- return $sToRender;
-}
-
-// if its the manual edit page..then display normally
-function getSelectWebSitePage($iUserID, $iWebSiteID) {
- global $default;
- $oUser = null;
- $oWebSite = null;
-
- if (isset($iUserID)) {
- $oUser = User::get($iUserID);
- }
-
- if (isset($iWebSiteID)) {
- $oWebSite = WebSite::get($iWebSiteID);
- }
-
- $sToRender .= renderHeading("Edit Website");
- $sToRender .= "\n";
- $sToRender .= "Please Select the WebSite you wish to Edit: \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "User: " . getUserDisplay($oUser) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "WebSite: " . getWebSiteDisplay($oWebSite,$iUserID) . " \n";
- $sToRender .= " \n";
- $sToRender .= "" . getCancelButton($oUser);
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
- return $sToRender;
-}
-
-// if its the manual edit page..then display normally
-function getEditWebSitePage($iUserID, $iWebSiteID) {
- global $default;
- $oUser = null;
- $oWebSite = null;
-
- if (isset($iUserID)) {
- $oUser = User::get($iUserID);
- }
-
- if (isset($iWebSiteID)) {
- $oWebSite = WebSite::get($iWebSiteID);
- }
+
+ $oUser = User::get($oWebSite->getWebMasterID());
$sToRender .= renderHeading("Edit Website");
$sToRender .= "\n";
- $sToRender .= "Enter WebSite Properties \n";
+ $sToRender .= "Update WebSite Properties \n";
$sToRender .= " \n";
$sToRender .= " \n";
$sToRender .= "\n";
- $sToRender .= "Webmaster: " . getUserChangedDisplay($oUser) . " \n";
+ $sToRender .= "Webmaster: " . getUserDisplay($oUser) . " \n";
$sToRender .= " \n";
$sToRender .= "\n";
- $sToRender .= "WebSite Name: " . getWebSiteDisplay($oWebSite,$iUserID) . " \n";
+ $sToRender .= "WebSite Name: " . getWebSiteName($oWebSite) . " \n";
$sToRender .= " \n";
$sToRender .= "WebSite URL: " . getWebSiteUrl($oWebSite,$iUserID) . " \n";
$sToRender .= " \n";
+ $sToRender .= " getID() . "\">\n";
$sToRender .= " \n";
$sToRender .= "\n";
$sToRender .= " " . getUpdateButton($oUser);
@@ -105,154 +40,47 @@ function getEditWebSitePage($iUserID, $iWebSiteID) {
return $sToRender;
}
-
-
-// if edition is successful print otu success page
-function getSuccessPage() {
- global $default;
-
- $sToRender .= renderHeading("Edit Website");
- $sToRender .= "\n";
- $sToRender .= "Success! \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
-}
-
-// if edition is successful print otu success page
-function getFailPage() {
- global $default;
-
- $sToRender .= renderHeading("Edit Website");
- $sToRender .= "\n";
- $sToRender .= "FAILURE! \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
-}
-
-
-// if edition is successful print otu success page
-function getTextPage() {
- global $default;
-
- $sToRender .= renderHeading("Edit Website");
- $sToRender .= "\n";
- $sToRender .= "FAILURE! \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
-}
-
-// gets the updatebutton when a User is selected
-function getUpdateButton($oUser) {
- global $default;
- if (isset($oUser)) {
- return " graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/> \n";
- }
-}
-
// gets the cancel button when a User is selected
function getCancelButton($oUser) {
global $default;
- if (isset($oUser)) {
- return "rootUrl/control.php?action=listWebsites\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
- }
+ return "rootUrl/control.php?action=listWebsites\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
}
// show the list box when no User selected
// then shows a text box with the User's name
function getUserDisplay($oUser) {
global $default;
- if (!isset($oUser)) {
-
- //$sWhereClause = " ST.has_lookup = 1" ;
- $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
-
- $sFromClause = "," . $default->owl_web_sites_table ." aS WB ";
- $sWhereClause = "ST.id = WB.web_master_id" ;
- $oPatternListBox->setFromClause($sFromClause);
- $oPatternListBox->setWhereClause($sWhereClause);
- //$oPatternListBox->setIncludeDefaultValue(true);
- //$oPatternListBox->setWhereClause($sWhereClause);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return " iId . "\">\n" .
- $oUser->getUserName();
+ $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fWebMasterID");
+ if ($oUser) {
+ $oPatternListBox->setSelectedValue($oUser->getID());
}
+ return $oPatternListBox->render();
}
-// show the list box when no User selected
-// then shows a text box with the User's name
-function getUserChangedDisplay($oUser) {
- global $default;
-
- $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
- $oPatternListBox->setSelectedValue($oUser->getID());
- $oPatternListBox->setIncludeDefaultValue(false) ;
- return $oPatternListBox->render();
+function getWebSiteName($oWebSite) {
+ return " getWebSiteName() . "\">\n";
}
// show the list box when no User selected
// then shows a text box with the User's name
-function getWebSiteDisplay($oWebSite,$iUserID) {
- global $default;
- if (!isset($oWebSite)) {
- $sWhereClause = " ST.web_master_id = " . $iUserID;
- $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID");
- $oPatternListBox->setWhereClause($sWhereClause);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return " iId . "\">\n" .
- " getWebSiteName() . "\">\n" .
- " getWebSiteName() . "\">\n" ;
- }
+function getWebSiteUrl($oWebSite) {
+ return " getWebSiteURL() . "\">\n";
}
+function getSuccessPage() {
+ return statusPage("Edit Website", "Website update success!", "The website has been updated.", "listWebsites");
+}
+function getFailPage() {
+ return statusPage("Edit Website", "Website update failure!", "There was an error updating the website, please try again later.", "listWebsites");
+ return $sToRender;
+}
-// show the list box when no User selected
-// then shows a text box with the User's name
-function getWebSiteUrl($oWebSite,$iUserID) {
+function getUpdateButton($oUser) {
global $default;
- if (!isset($oWebSite)) {
- return "";
- } else {
- return " getWebSiteURL() . "\">\n" .
- " getWebSiteURL() . "\">\n" ;
+ if (isset($oUser)) {
+ return " graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/> \n";
}
}
?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
index e10cc71..3fbc164 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
@@ -8,56 +8,45 @@
*
*/
- require_once("../../../../../config/dmsDefaults.php");
-
-if (checkSession()) {
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
- require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
- require_once("$default->fileSystemRoot/lib/users/User.inc");
- require_once("$default->fileSystemRoot/lib/security/permission.inc");
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
- require_once("$default->fileSystemRoot/presentation/Html.inc");
-
-
- $oPatternCustom = & new PatternCustom();
+require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+require_once("$default->fileSystemRoot/lib/users/User.inc");
+require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
if(checkSession()) {
- global $default;
-
- $oPatternCustom->addHtml(renderHeading("Website Management")); // Create the Heading
-
- $main->setFormAction($_SERVER['PHP_SELF']);
-
-
- $sQuery = "SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " .
- "'Edit', 'Delete' " .
- "FROM " . $default->owl_web_sites_table . " " .
- "ORDER BY web_site_name";
-
- $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
- $aColumnNames = array("Link Name","URL", "Edit", "Delete");
- $aColumnTypes = array(1,1,3,3);
- $aDBColumnArray = array("WebmasterID", "WebsiteID");
- $aQueryStringVariableNames = array("fUserID","fWebSiteID");
-
- $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editWebSite&fSelected=1",
- 3=> "$default->rootUrl/control.php?action=removeWebSite");
-
-
- $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
- $oSearchResults->setDisplayColumnHeadings(true);
- $htmlTables = $oSearchResults->render() ;
+ $oPatternCustom = & new PatternCustom();
- $oPatternCustom->addHtml($htmlTables);
-
- } // end of if checksession
+ $sQuery = "SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " .
+ "'Edit', 'Delete' " .
+ "FROM " . $default->owl_web_sites_table . " " .
+ "ORDER BY web_site_name";
+ $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
+ $aColumnNames = array("Link Name","URL", "Edit", "Delete");
+ $aColumnTypes = array(1,1,3,3);
+ $aDBColumnArray = array("WebsiteID");
+ $aQueryStringVariableNames = array("fWebSiteID");
+
+ $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editWebSite",
+ 3=> "$default->rootUrl/control.php?action=removeWebSite");
+
+
+ $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
+ $oSearchResults->setDisplayColumnHeadings(true);
+ $htmlTables = $oSearchResults->render() ;
+
+ $oPatternCustom->addHtml(renderHeading("Website Management"));
+ $oPatternCustom->addHtml($htmlTables);
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
$main->setCentralPayload($oPatternCustom);
+ $main->setFormAction($_SERVER['PHP_SELF']);
$main->render();
}
-?>
+?>
\ No newline at end of file