summaryrefslogtreecommitdiff
path: root/classes/backend.php
diff options
context:
space:
mode:
Diffstat (limited to 'classes/backend.php')
-rw-r--r--classes/backend.php36
1 files changed, 29 insertions, 7 deletions
diff --git a/classes/backend.php b/classes/backend.php
index 5473c5c79..7737df0f6 100644
--- 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,8 +19,8 @@ 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();
foreach ($imap[1] as $sequence => $action) {
@@ -29,6 +29,10 @@ class Backend extends Handler {
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>";
@@ -45,6 +49,28 @@ class Backend extends Handler {
$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>";
@@ -57,10 +83,6 @@ class Backend extends Handler {
}
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() {