Fixed few warnings appeared after turning E_STRICT on

[mirrors/Kyberia-bloodline.git] / wwwroot / nodes.php

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index bd4500eeaba4d9f58ab09a8dd9afad0970743199..9bafe5163028aae308f084fc0605079600b02e7a 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -63,11 +63,15 @@ switch(true) {
        case preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match):
                $_GET['node_id']  = nodes::getNodeIdByName($match[1]);
                break;
+       case preg_match('/search\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match):
+               //$query  = nodes::getNodeIdByName($match[1]);
+               //XXX TODO: Predat searchi az bude fungovat
+               break;
        case preg_match('/\/(.+)\/?$/',$_SERVER['PATH_INFO'],$match):
                $_GET['node_id']  = nodes::getNodeIdByName($match[1]);
                break;
        default:
-               $_GET['node_id']=1;
+               $_GET['node_id']=1; //WELCOME_NODE
                break;
 }
 
@@ -77,29 +81,27 @@ if (!empty($_GET['template_id'])) {
        $template_id=false;
 }
 
-error_reporting(1);
+error_reporting(E_ALL | E_STRICT);
 //$_SESSION['debugging']=0;
 //unset($_SESSION['debugging']); 
 //Well... we should make some event 
 //or JavaScript page to turning this on/off...
 //exit;
-if ($_SESSION['debugging']) {
-    error_reporting(E_ALL);
+if(isset($_SESSION['debugging']) && $_SESSION['debugging']) {
     echo 'GET VARIABLES::<br/>';
     print_r($_GET);
     echo 'POST VARIABLES::<br/>';
     print_r($_POST);
     echo '<b>SESSION VARIABLES::</b><br/>';
     print_r($_SESSION);
+} else {
+       $_SESSION['debugging']=false;
+       set_error_handler('logger::error_handler');
 }
 
-
+require_once(INCLUDE_DIR.'logout_idle.inc'); //Logout when idle
 
 //initializing node
-if (!is_numeric($_GET['node_id'])) {
-       $_GET['node_id']=WELCOME_NODE;
-}
-
 $node = nodes::getNodeById($_GET['node_id'],(isset($_SESSION['user_id']))?$_SESSION['user_id']:'');
 
 //XXX Paths are wrong (!)
@@ -147,14 +149,12 @@ if (isset($_SESSION['cube_vector']) && ($_SESSION['cube_vector'])) {
 @include_once(INCLUDE_DIR.'mail_rss.inc'); //haluz...
 
 //checking permissions
-function _checkPermissions()
-{
-       global $permissions, $node;
-       require(INCLUDE_DIR.'permissions.inc');
-       $permissions=permissions::checkPermissions($node);
-       $permissions['h']=permissions::isHierarch($node);
+include_once(BACKEND_DIR.'/'.DB_TYPE.'/permissions.inc');
+$permissions=permissions::checkPerms($node);
+if ($_SESSION['debugging']) {
+       print_r($permissions);
 }
-_checkPermissions();
+
 
 
 // DO NOT MESS WITH THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!