]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a93725)
Avoid some PHP warnings, no functional changes
authorMichael <heluecht@pirati.ca>
Thu, 3 Aug 2017 05:50:44 +0000 (05:50 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 3 Aug 2017 05:50:44 +0000 (05:50 +0000)
include/dba.php patch | blob | history
include/identity.php patch | blob | history
include/plugin.php patch | blob | history
view/theme/frio/php/default.php patch | blob | history
view/theme/frio/theme.php patch | blob | history

diff --git a/include/dba.php b/include/dba.php
index 08b6e0ad8ac8eaa32f1b51b0adb1f3e2fbeef16b..d921167c1ded9fcfb21f5416666de3c4754edd04 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -161,7 +161,7 @@ class dba {
        public function log_index($query) {
                $a = get_app();
 
-               if ($a->config["system"]["db_log_index"] == "") {
+               if (empty($a->config["system"]["db_log_index"])) {
                        return;
                }
 
diff --git a/include/identity.php b/include/identity.php
index 5de5c919dc7f1f494b985846c735468d30c4567e..b24a5314a5d8003a80e5b422ba9d7ad3c42ce19f 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -929,8 +929,8 @@ function zrl($s, $force = false) {
  *      is set to true
  */
 function get_theme_uid() {
-       $uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
-       if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
+       $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
+       if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
                return local_user();
        }
 
diff --git a/include/plugin.php b/include/plugin.php
index 0c43b4d44888f7aff2ace7581bef1956b274da0d..f5f0bb2b294f21ca6126bd46a5b5bdb755f6c060 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -562,7 +562,7 @@ function theme_include($file, $root = '') {
        if ($root !== '' && $root[strlen($root)-1] !== '/') {
                $root = $root . '/';
        }
-       $theme_info = $a->theme_info;
+       $theme_info = get_app()->theme_info;
        if (is_array($theme_info) && array_key_exists('extends',$theme_info)) {
                $parent = $theme_info['extends'];
        } else {
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index ef7e413ad828e1c691cab66c3eb58828d3142ac2..6d2e78656428c545275e83c884529e3a91a8ef94 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -9,7 +9,9 @@
        require_once('view/theme/frio/php/frio_boot.php');
 
 //     $minimal = is_modal();
-
+       if (!isset($minimal)) {
+               $minimal = false;
+       }
 ?>
 <html>
 <head>
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 551f39c8f78b560155a94d4ba25ef46e4c9b6cfd..36f2292636210b236afad4aeced4b045473c89d3 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -214,7 +214,7 @@ function frio_remote_nav($a,&$nav) {
 
        // since $userinfo isn't available for the hook we write it to the nav array
        // this isn't optimal because the contact query will be done now twice
-       if(local_user()) {
+       if (local_user()) {
                // empty the server url for local user because we won't need it
                $server_url = '';
                // user info
@@ -223,25 +223,27 @@ function frio_remote_nav($a,&$nav) {
                $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()) {
+       } elseif (!local_user() && remote_user()) {
                $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
                $nav['remote'] = t("Guest");
 
-       } elseif(get_my_url ()) {
+       } elseif (get_my_url()) {
                $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
                                WHERE `addr` = '%s' AND `network` = 'dfrn'",
                        dbesc($webbie));
                $nav['remote'] = t("Visitor");
+       } else {
+               $r = false;
        }
 
-       if (dbm::is_result($r)){
+       if (dbm::is_result($r)) {
                        $nav['userinfo'] = array(
                                'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
                                'name' => $r[0]['name'],
                        );
                }
 
-       if(!local_user() && !empty($server_url)) {
+       if (!local_user() && !empty($server_url)) {
                $nav['logout'] = Array($server_url . '/logout', t('Logout'), "", t('End this session'));
 
                // user menu
Unnamed repository; edit this file 'description' to name the repository.