Merge pull request #351 from mkoch227/use-build-numbers

Use build numbers instead of version numbers
merge-requests/2/head
Mike Koch 9 years ago
commit 941103d5b5

@ -10,61 +10,61 @@ if (!isset($_GET['v'])) {
$startingVersion = intval($_GET['v']); $startingVersion = intval($_GET['v']);
function echoInitialVersionRows($version) { function echoInitialVersionRows($version) {
if ($version < 1) { if ($version < 2) {
printRow('Pre-1.4.0'); printRow('Pre-1.4.0');
} }
if ($version < 140) { if ($version < 3) {
printRow('1.4.0'); printRow('1.4.0');
} }
if ($version < 141) { if ($version < 4) {
printRow('1.4.1'); printRow('1.4.1');
} }
if ($version < 150) { if ($version < 5) {
printRow('1.5.0'); printRow('1.5.0');
} }
if ($version < 160) { if ($version < 6) {
printRow('1.6.0'); printRow('1.6.0');
} }
if ($version < 161) { if ($version < 7) {
printRow('1.6.1'); printRow('1.6.1');
} }
if ($version < 170) { if ($version < 8) {
printRow('1.7.0'); printRow('1.7.0');
} }
if ($version < 200) { if ($version < 9) {
printRow('2.0.0'); printRow('2.0.0');
} }
if ($version < 201) { if ($version < 10) {
printRow('2.0.1'); printRow('2.0.1');
} }
if ($version < 210) { if ($version < 11) {
printRow('2.1.0'); printRow('2.1.0');
} }
if ($version < 211) { if ($version < 12) {
printRow('2.1.1'); printRow('2.1.1');
} }
if ($version < 220) { if ($version < 13) {
printRow('2.2.0'); printRow('2.2.0');
} }
if ($version < 221) { if ($version < 14) {
printRow('2.2.1'); printRow('2.2.1');
} }
if ($version < 230) { if ($version < 15) {
printRow('2.3.0'); printRow('2.3.0');
} }
if ($version < 231) { if ($version < 16) {
printRow('2.3.1'); printRow('2.3.1');
} }
if ($version < 232) { if ($version < 17) {
printRow('2.3.2'); printRow('2.3.2');
} }
if ($version < 240) { if ($version < 18) {
printRow('2.4.0'); printRow('2.4.0');
} }
if ($version < 241) { if ($version < 19) {
printRow('2.4.1'); printRow('2.4.1');
} }
if ($version < 242) { if ($version < 20) {
printRow('2.4.2'); printRow('2.4.2');
} }
} }
@ -115,7 +115,7 @@ function printRow($version) {
<?php echoInitialVersionRows($startingVersion); ?> <?php echoInitialVersionRows($startingVersion); ?>
</tbody> </tbody>
</table> </table>
<?php if ($startingVersion < 240) { ?> <?php if ($startingVersion < 18) { ?>
<table class="table table-striped" style="table-layout: fixed"> <table class="table table-striped" style="table-layout: fixed">
<thead> <thead>
<tr> <tr>
@ -124,7 +124,7 @@ function printRow($version) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if ($startingVersion < 200): ?> <?php if ($startingVersion < 9): ?>
<tr id="row-banmigrate"> <tr id="row-banmigrate">
<td>Migrate IP / Email Bans</td> <td>Migrate IP / Email Bans</td>
<td><i id="spinner-banmigrate" class="fa fa-spinner"></i> <span id="span-banmigrate">Waiting...</span></td> <td><i id="spinner-banmigrate" class="fa fa-spinner"></i> <span id="span-banmigrate">Waiting...</span></td>

@ -1,61 +1,61 @@
function processUpdates(startingVersion) { function processUpdates(startingVersion) {
if (startingVersion < 1) { if (startingVersion < 2) {
startVersionUpgrade('p140'); startVersionUpgrade('p140');
executeUpdate(1, 'p140', 'Pre 1.4.0'); executeUpdate(2, '2', 'Pre 1.4.0');
} else if (startingVersion < 140) { } else if (startingVersion < 3) {
startVersionUpgrade('140'); startVersionUpgrade('140');
executeUpdate(140, '140', '1.4.0'); executeUpdate(3, '3', '1.4.0');
} else if (startingVersion < 141) { } else if (startingVersion < 4) {
startVersionUpgrade('141'); startVersionUpgrade('141');
executeUpdate(141, '141', '1.4.1'); executeUpdate(4, '4', '1.4.1');
} else if (startingVersion < 150) { } else if (startingVersion < 5) {
startVersionUpgrade('150'); startVersionUpgrade('150');
executeUpdate(150, '150', '1.5.0'); executeUpdate(5, '5', '1.5.0');
} else if (startingVersion < 160) { } else if (startingVersion < 6) {
startVersionUpgrade('160'); startVersionUpgrade('160');
executeUpdate(160, '160', '1.6.0'); executeUpdate(6, '6', '1.6.0');
} else if (startingVersion < 161) { } else if (startingVersion < 7) {
startVersionUpgrade('161'); startVersionUpgrade('161');
executeUpdate(161, '161', '1.6.1'); executeUpdate(7, '7', '1.6.1');
} else if (startingVersion < 170) { } else if (startingVersion < 8) {
startVersionUpgrade('170'); startVersionUpgrade('170');
executeUpdate(170, '170', '1.7.0'); executeUpdate(8, '8', '1.7.0');
} else if (startingVersion < 200) { } else if (startingVersion < 9) {
startVersionUpgrade('200'); startVersionUpgrade('200');
executeUpdate(200, '200', '2.0.0'); executeUpdate(9, '9', '2.0.0');
} else if (startingVersion < 201) { } else if (startingVersion < 10) {
startVersionUpgrade('201'); startVersionUpgrade('201');
executeUpdate(201, '201', '2.0.1'); executeUpdate(10, '10', '2.0.1');
} else if (startingVersion < 210) { } else if (startingVersion < 11) {
startVersionUpgrade('210'); startVersionUpgrade('210');
executeUpdate(210, '210', '2.1.0'); executeUpdate(11, '11', '2.1.0');
} else if (startingVersion < 211) { } else if (startingVersion < 12) {
startVersionUpgrade('211'); startVersionUpgrade('211');
executeUpdate(211, '211', '2.1.1'); executeUpdate(12, '12', '2.1.1');
} else if (startingVersion < 220) { } else if (startingVersion < 13) {
startVersionUpgrade('220'); startVersionUpgrade('220');
executeUpdate(220, '220', '2.2.0'); executeUpdate(13, '13', '2.2.0');
} else if (startingVersion < 221) { } else if (startingVersion < 14) {
startVersionUpgrade('221'); startVersionUpgrade('221');
executeUpdate(221, '221', '2.2.1'); executeUpdate(14, '14', '2.2.1');
} else if (startingVersion < 230) { } else if (startingVersion < 15) {
startVersionUpgrade('230'); startVersionUpgrade('230');
executeUpdate(230, '230', '2.3.0'); executeUpdate(15, '15', '2.3.0');
} else if (startingVersion < 231) { } else if (startingVersion < 16) {
startVersionUpgrade('231'); startVersionUpgrade('231');
executeUpdate(231, '231', '2.3.1'); executeUpdate(16, '16', '2.3.1');
} else if (startingVersion < 232) { } else if (startingVersion < 17) {
startVersionUpgrade('232'); startVersionUpgrade('232');
executeUpdate(232, '232', '2.3.2'); executeUpdate(17, '17', '2.3.2');
} else if (startingVersion < 240) { } else if (startingVersion < 18) {
startVersionUpgrade('240'); startVersionUpgrade('240');
executeUpdate(240, '240', '2.4.0'); executeUpdate(18, '18', '2.4.0');
} else if (startingVersion < 241) { } else if (startingVersion < 19) {
startVersionUpgrade('241'); startVersionUpgrade('241');
executeUpdate(241, '241', '2.4.1'); executeUpdate(19, '19', '2.4.1');
} else if (startingVersion < 242) { } else if (startingVersion < 20) {
startVersionUpgrade('242'); startVersionUpgrade('242');
executeUpdate(242, '242', '2.4.2'); executeUpdate(20, '20', '2.4.2');
} else { } else {
installationFinished(); installationFinished();
} }
@ -70,9 +70,9 @@ function executeUpdate(version, cssclass, formattedVersion) {
data: { version: version }, data: { version: version },
success: function(data) { success: function(data) {
markUpdateAsSuccess(cssclass, formattedVersion); markUpdateAsSuccess(cssclass, formattedVersion);
if (version == 200) { if (version == 9) {
migrateIpEmailBans('banmigrate', 'banmigrate'); migrateIpEmailBans('banmigrate', 'banmigrate');
} else if (version == 240) { } else if (version == 18) {
initializeStatuses('initialize-statuses', 'initialize-statuses'); initializeStatuses('initialize-statuses', 'initialize-statuses');
} else { } else {
processUpdates(version); processUpdates(version);
@ -128,7 +128,7 @@ function initializeStatuses(version, cssclass) {
} }
function statusesInitialized() { function statusesInitialized() {
processUpdates(240); processUpdates(18);
} }
@ -155,7 +155,7 @@ function runMigration() {
function migrateComplete() { function migrateComplete() {
$('#attention-row').hide(); $('#attention-row').hide();
markUpdateAsSuccess('banmigrate', 'IP and Email address bans'); markUpdateAsSuccess('banmigrate', 'IP and Email address bans');
processUpdates(200); processUpdates(9);
} }
jQuery(document).ready(loadJquery); jQuery(document).ready(loadJquery);

@ -128,7 +128,7 @@ hesk_dbConnect();
$v241btn = 'btn-default'; $v241btn = 'btn-default';
} }
?> ?>
<a id="241" class="btn <?php echo $v241btn; ?> btn-block disablable" href="installModsForHesk.php?v=241">2.4.1</a> <a id="241" class="btn <?php echo $v241btn; ?> btn-block disablable" href="installModsForHesk.php?v=19">2.4.1</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -139,7 +139,7 @@ hesk_dbConnect();
$v240btn = 'btn-default'; $v240btn = 'btn-default';
} }
?> ?>
<a id="240" class="btn <?php echo $v240btn; ?> btn-block disablable" href="installModsForHesk.php?v=240">2.4.0</a> <a id="240" class="btn <?php echo $v240btn; ?> btn-block disablable" href="installModsForHesk.php?v=18">2.4.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -150,7 +150,7 @@ hesk_dbConnect();
$v232btn = 'btn-default'; $v232btn = 'btn-default';
} }
?> ?>
<a id="232" class="btn <?php echo $v232btn; ?> btn-block disablable" href="installModsForHesk.php?v=232">2.3.2</a> <a id="232" class="btn <?php echo $v232btn; ?> btn-block disablable" href="installModsForHesk.php?v=17">2.3.2</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -161,7 +161,7 @@ hesk_dbConnect();
$v231btn = 'btn-default'; $v231btn = 'btn-default';
} }
?> ?>
<a id="231" class="btn <?php echo $v231btn; ?> btn-block disablable" href="installModsForHesk.php?v=231">2.3.1</a> <a id="231" class="btn <?php echo $v231btn; ?> btn-block disablable" href="installModsForHesk.php?v=16">2.3.1</a>
</div> </div>
</div> </div>
<br> <br>
@ -175,7 +175,7 @@ hesk_dbConnect();
$v230btn = 'btn-default'; $v230btn = 'btn-default';
} }
?> ?>
<a id="230" class="btn <?php echo $v230btn; ?> btn-block disablable" href="installModsForHesk.php?v=230">2.3.0</a> <a id="230" class="btn <?php echo $v230btn; ?> btn-block disablable" href="installModsForHesk.php?v=15">2.3.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -186,7 +186,7 @@ hesk_dbConnect();
$v221btn = 'btn-default'; $v221btn = 'btn-default';
} }
?> ?>
<a id="221" class="btn <?php echo $v221btn; ?> btn-block disablable" href="installModsForHesk.php?v=221">2.2.1</a> <a id="221" class="btn <?php echo $v221btn; ?> btn-block disablable" href="installModsForHesk.php?v=14">2.2.1</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -197,7 +197,7 @@ hesk_dbConnect();
$v220btn = 'btn-default'; $v220btn = 'btn-default';
} }
?> ?>
<a id="220" class="btn <?php echo $v220btn; ?> btn-block disablable" href="installModsForHesk.php?v=220">2.2.0</a> <a id="220" class="btn <?php echo $v220btn; ?> btn-block disablable" href="installModsForHesk.php?v=13">2.2.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -208,7 +208,7 @@ hesk_dbConnect();
$v211btn = 'btn-default'; $v211btn = 'btn-default';
} }
?> ?>
<a id="211" class="btn <?php echo $v211btn; ?> btn-block disablable" href="installModsForHesk.php?v=211">2.1.1</a> <a id="211" class="btn <?php echo $v211btn; ?> btn-block disablable" href="installModsForHesk.php?v=12">2.1.1</a>
</div> </div>
</div> </div>
<br> <br>
@ -222,7 +222,7 @@ hesk_dbConnect();
$v210btn = 'btn-default'; $v210btn = 'btn-default';
} }
?> ?>
<a id="210" class="btn <?php echo $v210btn; ?> btn-block disablable" href="installModsForHesk.php?v=210">2.1.0</a> <a id="210" class="btn <?php echo $v210btn; ?> btn-block disablable" href="installModsForHesk.php?v=11">2.1.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -233,7 +233,7 @@ hesk_dbConnect();
$v201btn = 'btn-default'; $v201btn = 'btn-default';
} }
?> ?>
<a id="201" class="btn <?php echo $v201btn; ?> btn-block disablable" href="installModsForHesk.php?v=201">2.0.1</a> <a id="201" class="btn <?php echo $v201btn; ?> btn-block disablable" href="installModsForHesk.php?v=10">2.0.1</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -244,7 +244,7 @@ hesk_dbConnect();
$v200btn = 'btn-default'; $v200btn = 'btn-default';
} }
?> ?>
<a id="200" class="btn <?php echo $v200btn; ?> btn-block disablable" href="installModsForHesk.php?v=200">2.0.0</a> <a id="200" class="btn <?php echo $v200btn; ?> btn-block disablable" href="installModsForHesk.php?v=9">2.0.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<?php <?php
@ -255,7 +255,7 @@ hesk_dbConnect();
$v170btn = 'btn-default'; $v170btn = 'btn-default';
} }
?> ?>
<a id="170" class="btn <?php echo $v170btn; ?> btn-block disablable" href="installModsForHesk.php?v=170">1.7.0</a> <a id="170" class="btn <?php echo $v170btn; ?> btn-block disablable" href="installModsForHesk.php?v=8">1.7.0</a>
</div> </div>
</div> </div>
<br> <br>
@ -269,7 +269,7 @@ hesk_dbConnect();
$v161btn = 'btn-default'; $v161btn = 'btn-default';
} }
?> ?>
<a id="161" class="btn <?php echo $v161btn; ?> btn-block disablable" href="installModsForHesk.php?v=161">1.6.1</a> <a id="161" class="btn <?php echo $v161btn; ?> btn-block disablable" href="installModsForHesk.php?v=7">1.6.1</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
@ -281,25 +281,25 @@ hesk_dbConnect();
$v160btn = 'btn-default'; $v160btn = 'btn-default';
} }
?> ?>
<a id="160" class="btn <?php echo $v160btn; ?> btn-block disablable" href="installModsForHesk.php?v=160">1.6.0</a> <a id="160" class="btn <?php echo $v160btn; ?> btn-block disablable" href="installModsForHesk.php?v=6">1.6.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<a id="150" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=150">1.5.0</a> <a id="150" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=5">1.5.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<a id="141" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=141">1.4.1</a> <a id="141" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=4">1.4.1</a>
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row">
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">1.4.0</a> <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=3">1.4.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<a id="130" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=130">1.3.0</a> <a id="130" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=2">1.3.0</a>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<a id="124" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=124">1.2.4</a> <a id="124" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=1">1.2.4</a>
</div> </div>
</div> </div>
<br> <br>

Loading…
Cancel
Save