From ff56e95c6e907f05ecd18f40a372aa98b1b24926 Mon Sep 17 00:00:00 2001 From: dsp1986 Date: Tue, 17 Sep 2013 09:41:48 +0200 Subject: fix include paths --- index.php | 4 ++-- mod/setup.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index d93c73233..fe09e88fc 100755 --- a/index.php +++ b/index.php @@ -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/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'])); -- cgit v1.2.3 From d330df05f221e96b92d2bd17c7336152b7d8c128 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Tue, 17 Sep 2013 10:11:22 +0200 Subject: extend admin page for hubloc / server key management --- mod/admin.php | 16 ++++++++++++++++ mod/post.php | 1 + view/tpl/admin_aside.tpl | 1 + 3 files changed, 18 insertions(+) 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/post.php b/mod/post.php index 378192cbf..825131495 100644 --- a/mod/post.php +++ b/mod/post.php @@ -20,6 +20,7 @@ function post_init(&$a) { if(array_key_exists('auth',$_REQUEST)) { logger('mod_zot: auth request received.'); + logger('mod_post: $_REQUEST contains: ' . print_r($_REQUEST,true) . ' for ' . $webbie); $address = $_REQUEST['auth']; $dest = $_REQUEST['dest']; $sec = $_REQUEST['sec']; 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 @@
  • {{$admin.users.1}}
  • {{$admin.plugins.1}}
  • {{$admin.themes.1}}
    • +
  • {{$admin.hubloc.1}}
  • {{$admin.dbsync.1}}
    • -- cgit v1.2.3 From 4f55d154d41f45c9c04547b80fbff41eb3013b06 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Tue, 17 Sep 2013 10:14:52 +0200 Subject: removed logger statement --- mod/post.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/post.php b/mod/post.php index 825131495..378192cbf 100644 --- a/mod/post.php +++ b/mod/post.php @@ -20,7 +20,6 @@ function post_init(&$a) { if(array_key_exists('auth',$_REQUEST)) { logger('mod_zot: auth request received.'); - logger('mod_post: $_REQUEST contains: ' . print_r($_REQUEST,true) . ' for ' . $webbie); $address = $_REQUEST['auth']; $dest = $_REQUEST['dest']; $sec = $_REQUEST['sec']; -- cgit v1.2.3