]> git.mxchange.org Git - friendica.git/commitdiff
Avoid some notices
authorTobias Hößl <tobias@hoessl.eu>
Sun, 26 Feb 2012 20:43:51 +0000 (20:43 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Sun, 26 Feb 2012 20:43:51 +0000 (20:43 +0000)
include/event.php
include/items.php
include/template_processor.php

index c7669b381c7305441d427cf9dba291f778c2247a..4a9a9a0041e40ec6318070806ec9add4be990333 100755 (executable)
@@ -163,7 +163,7 @@ function bbtoevent($s) {
        if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
                $ev['adjust'] = $match[1];
        $match = '';
-       $ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0);
+       $ev['nofinish'] = (($ev['start'] && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
        return $ev;
 
 }
index c461b83b49da65fae7779ea8cd00a08432f25ac3..7d52571c25d6a176d32a0b70540df807102ac2ed 100755 (executable)
@@ -308,7 +308,7 @@ function get_atom_elements($feed,$item) {
        if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
                $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
                foreach($base as $link) {
-                       if(! $res['author-avatar']) {
+                       if(!x($res, 'author-avatar') || !$res['author-avatar']) {
                                if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
                                        $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
                        }
@@ -323,7 +323,7 @@ function get_atom_elements($feed,$item) {
                        foreach($base as $link) {
                                if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
                                        $res['author-link'] = unxmlify($link['attribs']['']['href']);
-                               if(! $res['author-avatar']) {
+                               if(!x($res, 'author-avatar') || !$res['author-avatar']) {
                                        if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
                                                $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
                                }
@@ -503,7 +503,7 @@ function get_atom_elements($feed,$item) {
                $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 
                foreach($base as $link) {
-                       if(! $res['owner-avatar']) {
+                       if(!x($res, 'owner-avatar') || !$res['owner-avatar']) {
                                if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')                 
                                        $res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
                        }
index 0d476f0e6e63f54a15f88dc69ebd514f58a22934..7f270fb4b39504b9d601e12d2cc6603a8d6ffde0 100755 (executable)
        
                        if(is_array($r) && count($r)) {
                                foreach ($r as $k => $v ) {
-                                       if (is_array($v))
+                                       if (is_array($v)) {
                                                $this->_build_replace($v, "$prefix$k.");
-                                       
-                                       $this->search[] =  $prefix . $k;
-                                       $this->replace[] = $v;
+                                       } else {
+                                               $this->search[] =  $prefix . $k;
+                                               $this->replace[] = $v;
+                                       }
                                }
                        }
                } 
@@ -53,7 +54,7 @@
                        $keys = array_map('trim',explode(".",$name));           
                        $val = $this->r;
                        foreach($keys as $k) {
-                               $val = $val[$k];
+                               $val = (isset($val[$k]) ? $val[$k] : null);
                        }
                        return $val;
                }
@@ -79,8 +80,8 @@
                        } else {
                                $val = $this->_get_var($args[2]);
                        }
-                       list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]);
-                       return ($val?$strue:$sfalse);
+                       $x = preg_split("|{{ *else *}}|", $args[3]);
+                       return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
                }
                
                /**