aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-17 01:34:17 -0700
committerfriendica <info@friendica.com>2013-09-17 01:34:17 -0700
commita27ba2195c5aa7d617b5297deecc1c4105c5d9d4 (patch)
tree952433902a75eb3c08364dc4aa90ec24da93a06d
parent3354abfd428d1baef3d69886b75588163292aeae (diff)
parent4f55d154d41f45c9c04547b80fbff41eb3013b06 (diff)
downloadvolse-hubzilla-a27ba2195c5aa7d617b5297deecc1c4105c5d9d4.tar.gz
volse-hubzilla-a27ba2195c5aa7d617b5297deecc1c4105c5d9d4.tar.bz2
volse-hubzilla-a27ba2195c5aa7d617b5297deecc1c4105c5d9d4.zip
Merge pull request #141 from MicMee/master
Preparation for server / hubloc handling
-rw-r--r--mod/admin.php16
-rwxr-xr-xview/tpl/admin_aside.tpl1
2 files changed, 17 insertions, 0 deletions
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/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>