use default system theme for system pages
This commit is contained in:
parent
d1432fe7b5
commit
2a269e0c18
|
@ -14,6 +14,8 @@ function directory_post(&$a) {
|
||||||
function directory_content(&$a) {
|
function directory_content(&$a) {
|
||||||
$o = '';
|
$o = '';
|
||||||
$o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
|
$o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
|
||||||
|
if(x($_SESSION,'theme'))
|
||||||
|
unset($_SESSION['theme']);
|
||||||
|
|
||||||
if(x($a->data,'search'))
|
if(x($a->data,'search'))
|
||||||
$search = notags(trim($a->data['search']));
|
$search = notags(trim($a->data['search']));
|
||||||
|
|
|
@ -14,11 +14,10 @@ if(! function_exists('home_content')) {
|
||||||
function home_content(&$a) {
|
function home_content(&$a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
/*
|
|
||||||
* if(! (x($a->page,'footer')))
|
if(x($_SESSION,'theme'))
|
||||||
* $a->page['footer'] = '';
|
unset($_SESSION['theme']);
|
||||||
* $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>';
|
$o .= '<h1>' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '</h1>';
|
||||||
if(file_exists('home.html'))
|
if(file_exists('home.html'))
|
||||||
$o .= file_get_contents('home.html');
|
$o .= file_get_contents('home.html');
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function login_content(&$a) {
|
function login_content(&$a) {
|
||||||
|
if(x($_SESSION,'theme'))
|
||||||
|
unset($_SESSION['theme']);
|
||||||
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
|
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
|
||||||
|
|
||||||
}
|
}
|
|
@ -360,6 +360,10 @@ function register_content(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(x($_SESSION,'theme'))
|
||||||
|
unset($_SESSION['theme']);
|
||||||
|
|
||||||
|
|
||||||
$username = ((x($_POST,'username')) ? $_POST['username'] : ((x($_GET,'username')) ? $_GET['username'] : ''));
|
$username = ((x($_POST,'username')) ? $_POST['username'] : ((x($_GET,'username')) ? $_GET['username'] : ''));
|
||||||
$email = ((x($_POST,'email')) ? $_POST['email'] : ((x($_GET,'email')) ? $_GET['email'] : ''));
|
$email = ((x($_POST,'email')) ? $_POST['email'] : ((x($_GET,'email')) ? $_GET['email'] : ''));
|
||||||
$openid_url = ((x($_POST,'openid_url')) ? $_POST['openid_url'] : ((x($_GET,'openid_url')) ? $_GET['openid_url'] : ''));
|
$openid_url = ((x($_POST,'openid_url')) ? $_POST['openid_url'] : ((x($_GET,'openid_url')) ? $_GET['openid_url'] : ''));
|
||||||
|
|
|
@ -9,6 +9,9 @@ function search_post(&$a) {
|
||||||
|
|
||||||
function search_content(&$a) {
|
function search_content(&$a) {
|
||||||
|
|
||||||
|
if(x($_SESSION,'theme'))
|
||||||
|
unset($_SESSION['theme']);
|
||||||
|
|
||||||
$o = '<div id="live-search"></div>' . "\r\n";
|
$o = '<div id="live-search"></div>' . "\r\n";
|
||||||
|
|
||||||
$o .= '<h3>' . t('Search') . '</h3>';
|
$o .= '<h3>' . t('Search') . '</h3>';
|
||||||
|
|
Loading…
Reference in New Issue
Block a user