From e909f81b8c7e4413f5788b36d8fbf2409ac11f46 Mon Sep 17 00:00:00 2001 From: niekt0 Date: Sat, 23 Oct 2010 11:24:16 +0200 Subject: [PATCH] path fixing (SYSTEM_ROOT.'inc/a' -> INCLUDE_DIR.'a') --- wwwroot/ajax/ajaxik.php | 6 +++--- wwwroot/ajax/get_children.php | 2 +- wwwroot/ajax/get_id_by_name.php | 4 ++-- wwwroot/ajax/get_moods.php | 4 ++-- wwwroot/ajax/get_username_by_id.php | 2 +- wwwroot/ajax/testing.php | 4 ++-- wwwroot/inc/eventz.inc | 6 +++--- wwwroot/inc/eventz/add.inc | 2 +- wwwroot/inc/eventz/add_test.inc | 2 +- wwwroot/inc/eventz/configure.inc | 4 ++-- wwwroot/inc/eventz/login.inc | 4 ++-- wwwroot/inc/eventz/login2.inc | 6 +++--- wwwroot/inc/eventz/login_lockout_test.inc | 6 +++--- wwwroot/inc/eventz/login_test.inc | 6 +++--- wwwroot/inc/eventz/register_users.inc | 6 +++--- wwwroot/inc/eventz/remove_users.inc | 2 +- wwwroot/inc/eventz/reset_password.inc | 4 ++-- wwwroot/inc/eventz/set_password.inc | 2 +- wwwroot/inc/eventz/upload_data_file.inc | 4 ++-- wwwroot/inc/nodes.inc | 2 +- wwwroot/inc/phpmailer.inc | 2 +- wwwroot/inc/smarty/node_methodz/modifier.preview.php | 2 +- wwwroot/nodes.php | 6 +++--- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/wwwroot/ajax/ajaxik.php b/wwwroot/ajax/ajaxik.php index 31a15e6..e1eaca7 100644 --- 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 672e794..86b6926 100644 --- a/wwwroot/ajax/get_children.php +++ b/wwwroot/ajax/get_children.php @@ -1,7 +1,7 @@ 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 43b3c43..03342fa 100644 --- 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']."
"; 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 eace3f5..b31ea48 100644 --- a/wwwroot/ajax/get_username_by_id.php +++ b/wwwroot/ajax/get_username_by_id.php @@ -1,7 +1,7 @@ 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')."
"; } -?> \ No newline at end of file +?> diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc index 1e03596..b2d6d3f 100644 --- a/wwwroot/inc/eventz.inc +++ b/wwwroot/inc/eventz.inc @@ -1,11 +1,11 @@ \ No newline at end of file +?> diff --git a/wwwroot/inc/eventz/login.inc b/wwwroot/inc/eventz/login.inc index c19f4e7..f293e1d 100644 --- a/wwwroot/inc/eventz/login.inc +++ b/wwwroot/inc/eventz/login.inc @@ -3,7 +3,7 @@ function login() { // lockout capatibility // with ldap sync //

This is da default one

- 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 93b7803..d00fc6e 100644 --- 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 7b5ce15..c007307 100644 --- 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 468eed8..cfd2062 100644 --- 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 1346017..481c616 100644 --- 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 9d5368b..2798f80 100644 --- 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 8c3554e..0f657e4 100644 --- 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 163f0ff..c2edfe8 100644 --- 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 6a8f0b3..2231b51 100644 --- 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 9390574..10369d9 100644 --- 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 144c780..d67563e 100644 --- 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 0ab2c37..719314b 100644 --- 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 6429521..d220c4c 100644 --- 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 -- 2.30.2