]> git.mxchange.org Git - friendica.git/commitdiff
Continued:
authorRoland Haeder <roland@mxchange.org>
Fri, 24 Mar 2017 19:57:52 +0000 (20:57 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 24 Mar 2017 19:57:52 +0000 (20:57 +0100)
- marked commented-out code as possible old-lost
- added more curly braces
- used more dbm::is_result() where SELECT is stated
- ! added quotes in array element, else (here) >thumb< (without quotes) is
  considered as a constant and causes an E_NOTICE

Signed-off-by: Roland Haeder <roland@mxchange.org>
mod/install.php
mod/manage.php

index fa952a79bc4b47ddefb3eee7a33cec0fcaa56aec..f58345e3a9e3acb7914a7d7c34afea965e3be889 100755 (executable)
@@ -485,6 +485,7 @@ function check_funcs(&$checks) {
                $ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
        }
 
+       /// @TODO old-lost code here?
        /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
                notice( t('Please see the file "INSTALL.txt".') . EOL);*/
 }
index 4beb8e46c65384d545951fb39d7b72df37769dc6..10fc7c7e64e859bf737b4a0dd1acd9819042358f 100644 (file)
@@ -72,16 +72,19 @@ function manage_post(App $a) {
        unset($_SESSION['return_url']);
        if(x($_SESSION,'submanage'))
                unset($_SESSION['submanage']);
-       if(x($_SESSION,'sysmsg'))
+       if (x($_SESSION,'sysmsg')) {
                unset($_SESSION['sysmsg']);
-       if(x($_SESSION,'sysmsg_info'))
+       }
+       if (x($_SESSION,'sysmsg_info')) {
                unset($_SESSION['sysmsg_info']);
+       }
 
        require_once('include/security.php');
-       authenticate_success($r[0],true,true);
+       authenticate_success($r[0], true, true);
 
-       if($limited_id)
+       if ($limited_id) {
                $_SESSION['submanage'] = $original_id;
+       }
 
        $ret = array();
        call_hooks('home_init',$ret);
@@ -113,26 +116,32 @@ function manage_content(App $a) {
                        dbesc($id['uid'])
                );
 
-               $identities[$key][thumb] = $thumb[0][thumb];
+               $identities[$key]['thumb'] = $thumb[0]['thumb'];
 
-               $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
+               $identities[$key]['selected'] = ($id['nickname'] === $a->user['nickname']);
 
                $notifications = 0;
 
                $r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
                        intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
-               if ($r)
+
+               if (dbm::is_result($r)) {
                        $notifications = sizeof($r);
+               }
 
                $r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
                        intval($id['uid']));
-               if ($r)
+
+               if (dbm::is_result($r)) {
                        $notifications = $notifications + sizeof($r);
+               }
 
                $r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
                        intval($id['uid']));
-               if ($r)
+
+               if (dbm::is_result($r)) {
                        $notifications = $notifications + $r[0]["introductions"];
+               }
 
                $identities[$key]['notifications'] = $notifications;
        }