diff --git a/app/registrations/status_registrations_inc.php b/app/registrations/status_registrations_inc.php index e4efaba3ac..36843301e9 100644 --- a/app/registrations/status_registrations_inc.php +++ b/app/registrations/status_registrations_inc.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2014 + Portions created by the Initial Developer are Copyright (C) 2008-2015 the Initial Developer. All Rights Reserved. Contributor(s): @@ -127,7 +127,7 @@ require_once "resources/check_auth.php"; echo "\n"; echo "\n"; echo "\n"; echo "
\n"; - echo " ".$text['header-registrations'].": ".count($registrations)."\n"; + echo " ".count($registrations)." ".$text['header-registrations']."\n"; echo ""; echo " \"".$text['label-refresh_pause']."\""; diff --git a/core/users/app_languages.php b/core/users/app_languages.php index 6d0316c86b..c7f1235c8d 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -1,6 +1,6 @@ - Portions created by the Initial Developer are Copyright (C) 2008-2013 + Portions created by the Initial Developer are Copyright (C) 2008-2015 the Initial Developer. All Rights Reserved. Contributor(s): @@ -34,6 +34,7 @@ else { exit; } +//additional includes require_once "resources/paging.php"; //set the variables @@ -41,35 +42,6 @@ else { $order = check_str($_GET["order"]); $search_value = check_str($_REQUEST["search_value"]); -//page title and description - echo "\n"; - echo ""; - echo "\n"; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - - echo "\n"; - echo "\n"; - echo "\n"; - //get the list of superadmins $superadmins = superadmin_list($db); @@ -157,10 +129,39 @@ else { $sql .= " limit ".$rows_per_page." offset ".$offset." "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); + $users = $prep_statement->fetchAll(PDO::FETCH_NAMED); + $user_count = count($users); unset ($prep_statement, $sql); +//page title and description + echo "
".$text['header-user_manager'].""; - if (permission_exists('user_all')) { - if ($_GET['showall'] == 'true') { - echo "\n"; - echo ""; - } - else { - echo "\n"; - } - } - echo ""; - echo ""; - echo "
\n"; - echo $text['description-user_manager']."\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; + echo ""; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + + echo "\n"; + echo "\n"; + echo "\n"; + //alternate the row style $c = 0; $row_style["0"] = "row_style0"; @@ -185,8 +186,8 @@ else { echo "\n"; echo "\n"; - if ($result_count > 0) { - foreach($result as $row) { + if ($user_count > 0) { + foreach($users as $row) { if (if_superadmin($superadmins, $row['user_uuid']) && !if_group("superadmin")) { //hide } else { @@ -233,7 +234,7 @@ else { if ($c==0) { $c=1; } else { $c=0; } } } //end foreach - unset($sql, $result, $row_count); + unset($sql, $users, $user_count); } //end if results echo "\n";
".$user_count." ".$text['header-user_manager'].""; + if (permission_exists('user_all')) { + if ($_GET['showall'] == 'true') { + echo "\n"; + echo ""; + } + else { + echo "\n"; + } + } + echo ""; + echo ""; + echo "
\n"; + echo $text['description-user_manager']."\n"; + echo "
\n"; + echo "
\n"; + echo "