Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix wrong class name case

Browse source 
- Use leading backslash for non-namespace class names in App
This commit is contained in:
Hypolite Petovan 2017-04-30 00:17:49 -04:00
parent 146258680b
commit 4b16de6d80
9 changed files with 89 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/NotificationsManager.php
View file

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

84
include/Smilies.php
View file

@ -5,6 +5,8 @@
* @brief This file contains the Smilies class which contains functions to handle smiles * @brief This file contains the Smilies class which contains functions to handle smiles
*/ */
use Friendica\App;
/** /**
* This class contains functions to handle smiles * This class contains functions to handle smiles
*/ */
@ -13,13 +15,13 @@ class Smilies {
/** /**
* @brief Function to list all smilies * @brief Function to list all smilies
* *
* Get an array of all smilies, both internal and from addons. * Get an array of all smilies, both internal and from addons.
* *
* @return array * @return array
* 'texts' => smilie shortcut * 'texts' => smilie shortcut
* 'icons' => icon in html * 'icons' => icon in html
* *
* @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array) * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
*/ */
public static function get_list() { public static function get_list() {
@ -64,41 +66,41 @@ class Smilies {
); );
$icons = array( $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-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-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-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-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-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-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=":-\" 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-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-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-|" 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="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-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-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-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-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-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-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-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/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=":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/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/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/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/like.gif" alt=":like" title=":like" />',
'<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />', '<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://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#" 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>' '<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); $params = array('texts' => $texts, 'icons' => $icons);
@ -121,7 +123,7 @@ class Smilies {
* *
* @param string $s * @param string $s
* @param boolean $sample * @param boolean $sample
* *
* @return string HML Output of the Smilie * @return string HML Output of the Smilie
*/ */
public static function replace($s, $sample = false) { public static function replace($s, $sample = false) {
@ -166,7 +168,7 @@ class Smilies {
* *
* @param string $x * @param string $x
* @return string HTML Output * @return string HTML Output
* *
* @todo: Rework because it doesn't work correctly * @todo: Rework because it doesn't work correctly
*/ */
private function preg_heart($x) { private function preg_heart($x) {
@ -174,7 +176,7 @@ class Smilies {
return $x[0]; return $x[0];
$t = ''; $t = '';
for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) 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]); $r = str_replace($x[0],$t,$x[0]);
return $r; return $r;
} }

22
include/dfrn.php
View file

@ -372,7 +372,7 @@ class dfrn {
$ext = Photo::supportedTypes(); $ext = Photo::supportedTypes();
foreach ($rp as $p) { 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); unset($rp, $ext);
@ -433,7 +433,7 @@ class dfrn {
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS); $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); $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"]); xml::add_element($doc, $root, "title", $owner["name"]);
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION); $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. // DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
ostatus::hublinks($doc, $root); 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); 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); 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); 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, "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); xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = array("rel" => "photo", "type" => "image/jpeg", $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 = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$attributes = array("ref" => $parent_item, "type" => "text/html", $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']); "dfrn:diaspora_guid" => $parent[0]['guid']);
xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes); 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? // 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", 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. // "comment-allow" is some old fashioned stuff for old Friendica versions.
// It is included in the rewritten code for completeness // It is included in the rewritten code for completeness
@ -884,8 +884,8 @@ class dfrn {
xml::add_element($doc, $entry, "dfrn:bookmark", "true"); xml::add_element($doc, $entry, "dfrn:bookmark", "true");
} }
if ($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, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['App']));
} }
xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]); xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
@ -2331,7 +2331,7 @@ class dfrn {
if ($notice_info AND ($notice_info->length > 0)) { if ($notice_info AND ($notice_info->length > 0)) {
foreach ($notice_info->item(0)->attributes AS $attributes) { foreach ($notice_info->item(0)->attributes AS $attributes) {
if ($attributes->name == "source") { if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent); $item["App"] = strip_tags($attributes->textContent);
} }
} }
} }

2
include/ostatus.php
View file

@ -2208,7 +2208,7 @@ class ostatus {
/** /**
* @brief Creates the XML feed for a given nickname * @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 $owner_nick Nickname of the feed owner
* @param string $last_update Date of the last update * @param string $last_update Date of the last update
* *

2
mod/api.php
View file

@ -108,8 +108,6 @@ function api_content(App $a) {
'$no' => t('No'), '$no' => t('No'),
)); ));
//echo "<pre>"; var_dump($app); killme();
return $o; return $o;
} }

2
mod/contacts.php
View file

@ -830,7 +830,7 @@ function contacts_content(App $a) {
* *
* Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends' * 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 $contact_id The ID of the contact
* @param int $active_tab 1 if tab should be marked as active * @param int $active_tab 1 if tab should be marked as active
* *

2
mod/network.php
View file

@ -795,7 +795,7 @@ function network_content(App $a, $update = 0) {
/** /**
* @brief Get the network tabs menu * @brief Get the network tabs menu
* *
* @param app $a The global App * @param App $a The global App
* @return string Html of the networktab * @return string Html of the networktab
*/ */
function network_tabs(App $a) { function network_tabs(App $a) {

10
src/App.php
View file

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

6
view/theme/frio/theme.php
View file

@ -132,7 +132,7 @@ function frio_item_photo_menu(App $a, &$arr) {
* Additionally the profile, status and photo page links will be changed * 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. * 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 * @param array $args Contains contact data and the original photo_menu
*/ */
function frio_contact_photo_menu(App $a, &$args){ 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 * Some links will point to the local pages because the user would expect
* local page (these pages are: search, community, help, apps, directory). * 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 * @param array $nav The original nav menu
*/ */
function frio_remote_nav($a,&$nav) { 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 App $a The app data @TODO Unused
* @param array $results The array with the originals from acl_lookup() * @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"); require_once("mod/contacts.php");
$nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : ""); $nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : "");