move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

4 files changed, 10 insertions, 10 deletions

diff --git a/includes/PHPAsync.php b/includes/PHPAsync.php
index 50e01be..92c1e07 100644
--- a/includes/PHPAsync.php
+++ b/includes/PHPAsync.php
@@ -22,7 +22,7 @@
 /**
  * Setup
  */
-require_once( UTIL_PKG_INC.'phpcontrib_lib.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'phpcontrib_lib.php' );
 
 // written for bitweaver environment, but you can override 
 if( !defined( 'PHPASYNC_TEMP_DIR' ) ){
diff --git a/includes/bitexcel/BitExcel.php b/includes/bitexcel/BitExcel.php
index 8bc30f2..6426793 100644
--- a/includes/bitexcel/BitExcel.php
+++ b/includes/bitexcel/BitExcel.php
@@ -24,7 +24,7 @@ if( !$php_excel_loaded ){
 	require_once( EXTERNALS_PKG_PATH.'phpexcel/Classes/PHPExcel/Writer/Excel2007.php');
 }
 
-require_once( UTIL_PKG_INC.'phpcontrib_lib.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'phpcontrib_lib.php' );
 
 require_once( LIBERTY_PKG_PATH . 'LibertyValidator.php' );
 
diff --git a/includes/bitexcel/BitExcelAsync.php b/includes/bitexcel/BitExcelAsync.php
index 47a5711..afffe16 100644
--- a/includes/bitexcel/BitExcelAsync.php
+++ b/includes/bitexcel/BitExcelAsync.php
@@ -12,9 +12,9 @@
 /**
  * required setup
  */
-require_once( UTIL_PKG_INC.'PHPAsync.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'PHPAsync.php' );
 
-require_once( UTIL_PKG_INC.'bitexcel/BitExcel.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'bitexcel/BitExcel.php' );
 
 /**
  * @package bitexcel
diff --git a/includes/mailman_lib.php b/includes/mailman_lib.php
index b642101..81d7e99 100644
--- a/includes/mailman_lib.php
+++ b/includes/mailman_lib.php
@@ -53,7 +53,7 @@ function mailman_list_members( $pListName ) {
 
 // pParamHash follows naming convention off config_list --help usage instructions
 function mailman_config_list( $pParamHash ){
-	$options = ' -i '.escapeshellarg(UTIL_PKG_INC.'mailman.cfg');
+	$options = ' -i '.escapeshellarg(UTIL_PKG_INCLUDE_PATH.'mailman.cfg');
 	$options .= ' '.escapeshellarg( $pParamHash['listname'] );
 	if( $ret = mailman_command( 'config_list', $output, $options) ) {
 		return (tra('Unable to configure list: ').$pParamHash['listname'].":".$ret);
@@ -76,7 +76,7 @@ function mailman_newlist( $pParamHash ) {
 			return (tra('Unable to create list: ').$pParamHash['listname'].":".$ret);
 		}
 
-		$options = ' -i '.escapeshellarg(UTIL_PKG_INC.'mailman.cfg');
+		$options = ' -i '.escapeshellarg(UTIL_PKG_INCLUDE_PATH.'mailman.cfg');
 		$options .= ' '.escapeshellarg( $pParamHash['listname'] );
 		if( $ret = mailman_command( 'config_list', $output, $options) ) {
 			// @TODO if this fails we should roll back the newlist created
@@ -147,7 +147,7 @@ function mailman_setmoderated( $pListName, $pModerated = TRUE ) {
 	$ret = FALSE;
 	if( $fullCommand = mailman_get_command( 'withlist' ) ) {
 		$cmd = $fullCommand." -q -l -r mailman_lib.setDefaultModerationFlag ".escapeshellarg( $pListName )." ".( $pModerated ? 1 : 0 );
-		$cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INC." $cmd\""; 
+		$cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INCLUDE_PATH." $cmd\""; 
 		exec( $cmd, $ret );
 	} else {
 		bit_error_log( 'Groups mailman command failed (withlist) File not found: '.$fullCommand );
@@ -159,7 +159,7 @@ function mailman_setmoderator( $pListName, $pEmail ) {
 	$ret = '';
 	if( $fullCommand = mailman_get_command( 'withlist' ) ) {
 		$cmd = $fullCommand." -q -l -r mailman_lib.setMemberModeratedFlag ".escapeshellarg( $pListName )." ".escapeshellarg( $pEmail );
-		$cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INC." $cmd\"";
+		$cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INCLUDE_PATH." $cmd\"";
 		exec( $cmd, $ret );
 	} else {
 		bit_error_log( 'Groups mailman command failed (withlist) File not found: '.$fullCommand );
@@ -206,7 +206,7 @@ function mailman_findmember( $pListName, $pEmail ) {
 function mailman_setsubscriptiontype( $pListName, $pEmail, $pType ) {
 	if( $fullCommand = mailman_get_command( 'withlist' ) ) {
         $cmd = $fullCommand." -q -l -r mailman_lib.setSubscriptionType ".escapeshellarg( $pListName )." ".escapeshellarg( $pEmail )." ".( $pType == 'digest' ? 1 : 0 );
-        $cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INC." $cmd\"";
+        $cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INCLUDE_PATH." $cmd\"";
         exec( $cmd, $ret );
 	}else{
 		bit_error_log( 'Groups mailman command failed (withlist) File not found: '.$fullCommand );
@@ -218,7 +218,7 @@ function mailman_getsubscriptiontype( $pListName, $pEmail ){
 	// even though setSubscriptionType returns a string or false  we return an array because thats what exec returns
 	if( $fullCommand = mailman_get_command( 'withlist' ) ) {
         $cmd = $fullCommand." -l -r mailman_lib.getSubscriptionType ".escapeshellarg( $pListName )." ".escapeshellarg( $pEmail );
-        $cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INC." $cmd\"";
+        $cmd = "/bin/sh -c \"PYTHONPATH=".UTIL_PKG_INCLUDE_PATH." $cmd\"";
         exec( $cmd, $ret );
 	}else{
 		bit_error_log( 'Groups mailman command failed (withlist) File not found: '.$fullCommand );