X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fbackend.php;h=d5d0f5a01ba1b94e9fa2c6ceb57019c091837b6d;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hp=5473c5c796aa0a726a84ca072d35582463e9bd46;hpb=7d272e5c04141529309fe2924d0aac93f17b56ea;p=tt-rss.git

diff --git a/classes/backend.php b/classes/backend.php
index 5473c5c7..d5d0f5a0 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -9,9 +9,7 @@ class Backend extends Handler {
 	function digestTest() {
 		header("Content-type: text/html");
 
-		require_once "digest.php";
-
-		$rv = prepare_headlines_digest($this->link, $_SESSION['uid'], 1, 1000);
+		$rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
 
 		$rv[3] = "<pre>" . $rv[3] . "</pre>";
 
@@ -19,8 +17,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 +27,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 +47,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,14 +81,10 @@ 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() {
-		$topic = basename($_REQUEST["topic"]);
+		$topic = basename(clean($_REQUEST["topic"]));
 
 		switch ($topic) {
 		case "main":
@@ -93,5 +113,4 @@ class Backend extends Handler {
 			__('Close this window')."</button></div>"; */
 
 	}
-}
-?>
+}
\ No newline at end of file