diff -uNr lms_OLD/lib/LMS.class.php lms/lib/LMS.class.php
--- lms_OLD/lib/LMS.class.php 2009-08-07 20:51:16.000000000 +0200
+++ lms/lib/LMS.class.php 2009-08-11 11:15:52.000000000 +0200
@@ -2154,8 +2154,8 @@
taxid, prodid, uprate, downrate, upceil, downceil, climit,
plimit, dlimit, type, sh_limit, www_limit, mail_limit, sql_limit,
ftp_limit, quota_sh_limit, quota_www_limit, quota_mail_limit,
- quota_sql_limit, quota_ftp_limit, domain_limit, alias_limit)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+ quota_sql_limit, quota_ftp_limit, domain_limit, alias_limit, burst_limit, burst_time, burst_threshold)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
array(
$tariff['name'],
$tariff['description'],
@@ -2182,6 +2182,9 @@
$tariff['quota_ftp_limit'],
$tariff['domain_limit'],
$tariff['alias_limit'],
+ $tariff['burst_limit'],
+ $tariff['burst_time'],
+ $tariff['burst_threshold'],
));
if ($result)
return $this->DB->GetLastInsertID('tariffs');
@@ -2196,7 +2199,7 @@
climit=?, plimit=?, dlimit=?, sh_limit=?, www_limit=?, mail_limit=?,
sql_limit=?, ftp_limit=?, quota_sh_limit=?, quota_www_limit=?,
quota_mail_limit=?, quota_sql_limit=?, quota_ftp_limit=?,
- domain_limit=?, alias_limit=?, type=? WHERE id=?',
+ domain_limit=?, alias_limit=?, type=?, burst_limit=?, burst_time=?, burst_threshold=? WHERE id=?',
array($tariff['name'],
$tariff['description'],
$tariff['value'],
@@ -2222,6 +2225,9 @@
$tariff['domain_limit'],
$tariff['alias_limit'],
$tariff['type'],
+ $tariff['burst_limit'],
+ $tariff['burst_time'],
+ $tariff['burst_threshold'],
$tariff['id']
));
}
@@ -2301,7 +2307,7 @@
function GetTariffs()
{
return $this->DB->GetAll('SELECT t.id, t.name, t.value, uprate, taxid, prodid,
- downrate, upceil, downceil, climit, plimit, taxes.value AS taxvalue,
+ downrate, upceil, downceil, climit, plimit, burst_limit, burst_time, burst_threshold, taxes.value AS taxvalue,
taxes.label AS tax
FROM tariffs t
LEFT JOIN taxes ON t.taxid = taxes.id
diff -uNr lms_OLD/lib/upgradedb/mysql.2009081100.php lms/lib/upgradedb/mysql.2009081100.php
--- lms_OLD/lib/upgradedb/mysql.2009081100.php 1970-01-01 01:00:00.000000000 +0100
+++ lms/lib/upgradedb/mysql.2009081100.php 2009-08-11 11:04:29.000000000 +0200
@@ -0,0 +1,35 @@
+Execute("
+ALTER TABLE `tariffs` ADD `burst_limit` INT( 11 ) NOT NULL DEFAULT '0',
+ADD `burst_time` INT( 11 ) NOT NULL DEFAULT '0',
+ADD `burst_threshold` INT( 11 ) NOT NULL DEFAULT '0'
+");
+
+$DB->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2009081100', 'dbversion'));
+
+?>
diff -uNr lms_OLD/lib/upgradedb/postgres.2009081100.php lms/lib/upgradedb/postgres.2009081100.php
--- lms_OLD/lib/upgradedb/postgres.2009081100.php 1970-01-01 01:00:00.000000000 +0100
+++ lms/lib/upgradedb/postgres.2009081100.php 2009-08-11 11:05:51.000000000 +0200
@@ -0,0 +1,39 @@
+BeginTrans();
+
+$DB->Execute("
+ALTER TABLE tariffs ADD burst_limit INT( 11 ) NOT NULL DEFAULT 0;
+ALTER TABLE tariffs ADD burst_time INT( 11 ) NOT NULL DEFAULT 0;
+ALTER TABLE tariffs ADD burst_threshold INT( 11 ) NOT NULL DEFAULT 0;
+");
+
+$DB->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2009081100', 'dbversion'));
+
+$DB->CommitTrans();
+
+?>
diff -uNr lms_OLD/lib/upgradedb.php lms/lib/upgradedb.php
--- lms_OLD/lib/upgradedb.php 2009-06-30 10:51:22.000000000 +0200
+++ lms/lib/upgradedb.php 2009-08-11 11:16:49.000000000 +0200
@@ -24,7 +24,7 @@
* $Id: upgradedb.php,v 1.157 2009/06/29 16:42:10 alec Exp $
*/
-define('DBVERSION', '2009060200'); // here should be always the newest version of database!
+define('DBVERSION', '2009081100'); // here should be always the newest version of database!
// it placed here to avoid read disk every time when we call this file.
/*
diff -uNr lms_OLD/modules/tariffadd.php lms/modules/tariffadd.php
--- lms_OLD/modules/tariffadd.php 2009-06-18 13:35:17.000000000 +0200
+++ lms/modules/tariffadd.php 2009-08-11 11:07:04.000000000 +0200
@@ -73,7 +73,7 @@
$items = array('domain_limit', 'alias_limit',
'sh_limit', 'mail_limit', 'www_limit', 'ftp_limit', 'sql_limit',
'quota_sh_limit', 'quota_mail_limit', 'quota_www_limit',
- 'quota_ftp_limit', 'quota_sql_limit',
+ 'quota_ftp_limit', 'quota_sql_limit', 'burst_limit', 'burst_time', 'burst_threshold',
);
foreach($items as $item)
diff -uNr lms_OLD/modules/tariffedit.php lms/modules/tariffedit.php
--- lms_OLD/modules/tariffedit.php 2009-06-18 13:35:17.000000000 +0200
+++ lms/modules/tariffedit.php 2009-08-11 11:07:59.000000000 +0200
@@ -77,7 +77,7 @@
$items = array('domain_limit', 'alias_limit',
'sh_limit', 'mail_limit', 'www_limit', 'ftp_limit', 'sql_limit',
'quota_sh_limit', 'quota_mail_limit', 'quota_www_limit',
- 'quota_ftp_limit', 'quota_sql_limit',
+ 'quota_ftp_limit', 'quota_sql_limit', 'burst_limit', 'burst_time', 'burst_threshold'
);
foreach($items as $item)
diff -uNr lms_OLD/templates/tariffadd.html lms/templates/tariffadd.html
--- lms_OLD/templates/tariffadd.html 2008-03-06 09:05:17.000000000 +0100
+++ lms/templates/tariffadd.html 2009-08-11 11:10:31.000000000 +0200
@@ -156,6 +156,30 @@
+
+ |
+ |
+ {t}Burst limit:{/t} |
+
+
+ |
+
+
+ |
+ |
+ {t}Burst time:{/t} |
+
+
+ |
+
+
+ |
+ |
+ {t}Burst threshold:{/t} |
+
+
+ |
+
diff -uNr lms_OLD/templates/tariffedit.html lms/templates/tariffedit.html
--- lms_OLD/templates/tariffedit.html 2008-03-06 09:05:17.000000000 +0100
+++ lms/templates/tariffedit.html 2009-08-11 11:11:10.000000000 +0200
@@ -159,6 +159,30 @@
+
+ |
+ |
+ {t}Burst limit:{/t} |
+
+
+ |
+
+
+ |
+ |
+ {t}Burst time:{/t} |
+
+
+ |
+
+
+ |
+ |
+ {t}Burst threshold:{/t} |
+
+
+ |
+
diff -uNr lms_OLD/templates/tariffinfo.html lms/templates/tariffinfo.html
--- lms_OLD/templates/tariffinfo.html 2008-06-19 15:44:36.000000000 +0200
+++ lms/templates/tariffinfo.html 2009-08-11 11:12:36.000000000 +0200
@@ -146,6 +146,30 @@
{if $tariff.dlimit}{$tariff.dlimit}{else}{t}no limits{/t}{/if}
+
+ |
+ |
+ {t}Burst limit:{/t} |
+
+ {if $tariff.burst_limit}{$tariff.burst_limit}{else}{t}no limits{/t}{/if}
+ |
+
+
+ |
+ |
+ {t}Burst time:{/t} |
+
+ {if $tariff.burst_time}{$tariff.burst_time}{else}{t}no limits{/t}{/if}
+ |
+
+
+ |
+ |
+ {t}Burst threshold:{/t} |
+
+ {if $tariff.burst_threshold}{$tariff.burst_threshold}{else}{t}no limits{/t}{/if}
+ |
+