Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 18d045f2d57d44244c605cf978dc14394388d241..d79c89a6b24ec9ddb867c7f7cf73434b913ceeb1 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -1,7 +1,6 @@
 <?php
 
-if(! function_exists('friendica_init')) {
-function friendica_init(&$a) {
+function friendica_init(App &$a) {
        if ($a->argv[1]=="json"){
                $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
@@ -16,7 +15,7 @@ function friendica_init(&$a) {
                        $r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($adminlist[0]));
                        $admin = array(
                                'name' => $r[0]['username'],
-                               'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
+                               'profile'=> App::get_baseurl().'/profile/'.$r[0]['nickname'],
                        );
                } else {
                        $admin = false;
@@ -25,7 +24,7 @@ function friendica_init(&$a) {
                $visible_plugins = array();
                if(is_array($a->plugins) && count($a->plugins)) {
                        $r = q("select * from addon where hidden = 0");
-                       if(count($r))
+                       if (dbm::is_result($r))
                                foreach($r as $rr)
                                        $visible_plugins[] = $rr['name'];
                }
@@ -50,17 +49,17 @@ function friendica_init(&$a) {
                        'site_name' => $a->config['sitename'],
                        'platform' => FRIENDICA_PLATFORM,
                        'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
-                       'no_scrape_url' => $a->get_baseurl().'/noscrape'
+                       'no_scrape_url' => App::get_baseurl().'/noscrape'
                );
 
                echo json_encode($data);
                killme();
        }
 }
-}
 
-if(! function_exists('friendica_content')) {
-function friendica_content(&$a) {
+
+
+function friendica_content(App &$a) {
 
        $o = '';
        $o .= '<h3>Friendica</h3>';
@@ -71,7 +70,7 @@ function friendica_content(&$a) {
        $o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
        $o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
-       $o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';
+       $o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';        
 
        $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a></p><p>';
        $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
@@ -81,7 +80,7 @@ function friendica_content(&$a) {
        $visible_plugins = array();
        if(is_array($a->plugins) && count($a->plugins)) {
                $r = q("select * from addon where hidden = 0");
-               if(count($r))
+               if (dbm::is_result($r))
                        foreach($r as $rr)
                                $visible_plugins[] = $rr['name'];
        }
@@ -103,8 +102,8 @@ function friendica_content(&$a) {
        else
                $o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
 
-       call_hooks('about_hook', $o);
+       call_hooks('about_hook', $o);   
 
        return $o;
-}
+
 }