diff options
| author | Andrew Dolgov <[email protected]> | 2010-07-01 12:26:27 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-07-01 12:26:27 +0400 |
| commit | 913f374b117f04fdc7b1bd522983109fce3594d3 (patch) | |
| tree | 4c55507aa940edd81a2b9de9cef785b5c0dffa13 /modules | |
| parent | 21a22f5466ee3749d6b23a88e7d4c73a40a6b26c (diff) | |
config: remove unused WEB_DEMO_MODE
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pref-feeds.php | 72 | ||||
| -rw-r--r-- | modules/pref-users.php | 4 |
2 files changed, 36 insertions, 40 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 78a8409bf..c0bb44168 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -957,36 +957,34 @@ if ($subop == "categorize") { - if (!WEB_DEMO_MODE) { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($_REQUEST["ids"])); - $cat_id = db_escape_string($_REQUEST["cat_id"]); + $cat_id = db_escape_string($_REQUEST["cat_id"]); - if ($cat_id == 0) { - $cat_id_qpart = 'NULL'; - } else { - $cat_id_qpart = "'$cat_id'"; - } + if ($cat_id == 0) { + $cat_id_qpart = 'NULL'; + } else { + $cat_id_qpart = "'$cat_id'"; + } - db_query($link, "BEGIN"); + db_query($link, "BEGIN"); - foreach ($ids as $id) { - - db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart - WHERE id = '$id' AND parent_feed IS NULL - AND owner_uid = " . $_SESSION["uid"]); - - # update linked feed categories - db_query($link, "UPDATE ttrss_feeds SET - cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND - owner_uid = " . $_SESSION["uid"]); + foreach ($ids as $id) { + + db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart + WHERE id = '$id' AND parent_feed IS NULL + AND owner_uid = " . $_SESSION["uid"]); - } + # update linked feed categories + db_query($link, "UPDATE ttrss_feeds SET + cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND + owner_uid = " . $_SESSION["uid"]); - db_query($link, "COMMIT"); } + db_query($link, "COMMIT"); + } if ($subop == "editCats") { @@ -1033,27 +1031,25 @@ if ($action == "add") { - if (!WEB_DEMO_MODE) { - - $feed_cat = db_escape_string(trim($_REQUEST["cat"])); + $feed_cat = db_escape_string(trim($_REQUEST["cat"])); + + $result = db_query($link, + "SELECT id FROM ttrss_feed_categories + WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]); + + if (db_num_rows($result) == 0) { + $result = db_query($link, - "SELECT id FROM ttrss_feed_categories - WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]); - - if (db_num_rows($result) == 0) { - - $result = db_query($link, - "INSERT INTO ttrss_feed_categories (owner_uid,title) - VALUES ('".$_SESSION["uid"]."', '$feed_cat')"); - - } else { - - print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", - $feed_cat)); - } + "INSERT INTO ttrss_feed_categories (owner_uid,title) + VALUES ('".$_SESSION["uid"]."', '$feed_cat')"); + + } else { + print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", + $feed_cat)); } + } if ($action == "remove") { diff --git a/modules/pref-users.php b/modules/pref-users.php index aa0da88e1..57be9b895 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -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"]); |