From e4c6cfd2d8727f22022218f9105d35eaf37b027e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 2 Jul 2016 14:00:42 +0200 Subject: [PATCH] Moves the function "is_result" from dba to dbm. --- boot.php | 8 ++++---- include/ForumManager.php | 2 +- include/dba.php | 10 ---------- include/dba_pdo.php | 10 ---------- include/dbm.php | 10 ++++++++++ include/poller.php | 2 +- index.php | 2 +- mod/message.php | 4 ++-- mod/network.php | 2 +- mod/ping.php | 18 +++++++++--------- mod/profile.php | 2 +- 11 files changed, 30 insertions(+), 40 deletions(-) diff --git a/boot.php b/boot.php index e9303211a2..754853d0d8 100644 --- a/boot.php +++ b/boot.php @@ -940,7 +940,7 @@ class App { } else { $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'", $common_filename); - if(! dba::is_result($r)){ + if(! dbm::is_result($r)){ $this->cached_profile_image[$avatar_image] = $avatar_image; } else { $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']); @@ -1425,7 +1425,7 @@ function run_update_function($x) { function check_plugins(&$a) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); - if(dba::is_result($r)) + if(dbm::is_result($r)) $installed = $r; else $installed = array(); @@ -1756,7 +1756,7 @@ function current_theme(){ $r = q("select theme from user where uid = %d limit 1", intval($a->profile_uid) ); - if(dba::is_result($r)) + if(dbm::is_result($r)) $page_theme = $r[0]['theme']; } @@ -1869,7 +1869,7 @@ function feed_birthday($uid,$tz) { intval($uid) ); - if(dba::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/ForumManager.php b/include/ForumManager.php index 9e3c3b9d70..69ff82cd40 100644 --- a/include/ForumManager.php +++ b/include/ForumManager.php @@ -86,7 +86,7 @@ class ForumManager { $total = count($contacts); $visible_forums = 10; - if(dba::is_result($contacts)) { + if(dbm::is_result($contacts)) { $id = 0; diff --git a/include/dba.php b/include/dba.php index 3a16c187c7..2c6e72d3a1 100644 --- a/include/dba.php +++ b/include/dba.php @@ -230,16 +230,6 @@ 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) diff --git a/include/dba_pdo.php b/include/dba_pdo.php index b48aba4487..7b720fb6c1 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -232,16 +232,6 @@ 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/dbm.php b/include/dbm.php index 3f936947d8..7c8c9b8c14 100644 --- a/include/dbm.php +++ b/include/dbm.php @@ -35,5 +35,15 @@ class dbm { } return(array("list" => $statelist, "amount" => $processes)); } + + /** + * 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); + } } ?> diff --git a/include/poller.php b/include/poller.php index 22fdbb5e53..805e0fd5e9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -228,7 +228,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 (!dba::is_result($r)) { + if (!dbm::is_result($r)) { // No processing here needed return; } diff --git a/index.php b/index.php index a8b7577e07..ef0138397d 100644 --- a/index.php +++ b/index.php @@ -126,7 +126,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 (dba::is_result($r)) $_SESSION['language'] = $r[0]['language']; + if (dbm::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 b08ab200ec..4bd73d0cee 100644 --- a/mod/message.php +++ b/mod/message.php @@ -373,13 +373,13 @@ function message_content(&$a) { intval(local_user()) ); - if (dba::is_result($r)) { + if (dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']); - if(! dba::is_result($r)) { + if(! dbm::is_result($r)) { info( t('No messages.') . EOL); return $o; } diff --git a/mod/network.php b/mod/network.php index 1123c34371..6ebedbcae8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -704,7 +704,7 @@ function network_content(&$a, $update = 0) { $parents_str = ''; $date_offset = ""; - if(dba::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']; diff --git a/mod/ping.php b/mod/ping.php index 40cfe31fa5..f2e57430d2 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -51,7 +51,7 @@ function ping_init(&$a) { intval(local_user()), intval(local_user()) ); - if(dba::is_result($r)) { + if(dbm::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(dba::is_result($ev)) { + if(dbm::is_result($ev)) { $all_events = intval($ev[0]['total']); if($all_events) { @@ -224,7 +224,7 @@ function ping_init(&$a) { $home\r\n"; if ($register!=0) echo "$register"; - if ( dba::is_result($groups_unseen) ) { + if ( dbm::is_result($groups_unseen) ) { echo ''; foreach ($groups_unseen as $it) if ($it['count'] > 0) @@ -233,7 +233,7 @@ function ping_init(&$a) { echo ""; } - if ( dba::is_result($forums_unseen) ) { + if ( dbm::is_result($forums_unseen) ) { echo ''; foreach ($forums_unseen as $it) if ($it['count'] > 0) @@ -250,7 +250,7 @@ function ping_init(&$a) { $birthdays_today\r\n"; - if (dba::is_result($notifs) && (! $sysnotify)) { + if (dbm::is_result($notifs) && (! $sysnotify)) { foreach ($notifs as $zz) { if($zz['seen'] == 0) $sysnotify ++; @@ -260,7 +260,7 @@ function ping_init(&$a) { echo ' '; // merge all notification types in one array - if ( dba::is_result($intros) ) { + if ( dbm::is_result($intros) ) { foreach ($intros as $i) { $n = array( 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], @@ -275,7 +275,7 @@ function ping_init(&$a) { } } - if ( dba::is_result($mails) ) { + if ( dbm::is_result($mails) ) { foreach ($mails as $i) { $n = array( 'href' => $a->get_baseurl().'/message/'.$i['id'], @@ -290,7 +290,7 @@ function ping_init(&$a) { } } - if ( dba::is_result($regs) ) { + if ( dbm::is_result($regs) ) { foreach ($regs as $i) { $n = array( 'href' => $a->get_baseurl().'/admin/users/', @@ -316,7 +316,7 @@ function ping_init(&$a) { }; usort($notifs, $sort_function); - if( dba::is_result($notifs) ) { + if( dbm::is_result($notifs) ) { foreach($notifs as $n) { echo xmlize($n); } diff --git a/mod/profile.php b/mod/profile.php index 75cb65c9af..681b1dbd1c 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -298,7 +298,7 @@ function profile_content(&$a, $update = 0) { $parents_arr = array(); $parents_str = ''; - if (dba::is_result($r)) { + if (dbm::is_result($r)) { foreach($r as $rr) $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); -- 2.39.5