move example plugins to -contrib

[tt-rss.git] / classes / pref / prefs.php

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index d8b8ecc756841c6704cbb5fc933e6042a3c66d0c..ba83a99008d0109d719e6d6058fb3cb01d18f1e0 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -11,8 +11,8 @@ class Pref_Prefs extends Handler_Protected {
                return array_search($method, $csrf_ignored) !== false;
        }
 
-       function __construct($link, $args) {
-               parent::__construct($link, $args);
+       function __construct($args) {
+               parent::__construct($args);
 
                $this->pref_sections = array(
                        1 => __('General'),
@@ -52,9 +52,10 @@ class Pref_Prefs extends Handler_Protected {
                        "STRIP_IMAGES" => array(__("Do not embed images in articles"), ""),
                        "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
                        "USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")),
-                       "USER_TIMEZONE" => array(__("User timezone"), ""),
+                       "USER_TIMEZONE" => array(__("Time zone"), ""),
                        "VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")),
-                       "USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes"))
+                       "USER_LANGUAGE" => array(__("Language")),
+                       "USER_CSS_THEME" => array(__("Theme"), __("Select one of the available CSS themes"))
                );
        }
 
@@ -79,8 +80,7 @@ class Pref_Prefs extends Handler_Protected {
                        return;
                }
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
                if (method_exists($authenticator, "change_password")) {
                        print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw);
@@ -112,18 +112,13 @@ class Pref_Prefs extends Handler_Protected {
                                }
                        }
 
-                       if ($pref_name == "language") {
+                       if ($pref_name == "USER_LANGUAGE") {
                                if ($_SESSION["language"] != $value) {
-                                       setcookie("ttrss_lang", $value,
-                                               time() + SESSION_COOKIE_LIFETIME);
-                                       $_SESSION["language"] = $value;
-
                                        $need_reload = true;
                                }
-                       } else {
-                               set_pref($pref_name, $value);
                        }
 
+                       set_pref($pref_name, $value);
                }
 
                if ($need_reload) {
@@ -255,10 +250,7 @@ class Pref_Prefs extends Handler_Protected {
                print "</form>";
 
                if ($_SESSION["auth_module"]) {
-                       global $pluginhost;
-
-                       $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
-
+                       $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
                } else {
                        $authenticator = false;
                }
@@ -372,7 +364,7 @@ class Pref_Prefs extends Handler_Protected {
 
                                print "</form>";
 
-                               } else {
+                               } else if (function_exists("imagecreatefromstring")) {
 
                                        print "<p>".__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>";
 
@@ -431,13 +423,16 @@ class Pref_Prefs extends Handler_Protected {
 
                                        print "</form>";
 
+                               } else {
+
+                                       print_notice(__("PHP GD functions are required for OTP support."));
+
                                }
 
                        }
                }
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsAuth");
 
                print "</div>"; #pane
@@ -544,22 +539,6 @@ class Pref_Prefs extends Handler_Protected {
                                print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>";
 
                                $lnum = 0;
-
-                               if ($active_section == 2) {
-                                       print "<tr>";
-
-                                       print "<td width=\"40%\" class=\"prefName\">";
-                                       print "<label>";
-                                       print __("Language:");
-                                       print "</label>";
-
-                                       print "<td>";
-                                       print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
-                                               "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
-                                       print "</td>";
-                                       print "</tr>";
-                               }
-
                        }
 
                        print "<tr>";
@@ -575,7 +554,11 @@ class Pref_Prefs extends Handler_Protected {
 
                        print "<td class=\"prefValue\">";
 
-                       if ($pref_name == "USER_TIMEZONE") {
+                       if ($pref_name == "USER_LANGUAGE") {
+                               print_select_hash($pref_name, $value, get_translations(),
+                                       "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
+
+                       } else if ($pref_name == "USER_TIMEZONE") {
 
                                $timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
@@ -675,8 +658,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"boolean_prefs\" value=\"$listed_boolean_prefs\">";
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsPrefsInside");
 
                print '</div>'; # inside pane
@@ -712,8 +694,7 @@ class Pref_Prefs extends Handler_Protected {
                                <label for='prefs_show_advanced'>" .
                                __("Show additional preferences") . "</label>"; */
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsPrefsOutside");
 
                print "</form>";
@@ -877,8 +858,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</div>"; #pane
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
                        "hook_prefs_tab", "prefPrefs");
 
                print "</div>"; #container
@@ -918,8 +898,7 @@ class Pref_Prefs extends Handler_Protected {
                $password = $_REQUEST["password"];
                $otp = $_REQUEST["otp"];
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
                if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
@@ -951,8 +930,7 @@ class Pref_Prefs extends Handler_Protected {
        function otpdisable() {
                $password = $this->dbh->escape_string($_REQUEST["password"]);
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
                if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
@@ -978,8 +956,7 @@ class Pref_Prefs extends Handler_Protected {
        function clearplugindata() {
                $name = $this->dbh->escape_string($_REQUEST["name"]);
 
-               global $pluginhost;
-               $pluginhost->clear_data($pluginhost->get_plugin($name));
+               PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
        }
 
        function customizeCSS() {
@@ -1064,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
 
                while ($line = $this->dbh->fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
-
                        $profile_id = $line["id"];
                        $this_row_id = "id=\"FCATR-$profile_id\"";