diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php index 0e76de1..c1d758e 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php @@ -1,17 +1,35 @@ fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); -require_once("$default->fileSystemRoot/lib/security/permission.inc"); +require_once("$default->fileSystemRoot/lib/security/Permission.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"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc index 1589ff2..c47a5b5 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc @@ -1,12 +1,30 @@ fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - -global $default; - -if(checkSession()) -{ - -// include the page template (with navbar) -require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - // when email button sent..send email -if ($submit) -{ - - //$success = $ - - //if successful ..rerender the page - if($success == True) - { - $Center = "
Group Successfully Added
"; - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml($Center); - $main->setCentralPayload($oPatternCustom); - $main->render(); - } - Else - { - $Center = "
Group Addition Unsuccessful
"; - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml($Center); - $main->setCentralPayload($oPatternCustom); - $main->render(); - } - - - -} - -$Center = " -
-
- - - - - - - - -
New Group:
- "; - -$oPatternListBox = & new PatternListBox("units_lookup", "name", "id", "Units"); -//echo "" . $oPatternListBox->render() . ""; - - - -$oPatternCustom = & new PatternCustom(); -$oPatternCustom->setHtml($Center); -$main->setCentralPayload($oPatternCustom); -$main->setFormAction($_SERVER["PHP_SELF"]); -$main->render(); - - - - -} - -?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php index ade28d4..1c61776 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php @@ -1,12 +1,30 @@ fileSystemRoot/lib/unitmanagement/Unit.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.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/foldermanagement/Folder.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc index 385edde..5c7d3c7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc @@ -1,12 +1,29 @@ owl_groups_table, "name", "id", "fGroupID"); - $oPatternListBox->setFromClause("LEFT OUTER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); + $oPatternListBox->setFromClause("LEFT OUTER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id"); $oPatternListBox->setWhereClause("ISNULL(GUL.group_id) AND ST.name <> 'Anonymous' AND ST.name <> 'System Administrators'"); return $oPatternListBox->render(); } else { @@ -214,7 +231,7 @@ function getUnitDisplay($oUnit) { $oUnit = Unit::get(User::getUnitID($_SESSION["userID"])); } if (!isset($oUnit)) { - $oPatternListBox = & new PatternListBox($default->owl_units_table , "name", "id", "fUnitID"); + $oPatternListBox = & new PatternListBox($default->units_table , "name", "id", "fUnitID"); return $oPatternListBox->render(); } else { return "iId . "\">\n" . diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php index c21c6b2..8f3ecb7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php @@ -1,19 +1,37 @@ fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("editGroupUI.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.inc"); + require_once("$default->fileSystemRoot/lib/security/Permission.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php index 66938a9..86d69f9 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php @@ -1,12 +1,29 @@ owl_groups_table WHERE id = $iGroupID"; + $sQuery = "SELECT * FROM $default->groups_table WHERE id = $iGroupID"; $aDisplayColumns = array("name","is_sys_admin","is_unit_admin"); $aStoreColumns = array("name","is_sys_admin","is_unit_admin"); $aColumnNames = array("Name:","System admin:", "Unit admin:"); @@ -21,7 +39,7 @@ function getCreatePage($iGroupID) { $aDatabaseColumnTypes = array(1,2,2); // get list of group properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes - $oPattern = & new PatternEditableListFromQuery($sQuery, $default->owl_groups_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); + $oPattern = & new PatternEditableListFromQuery($sQuery, $default->groups_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); $oPattern->setUniqueName("groupEdit"); $oPattern->setColumnsRequired(array(1,0,0)); @@ -156,18 +174,18 @@ function getGroupDisplay($oGroup) { if (!isset($oGroup)) { if (Permission::userIsSystemAdministrator()) { // if this is the system administrator, prepend group names with unit name - $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " . "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id"); $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)"); } else if (Permission::userIsUnitAdministrator()) { // else if this is a unit administrator, only display the groups in your unit - $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); - $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); + $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id"); $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); - $oUnassignedUsersLB = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); - $oUnassignedUsersLB->setFromClause("LEFT OUTER JOIN $default->owl_groups_units_table GUL ON ST.id=GUL.group_id"); + $oUnassignedUsersLB = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); + $oUnassignedUsersLB->setFromClause("LEFT OUTER JOIN $default->groups_units_table GUL ON ST.id=GUL.group_id"); $oUnassignedUsersLB->setWhereClause("ISNULL(GUL.unit_id) AND ST.name <> 'Anonymous' AND ST.name <> 'System Administrators'"); $oPatternListBox->setAdditionalEntries($oUnassignedUsersLB->getEntries()); } diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitBL.php index 69a90c9..e2aa520 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitBL.php @@ -1,12 +1,30 @@ fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/lib/users/User.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.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/foldermanagement/Folder.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitUI.inc index 232c020..9c55996 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUnitUI.inc @@ -1,12 +1,29 @@ owl_groups_units_table . ".group_id = $iGroupID"; + $sWhereClause = "WHERE " . $default->groups_units_table . ".group_id = $iGroupID"; $aGroupUnitLink = GroupUnitLink::getList($sWhereClause); @@ -200,10 +217,10 @@ function getPageSuccess() { function getUserDisplay($oUser) { global $default; if (!isset($oUser)) { - $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID"); + $oPatternListBox = & new PatternListBox($default->users_table, "username", "id", "fUserID"); if (Permission::userIsUnitAdministrator()) { - $oPatternListBox->setFromClause("INNER JOIN $default->owl_users_groups_table UGL on ST.id=UGL.user_id " . - "INNER JOIN $default->owl_groups_units_table GUL on UGL.group_id=GUL.group_id"); + $oPatternListBox->setFromClause("INNER JOIN $default->users_groups_table UGL on ST.id=UGL.user_id " . + "INNER JOIN $default->groups_units_table GUL on UGL.group_id=GUL.group_id"); $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); } $oPatternListBox->setPostBackOnChange(true); @@ -220,14 +237,14 @@ function getOtherGroupDisplay($oGroup) { if (!isset($oGroup)) { if (Permission::userIsSystemAdministrator()) { // if this is the system administrator, prepend group names with unit name - $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fOtherGroupID"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fOtherGroupID"); $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " . "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id"); $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)"); } else if (Permission::userIsUnitAdministrator()) { // else if this is a unit administrator, only display the groups in your unit - $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fOtherGroupID"); - $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fOtherGroupID"); + $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id"); $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); } return $oPatternListBox->render(); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php index fefdb1c..1ccfc04 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php @@ -1,17 +1,33 @@ fileSystemRoot/lib/users/User.inc"); -require_once("$default->fileSystemRoot/lib/security/permission.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/PatternListBox.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc index 3737a74..fd27f95 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc @@ -1,12 +1,29 @@ owl_units_table, "name", "id", "fUnitID"); + $oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID"); $oPatternListBox->setPostBackOnChange(true); if ($iUnitID != 0) { $oPatternListBox->setSelectedValue($iUnitID); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php index e652d1d..0a794f2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php @@ -1,12 +1,30 @@ fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("removeGroupUI.inc"); //require_once("../adminUI.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.inc"); + require_once("$default->fileSystemRoot/lib/security/Permission.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php index 31f8ed7..69ef534 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php @@ -1,13 +1,30 @@ fileSystemRoot/lib/unitmanagement/Unit.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.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/foldermanagement/Folder.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc index a263fbf..08ee9b5 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc @@ -1,12 +1,29 @@ owl_groups_table, "name", "id", "fGroupID"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); if (Permission::userIsSystemAdministrator()) { $default->log->info("getGroupDisplay sysadmin"); // if this is the system administrator, prepend group names with unit name @@ -150,7 +167,7 @@ function getGroupDisplay($oGroup) { } else if (Permission::userIsUnitAdministrator()) { $default->log->info("getGroupDisplay unitadmin"); // else if this is a unit administrator, only display the groups in your unit - $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id"); + $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id"); $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); } return $oPatternListBox->render(); @@ -164,7 +181,7 @@ function getGroupDisplay($oGroup) { function getUnitDisplay($oUnit) { global $default; if (!isset($oUnit)) { - //$oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID"); + //$oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID"); //$oPatternLiListBoxstBox->setPostBackOnChange(true); //return $oPatternListBox->render(); } else { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php index 42c6f34..6525beb 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php @@ -1,12 +1,29 @@ owl_groups_table, "name", "id", "fGroupID"); + $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); $oPatternListBox->setIncludeDefaultValue(true); $oPatternListBox->setPostBackOnChange(true); return $oPatternListBox->render(); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php index 8c65fba..52aa7bb 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php @@ -1,16 +1,34 @@ fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); -require_once("$default->fileSystemRoot/lib/links/link.inc"); -require_once("$default->fileSystemRoot/lib/security/permission.inc"); +require_once("$default->fileSystemRoot/lib/links/Link.inc"); +require_once("$default->fileSystemRoot/lib/security/Permission.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"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php index e5973f4..cdd33e6 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php @@ -1,12 +1,29 @@ setUniqueName("link"); $oPatternCreate->setDefaultValues(array(1=>"http://")); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php index dd08e0d..46b7206 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php @@ -1,20 +1,37 @@ fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("editLinkUI.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.inc"); - require_once("$default->fileSystemRoot/lib/links/link.inc"); + require_once("$default->fileSystemRoot/lib/security/Permission.inc"); + require_once("$default->fileSystemRoot/lib/links/Link.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc index 01789b9..48675fd 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc @@ -1,12 +1,29 @@ owl_links_table, "name", "id", "fLinkID"); + $oPatternListBox = & new PatternListBox($default->quicklinks_table, "name", "id", "fLinkID"); //$oPatternListBox->setIncludeDefaultValue(true); $oPatternListBox->setPostBackOnChange(true); return $oPatternListBox->render(); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php index c349a34..33ab410 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php @@ -1,19 +1,36 @@ 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/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"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc index 2ededb6..94347a6 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc @@ -1,18 +1,35 @@ owl_links_table . " " . + "FROM " . $default->quicklinks_table . " " . "ORDER BY name"; $aColumns = array("LinkName", "LinkURL", "LinkRank", "Edit", "Delete"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkBL.php index 811856a..653f258 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkBL.php @@ -1,20 +1,37 @@ fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("removeLinkUI.inc"); - require_once("$default->fileSystemRoot/lib/security/permission.inc"); - require_once("$default->fileSystemRoot/lib/links/link.inc"); + require_once("$default->fileSystemRoot/lib/security/Permission.inc"); + require_once("$default->fileSystemRoot/lib/links/Link.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc index e872373..2725a1b 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc @@ -1,13 +1,30 @@ owl_links_table, "name", "id", "fLinkID"); + $oPatternListBox = & new PatternListBox($default->quicklinks_table, "name", "id", "fLinkID"); $oPatternListBox->setIncludeDefaultValue(true); $oPatternListBox->setPostBackOnChange(true); return $oPatternListBox->render(); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php index 31649e1..6353735 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php @@ -7,17 +7,30 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); - /** * $Id$ - * - * Business logic for adding a news item * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * Business logic for adding a news item. + * + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ if (checkSession()) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php index 480b5ee..c285809 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php @@ -7,17 +7,30 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); - /** * $Id$ - * - * Business logic for editing a news item * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * Business logic for editing a news item. + * + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ if (checkSession()) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php index 3eb495f..e31e2f6 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php @@ -8,17 +8,30 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.i require_once("$default->uiDirectory/administration/news/newsUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); - /** * $Id$ - * - * This page handles the administration of dashboard news items * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * This page handles the administration of dashboard news items. + * + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ if (checkSession()) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc index 81305fc..794d9b2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc @@ -1,15 +1,28 @@ , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ /** @@ -28,7 +41,7 @@ function renderErrorMessage($sErrorMessage) { function renderNewsTable() { global $default; $sQuery = "SELECT id, synopsis, IF(LENGTH(body) > 25, CONCAT(LEFT(body,25),'...'), body) AS body, rank, IF(LENGTH(image)>0, 'yes', 'no') as image, active, 'Edit' AS edit, 'Preview' AS preview, 'Delete' AS del " . - "FROM $default->owl_news_table ORDER BY rank ASC"; + "FROM $default->news_table ORDER BY rank ASC"; $aColumns = array("synopsis", "body", "rank", "image", "active", "edit", "preview", "del"); $aColumnHeaders = array("Synopsis", "Body", "Rank", "Image", "Active"); $aColumnTypes = array(1,1,1,1,2,3,3,3); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php index 0b6599c..976fbd7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php @@ -10,16 +10,30 @@ require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ - * - * This page previews a news item * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * This page previews a news item. + * + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ - + if (checkSession()) { // instantiate my content pattern diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php index 981f661..f305ec2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php @@ -10,14 +10,28 @@ require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ - * - * Business logic for deleting a news item * - * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * Business logic for deleting a news item. + * + * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Revision$ * @author Michael Joseph , Jam Warehouse (Pty) Ltd, South Africa - * @package presentation.lookAndFeel.knowledgeTree.administration.news + * @package administration.news */ if (checkSession()) {