clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

This commit is contained in:
Friendika 2011-08-16 20:05:02 -07:00
parent 98cdf5d315
commit b28b468b21
11 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -7,13 +7,13 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1073' ); define ( 'FRIENDIKA_VERSION', '2.2.1074' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1079 ); define ( 'DB_UPDATE_VERSION', 1079 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'DOWN_ARROW', '&#x21e9;' );
/** /**
* *

32
include/network.php
View File

@ -5,7 +5,7 @@
// results. // results.
if(! function_exists('fetch_url')) { if(! function_exists('fetch_url')) {
function fetch_url($url,$binary = false, &$redirects = 0) { function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
$a = get_app(); $a = get_app();
@ -17,9 +17,13 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
$curl_time = intval(get_config('system','curl_timeout')); if(intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
}
else {
$curl_time = intval(get_config('system','curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
// by default we will allow self-signed certs // by default we will allow self-signed certs
// but you can override this // but you can override this
@ -66,7 +70,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
$url_parsed = @parse_url($url); $url_parsed = @parse_url($url);
if (isset($url_parsed)) { if (isset($url_parsed)) {
$redirects++; $redirects++;
return fetch_url($url,$binary,$redirects); return fetch_url($url,$binary,$redirects,$timeout);
} }
} }
@ -83,7 +87,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
// post request to $url. $params is an array of post variables. // post request to $url. $params is an array of post variables.
if(! function_exists('post_url')) { if(! function_exists('post_url')) {
function post_url($url,$params, $headers = null, &$redirects = 0) { function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) {
$a = get_app(); $a = get_app();
$ch = curl_init($url); $ch = curl_init($url);
if(($redirects > 8) || (! $ch)) if(($redirects > 8) || (! $ch))
@ -95,8 +99,13 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
curl_setopt($ch, CURLOPT_POSTFIELDS,$params); curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
$curl_time = intval(get_config('system','curl_timeout')); if(intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
}
else {
$curl_time = intval(get_config('system','curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
if(defined('LIGHTTPD')) { if(defined('LIGHTTPD')) {
if(!is_array($headers)) { if(!is_array($headers)) {
@ -150,7 +159,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
$url_parsed = @parse_url($url); $url_parsed = @parse_url($url);
if (isset($url_parsed)) { if (isset($url_parsed)) {
$redirects++; $redirects++;
return post_url($url,$binary,$headers,$redirects); return post_url($url,$params,$headers,$redirects,$timeout);
} }
} }
$a->set_curl_code($http_code); $a->set_curl_code($http_code);
@ -497,8 +506,9 @@ function fetch_lrdd_template($host) {
if(! function_exists('fetch_xrd_links')) { if(! function_exists('fetch_xrd_links')) {
function fetch_xrd_links($url) { function fetch_xrd_links($url) {
$xrd_timeout = intval(get_config('system','xrd_timeout'));
$xml = fetch_url($url); $redirects = 0;
$xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30));
logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);

4
include/notifier.php
View File

@ -557,7 +557,7 @@ function notifier_run($argv, $argc){
* *
*/ */
$max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxpubdeliver'))); $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 999 : intval(get_config('system','maxpubdeliver')));
/** /**
* *
@ -567,7 +567,7 @@ function notifier_run($argv, $argc){
*/ */
$r = q("SELECT `id`, `name` FROM `contact` $r = q("SELECT `id`, `name` FROM `contact`
WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 WHERE `network` = NETWORK_DFRN AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
AND `rel` != %d ", AND `rel` != %d ",
intval($owner['uid']), intval($owner['uid']),
intval(CONTACT_IS_SHARING) intval(CONTACT_IS_SHARING)

3
include/oembed.php
View File

@ -17,7 +17,8 @@ function oembed_fetch_url($embedurl){
$txt = ""; $txt = "";
// try oembed autodiscovery // try oembed autodiscovery
$html_text = fetch_url($embedurl); $redirects = 0;
$html_text = fetch_url($embedurl, false, $redirects, 15);
if(! $html_text) if(! $html_text)
return; return;
$dom = @DOMDocument::loadHTML($html_text); $dom = @DOMDocument::loadHTML($html_text);

4
include/text.php
View File

@ -948,3 +948,7 @@ function base64url_decode($s) {
return base64_decode(strtr($s,'-_','+/')); return base64_decode(strtr($s,'-_','+/'));
} }
function cc_license() {
return '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
}

2
mod/display.php
View File

@ -114,7 +114,7 @@ function display_content(&$a) {
} }
$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>'; $o .= cc_license();
return $o; return $o;
} }

3
mod/network.php
View File

@ -297,9 +297,8 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$r,$mode,$update); $o .= conversation($a,$r,$mode,$update);
if(! $update) { if(! $update) {
$o .= paginate($a); $o .= paginate($a);
$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>'; $o .= cc_license();
} }
return $o; return $o;

3
mod/profile.php
View File

@ -236,9 +236,8 @@ function profile_content(&$a, $update = 0) {
$o .= conversation($a,$r,'profile',$update); $o .= conversation($a,$r,'profile',$update);
if(! $update) { if(! $update) {
$o .= paginate($a); $o .= paginate($a);
$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>'; $o .= cc_license();
} }
return $o; return $o;

2
mod/register.php
View File

@ -501,7 +501,7 @@ function register_content(&$a) {
} }
$license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'); $license = cc_license();
$o = get_markup_template("register.tpl"); $o = get_markup_template("register.tpl");

1
mod/search.php
View File

@ -91,6 +91,7 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false); $o .= conversation($a,$r,'search',false);
$o .= paginate($a); $o .= paginate($a);
$o .= cc_license();
return $o; return $o;
} }

3
view/register.tpl
View File

@ -57,5 +57,6 @@
<div id="register-submit-end" ></div> <div id="register-submit-end" ></div>
</form> </form>
<div class="cc-license">$license</div> $license