Fix wrong class name case

- Use leading backslash for non-namespace class names in App

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index 611860f9d08b68e9e115dc46d55d9cf6beb96230..bce65a092d94c08f24e186b7bb2a990ab952fbae 100644 (file)
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -24,7 +24,7 @@ class NotificationsManager {
         *
         * @param array $notes array of note arrays from db
         * @return array Copy of input array with added properties
-        * 
+        *
         * Set some extra properties to note array from db:
         *  - timestamp as int in default TZ
         *  - date_rel : relative date string
@@ -143,8 +143,7 @@ class NotificationsManager {
 
        /**
         * @brief List of pages for the Notifications TabBar
-        * 
-        * @param app $a The 
+        *
         * @return array with with notifications TabBar data
         */
        public function getTabs() {
@@ -191,7 +190,7 @@ class NotificationsManager {
 
        /**
         * @brief Format the notification query in an usable array
-        * 
+        *
         * @param array $notifs The array from the db query
         * @param string $ident The notifications identifier (e.g. network)
         * @return array
@@ -360,7 +359,7 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Total number of network notifications 
+        * @brief Total number of network notifications
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
@@ -388,13 +387,13 @@ class NotificationsManager {
 
        /**
         * @brief Get network notifications
-        * 
+        *
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
         * @param int $start Start the query at this point
         * @param int $limit Maximum number of query results
-        * 
+        *
         * @return array with
         *      string 'ident' => Notification identifier
         *      int 'total' => Total number of available network notifications
@@ -436,7 +435,7 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Total number of system notifications 
+        * @brief Total number of system notifications
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
@@ -460,13 +459,13 @@ class NotificationsManager {
 
        /**
         * @brief Get system notifications
-        * 
+        *
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
         * @param int $start Start the query at this point
         * @param int $limit Maximum number of query results
-        * 
+        *
         * @return array with
         *      string 'ident' => Notification identifier
         *      int 'total' => Total number of available system notifications
@@ -502,7 +501,7 @@ class NotificationsManager {
 
        /**
         * @brief Addional SQL query string for the personal notifications
-        * 
+        *
         * @return string The additional sql query
         */
        private function _personal_sql_extra() {
@@ -520,7 +519,7 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Total number of personal notifications 
+        * @brief Total number of personal notifications
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
@@ -550,13 +549,13 @@ class NotificationsManager {
 
        /**
         * @brief Get personal notifications
-        * 
+        *
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
         * @param int $start Start the query at this point
         * @param int $limit Maximum number of query results
-        * 
+        *
         * @return array with
         *      string 'ident' => Notification identifier
         *      int 'total' => Total number of available personal notifications
@@ -573,13 +572,13 @@ class NotificationsManager {
                        $sql_seen = " AND `item`.`unseen` = 1 ";
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, 
-                               `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` 
+                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+                               `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
                        FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id`=`item`.`parent`
                        WHERE `item`.`visible` = 1
                                $sql_extra
                                $sql_seen
-                               AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 
+                               AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
                        ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
                                intval(local_user()),
                                intval($start),
@@ -588,7 +587,7 @@ class NotificationsManager {
 
                if (dbm::is_result($r))
                        $notifs = $this->formatNotifs($r, $ident);
-               
+
                $arr = array (
                        'notifications' => $notifs,
                        'ident' => $ident,
@@ -599,7 +598,7 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Total number of home notifications 
+        * @brief Total number of home notifications
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
@@ -626,13 +625,13 @@ class NotificationsManager {
 
        /**
         * @brief Get home notifications
-        * 
+        *
         * @param int|string $seen
         *      If 0 only include notifications into the query
         *      which aren't marked as "seen"
         * @param int $start Start the query at this point
         * @param int $limit Maximum number of query results
-        * 
+        *
         * @return array with
         *      string 'ident' => Notification identifier
         *      int 'total' => Total number of available home notifications
@@ -673,7 +672,7 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Total number of introductions 
+        * @brief Total number of introductions
         * @param bool $all
         *      If false only include introductions into the query
         *      which aren't marked as ignored
@@ -698,13 +697,13 @@ class NotificationsManager {
 
        /**
         * @brief Get introductions
-        * 
+        *
         * @param bool $all
         *      If false only include introductions into the query
         *      which aren't marked as ignored
         * @param int $start Start the query at this point
         * @param int $limit Maximum number of query results
-        * 
+        *
         * @return array with
         *      string 'ident' => Notification identifier
         *      int 'total' => Total number of available introductions
@@ -749,7 +748,7 @@ class NotificationsManager {
 
        /**
         * @brief Format the notification query in an usable array
-        * 
+        *
         * @param array $intros The array from the db query
         * @return array with the introductions
         */

diff --git a/include/Smilies.php b/include/Smilies.php
index d67b92d8b00f60a4e38ab0664510adb794b336ae..f4de32f8f8db4f3609594461e4575bb091d9f98c 100644 (file)
--- a/include/Smilies.php
+++ b/include/Smilies.php
@@ -5,6 +5,8 @@
  * @brief This file contains the Smilies class which contains functions to handle smiles
  */
 
+use Friendica\App;
+
 /**
  * This class contains functions to handle smiles
  */
@@ -13,13 +15,13 @@ class Smilies {
 
        /**
         * @brief Function to list all smilies
-        * 
+        *
         * Get an array of all smilies, both internal and from addons.
-        * 
+        *
         * @return array
         *      'texts' => smilie shortcut
         *      'icons' => icon in html
-        * 
+        *
         * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
         */
        public static function get_list() {
@@ -64,41 +66,41 @@ class Smilies {
                );
 
                $icons = array(
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" title=":like" />',
-               '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
-               '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
-               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
-               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/like.gif" alt=":like" title=":like" />',
+               '<img class="smiley" src="' . App::get_baseurl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
+               '<a href="http://friendica.com">~friendica <img class="smiley" src="' . App::get_baseurl() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . App::get_baseurl() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . App::get_baseurl() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
                );
 
                $params = array('texts' => $texts, 'icons' => $icons);
@@ -121,7 +123,7 @@ class Smilies {
         *
         * @param string $s
         * @param boolean $sample
-        * 
+        *
         * @return string HML Output of the Smilie
         */
        public static function replace($s, $sample = false) {
@@ -166,7 +168,7 @@ class Smilies {
         *
         * @param string $x
         * @return string HTML Output
-        * 
+        *
         * @todo: Rework because it doesn't work correctly
         */
        private function preg_heart($x) {
@@ -174,7 +176,7 @@ class Smilies {
                        return $x[0];
                $t = '';
                for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
-                       $t .= '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
+                       $t .= '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
                $r =  str_replace($x[0],$t,$x[0]);
                return $r;
        }

diff --git a/include/dfrn.php b/include/dfrn.php
index 9109efce4fcbc41b51e2f501b0c9e1746671a977..004f136ac333bbc20e44d5984910fac0ae3ffd57 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -372,7 +372,7 @@ class dfrn {
                $ext = Photo::supportedTypes();
 
                foreach ($rp as $p) {
-                       $photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+                       $photos[$p['scale']] = App::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
                }
 
                unset($rp, $ext);
@@ -433,7 +433,7 @@ class dfrn {
                $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
                $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
 
-               xml::add_element($doc, $root, "id", app::get_baseurl()."/profile/".$owner["nick"]);
+               xml::add_element($doc, $root, "id", App::get_baseurl()."/profile/".$owner["nick"]);
                xml::add_element($doc, $root, "title", $owner["name"]);
 
                $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
@@ -450,13 +450,13 @@ class dfrn {
                        // DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
                        ostatus::hublinks($doc, $root);
 
-                       $attributes = array("rel" => "salmon", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+                       $attributes = array("rel" => "salmon", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
                        xml::add_element($doc, $root, "link", "", $attributes);
 
-                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
                        xml::add_element($doc, $root, "link", "", $attributes);
 
-                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
                        xml::add_element($doc, $root, "link", "", $attributes);
                }
 
@@ -513,7 +513,7 @@ class dfrn {
                }
 
                xml::add_element($doc, $author, "name", $owner["name"], $attributes);
-               xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
+               xml::add_element($doc, $author, "uri", App::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
                xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
 
                $attributes = array("rel" => "photo", "type" => "image/jpeg",
@@ -814,7 +814,7 @@ class dfrn {
                        $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
                        $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
                        $attributes = array("ref" => $parent_item, "type" => "text/html",
-                                               "href" => app::get_baseurl().'/display/'.$parent[0]['guid'],
+                                               "href" => App::get_baseurl().'/display/'.$parent[0]['guid'],
                                                "dfrn:diaspora_guid" => $parent[0]['guid']);
                        xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
                }
@@ -856,7 +856,7 @@ class dfrn {
 
                // We save this value in "plink". Maybe we should read it from there as well?
                xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
-                                                               "href" => app::get_baseurl()."/display/".$item["guid"]));
+                                                               "href" => App::get_baseurl()."/display/".$item["guid"]));
 
                // "comment-allow" is some old fashioned stuff for old Friendica versions.
                // It is included in the rewritten code for completeness
@@ -884,8 +884,8 @@ class dfrn {
                        xml::add_element($doc, $entry, "dfrn:bookmark", "true");
                }
 
-               if ($item['app']) {
-                       xml::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+               if ($item['App']) {
+                       xml::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['App']));
                }
 
                xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
@@ -2331,7 +2331,7 @@ class dfrn {
                if ($notice_info AND ($notice_info->length > 0)) {
                        foreach ($notice_info->item(0)->attributes AS $attributes) {
                                if ($attributes->name == "source") {
-                                       $item["app"] = strip_tags($attributes->textContent);
+                                       $item["App"] = strip_tags($attributes->textContent);
                                }
                        }
                }

diff --git a/include/ostatus.php b/include/ostatus.php
index f0f59b272bd385d1c9f13fb133157317b64ee5ac..d582acfee67d6b9f6a4bf26c240add4331f304a7 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -2208,7 +2208,7 @@ class ostatus {
        /**
         * @brief Creates the XML feed for a given nickname
         *
-        * @param app $a The application class
+        * @param App $a The application class
         * @param string $owner_nick Nickname of the feed owner
         * @param string $last_update Date of the last update
         *

diff --git a/mod/api.php b/mod/api.php
index b771af01b2d88c057394b7df17ffa43a1e3db564..cd5d5241f86c8faa231407c51b9e6540ce17ac7e 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -108,8 +108,6 @@ function api_content(App $a) {
                        '$no'   => t('No'),
                ));
 
-               //echo "<pre>"; var_dump($app); killme();
-
                return $o;
        }
 

diff --git a/mod/contacts.php b/mod/contacts.php
index ee501fb9dd63f34a92afa820c280976c36f7bd2a..30d847e25f10b50fa65921739b82af503fd96b8c 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -830,7 +830,7 @@ function contacts_content(App $a) {
  *
  * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
  *
- * @param app $a
+ * @param App $a
  * @param int $contact_id The ID of the contact
  * @param int $active_tab 1 if tab should be marked as active
  *

diff --git a/mod/network.php b/mod/network.php
index 5c840da063c8f0cbe125c3e8c4a78019a8abd41a..0d37d4d2e25db10b2a0e4afe46992f507580da16 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -795,7 +795,7 @@ function network_content(App $a, $update = 0) {
 /**
  * @brief Get the network tabs menu
  *
- * @param app $a The global App
+ * @param App $a The global App
  * @return string Html of the networktab
  */
 function network_tabs(App $a) {

diff --git a/src/App.php b/src/App.php
index 41ee5d3a02bd77b6866c44578988198e522bd5de..45a9db435cc497d854f79b186769c1eced7a1d9b 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -667,7 +667,7 @@ class App {
                q('START TRANSACTION');\r
 \r
                $r = q('SELECT `pid` FROM `process` WHERE `pid` = %d', intval(getmypid()));\r
-               if (!dbm::is_result($r)) {\r
+               if (!\dbm::is_result($r)) {\r
                        q("INSERT INTO `process` (`pid`,`command`,`created`) VALUES (%d, '%s', '%s')", intval(getmypid()), dbesc($command), dbesc(datetime_convert()));\r
                }\r
                q('COMMIT');\r
@@ -680,7 +680,7 @@ class App {
                q('START TRANSACTION');\r
 \r
                $r = q('SELECT `pid` FROM `process`');\r
-               if (dbm::is_result($r)) {\r
+               if (\dbm::is_result($r)) {\r
                        foreach ($r AS $process) {\r
                                if (!posix_kill($process['pid'], 0)) {\r
                                        q('DELETE FROM `process` WHERE `pid` = %d', intval($process['pid']));\r
@@ -785,7 +785,7 @@ class App {
                        }\r
                }\r
 \r
-               $processlist = dbm::processlist();\r
+               $processlist = \dbm::processlist();\r
                if ($processlist['list'] != '') {\r
                        logger('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list'], LOGGER_DEBUG);\r
 \r
@@ -876,14 +876,14 @@ class App {
                // If the last worker fork was less than 10 seconds before then don't fork another one.\r
                // This should prevent the forking of masses of workers.\r
                $cachekey = 'app:proc_run:started';\r
-               $result = Cache::get($cachekey);\r
+               $result = \Cache::get($cachekey);\r
 \r
                if (!is_null($result) AND ( time() - $result) < 10) {\r
                        return;\r
                }\r
 \r
                // Set the timestamp of the last proc_run\r
-               Cache::set($cachekey, time(), CACHE_MINUTE);\r
+               \Cache::set($cachekey, time(), CACHE_MINUTE);\r
 \r
                array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));\r
 \r

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 0e34709e9c5f6b1bda1e29ea88e37cd3626e85ea..e0c382661a1be3b1099f626d9a9ffea4230537b8 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -132,7 +132,7 @@ function frio_item_photo_menu(App $a, &$arr) {
  *  Additionally the profile, status and photo page links  will be changed
  *  to don't open in a new tab if the contact is a friendica contact.
  *
- * @param app $a The app data
+ * @param App $a The app data
  * @param array $args Contains contact data and the original photo_menu
  */
 function frio_contact_photo_menu(App $a, &$args){
@@ -184,7 +184,7 @@ function frio_contact_photo_menu(App $a, &$args){
  *  Some links will point to the local pages because the user would expect
  *  local page (these pages are: search, community, help, apps, directory).
  *
- * @param app $a The App class
+ * @param App $a The App class
  * @param array $nav The original nav menu
  */
 function frio_remote_nav($a,&$nav) {
@@ -273,7 +273,7 @@ function frio_remote_nav($a,&$nav) {
  * @param App $a The app data @TODO Unused
  * @param array $results The array with the originals from acl_lookup()
  */
-function frio_acl_lookup($a, &$results) {
+function frio_acl_lookup(App $a, &$results) {
        require_once("mod/contacts.php");
 
        $nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : "");