Minor fixes, including overzealous replacement of app -> App

diff --git a/include/dfrn.php b/include/dfrn.php
index 004f136ac333bbc20e44d5984910fac0ae3ffd57..7e4d7af2bcceabe423bbe911fab8739b9eca6b2b 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -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/mod/apps.php b/mod/apps.php
index 5ba03bbb6678fcd8f085748f43720f5e90f279eb..0c0df76544ed6ca2a3fb97e05653bef278593a45 100644 (file)
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -5,8 +5,8 @@ use Friendica\App;
 function apps_content(App $a) {
        $privateaddons = get_config('config', 'private_addons');
        if ($privateaddons === "1") {
-               if ((!(local_user()))) {
-                       info(t("You must be logged in to use addons. "));
+               if (! local_user()) {
+                       info(t('You must be logged in to use addons. '));
                        return;
                };
        }
@@ -17,7 +17,7 @@ function apps_content(App $a) {
                notice(t('No installed applications.') . EOL);
        }
 
-       $tpl = get_markup_template("apps.tpl");
+       $tpl = get_markup_template('apps.tpl');
        return replace_macros($tpl, array(
                '$title' => $title,
                '$apps' => $a->apps,

diff --git a/mod/uexport.php b/mod/uexport.php
index d7c8934a5c9874ca55887019adb0469054059b0e..b00f9bdf927e44188e3b8c8aea2f84a77b08ac75 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -11,7 +11,6 @@ function uexport_init(App $a) {
        settings_init($a);
 }
 
-/// @TODO Change space -> tab where wanted
 function uexport_content(App $a) {
 
        if ($a->argc > 1) {
@@ -151,11 +150,6 @@ function uexport_all(App $a) {
                        intval($x),
                        intval(500)
                );
-               /* if (dbm::is_result($r)) {
-                 foreach($r as $rr)
-                 foreach($rr as $k => $v)
-                 $item[][$k] = $v;
-                 } */
 
                $output = array('item' => $r);
                echo json_encode($output) . "\n";