diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php index 74f5723..1a72c0c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php @@ -10,45 +10,44 @@ require_once("../../../../../config/dmsDefaults.php"); if (checkSession()) { - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("removeOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - // get main page - if (isset($fOrgID)) { - - $oPatternCustom->setHtml(getDeletePage($fOrgID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1"); - - // get delete page - } else { - $oPatternCustom->setHtml(getDeletePage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]); - } - - // if delete entry - if (isset($fForDelete)) { - $oOrg = Organisation::get($fOrgID); - $oOrg->setName($fOrgName); - - if ($oOrg->delete()) { - $oPatternCustom->setHtml(getDeleteSuccessPage()); - - } else { - $oPatternCustom->setHtml(getDeleteFailPage()); - } - } - - $main->setCentralPayload($oPatternCustom); - $main->render(); + require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); + require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); + require_once("removeOrgUI.inc"); + require_once("../adminUI.inc"); + require_once("$default->fileSystemRoot/lib/security/permission.inc"); + require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); + require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); + + $oPatternCustom = & new PatternCustom(); + + // get main page + if (isset($fOrgID)) { + $oPatternCustom->setHtml(getDeletePage($fOrgID)); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1"); + // get delete page + } + else { + $oPatternCustom->setHtml(getDeletePage(null)); + $main->setFormAction($_SERVER["PHP_SELF"]); + } + + // if delete entry + if (isset($fForDelete)) { + $oOrg = Organisation::get($fOrgID); + $oOrg->setName($fOrgName); + + if ($oOrg->delete()) { + $oPatternCustom->setHtml(getDeleteSuccessPage()); + } else { + $oPatternCustom->setHtml(getDeleteFailPage()); + } + } + + $main->setCentralPayload($oPatternCustom); + $main->render(); } ?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc index 1932ef0..0d4a6f2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc @@ -9,107 +9,102 @@ * */ // gets the delete stuff -function getDeletePage($iOrgID) { - global $default; - $oOrg = null; - if (isset($iOrgID)) { - $oOrg = Organisation::get($iOrgID); - $sToRender .= "

\n"; - $sToRender .= "Are you sure you wish to Remove this Organisation?:\n"; - } - else{ - $sToRender .= "

\n"; - $sToRender .= "Remove Organisation From System:\n"; - } - - $sToRender .= "\n"; - $sToRender .= "

\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= getDeleteButton($oOrg); - $sToRender .= "
Organisation Name: " . getOrgDisplay($oOrg) . "
\n"; - - - return $sToRender; +function getDeletePage($iOrgID) { + global $default; + $oOrg = null; + if (isset($iOrgID)) { + $oOrg = Organisation::get($iOrgID); + $sHeading .= "Are you sure you wish to Remove this Organisation?\n"; + } else { + $oOrg = null; + $sHeading .= "Please select a Organisation:"; + } + + $sToRender .= "" . renderHeading("Remove Organisation") . "
"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= getDeleteButton($oOrg); + $sToRender .= "
$sHeading
Organisation Name: " . getOrgDisplay($oOrg) . "
\n"; + + return $sToRender; } // get successfully deletion page -function getDeleteSuccessPage() { - -global $default; +function getDeleteSuccessPage() { + + global $default; -$sToRender = "

\n" ; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "
Organisation SuccessFully Removed!
rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - -return $sToRender; + $sToRender .= "" . renderHeading("Remove Organisation") . "
"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
Organisation SuccessFully Removed!
rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; + + return $sToRender; } // get deletion failed page -function getDeleteFailPage() { +function getDeleteFailPage() { + + global $default; -global $default; + $sToRender .= "" . renderHeading("Remove Organisation") . "
"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
Deletion Failed!
Please Ensure that ALL Units has been Removed the Organisation it belongs to
rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; -$sToRender = "

\n" ; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "\n"; -$sToRender .= "
Deletion Failed!
Please Ensure that ALL Units has been Removed the Organisation it belongs to
rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - -return $sToRender; + return $sToRender; } // show listbox...or the text name function getOrgDisplay($oOrg) { - global $default; - if (!isset($oOrg)) { - $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID"); - $oPatternListBox->setIncludeDefaultValue(true); - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "" . $oOrg->getName() . ""; - } - + global $default; + if (!isset($oOrg)) { + $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID"); + $oPatternListBox->setIncludeDefaultValue(true); + $oPatternListBox->setPostBackOnChange(true); + return $oPatternListBox->render(); + } else { + return "iId . "\">\n" . + "" . $oOrg->getName() . ""; + } + } // show delete button function getDeleteButton($oOrg) { - global $default; - if (!isset($oOrg)) { - return "Please select a Org: "; - } else { - return "graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/>\n". - "rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; - } + global $default; + if (isset($oOrg)) { + return "graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/>\n". + "rootUrl/control.php?action=removeOrg\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; + } } ?>