]> git.wh0rd.org - tt-rss.git/blobdiff - modules/pref-users.php
js: misc fixes, code cleanup
[tt-rss.git] / modules / pref-users.php
index 08bc10821f5d2ca1209e74babc7160fd72bb9923..bed5d45ed8ecb7fba16360172f4ecbd3aa9e7579 100644 (file)
@@ -12,9 +12,9 @@
 
                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;
                        }
                        
 
                        $login = db_fetch_result($result, 0, "login");
 
-                       // print "<h1>$login</h1>";
-
                        print "<table width='100%'>";
 
-                       $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
-                               strtotime(db_fetch_result($result, 0, "last_login")));
+                       $last_login = make_local_datetime($link,
+                               db_fetch_result($result, 0, "last_login"), true);
 
-                       $created = date(get_pref($link, 'LONG_DATE_FORMAT'),
-                               strtotime(db_fetch_result($result, 0, "created")));
+                       $created = make_local_datetime($link,
+                               db_fetch_result($result, 0, "created"), true);
 
                        $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'");
 
                        print "</ul>";
 
                        print "<div align='center'>
-                               <input type='submit' class='button'                     
-                               onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+                               <button onclick=\"closeInfoBox()\">".__("Close this window").
+                               "</button></div>";
 
                        print "</div>";
 
 
                if ($subop == "edit") {
 
-                       $id = db_escape_string($_GET["id"]);
+                       $id = db_escape_string($_REQUEST["id"]);
 
                        print "<div id=\"infoBoxTitle\">".__('User Editor')."</div>";
                        
                        print "</form>";
 
                        print "<div class=\"dlgButtons\">
-                               <input class=\"button\"
-                                       type=\"submit\" onclick=\"return userEditSave()\" 
-                                       value=\"".__('Save')."\">
-                               <input class=\"button\"
-                                       type=\"submit\" onclick=\"return userEditCancel()\" 
-                                       value=\"".__('Cancel')."\"></div>";
+                               <button onclick=\"return userEditSave()\">".
+                                       __('Save')."</button>
+                               <button onclick=\"return userEditCancel()\">".
+                                       __('Cancel')."</button></div>";
 
                        print "</div>";
 
 
                if ($subop == "editSave") {
        
-                       if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
+                       if ($_SESSION["access_level"] >= 10) {
 
                                $login = db_escape_string(trim($_REQUEST["login"]));
                                $uid = db_escape_string($_REQUEST["id"]);
 
                        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"]) {
+                                       if ($id != $_SESSION["uid"] && $id != 1) {
                                                db_query($link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
                                                db_query($link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
                                                db_query($link, "DELETE FROM ttrss_users WHERE id = '$id'");
                
                        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);
 
                        } 
                } else if ($subop == "resetPass") {
 
-                       if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
+                       if ($_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'");
 
                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"];
                }
 
-               print "<div class=\"feedEditSearch\">
+               print "<div style='float : right'>
                        <input id=\"user_search\" size=\"20\" type=\"search\"
                                onfocus=\"javascript:disableHotkeys();\" 
                                onblur=\"javascript:enableHotkeys();\"
                                onchange=\"javascript:updateUsersList()\" value=\"$user_search\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:updateUsersList()\" value=\"".__('Search')."\">
+                       <button onclick=\"javascript:updateUsersList()\">".
+                               __('Search')."</button>
                        </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\"
-                       onclick=\"javascript:addUser()\" value=\"".__('Create user')."\"></div>";
+               print "<button onclick=\"javascript:addUser()\">".__('Create user')."</button>";
+
+               print "
+                       <button onclick=\"javascript:selectedUserDetails()\">".
+                       __('Details')."</button>
+                       <button onclick=\"javascript:editSelectedUser()\">".
+                       __('Edit')."</button>
+                       <button onclick=\"javascript:removeSelectedUsers()\">".
+                       __('Remove')."</button>
+                       <button onclick=\"javascript:resetSelectedUserPass()\">".
+                       __('Reset password')."</button>";
+
+               print "</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 = "";
                }
 
                print "<tr><td class=\"selectPrompt\" colspan=\"8\">
                                ".__('Select:')." 
-                                       <a href=\"javascript:selectPrefRows('user', true)\">".__('All')."</a>,
-                                       <a href=\"javascript:selectPrefRows('user', false)\">".__('None')."</a>
+                                       <a href=\"#\" onclick=\"selectTableRows('prefUserList', 'all')\">".__('All')."</a>,
+                                       <a href=\"#\" onclick=\"selectTableRows('prefUserList', 'none')\">".__('None')."</a>
                                </td</tr>";
 
                print "<tr class=\"title\">
                                        <td align='center' width=\"5%\">&nbsp;</td>
-                                       <td width=''><a href=\"javascript:updateUsersList('login')\">".__('Login')."</a></td>
-                                       <td width='20%'><a href=\"javascript:updateUsersList('access_level')\">".__('Access Level')."</a></td>
-                                       <td width='20%'><a href=\"javascript:updateUsersList('created')\">".__('Registered')."</a></td>
-                                       <td width='20%'><a href=\"javascript:updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
+                                       <td width=''><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
+                                       <td width='20%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
+                                       <td width='20%'><a href=\"#\" onclick=\"updateUsersList('created')\">".__('Registered')."</a></td>
+                                       <td width='20%'><a href=\"#\" onclick=\"updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
                
                $lnum = 0;
                
                        $class = ($lnum % 2) ? "even" : "odd";
 
                        $uid = $line["id"];
-                       $edit_uid = $_GET["id"];
+                       $edit_uid = $_REQUEST["id"];
 
                        if ($subop == "edit" && $uid != $edit_uid) {
                                $class .= "Grayed";
 
                        $line["login"] = htmlspecialchars($line["login"]);
 
-#                      $line["last_login"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
-#                              strtotime($line["last_login"]));
-
-                       if (get_pref($link, 'HEADLINES_SMART_DATE')) {
-                               $line["last_login"] = smart_date_time(strtotime($line["last_login"]));
-                               $line["created"] = smart_date_time(strtotime($line["created"]));
-                       } else {
-                               $line["last_login"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
-                                       strtotime($line["last_login"]));
-                               $line["created"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
-                                       strtotime($line["created"]));
-                       }                               
+                       $line["created"] = make_local_datetime($link, $line["created"], false);
+                       $line["last_login"] = make_local_datetime($link, $line["last_login"], false);
 
-                       print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"user\");' 
+                       print "<td align='center'><input onclick='toggleSelectRow(this);' 
                                type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
 
-                       $onclick = "onclick='editUser($uid)' title='".__('Click to edit')."'";
+                       $onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
 
                        print "<td $onclick>" . $line["login"] . "</td>";               
 
 
                print "</table>";
 
-               print "<p id='userOpToolbar'>";
-
-               print "                         
-                       <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:selectedUserDetails()\" value=\"".__('User details')."\">
-                       <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\">
-                       <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\">
-                       <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">";
-
                } 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>";