Merge pull request #161 from tobiasd/master

[friendica.git] / mod / friendika.php

diff --git a/mod/friendika.php b/mod/friendika.php
index f07164f2cbe1fc91117306fd73f877b7c77b0372..d0e709c753b3cd19ca77e053093aea1e7541bbc4 100644 (file)
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -1,6 +1,6 @@
 <?php
 
-function friendika_content(&$a) {
+function friendika_init(&$a) {
        if ($a->argv[1]=="json"){
                $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
@@ -8,27 +8,30 @@ function friendika_content(&$a) {
                        $r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
                        $admin = array(
                                'name' => $r[0]['username'],
-                               'profile'=> $a->get_baseurl().'profile/'.$r[0]['nickname'],
+                               'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
                        );
                } else {
                        $admin = false;
                }
 
-
-
                $data = Array(
                        'version' => FRIENDIKA_VERSION,
-                       'url' => $a->get_baseurl(),
+                       'url' => z_root(),
                        'plugins' => $a->plugins,
                        'register_policy' =>  $register_policy[$a->config['register_policy']],
                        'admin' => $admin,
                        'site_name' => $a->config['sitename'],
-                       
+                       'info' => ((x($a->config,'info')) ? $a->config['info'] : '')                    
                );
 
                echo json_encode($data);
                killme();
        }
+}
+
+
+
+function friendika_content(&$a) {
 
        $o = '';
        $o .= '<h3>Friendika</h3>';
@@ -36,9 +39,8 @@ function friendika_content(&$a) {
 
        $o .= '<p></p><p>';
 
-       $o .= 'View <a href="LICENSE">License</a>' . '<br /><br />';
        $o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
-       $o .= t('running at web location') . ' ' . $a->get_baseurl() . '</p><p>';
+       $o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
        $o .= t('Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>') . '</p><p>';
 
@@ -59,7 +61,9 @@ function friendika_content(&$a) {
        }
        else
                $o .= '<p>' . t('No installed plugins/addons/apps');
-       
+
+       call_hooks('about_hook', $o);   
+
        return $o;
 
 }