use POST parameters for frontend requests

[tt-rss.git] / modules / pref-users.php

diff --git a/modules/pref-users.php b/modules/pref-users.php
index 3398f8acf6c876d5a112eeffceb8d7d905d1eb38..6b4df8854e7c72157ff59d77379f97ab1709d685 100644 (file)
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -8,13 +8,13 @@
                        return;
                }
 
-               $subop = $_GET["subop"];
+               $subop = $_REQUEST["subop"];
 
                if ($subop == "user-details") {
 
-                       $uid = sprintf("%d", $_GET["id"]);
+                       $uid = sprintf("%d", $_REQUEST["id"]);
 
-                       print "<div id=\"infoBoxTitle\">User details</div>";
+                       print "<div id=\"infoBoxTitle\">".__('User details')."</div>";
 
                        print "<div class='infoBoxContents'>";
 
@@ -28,7 +28,7 @@
                                WHERE id = '$uid'");
                                
                        if (db_num_rows($result) == 0) {
-                               print "<h1>User not found</h1>";
+                               print "<h1>".__('User not found')."</h1>";
                                return;
                        }
                        
@@ -36,8 +36,6 @@
 
                        $login = db_fetch_result($result, 0, "login");
 
-                       // print "<h1>$login</h1>";
-
                        print "<table width='100%'>";
 
                        $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
@@ -49,21 +47,9 @@
                        $access_level = db_fetch_result($result, 0, "access_level");
                        $stored_articles = db_fetch_result($result, 0, "stored_articles");
 
-                       // print "<tr><td>Username</td><td>$login</td></tr>";
-                       // print "<tr><td>Access level</td><td>$access_level</td></tr>";
                        print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
                        print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-/*                     $result = db_query($link, "SELECT 
-                               SUM(LENGTH(content)) AS db_size 
-                               FROM ttrss_user_entries,ttrss_entries 
-                                       WHERE owner_uid = '$uid' AND ref_id = id");
-
-                       $db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
-
-                       print "<tr><td>".__('Stored articles').
-                               "</td><td>$stored_articles (${db_size}K)</td></tr>"; */
-
                        $result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
                                WHERE owner_uid = '$uid'");
 
@@ -117,7 +103,7 @@
 
                if ($subop == "edit") {
 
-                       $id = db_escape_string($_GET["id"]);
+                       $id = db_escape_string($_REQUEST["id"]);
 
                        print "<div id=\"infoBoxTitle\">".__('User Editor')."</div>";
                        
@@ -140,12 +126,15 @@
                        print "<div class=\"dlgSec\">".__("User")."</div>";
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<input size=\"30\" style=\"font-size : 16px\" 
-                               onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
-                               value=\"$login\">";
-
                        if ($sel_disabled) {
                                print "<input type=\"hidden\" name=\"login\" value=\"$login\">";
+                               print "<input size=\"30\" style=\"font-size : 16px\" 
+                                       onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
+                                       value=\"$login\">";
+                       } else {
+                               print "<input size=\"30\" style=\"font-size : 16px\" 
+                                       onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
+                                       name=\"login\" value=\"$login\">";
                        }
 
                        print "</div>";
@@ -155,8 +144,14 @@
 
                        print __('Access level: ') . " ";
 
-                       print_select_hash("access_level", $access_level, $access_level_names, 
-                               $sel_disabled);
+                       if (!$sel_disabled) {
+                               print_select_hash("access_level", $access_level, $access_level_names, 
+                                       $sel_disabled);
+                       } else {
+                               print_select_hash("", $access_level, $access_level_names, 
+                                       $sel_disabled);
+                               print "<input type=\"hidden\" name=\"access_level\" value=\"$access_level\">";
+                       }
 
                        print "<br/>";
 
@@ -178,7 +173,7 @@
                        print "</table>";
 
                        print "</form>";
-                       
+
                        print "<div class=\"dlgButtons\">
                                <input class=\"button\"
                                        type=\"submit\" onclick=\"return userEditSave()\" 
@@ -196,11 +191,11 @@
        
                        if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
 
-                               $login = db_escape_string(trim($_GET["login"]));
-                               $uid = db_escape_string($_GET["id"]);
-                               $access_level = (int) $_GET["access_level"];
-                               $email = db_escape_string(trim($_GET["email"]));
-                               $password = db_escape_string(trim($_GET["password"]));
+                               $login = db_escape_string(trim($_REQUEST["login"]));
+                               $uid = db_escape_string($_REQUEST["id"]);
+                               $access_level = (int) $_REQUEST["access_level"];
+                               $email = db_escape_string(trim($_REQUEST["email"]));
+                               $password = db_escape_string(trim($_REQUEST["password"]));
 
                                if ($password) {
                                        $pwd_hash = encrypt_password($password, $login);
@@ -218,7 +213,7 @@
 
                        if ($_SESSION["access_level"] >= 10) {
 
-                               $ids = split(",", db_escape_string($_GET["ids"]));
+                               $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
                                foreach ($ids as $id) {
                                        if ($id != $_SESSION["uid"]) {
@@ -232,7 +227,7 @@
                
                        if ($_SESSION["access_level"] >= 10) {
 
-                               $login = db_escape_string(trim($_GET["login"]));
+                               $login = db_escape_string(trim($_REQUEST["login"]));
                                $tmp_user_pwd = make_password(8);
                                $pwd_hash = encrypt_password($tmp_user_pwd, $login);
 
@@ -271,7 +266,7 @@
 
                        if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
 
-                               $uid = db_escape_string($_GET["id"]);
+                               $uid = db_escape_string($_REQUEST["id"]);
 
                                $result = db_query($link, "SELECT login,email 
                                        FROM ttrss_users WHERE id = '$uid'");
@@ -351,9 +346,9 @@
 
                set_pref($link, "_PREFS_ACTIVE_TAB", "userConfig");
 
-               $user_search = db_escape_string($_GET["search"]);
+               $user_search = db_escape_string($_REQUEST["search"]);
 
-               if (array_key_exists("search", $_GET)) {
+               if (array_key_exists("search", $_REQUEST)) {
                        $_SESSION["prefs_user_search"] = $user_search;
                } else {
                        $user_search = $_SESSION["prefs_user_search"];
@@ -368,24 +363,28 @@
                                onclick=\"javascript:updateUsersList()\" value=\"".__('Search')."\">
                        </div>";
 
-               $sort = db_escape_string($_GET["sort"]);
+               $sort = db_escape_string($_REQUEST["sort"]);
 
                if (!$sort || $sort == "undefined") {
                        $sort = "login";
                }
 
-               print "<div class=\"prefGenericAddBox\">
-                       <input id=\"uadd_box\"                  
-                               onkeyup=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
-                               onchange=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
-                               size=\"15\">&nbsp;";
-                       
                print "<input type=\"submit\" class=\"button\" 
-                       id=\"user_add_btn\" disabled=\"true\"
+                       id=\"user_add_btn\" 
                        onclick=\"javascript:addUser()\" value=\"".__('Create user')."\"></div>";
 
                if ($user_search) {
-                       $user_search_query = "UPPER(login) LIKE UPPER('%$user_search%') AND";
+
+                       $user_search = split(" ", $user_search);
+                       $tokens = array();
+
+                       foreach ($user_search as $token) {                      
+                               $token = trim($token);
+                               array_push($tokens, "(UPPER(login) LIKE UPPER('%$token%'))");
+                       }
+
+                       $user_search_query = "(" . join($tokens, " AND ") . ") AND ";
+
                } else {
                        $user_search_query = "";
                }
@@ -428,7 +427,7 @@
                        $class = ($lnum % 2) ? "even" : "odd";
 
                        $uid = $line["id"];
-                       $edit_uid = $_GET["id"];
+                       $edit_uid = $_REQUEST["id"];
 
                        if ($subop == "edit" && $uid != $edit_uid) {
                                $class .= "Grayed";
@@ -489,9 +488,9 @@
                } else {
                        print "<p>";
                        if (!$user_search) {
-                               print __('No users defined.');
+                               print_warning(__('No users defined.'));
                        } else {
-                               print __('No matching users found.');
+                               print_warning(__('No matching users found.'));
                        }
                        print "</p>";