mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 20:15:16 +00:00
Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
44a4997cf7
4 changed files with 20 additions and 3 deletions
|
@ -50,7 +50,7 @@ if(! $install) {
|
||||||
load_config('system');
|
load_config('system');
|
||||||
load_config('feature');
|
load_config('feature');
|
||||||
|
|
||||||
require_once("session.php");
|
require_once("include/session.php");
|
||||||
load_hooks();
|
load_hooks();
|
||||||
call_hooks('init_1');
|
call_hooks('init_1');
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ if((x($_GET,'zid')) && (! $install)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
|
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
|
||||||
require("auth.php");
|
require("include/auth.php");
|
||||||
|
|
||||||
|
|
||||||
if(! x($_SESSION,'sysmsg'))
|
if(! x($_SESSION,'sysmsg'))
|
||||||
|
|
|
@ -54,6 +54,9 @@ function admin_post(&$a){
|
||||||
case 'logs':
|
case 'logs':
|
||||||
admin_page_logs_post($a);
|
admin_page_logs_post($a);
|
||||||
break;
|
break;
|
||||||
|
case 'hubloc':
|
||||||
|
admin_page_hubloc_post($a);
|
||||||
|
break;
|
||||||
case 'dbsync':
|
case 'dbsync':
|
||||||
admin_page_dbsync_post($a);
|
admin_page_dbsync_post($a);
|
||||||
break;
|
break;
|
||||||
|
@ -84,6 +87,7 @@ function admin_content(&$a) {
|
||||||
'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
|
'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
|
||||||
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
||||||
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
||||||
|
'hubloc' => Array($a->get_baseurl(true)."/admin/hubloc/", t("Server") , "server"),
|
||||||
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync")
|
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -132,6 +136,9 @@ function admin_content(&$a) {
|
||||||
case 'themes':
|
case 'themes':
|
||||||
$o = admin_page_themes($a);
|
$o = admin_page_themes($a);
|
||||||
break;
|
break;
|
||||||
|
case 'hubloc':
|
||||||
|
$o = admin_page_hubloc($a);
|
||||||
|
break;
|
||||||
case 'logs':
|
case 'logs':
|
||||||
$o = admin_page_logs($a);
|
$o = admin_page_logs($a);
|
||||||
break;
|
break;
|
||||||
|
@ -443,6 +450,15 @@ function admin_page_site(&$a) {
|
||||||
));
|
));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
function admin_page_hubloc_post(&$a){
|
||||||
|
check_form_security_token_redirectOnErr('/admin/hubloc', 'hubloc');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function admin_page_hubloc(&$a) {
|
||||||
|
$o = '';
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function admin_page_dbsync(&$a) {
|
function admin_page_dbsync(&$a) {
|
||||||
|
|
|
@ -286,7 +286,7 @@ function setup_content(&$a) {
|
||||||
return $o;
|
return $o;
|
||||||
}; break;
|
}; break;
|
||||||
case 3: { // Site settings
|
case 3: { // Site settings
|
||||||
require_once('datetime.php');
|
require_once('include/datetime.php');
|
||||||
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||||
$dbport = intval(notags(trim($_POST['dbuser'])));
|
$dbport = intval(notags(trim($_POST['dbuser'])));
|
||||||
$dbuser = notags(trim($_POST['dbuser']));
|
$dbuser = notags(trim($_POST['dbuser']));
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
<li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
|
<li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
|
||||||
<li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
|
<li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
|
||||||
<li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
|
<li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
|
||||||
|
<li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
|
||||||
<li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
|
<li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue