From 44cd77b642df47aef617d74f0571d4354d4be67d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Mar 2013 09:00:21 +0400 Subject: format_inline_player: add a link to original audio file --- include/functions.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 1feedcbf0..99c621f5f 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2870,6 +2870,8 @@ $entry = ""; + $url = htmlspecialchars($url); + if (strpos($ctype, "audio/") === 0) { if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false || @@ -2896,7 +2898,8 @@ "; } - if ($entry) $entry .= " " . basename($url); + if ($entry) $entry .= "  " . basename($url) . ""; return $entry; -- cgit v1.2.3 From 911845b5e7f6c3ebc59f6fdc3d800414fcb45c8d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Mar 2013 09:14:41 +0400 Subject: geturl: remove logging --- include/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 99c621f5f..e66ec0737 100644 --- a/include/functions.php +++ b/include/functions.php @@ -4030,8 +4030,8 @@ $oline=''; foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; - $handle = @fopen('./curl.error.log', 'a'); - fwrite($handle, $line); +# $handle = @fopen('./curl.error.log', 'a'); +# fwrite($handle, $line); return FALSE; } return $url; -- cgit v1.2.3 From b799dc8b0d540d671a7f9c4f1202d428692367c9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Mar 2013 09:15:59 +0400 Subject: only use geturl() if in safe mode --- include/functions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index e66ec0737..3b73ed5f7 100644 --- a/include/functions.php +++ b/include/functions.php @@ -286,8 +286,12 @@ global $fetch_last_error; if (function_exists('curl_init') && !ini_get("open_basedir")) { - //$ch = curl_init($url); - $ch = curl_init(geturl($url)); + + if (ini_get("safe_mode")) { + $ch = curl_init(geturl($url)); + } else { + $ch = curl_init($url); + } curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45); -- cgit v1.2.3 From 414191d4280d6884b575a82bc5b5452c6ddcb62b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Mar 2013 10:21:14 +0400 Subject: make a separate headline button to collapse current article in unexpanded cdm mode; modify a q hotkey to collapse article in unexpanded mode and dismiss article in expanded mode --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 3b73ed5f7..62699e175 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1889,7 +1889,7 @@ "article_scroll_up" => __("Scroll up"), "select_article_cursor" => __("Select article under cursor"), "email_article" => __("Email article"), - "close_article" => __("Close article"), + "close_article" => __("Close/collapse article"), "toggle_widescreen" => __("Toggle widescreen mode")), __("Article selection") => array( "select_all" => __("Select all articles"), -- cgit v1.2.3 From 6e2ed9cf6523a13c8a04513158e46c4fced5cee6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Mar 2013 10:25:01 +0400 Subject: update translations --- include/localized_schema.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/localized_schema.php b/include/localized_schema.php index cf09930d3..71436d96a 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ -