aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--[-rwxr-xr-x]index.php28
1 files changed, 23 insertions, 5 deletions
diff --git a/index.php b/index.php
index 2faac1f28..442173eeb 100755..100644
--- a/index.php
+++ b/index.php
@@ -38,11 +38,10 @@ load_translation_table($lang);
*/
require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
- unset($db_host, $db_user, $db_pass, $db_data);
-
if(! $install) {
+ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+ unset($db_host, $db_user, $db_pass, $db_data);
/**
* Load configs from db. Overwrite configs from .htconfig.php
@@ -95,6 +94,11 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
if(x($_GET,'zrl')) {
$_SESSION['my_url'] = $_GET['zrl'];
+ $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+ if(! $install) {
+ $arr = array('zrl' => $_SESSION['my_url'], 'url' => $a->cmd);
+ call_hooks('zrl_init',$arr);
+ }
}
/**
@@ -243,6 +247,8 @@ if (file_exists($theme_info_file)){
if(! x($a->page,'content'))
$a->page['content'] = '';
+if(! $install)
+ call_hooks('page_content_top',$a->page['content']);
/**
* Call module functions
@@ -255,6 +261,18 @@ if($a->module_loaded) {
$func($a);
}
+ if(function_exists(str_replace('-','_',current_theme()) . '_init')) {
+ $func = str_replace('-','_',current_theme()) . '_init';
+ $func($a);
+ }
+// elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
+// require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
+// if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
+// $func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
+// $func($a);
+// }
+// }
+
if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
&& (function_exists($a->module . '_post'))
&& (! x($_POST,'auth-params'))) {
@@ -345,13 +363,13 @@ $profile = $a->profile;
header("Content-type: text/html; charset=utf-8");
-$template = 'view/' . current_theme() . '/'
+$template = 'view/theme/' . current_theme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template))
require_once($template);
else
- require_once(str_replace(current_theme() . '/', '', $template));
+ require_once(str_replace('theme/' . current_theme() . '/', '', $template));
session_write_close();
exit;