Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / mod / home.php

diff --git a/mod/home.php b/mod/home.php
index 898313814dfdc0701f124c8ce1aa28cc71e23d69..2d646f8dd8a4b09553a9fc365fff80f6e7b301aa 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -3,24 +3,31 @@
 if(! function_exists('home_init')) {
 function home_init(&$a) {
 
-       if(x($_SESSION,'authenticated') && (x($_SESSION,'uid'))) {
-               if($a->user['nickname'])
+       if(local_user() && ($a->user['nickname']))
                        goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
-               else
-                       goaway( $a->get_baseurl() . "/profile/" . $_SESSION['uid'] );
-       }
-       $a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
- 
+
+       $a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n"; 
 }}
 
 
 if(! function_exists('home_content')) {
 function home_content(&$a) {
 
-       $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://mistpark.com\" name=\"Mistpark\" >Mistpark</a></div>";
-       $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
+       $o = '';
+/*
+ *     if(! (x($a->page,'footer')))
+ *             $a->page['footer'] = '';
+ *     $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>";
+ */
+       $o .= '<h1>' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '</h1>';
+       if(file_exists('home.html'))
+               $o .= file_get_contents('home.html');
+
        $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+       
+       call_hooks("home_content",$o);
+       
        return $o;
 
        
-}} 
\ No newline at end of file
+}}