diff --git a/boot.php b/boot.php index 497451224..b282f8d48 100644 --- a/boot.php +++ b/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'); diff --git a/include/Contact.php b/include/Contact.php index 58748e289..7ca45a21b 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -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'); @@ -242,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) { @@ -428,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 ''; } diff --git a/include/Core/Config.php b/include/Core/Config.php index a5eca0570..7b7045a9e 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -1,5 +1,8 @@ config[$family],$key)) { unset($a->config[$family][$key]); } diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 63d204b3a..43735018e 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -1,5 +1,8 @@ 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]); diff --git a/include/ForumManager.php b/include/ForumManager.php index d01ece4d9..c2a20df29 100644 --- a/include/ForumManager.php +++ b/include/ForumManager.php @@ -88,7 +88,7 @@ class ForumManager { $total = count($contacts); $visible_forums = 10; - if(dbm::is_result($contacts)) { + if (dbm::is_result($contacts)) { $id = 0; diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 13a2534e1..2adab5972 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -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 ( diff --git a/include/Probe.php b/include/Probe.php index 14e8d5bca..5c2ba86cc 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -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']); diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 71a42478b..ed9c634c2 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -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']); diff --git a/include/api.php b/include/api.php index 1f3c76298..2ae1aeaa0 100644 --- a/include/api.php +++ b/include/api.php @@ -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 diff --git a/include/auth.php b/include/auth.php index d1917b8b3..2ca9c3efb 100644 --- a/include/auth.php +++ b/include/auth.php @@ -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]; } diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php index e1900dc73..e12da35ef 100755 --- a/include/auth_ejabberd.php +++ b/include/auth_ejabberd.php @@ -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])) { @@ -214,7 +214,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) { diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 35c9d983d..0790e503e 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -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 .= "\r\n"; diff --git a/include/contact_widgets.php b/include/contact_widgets.php index bbbd941b5..f66d23c51 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -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']; } } diff --git a/include/conversation.php b/include/conversation.php index 63db42d93..567bf83e1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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']; diff --git a/include/cron.php b/include/cron.php index 730325ba8..77332dcec 100644 --- a/include/cron.php +++ b/include/cron.php @@ -43,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; @@ -434,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"]); @@ -474,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"]); diff --git a/include/cronhooks.php b/include/cronhooks.php index 4bb1e5f65..7524a0c3a 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -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; diff --git a/include/datetime.php b/include/datetime.php index 16b134e90..e88c274ab 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -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']); diff --git a/include/dba.php b/include/dba.php index 16d2dc54d..920027cbc 100644 --- a/include/dba.php +++ b/include/dba.php @@ -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; diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 7b720fb6c..a44c447af 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -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'; diff --git a/include/dbstructure.php b/include/dbstructure.php index 94e8da4a4..c694014f6 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -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; } } diff --git a/include/delivery.php b/include/delivery.php index 8fce98774..a7aebe709 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -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']; } } diff --git a/include/dfrn.php b/include/dfrn.php index 272105128..6451b8521 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -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"]) ); diff --git a/include/diaspora.php b/include/diaspora.php index f2d484867..94c6ccfb8 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1278,7 +1278,7 @@ class diaspora { $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1", dbesc($message_uri) ); - if($r) { + if (dbm::is_result($r)) { logger("duplicate message already delivered.", LOGGER_DEBUG); return false; } @@ -2925,7 +2925,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]; @@ -2956,7 +2956,7 @@ class diaspora { intval($item["parent"]) ); - if (!$p) + if (!dbm::is_result($p)) return false; $parent = $p[0]; @@ -3170,7 +3170,7 @@ class diaspora { intval($item["uid"]) ); - if (!$r) { + if (!dbm::is_result($r)) { logger("conversation not found."); return; } diff --git a/include/discover_poco.php b/include/discover_poco.php index 0b468faea..bf3e47edd 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -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")) { diff --git a/include/enotify.php b/include/enotify.php index 5b2bea297..c6e0506e9 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -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; } } diff --git a/include/event.php b/include/event.php index 6c0e2bdec..3a41dad4e 100644 --- a/include/event.php +++ b/include/event.php @@ -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 = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; $object .= '' . xmlify(format_event_bbcode($arr)) . ''; $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); diff --git a/include/expire.php b/include/expire.php index 873c594e8..eca2b1c42 100644 --- a/include/expire.php +++ b/include/expire.php @@ -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']); diff --git a/include/fcontact.php b/include/fcontact.php index 8821a985f..b2706e51a 100644 --- a/include/fcontact.php +++ b/include/fcontact.php @@ -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']; } diff --git a/include/files.php b/include/files.php index b3bd7690f..7bff0e346 100644 --- a/include/files.php +++ b/include/files.php @@ -1,6 +1,6 @@ '', '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']; } diff --git a/include/identity.php b/include/identity.php index a792c4714..bf05a0051 100644 --- a/include/identity.php +++ b/include/identity.php @@ -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) { diff --git a/include/items.php b/include/items.php index c2c4c1029..da9147fad 100644 --- a/include/items.php +++ b/include/items.php @@ -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); } diff --git a/include/like.php b/include/like.php index 118ec81ca..5b6d1b9e6 100644 --- a/include/like.php +++ b/include/like.php @@ -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 diff --git a/include/lock.php b/include/lock.php index 70cf4b787..0c7b6acaa 100644 --- a/include/lock.php +++ b/include/lock.php @@ -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; }} diff --git a/include/message.php b/include/message.php index 51f3ad805..ea2fcef3b 100644 --- a/include/message.php +++ b/include/message.php @@ -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) { diff --git a/include/nav.php b/include/nav.php index 7a8230cc1..2a9f24ca9 100644 --- a/include/nav.php +++ b/include/nav.php @@ -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 { diff --git a/include/network.php b/include/network.php index 351951846..df46d3593 100644 --- a/include/network.php +++ b/include/network.php @@ -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; } diff --git a/include/notifier.php b/include/notifier.php index 812752a55..2f9599d07 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -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']) { @@ -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 diff --git a/include/oauth.php b/include/oauth.php index 6a1d72d17..a30232df4 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -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; } diff --git a/include/oembed.php b/include/oembed.php index 5abd03b61..a1945894f 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -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 ''; } diff --git a/include/onepoll.php b/include/onepoll.php index 4ac5f38be..283403666 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -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']; } diff --git a/include/pgettext.php b/include/pgettext.php index de7cdda9e..fb87798ff 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -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 diff --git a/include/plugin.php b/include/plugin.php index f6e4a7a88..487ab5751 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -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']; } } diff --git a/include/poller.php b/include/poller.php index 925de3fe5..44f4895cd 100644 --- a/include/poller.php +++ b/include/poller.php @@ -39,7 +39,7 @@ function poller_run($argv, $argc){ return; } - if (App::maxload_reached()) { + if ($a->maxload_reached()) { return; } diff --git a/include/queue_fn.php b/include/queue_fn.php index a68aa8918..9dcefdd24 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -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; diff --git a/include/redir.php b/include/redir.php index ab4f3220c..8d8a035f1 100644 --- a/include/redir.php +++ b/include/redir.php @@ -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']; diff --git a/include/security.php b/include/security.php index b52ddeb2d..fa698c1b1 100644 --- a/include/security.php +++ b/include/security.php @@ -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']; } diff --git a/include/socgraph.php b/include/socgraph.php index 765ed5d89..349fd0b2c 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -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)) diff --git a/include/tags.php b/include/tags.php index a8bcae86d..6c1d01d74 100644 --- a/include/tags.php +++ b/include/tags.php @@ -1,6 +1,6 @@ get_baseurl(); $profile_data = parse_url($profile_base); diff --git a/include/text.php b/include/text.php index 1197f24ee..5856226c3 100644 --- a/include/text.php +++ b/include/text.php @@ -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)); diff --git a/include/threads.php b/include/threads.php index df0f8ee1d..48391174e 100644 --- a/include/threads.php +++ b/include/threads.php @@ -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) ); diff --git a/include/uimport.php b/include/uimport.php index 937a16710..51672d92b 100644 --- a/include/uimport.php +++ b/include/uimport.php @@ -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; } diff --git a/include/user.php b/include/user.php index 989c8b0e0..ec15d5b13 100644 --- a/include/user.php +++ b/include/user.php @@ -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']); } @@ -283,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", diff --git a/library/langdet/Text/LanguageDetect.php b/library/langdet/Text/LanguageDetect.php index d3caaff39..45337ea8f 100644 --- a/library/langdet/Text/LanguageDetect.php +++ b/library/langdet/Text/LanguageDetect.php @@ -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() diff --git a/mod/admin.php b/mod/admin.php index f852bd58d..cf0d8d9ac 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -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') diff --git a/mod/allfriends.php b/mod/allfriends.php index 03f78e696..240aa524b 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -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; } diff --git a/mod/api.php b/mod/api.php index da2c40c30..406ef26c1 100644 --- a/mod/api.php +++ b/mod/api.php @@ -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]; diff --git a/mod/attach.php b/mod/attach.php index 03f850f0d..274acfc2b 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -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; } diff --git a/mod/cal.php b/mod/cal.php index 3a229ebad..ba4339328 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -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); diff --git a/mod/common.php b/mod/common.php index 063eafe67..9f9379be5 100644 --- a/mod/common.php +++ b/mod/common.php @@ -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; } diff --git a/mod/community.php b/mod/community.php index c8d1e0c9d..40d4016f3 100644 --- a/mod/community.php +++ b/mod/community.php @@ -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; } diff --git a/mod/contactgroup.php b/mod/contactgroup.php index bf81afe07..4456db2f5 100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@ -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(); -} \ No newline at end of file +} diff --git a/mod/contacts.php b/mod/contacts.php index 1c1c21638..735ccec72 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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); } } diff --git a/mod/content.php b/mod/content.php index c4b1f2f68..1e2307f55 100644 --- a/mod/content.php +++ b/mod/content.php @@ -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"), diff --git a/mod/crepair.php b/mod/crepair.php index 3abbe343b..b4275f6ba 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -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; } diff --git a/mod/delegate.php b/mod/delegate.php index 20d2e605e..71628aed0 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -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; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 5aea4eede..23c62cb0a 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -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'); diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 6f6fc41c1..dfa2af18c 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.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); diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 9613229da..91cd33f49 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -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': diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index d7566905b..236970a2e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -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; } diff --git a/mod/directory.php b/mod/directory.php index 06aeec622..ddea650de 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -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'; diff --git a/mod/editpost.php b/mod/editpost.php index 46a530dce..217d793f5 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -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; diff --git a/mod/events.php b/mod/events.php index 16679ff7e..7cb171f9e 100644 --- a/mod/events.php +++ b/mod/events.php @@ -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]; } diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 110ca9585..11ac2d825 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -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"); diff --git a/mod/fetch.php b/mod/fetch.php index 1c73ad371..04bdf5188 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -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')); diff --git a/mod/friendica.php b/mod/friendica.php index aad5964ba..fb25f40e4 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -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']; } diff --git a/mod/fsuggest.php b/mod/fsuggest.php index ad407d5f3..1d56f4573 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -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; } diff --git a/mod/group.php b/mod/group.php index 5b28784f5..db92ed7de 100644 --- a/mod/group.php +++ b/mod/group.php @@ -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)) { diff --git a/mod/ignored.php b/mod/ignored.php index e876b4ef8..ba55c55e3 100644 --- a/mod/ignored.php +++ b/mod/ignored.php @@ -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'])) diff --git a/mod/install.php b/mod/install.php index 97092c140..b5af1373a 100755 --- a/mod/install.php +++ b/mod/install.php @@ -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, diff --git a/mod/item.php b/mod/item.php index 170bed12a..9ef82616c 100644 --- a/mod/item.php +++ b/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' diff --git a/mod/lockview.php b/mod/lockview.php index 0ae54c8c1..c806fc317 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -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[] = '' . $rr['name'] . ''; } @@ -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[] = '' . $rr['name'] . ''; } @@ -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[] = '' . $rr['name'] . ''; diff --git a/mod/lostpass.php b/mod/lostpass.php index 938d1cbb0..3dca3a8b8 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -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; } diff --git a/mod/manage.php b/mod/manage.php index adcc3d787..66891db72 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -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']); diff --git a/mod/match.php b/mod/match.php index 33e07c91c..f7fe325b3 100644 --- a/mod/match.php +++ b/mod/match.php @@ -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); diff --git a/mod/message.php b/mod/message.php index 4bd73d0ce..9bd5b0d72 100644 --- a/mod/message.php +++ b/mod/message.php @@ -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']; diff --git a/mod/modexp.php b/mod/modexp.php index bba2c2882..d1dabb101 100644 --- a/mod/modexp.php +++ b/mod/modexp.php @@ -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']); diff --git a/mod/mood.php b/mod/mood.php index f804af0c0..c64dd0d9e 100644 --- a/mod/mood.php +++ b/mod/mood.php @@ -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']; diff --git a/mod/msearch.php b/mod/msearch.php index 89de5b705..43b200ddf 100644 --- a/mod/msearch.php +++ b/mod/msearch.php @@ -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(); -} \ No newline at end of file +} diff --git a/mod/network.php b/mod/network.php index cafaa11ae..9cfeda102 100644 --- a/mod/network.php +++ b/mod/network.php @@ -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 { diff --git a/mod/nogroup.php b/mod/nogroup.php index 2f0985c9d..0a014c067 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -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); diff --git a/mod/noscrape.php b/mod/noscrape.php index 2a0460546..537aff878 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -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']); } diff --git a/mod/notes.php b/mod/notes.php index a25d090ed..74ab18a6f 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -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); diff --git a/mod/notice.php b/mod/notice.php index 19cf53189..7fdf4493a 100644 --- a/mod/notice.php +++ b/mod/notice.php @@ -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); diff --git a/mod/notifications.php b/mod/notifications.php index af44097c1..3e0bd9cc4 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -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, diff --git a/mod/notify.php b/mod/notify.php index 938e2ffbe..dceb326a4 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -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'], diff --git a/mod/openid.php b/mod/openid.php index 0ebda485d..60a9c1381 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -38,7 +38,7 @@ function openid_content(&$a) { dbesc($authid), dbesc(normalise_openid($authid)) ); - if($r && count($r)) { + if (dbm::is_result($r)) { // successful OpenID login diff --git a/mod/p.php b/mod/p.php index 8da044e93..4db8f5529 100644 --- a/mod/p.php +++ b/mod/p.php @@ -48,7 +48,7 @@ function p_init($a){ $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user` INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d", intval($item[0]["uid"])); - if (!$r) { + if (!dbm::is_result($r)) { header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found')); killme(); } diff --git a/mod/photo.php b/mod/photo.php index 0d60282d5..a94a3ac2c 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -76,7 +76,7 @@ function photo_init(&$a) { intval($resolution), intval($uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $data = $r[0]['data']; $mimetype = $r[0]['type']; } @@ -106,7 +106,7 @@ function photo_init(&$a) { dbesc($photo), intval($resolution) ); - if(count($r)) { + if (dbm::is_result($r)) { $sql_extra = permissions_sql($r[0]['uid']); @@ -117,9 +117,9 @@ function photo_init(&$a) { intval($resolution) ); - $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); + $public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); - if(count($r)) { + if (dbm::is_result($r)) { $resolution = $r[0]['scale']; $data = $r[0]['data']; $mimetype = $r[0]['type']; diff --git a/mod/photos.php b/mod/photos.php index d72a82482..24cc8fabb 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -165,7 +165,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); - if (! count($r)) { + if (! dbm::is_result($r)) { notice( t('Contact information unavailable') . EOL); logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); killme(); @@ -186,7 +186,7 @@ function photos_post(&$a) { dbesc($album), intval($page_owner_uid) ); - if (! count($r)) { + if (! dbm::is_result($r)) { notice( t('Album not found.') . EOL); goaway($_SESSION['photo_return']); return; // NOTREACHED @@ -255,7 +255,7 @@ function photos_post(&$a) { ); } if (dbm::is_result($r)) { - foreach ($r as $rr) { + foreach($r as $rr) { $res[] = "'" . dbesc($rr['rid']) . "'" ; } } else { @@ -277,7 +277,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); if (dbm::is_result($r)) { - foreach ($r as $rr) { + foreach($r as $rr) { q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", dbesc(datetime_convert()), dbesc($rr['parent-uri']), @@ -748,7 +748,7 @@ function photos_post(&$a) { dbesc($album), intval($page_owner_uid) ); - if ((! count($r)) || ($album == t('Profile Photos'))) + if ((! dbm::is_result($r)) || ($album == t('Profile Photos'))) $visible = 1; else $visible = 0; @@ -1573,7 +1573,7 @@ function photos_content(&$a) { } $comments = ''; - if (! count($r)) { + if (! dbm::is_result($r)) { if ($can_post || can_write_wall($a,$owner_uid)) { if ($link_item['last-child']) { $comments .= replace_macros($cmnt_tpl,array( @@ -1809,8 +1809,6 @@ function photos_content(&$a) { intval($a->pager['itemspage']) ); - - $photos = array(); if (dbm::is_result($r)) { $twist = 'rotright'; diff --git a/mod/ping.php b/mod/ping.php index 7e20b9383..1ef3cc5b4 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -175,7 +175,7 @@ function ping_init(App $a) ); $intro_count = count($intros1) + count($intros2); - $intros = $intros1+$intros2; + $intros = $intros1 + $intros2; $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail` @@ -189,7 +189,8 @@ function ping_init(App $a) $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid` WHERE `contact`.`self` = 1"); - if ($regs) { + + if (dbm::is_result($regs)) { $register_count = $regs[0]['total']; } } diff --git a/mod/poco.php b/mod/poco.php index 1ec5b2d4e..e454d1e66 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -45,7 +45,7 @@ function poco_init(&$a) { where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1", dbesc($user) ); - if(! count($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) + if(! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) http_status_exit(404); $user = $r[0]; @@ -83,7 +83,7 @@ function poco_init(&$a) { dbesc(NETWORK_STATUSNET) ); } - if(count($r)) + if (dbm::is_result($r)) $totalResults = intval($r[0]['total']); else $totalResults = 0; @@ -173,7 +173,7 @@ function poco_init(&$a) { } if(is_array($r)) { - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { if (!isset($rr['generation'])) { if ($global) diff --git a/mod/poke.php b/mod/poke.php index 435da4dcd..8102c3697 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -52,7 +52,7 @@ function poke_init(&$a) { intval($uid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('poke: no contact ' . $contact_id); return; } @@ -66,7 +66,7 @@ function poke_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']; @@ -159,7 +159,7 @@ function poke_content(&$a) { intval($_GET['c']), intval(local_user()) ); - if(count($r)) { + if (dbm::is_result($r)) { $name = $r[0]['name']; $id = $r[0]['id']; } diff --git a/mod/post.php b/mod/post.php index c0e783a6a..76282d29a 100644 --- a/mod/post.php +++ b/mod/post.php @@ -23,7 +23,7 @@ function post_post(&$a) { AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nickname) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; diff --git a/mod/profile.php b/mod/profile.php index 279f86352..5ab675dd0 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -13,7 +13,7 @@ function profile_init(&$a) { $which = htmlspecialchars($a->argv[1]); else { $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1"); - if(count($r)) { + if (dbm::is_result($r)) { goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); } else { @@ -136,7 +136,7 @@ function profile_content(&$a, $update = 0) { intval($contact_id), intval($a->profile['profile_uid']) ); - if(count($r)) { + if (dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -256,21 +256,21 @@ function profile_content(&$a, $update = 0) { AND `thread`.`wall` = 1 $sql_extra $sql_extra2 ", intval($a->profile['profile_uid']) - ); + ); - if(count($r)) { - $a->set_pager_total($r[0]['total']); + if (dbm::is_result($r)) { + $a->set_pager_total($r[0]['total']); } } // check if we serve a mobile device and get the user settings // accordingly if ($a->is_mobile) { - $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); - $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10); + $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10); } else { - $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); - $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); } // now that we have the user settings, see if the theme forces // a maximum item number which is lower then the user choice diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 11e671afc..20bbbbcbd 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -32,7 +32,7 @@ function profile_photo_post(&$a) { intval($_REQUEST['profile']), intval(local_user()) ); - if(count($r) && (! intval($r[0]['is-default']))) + if (dbm::is_result($r) && (! intval($r[0]['is-default']))) $is_default_profile = 0; } @@ -63,7 +63,7 @@ function profile_photo_post(&$a) { dbesc(local_user()), intval($scale)); - if(count($r)) { + if (dbm::is_result($r)) { $base_image = $r[0]; @@ -195,7 +195,7 @@ function profile_photo_content(&$a) { intval(local_user()), dbesc($resource_id) ); - if (!count($r)){ + if (!dbm::is_result($r)){ notice( t('Permission denied.') . EOL ); return; } diff --git a/mod/profiles.php b/mod/profiles.php index 943742e3a..f9fde658d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -15,7 +15,7 @@ function profiles_init(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); goaway('profiles'); return; // NOTREACHED @@ -130,7 +130,7 @@ function profiles_init(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); killme(); return; @@ -286,7 +286,7 @@ function profiles_post(&$a) { intval(local_user()) ); } - if(count($r)) { + if (dbm::is_result($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@ -613,7 +613,7 @@ function profiles_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); return; } @@ -767,7 +767,7 @@ function profiles_content(&$a) { "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", local_user() ); - if(count($r)){ + if (dbm::is_result($r)){ //Go to the default profile. goaway('profiles/'.$r[0]['id']); } @@ -775,7 +775,7 @@ function profiles_content(&$a) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); - if(count($r)) { + if (dbm::is_result($r)) { $tpl = get_markup_template('profile_entry.tpl'); foreach($r as $rr) { diff --git a/mod/profperm.php b/mod/profperm.php index 077f695be..1c37f84ab 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -42,7 +42,7 @@ function profperm_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + if (dbm::is_result($r)) $change = intval($a->argv[2]); } @@ -52,7 +52,7 @@ function profperm_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Invalid profile identifier.') . EOL ); return; } @@ -64,7 +64,7 @@ function profperm_content(&$a) { ); $ingroup = array(); - if(count($r)) + if (dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; @@ -94,7 +94,7 @@ function profperm_content(&$a) { $members = $r; $ingroup = array(); - if(count($r)) + if (dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; } @@ -138,7 +138,7 @@ function profperm_content(&$a) { dbesc(NETWORK_DFRN) ); - if(count($r)) { + if (dbm::is_result($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['id'],$ingroup)) { diff --git a/mod/proxy.php b/mod/proxy.php index de2810dd7..612dc910a 100644 --- a/mod/proxy.php +++ b/mod/proxy.php @@ -136,7 +136,7 @@ function proxy_init() { if (!$direct_cache AND ($cachefile == "")) { $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash); - if (count($r)) { + if (dbm::is_result($r)) { $img_str = $r[0]['data']; $mime = $r[0]["desc"]; if ($mime == "") $mime = "image/jpeg"; @@ -144,7 +144,7 @@ function proxy_init() { } else $r = array(); - if (!count($r)) { + if (!dbm::is_result($r)) { // It shouldn't happen but it does - spaces in URL $_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']); $redirects = 0; diff --git a/mod/pubsub.php b/mod/pubsub.php index 6053ee2fb..ddda7ec22 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -47,7 +47,7 @@ function pubsub_init(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: local account not found: ' . $nick); hub_return(false, ''); } @@ -62,7 +62,7 @@ function pubsub_init(&$a) { intval($contact_id), intval($owner['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: contact '.$contact_id.' not found.'); hub_return(false, ''); } @@ -117,7 +117,7 @@ function pubsub_post(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) hub_post_return(); $importer = $r[0]; @@ -131,7 +131,7 @@ function pubsub_post(&$a) { dbesc(NETWORK_FEED) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml); hub_post_return(); } diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index 5d7621cc7..bfe553c44 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -55,7 +55,7 @@ function pubsubhubbub_init(&$a) { " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick)); - if(!count($r)) { + if (!dbm::is_result($r)) { logger('pubsubhubbub: local account not found: ' . $nick); http_status_exit(404); } @@ -73,7 +73,7 @@ function pubsubhubbub_init(&$a) { $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`". " AND NOT `pending` AND `self` LIMIT 1", intval($owner['uid'])); - if(!count($r)) { + if (!dbm::is_result($r)) { logger('pubsubhubbub: contact not found.'); http_status_exit(404); } @@ -132,7 +132,7 @@ function pubsubhubbub_init(&$a) { // if we are just updating an old subscription, keep the // old values for push and last_update - if (count($r)) { + if (dbm::is_result($r)) { $last_update = $r[0]['last_update']; $push_flag = $r[0]['push']; } diff --git a/mod/qsearch.php b/mod/qsearch.php index c35e253b6..a440ea708 100644 --- a/mod/qsearch.php +++ b/mod/qsearch.php @@ -23,7 +23,7 @@ function qsearch_init(&$a) { intval($limit) ); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) $results[] = array( 0, (int) $rr['id'], $rr['name'], '', ''); @@ -38,7 +38,7 @@ function qsearch_init(&$a) { ); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']); diff --git a/mod/receive.php b/mod/receive.php index 4991ac47e..dd4e61ae4 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -34,7 +34,7 @@ function receive_post(&$a) { $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($guid) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; diff --git a/mod/redir.php b/mod/redir.php index 632c39578..5dc5ad372 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -18,7 +18,7 @@ function redir_init(&$a) { intval(local_user()) ); - if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) goaway(z_root()); $cid = $r[0]['id']; @@ -31,7 +31,7 @@ function redir_init(&$a) { intval(local_user()) ); - if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) goaway(z_root()); } diff --git a/mod/regmod.php b/mod/regmod.php index bbe733003..0120017b0 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -34,7 +34,7 @@ function user_allow($hash) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1", intval($user[0]['uid']) ); - if(count($r) && $r[0]['net-publish']) { + if (dbm::is_result($r) && $r[0]['net-publish']) { $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; if($url && strlen(get_config('system','directory'))) proc_run(PRIORITY_LOW, "include/directory.php", $url); diff --git a/mod/salmon.php b/mod/salmon.php index 37230a557..78cdc0932 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -31,7 +31,7 @@ function salmon_post(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; @@ -150,7 +150,7 @@ function salmon_post(&$a) { dbesc(normalise_link($author_link)), intval($importer['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('mod-salmon: Author unknown to us.'); if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) { $result = new_contact($importer['uid'],$author_link); @@ -169,8 +169,8 @@ function salmon_post(&$a) { // Have we ignored the person? // If so we can not accept this post. - //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { - if(count($r) && $r[0]['blocked']) { + //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { + if (dbm::is_result($r) && $r[0]['blocked']) { logger('mod-salmon: Ignoring this author.'); http_status_exit(202); // NOTREACHED @@ -179,7 +179,7 @@ function salmon_post(&$a) { // Placeholder for hub discovery. $hub = ''; - $contact_rec = ((count($r)) ? $r[0] : null); + $contact_rec = ((dbm::is_result($r)) ? $r[0] : null); ostatus::import($data,$importer,$contact_rec, $hub); diff --git a/mod/search.php b/mod/search.php index a83725999..d36cc8fcb 100644 --- a/mod/search.php +++ b/mod/search.php @@ -15,7 +15,7 @@ function search_saved_searches() { intval(local_user()) ); - if(count($r)) { + if (dbm::is_result($r)) { $saved = array(); foreach($r as $rr) { $saved[] = array( @@ -53,7 +53,7 @@ function search_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) @@ -209,7 +209,6 @@ function search_content(&$a) { $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); } - $r = q("SELECT %s FROM `item` %s WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) @@ -220,7 +219,7 @@ function search_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage'])); } - if(! count($r)) { + if(! dbm::is_result($r)) { info( t('No results.') . EOL); return $o; } diff --git a/mod/settings.php b/mod/settings.php index 663acd69f..a9521db22 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -225,7 +225,7 @@ function settings_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { q("INSERT INTO `mailacct` (`uid`) VALUES (%d)", intval(local_user()) ); @@ -255,7 +255,7 @@ function settings_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); - if(count($r)) { + if (dbm::is_result($r)) { $eacct = $r[0]; require_once('include/email.php'); $mb = construct_mailbox_name($eacct); @@ -691,7 +691,7 @@ function settings_content(&$a) { dbesc($a->argv[3]), local_user()); - if (!count($r)){ + if (!dbm::is_result($r)){ notice(t("You can't edit this application.")); return; } @@ -752,7 +752,7 @@ function settings_content(&$a) { $settings_addons = ""; $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); - if(! count($r)) + if(! dbm::is_result($r)) $settings_addons = t('No Plugin settings configured'); call_hooks('plugin_settings', $settings_addons); @@ -859,15 +859,15 @@ function settings_content(&$a) { $r = null; } - $mail_server = ((count($r)) ? $r[0]['server'] : ''); - $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); - $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); - $mail_user = ((count($r)) ? $r[0]['user'] : ''); - $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); - $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); - $mail_action = ((count($r)) ? $r[0]['action'] : 0); - $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); - $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); + $mail_server = ((dbm::is_result($r)) ? $r[0]['server'] : ''); + $mail_port = ((dbm::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); + $mail_ssl = ((dbm::is_result($r)) ? $r[0]['ssltype'] : ''); + $mail_user = ((dbm::is_result($r)) ? $r[0]['user'] : ''); + $mail_replyto = ((dbm::is_result($r)) ? $r[0]['reply_to'] : ''); + $mail_pubmail = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0); + $mail_action = ((dbm::is_result($r)) ? $r[0]['action'] : 0); + $mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : ''); + $mail_chk = ((dbm::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); $tpl = get_markup_template("settings_connectors.tpl"); diff --git a/mod/share.php b/mod/share.php index 085da4e30..0a34c6fc5 100644 --- a/mod/share.php +++ b/mod/share.php @@ -12,7 +12,7 @@ function share_init(&$a) { intval($post_id), intval(local_user()) ); - if(! count($r) || ($r[0]['private'] == 1)) + if(! dbm::is_result($r) || ($r[0]['private'] == 1)) killme(); if (!intval(get_config('system','old_share'))) { diff --git a/mod/starred.php b/mod/starred.php index 2a89ac768..27f924e44 100644 --- a/mod/starred.php +++ b/mod/starred.php @@ -18,7 +18,7 @@ function starred_init(&$a) { intval(local_user()), intval($message_id) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); if(! intval($r[0]['starred'])) diff --git a/mod/subthread.php b/mod/subthread.php index 33cf7489c..dc014047a 100644 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -20,7 +20,7 @@ function subthread_content(&$a) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if(! $item_id || (! dbm::is_result($r))) { logger('subthread: no item ' . $item_id); return; } @@ -41,7 +41,7 @@ function subthread_content(&$a) { intval($item['contact-id']), intval($item['uid']) ); - if(! count($r)) + if(! dbm::is_result($r)) return; if(! $r[0]['self']) $remote_owner = $r[0]; @@ -53,7 +53,7 @@ function subthread_content(&$a) { 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) { @@ -75,7 +75,7 @@ function subthread_content(&$a) { intval($_SESSION['visitor_id']), intval($owner_uid) ); - if(count($r)) + if (dbm::is_result($r)) $contact = $r[0]; } if(! $contact) { diff --git a/mod/suggest.php b/mod/suggest.php index 4399450ec..8f4315a84 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -67,7 +67,7 @@ function suggest_content(&$a) { $r = suggestion_query(local_user()); - if(! count($r)) { + if(! dbm::is_result($r)) { $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } diff --git a/mod/tagger.php b/mod/tagger.php index e0ef1ceb0..e5e5263d8 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -27,7 +27,7 @@ function tagger_content(&$a) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if(! $item_id || (! dbm::is_result($r))) { logger('tagger: no item ' . $item_id); return; } @@ -39,7 +39,7 @@ function tagger_content(&$a) { $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1", intval($owner_uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $owner_nick = $r[0]['nickname']; $blocktags = $r[0]['blocktags']; } @@ -50,7 +50,7 @@ function tagger_content(&$a) { $r = q("select * from contact where self = 1 and uid = %d limit 1", intval(local_user()) ); - if(count($r)) + if (dbm::is_result($r)) $contact = $r[0]; else { logger('tagger: no contact_id'); @@ -178,7 +178,7 @@ EOT; $r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1", dbesc($item['uri']) ); - if(count($r)) { + if (dbm::is_result($r)) { $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1", intval($r[0]['uid']) ); diff --git a/mod/tagrm.php b/mod/tagrm.php index 176986bc3..57024b3c3 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -19,7 +19,7 @@ function tagrm_post(&$a) { intval(local_user()) ); - if(! count($r)) + if(! dbm::is_result($r)) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); $arr = explode(',', $r[0]['tag']); @@ -68,7 +68,7 @@ function tagrm_content(&$a) { intval(local_user()) ); - if(! count($r)) + if(! dbm::is_result($r)) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); $arr = explode(',', $r[0]['tag']); diff --git a/mod/uexport.php b/mod/uexport.php index 3114add7e..e0a0b071f 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -44,7 +44,7 @@ function uexport_content(&$a){ function _uexport_multirow($query) { $result = array(); $r = q($query); -// if(count($r)) { +// if (dbm::is_result($r)) { if ($r){ foreach($r as $rr){ $p = array(); @@ -130,7 +130,7 @@ function uexport_all(&$a) { $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", intval(local_user()) ); - if(count($r)) + if (dbm::is_result($r)) $total = $r[0]['total']; // chunk the output to avoid exhausting memory @@ -142,7 +142,7 @@ function uexport_all(&$a) { intval($x), intval(500) ); - /*if(count($r)) { + /*if (dbm::is_result($r)) { foreach($r as $rr) foreach($rr as $k => $v) $item[][$k] = $v; diff --git a/mod/videos.php b/mod/videos.php index 1bb59bc54..1e03c5005 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -140,7 +140,7 @@ function videos_post(&$a) { dbesc($video_id) ); - if(count($r)) { + if (dbm::is_result($r)) { q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", intval(local_user()), dbesc($video_id) @@ -259,7 +259,7 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $can_post = true; $contact = $r[0]; $remote_contact = true; @@ -287,7 +287,7 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -347,7 +347,7 @@ function videos_content(&$a) { $sql_extra GROUP BY hash", intval($a->data['user']['uid']) ); - if(count($r)) { + if (dbm::is_result($r)) { $a->set_pager_total(count($r)); $a->set_pager_itemspage(20); } @@ -363,7 +363,7 @@ function videos_content(&$a) { $videos = array(); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { if($a->theme['template_engine'] === 'internal') { $alt_e = template_escape($rr['filename']); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 6be1f16de..c9f465676 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -16,7 +16,7 @@ function viewcontacts_init(&$a) { dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) return; $a->data['user'] = $r[0]; @@ -54,7 +54,7 @@ function viewcontacts_content(&$a) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(count($r)) + if (dbm::is_result($r)) $a->set_pager_total($r[0]['total']); $r = q("SELECT * FROM `contact` @@ -68,7 +68,7 @@ function viewcontacts_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - if(!count($r)) { + if (!dbm::is_result($r)) { info(t('No contacts.').EOL); return $o; } diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 3fa4eaed5..904b14425 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -24,7 +24,7 @@ function viewsrc_content(&$a) { dbesc($item_id) ); - if(count($r)) + if (dbm::is_result($r)) if(is_ajax()) { echo str_replace("\n",'
',$r[0]['body']); killme(); diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 15e3d3f75..80fc1c6e7 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -12,7 +12,7 @@ function wall_attach_post(&$a) { $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", dbesc($nick) ); - if(! count($r)){ + if(! dbm::is_result($r)){ if ($r_json) { echo json_encode(array('error'=>t('Invalid request.'))); killme(); @@ -55,7 +55,7 @@ function wall_attach_post(&$a) { intval($contact_id), intval($page_owner_uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $can_post = true; $visitor = $contact_id; } @@ -168,7 +168,7 @@ function wall_attach_post(&$a) { dbesc($hash) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $msg = t('File upload failed.'); if ($r_json) { echo json_encode(array('error'=>$msg)); diff --git a/mod/wall_upload.php b/mod/wall_upload.php index f5996d76f..21d9bf49c 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -15,7 +15,7 @@ function wall_upload_post(&$a, $desktopmode = true) { dbesc($nick) ); - if(! count($r)){ + if(! dbm::is_result($r)){ if ($r_json) { echo json_encode(array('error'=>t('Invalid request.'))); killme(); @@ -63,7 +63,7 @@ function wall_upload_post(&$a, $desktopmode = true) { intval($contact_id), intval($page_owner_uid) ); - if(count($r)) { + if (dbm::is_result($r)) { $can_post = true; $visitor = $contact_id; } diff --git a/mod/wallmessage.php b/mod/wallmessage.php index 8642624a4..03a0b7a16 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -22,7 +22,7 @@ function wallmessage_post(&$a) { dbesc($recipient) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('wallmessage: no recipient'); return; } @@ -91,7 +91,7 @@ function wallmessage_content(&$a) { dbesc($recipient) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('No recipient.') . EOL); logger('wallmessage: no recipient'); return; diff --git a/mod/xrd.php b/mod/xrd.php index 094211360..1250b0812 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -21,7 +21,7 @@ function xrd_init(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($name) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $salmon_key = salmon_key($r[0]['spubkey']); diff --git a/object/BaseObject.php b/object/BaseObject.php index 14f0d8fd0..2666dc1de 100644 --- a/object/BaseObject.php +++ b/object/BaseObject.php @@ -21,8 +21,7 @@ class BaseObject { if(self::$app) return self::$app; - global $a; - self::$app = $a; + self::$app = get_app(); return self::$app; } diff --git a/object/Conversation.php b/object/Conversation.php index 36c06c6d6..eb5b3b9b4 100644 --- a/object/Conversation.php +++ b/object/Conversation.php @@ -127,7 +127,7 @@ class Conversation extends BaseObject { * _ false on failure */ public function get_template_data($conv_responses) { - global $a; + $a = get_app(); $result = array(); $i = 0; diff --git a/object/Item.php b/object/Item.php index 9f01ac59b..45d2dba3e 100644 --- a/object/Item.php +++ b/object/Item.php @@ -235,7 +235,7 @@ class Item extends BaseObject { intval($item['uid']), intval($item['id']) ); - if (count($r)) { + if (dbm::is_result($r)) { $ignore = array( 'do' => t("ignore thread"), 'undo' => t("unignore thread"), diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 40f016747..79dcb36a7 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -55,13 +55,13 @@ function q($sql) { return $result; } //second call in handle_body, name - if($result[0]['name']===$args[1]) { - return $result; + if($result[0]['name']===$args[1]) { + return $result; } } //third call in handle_body, nick or attag - if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) { - return $result; + if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) { + return $result; } } @@ -88,23 +88,23 @@ function dbesc($str) { */ class GetTagsTest extends PHPUnit_Framework_TestCase { /** the mock to use as app */ - private $a; + private $a; /** * initialize the test. That's a phpUnit function, * don't change its name. - */ - public function setUp() { + */ + public function setUp() { $this->a=new MockApp(); } - /** - * test with one Person tag - */ - public function testGetTagsShortPerson() { - $text="hi @Mike"; - - $tags=get_tags($text); + /** + * test with one Person tag + */ + public function testGetTagsShortPerson() { + $text="hi @Mike"; + + $tags=get_tags($text); $inform=''; $str_tags=''; @@ -113,32 +113,32 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { } //correct tags found? - $this->assertEquals(1, count($tags)); + $this->assertEquals(1, count($tags)); $this->assertTrue(in_array("@Mike", $tags)); //correct output from handle_tag? $this->assertEquals("cid:15", $inform); $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); + $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); } - /** + /** * test with one Person tag. - * There's a minor spelling mistake... - */ - public function testGetTagsShortPersonSpelling() { - $text="hi @Mike.because"; - - $tags=get_tags($text); + * There's a minor spelling mistake... + */ + public function testGetTagsShortPersonSpelling() { + $text="hi @Mike.because"; - //correct tags found? - $this->assertEquals(1, count($tags)); + $tags=get_tags($text); + + //correct tags found? + $this->assertEquals(1, count($tags)); $this->assertTrue(in_array("@Mike.because", $tags)); - - $inform=''; - $str_tags=''; - handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]); - + + $inform=''; + $str_tags=''; + handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]); + // (mike) - This is a tricky case. // we support mentions as in @mike@example.com - which contains a period. // This shouldn't match anything unless you have a contact named "Mike.because". @@ -147,91 +147,91 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { // $this->assertEquals("cid:15", $inform); // $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); -// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); +// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); $this->assertEquals("", $inform); $this->assertEquals("", $str_tags); } - /** + /** * test with two Person tags. - * There's a minor spelling mistake... - */ + * There's a minor spelling mistake... + */ - public function testGetTagsPerson2Spelling() { - $text="hi @Mike@campino@friendica.eu"; - - $tags=get_tags($text); + public function testGetTagsPerson2Spelling() { + $text="hi @Mike@campino@friendica.eu"; + + $tags=get_tags($text); // This construct is not supported. Results are indeterminate -// $this->assertEquals(2, count($tags)); +// $this->assertEquals(2, count($tags)); // $this->assertTrue(in_array("@Mike", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); - } +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); + } /** * Test with one hash tag. - */ - public function testGetTagsShortTag() { - $text="This is a #test_case"; - - $tags=get_tags($text); + */ + public function testGetTagsShortTag() { + $text="This is a #test_case"; - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } + $tags=get_tags($text); + + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("#test_case", $tags)); + } /** * test with a person and a hash tag - */ - public function testGetTagsShortTagAndPerson() { - $text="hi @Mike This is a #test_case"; - - $tags=get_tags($text); + */ + public function testGetTagsShortTagAndPerson() { + $text="hi @Mike This is a #test_case"; + + $tags=get_tags($text); $this->assertEquals(3, count($tags)); $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("@Mike This", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); + $this->assertTrue(in_array("@Mike This", $tags)); + $this->assertTrue(in_array("#test_case", $tags)); $inform=''; $str_tags=''; foreach($tags as $tag) { handle_tag($this->a, $text, $inform, $str_tags, 11, $tag); } - + $this->assertEquals("cid:15", $inform); $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); - - } + + } /** * test with a person, a hash tag and some special chars. - */ - public function testGetTagsShortTagAndPersonSpecialChars() { - $text="hi @Mike, This is a #test_case."; - - $tags=get_tags($text); - + */ + public function testGetTagsShortTagAndPersonSpecialChars() { + $text="hi @Mike, This is a #test_case."; + + $tags=get_tags($text); + $this->assertEquals(2, count($tags)); $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } + $this->assertTrue(in_array("#test_case", $tags)); + } /** * Test with a person tag and text behind it. - */ - public function testGetTagsPersonOnly() { - $text="@Test I saw the Theme Dev group was created."; - - $tags=get_tags($text); + */ + public function testGetTagsPersonOnly() { + $text="@Test I saw the Theme Dev group was created."; - $this->assertEquals(2, count($tags)); + $tags=get_tags($text); + + $this->assertEquals(2, count($tags)); $this->assertTrue(in_array("@Test I", $tags)); - $this->assertTrue(in_array("@Test", $tags)); - } + $this->assertTrue(in_array("@Test", $tags)); + } /** * this test demonstrates strange behaviour by intval. @@ -255,72 +255,72 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { //happens right now, but it shouldn't be necessary $this->assertTrue(in_array("@mike+15 id", $tags)); - $inform=''; + $inform=''; $str_tags=''; foreach($tags as $tag) { handle_tag($this->a, $text, $inform, $str_tags, 11, $tag); } - $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); + $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery $this->assertContains("cid:15",$inform); } /** * test with two persons and one special tag. - */ - public function testGetTags2Persons1TagSpecialChars() { - $text="hi @Mike, I'm just writing #test_cases, so" - ." so @somebody@friendica.com may change #things."; - - $tags=get_tags($text); + */ + public function testGetTags2Persons1TagSpecialChars() { + $text="hi @Mike, I'm just writing #test_cases, so" + ." so @somebody@friendica.com may change #things."; - $this->assertEquals(5, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); + $tags=get_tags($text); + + $this->assertEquals(5, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com may", $tags)); - $this->assertTrue(in_array("#things", $tags)); - } + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com may", $tags)); + $this->assertTrue(in_array("#things", $tags)); + } /** * test with a long text. - */ - public function testGetTags() { - $text="hi @Mike, I'm just writing #test_cases, " - ." so @somebody@friendica.com may change #things. Of course I " - ."look for a lot of #pitfalls, like #tags at the end of a sentence " - ."@comment. I hope noone forgets about @fullstops.because that might" - ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " - ."Now, add a @first_last tag. "; - - $tags=get_tags($text); - - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("#pitfalls", $tags)); - $this->assertTrue(in_array("#tags", $tags)); - $this->assertTrue(in_array("@comment", $tags)); - $this->assertTrue(in_array("@fullstops.because", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#nice", $tags)); + */ + public function testGetTags() { + $text="hi @Mike, I'm just writing #test_cases, " + ." so @somebody@friendica.com may change #things. Of course I " + ."look for a lot of #pitfalls, like #tags at the end of a sentence " + ."@comment. I hope noone forgets about @fullstops.because that might" + ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " + ."Now, add a @first_last tag. "; + + $tags=get_tags($text); + + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_cases", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("#pitfalls", $tags)); + $this->assertTrue(in_array("#tags", $tags)); + $this->assertTrue(in_array("@comment", $tags)); + $this->assertTrue(in_array("@fullstops.because", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#nice", $tags)); $this->assertTrue(in_array("@first_last", $tags)); //right now, none of the is matched (unsupported) -// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); +// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); // $this->assertTrue(in_array("@campino@friendica.eu", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); - } +// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); + } /** * test with an empty string - */ - public function testGetTagsEmpty() { - $tags=get_tags(""); - $this->assertEquals(0, count($tags)); + */ + public function testGetTagsEmpty() { + $tags=get_tags(""); + $this->assertEquals(0, count($tags)); } -} \ No newline at end of file +} diff --git a/update.php b/update.php index 76007ad3a..0679b5a1f 100644 --- a/update.php +++ b/update.php @@ -85,7 +85,7 @@ function update_1006() { // create 's' keys for everybody that does not have one $r = q("SELECT * FROM `user` WHERE `spubkey` = '' "); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $sres=openssl_pkey_new(array('encrypt_key' => false )); $sprvkey = ''; @@ -122,7 +122,7 @@ function update_1010() { function update_1011() { q("ALTER TABLE `contact` ADD `nick` CHAR( 255 ) NOT NULL AFTER `name` "); $r = q("SELECT * FROM `contact` WHERE 1"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d", dbesc(basename($rr['url'])), @@ -145,7 +145,7 @@ function update_1014() { require_once('include/Photo.php'); q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` "); $r = q("SELECT * FROM `photo` WHERE `scale` = 4"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $ph = new Photo($rr['data']); if($ph->is_valid()) { @@ -155,7 +155,7 @@ function update_1014() { } } $r = q("SELECT * FROM `contact` WHERE 1"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { if(stristr($rr['thumb'],'avatar')) q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d", @@ -308,7 +308,7 @@ function update_1030() { function update_1031() { // Repair any bad links that slipped into the item table $r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' "); - if($r && count($r)) { + if($r && dbm::is_result($r)) { foreach($r as $rr) { if(strstr($rr['object'],'type="http')) { q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d", @@ -356,7 +356,7 @@ function update_1035() { function update_1036() { $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' "); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d", dbesc(str_replace('include/photo','photo',$rr['photo'])), @@ -594,7 +594,7 @@ function update_1073() { function update_1074() { q("ALTER TABLE `user` ADD `hidewall` TINYINT( 1) NOT NULL DEFAULT '0' AFTER `blockwall` "); $r = q("SELECT `uid` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 1"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d", intval($rr['uid']) @@ -606,7 +606,7 @@ function update_1074() { function update_1075() { q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` "); $r = q("SELECT `uid` FROM `user` WHERE 1"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $found = true; do { @@ -685,10 +685,10 @@ function update_1082() { ADD INDEX ( `guid` ) "); // make certain the following code is only executed once $r = q("select `id` from `photo` where `guid` != '' limit 1"); - if($r && count($r)) + if (dbm::is_result($r)) return; $r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $guid = get_guid(); q("update `photo` set `guid` = '%s' where `resource-id` = '%s'", @@ -731,7 +731,7 @@ function update_1087() { q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` "); $r = q("SELECT `id` FROM `item` WHERE `parent` = `id` "); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1", intval($rr['id']) @@ -854,7 +854,7 @@ function update_1100() { require_once('include/text.php'); $r = q("select id, url from contact where url != '' and nurl = '' "); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { q("update contact set nurl = '%s' where id = %d", dbesc(normalise_link($rr['url'])), @@ -1030,7 +1030,7 @@ function update_1120() { // might be missing on new installs. We'll check. $r = q("describe item"); - if($r && count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) if($rr['Field'] == 'spam') return; @@ -1168,7 +1168,7 @@ function update_1136() { // order in reverse so that we save the newest entry $r = q("select * from config where 1 order by id desc"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@ -1187,7 +1187,7 @@ function update_1136() { $arr = array(); $r = q("select * from pconfig where 1 order by id desc"); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@ -1692,7 +1692,7 @@ function update_1190() { ); // convert old forumlist addon entries in new config entries - if (count($r)) { + if (dbm::is_result($r)) { foreach ($r as $rr) { $uid = $rr['uid']; $family = $rr['cat']; diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 085d4d941..279edd64e 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -221,7 +221,7 @@ function frio_remote_nav($a,&$nav) { // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid'])); - $r[0]['photo'] = (count($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); + $r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); $r[0]['name'] = $a->user['username']; } elseif(!local_user() && remote_user()) { @@ -235,9 +235,9 @@ function frio_remote_nav($a,&$nav) { $nav['remote'] = t("Visitor"); } - if(count($r)){ + if (dbm::is_result($r)){ $nav['userinfo'] = array( - 'icon' => (count($r) ? $r[0]['photo'] : "images/person-48.jpg"), + 'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"), 'name' => $r[0]['name'], ); } @@ -299,7 +299,7 @@ function frio_acl_lookup($a, &$results) { $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)) { $total = $r[0]["total"]; } @@ -311,7 +311,7 @@ function frio_acl_lookup($a, &$results) { $contacts = array(); - if(count($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) { $contacts[] = _contact_detail_for_template($rr); } diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 67bab16a1..cbb850c13 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -24,69 +24,69 @@ img { } #pending-update { - float:right; - color: #ffffff; - font-weight: bold; - background-color: #FF0000; - padding: 0em 0.3em; + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; } .admin.linklist { - border: 0px; - padding: 0px; - list-style: none; - margin-top: 0px; + border: 0px; + padding: 0px; + list-style: none; + margin-top: 0px; } .admin.link { - list-style-position: inside; - font-size: 1em; -/* padding-left: 5px; - margin: 5px; */ + list-style-position: inside; + font-size: 1em; +/* padding-left: 5px; + margin: 5px; */ } #adminpage dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid black; + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; } #adminpage dt { - width: 200px; - float: left; - font-weight: bold; + width: 200px; + float: left; + font-weight: bold; } #adminpage dd { - margin-left: 200px; + margin-left: 200px; } #adminpage h3 { - border-bottom: 1px solid #898989; - margin-bottom: 5px; - margin-top: 10px; + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; } #adminpage .submit { - clear:left; + clear:left; } #adminpage #pluginslist { - margin: 0px; padding: 0px; + margin: 0px; padding: 0px; } #adminpage .plugin { - list-style: none; - display: block; - /* border: 1px solid #888888; */ - padding: 1em; - margin-bottom: 5px; - clear: left; + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; } #adminpage .toggleplugin { - float:left; - margin-right: 1em; + float:left; + margin-right: 1em; } #adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 925ac76a1..50b292f6b 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -147,7 +147,7 @@ function vier_community_info() { $r = suggestion_query(local_user(), 0, 9); $tpl = get_markup_template('ch_directory_item.tpl'); - if(count($r)) { + if (dbm::is_result($r)) { $aside['$comunity_profiles_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); @@ -170,13 +170,14 @@ function vier_community_info() { $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 "); $order = " ORDER BY `register_date` DESC "; + $tpl = get_markup_template('ch_directory_item.tpl'); + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ", 0, 9); - $tpl = get_markup_template('ch_directory_item.tpl'); - if(count($r)) { + if (dbm::is_result($r)) { $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array(); @@ -367,7 +368,7 @@ function vier_community_info() { $tpl = get_markup_template('ch_connectors.tpl'); - if(count($r)) { + if (dbm::is_result($r)) { $con_services = array(); $con_services['title'] = Array("", t('Connect Services'), "", "");