path fixing (SYSTEM_ROOT.'inc/a' -> INCLUDE_DIR.'a')

diff --git a/wwwroot/ajax/ajaxik.php b/wwwroot/ajax/ajaxik.php
index 31a15e6cc9103b1146fc4b593b358c1ea5f82874..e1eaca7d67df27f57d8acfae6c159bb451f2e013 100644 (file)
--- a/wwwroot/ajax/ajaxik.php
+++ b/wwwroot/ajax/ajaxik.php
@@ -2,10 +2,10 @@
 error_reporting(1);
 session_start();
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
-require(SYSTEM_ROOT.'inc/ubik.inc');
+require(INCLUDE_DIR.'database.inc');
+require(INCLUDE_DIR.'ubik.inc');
 $db=new CLASS_DATABASE();
 
 //print_r($_SESSION);
 
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/ajax/get_children.php b/wwwroot/ajax/get_children.php
index 672e794540bdd8b4c16d1531f7e1b6e717ab8ff2..86b69263c7e66ad7a6ccee12d71c3ea9eee1ef69 100644 (file)
--- a/wwwroot/ajax/get_children.php
+++ b/wwwroot/ajax/get_children.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(1);
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
+require(INCLUDE_DIR.'database.inc');
 $db=new CLASS_DATABASE();
 $user_id = $_GET['user_id'];
 $node_id = $_GET['node_id'];

diff --git a/wwwroot/ajax/get_id_by_name.php b/wwwroot/ajax/get_id_by_name.php
index fdcfb619bfdfe79783d04027e0e8fba864ef1bdd..b31ea48be976a10fb0e7ed917de1fdcf3e0d21f8 100644 (file)
--- a/wwwroot/ajax/get_id_by_name.php
+++ b/wwwroot/ajax/get_id_by_name.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(0);
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
+require(INCLUDE_DIR.'database.inc');
 $db=new CLASS_DATABASE();
 $name = addslashes($_GET['name']);
 $q="select users.user_id from users where users.login='$name' limit 1";
@@ -9,4 +9,4 @@ $set=$db->query($q);
 $set->next();
 $id=$set->getString('user_id');
 echo $id;
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/ajax/get_moods.php b/wwwroot/ajax/get_moods.php
index 43b3c4302c4a707a667d5f77c096190109b8b1e4..03342fab183587c79edc7d85c60517d8e5eeb7cf 100644 (file)
--- a/wwwroot/ajax/get_moods.php
+++ b/wwwroot/ajax/get_moods.php
@@ -2,7 +2,7 @@
 error_reporting(1);
 session_start();
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
+require(INCLUDE_DIR.'database.inc');
 $db=new CLASS_DATABASE();
 $user_id = $_GET['user_id'];
 
@@ -11,4 +11,4 @@ $set->next();
 $moods = $set->getString('moods');
 echo "session_user_id:: ".$_SESSION['user_id']."<br>";
 printf('moods:: %s session:: %d , %s , %s',$moods,$_SESSION['mood'],$_SESSION['mood_name'],$_SESSION['mood_text']);
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/ajax/get_username_by_id.php b/wwwroot/ajax/get_username_by_id.php
index eace3f5d09a9e3a18c426353ba05aeaae3cd8e76..b31ea48be976a10fb0e7ed917de1fdcf3e0d21f8 100644 (file)
--- a/wwwroot/ajax/get_username_by_id.php
+++ b/wwwroot/ajax/get_username_by_id.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(0);
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
+require(INCLUDE_DIR.'database.inc');
 $db=new CLASS_DATABASE();
 $name = addslashes($_GET['name']);
 $q="select users.user_id from users where users.login='$name' limit 1";

diff --git a/wwwroot/ajax/testing.php b/wwwroot/ajax/testing.php
index c8e78a2fa1066a5559bb5c299dcbc2ca6ee7492d..a5d2a1b8602952753c8ca2a9dfa2bec7e5ba5e0f 100644 (file)
--- a/wwwroot/ajax/testing.php
+++ b/wwwroot/ajax/testing.php
@@ -2,7 +2,7 @@
 error_reporting(1);
 session_start();
 require('../config/config.inc');
