diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/backend.php | 35 | ||||
-rw-r--r-- | classes/feeds.php | 4 | ||||
-rw-r--r-- | classes/pref/feeds.php | 2 | ||||
-rw-r--r-- | classes/pref/prefs.php | 5 |
4 files changed, 24 insertions, 22 deletions
diff --git a/classes/backend.php b/classes/backend.php index 0b6e6bd30..d9a7a9fec 100644 --- a/classes/backend.php +++ b/classes/backend.php @@ -23,16 +23,10 @@ class Backend extends Handler { $imap = get_hotkeys_map($this->link); $omap = array(); - // :( - $tinycharmap = array( - "(9)" => "{TAB}", - "(191)" => "?"); - foreach ($imap[1] as $sequence => $action) { - if (!isset($omap[$action])) { - $omap[$action] = isset($tinycharmap[$sequence]) ? $tinycharmap[$sequence] : - $sequence; - } + if (!isset($omap[$action])) $omap[$action] = array(); + + array_push($omap[$action], $sequence); } print "<ul class='helpKbList' id='helpKbList'>"; @@ -44,18 +38,21 @@ class Backend extends Handler { print "<li><h3>" . $section . "</h3></li>"; foreach ($hotkeys as $action => $description) { - if (strpos($omap[$action], "|") !== FALSE) { - $omap[$action] = substr($omap[$action], - strpos($omap[$action], "|")+1, - strlen($omap[$action])); - } - print "<li>"; - print "<span class='hksequence'>" . $omap[$action] . "</span>"; - print $description; - print "</li>"; - } + foreach ($omap[$action] as $sequence) { + if (strpos($sequence, "|") !== FALSE) { + $sequence = substr($sequence, + strpos($sequence, "|")+1, + strlen($sequence)); + } + + print "<li>"; + print "<span class='hksequence'>$sequence</span>"; + print $description; + print "</li>"; + } + } } print "</ul>"; diff --git a/classes/feeds.php b/classes/feeds.php index de001d568..886470e90 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -152,7 +152,7 @@ class Feeds extends Handler_Protected { $reply = array(); - $timing_info = getmicrotime(); + $timing_info = microtime(true); $topmost_article_ids = array(); @@ -750,7 +750,7 @@ class Feeds extends Handler_Protected { } function view() { - $timing_info = getmicrotime(); + $timing_info = microtime(true); $reply = array(); diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index da8d68ba1..2ed7b1b24 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -437,6 +437,8 @@ class Pref_Feeds extends Handler_Protected { } function uploadicon() { + header("Content-type: text/html"); + $icon_file = $_FILES['icon_file']['tmp_name']; $feed_id = db_escape_string($_REQUEST["feed_id"]); diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index eb84bde99..810b1e164 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -824,7 +824,10 @@ class Pref_Prefs extends Handler_Protected { } function setplugins() { - $plugins = join(",", $_REQUEST["plugins"]); + if (is_array($_REQUEST["plugins"])) + $plugins = join(",", $_REQUEST["plugins"]); + else + $plugins = ""; set_pref($this->link, "_ENABLED_PLUGINS", $plugins); } |