Skip to content

Commit

Permalink
Change version number
Browse files Browse the repository at this point in the history
  • Loading branch information
ulrichblock committed Jul 27, 2015
1 parent 3b23669 commit 5afa898
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions web/install/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
$licencecode = cleanFsockOpenRequest($licencecode, '{', '}');
$json = @json_decode($licencecode);

if (!$json or '5.00' == $json->v) {
if (!$json or '5.10' == $json->v) {
$displayToUser = "<div class='jumbotron'><h2>{$languageObject->welcome_header}</h2><p>{$languageObject->welcome_text}</p><div class='pager'><a href='?step=1${languageGetParameter}' class='pull-right'><span class='btn btn-primary btn-lg'>{$languageObject->continue}</span></a></div></div>";
} else {
$displayToUser = "<div class='alert alert-warning'><i class='fa fa-exclamation-triangle'></i> {$languageObject->welcome_old_version}<a href='https://easy-wi.com/uk/downloads/' target='_blank'>{$json->v}</a></div><div class='jumbotron'><h2>{$languageObject->welcome_header}</h2><p>{$languageObject->welcome_text}</p><div class='pager'><a href='?step=1${languageGetParameter}' class='pull-right'><span class='btn btn-primary btn-lg'>{$languageObject->continue}</span></a></div></div>";
Expand Down Expand Up @@ -731,7 +731,7 @@ function __destruct() {
$query = $sql->prepare("INSERT INTO `traffic_settings` (`id`,`type`) VALUES (1,'mysql') ON DUPLICATE KEY UPDATE `type`=`type`");
$query->execute();

$query = $sql->prepare("INSERT INTO `easywi_version` (`id`,`version`,`de`,`en`) VALUES (1,'5.00','','') ON DUPLICATE KEY UPDATE `id`=`id`");
$query = $sql->prepare("INSERT INTO `easywi_version` (`id`,`version`,`de`,`en`) VALUES (1,'5.10','','') ON DUPLICATE KEY UPDATE `id`=`id`");
$query->execute();

$query = $sql->prepare("INSERT INTO `page_pages` (`id`,`authorid`,`type`) VALUES (1,0,'about') ON DUPLICATE KEY UPDATE `id`=`id`");
Expand Down
4 changes: 3 additions & 1 deletion web/install/update.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,13 @@ function versioncheck ($current, $new ,$file ,$response) {
if (versioncheck ($version, '5.00', 'update_440-500.php', $response)) {
$version = '5.00';
}
if (versioncheck ($version, '5.10', 'update_500-510.php', $response)) {
$version = '5.10';
}

$response->add('Repairing tables if needed.');

include(EASYWIDIR . '/stuff/methods/tables_repair.php');

include(EASYWIDIR . '/stuff/methods/tables_entries_repair.php');

# Ende
Expand Down
2 changes: 1 addition & 1 deletion web/stuff/admin/init_admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
redirect('login.php');
}

$ewVersions['files'] = '5.00';
$ewVersions['files'] = '5.10';

$vcsprache = getlanguagefile('versioncheck', $user_language, $reseller_id);
$query = $sql->prepare("SELECT `version` FROM `easywi_version` ORDER BY `id` DESC LIMIT 1");
Expand Down
2 changes: 1 addition & 1 deletion web/stuff/methods/tables_add.php
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@

$query = "CREATE TABLE IF NOT EXISTS `settings` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`version` decimal(4,2) DEFAULT '5.00',
`version` decimal(4,2) DEFAULT '5.10',
`header_icon` varchar(100) DEFAULT 'logo_180px.png',
`header_text` varchar(100) DEFAULT 'Easy-Wi',
`header_href` varchar(100) DEFAULT 'https://easy-wi.com',
Expand Down
2 changes: 1 addition & 1 deletion web/stuff/methods/tables_repair.php
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@

$defined['settings'] = array(
'id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"),
'version' => array("Type"=>"decimal(4,2)","Null"=>"YES","Key"=>"","Default"=>"5.00","Extra"=>""),
'version' => array("Type"=>"decimal(4,2)","Null"=>"YES","Key"=>"","Default"=>"5.10","Extra"=>""),
'releasenotesDE' => array("Type"=>"int(11) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'releasenotesEN' => array("Type"=>"int(11) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'header_icon' => array("Type"=>"varchar(100)","Null"=>"YES","Key"=>"","Default"=>"logo_180px.png","Extra"=>""),
Expand Down

0 comments on commit 5afa898

Please sign in to comment.