-require(SYSTEM_ROOT.'inc/database.inc');
+require(INCLUDE_DIR.'database.inc');
 $db=new CLASS_DATABASE();
 
 $set=$db->query("select user_id,last_action from users where (user_id > 2334 and user_id < 123456 and last_action like '2005-11-06 00:00:02')");
@@ -10,4 +10,4 @@ while ($set->next()){
 echo $set->getString('user_id')." ; ".$set->getString('last_action')."<br>";
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc
index 1e03596c493ec7273527549481dab5dd216850a9..b2d6d3ff8e0ad106c22319b23734a6de389a5e3d 100644 (file)
--- a/wwwroot/inc/eventz.inc
+++ b/wwwroot/inc/eventz.inc
@@ -1,11 +1,11 @@
 <?php
 //do not make a permission check if an event was executed before
 if ($_SESSION['eventz'][$event]) {
-       include_once(SYSTEM_ROOT."/inc/eventz/$event.inc");
+       include_once(INCLUDE_DIR."eventz/$event.inc");
        $status=$event();
 }
 
-elseif (is_file(SYSTEM_ROOT."/inc/eventz/$event.inc")) {
+elseif (is_file(INCLUDE_DIR."eventz/$event.inc")) {
        $event_id=nodes::getNodeIdByName($event,"event://$event");
        $event_node=nodes::getNodeById($event_id,$_SESSION['user_id']);
        if ($event_node['node_system_access']=='public'
@@ -13,7 +13,7 @@ elseif (is_file(SYSTEM_ROOT."/inc/eventz/$event.inc")) {
 || $event_node['node_permission']=='op'
 || $event_node['node_permission']=='execute'
 || $event_node['node_permission']=='master' ) {
-               include_once(SYSTEM_ROOT."/inc/eventz/$event.inc");
+               include_once(INCLUDE_DIR."eventz/$event.inc");
                $status=$event();
                $_SESSION['eventz'][$event]=true;
 

diff --git a/wwwroot/inc/eventz/add.inc b/wwwroot/inc/eventz/add.inc
index 0345383c2e25afd608739de6defa3bf2c558a7b1..83ea201f764cf68b962814363fa09e3d89656760 100644 (file)
--- a/wwwroot/inc/eventz/add.inc
+++ b/wwwroot/inc/eventz/add.inc
@@ -91,7 +91,7 @@ function add() {
 
     if ($node_system_access=='crypto') {
 
-    require(SYSTEM_ROOT.'/inc/crypto.inc');
+    require(INCLUDE_DIR.'crypto.inc');
 
     if ($_SESSION['crypto'][$node_parent]) {
     $key=$_SESSION['crypto'][$node_parent];

diff --git a/wwwroot/inc/eventz/add_test.inc b/wwwroot/inc/eventz/add_test.inc
index 7cf1e394d5707d32fb484a1aaecd567b8ea70f49..0cd1290da5fbd50cd9be708f28a09b7ecf2824f7 100644 (file)
--- a/wwwroot/inc/eventz/add_test.inc
+++ b/wwwroot/inc/eventz/add_test.inc
@@ -102,7 +102,7 @@ function add_test() {
     if ($node_system_access=='crypto') {
 
 
-    require(SYSTEM_ROOT.'/inc/crypto.inc');
+    require(INCLUDE_DIR.'crypto.inc');
 
     if ($_SESSION['crypto'][$node_parent]) {
     $key=$_SESSION['crypto'][$node_parent];

diff --git a/wwwroot/inc/eventz/configure.inc b/wwwroot/inc/eventz/configure.inc
index 08e0269bfab28e3d96c76b49ac3ce61a7bea86af..915d7ad0f5f60349279a0224297a4e45abc63e09 100644 (file)
--- a/wwwroot/inc/eventz/configure.inc
+++ b/wwwroot/inc/eventz/configure.inc
@@ -69,7 +69,7 @@
                        $node_external_access=$_POST['node_external_access'];
                        $node_system_access=$_POST['node_system_access'];
 
-                       require(SYSTEM_ROOT.'/inc/htmlparse.inc');
+                       require(INCLUDE_DIR.'htmlparse.inc');
                        global $htmlparse;
                        htmlparse::htmlparse($node_name);
 
@@ -102,4 +102,4 @@
                }
 
        }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/login.inc b/wwwroot/inc/eventz/login.inc
index c19f4e7f29c6923b34cb1d6b79db0bc99874ad80..f293e1d09025f74cd87d4968f8ba10234accdb32 100644 (file)
--- a/wwwroot/inc/eventz/login.inc
+++ b/wwwroot/inc/eventz/login.inc
@@ -3,7 +3,7 @@ function login() {
 // lockout capatibility
 // with ldap sync
 // <h1> This is da default one</h1>
-    require(SYSTEM_ROOT.'/inc/ldap.inc');
+    require(INCLUDE_DIR.'ldap.inc');
 
     global $db,$error,$node_id;
     $login = mysql_real_escape_string($_POST['login']);
@@ -126,4 +126,4 @@ where node_access.user_id='$user_id' and node_bookmark='yes' order by node_name"
 //    header("Location: $referer");
     return true;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/login2.inc b/wwwroot/inc/eventz/login2.inc
index 93b7803d5104929660c8ccb087af9ab9b6483e08..d00fc6efd0427ee0babfeb05553e7404387fcdd1 100644 (file)
--- a/wwwroot/inc/eventz/login2.inc
+++ b/wwwroot/inc/eventz/login2.inc
@@ -17,7 +17,7 @@ function login2() {
             $q="select * from users where login='$login'";
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$set->getString('user_id');
             $user_name=$login;
         break;
@@ -25,7 +25,7 @@ function login2() {
             $q="select * from users where user_id='$login'";
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$login;
             $user_name=$set->getString('user_name');
         break;
@@ -87,4 +87,4 @@ function login2() {
     }
     return true;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/login_lockout_test.inc b/wwwroot/inc/eventz/login_lockout_test.inc
index 7b5ce15d03c22bb83b7683ce24990bab0b401c7f..c0073070ca282981879750ebbe925f4d8735e7ac 100644 (file)
--- a/wwwroot/inc/eventz/login_lockout_test.inc
+++ b/wwwroot/inc/eventz/login_lockout_test.inc
@@ -18,7 +18,7 @@ function login_lockout_test() {
             $q="select * from users where login='$login'";
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$set->getString('user_id');
             $user_name=$set->getString('login');
         break;
@@ -26,7 +26,7 @@ function login_lockout_test() {
             $q="select * from users where user_id='$login'";
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$set->getString('user_id');
             $user_name=$set->getString('login');
         break;
@@ -113,4 +113,4 @@ $_SESSION['browser']['screen_height']=$_POST['screen_height'];
     }
     return false;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/login_test.inc b/wwwroot/inc/eventz/login_test.inc
index 468eed8ad14233a18691a03ed5cf52271a841a91..cfd2062c7818b4fd832ee0e1a31ab50e633624a8 100644 (file)
--- a/wwwroot/inc/eventz/login_test.inc
+++ b/wwwroot/inc/eventz/login_test.inc
@@ -21,7 +21,7 @@ function login_test() {
             echo  $q;
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$set->getString('user_id');
             $user_name=$set->getString('login');
         break;
@@ -29,7 +29,7 @@ function login_test() {
             $q="select * from users where user_id='$login'";
             $set=$db->query($q);
             $set->next();
-            require(SYSTEM_ROOT.'/inc/ldap.inc');
+            require(INCLUDE_DIR.'ldap.inc');
             $user_id=$set->getString('user_id');
             $user_name=$set->getString('login');
         break;
@@ -118,4 +118,4 @@ $forwarded";
     }
     return true;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/register_users.inc b/wwwroot/inc/eventz/register_users.inc
index 13460177f89100699a004d5698c5e1957c469f87..481c61672dc86cc760fbf6fa5522fcc3dc6b34d4 100644 (file)
--- a/wwwroot/inc/eventz/register_users.inc
+++ b/wwwroot/inc/eventz/register_users.inc
@@ -2,8 +2,8 @@ function register_users() {
 global $permissions,$node,$db,$error;
 $user_id=$_SESSION['user_id'];
 $user_name=$_SESSION['user_name'];
-$hello="ahoj, tymto ta vitam v systeme kyberia.sk. do systemu ta zaregistrovala moja malickost. v pripade ze budes mat akykolvek problem, kontaktuj ma prosim cez postunnako prve by si mal navstivit forum Zaciname s kyberiounntoto je automaticky vygenerovana sprava";
-require(SYSTEM_ROOT."/inc/phpmailer.inc");
+$hello="ahoj, tymto ta vitam v systeme kyberia.sk. do systemu ta zaregistrovala moja malickost. v pripade ze budes mat akykolvek problem, kontaktuj ma prosim cez postunnako prve by si mal navstivit forum Zaciname s kyberiou\n\ntoto je automaticky vygenerovana sprava";
+require(INCLUDE_DIR."phpmailer.inc");
 $mail = new PHPMailer();
 $mail->IsSMTP(); // send via SMTP
 $mail->Host = "onyx.hysteria.sk"; // SMTP servers
@@ -48,4 +48,4 @@ return false;
 }
 return true;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/remove_users.inc b/wwwroot/inc/eventz/remove_users.inc
index 9d5368b0a412e5f656259c1de4ad935102adbbc0..2798f805ef6421ffe5a4d0975543a28f5cb1976f 100644 (file)
--- a/wwwroot/inc/eventz/remove_users.inc
+++ b/wwwroot/inc/eventz/remove_users.inc
@@ -5,7 +5,7 @@ function remove_users() {
 $user_id=$_SESSION['user_id'];
 $user_name=$_SESSION['user_name'];
 
-require(SYSTEM_ROOT."/inc/phpmailer.inc");
+require(INCLUDE_DIR."phpmailer.inc");
 $mail = new PHPMailer();
 $mail->IsSMTP();                                   // send via SMTP
 $mail->Host     = "onyx.hysteria.sk"; // SMTP servers

diff --git a/wwwroot/inc/eventz/reset_password.inc b/wwwroot/inc/eventz/reset_password.inc
index 8c3554e561c53887216c1b3a42998e9bb533b76d..0f657e40639e3f782ba1fadfd0d3612927c33f5e 100644 (file)
--- a/wwwroot/inc/eventz/reset_password.inc
+++ b/wwwroot/inc/eventz/reset_password.inc
@@ -48,10 +48,10 @@ function reset_password() {
     $q="update users set password='$password' where user_id='$user_id'";
     $db->query($q);
 
-    require(SYSTEM_ROOT.'/inc/ldap.inc');
+    require(INCLUDE_DIR.'ldap.inc');
     LDAPuser::change_pass_forced($user_id,$password1);
 
     $error="Password changed. Now you can login with your new password.";
     return false;
 }
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/eventz/set_password.inc b/wwwroot/inc/eventz/set_password.inc
index 163f0ff60ccf17cb9e6a9fb537dcc07d4f37da12..c2edfe895b0e59a8b11efb8b16b8c9f5434bd2bc 100644 (file)
--- a/wwwroot/inc/eventz/set_password.inc
+++ b/wwwroot/inc/eventz/set_password.inc
@@ -27,7 +27,7 @@ function set_password() {
        }
 
        //changing in LDAP
-        require(SYSTEM_ROOT.'/inc/ldap.inc');
+        require(INCLUDE_DIR.'ldap.inc');
        LDAPuser::change_pass_forced($user_id,$new_password1);
 
        //changing in MySQL

diff --git a/wwwroot/inc/eventz/upload_data_file.inc b/wwwroot/inc/eventz/upload_data_file.inc
index 6a8f0b39882eb2da3ecc0eb979f38bb929f18f7d..2231b518814360419f8248e099a8fe71bb6fb286 100644 (file)
--- a/wwwroot/inc/eventz/upload_data_file.inc
+++ b/wwwroot/inc/eventz/upload_data_file.inc
@@ -10,7 +10,7 @@ return false;
 
                $node_id=$node['node_id'];
                $node_template=$_POST['node_template'];
-               require(SYSTEM_ROOT.'/inc/filez.inc');
+               require(INCLUDE_DIR.'filez.inc');
                $suffix = array_pop(explode('.', basename($_FILES['data_file']['name'])));
                if (!is_dir(FILE_DIR.$_SESSION['user_id'])) {
                                 mkdir(FILE_DIR.$_SESSION['user_id']);
@@ -67,4 +67,4 @@ die();
 
                }
 
-?>
\ No newline at end of file
+?>

diff --git a/wwwroot/inc/nodes.inc b/wwwroot/inc/nodes.inc
index 93905746e8b72f192b75c78eab953ed19b18ceb3..10369d9f0008b9a8e8daa3b8c3bf283876f6d0c4 100644 (file)
--- a/wwwroot/inc/nodes.inc
+++ b/wwwroot/inc/nodes.inc
@@ -117,7 +117,7 @@ node_vector='".$params['node_vector']."'";
 
 function processContent($node_content) {
         global $node;
-        include_once(SYSTEM_ROOT.'/inc/htmlparse.inc');
+        include_once(INCLUDE_DIR.'htmlparse.inc');
 
         if ($node['template_id']==$node['node_id'] && $_POST['event']=='configure_content') {
 

diff --git a/wwwroot/inc/phpmailer.inc b/wwwroot/inc/phpmailer.inc
index 144c78089da845ea7f5ad34268b16020fd8b357a..d67563e8908f8ec02c2716891ac62942b445d5ba 100644 (file)
--- a/wwwroot/inc/phpmailer.inc
+++ b/wwwroot/inc/phpmailer.inc
@@ -119,7 +119,7 @@ class PHPMailer
      * is in a different directory than the PHP include path.
      * @var string
      */
-    var $PluginDir         = "/storage/system/www-docroot/kyberia.sk/inc/phpmailer/";
+    var $PluginDir         = "/srv/kyberia/wwwroot/inc/phpmailer/"; //XXX FIX
 
     /**
      *  Holds PHPMailer version.

diff --git a/wwwroot/inc/smarty/node_methodz/modifier.preview.php b/wwwroot/inc/smarty/node_methodz/modifier.preview.php
index 0ab2c373d809371e473e9f6fc0b41a02aff410a2..719314b1656b47f4cd1bef30259e4af075eefd40 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/modifier.preview.php
+++ b/wwwroot/inc/smarty/node_methodz/modifier.preview.php
@@ -13,7 +13,7 @@ function smarty_modifier_preview($node_content)
                         $node_content=htmlspecialchars($node_content);
                 }
 
-                require(SYSTEM_ROOT.'/inc/htmlparse.inc');
+                require(INCLUDE_DIR.'htmlparse.inc');
                global $htmlparse;
                 htmlparse::htmlparse($node_content);
 

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index 6429521d8bb398acee450d3c081c438b3f86039d..d220c4c5295c810731004e294f410f5a9e22d400 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -118,7 +118,7 @@ function _checkPermissions()
 {
        global $permissions, $node;
 
-       require(SYSTEM_ROOT.'inc/permissions.inc');
+       require(INCLUDE_DIR.'permissions.inc');
        $permissions=permissions::checkPermissions($node);
        $permissions['h']=permissions::isHierarch($node);
 }
@@ -256,11 +256,11 @@ if (($permissions['r']) || ($event != 'register')) {
 
 //performing node_events (based on update/insert/delete db queries)
 if ($event) {
-       require(SYSTEM_ROOT.'inc/eventz.inc');
+       require(INCLUDE_DIR.'eventz.inc');
 }
 
 elseif ($transaction) {
-       require(SYSTEM_ROOT.'inc/transaction.inc');
+       require(INCLUDE_DIR.'transaction.inc');
 }
 //end of performing node events