diff --git a/include/nav.php b/include/nav.php
index dd2655e84a..77cffc3ab1 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,8 +1,5 @@
page,'nav'))
- $a->page['nav'] = '';
-
$a->page['nav'] .= '
' ;
if(local_user()) {
@@ -56,7 +53,9 @@
$banner = get_config('system','banner');
+
if($banner === false)
$banner .= '
Friendika';
+
$a->page['nav'] .= '' . $banner . '';
diff --git a/index.php b/index.php
index f2c43a8b3d..e91603a30a 100644
--- a/index.php
+++ b/index.php
@@ -120,6 +120,9 @@ else
* "module"_afterpost
* "module"_content - the string return of this function contains our page body
*
+ * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do
+ * so within the module init and/or post functions and then invoke killme() to terminate
+ * further processing.
*/
if(strlen($a->module)) {
@@ -193,7 +196,7 @@ $a->page['content'] .= '';
*/
if($a->module != 'install')
- require_once("nav.php");
+ require_once('nav.php');
/**
*
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ce422aa9f9..e1370dfd82 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -6,7 +6,7 @@ function dfrn_request_init(&$a) {
if($a->argc > 1)
$which = $a->argv[1];
- profile_init($a,$which);
+ profile_load($a,$which);
return;
}}
diff --git a/mod/directory.php b/mod/directory.php
index 703c08ce1b..e9bbf47ab7 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -3,11 +3,22 @@ function directory_init(&$a) {
$a->set_pager_itemspage(60);
}
+
+function directory_post(&$a) {
+ if(x($_POST,'search'))
+ $a->data['search'] = $_POST['search'];
+}
+
+
+
function directory_content(&$a) {
$o = '';
$o .= '';
- $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+ if(x($a->data,'search'))
+ $search = notags(trim($a->data['search']));
+ else
+ $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
$tpl = load_view_file('view/directory_header.tpl');
diff --git a/mod/display.php b/mod/display.php
index 1049b28a09..990d0b431b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,7 +5,8 @@ function display_content(&$a) {
$o = '' . "\r\n";
- profile_init($a);
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ profile_load($a,$nick);
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
diff --git a/mod/home.php b/mod/home.php
index b8f16158eb..59cc31d3b0 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -14,12 +14,14 @@ if(! function_exists('home_content')) {
function home_content(&$a) {
$o = '';
- if(! (x($a->page,'footer')))
- $a->page['footer'] = '';
- $a->page['footer'] .= "";
+/*
+ * if(! (x($a->page,'footer')))
+ * $a->page['footer'] = '';
+ * $a->page['footer'] .= "";
+ */
$o .= 'Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '
';
if(file_exists('home.html'))
- $o .= file_get_contents('home.html');
+ $o .= file_get_contents('home.html');
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o;
diff --git a/mod/search.php b/mod/search.php
index 78a4a3d53f..7605e9ae26 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,13 +1,22 @@
data['search'] = $_POST['search'];
+}
+
+
function search_content(&$a) {
$o = '' . "\r\n";
$o .= '' . t('Search') . '
';
- $search = ((x($_GET,'search')) ? rawurldecode($_GET['search']) : '');
+ if(x($a->data,'search'))
+ $search = notags(trim($a->data['search']));
+ else
+ $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$o .= search($search);
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index c5f5355276..f20341dd69 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -178,10 +178,13 @@ img.photo {
font-weight: bold;
margin-left: 280px;
}
-#page-footer {
- height: 20px;
-/* border-bottom: 3px dashed #15607B; */
-}
+
+/*
+ * #page-footer {
+ * height: 20px;
+ *
+ * }
+ */
.heart {
color: #FF0000;
@@ -224,18 +227,16 @@ nav {
background: #15607B;
}
-footer {
- /*position: absolute;*/
- left: 0px;
- /*right: 0px;*/
- bottom: 0px;
- /*margin: 20px 20px 20px 20px;*/
-
- position: fixed;
- background-color: #0CBEFE;
- width: 100%;
- padding: 2px 3%;
-}
+/*
+ * footer {
+ * left: 0px;
+ * bottom: 0px;
+ * position: fixed;
+ * background-color: #0CBEFE;
+ * width: 100%;
+ * padding: 2px 3%;
+ * }
+ */
.fn {
font-size: 1.4em;