Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2
Coding convention applied split 2-6-2 (of 2-14-2)
This commit is contained in:
Hypolite Petovan
GitHub
commit
ea88e15a8c
|
|
@ -14,18 +14,19 @@ $objDDDBLResultHandler = new DataObjectPool('Result-Handler');
|
|||
*
|
||||
**/
|
||||
$cloPDOStatementResultHandler = function(Queue $objQueue) {
|
||||
|
||||
$objPDO = $objQueue->getState()->get('PDOStatement');
|
||||
$objQueue->getState()->update(array('result' => $objPDO));
|
||||
|
||||
# delete handler which closes the PDOStatement-cursor
|
||||
# this will be done manual if using this handler
|
||||
/*
|
||||
* delete handler which closes the PDOStatement-cursor
|
||||
* this will be done manual if using this handler
|
||||
*/
|
||||
$objQueue->deleteHandler(QUEUE_CLOSE_CURSOR_POSITION);
|
||||
|
||||
};
|
||||
|
||||
$objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementResultHandler));
|
||||
|
||||
if (! class_exists('dba')) {
|
||||
/**
|
||||
*
|
||||
* MySQL database class
|
||||
|
|
@ -36,8 +37,6 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR
|
|||
* the debugging stream is safe to view within both terminals and web pages.
|
||||
*
|
||||
*/
|
||||
|
||||
if (! class_exists('dba')) {
|
||||
class dba {
|
||||
|
||||
private $debug = 0;
|
||||
|
|
@ -146,9 +145,11 @@ class dba {
|
|||
|
||||
$a->save_timestamp($stamp1, "database");
|
||||
|
||||
/// @TODO really check $a->config for 'system'? it is very generic and should be there
|
||||
if (x($a->config, 'system') && x($a->config['system'], 'db_log')) {
|
||||
if (($duration > $a->config["system"]["db_loglimit"])) {
|
||||
/*
|
||||
* Check if the configuration group 'system' and db_log is there. The
|
||||
* extra first check needs to be done to avoid endless loop.
|
||||
*/
|
||||
if (x($a->config, 'system') && x($a->config['system'], 'db_log') && ($duration > $a->config["system"]["db_loglimit"])) {
|
||||
$duration = round($duration, 3);
|
||||
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
|
||||
@file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t".
|
||||
|
|
@ -156,7 +157,6 @@ class dba {
|
|||
$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
|
||||
substr($sql, 0, 2000)."\n", FILE_APPEND);
|
||||
}
|
||||
}
|
||||
|
||||
if ($intErrorCode) {
|
||||
$this->error = $intErrorCode;
|
||||
|
|
@ -202,8 +202,11 @@ class dba {
|
|||
}
|
||||
|
||||
if ($onlyquery) {
|
||||
$this->result = $r; # this will store an PDOStatement Object in result
|
||||
$this->result->execute(); # execute the Statement, to get its result
|
||||
// this will store an PDOStatement Object in result
|
||||
$this->result = $r;
|
||||
|
||||
// execute the Statement, to get its result
|
||||
$this->result->execute();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -262,7 +265,8 @@ function printable($s) {
|
|||
return $s;
|
||||
}}
|
||||
|
||||
// Procedural functions
|
||||
// --- Procedural functions ---
|
||||
|
||||
if (! function_exists('dbg')) {
|
||||
function dbg($state) {
|
||||
global $db;
|
||||
|
|
@ -273,14 +277,16 @@ function dbg($state) {
|
|||
if (! function_exists('dbesc')) {
|
||||
function dbesc($str) {
|
||||
global $db;
|
||||
if ($db && $db->connected)
|
||||
return($db->escape($str));
|
||||
else
|
||||
return(str_replace("'","\\'",$str));
|
||||
|
||||
if ($db && $db->connected) {
|
||||
return $db->escape($str);
|
||||
} else {
|
||||
return str_replace("'","\\'",$str);
|
||||
}
|
||||
}}
|
||||
|
||||
if (! function_exists('q')) {
|
||||
/**
|
||||
/*
|
||||
* Function: q($sql,$args);
|
||||
* Description: execute SQL query with printf style args.
|
||||
* Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
|
||||
|
|
@ -301,23 +307,19 @@ function q($sql) {
|
|||
return $db->q($stmt);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
/*
|
||||
* This will happen occasionally trying to store the
|
||||
* session data after abnormal program termination
|
||||
*
|
||||
*/
|
||||
logger('dba: no database: ' . print_r($args,true));
|
||||
return false;
|
||||
|
||||
}}
|
||||
|
||||
if (! function_exists('dbq')) {
|
||||
/**
|
||||
/*
|
||||
* Raw db query, no arguments
|
||||
*/
|
||||
function dbq($sql) {
|
||||
|
||||
global $db;
|
||||
if ($db && $db->connected) {
|
||||
$ret = $db->q($sql);
|
||||
|
|
@ -327,15 +329,14 @@ function dbq($sql) {
|
|||
return $ret;
|
||||
}}
|
||||
|
||||
|
||||
if (! function_exists('dbesc_array_cb')) {
|
||||
function dbesc_array_cb(&$item, $key) {
|
||||
/*
|
||||
* Caller is responsible for ensuring that any integer arguments to
|
||||
* dbesc_array are actually integers and not malformed strings containing
|
||||
* SQL injection vectors. All integer array elements should be specifically
|
||||
* cast to int to avoid trouble.
|
||||
*/
|
||||
if (! function_exists('dbesc_array_cb')) {
|
||||
function dbesc_array_cb(&$item, $key) {
|
||||
if (is_string($item)) {
|
||||
$item = dbesc($item);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ function convert_to_innodb() {
|
|||
$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
|
||||
echo $sql."\n";
|
||||
|
||||
$result = @$db->q($sql);
|
||||
$result = $db->q($sql);
|
||||
if (!dbm::is_result($result)) {
|
||||
print_update_error($db, $sql);
|
||||
}
|
||||
|
|
@ -85,6 +85,7 @@ function update_fail($update_id, $error_message) {
|
|||
|
||||
|
||||
/*
|
||||
@TODO deprecated code?
|
||||
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||
$email_msg = replace_macros($email_tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
|
|
@ -1764,8 +1765,8 @@ function dbstructure_run(&$argv, &$argc) {
|
|||
}
|
||||
|
||||
if (is_null($db)) {
|
||||
@include(".htconfig.php");
|
||||
require_once("include/dba.php");
|
||||
@include ".htconfig.php";
|
||||
require_once "include/dba.php";
|
||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -880,11 +880,14 @@ class Diaspora {
|
|||
if (dbm::is_result($r)) {
|
||||
return $r[0];
|
||||
} else {
|
||||
// We haven't found it?
|
||||
// We use another function for it that will possibly create a contact entry
|
||||
/*
|
||||
* We haven't found it?
|
||||
* We use another function for it that will possibly create a contact entry.
|
||||
*/
|
||||
$cid = get_contact($handle, $uid);
|
||||
|
||||
if ($cid > 0) {
|
||||
/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
|
|
@ -919,9 +922,11 @@ class Diaspora {
|
|||
*/
|
||||
private static function post_allow($importer, $contact, $is_comment = false) {
|
||||
|
||||
// perhaps we were already sharing with this person. Now they're sharing with us.
|
||||
// That makes us friends.
|
||||
// Normally this should have handled by getting a request - but this could get lost
|
||||
/*
|
||||
* Perhaps we were already sharing with this person. Now they're sharing with us.
|
||||
* That makes us friends.
|
||||
* Normally this should have handled by getting a request - but this could get lost
|
||||
*/
|
||||
if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
|
||||
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
|
||||
intval(CONTACT_IS_FRIEND),
|
||||
|
|
@ -934,16 +939,19 @@ class Diaspora {
|
|||
|
||||
// We don't seem to like that person
|
||||
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
|
||||
// Maybe blocked, don't accept.
|
||||
return false;
|
||||
// We are following this person? Then it is okay
|
||||
// We are following this person?
|
||||
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
|
||||
// Yes, then it is fine.
|
||||
return true;
|
||||
// Is it a post to a community? That's good
|
||||
// Is it a post to a community?
|
||||
} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
|
||||
// That's good
|
||||
return true;
|
||||
}
|
||||
// Is the message a global user or a comment?
|
||||
} elseif (($importer["uid"] == 0) || $is_comment) {
|
||||
// Messages for the global users and comments are always accepted
|
||||
if (($importer["uid"] == 0) || $is_comment) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -853,18 +853,22 @@ function widget_events() {
|
|||
return;
|
||||
}
|
||||
|
||||
// Cal logged in user (test permission at foreign profile page)
|
||||
// If the $owner uid is available we know it is part of one of the profile pages (like /cal)
|
||||
// So we have to test if if it's the own profile page of the logged in user
|
||||
// or a foreign one. For foreign profile pages we need to check if the feature
|
||||
// for exporting the cal is enabled (otherwise the widget would appear for logged in users
|
||||
// on foreigen profile pages even if the widget is disabled)
|
||||
/*
|
||||
* Cal logged in user (test permission at foreign profile page)
|
||||
* If the $owner uid is available we know it is part of one of the profile pages (like /cal)
|
||||
* So we have to test if if it's the own profile page of the logged in user
|
||||
* or a foreign one. For foreign profile pages we need to check if the feature
|
||||
* for exporting the cal is enabled (otherwise the widget would appear for logged in users
|
||||
* on foreigen profile pages even if the widget is disabled)
|
||||
*/
|
||||
if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
|
||||
return;
|
||||
}
|
||||
|
||||
// If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
|
||||
// export feature isn't enabled
|
||||
/*
|
||||
* If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
|
||||
* export feature isn't enabled
|
||||
*/
|
||||
if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ function pop_lang() {
|
|||
$lang = $a->langsave;
|
||||
}
|
||||
|
||||
|
||||
// l
|
||||
|
||||
if (! function_exists('load_translation_table')) {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once('include/queue_fn.php');
|
||||
require_once('include/dfrn.php');
|
||||
require_once("include/datetime.php");
|
||||
require_once('include/items.php');
|
||||
require_once('include/bbcode.php');
|
||||
require_once('include/socgraph.php');
|
||||
require_once('include/cache.php');
|
||||
require_once 'include/queue_fn.php';
|
||||
require_once 'include/dfrn.php';
|
||||
require_once 'include/datetime.php';
|
||||
require_once 'include/items.php';
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'include/socgraph.php';
|
||||
require_once 'include/cache.php';
|
||||
|
||||
function queue_run(&$argv, &$argc) {
|
||||
global $a;
|
||||
|
|
@ -41,9 +41,10 @@ function queue_run(&$argv, &$argc){
|
|||
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
||||
}
|
||||
|
||||
// For the first 12 hours we'll try to deliver every 15 minutes
|
||||
// After that, we'll only attempt delivery once per hour.
|
||||
|
||||
/*
|
||||
* For the first 12 hours we'll try to deliver every 15 minutes
|
||||
* After that, we'll only attempt delivery once per hour.
|
||||
*/
|
||||
$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
|
||||
|
||||
call_hooks('queue_predeliver', $a, $r);
|
||||
|
|
@ -60,8 +61,8 @@ function queue_run(&$argv, &$argc){
|
|||
|
||||
// delivering
|
||||
|
||||
require_once('include/salmon.php');
|
||||
require_once('include/diaspora.php');
|
||||
require_once 'include/salmon.php';
|
||||
require_once 'include/diaspora.php';
|
||||
|
||||
$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
||||
intval($queue_id));
|
||||
|
|
|
|||
|
|
@ -170,11 +170,14 @@ function slapper($owner, $url, $slap) {
|
|||
}
|
||||
|
||||
logger('slapper for '.$url.' returned ' . $return_code);
|
||||
|
||||
if (! $return_code) {
|
||||
return(-1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
|
||||
return(-1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,16 +62,17 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
$a->module = 'profile_photo';
|
||||
info( t("Welcome ") . $a->user['username'] . EOL);
|
||||
info( t('Please upload a profile photo.') . EOL);
|
||||
}
|
||||
else
|
||||
} else {
|
||||
info( t("Welcome back ") . $a->user['username'] . EOL);
|
||||
}
|
||||
}
|
||||
|
||||
$member_since = strtotime($a->user['register_date']);
|
||||
if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
|
||||
if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
|
||||
$_SESSION['new_member'] = true;
|
||||
else
|
||||
} else {
|
||||
$_SESSION['new_member'] = false;
|
||||
}
|
||||
if (strlen($a->user['timezone'])) {
|
||||
date_default_timezone_set($a->user['timezone']);
|
||||
$a->timezone = $a->user['timezone'];
|
||||
|
|
@ -80,34 +81,40 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
$master_record = $a->user;
|
||||
|
||||
if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
|
||||
$r = q("select * from user where uid = %d limit 1",
|
||||
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($_SESSION['submanage'])
|
||||
);
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
$master_record = $r[0];
|
||||
}
|
||||
}
|
||||
|
||||
$r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ",
|
||||
dbesc($master_record['password']),
|
||||
dbesc($master_record['email'])
|
||||
);
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
$a->identities = $r;
|
||||
else
|
||||
} else {
|
||||
$a->identities = array();
|
||||
}
|
||||
|
||||
$r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
|
||||
from manage INNER JOIN user on manage.mid = user.uid where `user`.`account_removed` = 0
|
||||
and `manage`.`uid` = %d",
|
||||
$r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
|
||||
FROM `manage`
|
||||
INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
|
||||
WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d",
|
||||
intval($master_record['uid'])
|
||||
);
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
$a->identities = array_merge($a->identities,$r);
|
||||
}
|
||||
|
||||
if($login_initial)
|
||||
if ($login_initial) {
|
||||
logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
|
||||
if($login_refresh)
|
||||
}
|
||||
if ($login_refresh) {
|
||||
logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||
intval($_SESSION['uid']));
|
||||
|
|
@ -238,7 +245,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
*
|
||||
* default permissions - anonymous user
|
||||
*/
|
||||
|
||||
$sql = " AND allow_cid = ''
|
||||
AND allow_gid = ''
|
||||
AND deny_cid = ''
|
||||
|
|
@ -251,9 +257,8 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
|
||||
if (($local_user) && ($local_user == $owner_id)) {
|
||||
$sql = '';
|
||||
}
|
||||
|
||||
/**
|
||||
} elseif ($remote_user) {
|
||||
/*
|
||||
* Authenticated visitor. Unless pre-verified,
|
||||
* check that the contact belongs to this $owner_id
|
||||
* and load the groups the visitor belongs to.
|
||||
|
|
@ -261,8 +266,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
* done this and passed the groups into this function.
|
||||
*/
|
||||
|
||||
elseif($remote_user) {
|
||||
|
||||
if (! $remote_verified) {
|
||||
$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
|
||||
intval($remote_user),
|
||||
|
|
@ -282,7 +285,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
$gs .= '|<' . intval($g) . '>';
|
||||
}
|
||||
|
||||
/*$sql = sprintf(
|
||||
/*
|
||||
* @TODO old-lost code found?
|
||||
$sql = sprintf(
|
||||
" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
|
||||
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
|
||||
AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
|
||||
|
|
@ -292,7 +297,8 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
intval($remote_user),
|
||||
dbesc($gs),
|
||||
dbesc($gs)
|
||||
);*/
|
||||
);
|
||||
*/
|
||||
$sql = sprintf(
|
||||
" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
|
||||
AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
|
||||
|
|
@ -319,7 +325,6 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
|
|||
*
|
||||
* default permissions - anonymous user
|
||||
*/
|
||||
|
||||
$sql = " AND `item`.allow_cid = ''
|
||||
AND `item`.allow_gid = ''
|
||||
AND `item`.deny_cid = ''
|
||||
|
|
@ -330,21 +335,16 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
|
|||
/**
|
||||
* Profile owner - everything is visible
|
||||
*/
|
||||
|
||||
if ($local_user && ($local_user == $owner_id)) {
|
||||
$sql = '';
|
||||
}
|
||||
|
||||
/**
|
||||
} elseif ($remote_user) {
|
||||
/*
|
||||
* Authenticated visitor. Unless pre-verified,
|
||||
* check that the contact belongs to this $owner_id
|
||||
* and load the groups the visitor belongs to.
|
||||
* If pre-verified, the caller is expected to have already
|
||||
* done this and passed the groups into this function.
|
||||
*/
|
||||
|
||||
elseif($remote_user) {
|
||||
|
||||
if (! $remote_verified) {
|
||||
$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
|
||||
intval($remote_user),
|
||||
|
|
@ -360,9 +360,10 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
|
|||
$gs = '<<>>'; // should be impossible to match
|
||||
|
||||
if (is_array($groups) && count($groups)) {
|
||||
foreach($groups as $g)
|
||||
foreach ($groups as $g) {
|
||||
$gs .= '|<' . intval($g) . '>';
|
||||
}
|
||||
}
|
||||
|
||||
$sql = sprintf(
|
||||
/*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
|
||||
|
|
@ -412,7 +413,11 @@ function get_form_security_token($typename = '') {
|
|||
}
|
||||
|
||||
function check_form_security_token($typename = '', $formname = 'form_security_token') {
|
||||
if (!x($_REQUEST, $formname)) return false;
|
||||
if (!x($_REQUEST, $formname)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/// @TODO Careful, not secured!
|
||||
$hash = $_REQUEST[$formname];
|
||||
|
||||
$max_livetime = 10800; // 3 hours
|
||||
|
|
@ -420,7 +425,9 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
|
|||
$a = get_app();
|
||||
|
||||
$x = explode('.', $hash);
|
||||
if (time() > (IntVal($x[0]) + $max_livetime)) return false;
|
||||
if (time() > (IntVal($x[0]) + $max_livetime)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
|
||||
|
||||
|
|
@ -467,4 +474,3 @@ function init_groups_visitor($contact_id) {
|
|||
}
|
||||
return $groups;
|
||||
}}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,12 +63,14 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
|
|||
$uid = $r[0]['uid'];
|
||||
}
|
||||
}
|
||||
if(! $uid)
|
||||
if (! $uid) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(! $url)
|
||||
if (! $url) {
|
||||
return;
|
||||
}
|
||||
|
||||
$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
|
||||
|
||||
|
|
@ -80,15 +82,17 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
|
|||
|
||||
logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG);
|
||||
|
||||
if(($a->get_curl_code() > 299) || (! $s))
|
||||
if (($a->get_curl_code() > 299) || (! $s)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$j = json_decode($s);
|
||||
|
||||
logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
|
||||
|
||||
if(! isset($j->entry))
|
||||
if (! isset($j->entry)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$total = 0;
|
||||
foreach ($j->entry as $entry) {
|
||||
|
|
@ -160,8 +164,9 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
|
|||
}
|
||||
}
|
||||
|
||||
if (isset($entry->contactType) && ($entry->contactType >= 0))
|
||||
if (isset($entry->contactType) && ($entry->contactType >= 0)) {
|
||||
$contact_type = $entry->contactType;
|
||||
}
|
||||
|
||||
$gcontact = array("url" => $profile_url,
|
||||
"name" => $name,
|
||||
|
|
@ -267,7 +272,7 @@ function sanitize_gcontact($gcontact) {
|
|||
dbesc(normalise_link($gcontact['url']))
|
||||
);
|
||||
|
||||
if (count($x)) {
|
||||
if (dbm::is_result($x)) {
|
||||
if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
|
||||
$gcontact['network'] = $x[0]["network"];
|
||||
}
|
||||
|
|
@ -299,7 +304,7 @@ function sanitize_gcontact($gcontact) {
|
|||
if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
|
||||
// Delete the old entry - if it exists
|
||||
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
|
||||
q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
|
||||
}
|
||||
|
|
@ -353,6 +358,7 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
|
|||
intval($gcid),
|
||||
intval($zcid)
|
||||
);
|
||||
|
||||
if (!dbm::is_result($r)) {
|
||||
q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
|
||||
intval($cid),
|
||||
|
|
@ -374,11 +380,13 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
|
|||
|
||||
function poco_reachable($profile, $server = "", $network = "", $force = false) {
|
||||
|
||||
if ($server == "")
|
||||
if ($server == "") {
|
||||
$server = poco_detect_server($profile);
|
||||
}
|
||||
|
||||
if ($server == "")
|
||||
if ($server == "") {
|
||||
return true;
|
||||
}
|
||||
|
||||
return poco_check_server($server, $network, $force);
|
||||
}
|
||||
|
|
@ -661,7 +669,7 @@ function poco_last_updated($profile, $force = false) {
|
|||
|
||||
$last_updated = "";
|
||||
|
||||
foreach ($entries AS $entry) {
|
||||
foreach ($entries as $entry) {
|
||||
$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
|
||||
$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
|
||||
|
||||
|
|
@ -694,48 +702,55 @@ function poco_last_updated($profile, $force = false) {
|
|||
function poco_do_update($created, $updated, $last_failure, $last_contact) {
|
||||
$now = strtotime(datetime_convert());
|
||||
|
||||
if ($updated > $last_contact)
|
||||
if ($updated > $last_contact) {
|
||||
$contact_time = strtotime($updated);
|
||||
else
|
||||
} else {
|
||||
$contact_time = strtotime($last_contact);
|
||||
}
|
||||
|
||||
$failure_time = strtotime($last_failure);
|
||||
$created_time = strtotime($created);
|
||||
|
||||
// If there is no "created" time then use the current time
|
||||
if ($created_time <= 0)
|
||||
if ($created_time <= 0) {
|
||||
$created_time = $now;
|
||||
}
|
||||
|
||||
// If the last contact was less than 24 hours then don't update
|
||||
if (($now - $contact_time) < (60 * 60 * 24))
|
||||
if (($now - $contact_time) < (60 * 60 * 24)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the last failure was less than 24 hours then don't update
|
||||
if (($now - $failure_time) < (60 * 60 * 24))
|
||||
if (($now - $failure_time) < (60 * 60 * 24)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the last contact was less than a week ago and the last failure is older than a week then don't update
|
||||
//if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
|
||||
// return false;
|
||||
|
||||
// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
|
||||
if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7)))
|
||||
if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
|
||||
if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30)))
|
||||
if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function poco_to_boolean($val) {
|
||||
if (($val == "true") || ($val == 1))
|
||||
return(true);
|
||||
if (($val == "false") || ($val == 0))
|
||||
return(false);
|
||||
if (($val == "true") || ($val == 1)) {
|
||||
return true;
|
||||
} elseif (($val == "false") || ($val == 0)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($val);
|
||||
return $val;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -763,7 +778,7 @@ function poco_detect_poco_data($data) {
|
|||
return false;
|
||||
}
|
||||
|
||||
foreach ($data->entry[0]->urls AS $url) {
|
||||
foreach ($data->entry[0]->urls as $url) {
|
||||
if ($url->type == 'zot') {
|
||||
$server = array();
|
||||
$server["platform"] = 'Hubzilla';
|
||||
|
|
@ -798,7 +813,7 @@ function poco_fetch_nodeinfo($server_url) {
|
|||
|
||||
$nodeinfo_url = '';
|
||||
|
||||
foreach ($nodeinfo->links AS $link) {
|
||||
foreach ($nodeinfo->links as $link) {
|
||||
if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
|
||||
$nodeinfo_url = $link->href;
|
||||
}
|
||||
|
|
@ -851,7 +866,7 @@ function poco_fetch_nodeinfo($server_url) {
|
|||
$gnusocial = false;
|
||||
|
||||
if (is_array($nodeinfo->protocols->inbound)) {
|
||||
foreach ($nodeinfo->protocols->inbound AS $inbound) {
|
||||
foreach ($nodeinfo->protocols->inbound as $inbound) {
|
||||
if ($inbound == 'diaspora') {
|
||||
$diaspora = true;
|
||||
}
|
||||
|
|
@ -926,8 +941,7 @@ function poco_detect_server_type($body) {
|
|||
$attr[$attribute->name] = $attribute->value;
|
||||
}
|
||||
}
|
||||
if ($attr['property'] == 'generator') {
|
||||
if (in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
|
||||
if ($attr['property'] == 'generator' && in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
|
||||
$server = array();
|
||||
$server["platform"] = $attr['content'];
|
||||
$server["version"] = "";
|
||||
|
|
@ -935,7 +949,6 @@ function poco_detect_server_type($body) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$server) {
|
||||
return false;
|
||||
|
|
@ -951,8 +964,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
|||
$server_url = trim($server_url, "/");
|
||||
$server_url = str_replace("/index.php", "", $server_url);
|
||||
|
||||
if ($server_url == "")
|
||||
if ($server_url == "") {
|
||||
return false;
|
||||
}
|
||||
|
||||
$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
|
||||
if (dbm::is_result($servers)) {
|
||||
|
|
@ -964,8 +978,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
|||
$poco = $servers[0]["poco"];
|
||||
$noscrape = $servers[0]["noscrape"];
|
||||
|
||||
if ($network == "")
|
||||
if ($network == "") {
|
||||
$network = $servers[0]["network"];
|
||||
}
|
||||
|
||||
$last_contact = $servers[0]["last_contact"];
|
||||
$last_failure = $servers[0]["last_failure"];
|
||||
|
|
@ -1165,10 +1180,11 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
|||
$network = NETWORK_DIASPORA;
|
||||
}
|
||||
if (isset($data->site->redmatrix)) {
|
||||
if (isset($data->site->redmatrix->PLATFORM_NAME))
|
||||
if (isset($data->site->redmatrix->PLATFORM_NAME)) {
|
||||
$platform = $data->site->redmatrix->PLATFORM_NAME;
|
||||
elseif (isset($data->site->redmatrix->RED_PLATFORM))
|
||||
} elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
|
||||
$platform = $data->site->redmatrix->RED_PLATFORM;
|
||||
}
|
||||
|
||||
$version = $data->site->redmatrix->RED_VERSION;
|
||||
$network = NETWORK_DIASPORA;
|
||||
|
|
@ -1185,15 +1201,16 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
|||
$data->site->private = poco_to_boolean($data->site->private);
|
||||
$data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
|
||||
|
||||
if (!$data->site->closed && !$data->site->private and $data->site->inviteonly)
|
||||
if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
|
||||
$register_policy = REGISTER_APPROVE;
|
||||
elseif (!$data->site->closed && !$data->site->private)
|
||||
} elseif (!$data->site->closed && !$data->site->private) {
|
||||
$register_policy = REGISTER_OPEN;
|
||||
else
|
||||
} else {
|
||||
$register_policy = REGISTER_CLOSED;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Query statistics.json. Optional package for Diaspora, Friendica and Redmatrix
|
||||
if (!$failure) {
|
||||
|
|
@ -1254,8 +1271,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
|||
if (!$failure && in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
|
||||
$serverret = z_fetch_url($server_url."/friendica/json");
|
||||
|
||||
if (!$serverret["success"])
|
||||
if (!$serverret["success"]) {
|
||||
$serverret = z_fetch_url($server_url."/friendika/json");
|
||||
}
|
||||
|
||||
if ($serverret["success"]) {
|
||||
$data = json_decode($serverret["body"]);
|
||||
|
|
@ -1365,8 +1383,9 @@ function count_common_friends($uid,$cid) {
|
|||
);
|
||||
|
||||
// logger("count_common_friends: $uid $cid {$r[0]['total']}");
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
return $r[0]['total'];
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
|
@ -1374,10 +1393,11 @@ function count_common_friends($uid,$cid) {
|
|||
|
||||
function common_friends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false) {
|
||||
|
||||
if($shuffle)
|
||||
if ($shuffle) {
|
||||
$sql_extra = " order by rand() ";
|
||||
else
|
||||
} else {
|
||||
$sql_extra = " order by `gcontact`.`name` asc ";
|
||||
}
|
||||
|
||||
$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
|
||||
FROM `glink`
|
||||
|
|
@ -1396,6 +1416,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
|
||||
return $r;
|
||||
|
||||
}
|
||||
|
|
@ -1411,18 +1432,20 @@ function count_common_friends_zcid($uid,$zcid) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
return $r[0]['total'];
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
function common_friends_zcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle = false) {
|
||||
|
||||
if($shuffle)
|
||||
if ($shuffle) {
|
||||
$sql_extra = " order by rand() ";
|
||||
else
|
||||
} else {
|
||||
$sql_extra = " order by `gcontact`.`name` asc ";
|
||||
}
|
||||
|
||||
$r = q("SELECT `gcontact`.*
|
||||
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||
|
|
@ -1435,6 +1458,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
|
||||
return $r;
|
||||
|
||||
}
|
||||
|
|
@ -1450,8 +1474,9 @@ function count_all_friends($uid,$cid) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
return $r[0]['total'];
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
|
@ -1473,6 +1498,7 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
|
||||
return $r;
|
||||
}
|
||||
|
||||
|
|
@ -1484,8 +1510,10 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
|
|||
return array();
|
||||
}
|
||||
|
||||
// Uncommented because the result of the queries are to big to store it in the cache.
|
||||
// We need to decide if we want to change the db column type or if we want to delete it.
|
||||
/*
|
||||
* Uncommented because the result of the queries are to big to store it in the cache.
|
||||
* We need to decide if we want to change the db column type or if we want to delete it.
|
||||
*/
|
||||
//$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
|
||||
//if (!is_null($list)) {
|
||||
// return $list;
|
||||
|
|
@ -1493,11 +1521,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
|
|||
|
||||
$network = array(NETWORK_DFRN);
|
||||
|
||||
if (get_config('system','diaspora_enabled'))
|
||||
if (get_config('system','diaspora_enabled')) {
|
||||
$network[] = NETWORK_DIASPORA;
|
||||
}
|
||||
|
||||
if (!get_config('system','ostatus_disabled'))
|
||||
if (!get_config('system','ostatus_disabled')) {
|
||||
$network[] = NETWORK_OSTATUS;
|
||||
}
|
||||
|
||||
$sql_network = implode("', '", $network);
|
||||
$sql_network = "'".$sql_network."'";
|
||||
|
|
@ -1524,8 +1554,10 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
|
|||
);
|
||||
|
||||
if (dbm::is_result($r) && count($r) >= ($limit -1)) {
|
||||
// Uncommented because the result of the queries are to big to store it in the cache.
|
||||
// We need to decide if we want to change the db column type or if we want to delete it.
|
||||
/*
|
||||
* Uncommented because the result of the queries are to big to store it in the cache.
|
||||
* We need to decide if we want to change the db column type or if we want to delete it.
|
||||
*/
|
||||
//Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
|
||||
|
||||
return $r;
|
||||
|
|
@ -1550,17 +1582,22 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
|
|||
);
|
||||
|
||||
$list = array();
|
||||
foreach ($r2 AS $suggestion)
|
||||
foreach ($r2 as $suggestion) {
|
||||
$list[$suggestion["nurl"]] = $suggestion;
|
||||
}
|
||||
|
||||
foreach ($r AS $suggestion)
|
||||
foreach ($r as $suggestion) {
|
||||
$list[$suggestion["nurl"]] = $suggestion;
|
||||
}
|
||||
|
||||
while (sizeof($list) > ($limit))
|
||||
while (sizeof($list) > ($limit)) {
|
||||
array_pop($list);
|
||||
}
|
||||
|
||||
// Uncommented because the result of the queries are to big to store it in the cache.
|
||||
// We need to decide if we want to change the db column type or if we want to delete it.
|
||||
/*
|
||||
* Uncommented because the result of the queries are to big to store it in the cache.
|
||||
* We need to decide if we want to change the db column type or if we want to delete it.
|
||||
*/
|
||||
//Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
|
||||
return $list;
|
||||
}
|
||||
|
|
@ -1602,11 +1639,12 @@ function update_suggestions() {
|
|||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
|
||||
if(! in_array($base,$done))
|
||||
if (! in_array($base,$done)) {
|
||||
poco_load(0,0,0,$base);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Fetch server list from remote servers and adds them when they are new.
|
||||
|
|
@ -1624,7 +1662,7 @@ function poco_fetch_serverlist($poco) {
|
|||
return;
|
||||
}
|
||||
|
||||
foreach ($serverlist AS $server) {
|
||||
foreach ($serverlist as $server) {
|
||||
$server_url = str_replace("/index.php", "", $server->url);
|
||||
|
||||
$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
|
||||
|
|
@ -1640,9 +1678,10 @@ function poco_discover_federation() {
|
|||
|
||||
if ($last) {
|
||||
$next = $last + (24 * 60 * 60);
|
||||
if($next > time())
|
||||
if ($next > time()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Discover Friendica, Hubzilla and Diaspora servers
|
||||
$serverdata = fetch_url("http://the-federation.info/pods.json");
|
||||
|
|
@ -1650,7 +1689,7 @@ function poco_discover_federation() {
|
|||
if ($serverdata) {
|
||||
$servers = json_decode($serverdata);
|
||||
|
||||
foreach ($servers->pods AS $server) {
|
||||
foreach ($servers->pods as $server) {
|
||||
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host));
|
||||
}
|
||||
}
|
||||
|
|
@ -1662,7 +1701,7 @@ function poco_discover_federation() {
|
|||
if ($serverdata) {
|
||||
$servers = json_decode($serverdata);
|
||||
|
||||
foreach ($servers AS $server) {
|
||||
foreach ($servers as $server) {
|
||||
$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
|
||||
proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url));
|
||||
}
|
||||
|
|
@ -1679,7 +1718,7 @@ function poco_discover_federation() {
|
|||
// if ($result["success"]) {
|
||||
// $servers = json_decode($result["body"]);
|
||||
|
||||
// foreach($servers->data AS $server)
|
||||
// foreach($servers->data as $server)
|
||||
// poco_check_server($server->instance_address);
|
||||
// }
|
||||
//}
|
||||
|
|
@ -1765,7 +1804,7 @@ function poco_discover($complete = false) {
|
|||
|
||||
$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r AS $server) {
|
||||
foreach ($r as $server) {
|
||||
|
||||
if (!poco_check_server($server["url"], $server["network"])) {
|
||||
// The server is not reachable? Okay, then we will try it later
|
||||
|
|
@ -1785,19 +1824,21 @@ function poco_discover($complete = false) {
|
|||
|
||||
function poco_discover_server_users($data, $server) {
|
||||
|
||||
if (!isset($data->entry))
|
||||
if (!isset($data->entry)) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($data->entry AS $entry) {
|
||||
foreach ($data->entry as $entry) {
|
||||
$username = "";
|
||||
if (isset($entry->urls)) {
|
||||
foreach($entry->urls as $url)
|
||||
foreach ($entry->urls as $url) {
|
||||
if ($url->type == 'profile') {
|
||||
$profile_url = $url->value;
|
||||
$urlparts = parse_url($profile_url);
|
||||
$username = end(explode("/", $urlparts["path"]));
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($username != "") {
|
||||
logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG);
|
||||
|
||||
|
|
@ -1805,20 +1846,22 @@ function poco_discover_server_users($data, $server) {
|
|||
$url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
|
||||
|
||||
$retdata = z_fetch_url($url);
|
||||
if ($retdata["success"])
|
||||
if ($retdata["success"]) {
|
||||
poco_discover_server(json_decode($retdata["body"]), 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function poco_discover_server($data, $default_generation = 0) {
|
||||
|
||||
if (!isset($data->entry) || !count($data->entry))
|
||||
if (!isset($data->entry) || !count($data->entry)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$success = false;
|
||||
|
||||
foreach ($data->entry AS $entry) {
|
||||
foreach ($data->entry as $entry) {
|
||||
$profile_url = '';
|
||||
$profile_photo = '';
|
||||
$connect_url = '';
|
||||
|
|
@ -1930,19 +1973,23 @@ function poco_discover_server($data, $default_generation = 0) {
|
|||
function clean_contact_url($url) {
|
||||
$parts = parse_url($url);
|
||||
|
||||
if (!isset($parts["scheme"]) || !isset($parts["host"]))
|
||||
if (!isset($parts["scheme"]) || !isset($parts["host"])) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
$new_url = $parts["scheme"]."://".$parts["host"];
|
||||
|
||||
if (isset($parts["port"]))
|
||||
if (isset($parts["port"])) {
|
||||
$new_url .= ":".$parts["port"];
|
||||
}
|
||||
|
||||
if (isset($parts["path"]))
|
||||
if (isset($parts["path"])) {
|
||||
$new_url .= $parts["path"];
|
||||
}
|
||||
|
||||
if ($new_url != $url)
|
||||
if ($new_url != $url) {
|
||||
logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
return $new_url;
|
||||
}
|
||||
|
|
@ -1981,19 +2028,22 @@ function get_gcontact_id($contact) {
|
|||
return false;
|
||||
}
|
||||
|
||||
if ($contact["network"] == NETWORK_STATUSNET)
|
||||
if ($contact["network"] == NETWORK_STATUSNET) {
|
||||
$contact["network"] = NETWORK_OSTATUS;
|
||||
}
|
||||
|
||||
// All new contacts are hidden by default
|
||||
if (!isset($contact["hide"]))
|
||||
if (!isset($contact["hide"])) {
|
||||
$contact["hide"] = true;
|
||||
}
|
||||
|
||||
// Replace alternate OStatus user format with the primary one
|
||||
fix_alternate_contact_address($contact);
|
||||
|
||||
// Remove unwanted parts from the contact url (e.g. "?zrl=...")
|
||||
if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
|
||||
if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
|
||||
$contact["url"] = clean_contact_url($contact["url"]);
|
||||
}
|
||||
|
||||
dba::lock('gcontact');
|
||||
$r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
|
||||
|
|
@ -2031,7 +2081,7 @@ function get_gcontact_id($contact) {
|
|||
$r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
|
||||
dbesc(normalise_link($contact["url"])));
|
||||
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
$gcontact_id = $r[0]["id"];
|
||||
|
||||
$doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
|
||||
|
|
@ -2064,8 +2114,9 @@ function update_gcontact($contact) {
|
|||
|
||||
$gcontact_id = get_gcontact_id($contact);
|
||||
|
||||
if (!$gcontact_id)
|
||||
if (!$gcontact_id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
|
||||
`contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
|
||||
|
|
@ -2074,8 +2125,9 @@ function update_gcontact($contact) {
|
|||
|
||||
// Get all field names
|
||||
$fields = array();
|
||||
foreach ($r[0] AS $field => $data)
|
||||
foreach ($r[0] as $field => $data) {
|
||||
$fields[$field] = $data;
|
||||
}
|
||||
|
||||
unset($fields["url"]);
|
||||
unset($fields["updated"]);
|
||||
|
|
@ -2083,47 +2135,58 @@ function update_gcontact($contact) {
|
|||
|
||||
// Bugfix: We had an error in the storing of keywords which lead to the "0"
|
||||
// This value is still transmitted via poco.
|
||||
if ($contact["keywords"] == "0")
|
||||
if ($contact["keywords"] == "0") {
|
||||
unset($contact["keywords"]);
|
||||
}
|
||||
|
||||
if ($r[0]["keywords"] == "0")
|
||||
if ($r[0]["keywords"] == "0") {
|
||||
$r[0]["keywords"] = "";
|
||||
}
|
||||
|
||||
// assign all unassigned fields from the database entry
|
||||
foreach ($fields AS $field => $data)
|
||||
if (!isset($contact[$field]) || ($contact[$field] == ""))
|
||||
foreach ($fields as $field => $data) {
|
||||
if (!isset($contact[$field]) || ($contact[$field] == "")) {
|
||||
$contact[$field] = $r[0][$field];
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($contact["hide"]))
|
||||
if (!isset($contact["hide"])) {
|
||||
$contact["hide"] = $r[0]["hide"];
|
||||
}
|
||||
|
||||
$fields["hide"] = $r[0]["hide"];
|
||||
|
||||
if ($contact["network"] == NETWORK_STATUSNET)
|
||||
if ($contact["network"] == NETWORK_STATUSNET) {
|
||||
$contact["network"] = NETWORK_OSTATUS;
|
||||
}
|
||||
|
||||
// Replace alternate OStatus user format with the primary one
|
||||
fix_alternate_contact_address($contact);
|
||||
|
||||
if (!isset($contact["updated"]))
|
||||
if (!isset($contact["updated"])) {
|
||||
$contact["updated"] = dbm::date();
|
||||
}
|
||||
|
||||
if ($contact["server_url"] == "") {
|
||||
$server_url = $contact["url"];
|
||||
|
||||
$server_url = matching_url($server_url, $contact["alias"]);
|
||||
if ($server_url != "")
|
||||
if ($server_url != "") {
|
||||
$contact["server_url"] = $server_url;
|
||||
}
|
||||
|
||||
$server_url = matching_url($server_url, $contact["photo"]);
|
||||
if ($server_url != "")
|
||||
if ($server_url != "") {
|
||||
$contact["server_url"] = $server_url;
|
||||
}
|
||||
|
||||
$server_url = matching_url($server_url, $contact["notify"]);
|
||||
if ($server_url != "")
|
||||
if ($server_url != "") {
|
||||
$contact["server_url"] = $server_url;
|
||||
} else
|
||||
}
|
||||
} else {
|
||||
$contact["server_url"] = normalise_link($contact["server_url"]);
|
||||
}
|
||||
|
||||
if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) {
|
||||
$hostname = str_replace("http://", "", $contact["server_url"]);
|
||||
|
|
@ -2135,11 +2198,12 @@ function update_gcontact($contact) {
|
|||
unset($fields["generation"]);
|
||||
|
||||
if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) {
|
||||
foreach ($fields AS $field => $data)
|
||||
foreach ($fields as $field => $data) {
|
||||
if ($contact[$field] != $r[0][$field]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ($contact["generation"] < $r[0]["generation"]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG);
|
||||
|
|
@ -2171,7 +2235,7 @@ function update_gcontact($contact) {
|
|||
$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
|
||||
dbesc(normalise_link($contact["url"])));
|
||||
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
|
||||
|
||||
update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
|
||||
|
|
@ -2231,10 +2295,11 @@ function update_gcontact_for_user($uid) {
|
|||
"country-name" => $r[0]["country-name"]));
|
||||
|
||||
// The "addr" field was added in 3.4.3 so it can be empty for older users
|
||||
if ($r[0]["addr"] != "")
|
||||
if ($r[0]["addr"] != "") {
|
||||
$addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
|
||||
else
|
||||
} else {
|
||||
$addr = $r[0]["addr"];
|
||||
}
|
||||
|
||||
$gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"],
|
||||
"gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"],
|
||||
|
|
@ -2262,33 +2327,37 @@ function gs_fetch_users($server) {
|
|||
$url = $server."/main/statistics";
|
||||
|
||||
$result = z_fetch_url($url);
|
||||
if (!$result["success"])
|
||||
if (!$result["success"]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$statistics = json_decode($result["body"]);
|
||||
|
||||
if (is_object($statistics->config)) {
|
||||
if ($statistics->config->instance_with_ssl)
|
||||
if ($statistics->config->instance_with_ssl) {
|
||||
$server = "https://";
|
||||
else
|
||||
} else {
|
||||
$server = "http://";
|
||||
}
|
||||
|
||||
$server .= $statistics->config->instance_address;
|
||||
|
||||
$hostname = $statistics->config->instance_address;
|
||||
} else {
|
||||
if ($statistics->instance_with_ssl)
|
||||
/// @TODO is_object() above means here no object, still $statistics is being used as object
|
||||
if ($statistics->instance_with_ssl) {
|
||||
$server = "https://";
|
||||
else
|
||||
} else {
|
||||
$server = "http://";
|
||||
}
|
||||
|
||||
$server .= $statistics->instance_address;
|
||||
|
||||
$hostname = $statistics->instance_address;
|
||||
}
|
||||
|
||||
if (is_object($statistics->users))
|
||||
foreach ($statistics->users AS $nick => $user) {
|
||||
if (is_object($statistics->users)) {
|
||||
foreach ($statistics->users as $nick => $user) {
|
||||
$profile_url = $server."/".$user->nickname;
|
||||
|
||||
$contact = array("url" => $profile_url,
|
||||
|
|
@ -2301,6 +2370,7 @@ function gs_fetch_users($server) {
|
|||
get_gcontact_id($contact);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Asking GNU Social server on a regular base for their user data
|
||||
|
|
@ -2315,10 +2385,11 @@ function gs_discover() {
|
|||
$r = q("SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
|
||||
dbesc(NETWORK_OSTATUS), dbesc($last_update));
|
||||
|
||||
if (!$r)
|
||||
if (!dbm::is_result($r)) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($r AS $server) {
|
||||
foreach ($r as $server) {
|
||||
gs_fetch_users($server["url"]);
|
||||
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
|
||||
}
|
||||
|
|
@ -2337,5 +2408,6 @@ function poco_serverlist() {
|
|||
if (!dbm::is_result($r)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $r;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,10 +108,11 @@ function create_tags_from_itemuri($itemuri, $uid) {
|
|||
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||
|
||||
if (count($messages)) {
|
||||
foreach ($messages as $message)
|
||||
foreach ($messages as $message) {
|
||||
create_tags_from_item($message["id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function update_items() {
|
||||
|
||||
|
|
|
|||
|
|
@ -109,14 +109,16 @@ class Template implements ITemplateEngine {
|
|||
//$vals = $this->r[$m[0]];
|
||||
$vals = $this->_get_var($m[0]);
|
||||
$ret = "";
|
||||
if (!is_array($vals))
|
||||
if (!is_array($vals)) {
|
||||
return $ret;
|
||||
}
|
||||
foreach ($vals as $k => $v) {
|
||||
$this->_push_stack();
|
||||
$r = $this->r;
|
||||
$r[$varname] = $v;
|
||||
if ($keyname != '')
|
||||
if ($keyname != '') {
|
||||
$r[$keyname] = (($k === 0) ? '0' : $k);
|
||||
}
|
||||
$ret .= $this->replace($args[3], $r);
|
||||
$this->_pop_stack();
|
||||
}
|
||||
|
|
|
|||
293
include/text.php
293
include/text.php
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
use Friendica\App;
|
||||
|
||||
require_once("include/template_processor.php");
|
||||
require_once("include/friendica_smarty.php");
|
||||
require_once("include/Smilies.php");
|
||||
require_once("include/map.php");
|
||||
require_once("mod/proxy.php");
|
||||
require_once "include/template_processor.php";
|
||||
require_once "include/friendica_smarty.php";
|
||||
require_once "include/Smilies.php";
|
||||
require_once "include/map.php";
|
||||
require_once "mod/proxy.php";
|
||||
|
||||
if (! function_exists('replace_macros')) {
|
||||
/**
|
||||
|
|
@ -26,12 +26,12 @@ function replace_macros($s,$r) {
|
|||
// pass $baseurl to all templates
|
||||
$r['$baseurl'] = App::get_baseurl();
|
||||
|
||||
|
||||
$t = $a->template_engine();
|
||||
try {
|
||||
$output = $t->replace_macros($s, $r);
|
||||
} catch (Exception $e) {
|
||||
echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
|
||||
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
|
||||
killme();
|
||||
}
|
||||
|
||||
$a->save_timestamp($stamp1, "rendering");
|
||||
|
|
@ -73,8 +73,7 @@ if(! function_exists('notags')) {
|
|||
* @return string Filtered string
|
||||
*/
|
||||
function notags($string) {
|
||||
|
||||
return(str_replace(array("<",">"), array('[',']'), $string));
|
||||
return str_replace(array("<", ">"), array('[', ']'), $string);
|
||||
|
||||
// High-bit filter no longer used
|
||||
// return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string));
|
||||
|
|
@ -90,8 +89,7 @@ if(! function_exists('escape_tags')) {
|
|||
* @return string
|
||||
*/
|
||||
function escape_tags($string) {
|
||||
|
||||
return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false));
|
||||
return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -107,12 +105,14 @@ if(! function_exists('autoname')) {
|
|||
*/
|
||||
function autoname($len) {
|
||||
|
||||
if($len <= 0)
|
||||
if ($len <= 0) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u');
|
||||
if(mt_rand(0,5) == 4)
|
||||
if (mt_rand(0, 5) == 4) {
|
||||
$vowels[] = 'y';
|
||||
}
|
||||
|
||||
$cons = array(
|
||||
'b','bl','br',
|
||||
|
|
@ -144,10 +144,11 @@ function autoname($len) {
|
|||
'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh');
|
||||
|
||||
$start = mt_rand(0,2);
|
||||
if($start == 0)
|
||||
if ($start == 0) {
|
||||
$table = $vowels;
|
||||
else
|
||||
} else {
|
||||
$table = $cons;
|
||||
}
|
||||
|
||||
$word = '';
|
||||
|
||||
|
|
@ -155,10 +156,11 @@ function autoname($len) {
|
|||
$r = mt_rand(0,count($table) - 1);
|
||||
$word .= $table[$r];
|
||||
|
||||
if($table == $vowels)
|
||||
if ($table == $vowels) {
|
||||
$table = array_merge($cons,$midcons);
|
||||
else
|
||||
} else {
|
||||
$table = $vowels;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -170,8 +172,9 @@ function autoname($len) {
|
|||
break;
|
||||
}
|
||||
}
|
||||
if(substr($word,-1) == 'q')
|
||||
if (substr($word, -1) == 'q') {
|
||||
$word = substr($word, 0, -1);
|
||||
}
|
||||
return $word;
|
||||
}}
|
||||
|
||||
|
|
@ -186,6 +189,7 @@ if(! function_exists('xmlify')) {
|
|||
* @return string Escaped text.
|
||||
*/
|
||||
function xmlify($str) {
|
||||
/// @TODO deprecated code found?
|
||||
/* $buffer = '';
|
||||
|
||||
$len = mb_strlen($str);
|
||||
|
|
@ -239,6 +243,7 @@ if(! function_exists('unxmlify')) {
|
|||
* @return string unescaped text
|
||||
*/
|
||||
function unxmlify($s) {
|
||||
/// @TODO deprecated code found?
|
||||
// $ret = str_replace('&','&', $s);
|
||||
// $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret);
|
||||
/*$ret = mb_ereg_replace('&', '&', $s);
|
||||
|
|
@ -258,14 +263,15 @@ if(! function_exists('hex2bin')) {
|
|||
* @return number
|
||||
*/
|
||||
function hex2bin($s) {
|
||||
if(! (is_string($s) && strlen($s)))
|
||||
if (! (is_string($s) && strlen($s))) {
|
||||
return '';
|
||||
|
||||
if(! ctype_xdigit($s)) {
|
||||
return($s);
|
||||
}
|
||||
|
||||
return(pack("H*",$s));
|
||||
if (! ctype_xdigit($s)) {
|
||||
return $s;
|
||||
}
|
||||
|
||||
return pack("H*",$s);
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -422,10 +428,11 @@ function expand_acl($s) {
|
|||
$t = str_replace('<', '', $s);
|
||||
$a = explode('>', $t);
|
||||
foreach ($a as $aa) {
|
||||
if(intval($aa))
|
||||
if (intval($aa)) {
|
||||
$ret[] = intval($aa);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}}
|
||||
|
||||
|
|
@ -435,10 +442,11 @@ if(! function_exists('sanitise_acl')) {
|
|||
* @param string $item
|
||||
*/
|
||||
function sanitise_acl(&$item) {
|
||||
if(intval($item))
|
||||
if (intval($item)) {
|
||||
$item = '<' . intval(notags(trim($item))) . '>';
|
||||
else
|
||||
} else {
|
||||
unset($item);
|
||||
}
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -454,10 +462,11 @@ if(! function_exists('perms2str')) {
|
|||
*/
|
||||
function perms2str($p) {
|
||||
$ret = '';
|
||||
if(is_array($p))
|
||||
if (is_array($p)) {
|
||||
$tmp = $p;
|
||||
else
|
||||
} else {
|
||||
$tmp = explode(',',$p);
|
||||
}
|
||||
|
||||
if (is_array($tmp)) {
|
||||
array_walk($tmp, 'sanitise_acl');
|
||||
|
|
@ -481,9 +490,9 @@ function item_new_uri($hostname,$uid, $guid = "") {
|
|||
do {
|
||||
$dups = false;
|
||||
|
||||
if ($guid == "")
|
||||
if ($guid == "") {
|
||||
$hash = get_guid(32);
|
||||
else {
|
||||
} else {
|
||||
$hash = $guid;
|
||||
$guid = "";
|
||||
}
|
||||
|
|
@ -492,9 +501,11 @@ function item_new_uri($hostname,$uid, $guid = "") {
|
|||
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
||||
dbesc($uri));
|
||||
if (dbm::is_result($r))
|
||||
if (dbm::is_result($r)) {
|
||||
$dups = true;
|
||||
}
|
||||
} while ($dups == true);
|
||||
|
||||
return $uri;
|
||||
}}
|
||||
|
||||
|
|
@ -516,9 +527,12 @@ function photo_new_resource() {
|
|||
$r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
|
||||
dbesc($resource)
|
||||
);
|
||||
if (dbm::is_result($r))
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$found = true;
|
||||
}
|
||||
} while ($found == true);
|
||||
|
||||
return $resource;
|
||||
}}
|
||||
|
||||
|
|
@ -536,8 +550,9 @@ if(! function_exists('load_view_file')) {
|
|||
*/
|
||||
function load_view_file($s) {
|
||||
global $lang, $a;
|
||||
if(! isset($lang))
|
||||
if (! isset($lang)) {
|
||||
$lang = 'en';
|
||||
}
|
||||
$b = basename($s);
|
||||
$d = dirname($s);
|
||||
if (file_exists("$d/$lang/$b")) {
|
||||
|
|
@ -576,11 +591,13 @@ function get_intltext_template($s) {
|
|||
|
||||
$a = get_app();
|
||||
$engine = '';
|
||||
if($a->theme['template_engine'] === 'smarty3')
|
||||
if ($a->theme['template_engine'] === 'smarty3') {
|
||||
$engine = "/smarty3";
|
||||
}
|
||||
|
||||
if(! isset($lang))
|
||||
if (! isset($lang)) {
|
||||
$lang = 'en';
|
||||
}
|
||||
|
||||
if (file_exists("view/lang/$lang$engine/$s")) {
|
||||
$stamp1 = microtime(true);
|
||||
|
|
@ -616,7 +633,8 @@ function get_markup_template($s, $root = '') {
|
|||
try {
|
||||
$template = $t->get_template_file($s, $root);
|
||||
} catch (Exception $e) {
|
||||
echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
|
||||
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
|
||||
killme();
|
||||
}
|
||||
|
||||
$a->save_timestamp($stamp1, "file");
|
||||
|
|
@ -636,27 +654,24 @@ function get_template_file($a, $filename, $root = '') {
|
|||
$theme = current_theme();
|
||||
|
||||
// Make sure $root ends with a slash /
|
||||
if($root !== '' && $root[strlen($root)-1] !== '/')
|
||||
if ($root !== '' && substr($root, -1, 1) !== '/') {
|
||||
$root = $root . '/';
|
||||
}
|
||||
|
||||
if(file_exists("{$root}view/theme/$theme/$filename"))
|
||||
if (file_exists("{$root}view/theme/$theme/$filename")) {
|
||||
$template_file = "{$root}view/theme/$theme/$filename";
|
||||
elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
|
||||
$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
|
||||
elseif (file_exists("{$root}/$filename"))
|
||||
} elseif (x($a->theme_info, "extends") && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename))) {
|
||||
$template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename);
|
||||
} elseif (file_exists("{$root}/$filename")) {
|
||||
$template_file = "{$root}/$filename";
|
||||
else
|
||||
} else {
|
||||
$template_file = "{$root}view/$filename";
|
||||
}
|
||||
|
||||
return $template_file;
|
||||
}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (! function_exists('attribute_contains')) {
|
||||
/**
|
||||
* for html,xml parsing - let's say you've got
|
||||
|
|
@ -674,9 +689,7 @@ if(! function_exists('attribute_contains')) {
|
|||
*/
|
||||
function attribute_contains($attr, $s) {
|
||||
$a = explode(' ', $attr);
|
||||
if(count($a) && in_array($s,$a))
|
||||
return true;
|
||||
return false;
|
||||
return (count($a) && in_array($s,$a));
|
||||
}}
|
||||
|
||||
if (! function_exists('logger')) {
|
||||
|
|
@ -830,9 +843,7 @@ if(! function_exists('activity_match')) {
|
|||
* @return boolean
|
||||
*/
|
||||
function activity_match($haystack,$needle) {
|
||||
if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA)))
|
||||
return true;
|
||||
return false;
|
||||
return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA)));
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -933,13 +944,16 @@ function contact_block() {
|
|||
$a = get_app();
|
||||
|
||||
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
|
||||
if($shown === false)
|
||||
if ($shown === false) {
|
||||
$shown = 24;
|
||||
if($shown == 0)
|
||||
}
|
||||
if ($shown == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if((! is_array($a->profile)) || ($a->profile['hide-friends']))
|
||||
if ((! is_array($a->profile)) || ($a->profile['hide-friends'])) {
|
||||
return $o;
|
||||
}
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||
WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
|
||||
AND NOT `pending` AND NOT `hidden` AND NOT `archive`
|
||||
|
|
@ -954,8 +968,7 @@ function contact_block() {
|
|||
}
|
||||
if (! $total) {
|
||||
$contacts = t('No contacts');
|
||||
$micropro = Null;
|
||||
|
||||
$micropro = null;
|
||||
} else {
|
||||
// Splitting the query in two parts makes it much faster
|
||||
$r = q("SELECT `id` FROM `contact`
|
||||
|
|
@ -1024,8 +1037,9 @@ function contact_block() {
|
|||
function micropro($contact, $redirect = false, $class = '', $textmode = false) {
|
||||
|
||||
// Use the contact URL if no address is available
|
||||
if ($contact["addr"] == "")
|
||||
if ($contact["addr"] == "") {
|
||||
$contact["addr"] = $contact["url"];
|
||||
}
|
||||
|
||||
$url = $contact['url'];
|
||||
$sparkle = '';
|
||||
|
|
@ -1038,14 +1052,15 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
|
|||
$redir = true;
|
||||
$url = $redirect_url;
|
||||
$sparkle = ' sparkle';
|
||||
}
|
||||
else
|
||||
} else {
|
||||
$url = zrl($url);
|
||||
}
|
||||
}
|
||||
|
||||
// If there is some js available we don't need the url
|
||||
if(x($contact,'click'))
|
||||
if (x($contact, 'click')) {
|
||||
$url = '';
|
||||
}
|
||||
|
||||
return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array(
|
||||
'$click' => (($contact['click']) ? $contact['click'] : ''),
|
||||
|
|
@ -1090,9 +1105,10 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true)
|
|||
t("Tags"),
|
||||
t("Contacts"));
|
||||
|
||||
if (get_config('system','poco_local_search'))
|
||||
if (get_config('system','poco_local_search')) {
|
||||
$values['$searchoption'][] = t("Forums");
|
||||
}
|
||||
}
|
||||
|
||||
return replace_macros(get_markup_template('searchbox.tpl'), $values);
|
||||
}}
|
||||
|
|
@ -1106,13 +1122,10 @@ if(! function_exists('valid_email')) {
|
|||
*/
|
||||
function valid_email($x){
|
||||
|
||||
// Removed because Fabio told me so.
|
||||
/// @TODO Removed because Fabio told me so.
|
||||
//if (get_config('system','disable_email_validation'))
|
||||
// return true;
|
||||
|
||||
if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
|
||||
return true;
|
||||
return false;
|
||||
return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x);
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -1125,7 +1138,7 @@ if(! function_exists('linkify')) {
|
|||
function linkify($s) {
|
||||
$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="_blank">$1</a>', $s);
|
||||
$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
|
||||
return($s);
|
||||
return $s;
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -1216,7 +1229,7 @@ if(! function_exists('normalise_link')) {
|
|||
*/
|
||||
function normalise_link($url) {
|
||||
$ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url);
|
||||
return(rtrim($ret,'/'));
|
||||
return rtrim($ret,'/');
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -1234,9 +1247,7 @@ if(! function_exists('link_compare')) {
|
|||
*
|
||||
*/
|
||||
function link_compare($a, $b) {
|
||||
if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
|
||||
return true;
|
||||
return false;
|
||||
return (strcasecmp(normalise_link($a), normalise_link($b)) === 0);
|
||||
}}
|
||||
|
||||
/**
|
||||
|
|
@ -1318,8 +1329,9 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
|
||||
foreach ($taglist as $tag) {
|
||||
|
||||
if ($tag["url"] == "")
|
||||
if ($tag["url"] == "") {
|
||||
$tag["url"] = $searchpath.strtolower($tag["term"]);
|
||||
}
|
||||
|
||||
if ($tag["type"] == TERM_HASHTAG) {
|
||||
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
|
||||
|
|
@ -1340,8 +1352,9 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
$update = (!local_user() and !remote_user() and ($item["uid"] == 0));
|
||||
|
||||
// Or update it if the current viewer is the intented viewer
|
||||
if (($item["uid"] == local_user()) && ($item["uid"] != 0))
|
||||
if (($item["uid"] == local_user()) && ($item["uid"] != 0)) {
|
||||
$update = true;
|
||||
}
|
||||
|
||||
put_item_in_cache($item, $update);
|
||||
$s = $item["rendered-html"];
|
||||
|
|
@ -1370,10 +1383,11 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
foreach ($matches as $mtch) {
|
||||
$mime = $mtch[3];
|
||||
|
||||
if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
|
||||
if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
|
||||
$the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
|
||||
else
|
||||
} else {
|
||||
$the_url = $mtch[1];
|
||||
}
|
||||
|
||||
if (strpos($mime, 'video') !== false) {
|
||||
if (!$vhead) {
|
||||
|
|
@ -1401,8 +1415,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
if ($filetype) {
|
||||
$filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
|
||||
$filesubtype = str_replace('.', '-', $filesubtype);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$filetype = 'unkn';
|
||||
$filesubtype = 'unkn';
|
||||
}
|
||||
|
|
@ -1433,7 +1446,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
$s = $s . $as;
|
||||
|
||||
// map
|
||||
if(strpos($s,'<div class="map">') !== false && $item['coord']) {
|
||||
if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) {
|
||||
$x = generate_map(trim($item['coord']));
|
||||
if ($x) {
|
||||
$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
|
||||
|
|
@ -1445,13 +1458,14 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
$spoilersearch = '<blockquote class="spoiler">';
|
||||
|
||||
// Remove line breaks before the spoiler
|
||||
while ((strpos($s, "\n".$spoilersearch) !== false))
|
||||
while ((strpos($s, "\n" . $spoilersearch) !== false)) {
|
||||
$s = str_replace("\n" . $spoilersearch, $spoilersearch, $s);
|
||||
while ((strpos($s, "<br />".$spoilersearch) !== false))
|
||||
}
|
||||
while ((strpos($s, "<br />" . $spoilersearch) !== false)) {
|
||||
$s = str_replace("<br />" . $spoilersearch, $spoilersearch, $s);
|
||||
}
|
||||
|
||||
while ((strpos($s, $spoilersearch) !== false)) {
|
||||
|
||||
$pos = strpos($s, $spoilersearch);
|
||||
$rnd = random_string(8);
|
||||
$spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . sprintf(t('Click to open/close')) . '</span>'.
|
||||
|
|
@ -1463,7 +1477,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
$authorsearch = '<blockquote class="author">';
|
||||
|
||||
while ((strpos($s, $authorsearch) !== false)) {
|
||||
|
||||
$pos = strpos($s, $authorsearch);
|
||||
$rnd = random_string(8);
|
||||
$authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . sprintf(t('Click to open/close')) . '</span>'.
|
||||
|
|
@ -1474,7 +1487,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
|
|||
// replace friendica image url size with theme preference
|
||||
if (x($a->theme_info, 'item_image_size')){
|
||||
$ps = $a->theme_info['item_image_size'];
|
||||
|
||||
$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
|
||||
}
|
||||
|
||||
|
|
@ -1494,12 +1506,13 @@ if(! function_exists('prepare_text')) {
|
|||
*/
|
||||
function prepare_text($text) {
|
||||
|
||||
require_once('include/bbcode.php');
|
||||
require_once 'include/bbcode.php';
|
||||
|
||||
if(stristr($text,'[nosmile]'))
|
||||
if (stristr($text, '[nosmile]')) {
|
||||
$s = bbcode($text);
|
||||
else
|
||||
} else {
|
||||
$s = Smilies::replace(bbcode($text));
|
||||
}
|
||||
|
||||
return trim($s);
|
||||
}}
|
||||
|
|
@ -1539,7 +1552,8 @@ function get_cats_and_terms($item) {
|
|||
$categories = array();
|
||||
$folders = array();
|
||||
|
||||
$matches = false; $first = true;
|
||||
$matches = false;
|
||||
$first = true;
|
||||
$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
|
||||
if ($cnt) {
|
||||
foreach ($matches as $mtch) {
|
||||
|
|
@ -1553,11 +1567,14 @@ function get_cats_and_terms($item) {
|
|||
$first = false;
|
||||
}
|
||||
}
|
||||
if (count($categories)) $categories[count($categories)-1]['last'] = true;
|
||||
|
||||
if (count($categories)) {
|
||||
$categories[count($categories) - 1]['last'] = true;
|
||||
}
|
||||
|
||||
if (local_user() == $item['uid']) {
|
||||
$matches = false; $first = true;
|
||||
$matches = false;
|
||||
$first = true;
|
||||
$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
|
||||
if ($cnt) {
|
||||
foreach ($matches as $mtch) {
|
||||
|
|
@ -1573,7 +1590,9 @@ function get_cats_and_terms($item) {
|
|||
}
|
||||
}
|
||||
|
||||
if (count($folders)) $folders[count($folders)-1]['last'] = true;
|
||||
if (count($folders)) {
|
||||
$folders[count($folders) - 1]['last'] = true;
|
||||
}
|
||||
|
||||
return array($categories, $folders);
|
||||
}
|
||||
|
|
@ -1601,18 +1620,17 @@ function get_plink($item) {
|
|||
$ret["title"] = t('link to source');
|
||||
}
|
||||
|
||||
} elseif (x($item,'plink') && ($item['private'] != 1))
|
||||
} elseif (x($item, 'plink') && ($item['private'] != 1)) {
|
||||
$ret = array(
|
||||
'href' => $item['plink'],
|
||||
'orig' => $item['plink'],
|
||||
'title' => t('link to source'),
|
||||
);
|
||||
else
|
||||
} else {
|
||||
$ret = array();
|
||||
}
|
||||
|
||||
//if (x($item,'plink') && ($item['private'] != 1))
|
||||
|
||||
return($ret);
|
||||
return $ret;
|
||||
}}
|
||||
|
||||
if (! function_exists('unamp')) {
|
||||
|
|
@ -1651,9 +1669,11 @@ function generate_user_guid() {
|
|||
$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
|
||||
dbesc($guid)
|
||||
);
|
||||
if(! count($x))
|
||||
if (! dbm::is_result($x)) {
|
||||
$found = false;
|
||||
}
|
||||
} while ($found == true );
|
||||
|
||||
return $guid;
|
||||
}
|
||||
|
||||
|
|
@ -1667,8 +1687,9 @@ function base64url_encode($s, $strip_padding = false) {
|
|||
|
||||
$s = strtr(base64_encode($s), '+/', '-_');
|
||||
|
||||
if($strip_padding)
|
||||
if ($strip_padding) {
|
||||
$s = str_replace('=','',$s);
|
||||
}
|
||||
|
||||
return $s;
|
||||
}
|
||||
|
|
@ -1816,8 +1837,11 @@ function html2bb_video($s) {
|
|||
* @return array
|
||||
*/
|
||||
function array_xmlify($val){
|
||||
if (is_bool($val)) return $val?"true":"false";
|
||||
if (is_array($val)) return array_map('array_xmlify', $val);
|
||||
if (is_bool($val)) {
|
||||
return $val?"true":"false";
|
||||
} elseif (is_array($val)) {
|
||||
return array_map('array_xmlify', $val);
|
||||
}
|
||||
return xmlify((string) $val);
|
||||
}
|
||||
|
||||
|
|
@ -1830,8 +1854,9 @@ function array_xmlify($val){
|
|||
* @return string
|
||||
*/
|
||||
function reltoabs($text, $base) {
|
||||
if (empty($base))
|
||||
if (empty($base)) {
|
||||
return $text;
|
||||
}
|
||||
|
||||
$base = rtrim($base,'/');
|
||||
|
||||
|
|
@ -1867,14 +1892,16 @@ function reltoabs($text, $base) {
|
|||
* @return string
|
||||
*/
|
||||
function item_post_type($item) {
|
||||
if(intval($item['event-id']))
|
||||
if (intval($item['event-id'])) {
|
||||
return t('event');
|
||||
if(strlen($item['resource-id']))
|
||||
} elseif (strlen($item['resource-id'])) {
|
||||
return t('photo');
|
||||
if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST)
|
||||
} elseif (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
|
||||
return t('activity');
|
||||
if($item['id'] != $item['parent'])
|
||||
} elseif ($item['id'] != $item['parent']) {
|
||||
return t('comment');
|
||||
}
|
||||
|
||||
return t('post');
|
||||
}
|
||||
|
||||
|
|
@ -1893,10 +1920,11 @@ function file_tag_decode($s) {
|
|||
|
||||
function file_tag_file_query($table,$s,$type = 'file') {
|
||||
|
||||
if($type == 'file')
|
||||
if ($type == 'file') {
|
||||
$str = preg_quote( '[' . str_replace('%', '%%', file_tag_encode($s)) . ']' );
|
||||
else
|
||||
} else {
|
||||
$str = preg_quote( '<' . str_replace('%', '%%', file_tag_encode($s)) . '>' );
|
||||
}
|
||||
return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' ";
|
||||
}
|
||||
|
||||
|
|
@ -1908,8 +1936,7 @@ function file_tag_list_to_file($list,$type = 'file') {
|
|||
if ($type == 'file') {
|
||||
$lbracket = '[';
|
||||
$rbracket = ']';
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$lbracket = '<';
|
||||
$rbracket = '>';
|
||||
}
|
||||
|
|
@ -1929,14 +1956,14 @@ function file_tag_file_to_list($file,$type = 'file') {
|
|||
$list = '';
|
||||
if ($type == 'file') {
|
||||
$cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
|
||||
}
|
||||
if ($cnt) {
|
||||
foreach ($matches as $mtch) {
|
||||
if(strlen($list))
|
||||
if (strlen($list)) {
|
||||
$list .= ',';
|
||||
}
|
||||
$list .= file_tag_decode($mtch[1]);
|
||||
}
|
||||
}
|
||||
|
|
@ -1996,10 +2023,6 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
|
|||
intval($termtype),
|
||||
intval($uid));
|
||||
|
||||
//$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
|
||||
// intval($uid)
|
||||
//);
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
unset($deleted_tags[$key]);
|
||||
}
|
||||
|
|
@ -2021,7 +2044,7 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
|
|||
}
|
||||
|
||||
function file_tag_save_file($uid, $item, $file) {
|
||||
require_once("include/files.php");
|
||||
require_once "include/files.php";
|
||||
|
||||
$result = false;
|
||||
if (! intval($uid))
|
||||
|
|
@ -2031,25 +2054,27 @@ function file_tag_save_file($uid,$item,$file) {
|
|||
intval($uid)
|
||||
);
|
||||
if (dbm::is_result($r)) {
|
||||
if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
|
||||
if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
|
||||
q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
|
||||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
}
|
||||
|
||||
create_files_from_item($item);
|
||||
|
||||
$saved = get_pconfig($uid,'system','filetags');
|
||||
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
|
||||
if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) {
|
||||
set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
|
||||
}
|
||||
info( t('Item filed') );
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function file_tag_unsave_file($uid, $item, $file, $cat = false) {
|
||||
require_once("include/files.php");
|
||||
require_once "include/files.php";
|
||||
|
||||
$result = false;
|
||||
if (! intval($uid))
|
||||
|
|
@ -2086,9 +2111,6 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
|
|||
intval($termtype),
|
||||
intval($uid));
|
||||
|
||||
//$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
|
||||
//);
|
||||
|
||||
if (! dbm::is_result($r)) {
|
||||
$saved = get_pconfig($uid,'system','filetags');
|
||||
set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
|
||||
|
|
@ -2114,7 +2136,7 @@ function undo_post_tagging($s) {
|
|||
}
|
||||
|
||||
function protect_sprintf($s) {
|
||||
return(str_replace('%','%%',$s));
|
||||
return str_replace('%', '%%', $s);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2175,11 +2197,12 @@ function formatBytes($bytes, $precision = 2) {
|
|||
*/
|
||||
function format_network_name($network, $url = 0) {
|
||||
if ($network != "") {
|
||||
require_once('include/contact_selectors.php');
|
||||
if ($url != "")
|
||||
require_once 'include/contact_selectors.php';
|
||||
if ($url != "") {
|
||||
$network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>";
|
||||
else
|
||||
} else {
|
||||
$network_name = network_to_name($network);
|
||||
}
|
||||
|
||||
return $network_name;
|
||||
}
|
||||
|
|
@ -2211,16 +2234,15 @@ function text_highlight($s, $lang) {
|
|||
$s = trim(html_entity_decode($s, ENT_COMPAT));
|
||||
$s = str_replace(' ', "\t", $s);
|
||||
|
||||
// The highlighter library insists on an opening php tag for php code blocks. If
|
||||
// it isn't present, nothing is highlighted. So we're going to see if it's present.
|
||||
// If not, we'll add it, and then quietly remove it after we get the processed output back.
|
||||
|
||||
if ($lang === 'php') {
|
||||
if (strpos($s, '<?php') !== 0) {
|
||||
/*
|
||||
* The highlighter library insists on an opening php tag for php code blocks. If
|
||||
* it isn't present, nothing is highlighted. So we're going to see if it's present.
|
||||
* If not, we'll add it, and then quietly remove it after we get the processed output back.
|
||||
*/
|
||||
if ($lang === 'php' && strpos($s, '<?php') !== 0) {
|
||||
$s = '<?php' . "\n" . $s;
|
||||
$tag_added = true;
|
||||
}
|
||||
}
|
||||
|
||||
$renderer = new Text_Highlighter_Renderer_Html($options);
|
||||
$hl = Text_Highlighter::factory($lang);
|
||||
|
|
@ -2228,7 +2250,6 @@ function text_highlight($s, $lang) {
|
|||
$o = $hl->highlight($s);
|
||||
$o = str_replace("\n", '', $o);
|
||||
|
||||
|
||||
if ($tag_added) {
|
||||
$b = substr($o, 0, strpos($o, '<li>'));
|
||||
$e = substr($o, strpos($o, '</li>'));
|
||||
|
|
|
|||
|
|
@ -177,29 +177,34 @@ function add_shadow_entry($itemid) {
|
|||
function update_thread_uri($itemuri, $uid) {
|
||||
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||
|
||||
if (dbm::is_result($messages))
|
||||
foreach ($messages as $message)
|
||||
if (dbm::is_result($messages)) {
|
||||
foreach ($messages as $message) {
|
||||
update_thread($message["id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function update_thread($itemid, $setmention = false) {
|
||||
$items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
|
||||
`deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
|
||||
|
||||
if (!dbm::is_result($items))
|
||||
if (!dbm::is_result($items)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$item = $items[0];
|
||||
|
||||
if ($setmention)
|
||||
if ($setmention) {
|
||||
$item["mention"] = 1;
|
||||
}
|
||||
|
||||
$sql = "";
|
||||
|
||||
foreach ($item AS $field => $data)
|
||||
if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
|
||||
if ($sql != "")
|
||||
if ($sql != "") {
|
||||
$sql .= ", ";
|
||||
}
|
||||
|
||||
$sql .= "`".$field."` = '".dbesc($data)."'";
|
||||
}
|
||||
|
|
@ -211,8 +216,9 @@ function update_thread($itemid, $setmention = false) {
|
|||
// Updating a shadow item entry
|
||||
$items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
|
||||
|
||||
if (!$items)
|
||||
if (!dbm::is_result($items)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
|
||||
dbesc($item["title"]),
|
||||
|
|
@ -227,10 +233,12 @@ function update_thread($itemid, $setmention = false) {
|
|||
function delete_thread_uri($itemuri, $uid) {
|
||||
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||
|
||||
if(count($messages))
|
||||
foreach ($messages as $message)
|
||||
if (dbm::is_result($messages)) {
|
||||
foreach ($messages as $message) {
|
||||
delete_thread($message["id"], $itemuri);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function delete_thread($itemid, $itemuri = "") {
|
||||
$item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
|
||||
|
|
|
|||
Loading…
Reference in a new issue