';
+$content .= '
';
@@ -172,7 +172,7 @@ $tpl->set('s', 'LISTOPTIONS', $oListOptionRow->render());
#########
# Paging
#########
-$cApiUserCollection = new cApiUserCollection;
+$cApiUserCollection = new cApiUserCollection;
$cApiUserCollection->query();
$iItemCount = $cApiUserCollection->count();
@@ -188,12 +188,12 @@ $oPagerLink->setCustom("area", $area);
$oPagerLink->enableAutomaticParameterAppend();
$oPagerLink->setCustom("contenido", $sess->id);
-$pagerID="pager";
+$pagerID = "pager";
+$page = (isset($page))?$page:1;
$oPager = new cObjectPager("44b41691-0dd4-443c-a594-66a8164e25fd", $iItemCount, $elemperpage, $page, $oPagerLink, "page", $pagerID);
$oPager->setExpanded('true');
$tpl->set('s', 'PAGINGLINK', $pagerID);
$tpl->set('s', 'PAGING', $oPager->render());
-
$tpl->generate($cfg['path']['templates'] . $cfg['templates']['rights_left_top']);
?>
\ No newline at end of file
diff --git a/conlite/includes/include.rights_menu.php b/conlite/includes/include.rights_menu.php
index db5ea1d..2334720 100644
--- a/conlite/includes/include.rights_menu.php
+++ b/conlite/includes/include.rights_menu.php
@@ -1,4 +1,5 @@
query();
$iSumUsers = $cApiUserCollection->count();
-if (isset($_REQUEST["sortby"]) && $_REQUEST["sortby"] != "")
-{
- $cApiUserCollection->setOrder($_REQUEST["sortby"]. " ". $_REQUEST["sortorder"]);
-} else {
- $cApiUserCollection->setOrder("username asc");
+if (empty($_REQUEST["sortby"])) {
+ $_REQUEST["sortby"] = 'username';
+ $_REQUEST["sortorder"] = 'asc';
+ $cApiUserCollection->setOrder("username asc");
}
-if (isset($_REQUEST["filter"]) && $_REQUEST["filter"] != "")
-{
- $cApiUserCollection->setWhereGroup("default", "username", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "realname", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "email", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "telephone", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "address_street", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "address_zip", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "address_city", "%".$_REQUEST["filter"]."%", "LIKE");
- $cApiUserCollection->setWhereGroup("default", "address_country", "%".$_REQUEST["filter"]."%", "LIKE");
-
- $cApiUserCollection->setInnerGroupCondition("default", "OR");
+$cApiUserCollection->setOrder($_REQUEST["sortby"] . " " . $_REQUEST["sortorder"]);
+
+if (!empty($_REQUEST["filter"])) {
+ $cApiUserCollection->setWhereGroup("default", "username", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "realname", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "email", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "telephone", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "address_street", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "address_zip", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "address_city", "%" . $_REQUEST["filter"] . "%", "LIKE");
+ $cApiUserCollection->setWhereGroup("default", "address_country", "%" . $_REQUEST["filter"] . "%", "LIKE");
+
+ $cApiUserCollection->setInnerGroupCondition("default", "OR");
+} else {
+ $_REQUEST["filter"] = '';
}
$cApiUserCollection->query();
@@ -67,108 +69,87 @@ $aCurrentUserAccessibleClients = $classclient->getAccessibleClients();
$iMenu = 0;
$iItemCount = 0;
-$mPage = $_REQUEST["page"];
+$mPage = (isset($_REQUEST["page"])) ? (int) $_REQUEST["page"] : 1;
-if ($mPage == 0)
-{
- $mPage = 1;
-}
-
-$elemperpage = $_REQUEST["elemperpage"];
-
-if ($elemperpage == 0)
-{
- $elemperpage = 25;
-}
+$elemperpage = (isset($_REQUEST["elemperpage"])) ? (int) $_REQUEST["elemperpage"] : 25;
$mlist = new UI_Menu;
$sToday = date('Y-m-d');
-
-if (($elemperpage*$mPage) >= $iSumUsers+$elemperpage && $mPage != 1) {
+if (($elemperpage * $mPage) >= $iSumUsers + $elemperpage && $mPage != 1) {
$_REQUEST["page"]--;
$mPage--;
}
-while ($cApiUser = $cApiUserCollection->next())
-{
- $userid = $cApiUser->get("user_id");
-
- $aUserPermissions = explode(',', $cApiUser->get('perms'));
-
- $bDisplayUser = false;
+while ($cApiUser = $cApiUserCollection->next()) {
+ $userid = $cApiUser->get("user_id");
- if (in_array("sysadmin", $aCurrentUserPermissions))
- {
+ $aUserPermissions = explode(',', $cApiUser->get('perms'));
+
+ $bDisplayUser = false;
+
+ if (in_array("sysadmin", $aCurrentUserPermissions)) {
$bDisplayUser = true;
}
-
- foreach ($aCurrentUserAccessibleClients as $key => $value)
- {
- if (in_array("client[$key]", $aUserPermissions))
- {
+
+ foreach ($aCurrentUserAccessibleClients as $key => $value) {
+ if (in_array("client[$key]", $aUserPermissions)) {
$bDisplayUser = true;
}
}
-
- foreach ($aUserPermissions as $sLocalPermission)
- {
- if (in_array($sLocalPermission, $aCurrentUserPermissions))
- {
+
+ foreach ($aUserPermissions as $sLocalPermission) {
+ if (in_array($sLocalPermission, $aCurrentUserPermissions)) {
$bDisplayUser = true;
}
- }
-
+ }
+
$link = new cHTMLLink;
$link->setMultiLink("user", "", "user_overview", "");
$link->setCustom("userid", $cApiUser->get("user_id"));
-
- if ($bDisplayUser == true)
- {
- $iItemCount++;
- if ($iItemCount > ($elemperpage * ($mPage - 1)) && $iItemCount < (($elemperpage * $mPage) + 1))
- {
- if ($perm->have_perm_area_action('user',"user_delete") ) {
- $message = sprintf(i18n("Do you really want to delete the user %s?"), $cApiUser->get("username"));
-
- $delTitle = i18n("Delete user");
- $deletebutton = '
';
-
- } else {
- $deletebutton = "";
- }
+ if ($bDisplayUser == true) {
+ $iItemCount++;
- $iMenu++;
-
- if (($sToday < $cApiUser->get("valid_from")
- && $cApiUser->get("valid_from") != '0000-00-00'
- && $cApiUser->get("valid_from") != '1000-01-01'
+ if ($iItemCount > ($elemperpage * ($mPage - 1)) && $iItemCount < (($elemperpage * $mPage) + 1)) {
+ if ($perm->have_perm_area_action('user', "user_delete")) {
+ $message = sprintf(i18n("Do you really want to delete the user %s?"), $cApiUser->get("username"));
+
+ $delTitle = i18n("Delete user");
+ $deletebutton = '
';
+ } else {
+ $deletebutton = "";
+ }
+
+ $iMenu++;
+
+ if (($sToday < $cApiUser->get("valid_from")
+ && $cApiUser->get("valid_from") != '0000-00-00'
+ && $cApiUser->get("valid_from") != '1000-01-01'
&& $cApiUser->get("valid_from") != '')
- || ($sToday > $cApiUser->get("valid_to")
- && $cApiUser->get("valid_to") != '0000-00-00'
- && $cApiUser->get("valid_to") != '1000-01-01'
- && $cApiUser->get("valid_from") != '')) {
- $mlist->setTitle($iMenu, '
'.$cApiUser->get("username")."
".$cApiUser->get("realname").'');
- } else {
- $mlist->setTitle($iMenu, $cApiUser->get("username")."
".$cApiUser->get("realname"));
- }
+ || ($sToday > $cApiUser->get("valid_to")
+ && $cApiUser->get("valid_to") != '0000-00-00'
+ && $cApiUser->get("valid_to") != '1000-01-01'
+ && $cApiUser->get("valid_from") != '')) {
+ $mlist->setTitle($iMenu, '
' . $cApiUser->get("username") . "
" . $cApiUser->get("realname") . '');
+ } else {
+ $mlist->setTitle($iMenu, $cApiUser->get("username") . "
" . $cApiUser->get("realname"));
+ }
- $mlist->setLink($iMenu, $link);
- $mlist->setActions($iMenu, "delete", $deletebutton);
-
- if ($_GET['userid'] == $cApiUser->get("user_id")) {
+ $mlist->setLink($iMenu, $link);
+ $mlist->setActions($iMenu, "delete", $deletebutton);
+
+ if (!empty($_GET['userid']) && $_GET['userid'] == $cApiUser->get("user_id")) {
$mlist->setExtra($iMenu, 'id="marked" ');
}
- }
+ }
}
-
}
$deleteScript = '';
-
+
$markActiveScript = '';
- //
+//
$oPage->setMargin(0);
$oPage->addScript('rowMark.js', '');
$oPage->addScript('parameterCollector.js', '');
-$oPage->addScript('messagebox', '');
+$oPage->addScript('messagebox', '');
$oPage->addScript('delete', $deleteScript);
-$oPage->setContent($mlist->render(false).$markActiveScript);
+$oPage->setContent($mlist->render(false) . $markActiveScript);
//generate current content for Object Pager
$oPagerLink = new cHTMLLink;
@@ -225,10 +206,10 @@ $oPagerLink->setCustom("area", $area);
$oPagerLink->enableAutomaticParameterAppend();
$oPagerLink->setCustom("contenido", $sess->id);
-$pagerID="pager";
+$pagerID = "pager";
+$page = (empty($page))?1:(int)$page;
$oPager = new cObjectPager("44b41691-0dd4-443c-a594-66a8164e25fd", $iItemCount, $elemperpage, $page, $oPagerLink, "page", $pagerID);
-
//add slashes, to insert in javascript
$sPagerContent = $oPager->render(1);
$sPagerContent = str_replace('\\', '\\\\', $sPagerContent);
@@ -237,7 +218,7 @@ $sPagerContent = str_replace('\'', '\\\'', $sPagerContent);
//send new object pager to left_top
$sRefreshPager = '
';
-$oPage->addScript('refreshpager', $sRefreshPager);
+$oPage->addScript('refreshpager', $sRefreshPager);
$oPage->render();
-
-?>
\ No newline at end of file
diff --git a/conlite/includes/include.rights_overview.php b/conlite/includes/include.rights_overview.php
index 71e83ea..d9fc8e5 100644
--- a/conlite/includes/include.rights_overview.php
+++ b/conlite/includes/include.rights_overview.php
@@ -1,4 +1,5 @@
have_perm_area_action($area, $action) || $perm->have_perm_area_action('user', $action))) {
// access denied
$notification->displayNotification("error", i18n("Permission denied"));
@@ -55,8 +54,8 @@ if (!isset($userid)) {
return;
}
-$aPerms = array();
-$bError = false;
+$aPerms = array();
+$bError = false;
$sNotification = '';
// delete user
@@ -65,11 +64,11 @@ if ($action == 'user_delete') {
$oUsers->deleteUserByID($userid);
$sql = "DELETE FROM " . $cfg["tab"]["groupmembers"]
- . " WHERE user_id = '" . Contenido_Security::escapeDB($userid, $db) . "'";
+ . " WHERE user_id = '" . Contenido_Security::escapeDB($userid, $db) . "'";
$db->query($sql);
$sql = "DELETE FROM " . $cfg["tab"]["rights"]
- ." WHERE user_id = '" . Contenido_Security::escapeDB($userid, $db) . "'";
+ . " WHERE user_id = '" . Contenido_Security::escapeDB($userid, $db) . "'";
$db->query($sql);
$sNotification = $notification->displayNotification("info", i18n("User deleted"));
@@ -87,7 +86,7 @@ if ($action == 'user_delete') {