Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
# Conflicts: # include/follow.php
This commit is contained in:
Hypolite Petovan
commit
e8e1f9253d
35
boot.php
35
boot.php
|
|
@ -767,7 +767,7 @@ class App {
|
|||
|
||||
}
|
||||
|
||||
function get_basepath() {
|
||||
public static function get_basepath() {
|
||||
|
||||
$basepath = get_config("system", "basepath");
|
||||
|
||||
|
|
@ -1191,7 +1191,7 @@ class App {
|
|||
q("START TRANSACTION");
|
||||
|
||||
$r = q("SELECT `pid` FROM `process` WHERE `pid` = %d", intval(getmypid()));
|
||||
if(!dbm::is_result($r)) {
|
||||
if (!dbm::is_result($r)) {
|
||||
q("INSERT INTO `process` (`pid`,`command`,`created`) VALUES (%d, '%s', '%s')",
|
||||
intval(getmypid()),
|
||||
dbesc($command),
|
||||
|
|
@ -1207,7 +1207,7 @@ class App {
|
|||
q("START TRANSACTION");
|
||||
|
||||
$r = q("SELECT `pid` FROM `process`");
|
||||
if(dbm::is_result($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r AS $process) {
|
||||
if (!posix_kill($process["pid"], 0)) {
|
||||
q("DELETE FROM `process` WHERE `pid` = %d", intval($process["pid"]));
|
||||
|
|
@ -1294,10 +1294,6 @@ class App {
|
|||
*/
|
||||
function max_processes_reached() {
|
||||
|
||||
// Is the function called statically?
|
||||
if (!is_object($this))
|
||||
return(self::$a->max_processes_reached());
|
||||
|
||||
if ($this->is_backend()) {
|
||||
$process = "backend";
|
||||
$max_processes = get_config('system', 'max_processes_backend');
|
||||
|
|
@ -1329,10 +1325,6 @@ class App {
|
|||
*/
|
||||
function maxload_reached() {
|
||||
|
||||
// Is the function called statically?
|
||||
if (!is_object($this))
|
||||
return(self::$a->maxload_reached());
|
||||
|
||||
if ($this->is_backend()) {
|
||||
$process = "backend";
|
||||
$maxsysload = intval(get_config('system', 'maxloadavg'));
|
||||
|
|
@ -1479,17 +1471,18 @@ function system_unavailable() {
|
|||
|
||||
|
||||
function clean_urls() {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
// if($a->config['system']['clean_urls'])
|
||||
return true;
|
||||
// return false;
|
||||
}
|
||||
|
||||
function z_path() {
|
||||
global $a;
|
||||
$base = $a->get_baseurl();
|
||||
$base = App::get_baseurl();
|
||||
|
||||
if(! clean_urls())
|
||||
$base .= '/?q=';
|
||||
|
||||
return $base;
|
||||
}
|
||||
|
||||
|
|
@ -1499,10 +1492,10 @@ function z_path() {
|
|||
* @see App::get_baseurl()
|
||||
*
|
||||
* @return string
|
||||
* @TODO Maybe super-flous and deprecated? Seems to only wrap App::get_baseurl()
|
||||
*/
|
||||
function z_root() {
|
||||
global $a;
|
||||
return $a->get_baseurl();
|
||||
return App::get_baseurl();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1685,7 +1678,7 @@ function run_update_function($x) {
|
|||
function check_plugins(&$a) {
|
||||
|
||||
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$installed = $r;
|
||||
else
|
||||
$installed = array();
|
||||
|
|
@ -1903,7 +1896,7 @@ function info($s) {
|
|||
* @return int
|
||||
*/
|
||||
function get_max_import_size() {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
|
||||
}
|
||||
|
||||
|
|
@ -2029,7 +2022,7 @@ function current_theme(){
|
|||
$r = q("select theme from user where uid = %d limit 1",
|
||||
intval($a->profile_uid)
|
||||
);
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$page_theme = $r[0]['theme'];
|
||||
}
|
||||
|
||||
|
|
@ -2100,7 +2093,7 @@ function current_theme(){
|
|||
* @return string
|
||||
*/
|
||||
function current_theme_url() {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$t = current_theme();
|
||||
|
||||
|
|
@ -2142,7 +2135,7 @@ function feed_birthday($uid,$tz) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(dbm::is_result($p)) {
|
||||
if (dbm::is_result($p)) {
|
||||
$tmp_dob = substr($p[0]['dob'],5);
|
||||
if(intval($tmp_dob)) {
|
||||
$y = datetime_convert($tz,$tz,'now','Y');
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ function contact_remove($id) {
|
|||
$r = q("select uid from contact where id = %d limit 1",
|
||||
intval($id)
|
||||
);
|
||||
if((! count($r)) || (! intval($r[0]['uid'])))
|
||||
if((! dbm::is_result($r)) || (! intval($r[0]['uid'])))
|
||||
return;
|
||||
|
||||
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
|
||||
|
|
@ -93,20 +93,13 @@ function terminate_friendship($user,$self,$contact) {
|
|||
|
||||
if($contact['network'] === NETWORK_OSTATUS) {
|
||||
|
||||
$slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
|
||||
'$name' => $user['username'],
|
||||
'$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
|
||||
'$photo' => $self['photo'],
|
||||
'$thumb' => $self['thumb'],
|
||||
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
||||
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
|
||||
'$title' => '',
|
||||
'$type' => 'text',
|
||||
'$content' => t('stopped following'),
|
||||
'$nick' => $user['nickname'],
|
||||
'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
|
||||
'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
|
||||
));
|
||||
require_once('include/ostatus.php');
|
||||
|
||||
// create an unfollow slap
|
||||
$item = array();
|
||||
$item['verb'] = NAMESPACE_OSTATUS."/unfollow";
|
||||
$item['follow'] = $contact["url"];
|
||||
$slap = ostatus::salmon($item, $user);
|
||||
|
||||
if((x($contact,'notify')) && (strlen($contact['notify']))) {
|
||||
require_once('include/salmon.php');
|
||||
|
|
@ -249,7 +242,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
|
|||
FROM `gcontact` WHERE `nurl` = '%s'",
|
||||
dbesc(normalise_link($url)));
|
||||
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
// If there is more than one entry we filter out the connector networks
|
||||
if (count($r) > 1) {
|
||||
foreach ($r AS $id => $result) {
|
||||
|
|
@ -435,7 +428,7 @@ function random_profile() {
|
|||
ORDER BY rand() LIMIT 1",
|
||||
dbesc(NETWORK_DFRN));
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return dirname($r[0]['url']);
|
||||
return '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<?php
|
||||
namespace Friendica\Core;
|
||||
|
||||
use dbm;
|
||||
|
||||
/**
|
||||
* @file include/Core/Config.php
|
||||
*
|
||||
|
|
@ -30,10 +33,10 @@ class Config {
|
|||
* @return void
|
||||
*/
|
||||
public static function load($family) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s' ORDER BY `cat`, `k`, `id`", dbesc($family));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$k = $rr['k'];
|
||||
if ($family === 'config') {
|
||||
|
|
@ -72,7 +75,7 @@ class Config {
|
|||
*/
|
||||
public static function get($family, $key, $default_value = null, $refresh = false) {
|
||||
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
if (!$refresh) {
|
||||
// Looking if the whole family isn't set
|
||||
|
|
@ -123,7 +126,7 @@ class Config {
|
|||
* @return mixed Stored $value or false if the database update failed
|
||||
*/
|
||||
public static function set($family, $key, $value) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$stored = self::get($family, $key);
|
||||
|
||||
|
|
@ -171,7 +174,7 @@ class Config {
|
|||
*/
|
||||
public static function delete($family, $key) {
|
||||
|
||||
global $a;
|
||||
$a = get_app();
|
||||
if (x($a->config[$family],$key)) {
|
||||
unset($a->config[$family][$key]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<?php
|
||||
namespace Friendica\Core;
|
||||
|
||||
use dbm;
|
||||
|
||||
/**
|
||||
* @file include/Core/PConfig.php
|
||||
* @brief contains the class with methods for the management
|
||||
|
|
@ -28,12 +31,12 @@ class PConfig {
|
|||
* @return void
|
||||
*/
|
||||
public static function load($uid, $family) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
$r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d ORDER BY `cat`, `k`, `id`",
|
||||
dbesc($family),
|
||||
intval($uid)
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$k = $rr['k'];
|
||||
$a->config[$uid][$family][$k] = $rr['v'];
|
||||
|
|
@ -65,7 +68,7 @@ class PConfig {
|
|||
*/
|
||||
public static function get($uid, $family, $key, $default_value = null, $refresh = false) {
|
||||
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
if (!$refresh) {
|
||||
// Looking if the whole family isn't set
|
||||
|
|
@ -120,7 +123,7 @@ class PConfig {
|
|||
*/
|
||||
public static function set($uid, $family, $key, $value) {
|
||||
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$stored = self::get($uid, $family, $key);
|
||||
|
||||
|
|
@ -171,7 +174,7 @@ class PConfig {
|
|||
*/
|
||||
public static function delete($uid,$family,$key) {
|
||||
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
if (x($a->config[$uid][$family], $key)) {
|
||||
unset($a->config[$uid][$family][$key]);
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class ForumManager {
|
|||
$total = count($contacts);
|
||||
$visible_forums = 10;
|
||||
|
||||
if(dbm::is_result($contacts)) {
|
||||
if (dbm::is_result($contacts)) {
|
||||
|
||||
$id = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class NotificationsManager {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $this->_set_extra($r);
|
||||
|
||||
return false;
|
||||
|
|
@ -105,7 +105,7 @@ class NotificationsManager {
|
|||
intval($id),
|
||||
intval(local_user())
|
||||
);
|
||||
if(dbm::is_result($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
return $this->_set_extra($r)[0];
|
||||
}
|
||||
return null;
|
||||
|
|
@ -358,7 +358,7 @@ class NotificationsManager {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
|
||||
return 0;
|
||||
|
|
@ -401,7 +401,7 @@ class NotificationsManager {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$notifs = $this->formatNotifs($r, $ident);
|
||||
|
||||
$arr = array (
|
||||
|
|
@ -430,7 +430,7 @@ class NotificationsManager {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
|
||||
return 0;
|
||||
|
|
@ -466,7 +466,7 @@ class NotificationsManager {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$notifs = $this->formatNotifs($r, $ident);
|
||||
|
||||
$arr = array (
|
||||
|
|
@ -520,7 +520,7 @@ class NotificationsManager {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
|
||||
return 0;
|
||||
|
|
@ -564,7 +564,7 @@ class NotificationsManager {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$notifs = $this->formatNotifs($r, $ident);
|
||||
|
||||
$arr = array (
|
||||
|
|
@ -596,7 +596,7 @@ class NotificationsManager {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
|
||||
return 0;
|
||||
|
|
@ -638,7 +638,7 @@ class NotificationsManager {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$notifs = $this->formatNotifs($r, $ident);
|
||||
|
||||
$arr = array (
|
||||
|
|
@ -668,7 +668,7 @@ class NotificationsManager {
|
|||
intval($_SESSION['uid'])
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
|
||||
return 0;
|
||||
|
|
@ -713,7 +713,7 @@ class NotificationsManager {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if(dbm::is_result($r))
|
||||
if (dbm::is_result($r))
|
||||
$notifs = $this->formatIntros($r);
|
||||
|
||||
$arr = array (
|
||||
|
|
|
|||
|
|
@ -1084,7 +1084,7 @@ class Probe {
|
|||
|
||||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
|
||||
|
||||
if(count($x) && count($r)) {
|
||||
if (dbm::is_result($x) && dbm::is_result($r)) {
|
||||
$mailbox = construct_mailbox_name($r[0]);
|
||||
$password = '';
|
||||
openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
|
|||
|
||||
call_hooks($a->module . '_pre_' . $selname, $arr);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if((is_array($preselected)) && in_array($rr['id'], $preselected))
|
||||
$selected = " selected=\"selected\" ";
|
||||
|
|
@ -144,7 +144,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
|
|||
|
||||
call_hooks($a->module . '_pre_' . $selname, $arr);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if((is_array($preselected)) && in_array($rr['id'], $preselected))
|
||||
$selected = " selected=\"selected\" ";
|
||||
|
|
@ -220,7 +220,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
|
|||
|
||||
$receiverlist = array();
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if((is_array($preselected)) && in_array($rr['id'], $preselected))
|
||||
$selected = " selected=\"selected\" ";
|
||||
|
|
@ -314,7 +314,7 @@ function populate_acl($user = null, $show_jotnets = false) {
|
|||
$r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$mail_enabled = true;
|
||||
if(intval($r[0]['pubmail']))
|
||||
$pubmail_enabled = true;
|
||||
|
|
@ -577,7 +577,7 @@ function acl_lookup(&$a, $out_type = 'json') {
|
|||
$r = array();
|
||||
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $g){
|
||||
$contacts[] = array(
|
||||
"type" => "c",
|
||||
|
|
@ -612,7 +612,7 @@ function acl_lookup(&$a, $out_type = 'json') {
|
|||
dbesc($search),
|
||||
implode("','", $known_contacts)
|
||||
);
|
||||
if (is_array($r) && count($r)){
|
||||
if (dbm::is_result($r)){
|
||||
foreach($r as $row) {
|
||||
// nickname..
|
||||
$up = parse_url($row['author-link']);
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@
|
|||
dbesc(trim($user)),
|
||||
dbesc($encrypted)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$record = $r[0];
|
||||
}
|
||||
|
||||
|
|
@ -408,13 +408,13 @@
|
|||
if (is_null($user_info)) $user_info = api_get_user($a);
|
||||
$arr['$user'] = $user_info;
|
||||
$arr['$rss'] = array(
|
||||
'alternate' => $user_info['url'],
|
||||
'self' => App::get_baseurl(). "/". $a->query_string,
|
||||
'base' => App::get_baseurl(),
|
||||
'updated' => api_date(null),
|
||||
'alternate' => $user_info['url'],
|
||||
'self' => App::get_baseurl(). "/". $a->query_string,
|
||||
'base' => App::get_baseurl(),
|
||||
'updated' => api_date(null),
|
||||
'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME),
|
||||
'language' => $user_info['language'],
|
||||
'logo' => App::get_baseurl()."/images/friendica-32.png",
|
||||
'language' => $user_info['language'],
|
||||
'logo' => App::get_baseurl()."/images/friendica-32.png",
|
||||
);
|
||||
|
||||
return $arr;
|
||||
|
|
@ -1326,10 +1326,10 @@
|
|||
|
||||
if (isset($_GET["q"])) {
|
||||
$r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"]));
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"]));
|
||||
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$k = 0;
|
||||
foreach ($r AS $user) {
|
||||
$user_info = api_get_user($a, $user["id"], "json");
|
||||
|
|
@ -2755,7 +2755,7 @@
|
|||
intval(api_user())
|
||||
);
|
||||
|
||||
if(!dbm::is_result($r))
|
||||
if (!dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$ids = array();
|
||||
|
|
@ -3174,7 +3174,7 @@
|
|||
intval(api_user())
|
||||
);
|
||||
|
||||
if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
|
||||
if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
|
||||
throw new BadRequestException("Unknown contact");
|
||||
|
||||
$cid = $r[0]['id'];
|
||||
|
|
@ -3526,7 +3526,7 @@
|
|||
intval($uid),
|
||||
intval($gid));
|
||||
// error message if specified gid is not in database
|
||||
if (count($r) == 0)
|
||||
if (!dbm::is_result($r))
|
||||
throw new BadRequestException("gid not available");
|
||||
}
|
||||
else
|
||||
|
|
@ -3581,7 +3581,7 @@
|
|||
intval($uid),
|
||||
intval($gid));
|
||||
// error message if specified gid is not in database
|
||||
if (count($r) == 0)
|
||||
if (!dbm::is_result($r))
|
||||
throw new BadRequestException('gid not available');
|
||||
|
||||
// get data of the specified group id and group name
|
||||
|
|
@ -3919,7 +3919,9 @@
|
|||
|
||||
$profile_url = $user_info["url"];
|
||||
// message if nothing was found
|
||||
if (count($r) == 0)
|
||||
if (!dbm::is_result($r))
|
||||
$success = array('success' => false, 'search_results' => 'problem with query');
|
||||
else if (count($r) == 0)
|
||||
$success = array('success' => false, 'search_results' => 'nothing found');
|
||||
else {
|
||||
$ret = Array();
|
||||
|
|
@ -3941,7 +3943,6 @@
|
|||
}
|
||||
api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_messages_search', true);
|
||||
|
||||
|
||||
/**
|
||||
* @brief return data of all the profiles a user has to the client
|
||||
*
|
||||
|
|
@ -3966,7 +3967,7 @@
|
|||
intval(api_user()),
|
||||
intval($profileid));
|
||||
// error message if specified gid is not in database
|
||||
if (count($r) == 0)
|
||||
if (!dbm::is_result($r))
|
||||
throw new BadRequestException("profile_id not available");
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($_SESSION['visitor_id'])
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->contact = $r[0];
|
||||
}
|
||||
}
|
||||
|
|
@ -73,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
intval($_SESSION['uid'])
|
||||
);
|
||||
|
||||
if (!count($r)) {
|
||||
if (!dbm::is_result($r)) {
|
||||
nuke_session();
|
||||
goaway(z_root());
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
dbesc(trim($_POST['username'])),
|
||||
dbesc($encrypted)
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$record = $r[0];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ class exAuth {
|
|||
* @param array $aCommand The command array
|
||||
*/
|
||||
private function isuser($aCommand) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
// Check if there is a username
|
||||
if (!isset($aCommand[1])) {
|
||||
|
|
@ -159,14 +159,19 @@ class exAuth {
|
|||
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
|
||||
$this->writeDebugLog("[debug] checking isuser for ". $sUser."@".$aCommand[2]);
|
||||
|
||||
// If the hostnames doesn't match, we try to check remotely
|
||||
if ($a->get_hostname() != $aCommand[2])
|
||||
$found = $this->check_user($aCommand[2], $aCommand[1], true);
|
||||
else {
|
||||
// Does the hostname match? So we try directly
|
||||
if ($a->get_hostname() == $aCommand[2]) {
|
||||
$sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
|
||||
$this->writeDebugLog("[debug] using query ". $sQuery);
|
||||
$r = q($sQuery);
|
||||
$found = dbm::is_result($r);
|
||||
} else {
|
||||
$found = false;
|
||||
}
|
||||
|
||||
// If the hostnames doesn't match or there is some failure, we try to check remotely
|
||||
if (!$found) {
|
||||
$found = $this->check_user($aCommand[2], $aCommand[1], true);
|
||||
}
|
||||
|
||||
if ($found) {
|
||||
|
|
@ -214,7 +219,7 @@ class exAuth {
|
|||
* @param array $aCommand The command array
|
||||
*/
|
||||
private function auth($aCommand) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
// check user authentication
|
||||
if (sizeof($aCommand) != 4) {
|
||||
|
|
@ -227,10 +232,8 @@ class exAuth {
|
|||
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
|
||||
$this->writeDebugLog("[debug] doing auth for ".$sUser."@".$aCommand[2]);
|
||||
|
||||
// If the hostnames doesn't match, we try to authenticate remotely
|
||||
if ($a->get_hostname() != $aCommand[2])
|
||||
$Error = !$this->check_credentials($aCommand[2], $aCommand[1], $aCommand[3], true);
|
||||
else {
|
||||
// Does the hostname match? So we try directly
|
||||
if ($a->get_hostname() == $aCommand[2]) {
|
||||
$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
|
||||
$this->writeDebugLog("[debug] using query ". $sQuery);
|
||||
if ($oResult = q($sQuery)) {
|
||||
|
|
@ -246,6 +249,13 @@ class exAuth {
|
|||
$this->writeLog("[exAuth] got password ".$oConfig[0]["v"]);
|
||||
$Error = ($aCommand[3] != $oConfig[0]["v"]);
|
||||
}
|
||||
} else {
|
||||
$Error = true;
|
||||
}
|
||||
|
||||
// If the hostnames doesn't match or there is some failure, we try to check remotely
|
||||
if ($Error) {
|
||||
$Error = !$this->check_credentials($aCommand[2], $aCommand[1], $aCommand[3], true);
|
||||
}
|
||||
|
||||
if ($Error) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ function contact_profile_assign($current,$foreign_net) {
|
|||
$r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
|
||||
intval($_SESSION['uid']));
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ function networks_widget($baseurl,$selected = '') {
|
|||
);
|
||||
|
||||
$nets = array();
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
require_once('include/contact_selectors.php');
|
||||
foreach($r as $rr) {
|
||||
if($rr['network'])
|
||||
|
|
@ -204,13 +204,13 @@ function common_friends_visitor_widget($profile_uid) {
|
|||
dbesc(normalise_link(get_my_url())),
|
||||
intval($profile_uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$cid = $r[0]['id'];
|
||||
else {
|
||||
$r = q("select id from gcontact where nurl = '%s' limit 1",
|
||||
dbesc(normalise_link(get_my_url()))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$zcid = $r[0]['id'];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ function localize_item(&$item){
|
|||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
||||
dbesc($item['parent-uri']));
|
||||
if(count($r)==0) return;
|
||||
if (!dbm::is_result($r)) return;
|
||||
$obj=$r[0];
|
||||
|
||||
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
|
||||
|
|
@ -245,7 +245,7 @@ function localize_item(&$item){
|
|||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
||||
dbesc($item['parent-uri']));
|
||||
if(count($r)==0) return;
|
||||
if (!dbm::is_result($r)) return;
|
||||
$obj=$r[0];
|
||||
|
||||
$author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
|
||||
|
|
@ -294,7 +294,7 @@ function localize_item(&$item){
|
|||
dbesc($obj->id),
|
||||
intval($item['uid'])
|
||||
);
|
||||
if(count($r) && $r[0]['plink']) {
|
||||
if (dbm::is_result($r) && $r[0]['plink']) {
|
||||
$target = $r[0];
|
||||
$Bname = $target['author-name'];
|
||||
$Blink = $target['author-link'];
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
|
|||
|
||||
require_once("boot.php");
|
||||
require_once("include/photos.php");
|
||||
require_once("include/user.php");
|
||||
|
||||
|
||||
function cron_run(&$argv, &$argc){
|
||||
|
|
@ -42,7 +43,7 @@ function cron_run(&$argv, &$argc){
|
|||
|
||||
// Don't check this stuff if the function is called by the poller
|
||||
if (App::callstack() != "poller_run") {
|
||||
if (App::maxload_reached())
|
||||
if ($a->maxload_reached())
|
||||
return;
|
||||
if (App::is_already_running('cron', 'include/cron.php', 540))
|
||||
return;
|
||||
|
|
@ -433,7 +434,7 @@ function cron_repair_diaspora(&$a) {
|
|||
$r = q("SELECT `id`, `url` FROM `contact`
|
||||
WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
|
||||
ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r AS $contact) {
|
||||
if (poco_reachable($contact["url"])) {
|
||||
$data = probe_url($contact["url"]);
|
||||
|
|
@ -454,6 +455,16 @@ function cron_repair_diaspora(&$a) {
|
|||
*/
|
||||
function cron_repair_database() {
|
||||
|
||||
// Sometimes there seem to be issues where the "self" contact vanishes.
|
||||
// We haven't found the origin of the problem by now.
|
||||
$r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r AS $user) {
|
||||
logger('Create missing self contact for user '.$user['uid']);
|
||||
user_create_self_contact($user['uid']);
|
||||
}
|
||||
}
|
||||
|
||||
// Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
|
||||
// This call is very "cheap" so we can do it at any time without a problem
|
||||
q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
|
||||
|
|
@ -463,7 +474,7 @@ function cron_repair_database() {
|
|||
|
||||
// Update the global contacts for local users
|
||||
$r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
|
||||
if ($r)
|
||||
if (dbm::is_result($r))
|
||||
foreach ($r AS $user)
|
||||
update_gcontact_for_user($user["uid"]);
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ function cronhooks_run(&$argv, &$argc){
|
|||
|
||||
// Don't check this stuff if the function is called by the poller
|
||||
if (App::callstack() != "poller_run") {
|
||||
if (App::maxload_reached())
|
||||
if ($a->maxload_reached())
|
||||
return;
|
||||
if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -552,7 +552,7 @@ function update_contact_birthdays() {
|
|||
// In-network birthdays are handled within local_delivery
|
||||
|
||||
$r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` ");
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
|
||||
logger('update_contact_birthday: ' . $rr['bd']);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class dba {
|
|||
public $error = false;
|
||||
|
||||
function __construct($server, $user, $pass, $db, $install = false) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ class dba {
|
|||
}
|
||||
|
||||
public function q($sql, $onlyquery = false) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
if (!$this->db || !$this->connected) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class dba {
|
|||
public $error = false;
|
||||
|
||||
function __construct($server,$user,$pass,$db,$install = false) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
# work around, to store the database - configuration in DDDBL
|
||||
$objDataObjectPool = new \DDDBL\DataObjectPool('Database-Definition');
|
||||
|
|
@ -99,7 +99,7 @@ class dba {
|
|||
}
|
||||
|
||||
public function q($sql, $onlyquery = false) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI';
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,14 @@ function update_fail($update_id, $error_message){
|
|||
$admin_mail_list
|
||||
);
|
||||
|
||||
// No valid result?
|
||||
if (!dbm::is_result($adminlist)) {
|
||||
logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_WARNING);
|
||||
|
||||
// Don't continue
|
||||
return;
|
||||
}
|
||||
|
||||
// every admin could had different language
|
||||
|
||||
foreach ($adminlist as $admin) {
|
||||
|
|
@ -73,7 +81,7 @@ function table_structure($table) {
|
|||
$fielddata = array();
|
||||
$indexdata = array();
|
||||
|
||||
if (is_array($indexes))
|
||||
if (dbm::is_result($indexes))
|
||||
foreach ($indexes AS $index) {
|
||||
if ($index["Index_type"] == "FULLTEXT")
|
||||
continue;
|
||||
|
|
@ -93,7 +101,7 @@ function table_structure($table) {
|
|||
$indexdata[$index["Key_name"]][] = $column;
|
||||
}
|
||||
|
||||
if (is_array($structures)) {
|
||||
if (dbm::is_result($structures)) {
|
||||
foreach($structures AS $field) {
|
||||
$fielddata[$field["Field"]]["type"] = $field["Type"];
|
||||
if ($field["Null"] == "NO")
|
||||
|
|
@ -151,6 +159,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
|
|||
foreach ($tables AS $table) {
|
||||
$table = current($table);
|
||||
|
||||
logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
|
||||
$database[$table] = table_structure($table);
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +188,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
|
|||
$sql3="";
|
||||
if (!isset($database[$name])) {
|
||||
$r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
|
||||
if(false === $r) {
|
||||
if (!dbm::is_result($r)) {
|
||||
$errors .= t('Errors encountered creating database tables.').$name.EOL;
|
||||
}
|
||||
$is_new_table = True;
|
||||
|
|
@ -256,7 +265,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
|
|||
|
||||
if ($action) {
|
||||
$r = @$db->q($sql3);
|
||||
if(false === $r)
|
||||
if (dbm::is_result($r))
|
||||
$errors .= t('Errors encountered performing database changes.').$sql3.EOL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,11 +53,11 @@ function delivery_run(&$argv, &$argc){
|
|||
dbesc($item_id),
|
||||
dbesc($contact_id)
|
||||
);
|
||||
if (!count($r)) {
|
||||
if (!dbm::is_result($r)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (App::maxload_reached())
|
||||
if ($a->maxload_reached())
|
||||
return;
|
||||
|
||||
// It's ours to deliver. Remove it from the queue.
|
||||
|
|
@ -131,7 +131,7 @@ function delivery_run(&$argv, &$argc){
|
|||
intval($item_id)
|
||||
);
|
||||
|
||||
if ((!count($r)) || (!intval($r[0]['parent']))) {
|
||||
if ((!dbm::is_result($r)) || (!intval($r[0]['parent']))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ function delivery_run(&$argv, &$argc){
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
continue;
|
||||
|
||||
$owner = $r[0];
|
||||
|
|
@ -254,7 +254,7 @@ function delivery_run(&$argv, &$argc){
|
|||
intval($contact_id)
|
||||
);
|
||||
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$contact = $r[0];
|
||||
|
||||
if ($contact['self'])
|
||||
|
|
@ -423,7 +423,7 @@ function delivery_run(&$argv, &$argc){
|
|||
intval($argv[2]),
|
||||
intval($uid)
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$it = $r[0];
|
||||
}
|
||||
if (!$it)
|
||||
|
|
@ -478,14 +478,14 @@ function delivery_run(&$argv, &$argc){
|
|||
dbesc($it['parent-uri']),
|
||||
intval($uid));
|
||||
|
||||
if (count($r) AND ($r[0]['title'] != ''))
|
||||
if (dbm::is_result($r) AND ($r[0]['title'] != ''))
|
||||
$subject = $r[0]['title'];
|
||||
else {
|
||||
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($it['parent-uri']),
|
||||
intval($uid));
|
||||
|
||||
if (count($r) AND ($r[0]['title'] != ''))
|
||||
if (dbm::is_result($r) AND ($r[0]['title'] != ''))
|
||||
$subject = $r[0]['title'];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class dfrn {
|
|||
dbesc($owner_nick)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
$owner = $r[0];
|
||||
|
|
@ -139,7 +139,7 @@ class dfrn {
|
|||
intval($owner_id)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
$contact = $r[0];
|
||||
|
|
@ -1443,6 +1443,7 @@ class dfrn {
|
|||
* @param array $importer Record of the importer user mixed with contact of the content
|
||||
*/
|
||||
private function process_suggestion($xpath, $suggestion, $importer) {
|
||||
$a = get_app();
|
||||
|
||||
logger("Processing suggestions");
|
||||
|
||||
|
|
@ -1462,7 +1463,7 @@ class dfrn {
|
|||
dbesc(normalise_link($suggest["url"])),
|
||||
intval($suggest["uid"])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return false;
|
||||
|
||||
// Do we already have an fcontact record for this person?
|
||||
|
|
@ -1473,7 +1474,7 @@ class dfrn {
|
|||
dbesc($suggest["name"]),
|
||||
dbesc($suggest["request"])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$fid = $r[0]["id"];
|
||||
|
||||
// OK, we do. Do we already have an introduction for this person ?
|
||||
|
|
@ -1481,7 +1482,7 @@ class dfrn {
|
|||
intval($suggest["uid"]),
|
||||
intval($fid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return false;
|
||||
}
|
||||
if(!$fid)
|
||||
|
|
@ -1496,7 +1497,7 @@ class dfrn {
|
|||
dbesc($suggest["name"]),
|
||||
dbesc($suggest["request"])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$fid = $r[0]["id"];
|
||||
else
|
||||
// database record did not get created. Quietly give up.
|
||||
|
|
@ -1745,7 +1746,7 @@ class dfrn {
|
|||
LIMIT 1",
|
||||
dbesc($item["parent-uri"])
|
||||
);
|
||||
if($r && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
|
||||
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s')
|
||||
|
|
@ -1757,7 +1758,7 @@ class dfrn {
|
|||
dbesc($r[0]["parent-uri"]),
|
||||
intval($importer["importer_uid"])
|
||||
);
|
||||
if($r && count($r))
|
||||
if (dbm::is_result($r))
|
||||
$is_a_remote_action = true;
|
||||
}
|
||||
|
||||
|
|
@ -1895,7 +1896,7 @@ class dfrn {
|
|||
dbesc($item["verb"]),
|
||||
dbesc($item["parent-uri"])
|
||||
);
|
||||
if($r && count($r))
|
||||
if (dbm::is_result($r))
|
||||
return false;
|
||||
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
|
||||
|
|
@ -1904,7 +1905,7 @@ class dfrn {
|
|||
dbesc($item["verb"]),
|
||||
dbesc($item["parent-uri"])
|
||||
);
|
||||
if($r && count($r))
|
||||
if (dbm::is_result($r))
|
||||
return false;
|
||||
} else
|
||||
$is_like = false;
|
||||
|
|
@ -1920,7 +1921,7 @@ class dfrn {
|
|||
intval($importer["importer_uid"])
|
||||
);
|
||||
|
||||
if(!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
return false;
|
||||
|
||||
// extract tag, if not duplicate, add to parent item
|
||||
|
|
@ -2192,7 +2193,7 @@ class dfrn {
|
|||
dbesc($item["uri"]),
|
||||
intval($importer["uid"])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$ev["id"] = $r[0]["id"];
|
||||
|
||||
$event_id = event_store($ev);
|
||||
|
|
@ -2213,7 +2214,7 @@ class dfrn {
|
|||
}
|
||||
|
||||
// Update content if 'updated' changes
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
if (self::update_content($r[0], $item, $importer, $entrytype))
|
||||
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
|
||||
else
|
||||
|
|
@ -2235,7 +2236,7 @@ class dfrn {
|
|||
intval($posted_id),
|
||||
intval($importer["importer_uid"])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$parent = $r[0]["parent"];
|
||||
$parent_uri = $r[0]["parent-uri"];
|
||||
}
|
||||
|
|
@ -2323,7 +2324,7 @@ class dfrn {
|
|||
intval($importer["uid"]),
|
||||
intval($importer["id"])
|
||||
);
|
||||
if(!count($r)) {
|
||||
if (!dbm::is_result($r)) {
|
||||
logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
|
||||
return;
|
||||
} else {
|
||||
|
|
@ -2417,7 +2418,7 @@ class dfrn {
|
|||
dbesc($item["parent-uri"]),
|
||||
intval($importer["uid"])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
|
||||
intval($r[0]["id"])
|
||||
);
|
||||
|
|
|
|||
|
|
@ -2364,7 +2364,7 @@ class Diaspora {
|
|||
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
|
||||
}
|
||||
|
||||
$datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
|
||||
$datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
|
||||
} else {
|
||||
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
|
||||
|
||||
|
|
@ -3004,7 +3004,7 @@ class Diaspora {
|
|||
|
||||
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
||||
dbesc($item["thr-parent"]));
|
||||
if(!$p)
|
||||
if (!dbm::is_result($p))
|
||||
return false;
|
||||
|
||||
$parent = $p[0];
|
||||
|
|
@ -3035,7 +3035,7 @@ class Diaspora {
|
|||
intval($item["parent"])
|
||||
);
|
||||
|
||||
if (!$p)
|
||||
if (!dbm::is_result($p))
|
||||
return false;
|
||||
|
||||
$parent = $p[0];
|
||||
|
|
@ -3249,7 +3249,7 @@ class Diaspora {
|
|||
intval($item["uid"])
|
||||
);
|
||||
|
||||
if (!$r) {
|
||||
if (!dbm::is_result($r)) {
|
||||
logger("conversation not found.");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ function discover_poco_run(&$argv, &$argc){
|
|||
|
||||
// Don't check this stuff if the function is called by the poller
|
||||
if (App::callstack() != "poller_run")
|
||||
if (App::maxload_reached())
|
||||
if ($a->maxload_reached())
|
||||
return;
|
||||
|
||||
if(($argc > 2) && ($argv[1] == "dirsearch")) {
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ function notification($params) {
|
|||
$hash = random_string();
|
||||
$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
|
||||
dbesc($hash));
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$dups = true;
|
||||
} while($dups == true);
|
||||
|
||||
|
|
@ -648,6 +648,7 @@ function notification($params) {
|
|||
* @param str $defaulttype (Optional) Forces a notification with this type.
|
||||
*/
|
||||
function check_item_notification($itemid, $uid, $defaulttype = "") {
|
||||
$a = get_app();
|
||||
|
||||
$notification_data = array("uid" => $uid, "profiles" => array());
|
||||
call_hooks('check_item_notification', $notification_data);
|
||||
|
|
@ -666,7 +667,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
|
|||
$profiles[] = $owner[0]["url"];
|
||||
|
||||
// Notifications from Diaspora are often with an URL in the Diaspora format
|
||||
$profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"];
|
||||
$profiles[] = $a->get_baseurl()."/u/".$user[0]["nickname"];
|
||||
|
||||
$profiles2 = array();
|
||||
|
||||
|
|
@ -732,17 +733,17 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
|
|||
intval($item[0]['contact-id']),
|
||||
intval($uid)
|
||||
);
|
||||
$send_notification = count($r);
|
||||
$send_notification = dbm::is_result($r);
|
||||
|
||||
if (!$send_notification) {
|
||||
$tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
|
||||
intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid));
|
||||
|
||||
if (count($tags)) {
|
||||
if (dbm::is_result($tags)) {
|
||||
foreach ($tags AS $tag) {
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`",
|
||||
normalise_link($tag["url"]), intval($uid));
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$send_notification = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ function event_store($arr) {
|
|||
intval($arr['id']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
|
||||
if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
|
||||
|
||||
// Nothing has changed. Grab the item id to return.
|
||||
|
||||
|
|
@ -279,7 +279,7 @@ function event_store($arr) {
|
|||
intval($arr['id']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
return((count($r)) ? $r[0]['id'] : 0);
|
||||
return((dbm::is_result($r)) ? $r[0]['id'] : 0);
|
||||
}
|
||||
|
||||
// The event changed. Update it.
|
||||
|
|
@ -312,7 +312,7 @@ function event_store($arr) {
|
|||
intval($arr['id']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
|
||||
$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
|
||||
$object .= '</object>' . "\n";
|
||||
|
|
@ -365,7 +365,7 @@ function event_store($arr) {
|
|||
dbesc($arr['uri']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$event = $r[0];
|
||||
|
||||
$item_arr = array();
|
||||
|
|
@ -407,7 +407,7 @@ function event_store($arr) {
|
|||
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($arr['uid'])
|
||||
);
|
||||
//if(count($r))
|
||||
//if (dbm::is_result($r))
|
||||
// $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
|
||||
|
||||
|
||||
|
|
@ -515,7 +515,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
|
|||
intval($event_params["event_id"])
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r;
|
||||
|
||||
}
|
||||
|
|
@ -557,7 +557,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
|
|||
dbesc($event_params["adjust_finish"])
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r;
|
||||
}
|
||||
|
||||
|
|
@ -750,7 +750,7 @@ function events_by_uid($uid = 0, $sql_extra = '') {
|
|||
);
|
||||
}
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r;
|
||||
}
|
||||
|
||||
|
|
@ -773,7 +773,7 @@ function event_export($uid, $format = 'ical') {
|
|||
// we are allowed to show events
|
||||
// get the timezone the user is in
|
||||
$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$timezone = $r[0]['timezone'];
|
||||
|
||||
// get all events which are owned by a uid (respects permissions);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function expire_run(&$argv, &$argc){
|
|||
logger('expire: start');
|
||||
|
||||
$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
|
||||
item_expire($rr['uid'],$rr['expire']);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ function fcontact_store($url,$name,$photo) {
|
|||
dbesc($nurl)
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['id'];
|
||||
|
||||
$r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ",
|
||||
|
|
@ -19,11 +19,11 @@ function fcontact_store($url,$name,$photo) {
|
|||
dbesc($photo)
|
||||
);
|
||||
|
||||
if($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1",
|
||||
dbesc($nurl)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['id'];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
function create_files_from_item($itemid) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `file`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
require_once("include/Scrape.php");
|
||||
require_once("include/socgraph.php");
|
||||
require_once('include/group.php');
|
||||
require_once('include/salmon.php');
|
||||
require_once('include/ostatus.php');
|
||||
require_once("include/Photo.php");
|
||||
require_once('include/diaspora.php');
|
||||
|
||||
function update_contact($id) {
|
||||
/*
|
||||
|
|
@ -173,12 +177,12 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
dbesc($ret['network'])
|
||||
);
|
||||
|
||||
if(!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
|
||||
intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
// update contact
|
||||
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
||||
q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
|
||||
|
|
@ -196,7 +200,7 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
$r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0",
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$total_contacts = $r[0]['total'];
|
||||
|
||||
if(! service_class_allows($uid,'total_contacts',$total_contacts)) {
|
||||
|
|
@ -208,7 +212,7 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
intval($uid),
|
||||
dbesc($network)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$total_network = $r[0]['total'];
|
||||
|
||||
if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
|
||||
|
|
@ -250,7 +254,7 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$result['message'] .= t('Unable to retrieve contact information.') . EOL;
|
||||
return $result;
|
||||
}
|
||||
|
|
@ -263,8 +267,6 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
if (intval($def_gid))
|
||||
group_add_member($uid, '', $contact_id, $def_gid);
|
||||
|
||||
require_once("include/Photo.php");
|
||||
|
||||
// Update the avatar
|
||||
update_contact_avatar($ret['photo'],$uid,$contact_id);
|
||||
|
||||
|
|
@ -272,37 +274,29 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
|
||||
proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
|
||||
|
||||
// create a follow slap
|
||||
|
||||
$tpl = get_markup_template('follow_slap.tpl');
|
||||
$slap = replace_macros($tpl, array(
|
||||
'$name' => $a->user['username'],
|
||||
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
||||
'$photo' => $a->contact['photo'],
|
||||
'$thumb' => $a->contact['thumb'],
|
||||
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
||||
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . get_guid(32),
|
||||
'$title' => '',
|
||||
'$type' => 'text',
|
||||
'$content' => t('following'),
|
||||
'$nick' => $a->user['nickname'],
|
||||
'$verb' => ACTIVITY_FOLLOW,
|
||||
'$ostat_follow' => ''
|
||||
));
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
||||
require_once('include/salmon.php');
|
||||
slapper($r[0],$contact['notify'],$slap);
|
||||
if (dbm::is_result($r)) {
|
||||
if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
||||
|
||||
// create a follow slap
|
||||
$item = array();
|
||||
$item['verb'] = ACTIVITY_FOLLOW;
|
||||
$item['follow'] = $contact["url"];
|
||||
$slap = ostatus::salmon($item, $r[0]);
|
||||
slapper($r[0], $contact['notify'], $slap);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if($contact['network'] == NETWORK_DIASPORA) {
|
||||
require_once('include/diaspora.php');
|
||||
$ret = Diaspora::send_share($a->user,$contact);
|
||||
=======
|
||||
if ($contact['network'] == NETWORK_DIASPORA) {
|
||||
$ret = diaspora::send_share($a->user,$contact);
|
||||
>>>>>>> friendica/develop
|
||||
logger('share returns: '.$ret);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ function gprobe_run(&$argv, &$argc){
|
|||
dbesc(normalise_link($url))
|
||||
);
|
||||
}
|
||||
if(dbm::is_result($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
// Check for accessibility and do a poco discovery
|
||||
if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
|
||||
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ function group_rmv($uid,$name) {
|
|||
intval($uid),
|
||||
dbesc($name)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$group_id = $r[0]['id'];
|
||||
if(! $group_id)
|
||||
return false;
|
||||
|
|
@ -106,7 +106,7 @@ function group_byname($uid,$name) {
|
|||
intval($uid),
|
||||
dbesc($name)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['id'];
|
||||
return false;
|
||||
}
|
||||
|
|
@ -139,11 +139,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
|
|||
intval($gid),
|
||||
intval($member)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return true; // You might question this, but
|
||||
// we indicate success because the group member was in fact created
|
||||
// -- It was just created at another time
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
$r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
|
||||
VALUES( %d, %d, %d ) ",
|
||||
intval($uid),
|
||||
|
|
@ -164,7 +164,7 @@ function group_get_members($gid) {
|
|||
intval($gid),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$ret = $r;
|
||||
}
|
||||
return $ret;
|
||||
|
|
@ -181,7 +181,7 @@ function group_public_members($gid) {
|
|||
intval(local_user()),
|
||||
dbesc(NETWORK_OSTATUS)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$ret = count($r);
|
||||
}
|
||||
return $ret;
|
||||
|
|
@ -197,7 +197,7 @@ function mini_group_select($uid,$gid = 0, $label = "") {
|
|||
intval($uid)
|
||||
);
|
||||
$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
|
||||
}
|
||||
|
|
@ -255,7 +255,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
|
|||
$member_of = groups_containing(local_user(),$cid);
|
||||
}
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
|
||||
|
||||
|
|
@ -316,7 +316,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) {
|
|||
|
||||
|
||||
$ret = array();
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$ret[] = $rr['contact-id'];
|
||||
if($check_dead AND !$use_gcontact) {
|
||||
|
|
@ -345,7 +345,7 @@ function groups_containing($uid,$c) {
|
|||
);
|
||||
|
||||
$ret = array();
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
$ret[] = $rr['gid'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
|
|||
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($visitor['cid'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$profile = $r[0]['profile-id'];
|
||||
break;
|
||||
}
|
||||
|
|
@ -159,7 +159,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
|
|||
intval($profile_int)
|
||||
);
|
||||
}
|
||||
if((!$r) && (!count($r))) {
|
||||
if (!dbm::is_result($r)) {
|
||||
$r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*,
|
||||
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
|
||||
FROM `profile`
|
||||
|
|
@ -236,7 +236,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
|
||||
$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
|
||||
local_user(), $profile_url);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$connect = false;
|
||||
}
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
'entries' => array(),
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
foreach($r as $rr) {
|
||||
$profile['menu']['entries'][] = array(
|
||||
|
|
@ -368,7 +368,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
if(is_array($a->profile) AND !$a->profile['hide-friends']) {
|
||||
$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
|
||||
intval($a->profile['uid']));
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$updated = date("c", strtotime($r[0]['updated']));
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
|
||||
|
|
@ -378,7 +378,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
dbesc(NETWORK_DIASPORA),
|
||||
dbesc(NETWORK_OSTATUS)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$contacts = intval($r[0]['total']);
|
||||
}
|
||||
}
|
||||
|
|
@ -460,7 +460,7 @@ function get_birthdays() {
|
|||
dbesc(datetime_convert('UTC','UTC','now'))
|
||||
);
|
||||
|
||||
if($r && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$total = 0;
|
||||
$now = strtotime('now');
|
||||
$cids = array();
|
||||
|
|
@ -543,7 +543,7 @@ function get_events() {
|
|||
dbesc(datetime_convert('UTC','UTC','now - 1 days'))
|
||||
);
|
||||
|
||||
if($r && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$now = strtotime('now');
|
||||
$istoday = false;
|
||||
foreach($r as $rr) {
|
||||
|
|
|
|||
|
|
@ -451,7 +451,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
|
|||
/* check for create date and expire time */
|
||||
$uid = intval($arr['uid']);
|
||||
$r = q("SELECT expire FROM user WHERE uid = %d", intval($uid));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$expire_interval = $r[0]['expire'];
|
||||
if ($expire_interval>0) {
|
||||
$expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC'));
|
||||
|
|
@ -568,19 +568,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
|
|||
intval($arr['uid'])
|
||||
);
|
||||
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
$r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1",
|
||||
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
|
||||
dbesc(normalise_link($arr['author-link']))
|
||||
);
|
||||
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
$r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($arr['contact-id']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
$arr['network'] = $r[0]["network"];
|
||||
|
||||
// Fallback to friendica (why is it empty in some cases?)
|
||||
|
|
@ -634,7 +634,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
|
|||
$r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
|
||||
dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
|
||||
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -662,7 +662,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
|
|||
intval($arr['uid'])
|
||||
);
|
||||
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
// is the new message multi-level threaded?
|
||||
// even though we don't support it now, preserve the info
|
||||
|
|
@ -1120,7 +1120,7 @@ function item_body_set_hashtags(&$item) {
|
|||
|
||||
function get_item_guid($id) {
|
||||
$r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id));
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return($r[0]["guid"]);
|
||||
else
|
||||
return("");
|
||||
|
|
@ -1139,7 +1139,7 @@ function get_item_id($guid, $uid = 0) {
|
|||
$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
|
||||
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
||||
AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$id = $r[0]["id"];
|
||||
$nick = $r[0]["nickname"];
|
||||
}
|
||||
|
|
@ -1153,7 +1153,7 @@ function get_item_id($guid, $uid = 0) {
|
|||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
||||
AND `item`.`private` = 0 AND `item`.`wall` = 1
|
||||
AND `item`.`guid` = '%s'", dbesc($guid));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$id = $r[0]["id"];
|
||||
$nick = $r[0]["nickname"];
|
||||
}
|
||||
|
|
@ -1454,7 +1454,7 @@ function item_is_remote_self($contact, &$datarray) {
|
|||
if ($contact['remote_self'] == 2) {
|
||||
$r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
|
||||
intval($contact['uid']));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$datarray['contact-id'] = $r[0]["id"];
|
||||
|
||||
$datarray['owner-name'] = $r[0]["name"];
|
||||
|
|
@ -1531,7 +1531,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
intval($importer['uid']),
|
||||
dbesc($url)
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contact_record = $r[0];
|
||||
update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
|
||||
}
|
||||
|
|
@ -1541,7 +1541,8 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
intval($importer['uid'])
|
||||
);
|
||||
$a = get_app();
|
||||
if (count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
|
||||
|
||||
if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
|
||||
|
||||
// create notification
|
||||
$hash = random_string();
|
||||
|
|
@ -1580,7 +1581,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
));
|
||||
|
||||
}
|
||||
} elseif (count($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
|
||||
} elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
|
||||
$r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
|
||||
intval($importer['uid']),
|
||||
dbesc($url)
|
||||
|
|
@ -1628,7 +1629,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
|
|||
// through the direct Diaspora protocol. If we try and use
|
||||
// the feed, we'll get duplicates. So don't.
|
||||
|
||||
if ((! count($r)) || $contact['network'] === NETWORK_DIASPORA)
|
||||
if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA)
|
||||
return;
|
||||
|
||||
$push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
|
||||
|
|
@ -1846,7 +1847,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
|
|||
intval($days)
|
||||
);
|
||||
|
||||
if (! count($r))
|
||||
if (! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$expire_items = get_pconfig($uid, 'expire','items');
|
||||
|
|
@ -1924,7 +1925,7 @@ function drop_item($id,$interactive = true) {
|
|||
intval($id)
|
||||
);
|
||||
|
||||
if (! count($r)) {
|
||||
if (! dbm::is_result($r)) {
|
||||
if (! $interactive)
|
||||
return 0;
|
||||
notice( t('Item not found.') . EOL);
|
||||
|
|
@ -2111,7 +2112,7 @@ function drop_item($id,$interactive = true) {
|
|||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
|
|
@ -2147,7 +2148,7 @@ function first_post_date($uid,$wall = false) {
|
|||
intval($uid),
|
||||
intval($wall ? 1 : 0)
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
|
||||
return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ function do_like($item_id, $verb) {
|
|||
dbesc($item_id)
|
||||
);
|
||||
|
||||
if(! $item_id || (! count($r))) {
|
||||
if(! $item_id || (! dbm::is_result($r))) {
|
||||
logger('like: no item ' . $item_id);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -78,7 +78,7 @@ function do_like($item_id, $verb) {
|
|||
intval($item['contact-id']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return false;
|
||||
if(! $r[0]['self'])
|
||||
$remote_owner = $r[0];
|
||||
|
|
@ -90,7 +90,7 @@ function do_like($item_id, $verb) {
|
|||
WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
|
||||
intval($owner_uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$owner = $r[0];
|
||||
|
||||
if(! $owner) {
|
||||
|
|
@ -112,7 +112,7 @@ function do_like($item_id, $verb) {
|
|||
intval($_SESSION['visitor_id']),
|
||||
intval($owner_uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$contact = $r[0];
|
||||
}
|
||||
if(! $contact) {
|
||||
|
|
@ -135,7 +135,7 @@ function do_like($item_id, $verb) {
|
|||
dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$like_item = $r[0];
|
||||
|
||||
// Already voted, undo it
|
||||
|
|
@ -163,7 +163,7 @@ function do_like($item_id, $verb) {
|
|||
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
|
||||
if($item['object-type'] === ACTIVITY_OBJ_EVENT)
|
||||
$post_type = t('event');
|
||||
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
|
||||
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
|
||||
$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
|
||||
$body = $item['body'];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
|
|||
dbesc($fn_name)
|
||||
);
|
||||
|
||||
if((count($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
|
||||
if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
|
||||
q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($fn_name)
|
||||
);
|
||||
$got_lock = true;
|
||||
}
|
||||
elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
|
||||
elseif(! dbm::is_result($r)) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
|
||||
q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)",
|
||||
dbesc($fn_name),
|
||||
dbesc(datetime_convert())
|
||||
|
|
@ -56,10 +56,10 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
|
|||
dbesc($fn_name)
|
||||
);
|
||||
|
||||
if(count($r) && $r[0]['locked'])
|
||||
if (dbm::is_result($r) && $r[0]['locked'])
|
||||
sleep($wait_sec);
|
||||
|
||||
} while(count($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
|
||||
} while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
|
||||
|
||||
return;
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
dbesc($replyto),
|
||||
dbesc($replyto)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$convid = $r[0]['convid'];
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
dbesc($conv_guid),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$convid = $r[0]['id'];
|
||||
}
|
||||
|
||||
|
|
@ -113,7 +113,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
dbesc($uri),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$post_id = $r[0]['id'];
|
||||
|
||||
/**
|
||||
|
|
@ -210,7 +210,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
|||
dbesc($conv_guid),
|
||||
intval($recipient['uid'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$convid = $r[0]['id'];
|
||||
|
||||
if(! $convid) {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ function nav_info(App $a)
|
|||
// user info
|
||||
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid']));
|
||||
$userinfo = array(
|
||||
'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
|
||||
'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
|
||||
'name' => $a->user['username'],
|
||||
);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -338,7 +338,6 @@ function xml_status($st, $message = '') {
|
|||
killme();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Send HTTP status header and exit.
|
||||
*
|
||||
|
|
@ -348,6 +347,14 @@ function xml_status($st, $message = '') {
|
|||
* 'description' => optional message
|
||||
*/
|
||||
|
||||
/**
|
||||
* @brief Send HTTP status header and exit.
|
||||
*
|
||||
* @param integer $val HTTP status result value
|
||||
* @param array $description optional message
|
||||
* 'title' => header title
|
||||
* 'description' => optional message
|
||||
*/
|
||||
function http_status_exit($val, $description = array()) {
|
||||
$err = '';
|
||||
if($val >= 400) {
|
||||
|
|
@ -381,19 +388,23 @@ function http_status_exit($val, $description = array()) {
|
|||
* @return boolean True if it's a valid URL, fals if something wrong with it
|
||||
*/
|
||||
function validate_url(&$url) {
|
||||
|
||||
if(get_config('system','disable_url_validation'))
|
||||
return true;
|
||||
|
||||
// no naked subdomains (allow localhost for tests)
|
||||
if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
|
||||
return false;
|
||||
|
||||
if(substr($url,0,4) != 'http')
|
||||
$url = 'http://' . $url;
|
||||
|
||||
/// @TODO Really supress function outcomes? Why not find them + debug them?
|
||||
$h = @parse_url($url);
|
||||
|
||||
if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
||||
if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ function notifier_run(&$argv, &$argc){
|
|||
intval($item_id)
|
||||
);
|
||||
|
||||
if((! count($r)) || (! intval($r[0]['parent']))) {
|
||||
if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ function notifier_run(&$argv, &$argc){
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$owner = $r[0];
|
||||
|
|
@ -321,7 +321,7 @@ function notifier_run(&$argv, &$argc){
|
|||
intval($uid),
|
||||
dbesc(NETWORK_DFRN)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$recipients_followup[] = $rr['id'];
|
||||
}
|
||||
|
|
@ -445,7 +445,7 @@ function notifier_run(&$argv, &$argc){
|
|||
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$contacts = $r;
|
||||
|
||||
} else
|
||||
|
|
@ -463,7 +463,7 @@ function notifier_run(&$argv, &$argc){
|
|||
intval($uid),
|
||||
dbesc(NETWORK_MAIL)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
$recipients[] = $rr['id'];
|
||||
}
|
||||
|
|
@ -491,7 +491,7 @@ function notifier_run(&$argv, &$argc){
|
|||
|
||||
// delivery loop
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
foreach($r as $contact) {
|
||||
if(!$contact['self']) {
|
||||
|
|
@ -575,7 +575,7 @@ function notifier_run(&$argv, &$argc){
|
|||
$r0 = array();
|
||||
|
||||
$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
|
||||
AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
|
||||
AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
|
||||
dbesc(NETWORK_DIASPORA),
|
||||
intval($owner['uid']),
|
||||
intval(CONTACT_IS_SHARING)
|
||||
|
|
@ -592,7 +592,7 @@ function notifier_run(&$argv, &$argc){
|
|||
|
||||
$r = array_merge($r2,$r1,$r0);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
|
||||
|
||||
// throw everything into the queue in case we get killed
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class FKOAuthDataStore extends OAuthDataStore {
|
|||
$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
|
||||
dbesc($consumer_key)
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ class FKOAuthDataStore extends OAuthDataStore {
|
|||
dbesc($token_type),
|
||||
dbesc($token)
|
||||
);
|
||||
if (count($r)){
|
||||
if (dbm::is_result($r)){
|
||||
$ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
|
||||
$ot->scope=$r[0]['scope'];
|
||||
$ot->expires = $r[0]['expires'];
|
||||
|
|
@ -52,7 +52,7 @@ class FKOAuthDataStore extends OAuthDataStore {
|
|||
dbesc($nonce),
|
||||
intval($timestamp)
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return new OAuthToken($r[0]['id'],$r[0]['secret']);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -136,7 +136,7 @@ class FKOAuth1 extends OAuthServer {
|
|||
$r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)){
|
||||
if (dbm::is_result($r)){
|
||||
$record = $r[0];
|
||||
} else {
|
||||
logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
|
|
@ -162,7 +162,7 @@ class FKOAuth1 extends OAuthServer {
|
|||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
|
||||
intval($_SESSION['uid']));
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->contact = $r[0];
|
||||
$a->cid = $r[0]['id'];
|
||||
$_SESSION['cid'] = $a->cid;
|
||||
|
|
@ -219,7 +219,7 @@ class FKOAuth2 extends OAuth2 {
|
|||
$r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'",
|
||||
dbesc($oauth_token));
|
||||
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0];
|
||||
return null;
|
||||
}
|
||||
|
|
@ -247,7 +247,7 @@ class FKOAuth2 extends OAuth2 {
|
|||
$r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'",
|
||||
dbesc($code));
|
||||
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0];
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,12 +165,12 @@ function oembed_format_object($j){
|
|||
$th=120; $tw = $th*$tr;
|
||||
$tpl=get_markup_template('oembed_video.tpl');
|
||||
$ret.=replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$embedurl'=>$embedurl,
|
||||
'$escapedhtml'=>base64_encode($jhtml),
|
||||
'$tw'=>$tw,
|
||||
'$th'=>$th,
|
||||
'$turl'=>$j->thumbnail_url,
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$embedurl' => $embedurl,
|
||||
'$escapedhtml' => base64_encode($jhtml),
|
||||
'$tw' => $tw,
|
||||
'$th' => $th,
|
||||
'$turl' => $j->thumbnail_url,
|
||||
));
|
||||
|
||||
} else {
|
||||
|
|
@ -255,12 +255,14 @@ function oembed_format_object($j){
|
|||
* @see oembed_format_object()
|
||||
*/
|
||||
function oembed_iframe($src, $width, $height) {
|
||||
$a = get_app();
|
||||
|
||||
if (!$height || strstr($height,'%')) {
|
||||
$height = '200';
|
||||
}
|
||||
$width = '100%';
|
||||
|
||||
$s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
|
||||
$s = App::get_baseurl() . '/oembed/' . base64url_encode($src);
|
||||
return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ function onepoll_run(&$argv, &$argc){
|
|||
where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
|
||||
intval($contact['id'])
|
||||
);
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
if (!$r[0]['total'])
|
||||
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
|
||||
}
|
||||
|
|
@ -143,7 +143,7 @@ function onepoll_run(&$argv, &$argc){
|
|||
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||
intval($importer_uid)
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$importer = $r[0];
|
||||
|
|
@ -393,7 +393,7 @@ function onepoll_run(&$argv, &$argc){
|
|||
dbesc($datarray['uri'])
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
|
||||
|
||||
// Only delete when mails aren't automatically moved or deleted
|
||||
|
|
@ -446,7 +446,7 @@ function onepoll_run(&$argv, &$argc){
|
|||
$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
|
||||
intval($importer_uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
|
||||
// $datarray['parent-uri'] = $r[0]['uri'];
|
||||
}
|
||||
|
|
@ -479,7 +479,7 @@ function onepoll_run(&$argv, &$argc){
|
|||
dbesc(protect_sprintf($datarray['title'])),
|
||||
intval($importer_uid),
|
||||
dbesc(NETWORK_MAIL));
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$datarray['parent-uri'] = $r[0]['parent-uri'];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ class ostatus {
|
|||
}
|
||||
|
||||
// Is it a repeated post?
|
||||
if ($repeat_of != "") {
|
||||
if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) {
|
||||
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
|
||||
|
||||
if (is_object($activityobjects)) {
|
||||
|
|
@ -1561,10 +1561,13 @@ class ostatus {
|
|||
if ($xml)
|
||||
return $xml;
|
||||
|
||||
if ($item["verb"] == ACTIVITY_LIKE)
|
||||
if ($item["verb"] == ACTIVITY_LIKE) {
|
||||
return self::like_entry($doc, $item, $owner, $toplevel);
|
||||
else
|
||||
} elseif (in_array($item["verb"], array(ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"))) {
|
||||
return self::follow_entry($doc, $item, $owner, $toplevel);
|
||||
} else {
|
||||
return self::note_entry($doc, $item, $owner, $toplevel);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1740,6 +1743,113 @@ class ostatus {
|
|||
return $entry;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Adds the person object element to the XML document
|
||||
*
|
||||
* @param object $doc XML document
|
||||
* @param array $owner Contact data of the poster
|
||||
* @param array $contact Contact data of the target
|
||||
*
|
||||
* @return object author element
|
||||
*/
|
||||
private function add_person_object($doc, $owner, $contact) {
|
||||
|
||||
$object = $doc->createElement("activity:object");
|
||||
xml::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
|
||||
|
||||
if ($contact['network'] == NETWORK_PHANTOM) {
|
||||
xml::add_element($doc, $object, "id", $contact['url']);
|
||||
return $object;
|
||||
}
|
||||
|
||||
xml::add_element($doc, $object, "id", $contact["alias"]);
|
||||
xml::add_element($doc, $object, "title", $contact["nick"]);
|
||||
|
||||
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]);
|
||||
xml::add_element($doc, $object, "link", "", $attributes);
|
||||
|
||||
$attributes = array(
|
||||
"rel" => "avatar",
|
||||
"type" => "image/jpeg", // To-Do?
|
||||
"media:width" => 175,
|
||||
"media:height" => 175,
|
||||
"href" => $contact["photo"]);
|
||||
xml::add_element($doc, $object, "link", "", $attributes);
|
||||
|
||||
xml::add_element($doc, $object, "poco:preferredUsername", $contact["nick"]);
|
||||
xml::add_element($doc, $object, "poco:displayName", $contact["name"]);
|
||||
|
||||
if (trim($contact["location"]) != "") {
|
||||
$element = $doc->createElement("poco:address");
|
||||
xml::add_element($doc, $element, "poco:formatted", $contact["location"]);
|
||||
$object->appendChild($element);
|
||||
}
|
||||
|
||||
return $object;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Adds a follow/unfollow entry element
|
||||
*
|
||||
* @param object $doc XML document
|
||||
* @param array $item Data of the follow/unfollow message
|
||||
* @param array $owner Contact data of the poster
|
||||
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
|
||||
*
|
||||
* @return object Entry element
|
||||
*/
|
||||
private function follow_entry($doc, $item, $owner, $toplevel) {
|
||||
|
||||
$item["id"] = $item["parent"] = 0;
|
||||
$item["created"] = $item["edited"] = date("c");
|
||||
$item["private"] = true;
|
||||
|
||||
$contact = Probe::uri($item['follow']);
|
||||
|
||||
if ($contact['alias'] == '') {
|
||||
$contact['alias'] = $contact["url"];
|
||||
} else {
|
||||
$item['follow'] = $contact['alias'];
|
||||
}
|
||||
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
|
||||
intval($owner['uid']), dbesc(normalise_link($contact["url"])));
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$connect_id = $r[0]['id'];
|
||||
} else {
|
||||
$connect_id = 0;
|
||||
}
|
||||
|
||||
if ($item['verb'] == ACTIVITY_FOLLOW) {
|
||||
$message = t('%s is now following %s.');
|
||||
$title = t('following');
|
||||
$action = "subscription";
|
||||
} else {
|
||||
$message = t('%s stopped following %s.');
|
||||
$title = t('stopped following');
|
||||
$action = "unfollow";
|
||||
}
|
||||
|
||||
$item["uri"] = $item['parent-uri'] = $item['thr-parent'] =
|
||||
'tag:'.get_app()->get_hostname().
|
||||
','.date('Y-m-d').':'.$action.':'.$owner['uid'].
|
||||
':person:'.$connect_id.':'.$item['created'];
|
||||
|
||||
$item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
|
||||
|
||||
self::entry_header($doc, $entry, $owner, $toplevel);
|
||||
|
||||
self::entry_content($doc, $entry, $item, $owner, $title);
|
||||
|
||||
$object = self::add_person_object($doc, $owner, $contact);
|
||||
$entry->appendChild($object);
|
||||
|
||||
self::entry_footer($doc, $entry, $item, $owner);
|
||||
|
||||
return $entry;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Adds a regular entry element
|
||||
*
|
||||
|
|
@ -1832,7 +1942,7 @@ class ostatus {
|
|||
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
|
||||
"href" => App::get_baseurl()."/display/".$item["guid"]));
|
||||
|
||||
if ($complete)
|
||||
if ($complete AND ($item["id"] > 0))
|
||||
xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
|
||||
|
||||
xml::add_element($doc, $entry, "activity:verb", $verb);
|
||||
|
|
@ -1881,9 +1991,11 @@ class ostatus {
|
|||
}
|
||||
}
|
||||
|
||||
xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
|
||||
"href" => App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
|
||||
xml::add_element($doc, $entry, "ostatus:conversation", App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]);
|
||||
if (intval($item["parent"]) > 0) {
|
||||
$conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
|
||||
xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation));
|
||||
xml::add_element($doc, $entry, "ostatus:conversation", $conversation);
|
||||
}
|
||||
|
||||
$tags = item_getfeedtags($item);
|
||||
|
||||
|
|
@ -1929,7 +2041,7 @@ class ostatus {
|
|||
|
||||
self::get_attachment($doc, $entry, $item);
|
||||
|
||||
if ($complete) {
|
||||
if ($complete AND ($item["id"] > 0)) {
|
||||
$app = $item["app"];
|
||||
if ($app == "")
|
||||
$app = "web";
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ if(! function_exists('load_translation_table')) {
|
|||
* @param string $lang language code to load
|
||||
*/
|
||||
function load_translation_table($lang) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$a->strings = array();
|
||||
// load enabled plugins strings
|
||||
|
|
|
|||
|
|
@ -63,6 +63,10 @@ function get_old_attachment_data($body) {
|
|||
$post["url"] = $matches[1];
|
||||
$post["title"] = $matches[2];
|
||||
}
|
||||
if (($post["url"] == "") AND (in_array($post["type"], array("link", "video")))
|
||||
AND preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
|
||||
$post["url"] = $matches[1];
|
||||
}
|
||||
|
||||
// Search for description
|
||||
if (preg_match("/\[quote\](.*?)\[\/quote\]/ism", $attacheddata, $matches))
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ function reload_plugins() {
|
|||
if(strlen($plugins)) {
|
||||
|
||||
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$installed = $r;
|
||||
else
|
||||
$installed = array();
|
||||
|
|
@ -150,7 +150,7 @@ function register_hook($hook,$file,$function,$priority=0) {
|
|||
dbesc($file),
|
||||
dbesc($function)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return true;
|
||||
|
||||
$r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ",
|
||||
|
|
@ -187,7 +187,7 @@ function load_hooks() {
|
|||
$a = get_app();
|
||||
$a->hooks = array();
|
||||
$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if(! array_key_exists($rr['hook'],$a->hooks))
|
||||
$a->hooks[$rr['hook']] = array();
|
||||
|
|
@ -473,7 +473,7 @@ function service_class_allows($uid,$property,$usage = false) {
|
|||
$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if($r !== false and count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$service_class = $r[0]['service_class'];
|
||||
}
|
||||
}
|
||||
|
|
@ -503,7 +503,7 @@ function service_class_fetch($uid,$property) {
|
|||
$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if($r !== false and count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$service_class = $r[0]['service_class'];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function poller_run($argv, $argc){
|
|||
return;
|
||||
}
|
||||
|
||||
if (App::maxload_reached()) {
|
||||
if ($a->maxload_reached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,12 +23,11 @@ function remove_queue_item($id) {
|
|||
* @return bool The communication with this contact has currently problems
|
||||
*/
|
||||
function was_recently_delayed($cid) {
|
||||
|
||||
$was_delayed = false;
|
||||
|
||||
// Are there queue entries that were recently added?
|
||||
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
|
||||
AND `last` > UTC_TIMESTAMP() - interval 15 minute LIMIT 1",
|
||||
AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
|
||||
intval($cid)
|
||||
);
|
||||
|
||||
|
|
@ -61,7 +60,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
|
|||
WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
|
||||
intval($cid)
|
||||
);
|
||||
if($r && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
if($batch && ($r[0]['total'] > $batch_queue)) {
|
||||
logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function auto_redir(&$a, $contact_nick) {
|
|||
dbesc($nurl)
|
||||
);
|
||||
|
||||
if((!$r) || (! count($r)) || $r[0]['id'] == remote_user())
|
||||
if((! dbm::is_result($r)) || $r[0]['id'] == remote_user())
|
||||
return;
|
||||
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ function auto_redir(&$a, $contact_nick) {
|
|||
dbesc($baseurl)
|
||||
);
|
||||
|
||||
if(! ($r && count($r)))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$cid = $r[0]['id'];
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
$r = q("select * from user where uid = %d limit 1",
|
||||
intval($_SESSION['submanage'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$master_record = $r[0];
|
||||
}
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
dbesc($master_record['password']),
|
||||
dbesc($master_record['email'])
|
||||
);
|
||||
if($r && count($r))
|
||||
if (dbm::is_result($r))
|
||||
$a->identities = $r;
|
||||
else
|
||||
$a->identities = array();
|
||||
|
|
@ -60,7 +60,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
and `manage`.`uid` = %d",
|
||||
intval($master_record['uid'])
|
||||
);
|
||||
if($r && count($r))
|
||||
if (dbm::is_result($r))
|
||||
$a->identities = array_merge($a->identities,$r);
|
||||
|
||||
if($login_initial)
|
||||
|
|
@ -70,7 +70,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||
intval($_SESSION['uid']));
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->contact = $r[0];
|
||||
$a->cid = $r[0]['id'];
|
||||
$_SESSION['cid'] = $a->cid;
|
||||
|
|
@ -156,7 +156,7 @@ function can_write_wall(&$a,$owner) {
|
|||
intval(PAGE_COMMUNITY)
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$verified = 2;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -210,7 +210,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
|
|||
intval($remote_user),
|
||||
intval($owner_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$remote_verified = true;
|
||||
$groups = init_groups_visitor($remote_user);
|
||||
}
|
||||
|
|
@ -292,7 +292,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
|
|||
intval($remote_user),
|
||||
intval($owner_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$remote_verified = true;
|
||||
$groups = init_groups_visitor($remote_user);
|
||||
}
|
||||
|
|
@ -403,7 +403,7 @@ function init_groups_visitor($contact_id) {
|
|||
WHERE `contact-id` = %d ",
|
||||
intval($contact_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
$groups[] = $rr['gid'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
|||
$r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
|
||||
intval($cid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$url = $r[0]['poco'];
|
||||
$uid = $r[0]['uid'];
|
||||
}
|
||||
|
|
@ -213,14 +213,14 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
|
|||
$r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
|
||||
dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$network = $r[0]["network"];
|
||||
|
||||
if (($network == "") OR ($network == NETWORK_OSTATUS)) {
|
||||
$r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
|
||||
dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$network = $r[0]["network"];
|
||||
//$profile_url = $r[0]["url"];
|
||||
}
|
||||
|
|
@ -330,7 +330,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
|
|||
intval($gcid),
|
||||
intval($zcid)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
|
||||
intval($cid),
|
||||
intval($uid),
|
||||
|
|
@ -976,7 +976,7 @@ function count_common_friends($uid,$cid) {
|
|||
);
|
||||
|
||||
// logger("count_common_friends: $uid $cid {$r[0]['total']}");
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
return 0;
|
||||
|
||||
|
|
@ -1022,7 +1022,7 @@ function count_common_friends_zcid($uid,$zcid) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
return 0;
|
||||
|
||||
|
|
@ -1061,7 +1061,7 @@ function count_all_friends($uid,$cid) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
return $r[0]['total'];
|
||||
return 0;
|
||||
|
||||
|
|
@ -1133,7 +1133,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
|
|||
intval($limit)
|
||||
);
|
||||
|
||||
if (count($r) && count($r) >= ($limit -1)) {
|
||||
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.
|
||||
// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
|
||||
|
|
@ -1207,7 +1207,7 @@ function update_suggestions() {
|
|||
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
|
||||
if(! in_array($base,$done))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
function create_tags_from_item($itemid) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
|
||||
$profile_base = $a->get_baseurl();
|
||||
$profile_data = parse_url($profile_base);
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ function item_new_uri($hostname,$uid, $guid = "") {
|
|||
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
||||
dbesc($uri));
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$dups = true;
|
||||
} while($dups == true);
|
||||
return $uri;
|
||||
|
|
@ -515,7 +515,7 @@ function photo_new_resource() {
|
|||
$r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
|
||||
dbesc($resource)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$found = true;
|
||||
} while($found == true);
|
||||
return $resource;
|
||||
|
|
@ -699,7 +699,7 @@ $LOGGER_LEVELS = array();
|
|||
* @param int $level
|
||||
*/
|
||||
function logger($msg, $level = 0) {
|
||||
global $a;
|
||||
$a = get_app();
|
||||
global $db;
|
||||
global $LOGGER_LEVELS;
|
||||
|
||||
|
|
@ -882,7 +882,7 @@ function contact_block() {
|
|||
dbesc(NETWORK_OSTATUS),
|
||||
dbesc(NETWORK_DIASPORA)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$total = intval($r[0]['total']);
|
||||
}
|
||||
if(! $total) {
|
||||
|
|
@ -901,14 +901,15 @@ function contact_block() {
|
|||
dbesc(NETWORK_DIASPORA),
|
||||
intval($shown)
|
||||
);
|
||||
if ($r) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contacts = "";
|
||||
foreach ($r AS $contact)
|
||||
$contacts[] = $contact["id"];
|
||||
|
||||
$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
|
||||
dbesc(implode(",", $contacts)));
|
||||
if(count($r)) {
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
|
||||
$micropro = Array();
|
||||
foreach($r as $rr) {
|
||||
|
|
@ -1931,7 +1932,7 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
|
|||
// intval($uid)
|
||||
//);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
unset($deleted_tags[$key]);
|
||||
}
|
||||
else {
|
||||
|
|
@ -1961,7 +1962,7 @@ function file_tag_save_file($uid,$item,$file) {
|
|||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
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) . ']'),
|
||||
|
|
@ -1999,7 +2000,7 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
|
|||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return false;
|
||||
|
||||
q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||
|
|
@ -2019,7 +2020,7 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
|
|||
//$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
|
||||
//);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$saved = get_pconfig($uid,'system','filetags');
|
||||
set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
|
||||
|
||||
|
|
|
|||
|
|
@ -142,12 +142,12 @@ function add_shadow_entry($itemid) {
|
|||
|
||||
// Is there a shadow parent?
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
return;
|
||||
|
||||
// Is there already a shadow entry?
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
|
||||
if (count($r))
|
||||
if (dbm::is_result($r))
|
||||
return;
|
||||
|
||||
// Preparing public shadow (removing user specific data)
|
||||
|
|
@ -174,7 +174,7 @@ 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(count($messages))
|
||||
if (dbm::is_result($messages))
|
||||
foreach ($messages as $message)
|
||||
update_thread($message["id"]);
|
||||
}
|
||||
|
|
@ -183,7 +183,7 @@ 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 (!$items)
|
||||
if (!dbm::is_result($items))
|
||||
return;
|
||||
|
||||
$item = $items[0];
|
||||
|
|
@ -241,7 +241,7 @@ function delete_thread($itemid, $itemuri = "") {
|
|||
dbesc($itemuri),
|
||||
intval($item["uid"])
|
||||
);
|
||||
if (!count($r)) {
|
||||
if (!dbm::is_result($r)) {
|
||||
$r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
|
||||
dbesc($itemuri)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ function import_account(&$a, $file) {
|
|||
notice(t('Error! Cannot check nickname'));
|
||||
return;
|
||||
}
|
||||
if (count($r) > 0) {
|
||||
if (dbm::is_result($r) > 0) {
|
||||
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
|
||||
return;
|
||||
}
|
||||
|
|
@ -127,7 +127,7 @@ function import_account(&$a, $file) {
|
|||
notice(t('Error! Cannot check nickname'));
|
||||
return;
|
||||
}
|
||||
if (count($r) > 0) {
|
||||
if (dbm::is_result($r) > 0) {
|
||||
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ function create_user($arr) {
|
|||
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
|
||||
dbesc($email)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$result['message'] .= t('Cannot use that email.') . EOL;
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ function create_user($arr) {
|
|||
WHERE `nickname` = '%s' LIMIT 1",
|
||||
dbesc($nickname)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
|
||||
|
||||
// Check deleted accounts that had this nickname. Doesn't matter to us,
|
||||
|
|
@ -153,7 +153,7 @@ function create_user($arr) {
|
|||
WHERE `username` = '%s' LIMIT 1",
|
||||
dbesc($nickname)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
|
||||
|
||||
if(strlen($result['message'])) {
|
||||
|
|
@ -222,7 +222,7 @@ function create_user($arr) {
|
|||
dbesc($username),
|
||||
dbesc($new_password_encoded)
|
||||
);
|
||||
if($r !== false && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$u = $r[0];
|
||||
$newuid = intval($r[0]['uid']);
|
||||
}
|
||||
|
|
@ -269,28 +269,9 @@ function create_user($arr) {
|
|||
intval($newuid));
|
||||
return $result;
|
||||
}
|
||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
||||
`addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
|
||||
VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
|
||||
intval($newuid),
|
||||
datetime_convert(),
|
||||
dbesc($username),
|
||||
dbesc($nickname),
|
||||
dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
|
||||
dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
|
||||
dbesc(z_root() . "/photo/micro/{$newuid}.jpg"),
|
||||
dbesc(z_root() . "/profile/$nickname"),
|
||||
dbesc(normalise_link(z_root() . "/profile/$nickname")),
|
||||
dbesc($nickname . '@' . substr(z_root(), strpos(z_root(),'://') + 3 )),
|
||||
dbesc(z_root() . "/dfrn_request/$nickname"),
|
||||
dbesc(z_root() . "/dfrn_notify/$nickname"),
|
||||
dbesc(z_root() . "/dfrn_poll/$nickname"),
|
||||
dbesc(z_root() . "/dfrn_confirm/$nickname"),
|
||||
dbesc(z_root() . "/poco/$nickname"),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert())
|
||||
);
|
||||
|
||||
// Create the self contact
|
||||
user_create_self_contact($newuid);
|
||||
|
||||
// Create a group with no members. This allows somebody to use it
|
||||
// right away as a default group for new contacts.
|
||||
|
|
@ -302,7 +283,7 @@ function create_user($arr) {
|
|||
intval($newuid),
|
||||
dbesc(t('Friends'))
|
||||
);
|
||||
if($r && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$def_gid = $r[0]['id'];
|
||||
|
||||
q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",
|
||||
|
|
@ -377,6 +358,49 @@ function create_user($arr) {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief create the "self" contact from data from the user table
|
||||
*
|
||||
* @param integer $uid
|
||||
*/
|
||||
function user_create_self_contact($uid) {
|
||||
|
||||
// Only create the entry if it doesn't exist yet
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
|
||||
if (dbm::is_result($r)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `uid` = %d", intval($uid));
|
||||
if (!dbm::is_result($r)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$user = $r[0];
|
||||
|
||||
q("INSERT INTO `contact` (`uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
||||
`addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness`)
|
||||
VALUES (%d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0)",
|
||||
intval($user['uid']),
|
||||
datetime_convert(),
|
||||
dbesc($user['username']),
|
||||
dbesc($user['nickname']),
|
||||
dbesc(z_root()."/photo/profile/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/photo/avatar/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/photo/micro/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/profile/".$user['nickname']),
|
||||
dbesc(normalise_link(z_root()."/profile/".$user['nickname'])),
|
||||
dbesc($user['nickname'].'@'.substr(z_root(), strpos(z_root(),'://') + 3)),
|
||||
dbesc(z_root()."/dfrn_request/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_notify/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_poll/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_confirm/".$user['nickname']),
|
||||
dbesc(z_root()."/poco/".$user['nickname']),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert())
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief send registration confiŕmation with the intormation that reg is pending
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ class Text_LanguageDetect
|
|||
* Returns the list of detectable languages
|
||||
*
|
||||
* @access public
|
||||
* @return array the names of the languages known to this object<<<<<<<
|
||||
* @return array the names of the languages known to this object
|
||||
* @throws Text_LanguageDetect_Exception
|
||||
*/
|
||||
function getLanguages()
|
||||
|
|
|
|||
|
|
@ -1121,7 +1121,7 @@ function admin_page_dbsync(&$a) {
|
|||
|
||||
$failed = array();
|
||||
$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$upd = intval(substr($rr['k'],7));
|
||||
if($upd < 1139 || $rr['v'] === 'success')
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function allfriends_content(&$a) {
|
|||
|
||||
$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$o .= t('No friends to display.');
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function oauth_get_client($request){
|
|||
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'",
|
||||
dbesc($token));
|
||||
|
||||
if (!count($r))
|
||||
if (!dbm::is_result($r))
|
||||
return null;
|
||||
|
||||
return $r[0];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function attach_init(&$a) {
|
|||
$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
|
||||
intval($item_id)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Item was not found.'). EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ function attach_init(&$a) {
|
|||
dbesc($item_id)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ function cal_content(&$a) {
|
|||
intval($contact_id),
|
||||
intval($a->profile['profile_uid'])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contact = $r[0];
|
||||
$remote_contact = true;
|
||||
}
|
||||
|
|
@ -227,7 +227,7 @@ function cal_content(&$a) {
|
|||
|
||||
$links = array();
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$r = sort_by_date($r);
|
||||
foreach($r as $rr) {
|
||||
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
|
||||
|
|
@ -240,7 +240,7 @@ function cal_content(&$a) {
|
|||
$events=array();
|
||||
|
||||
// transform the event in a usable array
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$r = sort_by_date($r);
|
||||
$events = process_events($r);
|
||||
|
||||
|
|
|
|||
|
|
@ -57,13 +57,13 @@ function common_content(&$a) {
|
|||
dbesc(normalise_link(get_my_url())),
|
||||
intval($profile_uid)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$cid = $r[0]['id'];
|
||||
else {
|
||||
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
|
||||
dbesc(normalise_link(get_my_url()))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$zcid = $r[0]['id'];
|
||||
}
|
||||
}
|
||||
|
|
@ -94,7 +94,7 @@ function common_content(&$a) {
|
|||
$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
||||
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function community_content(&$a, $update = 0) {
|
|||
AND `item`.`private` = 0 AND `item`.`wall` = 1"
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
if(! $r[0]['total']) {
|
||||
|
|
@ -71,7 +71,7 @@ function community_content(&$a, $update = 0) {
|
|||
|
||||
$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
info( t('No results.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function contactgroup_content(&$a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$change = intval($a->argv[2]);
|
||||
}
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ function contactgroup_content(&$a) {
|
|||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
killme();
|
||||
}
|
||||
|
||||
|
|
@ -47,4 +47,4 @@ function contactgroup_content(&$a) {
|
|||
}
|
||||
|
||||
killme();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ function contacts_init(&$a) {
|
|||
intval(local_user()),
|
||||
intval($contact_id)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$contact_id = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ function contacts_post(&$a) {
|
|||
intval($profile_id),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Could not locate selected profile.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -211,7 +211,7 @@ function contacts_post(&$a) {
|
|||
intval($contact_id),
|
||||
intval(local_user())
|
||||
);
|
||||
if($r && count($r))
|
||||
if($r && dbm::is_result($r))
|
||||
$a->data['contact'] = $r[0];
|
||||
|
||||
return;
|
||||
|
|
@ -765,7 +765,7 @@ function contacts_content(&$a) {
|
|||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||
WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
|
||||
intval($_SESSION['uid']));
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
$total = $r[0]['total'];
|
||||
}
|
||||
|
|
@ -780,8 +780,8 @@ function contacts_content(&$a) {
|
|||
|
||||
$contacts = array();
|
||||
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$contacts[] = _contact_detail_for_template($rr);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ function content_content(&$a, $update = 0) {
|
|||
);
|
||||
|
||||
$str = '';
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$str .= '<' . $rr['id'] . '>';
|
||||
if(strlen($str))
|
||||
|
|
@ -113,7 +113,7 @@ function content_content(&$a, $update = 0) {
|
|||
intval($group),
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
if($update)
|
||||
killme();
|
||||
notice( t('No such group') . EOL );
|
||||
|
|
@ -141,7 +141,7 @@ function content_content(&$a, $update = 0) {
|
|||
AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
|
||||
intval($cid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) ";
|
||||
|
||||
}
|
||||
|
|
@ -197,7 +197,7 @@ function content_content(&$a, $update = 0) {
|
|||
}
|
||||
|
||||
if($conv) {
|
||||
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||
$myurl = str_replace('www.','',$myurl);
|
||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||
|
|
@ -259,7 +259,7 @@ function content_content(&$a, $update = 0) {
|
|||
$parents_arr = array();
|
||||
$parents_str = '';
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
if(! in_array($rr['item_id'],$parents_arr))
|
||||
$parents_arr[] = $rr['item_id'];
|
||||
|
|
@ -782,7 +782,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
|
|||
intval($item['uid']),
|
||||
intval($item['id'])
|
||||
);
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$ignore = array(
|
||||
'do' => t("ignore thread"),
|
||||
'undo' => t("unignore thread"),
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function crepair_init(&$a) {
|
|||
intval(local_user()),
|
||||
intval($contact_id)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$contact_id = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -43,7 +43,7 @@ function crepair_post(&$a) {
|
|||
);
|
||||
}
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
$contact = $r[0];
|
||||
|
|
@ -110,7 +110,7 @@ function crepair_content(&$a) {
|
|||
);
|
||||
}
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Contact not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ function delegate_content(&$a) {
|
|||
$r = q("select `nickname` from user where uid = %d limit 1",
|
||||
intval($id)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
|
||||
intval(local_user()),
|
||||
dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname']))
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
q("insert into manage ( uid, mid ) values ( %d , %d ) ",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
|
|
@ -64,7 +64,7 @@ function delegate_content(&$a) {
|
|||
dbesc($a->user['email']),
|
||||
dbesc($a->user['password'])
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$full_managers = $r;
|
||||
|
||||
$delegates = array();
|
||||
|
|
@ -75,7 +75,7 @@ function delegate_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$delegates = $r;
|
||||
|
||||
$uids = array();
|
||||
|
|
@ -97,14 +97,14 @@ function delegate_content(&$a) {
|
|||
dbesc(NETWORK_DFRN)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('No potential page delegates located.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$nicknames = array();
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
|
||||
}
|
||||
|
|
@ -118,7 +118,7 @@ function delegate_content(&$a) {
|
|||
|
||||
$r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )");
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
if(! in_array($rr['uid'],$uids))
|
||||
$potentials[] = $rr;
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
logger('Contact not found in DB.');
|
||||
notice( t('Contact not found.') . EOL );
|
||||
notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
|
||||
|
|
@ -423,7 +423,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($contact_id)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$contact = $r[0];
|
||||
else
|
||||
$contact = null;
|
||||
|
|
@ -443,7 +443,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
intval($uid)
|
||||
);
|
||||
|
||||
if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
|
||||
if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
|
|
@ -553,7 +553,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
|
||||
dbesc($node));
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$message = sprintf(t('No user record found for \'%s\' '), $node);
|
||||
xml_status(3,$message); // failure
|
||||
// NOTREACHED
|
||||
|
|
@ -629,7 +629,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
$r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1",
|
||||
dbesc($decrypted_dfrn_id)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
|
||||
xml_status(1,$message); // Birthday paradox - duplicate dfrn-id
|
||||
// NOTREACHED
|
||||
|
|
@ -640,7 +640,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
dbesc($dfrn_pubkey),
|
||||
intval($dfrn_record)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$message = t('Unable to set your contact credentials on our system.');
|
||||
xml_status(3,$message);
|
||||
}
|
||||
|
|
@ -661,7 +661,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($dfrn_record));
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$photo = $r[0]['photo'];
|
||||
else
|
||||
$photo = $a->get_baseurl() . '/images/person-175.jpg';
|
||||
|
|
@ -714,10 +714,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
intval($dfrn_record)
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$combined = $r[0];
|
||||
|
||||
if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
|
||||
if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
|
||||
$mutual = ($new_relation == CONTACT_IS_FRIEND);
|
||||
notification(array(
|
||||
'type' => NOTIFY_CONFIRM,
|
||||
|
|
@ -742,7 +742,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
intval($local_uid)
|
||||
);
|
||||
|
||||
if((count($r)) && ($r[0]['hide-friends'] == 0)) {
|
||||
if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function dfrn_notify_post(&$a) {
|
|||
dbesc($dfrn_id),
|
||||
dbesc($challenge)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
|
||||
xml_status(3);
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ function dfrn_notify_post(&$a) {
|
|||
dbesc($a->argv[1])
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
|
||||
xml_status(3);
|
||||
//NOTREACHED
|
||||
|
|
@ -284,7 +284,7 @@ function dfrn_notify_content(&$a) {
|
|||
dbesc($a->argv[1])
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
$status = 1;
|
||||
|
||||
logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ function dfrn_poll_init(&$a) {
|
|||
dbesc($a->argv[1])
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ function dfrn_poll_init(&$a) {
|
|||
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
|
||||
dbesc($sec)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
xml_status(3, 'No ticket');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -190,7 +190,7 @@ function dfrn_poll_init(&$a) {
|
|||
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
|
||||
$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
|
||||
dbesc($dfrn_id));
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
xml_status(1);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
|
@ -223,7 +223,7 @@ function dfrn_poll_post(&$a) {
|
|||
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
|
||||
dbesc($sec)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
xml_status(3, 'No ticket');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -284,7 +284,7 @@ function dfrn_poll_post(&$a) {
|
|||
dbesc($challenge)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
$type = $r[0]['type'];
|
||||
|
|
@ -319,7 +319,7 @@ function dfrn_poll_post(&$a) {
|
|||
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
|
||||
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
$contact = $r[0];
|
||||
|
|
@ -335,7 +335,7 @@ function dfrn_poll_post(&$a) {
|
|||
$reputation = 0;
|
||||
$text = '';
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$reputation = $r[0]['rating'];
|
||||
$text = $r[0]['reason'];
|
||||
|
||||
|
|
@ -448,7 +448,7 @@ function dfrn_poll_content(&$a) {
|
|||
dbesc($nickname)
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
$challenge = '';
|
||||
$encrypted_id = '';
|
||||
|
|
@ -495,7 +495,7 @@ function dfrn_poll_content(&$a) {
|
|||
));
|
||||
}
|
||||
|
||||
$profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
|
||||
$profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
|
||||
|
||||
switch($destination_url) {
|
||||
case 'profile':
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ function dfrn_request_post(&$a) {
|
|||
dbesc(normalise_link($dfrn_url))
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
if(strlen($r[0]['dfrn-id'])) {
|
||||
|
||||
/*
|
||||
|
|
@ -185,7 +185,7 @@ function dfrn_request_post(&$a) {
|
|||
dbesc($dfrn_url),
|
||||
$parms['key'] // this was already escaped
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$def_gid = get_default_group(local_user(), $r[0]["network"]);
|
||||
if(intval($def_gid))
|
||||
group_add_member(local_user(), '', $r[0]['id'], $def_gid);
|
||||
|
|
@ -273,7 +273,7 @@ function dfrn_request_post(&$a) {
|
|||
dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r) > $maxreq) {
|
||||
if (dbm::is_result($r) && count($r) > $maxreq) {
|
||||
notice( sprintf( t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
|
||||
notice( t('Spam protection measures have been invoked.') . EOL);
|
||||
notice( t('Friends are advised to please try again in 24 hours.') . EOL);
|
||||
|
|
@ -295,7 +295,7 @@ function dfrn_request_post(&$a) {
|
|||
AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
|
||||
dbesc(NETWORK_MAIL2)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if(! $rr['rel']) {
|
||||
q("DELETE FROM `contact` WHERE `id` = %d",
|
||||
|
|
@ -320,7 +320,7 @@ function dfrn_request_post(&$a) {
|
|||
AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
|
||||
dbesc(NETWORK_MAIL2)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
if(! $rr['rel']) {
|
||||
q("DELETE FROM `contact` WHERE `id` = %d",
|
||||
|
|
@ -370,8 +370,8 @@ function dfrn_request_post(&$a) {
|
|||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if(! count($r)) {
|
||||
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('This account has not been configured for email. Request failed.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -398,7 +398,7 @@ function dfrn_request_post(&$a) {
|
|||
dbesc($poll),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contact_id = $r[0]['id'];
|
||||
|
||||
$def_gid = get_default_group($uid, $r[0]["network"]);
|
||||
|
|
@ -431,8 +431,8 @@ function dfrn_request_post(&$a) {
|
|||
|
||||
$hash = random_string();
|
||||
|
||||
$r = q("insert into intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
|
||||
values( %d , %d, %d, '%s', '%s', '%s', %d ) ",
|
||||
$r = q("INSERT INTO `intro` ( `uid`, `contact-id`, knowyou, note, hash, datetime, blocked )
|
||||
VALUES( %d , %d, %d, '%s', '%s', '%s', %d ) ",
|
||||
intval($uid),
|
||||
intval($contact_id),
|
||||
((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
|
||||
|
|
@ -473,7 +473,7 @@ function dfrn_request_post(&$a) {
|
|||
dbesc($url)
|
||||
);
|
||||
|
||||
if(count($ret)) {
|
||||
if (dbm::is_result($ret)) {
|
||||
if(strlen($ret[0]['issued-id'])) {
|
||||
notice( t('You have already introduced yourself here.') . EOL );
|
||||
return;
|
||||
|
|
@ -572,7 +572,7 @@ function dfrn_request_post(&$a) {
|
|||
$parms['url'],
|
||||
$parms['issued-id']
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contact_record = $r[0];
|
||||
update_contact_avatar($photo, $uid, $contact_record["id"], true);
|
||||
}
|
||||
|
|
@ -720,7 +720,7 @@ function dfrn_request_content(&$a) {
|
|||
dbesc($_GET['confirm_key'])
|
||||
);
|
||||
|
||||
if(count($intro)) {
|
||||
if (dbm::is_result($intro)) {
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `contact`.`id` = %d LIMIT 1",
|
||||
|
|
@ -729,7 +729,7 @@ function dfrn_request_content(&$a) {
|
|||
|
||||
$auto_confirm = false;
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
|
||||
$auto_confirm = true;
|
||||
|
||||
|
|
@ -742,7 +742,7 @@ function dfrn_request_content(&$a) {
|
|||
'to_name' => $r[0]['username'],
|
||||
'to_email' => $r[0]['email'],
|
||||
'uid' => $r[0]['uid'],
|
||||
'link' => $a->get_baseurl() . '/notifications/intros',
|
||||
'link' => $a->get_baseurl() . '/notifications/intros',
|
||||
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
|
||||
'source_link' => $r[0]['url'],
|
||||
'source_photo' => $r[0]['photo'],
|
||||
|
|
@ -754,11 +754,11 @@ function dfrn_request_content(&$a) {
|
|||
if($auto_confirm) {
|
||||
require_once('mod/dfrn_confirm.php');
|
||||
$handsfree = array(
|
||||
'uid' => $r[0]['uid'],
|
||||
'node' => $r[0]['nickname'],
|
||||
'dfrn_id' => $r[0]['issued-id'],
|
||||
'uid' => $r[0]['uid'],
|
||||
'node' => $r[0]['nickname'],
|
||||
'dfrn_id' => $r[0]['issued-id'],
|
||||
'intro_id' => $intro[0]['id'],
|
||||
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
|
||||
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
|
||||
'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
|
||||
);
|
||||
dfrn_confirm_post($a,$handsfree);
|
||||
|
|
@ -842,7 +842,7 @@ function dfrn_request_content(&$a) {
|
|||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
|
||||
intval($a->profile['uid'])
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
$mail_disabled = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ function directory_content(&$a) {
|
|||
$r = $db->q("SELECT COUNT(*) AS `total` FROM `profile`
|
||||
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
$order = " ORDER BY `name` ASC ";
|
||||
|
|
@ -90,7 +90,7 @@ function directory_content(&$a) {
|
|||
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
if(in_array('small', $a->argv))
|
||||
$photo = 'thumb';
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ function editpost_content(&$a) {
|
|||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$mail_enabled = true;
|
||||
if(intval($r[0]['pubmail']))
|
||||
$pubmail_enabled = true;
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@ function events_content(&$a) {
|
|||
|
||||
$links = array();
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$r = sort_by_date($r);
|
||||
foreach($r as $rr) {
|
||||
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
|
||||
|
|
@ -344,9 +344,10 @@ function events_content(&$a) {
|
|||
$events=array();
|
||||
|
||||
// transform the event in a usable array
|
||||
if(count($r))
|
||||
if (dbm::is_result($r)) {
|
||||
$r = sort_by_date($r);
|
||||
$events = process_events($r);
|
||||
}
|
||||
|
||||
if ($a->argv[1] === 'json'){
|
||||
echo json_encode($events); killme();
|
||||
|
|
@ -403,7 +404,7 @@ function events_content(&$a) {
|
|||
intval($event_id),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$orig_event = $r[0];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ function fbrowser_content($a){
|
|||
);
|
||||
|
||||
function _map_files1($rr){
|
||||
global $a;
|
||||
$a = get_app();
|
||||
$types = Photo::supportedTypes();
|
||||
$ext = $types[$rr['type']];
|
||||
|
||||
|
|
@ -110,7 +110,8 @@ function fbrowser_content($a){
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
function _map_files2($rr){ global $a;
|
||||
function _map_files2($rr){
|
||||
$a = get_app();
|
||||
list($m1,$m2) = explode("/",$rr['filetype']);
|
||||
$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ require_once("include/crypto.php");
|
|||
require_once("include/diaspora.php");
|
||||
require_once("include/xml.php");
|
||||
|
||||
function fetch_init($a){
|
||||
/// @TODO You always make it like this: function foo(&$a)
|
||||
/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
|
||||
function fetch_init(&$a){
|
||||
|
||||
if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
|
||||
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ function friendica_init(&$a) {
|
|||
$visible_plugins = array();
|
||||
if(is_array($a->plugins) && count($a->plugins)) {
|
||||
$r = q("select * from addon where hidden = 0");
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$visible_plugins[] = $rr['name'];
|
||||
}
|
||||
|
|
@ -80,7 +80,7 @@ function friendica_content(&$a) {
|
|||
$visible_plugins = array();
|
||||
if(is_array($a->plugins) && count($a->plugins)) {
|
||||
$r = q("select * from addon where hidden = 0");
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$visible_plugins[] = $rr['name'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function fsuggest_post(&$a) {
|
|||
intval($contact_id),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Contact not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -33,7 +33,7 @@ function fsuggest_post(&$a) {
|
|||
intval($new_contact),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
|
||||
$x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
|
||||
VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
|
||||
|
|
@ -50,7 +50,7 @@ function fsuggest_post(&$a) {
|
|||
dbesc($hash),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$fsuggest_id = $r[0]['id'];
|
||||
q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||
dbesc($note),
|
||||
|
|
@ -88,7 +88,7 @@ function fsuggest_content(&$a) {
|
|||
intval($contact_id),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Contact not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function group_post(&$a) {
|
|||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Group not found.') . EOL );
|
||||
goaway($a->get_baseurl() . '/contacts');
|
||||
return; // NOTREACHED
|
||||
|
|
@ -107,7 +107,7 @@ function group_content(&$a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$result = group_rmv(local_user(),$r[0]['name']);
|
||||
if($result)
|
||||
info( t('Group removed.') . EOL);
|
||||
|
|
@ -125,7 +125,7 @@ function group_content(&$a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$change = intval($a->argv[2]);
|
||||
}
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ function group_content(&$a) {
|
|||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Group not found.') . EOL );
|
||||
goaway($a->get_baseurl() . '/contacts');
|
||||
}
|
||||
|
|
@ -209,7 +209,7 @@ function group_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
|
||||
foreach($r as $member) {
|
||||
if(! in_array($member['id'],$preselected)) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function ignored_init(&$a) {
|
|||
intval(local_user()),
|
||||
intval($message_id)
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
if(! intval($r[0]['ignored']))
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ function install_content(&$a) {
|
|||
|
||||
if($db && $db->connected) {
|
||||
$r = q("SELECT COUNT(*) as `total` FROM `user`");
|
||||
if($r && count($r) && $r[0]['total']) {
|
||||
if (dbm::is_result($r) && $r[0]['total']) {
|
||||
$tpl = get_markup_template('install.tpl');
|
||||
return replace_macros($tpl, array(
|
||||
'$title' => $install_title,
|
||||
|
|
@ -548,9 +548,14 @@ function check_imagik(&$checks) {
|
|||
$gif = true;
|
||||
}
|
||||
}
|
||||
check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
|
||||
if ($imagick) {
|
||||
check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
|
||||
if ($imagick == false) {
|
||||
check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
|
||||
}
|
||||
else {
|
||||
check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
|
||||
if ($imagick) {
|
||||
check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
10
mod/item.php
10
mod/item.php
|
|
@ -102,7 +102,7 @@ function item_post(&$a) {
|
|||
}
|
||||
|
||||
// if this isn't the real parent of the conversation, find it
|
||||
if($r !== false && count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$parid = $r[0]['parent'];
|
||||
$parent_uri = $r[0]['uri'];
|
||||
if($r[0]['id'] != $r[0]['parent']) {
|
||||
|
|
@ -112,7 +112,7 @@ function item_post(&$a) {
|
|||
}
|
||||
}
|
||||
|
||||
if(($r === false) || (! count($r))) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('Unable to locate original post.') . EOL);
|
||||
if(x($_REQUEST,'return'))
|
||||
goaway($return_path);
|
||||
|
|
@ -141,7 +141,7 @@ function item_post(&$a) {
|
|||
|
||||
$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
|
||||
dbesc(normalise_link($thrparent[0]["author-link"])));
|
||||
if (count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$parent_contact = $r[0];
|
||||
$parent_contact["thumb"] = $parent_contact["photo"];
|
||||
$parent_contact["micro"] = $parent_contact["photo"];
|
||||
|
|
@ -330,7 +330,7 @@ function item_post(&$a) {
|
|||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r) && intval($r[0]['pubmail']))
|
||||
if (dbm::is_result($r) && intval($r[0]['pubmail']))
|
||||
$pubmail_enabled = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -464,7 +464,7 @@ function item_post(&$a) {
|
|||
intval($profile_uid)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
continue;
|
||||
|
||||
$r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ function lockview_content(&$a) {
|
|||
dbesc($type),
|
||||
intval($item_id)
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
$item = $r[0];
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ function lockview_content(&$a) {
|
|||
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||
dbesc(implode(', ', $allowed_groups))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$l[] = '<b>' . $rr['name'] . '</b>';
|
||||
}
|
||||
|
|
@ -60,7 +60,7 @@ function lockview_content(&$a) {
|
|||
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||
dbesc(implode(', ',$allowed_users))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$l[] = $rr['name'];
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ function lockview_content(&$a) {
|
|||
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||
dbesc(implode(', ', $deny_groups))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
|
||||
}
|
||||
|
|
@ -78,7 +78,7 @@ function lockview_content(&$a) {
|
|||
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||
dbesc(implode(', ',$deny_users))
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$l[] = '<strike>' . $rr['name'] . '</strike>';
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function lostpass_post(&$a) {
|
|||
dbesc($loginame)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
notice( t('No valid account found.') . EOL);
|
||||
goaway(z_root());
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ function lostpass_content(&$a) {
|
|||
$r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
|
||||
dbesc($hash)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
$o = t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function manage_post(&$a) {
|
|||
$r = q("select * from user where uid = %d limit 1",
|
||||
intval($_SESSION['submanage'])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$uid = intval($r[0]['uid']);
|
||||
$orig_record = $r[0];
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@ function manage_post(&$a) {
|
|||
);
|
||||
}
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
|
||||
unset($_SESSION['authenticated']);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function match_content(&$a) {
|
|||
$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
return;
|
||||
if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
|
||||
notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ function message_content(&$a) {
|
|||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$parent = $r[0]['parent-uri'];
|
||||
$convid = $r[0]['convid'];
|
||||
|
||||
|
|
@ -309,19 +309,21 @@ function message_content(&$a) {
|
|||
intval(local_user()),
|
||||
intval($a->argv[2])
|
||||
);
|
||||
if(!$r) {
|
||||
if (!dbm::is_result($r)) {
|
||||
$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc(normalise_link(base64_decode($a->argv[2])))
|
||||
);
|
||||
}
|
||||
if(!$r) {
|
||||
|
||||
if (!dbm::is_result($r)) {
|
||||
$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc(base64_decode($a->argv[2]))
|
||||
);
|
||||
}
|
||||
if(count($r)) {
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
$prename = $r[0]['name'];
|
||||
$preurl = $r[0]['url'];
|
||||
$preid = $r[0]['id'];
|
||||
|
|
@ -405,7 +407,7 @@ function message_content(&$a) {
|
|||
intval(local_user()),
|
||||
intval($a->argv[1])
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$contact_id = $r[0]['contact-id'];
|
||||
$convid = $r[0]['convid'];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ function modexp_init(&$a) {
|
|||
dbesc($nick)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! dbm::is_result($r))
|
||||
killme();
|
||||
|
||||
$lines = explode("\n",$r[0]['spubkey']);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function mood_init(&$a) {
|
|||
intval($parent),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$parent_uri = $r[0]['uri'];
|
||||
$private = $r[0]['private'];
|
||||
$allow_cid = $r[0]['allow_cid'];
|
||||
|
|
|
|||
|
|
@ -13,17 +13,19 @@ function msearch_post(&$a) {
|
|||
$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
|
||||
dbesc($search)
|
||||
);
|
||||
if(count($r))
|
||||
|
||||
if (dbm::is_result($r))
|
||||
$total = $r[0]['total'];
|
||||
|
||||
$results = array();
|
||||
|
||||
$r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
|
||||
dbesc($search),
|
||||
intval($startrec),
|
||||
intval($perpage)
|
||||
);
|
||||
|
||||
$results = array();
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
$results[] = array(
|
||||
'name' => $rr['name'],
|
||||
|
|
@ -39,4 +41,4 @@ function msearch_post(&$a) {
|
|||
|
||||
killme();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ function network_init(&$a) {
|
|||
intval(local_user()),
|
||||
dbesc($search)
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ",
|
||||
intval(local_user()),
|
||||
dbesc($search)
|
||||
|
|
@ -182,7 +182,7 @@ function saved_searches($search) {
|
|||
|
||||
$saved = array();
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
$saved[] = array(
|
||||
'id' => $rr['id'],
|
||||
|
|
@ -381,7 +381,7 @@ function network_content(&$a, $update = 0) {
|
|||
);
|
||||
|
||||
$str = '';
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
foreach($r as $rr)
|
||||
$str .= '<' . $rr['id'] . '>';
|
||||
if(strlen($str))
|
||||
|
|
@ -463,7 +463,7 @@ function network_content(&$a, $update = 0) {
|
|||
intval($group),
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
if(! count($r)) {
|
||||
if(! dbm::is_result($r)) {
|
||||
if($update)
|
||||
killme();
|
||||
notice( t('No such group') . EOL );
|
||||
|
|
@ -507,7 +507,7 @@ function network_content(&$a, $update = 0) {
|
|||
AND (NOT `blocked` OR `pending`) LIMIT 1",
|
||||
intval($cid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
|
||||
|
||||
$entries[0] = array(
|
||||
|
|
@ -609,7 +609,7 @@ function network_content(&$a, $update = 0) {
|
|||
intval($_SESSION['uid'])
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
}
|
||||
}
|
||||
|
|
@ -705,7 +705,7 @@ function network_content(&$a, $update = 0) {
|
|||
$parents_str = '';
|
||||
$date_offset = "";
|
||||
|
||||
if(dbm::is_result($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
if(! in_array($rr['item_id'],$parents_arr))
|
||||
$parents_arr[] = $rr['item_id'];
|
||||
|
|
@ -729,7 +729,9 @@ function network_content(&$a, $update = 0) {
|
|||
intval($parents),
|
||||
intval($max_comments + 1)
|
||||
);
|
||||
$items = array_merge($items, $thread_items);
|
||||
|
||||
if (dbm::is_result($thread_items))
|
||||
$items = array_merge($items, $thread_items);
|
||||
}
|
||||
$items = conv_sort($items,$ordering);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ function nogroup_content(&$a) {
|
|||
|
||||
require_once('include/Contact.php');
|
||||
$r = contacts_not_grouped(local_user());
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
}
|
||||
$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr) {
|
||||
|
||||
$contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function noscrape_init(&$a) {
|
|||
if(is_array($a->profile) AND !$a->profile['hide-friends']) {
|
||||
$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
|
||||
intval($a->profile['uid']));
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$json_info["updated"] = date("c", strtotime($r[0]['updated']));
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
|
||||
|
|
@ -53,7 +53,7 @@ function noscrape_init(&$a) {
|
|||
dbesc(NETWORK_DIASPORA),
|
||||
dbesc(NETWORK_OSTATUS)
|
||||
);
|
||||
if(count($r))
|
||||
if (dbm::is_result($r))
|
||||
$json_info["contacts"] = intval($r[0]['total']);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ function notes_content(&$a,$update = false) {
|
|||
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
$a->set_pager_itemspage(40);
|
||||
}
|
||||
|
|
@ -102,7 +102,7 @@ function notes_content(&$a,$update = false) {
|
|||
$parents_arr = array();
|
||||
$parents_str = '';
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
foreach($r as $rr)
|
||||
$parents_arr[] = $rr['item_id'];
|
||||
$parents_str = implode(', ', $parents_arr);
|
||||
|
|
@ -116,7 +116,7 @@ function notes_content(&$a,$update = false) {
|
|||
dbesc($parents_str)
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$items = conv_sort($r,"`commented`");
|
||||
|
||||
$o .= conversation($a,$items,'notes',$update);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
|
||||
intval($id)
|
||||
);
|
||||
if (count($r)){
|
||||
if (dbm::is_result($r)){
|
||||
$nick = $r[0]['nickname'];
|
||||
$url = $a->get_baseurl()."/display/$nick/$id";
|
||||
goaway($url);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function notifications_post(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
if (dbm::is_result($r)) {
|
||||
$intro_id = $r[0]['id'];
|
||||
$contact_id = $r[0]['contact-id'];
|
||||
}
|
||||
|
|
@ -305,7 +305,6 @@ function notifications_content(&$a) {
|
|||
$notif_nocontent = sprintf( t('No more %s notifications.'), $notifs['ident']);
|
||||
}
|
||||
|
||||
|
||||
$o .= replace_macros($notif_tpl, array(
|
||||
'$notif_header' => $notif_header,
|
||||
'$tabs' => $tabs,
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function notify_content(&$a) {
|
|||
require_once('include/bbcode.php');
|
||||
|
||||
$r = $nm->getAll(array('seen'=>0));
|
||||
if ($r!==false && count($r) > 0) {
|
||||
if (dbm::is_result($r) > 0) {
|
||||
foreach ($r as $it) {
|
||||
$notif_content .= replace_macros($not_tpl,array(
|
||||
'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue