From 9cfc249b12b3d8b756cc914b0a03a17957e49a77 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 12 Mar 2016 18:54:55 +0100 Subject: [PATCH] Moved is_filled_array() to both dba classes and named it is_result(). Please see ticket #2390 for full discussion. Signed-off-by: Roland Haeder --- boot.php | 14 +++++--------- include/ForumManager.php | 2 +- include/dba.php | 11 ++++++++++- include/dba_pdo.php | 10 ++++++++++ include/poller.php | 2 +- index.php | 2 +- mod/message.php | 4 ++-- mod/ping.php | 18 +++++++++--------- 8 files changed, 39 insertions(+), 24 deletions(-) diff --git a/boot.php b/boot.php index 72d34229e5..a9ff0c30c3 100644 --- a/boot.php +++ b/boot.php @@ -927,7 +927,7 @@ class App { } else { $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'", $common_filename); - if(! is_filled_array($r)){ + if(! dba::is_result($r)){ $this->cached_profile_image[$avatar_image] = $avatar_image; } else { $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']); @@ -1412,7 +1412,7 @@ function run_update_function($x) { function check_plugins(&$a) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); - if(is_filled_array($r)) + if(dba::is_result($r)) $installed = $r; else $installed = array(); @@ -1743,7 +1743,7 @@ function current_theme(){ $r = q("select theme from user where uid = %d limit 1", intval($a->profile_uid) ); - if(is_filled_array($r)) + if(dba::is_result($r)) $page_theme = $r[0]['theme']; } @@ -1856,7 +1856,7 @@ function feed_birthday($uid,$tz) { intval($uid) ); - if(is_filled_array($p)) { + if(dba::is_result($p)) { $tmp_dob = substr($p[0]['dob'],5); if(intval($tmp_dob)) { $y = datetime_convert($tz,$tz,'now','Y'); @@ -1902,7 +1902,7 @@ function load_contact_links($uid) { intval($uid) ); - if(is_filled_array($r)) { + if(dba::is_result($r)) { foreach($r as $rr){ $url = normalise_link($rr['url']); $ret[$url] = $rr; @@ -2202,7 +2202,3 @@ function argv($x) { return ''; } - -function is_filled_array ($array) { - return (is_array($array) && count($array) > 0); -} diff --git a/include/ForumManager.php b/include/ForumManager.php index bbf881c9d0..99a78be71e 100644 --- a/include/ForumManager.php +++ b/include/ForumManager.php @@ -86,7 +86,7 @@ class ForumManager { $total = count($contacts); $visible_forums = 10; - if(is_filled_array($contacts)) { + if(dba::is_result($contacts)) { $id = 0; diff --git a/include/dba.php b/include/dba.php index cae045d874..3a16c187c7 100644 --- a/include/dba.php +++ b/include/dba.php @@ -230,6 +230,16 @@ class dba { } } + /** + * Checks if $array is a filled array with at least one entry. + * + * @param $array mixed A filled array with at least one entry + * @return Whether $array is a filled array + */ + public function is_result ($array) { + return (is_array($array) && count($array) > 0); + } + function __destruct() { if ($this->db) if($this->mysqli) @@ -340,4 +350,3 @@ function dbesc_array(&$arr) { function dba_timer() { return microtime(true); } - diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 7b720fb6c1..b48aba4487 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -232,6 +232,16 @@ class dba { } } + /** + * Checks if $array is a filled array with at least one entry. + * + * @param $array mixed A filled array with at least one entry + * @return Whether $array is a filled array + */ + public function is_result ($array) { + return (is_array($array) && count($array) > 0); + } + function __destruct() { if ($this->db) \DDDBL\disconnect(); diff --git a/include/poller.php b/include/poller.php index 0b3d89ab3d..b0e88f73dd 100644 --- a/include/poller.php +++ b/include/poller.php @@ -197,7 +197,7 @@ function poller_max_connections_reached() { function poller_kill_stale_workers() { $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'"); - if (!is_filled_array($r)) { + if (!dba::is_result($r)) { // No processing here needed return; } diff --git a/index.php b/index.php index 841eede0ab..484c276343 100644 --- a/index.php +++ b/index.php @@ -108,7 +108,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) { // we didn't loaded user data yet, but we need user language $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid'])); $_SESSION['language'] = $lang; - if (is_filled_array($r)) $_SESSION['language'] = $r[0]['language']; + if (dba::is_result($r)) $_SESSION['language'] = $r[0]['language']; } if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { diff --git a/mod/message.php b/mod/message.php index 6e176f7123..b6981cc88c 100644 --- a/mod/message.php +++ b/mod/message.php @@ -360,13 +360,13 @@ function message_content(&$a) { dbesc($myprofile) ); - if (is_filled_array($r)) { + if (dba::is_result($r)) { $a->set_pager_total($r[0]['total']); } $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']); - if(! is_filled_array($r)) { + if(! dba::is_result($r)) { info( t('No messages.') . EOL); return $o; } diff --git a/mod/ping.php b/mod/ping.php index f572b430e8..9338b8b686 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -51,7 +51,7 @@ function ping_init(&$a) { intval(local_user()), intval(local_user()) ); - if(is_filled_array($r)) { + if(dba::is_result($r)) { $arr = array('items' => $r); call_hooks('network_ping', $arr); @@ -150,7 +150,7 @@ function ping_init(&$a) { dbesc(datetime_convert('UTC','UTC','now')) ); - if(is_filled_array($ev)) { + if(dba::is_result($ev)) { $all_events = intval($ev[0]['total']); if($all_events) { @@ -219,7 +219,7 @@ function ping_init(&$a) { $home\r\n"; if ($register!=0) echo "$register"; - if ( is_filled_array($groups_unseen) ) { + if ( dba::is_result($groups_unseen) ) { echo ''; foreach ($groups_unseen as $it) if ($it['count'] > 0) @@ -228,7 +228,7 @@ function ping_init(&$a) { echo ""; } - if ( is_filled_array($forums_unseen) ) { + if ( dba::is_result($forums_unseen) ) { echo ''; foreach ($forums_unseen as $it) if ($it['count'] > 0) @@ -245,7 +245,7 @@ function ping_init(&$a) { $birthdays_today\r\n"; - if (is_filled_array($notifs) && (! $sysnotify)) { + if (dba::is_result($notifs) && (! $sysnotify)) { foreach ($notifs as $zz) { if($zz['seen'] == 0) $sysnotify ++; @@ -255,7 +255,7 @@ function ping_init(&$a) { echo ' '; // merge all notification types in one array - if ( is_filled_array($intros) ) { + if ( dba::is_result($intros) ) { foreach ($intros as $i) { $n = array( 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], @@ -270,7 +270,7 @@ function ping_init(&$a) { } } - if ( is_filled_array($mails) ) { + if ( dba::is_result($mails) ) { foreach ($mails as $i) { $n = array( 'href' => $a->get_baseurl().'/message/'.$i['id'], @@ -285,7 +285,7 @@ function ping_init(&$a) { } } - if ( is_filled_array($regs) ) { + if ( dba::is_result($regs) ) { foreach ($regs as $i) { $n = array( 'href' => $a->get_baseurl().'/admin/users/', @@ -311,7 +311,7 @@ function ping_init(&$a) { }; usort($notifs, $sort_function); - if( is_filled_array($notifs) ) { + if( dba::is_result($notifs) ) { foreach($notifs as $n) { echo xmlize($n); }