js: misc fixes, code cleanup

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

diff --git a/modules/pref-users.php b/modules/pref-users.php
index aa0da88e1cc33121f27fd864220cb3989323d131..bed5d45ed8ecb7fba16360172f4ecbd3aa9e7579 100644 (file)
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -38,11 +38,11 @@
 
                        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");
@@ -187,7 +187,7 @@
 
                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"]);
@@ -262,7 +262,7 @@
                        } 
                } else if ($subop == "resetPass") {
 
-                       if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
+                       if ($_SESSION["access_level"] >= 10) {
 
                                $uid = db_escape_string($_REQUEST["id"]);
 
@@ -417,16 +417,16 @@
 
                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;
                
@@ -448,23 +448,13 @@
 
                        $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>";