diff options
| author | friendica <info@friendica.com> | 2013-09-17 02:27:34 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-17 02:27:34 -0700 |
| commit | 44a4997cf7690f218db4e9376c7e2fd0345432f5 (patch) | |
| tree | 018ebb5a560d8daa5b31ee0be9c3f8d952eb09a2 | |
| parent | 56de8aa05b0475b982946d9f3e36818c43d19803 (diff) | |
| parent | 8452535467036f1ea43ba406ba981e0dbee5c380 (diff) | |
| download | volse-hubzilla-44a4997cf7690f218db4e9376c7e2fd0345432f5.tar.gz volse-hubzilla-44a4997cf7690f218db4e9376c7e2fd0345432f5.tar.bz2 volse-hubzilla-44a4997cf7690f218db4e9376c7e2fd0345432f5.zip | |
Merge https://github.com/friendica/red into zpull
| -rwxr-xr-x | index.php | 4 | ||||
| -rw-r--r-- | mod/admin.php | 16 | ||||
| -rwxr-xr-x | mod/setup.php | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 1 |
4 files changed, 20 insertions, 3 deletions
@@ -50,7 +50,7 @@ if(! $install) { load_config('system'); load_config('feature'); - require_once("session.php"); + require_once("include/session.php"); load_hooks(); call_hooks('init_1'); @@ -102,7 +102,7 @@ if((x($_GET,'zid')) && (! $install)) { } if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) - require("auth.php"); + require("include/auth.php"); if(! x($_SESSION,'sysmsg')) diff --git a/mod/admin.php b/mod/admin.php index fb1a9ab53..455897f6f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -54,6 +54,9 @@ function admin_post(&$a){ case 'logs': admin_page_logs_post($a); break; + case 'hubloc': + admin_page_hubloc_post($a); + break; case 'dbsync': admin_page_dbsync_post($a); break; @@ -84,6 +87,7 @@ function admin_content(&$a) { 'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), '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") ); @@ -132,6 +136,9 @@ function admin_content(&$a) { case 'themes': $o = admin_page_themes($a); break; + case 'hubloc': + $o = admin_page_hubloc($a); + break; case 'logs': $o = admin_page_logs($a); 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) { diff --git a/mod/setup.php b/mod/setup.php index 3c0a133b7..97bdba34e 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -286,7 +286,7 @@ function setup_content(&$a) { return $o; }; break; case 3: { // Site settings - require_once('datetime.php'); + require_once('include/datetime.php'); $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'); $dbport = intval(notags(trim($_POST['dbuser']))); $dbuser = notags(trim($_POST['dbuser'])); diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index acf58668d..fdf070aa2 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -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.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.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> </ul> |