4 files changed, 39 insertions, 71 deletions
diff --git a/admin/admin_quota_inc.php b/admin/admin_quota_inc.php
index f4c1733..22a3d87 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_CLASS_PATH.'LibertyQuota.php' );
+use Bitweaver\Quota\LibertyQuota;
 
 if( !empty( $_REQUEST['cancelquota'] ) ) {
 	unset( $_REQUEST['quota_id'] );
@@ -24,7 +24,7 @@ if( !empty( $_REQUEST['savequota'] ) ) {
 		die;
 	} else {
 		$saveError = TRUE;
-		$gBitSmarty->assignByRef( 'errors', $gQuota->mErrors );
+		$gBitSmarty->assign( 'errors', $gQuota->mErrors );
 	}
 } elseif( !empty( $_REQUEST['assignquota'] ) ) {
 	foreach( array_keys( $_REQUEST ) as $key ) {
@@ -37,16 +37,14 @@ if( !empty( $_REQUEST['savequota'] ) ) {
 }
 $gQuota->load();
 if( $gQuota->isValid() || isset( $_REQUEST['newquota'] ) || !empty( $saveError ) ) {
-	$gBitSmarty->assignByRef('gQuota', $gQuota);
+	$gBitSmarty->assign('gQuota', $gQuota);
 } else {
 	$quotas = $gQuota->getList();
 	$systemGroups = $gQuota->getQuotaGroups();
-	$gBitSmarty->assignByRef('systemGroups', $systemGroups );
+	$gBitSmarty->assign('systemGroups', $systemGroups );
 foreach( array_keys( $systemGroups ) as $groupId ) {
 	$groupQuota[$groupId] = $gQuota->getQuotaMenu( 'quota_group_'.$groupId, $systemGroups[$groupId]['quota_id'] );
 }
-	$gBitSmarty->assignByRef('groupQuota', $groupQuota );
-	$gBitSmarty->assignByRef('quotaList', $quotas);
+	$gBitSmarty->assign('groupQuota', $groupQuota );
+	$gBitSmarty->assign('quotaList', $quotas);
 }
-
-?>
diff --git a/admin/pump_quota_inc.php b/admin/pump_quota_inc.php
index 893a4dc..d76e1d3 100644
--- a/admin/pump_quota_inc.php
+++ b/admin/pump_quota_inc.php
@@ -8,7 +8,8 @@
 /**
  * required setup
  */
-require_once( QUOTA_PKG_CLASS_PATH.'LibertyQuota.php' );
+use Bitweaver\Quota\LibertyQuota;
+
 
 $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/admin/schema_inc.php b/admin/schema_inc.php
index 25ca7f1..9051837 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -1,13 +1,13 @@
 <?php
 
-$tables = array(
+$tables = [
 
-'users_quota_units' => "
+	'users_quota_units' => "
 	user_id I4 PRIMARY,
 	units I4 NOTNULL
 ",
 
-'quotas' => "
+	'quotas'            => "
 	quota_id I4 PRIMARY,
 	disk_usage I8,
 	monthly_transfer I8,
@@ -15,14 +15,14 @@ $tables = array(
 	description X
 ",
 
-'quotas_group_map' => "
+	'quotas_group_map'  => "
 	quota_id I4 PRIMARY,
 	group_id I4 PRIMARY
-	CONSTRAINT ', CONSTRAINT `quotas_group_ref` FOREIGN KEY (`group_id`) REFERENCES `".BIT_DB_PREFIX."users_groups`( `group_id` )
-				, CONSTRAINT `quotas_map_ref` FOREIGN KEY (`quota_id`) REFERENCES `".BIT_DB_PREFIX."quotas`( `quota_id` )'
+	CONSTRAINT ', CONSTRAINT `quotas_group_ref` FOREIGN KEY (`group_id`) REFERENCES `" . BIT_DB_PREFIX . "users_groups`( `group_id` )
+				, CONSTRAINT `quotas_map_ref` FOREIGN KEY (`quota_id`) REFERENCES `" . BIT_DB_PREFIX . "quotas`( `quota_id` )'
 ",
 
-);
+];
 
 global $gBitInstaller;
 
@@ -30,38 +30,37 @@ foreach( array_keys( $tables ) AS $tableName ) {
 	$gBitInstaller->registerSchemaTable( QUOTA_PKG_NAME, $tableName, $tables[$tableName] );
 }
 
-$gBitInstaller->registerPackageInfo( QUOTA_PKG_NAME, array(
+$gBitInstaller->registerPackageInfo( QUOTA_PKG_NAME, [
 	'description' => "Quota system limits user disk and bandwidth usage for Liberty content",
-	'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
-) );
+	'license'     => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
+] );
 
 // ### Indexes
-$indices = array (
-	'quotas_group_idx' => array( 'table' => 'quotas_group_map', 'cols' => 'group_id', 'opts' => array( 'UNIQUE' ) ),
-);
+$indices = [
+	'quotas_group_idx' => [ 'table' => 'quotas_group_map', 'cols' => 'group_id', 'opts' => [ 'UNIQUE' ] ],
+];
 $gBitInstaller->registerSchemaIndexes( QUOTA_PKG_NAME, $indices );
 
 // ### Sequences
-$sequences = array (
-	'quota_id_seq' => array( 'start' => 3 )
-);
+$sequences = [
+	'quota_id_seq' => [ 'start' => 3 ],
+];
 $gBitInstaller->registerSchemaSequences( QUOTA_PKG_NAME, $sequences );
 
-$gBitInstaller->registerUserPermissions( QUOTA_PKG_NAME, array(
-	array('p_quota_create', 'Can create a quota', 'registered', QUOTA_PKG_NAME),
-	array('p_quota_edit', 'Can edit any quota', 'editors', QUOTA_PKG_NAME),
-	array('p_quota_admin', 'Can admin quota', 'editors', QUOTA_PKG_NAME),
-	array('p_quota_read', 'Can read quota', 'basic', QUOTA_PKG_NAME),
-	array('p_quota_unlimited', 'Can upload unlimited amount of data', 'editors', QUOTA_PKG_NAME),
-) );
+$gBitInstaller->registerUserPermissions( QUOTA_PKG_NAME, [
+	[ 'p_quota_create', 'Can create a quota', 'registered', QUOTA_PKG_NAME ],
+	[ 'p_quota_edit', 'Can edit any quota', 'editors', QUOTA_PKG_NAME ],
+	[ 'p_quota_admin', 'Can admin quota', 'editors', QUOTA_PKG_NAME ],
+	[ 'p_quota_read', 'Can read quota', 'basic', QUOTA_PKG_NAME ],
+	[ 'p_quota_unlimited', 'Can upload unlimited amount of data', 'editors', QUOTA_PKG_NAME ],
+] );
 
-$gBitInstaller->registerPreferences( QUOTA_PKG_NAME, array(
-	array(QUOTA_PKG_NAME, 'quota_default_ordering','title_desc'),
-	array(QUOTA_PKG_NAME, 'quota_list_content_id','y'),
-	array(QUOTA_PKG_NAME, 'quota_list_title','y'),
-	array(QUOTA_PKG_NAME, 'quota_list_description','y'),
-) );
+$gBitInstaller->registerPreferences( QUOTA_PKG_NAME, [
+	[ QUOTA_PKG_NAME, 'quota_default_ordering', 'title_desc' ],
+	[ QUOTA_PKG_NAME, 'quota_list_content_id', 'y' ],
+	[ QUOTA_PKG_NAME, 'quota_list_title', 'y' ],
+	[ QUOTA_PKG_NAME, 'quota_list_description', 'y' ],
+] );
 
-//$gBitInstaller->registerSchemaDefault( QUOTA_PKG_NAME, array(
-//) );
-?>
+//$gBitInstaller->registerSchemaDefault( QUOTA_PKG_NAME, [
+//] );
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
deleted file mode 100644
index 87a6ba2..0000000
--- a/admin/upgrade_inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-global $gBitSystem, $gUpgradeFrom, $gUpgradeTo;
-
-$upgrades = array(
-
-	'BWR1' => array(
-		'BWR2' => array(
-// de-tikify tables
-array( 'DATADICT' => array(
-	array( 'RENAMETABLE' => array(
-		'tiki_quotas' => 'quotas',
-		'tiki_quotas_group_map' => 'quotas_group_map',
-	)),
-)),
-
-// query: create a quota_id_seq and bring the table up to date with the current max quota_id used in the quotas table - this basically for mysql
-array( 'PHP' => '
-	$query = $gBitDb->getOne("SELECT MAX(quota_id) FROM `'.BIT_DB_PREFIX.'quotas`");
-	$tempId = $gBitDb->mDb->GenID("`'.BIT_DB_PREFIX.'quota_id_seq`", $query);
-' ),
-		)
-	),
-
-);
-
-if( isset( $upgrades[$gUpgradeFrom][$gUpgradeTo] ) ) {
-	$gBitSystem->registerUpgrade( QUOTA_PKG_NAME, $upgrades[$gUpgradeFrom][$gUpgradeTo] );
-}
-?>