From ce3bf4089f536dede0778ff5283578571b840c0d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 May 2006 13:01:09 +0100 Subject: disable pref toolbars when nothing is selected --- backend.php | 167 +++++++++++++++++++++++++----------------------------------- 1 file changed, 70 insertions(+), 97 deletions(-) (limited to 'backend.php') diff --git a/backend.php b/backend.php index 66d52ae9e..4b174e858 100644 --- a/backend.php +++ b/backend.php @@ -1888,10 +1888,8 @@ class=\"prefFeedList\" id=\"prefFeedList\">"; print " Select: - All, - None + All, + None "; if (!get_pref($link, 'ENABLE_FEED_CATS')) { @@ -1958,7 +1956,7 @@ $feed_icon = ""; } - print ""; if (get_pref($link, 'ENABLE_FEED_ICONS')) { @@ -1980,17 +1978,6 @@ print "" . $edit_link . ""; -/* if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "" . - $edit_cat . ""; - } */ - -/* print "" . - $update_intervals[$line["update_interval"]] . ""; - - print "" . - $purge_intervals[$line["purge_interval"]] . ""; */ - print "" . "$last_updated"; @@ -2001,7 +1988,7 @@ print ""; - print "

"; + print "

"; if ($subop == "edit") { print "Edit feed:  @@ -2013,11 +2000,9 @@ print " Selection:  - - - "; if (get_pref($link, 'ENABLE_FEED_CATS')) { @@ -2028,7 +2013,7 @@ WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title"); - print ""; print ""; if (db_num_rows($result) != 0) { @@ -2043,12 +2028,12 @@ print ""; - print " "; } - print " + print "  All feeds: "; @@ -2068,9 +2053,10 @@ print "

 
"; $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories @@ -2084,10 +2070,8 @@ print " Select: - All, - None + All, + None "; print " @@ -2117,8 +2101,8 @@ if (!$edit_cat_id || $subop != "editCat") { - print ""; + print ""; print "" . $edit_title . ""; @@ -2145,21 +2129,21 @@ print ""; - print "

"; + print "

"; if ($subop == "editCat") { print "Edit category:  - - "; } else { print " Selection:  - - "; } @@ -2332,10 +2316,8 @@ print " Select: - All, - None + All, + None "; print " @@ -2369,7 +2351,7 @@ if (!$edit_filter_id || $subop != "edit") { - print ""; print "" . @@ -2462,7 +2444,7 @@ print ""; - print "

"; + print "

"; if ($subop == "edit") { print "Edit filter: @@ -2475,9 +2457,9 @@ print " Selection: - - "; } @@ -2620,10 +2602,8 @@ print " Select: - All, - None + All, + None "; print " @@ -2658,7 +2638,7 @@ if (!$line["description"]) $line["description"] = "[No caption]"; - print ""; print "" . @@ -2685,8 +2665,7 @@ "\">"; print ""; - + "\">"; } @@ -2701,7 +2680,7 @@ print ""; - print "

"; + print "

"; if ($subop == "edit") { print "Edit label: @@ -2712,13 +2691,12 @@ "; - } else { - + } else { print " Selection: - - "; } } else { @@ -3394,28 +3372,37 @@ $tmp_user_pwd = make_password(8); $pwd_hash = 'SHA1:' . sha1($tmp_user_pwd); - db_query($link, "INSERT INTO ttrss_users - (login,pwd_hash,access_level,last_login) - VALUES ('$login', '$pwd_hash', 0, NOW())"); - - $result = db_query($link, "SELECT id FROM ttrss_users WHERE - login = '$login' AND pwd_hash = '$pwd_hash'"); - - if (db_num_rows($result) == 1) { - - $new_uid = db_fetch_result($result, 0, "id"); + login = '$login'"); - print "

Added user ".$_GET["login"]. - " with password $tmp_user_pwd.
"; - - initialize_user($link, $new_uid); + if (db_num_rows($result) == 0) { + db_query($link, "INSERT INTO ttrss_users + (login,pwd_hash,access_level,last_login) + VALUES ('$login', '$pwd_hash', 0, NOW())"); + + + $result = db_query($link, "SELECT id FROM ttrss_users WHERE + login = '$login' AND pwd_hash = '$pwd_hash'"); + + if (db_num_rows($result) == 1) { + + $new_uid = db_fetch_result($result, 0, "id"); + + print "
Added user ".$_GET["login"]. + " with password $tmp_user_pwd.
"; + + initialize_user($link, $new_uid); + + } else { + + print "
Could not create user ". + $_GET["login"]."
"; + + } } else { - - print "
Error while adding user ". - $_GET["login"].".
"; - + print "
User ". + $_GET["login"]." already exists.
"; } } } else if ($subop == "resetPass") { @@ -3481,10 +3468,8 @@ print " Select: -
All, - None + All, + None "; print " @@ -3519,18 +3504,9 @@ $access_level_names = array(0 => "User", 10 => "Administrator"); -/* if ($uid == $_SESSION["uid"]) { - - print ""; - - print "".$line["login"].""; - print "".$line["email"].""; - print "".$line["access_level"].""; + if (!$edit_uid || $subop != "edit") { - } else */ if (!$edit_uid || $subop != "edit") { - - print ""; print "" . @@ -3566,9 +3542,6 @@ print ""; -// print ""; - print ""; print " - - - "; } -- cgit v1.2.3-54-g00ecf