remove $link

[tt-rss.git] / classes / backend.php

diff --git a/classes/backend.php b/classes/backend.php
index 6fa31864d6bcc507c7e801ad7eb7c57cde2386e3..a0416810886a6145e355484dfc8226031c317b22 100644 (file)
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -11,7 +11,7 @@ class Backend extends Handler {
 
                require_once "digest.php";
 
-               $rv = prepare_headlines_digest($this->link, $_SESSION['uid'], 1, 1000);
+               $rv = prepare_headlines_digest( $_SESSION['uid'], 1, 1000);
 
                $rv[3] = "<pre>" . $rv[3] . "</pre>";
 
@@ -19,22 +19,20 @@ class Backend extends Handler {
        }
 
        private function display_main_help() {
-               $info = get_hotkeys_info($this->link);
-               $imap = get_hotkeys_map($this->link);
+               $info = get_hotkeys_info();
+               $imap = get_hotkeys_map();
                $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_notice("<a target=\"_blank\" href=\"http://tt-rss.org/wiki/InterfaceTips\">".
+                       __("Other interface tips are available in the Tiny Tiny RSS wiki.") .
+                       "</a>");
+
                print "<ul class='helpKbList' id='helpKbList'>";
 
                print "<h2>" . __("Keyboard Shortcuts") . "</h2>";
@@ -44,19 +42,47 @@ class Backend extends Handler {
                        print "<li><h3>" . $section . "</h3></li>";
 
                        foreach ($hotkeys as $action => $description) {
-                               print "<li>";
-                               print "<span class='hksequence'>" . $omap[$action] . "</span>";
-                               print $description;
-                               print "</li>";
-                       }
 
+                               if (is_array($omap[$action])) {
+                                       foreach ($omap[$action] as $sequence) {
+                                               if (strpos($sequence, "|") !== FALSE) {
+                                                       $sequence = substr($sequence,
+                                                               strpos($sequence, "|")+1,
+                                                               strlen($sequence));
+                                               } else {
+                                                       $keys = explode(" ", $sequence);
+
+                                                       for ($i = 0; $i < count($keys); $i++) {
+                                                               if (strlen($keys[$i]) > 1) {
+                                                                       $tmp = '';
+                                                                       foreach (str_split($keys[$i]) as $c) {
+                                                                               switch ($c) {
+                                                                               case '*':
+                                                                                       $tmp .= __('Shift') . '+';
+                                                                                       break;
+                                                                               case '^':
+                                                                                       $tmp .= __('Ctrl') . '+';
+                                                                                       break;
+                                                                               default:
+                                                                                       $tmp .= $c;
+                                                                               }
+                                                                       }
+                                                                       $keys[$i] = $tmp;
+                                                               }
+                                                       }
+                                                       $sequence = join(" ", $keys);
+                                               }
+
+                                               print "<li>";
+                                               print "<span class='hksequence'>$sequence</span>";
+                                               print $description;
+                                               print "</li>";
+                                       }
+                               }
+                       }
                }
 
                print "</ul>";
-
-               print "<p><a target=\"_blank\" href=\"http://tt-rss.org/wiki/InterfaceTips\">".
-                       __("Other interface tips are available in the Tiny Tiny RSS wiki.") .
-                       "</a></p>";
        }
 
        function help() {