diff options
| author | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
| commit | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (patch) | |
| tree | 5c00a04297478b8b6550c677d8799c404a0fddd7 /include | |
| parent | 598a8f37a2ce94186166d1c3b22cc65efdebe4a4 (diff) | |
| parent | 54bc5594ab26ae961bb92c113a1d2815044e450f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 19 | ||||
| -rw-r--r-- | include/localized_schema.php | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/include/functions.php b/include/functions.php index 1feedcbf0..62699e175 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); @@ -1885,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"), @@ -2870,6 +2874,8 @@ $entry = ""; + $url = htmlspecialchars($url); + if (strpos($ctype, "audio/") === 0) { if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false || @@ -2896,7 +2902,8 @@ </object>"; } - if ($entry) $entry .= " " . basename($url); + if ($entry) $entry .= " <a target=\"_blank\" + href=\"$url\">" . basename($url) . "</a>"; return $entry; @@ -4027,8 +4034,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; 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 @@ -<?php # This file has been generated at: Tue Mar 19 22:42:44 MSK 2013 +<?php # This file has been generated at: Wed Mar 20 10:24:45 MSK 2013 __("Title"); __("Title or Content"); |