diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php index 9828026..b9735e1 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php @@ -8,18 +8,18 @@ * */ require_once("../../../../../config/dmsDefaults.php"); +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); +require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.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"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); +require_once("addRoleUI.inc"); if (checkSession()) { - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("addRoleUI.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"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml(getPage()); $main->setCentralPayload($oPatternCustom); @@ -27,4 +27,4 @@ if (checkSession()) { $main->setHasRequiredFields(true); $main->render(); } -?> +?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc index 0589935..d0c6103 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc @@ -30,7 +30,8 @@ function getPage() { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>\n"; + $sToRender .= "graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>"; + $sToRender .= getCancelButton("listRoles") . "\n"; $sToRender .= "\n"; return $sToRender; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc index 2051ef3..cbdd36b 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc @@ -125,7 +125,7 @@ function getEditPageSuccess() { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "rootUrl/control.php?action=listRole\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; + $sToRender .= "rootUrl/control.php?action=listRoles\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -215,7 +215,7 @@ function getCancelButton($oRole) { if (!isset($oRole)) { //return "rootUrl/control.php?action=groupManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" />\n"; } else { - return "rootUrl/control.php?action=listRole\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; + return "rootUrl/control.php?action=listRoles\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; } } ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php index b6ea70d..d87cabd 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php @@ -8,59 +8,22 @@ * */ - require_once("../../../../../config/dmsDefaults.php"); +require_once("../../../../../config/dmsDefaults.php"); +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/PatternListBox.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); +require_once("listRolesUI.inc"); -if (checkSession()) { - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("listRolesUI.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/lib/documentmanagement/Document.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/lib/discussions/DiscussionThread.inc"); - require_once("$default->fileSystemRoot/lib/discussions/DiscussionComment.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - +if (checkSession()) { $oPatternCustom = & new PatternCustom(); - -if(checkSession()) { - global $default; - - $oPatternCustom->addHtml(renderHeading("Current System Roles")); // Create the Heading - - - $main->setFormAction($_SERVER['PHP_SELF']); - - $sQuery = "SELECT id as roleID, name as name, active, can_read as reader, can_write as writer, " . - "'Edit', 'Delete' " . - "FROM roles " . - "ORDER BY name"; - - $aColumns = array("name", "active", "reader", "writer", "Edit", "Delete"); - $aColumnNames = array("Name", "Active", "Read", "Write", "Edit", "Delete"); - $aColumnTypes = array(1,2,2,2,3,3); - $aDBColumnArray = array("roleID"); - $aQueryStringVariableNames = array("fRoleID"); - - $aHyperLinkURL = array( 4=> "$default->rootUrl/control.php?action=editRole", - 5=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup"); - - $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); - $oSearchResults->setDisplayColumnHeadings(true); - $htmlTables = $oSearchResults->render() ; - - $oPatternCustom->addHtml($htmlTables); - - } // end of if checksession - + $oPatternCustom->setHtml(getPage($fGroupID)); + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $main->setCentralPayload($oPatternCustom); - $main->render(); + $main->setFormAction($_SERVER['PHP_SELF']); + $main->render(); } ?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc index 8e8563c..0ebf092 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc @@ -7,212 +7,35 @@ * @package presentation.lookAndFeel.knowledgeTree. * */ - -function getSubmit() { - global $default; - $sToRender = "graphicsUrl/widgets/select.gif\" value=\"submit\" border=\"0\"/>\n"; - return $sToRender; -} - -// display the listbox initially ..then just display the text -function getGroupDisplay($oGroup, $iSelectedValue = 0) { +function getRoles() { global $default; - 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->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->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); - } - if ($iSelectedValue != 0) { - $oPatternListBox->setSelectedValue($iSelectedValue); - } - - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - $oGroup->getName(); - } - -} - - -function getFilterOptions($fGroupID = 0){ - global $default; - $sToRender .= getGroupDisplay($aGroups, $fGroupID); - /* - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "
graphicsUrl/widgets/addcomment.gif\" border=\"0\" />graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" />
\n";*/ - return $sToRender ; -} - -function getPageButtons($oThread){ + $sQuery = "SELECT id as roleID, name as name, active, can_read as reader, can_write as writer, " . + "'Edit', 'Delete' " . + "FROM roles " . + "ORDER BY name"; + + $aColumns = array("name", "active", "reader", "writer", "Edit", "Delete"); + $aColumnNames = array("Name", "Active", "Read", "Write", "Edit", "Delete"); + $aColumnTypes = array(1,2,2,2,3,3); + $aDBColumnArray = array("roleID"); + $aQueryStringVariableNames = array("fRoleID"); + + $aHyperLinkURL = array( 4=> "$default->rootUrl/control.php?action=editRole", + 5=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup"); + + $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); + $oSearchResults->setDisplayColumnHeadings(true); + + return $oSearchResults->render() ; +} + +function getPage() { global $default; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "
graphicsUrl/widgets/addcomment.gif\" border=\"0\" />graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" />
\n"; - //$sToRender .= "graphicsUrl/widgets/addcomment.gif\" border=\"0\" />\n"; - //$sToRender .= "graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" />\n"; - - return $sToRender ; -} + $sToRender .= renderHeading("Current System Roles"); -// If there are no threads to view for a document -function getViewFailPage($sMessage) -{ - global $default; - - if (strlen($sMessage)>0){ - $sToRender = $sMessage; - } - else $sToRender = "Current document has no discussion. Press the ADD button to start a discussion."; - + // add user link + $sToRender .= getAddLink("addRole", "Add A Role"); + $sToRender .= getRoles(); return $sToRender; } - -/** - * Page to create a new thread - * - * @param $fDocumentID -> a valid document ID - */ -function getNewThreadOption($fDocumentID) { - global $default; - - $sToRender .= "Would you like to create a new Discussion thread for this document?"; - $sToRender .= "   "; - $sToRender .= "graphicsUrl/widgets/new.gif\" border=\"0\">"; - $sToRender .= "graphicsUrl/widgets/cancel.gif\" border=\"0\">"; - - return $sToRender; -} - -/** - * Renders the heading for the page - * - * @param $sHeading -> text heading for the page - */ -function renderHeading1($sHeading) { - global $default; - - $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); - $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); - $sToRender = "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
$sHeading
\n"; - return $sToRender; -} - -/** - * Renders the path for the document - * - * @param $fDocumentID -> a valid document ID - */ -function renderDocumentPath($iDocumentID) { - global $default; - - $oDocument = & Document::get($iDocumentID); - $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); - $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); - $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; - $sDocumentPath .= "rootUrl/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php?fDocumentID=" . $oDocument->getID() . "&fForInlineView=1\">" . $oDocument->getName() . ""; - return "
$sDocumentPath
\n"; -} - -/** - * Views the list of comments for a document - * Prints out 1 comment - * User needs to call this function many times to list all comments - * - * @param $iNum -> its the iterative index of the current comment - * @param $iThread -> a valid Thread Object - * @param $oComment -> a valid Comment Object - * @param $oUser -> a valid User Object (Logged in user) - */ -function getViewComment($iNum,$oThread,$oComment,$oUser) { - global $default; - - $iSubjectChars = 59; - // If iNum is odd then highlight it - if (($iNum%2) == 1) $BGcolor = "#F5F6EE"; - if (($iNum%2) == 0) $UserBGcolor = "#F5F6EE"; - - // If the Subject string is too long - if (strlen($oComment->getSubject())>$iSubjectChars ) $dotdot = " ..."; - if (strlen($oUser->getUserName())> 13 ) $Userdotdot = " ..."; - - // If this is the first Subject line then create a table - if ($iNum == 1) { - $sHeading = "Document Discussion Comments"; - - $sToRender .= renderHeading($sHeading ); - $sToRender .= renderDocumentPath($oThread->getDocumentID()); - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= "
Views: " . $oThread->getNumberOfViews() . "Replies: " . $oThread->getNumberOfReplies() . "graphicsUrl/widgets/addcomment.gif\" border=\"0\" />"; - $sToRender .= "graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" >

\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - } - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - // If this is the last subject line then close the table - if ($iNum == ($oThread->getNumberOfReplies())) { $sToRender .= "\n
SubjectAuthorDate
$iNum getID() . "&iDocumentID=" . $oThread->getDocumentID() . "\" title=\"" . $oComment->getSubject() . "\">" . substr($oComment->getSubject(),0,$iSubjectChars ) . $dotdot . "getUserName()\">" . substr($oUser->getUserName(),0,10) . $Userdotdot . "" . $oComment->getDate() . "
\n\n";} - return $sToRender; -} - -/** - * Views a single thread comment with its text body - * - * @param $iDocumentID -> a valid Document ID - * @param $oComment -> a valid Comment Object - * @param $oUser -> a valid User Object (Logged in user) - */ -function getCommentBody($oComment, $iDocumentID, $oUser) { - global $default; - - $sHeading = "Document Comment"; - - $sToRender .= renderHeading($sHeading); - $sToRender .= renderDocumentPath($iDocumentID); - - $sToRender .= "
\n"; - $sToRender .= "\n"; - $sToRender .= ""; - - $sToRender .= "
Author: " . $oUser->getUserName() . "\n"; - $sToRender .= "getID()) . "\">graphicsUrl/widgets/reply.gif\" border=\"0\" />"; - $sToRender .= "graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" >
Subject: "; - $sToRender .= "" . $oComment->getSubject() . ""; - $sToRender .= "Date: " . $oComment->getDate() . "   
"; - $sToRender .= "
"; - $sToRender .= urldecode(str_replace("%0D%0A","
",str_replace("+", " ",$oComment->getBody()))); // Div Views as HTML - $sToRender .= "
"; - - return $sToRender; -} - ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc index 146a153..54c5c6c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc @@ -61,7 +61,7 @@ function getDeleteSuccessPage() { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "rootUrl/control.php?action=listRole\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; + $sToRender .= "rootUrl/control.php?action=listRoles\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -84,7 +84,7 @@ function getDeleteFailPage() { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "rootUrl/control.php?action=listRole\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; + $sToRender .= "rootUrl/control.php?action=listRoles\">graphicsUrl/widgets/back.gif\" border = \"0\" />\n"; $sToRender .= "\n"; return $sToRender; @@ -138,7 +138,7 @@ function getDeleteButton($oRole) { global $default; if (isset($oRole)) { return "graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/>\n". - "rootUrl/control.php?action=listRole\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; + "rootUrl/control.php?action=listRoles\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; } } ?>