rename

diff --git a/boot.php b/boot.php
index d2557e11486faeecc97aeabc803f7af0e965ccb8..85aca95be1969c3e1556b5037479ea19ea809772 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
-define ( 'FRIENDIKA_VERSION',      '2.3.1148' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1150' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1099      );
 

diff --git a/mod/friendica.php b/mod/friendica.php
new file mode 100644 (file)
index 0000000..363f140
--- /dev/null
+++ b/mod/friendica.php
@@ -0,0 +1,68 @@
+<?php
+
+function friendica_init(&$a) {
+       if ($a->argv[1]=="json"){
+               $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
+
+               if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
+                       $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'],
+                       );
+               } else {
+                       $admin = false;
+               }
+
+               $data = Array(
+                       'version' => FRIENDIKA_VERSION,
+                       'url' => z_root(),
+                       'plugins' => $a->plugins,
+                       'register_policy' =>  $register_policy[$a->config['register_policy']],
+                       'admin' => $admin,
+                       'site_name' => $a->config['sitename'],
+                       'platform' => FRIENDIKA_PLATFORM,
+                       'info' => ((x($a->config,'info')) ? $a->config['info'] : '')                    
+               );
+
+               echo json_encode($data);
+               killme();
+       }
+}
+
+
+
+function friendica_content(&$a) {
+
+       $o = '';
+       $o .= '<h3>Friendica</h3>';
+
+
+       $o .= '<p></p><p>';
+
+       $o .= t('This is Friendica, version') . ' ' . FRIENDIKA_VERSION . ' ';
+       $o .= t('running at web location') . ' ' . z_root() . '</p><p>';
+
+       $o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendica project.') . '</p><p>';        
+
+       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';
+       $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
+
+       $o .= '<p></p>';
+
+       if(count($a->plugins)) {
+               $o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
+               $o .= '<ul>';
+               foreach($a->plugins as $p)
+                       if(strlen($p))
+                               $o .= '<li>' . $p . '</li>';
+               $o .= '</ul>';
+       }
+       else
+               $o .= '<p>' . t('No installed plugins/addons/apps');
+
+       call_hooks('about_hook', $o);   
+
+       return $o;
+
+}

diff --git a/mod/friendika.php b/mod/friendika.php
index b12110bd5402a267da7d5ebc2eef1aca20314ced..1f3df565d693b1ccabc3376cf8f6aac3f7d0d384 100644 (file)
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -1,68 +1,11 @@
 <?php
 
-function friendika_init(&$a) {
-       if ($a->argv[1]=="json"){
-               $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
-
-               if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
-                       $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'],
-                       );
-               } else {
-                       $admin = false;
-               }
-
-               $data = Array(
-                       'version' => FRIENDIKA_VERSION,
-                       'url' => z_root(),
-                       'plugins' => $a->plugins,
-                       'register_policy' =>  $register_policy[$a->config['register_policy']],
-                       'admin' => $admin,
-                       'site_name' => $a->config['sitename'],
-                       'platform' => FRIENDIKA_PLATFORM,
-                       'info' => ((x($a->config,'info')) ? $a->config['info'] : '')                    
-               );
+require_once('mod/friendica.php');
 
-               echo json_encode($data);
-               killme();
-       }
+function friendika_init(&$a) {
+       friendica_init($a);
 }
 
-
-
 function friendika_content(&$a) {
-
-       $o = '';
-       $o .= '<h3>Friendika</h3>';
-
-
-       $o .= '<p></p><p>';
-
-       $o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
-       $o .= t('running at web location') . ' ' . z_root() . '</p><p>';
-
-       $o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.') . '</p><p>';        
-
-       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';
-       $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com') . '</p>';
-
-       $o .= '<p></p>';
-
-       if(count($a->plugins)) {
-               $o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
-               $o .= '<ul>';
-               foreach($a->plugins as $p)
-                       if(strlen($p))
-                               $o .= '<li>' . $p . '</li>';
-               $o .= '</ul>';
-       }
-       else
-               $o .= '<p>' . t('No installed plugins/addons/apps');
-
-       call_hooks('about_hook', $o);   
-
-       return $o;
-
+       return friendica_content($a);
 }