From cf60e573156057b257c8af54fced371aa85cc795 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Tue, 2 Feb 2021 01:17:24 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

---
 LibertyQuota.php          | 2 +-
 admin/admin_quota_inc.php | 2 +-
 admin/pump_quota_inc.php  | 2 +-
 calculate_quota_inc.php   | 2 +-
 index.php                 | 2 +-
 quota_inc.php             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LibertyQuota.php b/LibertyQuota.php
index 63840eb..549e62f 100644
--- a/LibertyQuota.php
+++ b/LibertyQuota.php
@@ -15,7 +15,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyAttachable.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyAttachable.php' );
 
 /**
  * Quota class to illustrate best practices when creating a new bitweaver package that
diff --git a/admin/admin_quota_inc.php b/admin/admin_quota_inc.php
index b6909ea..f4c1733 100644
--- a/admin/admin_quota_inc.php
+++ b/admin/admin_quota_inc.php
@@ -10,7 +10,7 @@
 //	$gBitSmarty->assign( 'home_quota', $_REQUEST["homeSample"] );
 //}
 
-require_once( QUOTA_PKG_PATH.'LibertyQuota.php' );
+require_once( QUOTA_PKG_CLASS_PATH.'LibertyQuota.php' );
 
 if( !empty( $_REQUEST['cancelquota'] ) ) {
 	unset( $_REQUEST['quota_id'] );
diff --git a/admin/pump_quota_inc.php b/admin/pump_quota_inc.php
index 0d348f2..893a4dc 100644
--- a/admin/pump_quota_inc.php
+++ b/admin/pump_quota_inc.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-require_once( QUOTA_PKG_PATH.'LibertyQuota.php' );
+require_once( QUOTA_PKG_CLASS_PATH.'LibertyQuota.php' );
 
 $quota = new LibertyQuota();
 $quota->mDb->Execute("INSERT INTO `".BIT_DB_PREFIX."quotas` ( `quota_id`, `disk_usage`, `monthly_transfer`, `title`, `description` ) VALUES ('1', 2000000, 20000000, 'Free Trial', 'A little space to try out site features' )");
diff --git a/calculate_quota_inc.php b/calculate_quota_inc.php
index 463455a..65db3ec 100644
--- a/calculate_quota_inc.php
+++ b/calculate_quota_inc.php
@@ -9,7 +9,7 @@
 /**
  * quota setup
  */
-require_once( QUOTA_PKG_PATH.'LibertyQuota.php' );
+require_once( QUOTA_PKG_CLASS_PATH.'LibertyQuota.php' );
 
 $quota = new LibertyQuota();
 if( !$gBitUser->isAdmin() && !$quota->isUserUnderQuota( $gBitUser->mUserId ) ) {
diff --git a/index.php b/index.php
index b719e62..b615853 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'quota' );
 
-require_once( QUOTA_PKG_PATH.'quota_inc.php' );
+require_once( QUOTA_PKG_INCLUDE_PATH.'quota_inc.php' );
 
 $gBitSystem->display( 'bitpackage:quota/quota.tpl', 'View Quota' , array( 'display_mode' => 'display' ));
 ?>
diff --git a/quota_inc.php b/quota_inc.php
index f43f2bc..b4e3225 100644
--- a/quota_inc.php
+++ b/quota_inc.php
@@ -9,7 +9,7 @@
 /**
  * quota setup
  */
-require_once( QUOTA_PKG_PATH.'LibertyQuota.php' );
+require_once( QUOTA_PKG_CLASS_PATH.'LibertyQuota.php' );
 global $gBitSmarty, $assignUser, $gBitUser;
 
 if( empty( $pQuotaUserId ) ) {
-- 
cgit v1.3