Moves the function "is_result" from dba to dbm.

diff --git a/boot.php b/boot.php
index e9303211a2c8fa786e95e6a7034f20d7b3b9e311..754853d0d89ac1d92cdba0efdd085305247b82f1 100644 (file)
--- 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 9e3c3b9d7020ece3a81418807abbb2b168acda40..69ff82cd4013ddb9d3b78d071ca8244caadabb3a 100644 (file)
--- 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 3a16c187c7ec81b47085d894d169c047e18b7cd6..2c6e72d3a1f3af595e78ca3db70085d856b9756f 100644 (file)
--- 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 b48aba44876d5fc6bf0d64d21c211d3374338114..7b720fb6c1217e31be5ae0368ea9facbdfcf229e 100644 (file)
--- 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 3f936947d841b742139a2981a5a660ffc4b48b36..7c8c9b8c145ebd1e709cdcad4892ec696978e43c 100644 (file)
--- 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 22fdbb5e5374a016a4ec61533727782a12ac6c26..805e0fd5e92b3cb5db5409274fde410b04d35c00 100644 (file)
--- 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 a8b7577e07263ce0915c4764e3192143cc1ba446..ef0138397dc87394d9220c9888b9907eee890b17 100644 (file)
--- 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 b08ab200eca2a13b32790bd0e86aaa0cb8e66dc1..4bd73d0cee9d36da73e625d467457843d4a4fe2a 100644 (file)
--- 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 1123c34371b67644c6596d337ec7182a4489c428..6ebedbcae8ff27f9ce63516080dacee98508cadf 100644 (file)
--- 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 40cfe31fa5e1ae3e61b9523e481dda9885805b06..f2e57430d2d6ac14488be6cd7e363eb9632fbf52 100644 (file)
--- 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>$home</home>\r\n";
                if ($register!=0) echo "<register>$register</register>";
 
-               if ( dba::is_result($groups_unseen) ) {
+               if ( dbm::is_result($groups_unseen) ) {
                        echo '<groups>';
                        foreach ($groups_unseen as $it)
                                if ($it['count'] > 0)
@@ -233,7 +233,7 @@ function ping_init(&$a) {
                        echo "</groups>";
                }
 
-               if ( dba::is_result($forums_unseen) ) {
+               if ( dbm::is_result($forums_unseen) ) {
                        echo '<forums>';
                        foreach ($forums_unseen as $it)
                                if ($it['count'] > 0)
@@ -250,7 +250,7 @@ function ping_init(&$a) {
                        <birthdays-today>$birthdays_today</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 '  <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
 
                // 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 75cb65c9afffd38fb8e818e8d277102d3e31a108..681b1dbd1cdd45974b9ee00b16ccf83dbcb9c544 100644 (file)
--- 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);