diff options
| author | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
| commit | 77accf45df3072bf0e3fe1e919bb75fc14313119 (patch) | |
| tree | 84be283769a6849f4916880739044a163e6f4761 /plugins | |
| parent | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (diff) | |
| parent | 2d2d08fc41dec694ac0895368eff3eb80a173a5b (diff) | |
fix merge conflict with stylesheet tags
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/af_unburn/init.php | 11 | ||||
| -rw-r--r-- | plugins/digest/digest.js | 2 | ||||
| -rw-r--r-- | plugins/digest/digest_body.php | 22 |
3 files changed, 21 insertions, 14 deletions
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php index a0c51c97e..9f0b6cb0d 100644 --- a/plugins/af_unburn/init.php +++ b/plugins/af_unburn/init.php @@ -29,11 +29,16 @@ class Af_Unburn extends Plugin { if (strpos($article["plugin_data"], "unburn,$owner_uid:") === FALSE) { - $ch = curl_init(geturl($article["link"])); + if (ini_get("safe_mode")) { + $ch = curl_init(geturl($article["link"])); + } else { + $ch = curl_init($article["link"]); + } + curl_setopt($ch, CURLOPT_TIMEOUT, 5); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_HEADER, true); - //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode")); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); $contents = @curl_exec($ch); @@ -74,7 +79,7 @@ class Af_Unburn extends Plugin { return $article; } - + function geturl($url){ (function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini'); diff --git a/plugins/digest/digest.js b/plugins/digest/digest.js index 88410d9ed..197847411 100644 --- a/plugins/digest/digest.js +++ b/plugins/digest/digest.js @@ -670,8 +670,6 @@ function init_second_stage() { function init() { try { - dojo.require("dijit.Dialog"); - new Ajax.Request("backend.php", { parameters: {op: "rpc", method: "sanityCheck"}, onComplete: function(transport) { diff --git a/plugins/digest/digest_body.php b/plugins/digest/digest_body.php index c4f51d376..5ffcfd812 100644 --- a/plugins/digest/digest_body.php +++ b/plugins/digest/digest_body.php @@ -7,8 +7,7 @@ <head> <title>Tiny Tiny RSS</title> - <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/> - <link rel="stylesheet" type="text/css" href="plugins/digest/digest.css?<?php echo $dt_add ?>"/> + <?php echo stylesheet_tag("plugins/digest/digest.css") ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> @@ -16,13 +15,18 @@ <link rel="shortcut icon" type="image/png" href="images/favicon.png"/> - <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script> - <script type="text/javascript" src="lib/prototype.js"></script> - <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script> + <?php + foreach (array("lib/prototype.js", + "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls", + "localized_js.php", + "js/functions.js", + "plugins/digest/digest.js", + "errors.php?mode=js") as $jsfile) { + + echo javascript_tag($jsfile); + + } ?> - <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script> - <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script> - <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script> <script type="text/javascript" src="plugins/digest/digest.js"></script> <script type="text/javascript"> @@ -31,7 +35,7 @@ }); </script> </head> -<body id="ttrssDigest" class="claro"> +<body id="ttrssDigest"> <div id="overlay" style="display : block"> <div id="overlay_inner"> <noscript> |