Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > bbb00bce1f7e67144528e33a9ef998d4 > files > 2

openvcp-web-0.3-0.rc2.1mdv2009.0.src.rpm

diff -Naur openvcp-web-0.3-rc2/core/OpenVCP.php openvcp-web-0.3-rc2.oden/core/OpenVCP.php
--- openvcp-web-0.3-rc2/core/OpenVCP.php	2008-09-06 19:03:51.000000000 +0200
+++ openvcp-web-0.3-rc2.oden/core/OpenVCP.php	2008-09-06 19:00:16.000000000 +0200
@@ -26,14 +26,13 @@
 define('OPENVCP_ROOT_DIR'	, realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'));
 define('OPENVCP_CORE_DIR'	, OPENVCP_ROOT_DIR . DIRECTORY_SEPARATOR . 'core');
 define('OPENVCP_MODS_DIR'	, OPENVCP_ROOT_DIR . DIRECTORY_SEPARATOR . 'mods');
-define('OPENVCP_PEAR_DIR'	, OPENVCP_CORE_DIR . DIRECTORY_SEPARATOR . 'pear');
-define('OPENVCP_CACHE_DIR'	, OPENVCP_CORE_DIR . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR);
+define('OPENVCP_CACHE_DIR'	, '/var/cache/openvcp' . DIRECTORY_SEPARATOR);
 
 ### DEFINES (Core)
 define('OPENVCP_CORE_PREFIX', 'OpenVCP_');
 
 ### DEFINES (Config)
-define('OPENVCP_CORE_CONFIG', OPENVCP_CORE_DIR . DIRECTORY_SEPARATOR . 'openvcp.conf');
+define('OPENVCP_CORE_CONFIG', '/etc/openvcp/openvcp.conf');
 
 ### DEFINES (Debug)
 define('OPENVCP_E_QUIET'  , 0);
@@ -41,11 +40,11 @@
 define('OPENVCP_E_ERROR'  , 2);
 
 ### SET INCLUDE DIRS
-ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . OPENVCP_PEAR_DIR . PATH_SEPARATOR . OPENVCP_CORE_DIR);
+ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . OPENVCP_CORE_DIR);
 
 ### IMPORTANT INCLUDES
-require_once('pear/Config.php');
-require_once('pear/Cache/Lite.php');
+require_once('Config.php');
+require_once('Cache/Lite.php');
 
 /**
  * OpenVCP Core Class
diff -Naur openvcp-web-0.3-rc2/mods/super/nodes/node.php openvcp-web-0.3-rc2.oden/mods/super/nodes/node.php
--- openvcp-web-0.3-rc2/mods/super/nodes/node.php	2007-09-04 21:08:06.000000000 +0200
+++ openvcp-web-0.3-rc2.oden/mods/super/nodes/node.php	2008-09-06 19:03:16.000000000 +0200
@@ -33,8 +33,8 @@
 $LOG->setUserId($USERINFO['id']);
 $LOG->setLevel('admin');
 
-require_once('Networking/Net_IPv4/IPv4.php');
-require_once('Networking/Net_IPv6/IPv6.php');
+require_once('Net/IPv4.php');
+require_once('Net/IPv6.php');
 require_once('Node.class.php');
 require_once('Admin.class.php');
 require_once('Vserver.class.php');