Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
489
Issues
489
List
Boards
Labels
Service Desk
Milestones
Merge Requests
25
Merge Requests
25
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
eb3ab433
Commit
eb3ab433
authored
Feb 10, 2014
by
Marius Cramer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed version to 3.0.5.4dev
parent
7ffd14a9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
43 deletions
+6
-43
install/lib/install.lib.php
install/lib/install.lib.php
+0
-37
install/lib/update.lib.php
install/lib/update.lib.php
+2
-2
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+1
-1
install/tpl/config.inc.php.master
install/tpl/config.inc.php.master
+1
-1
interface/lib/config.inc.php
interface/lib/config.inc.php
+1
-1
server/scripts/ispconfig_update.php
server/scripts/ispconfig_update.php
+1
-1
No files found.
install/lib/install.lib.php
View file @
eb3ab433
...
...
@@ -692,43 +692,6 @@ function is_installed($appname) {
}
}
/*
* Compare ISPConfig version number.
* return values:
* -1 $current version is newer then $new version (downgrade)
* 0 $current version = $new version
* 1 $current version is older then new version (update)
*/
function
compare_ispconfig_version
(
$current
,
$new
)
{
if
(
$current
==
$new
)
{
return
0
;
}
$p
=
explode
(
'.'
,
$current
);
$tmp
=
''
;
$tmp
.
=
str_pad
(
intval
(
$p
[
0
]),
3
,
'0'
,
STR_PAD_LEFT
);
$tmp
.
=
(
isset
(
$p
[
1
]))
?
str_pad
(
intval
(
$p
[
1
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$tmp
.
=
(
isset
(
$p
[
2
]))
?
str_pad
(
intval
(
$p
[
2
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$tmp
.
=
(
isset
(
$p
[
3
]))
?
str_pad
(
intval
(
$p
[
3
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$current
=
$tmp
;
$p
=
explode
(
'.'
,
$new
);
$tmp
=
''
;
$tmp
.
=
str_pad
(
intval
(
$p
[
0
]),
3
,
'0'
,
STR_PAD_LEFT
);
$tmp
.
=
(
isset
(
$p
[
1
]))
?
str_pad
(
intval
(
$p
[
1
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$tmp
.
=
(
isset
(
$p
[
2
]))
?
str_pad
(
intval
(
$p
[
2
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$tmp
.
=
(
isset
(
$p
[
3
]))
?
str_pad
(
intval
(
$p
[
3
]),
3
,
'0'
,
STR_PAD_LEFT
)
:
'000'
;
$new
=
$tmp
;
if
(
$new
>
$current
)
{
return
1
;
}
else
{
return
-
1
;
}
}
/*
* Get the port number of the ISPConfig controlpanel vhost
*/
...
...
install/lib/update.lib.php
View file @
eb3ab433
...
...
@@ -153,8 +153,8 @@ function updateDbAndIni() {
$conf
[
'nginx'
][
'installed'
]
=
false
;
}
//* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
if
(
compare_ispconfig_version
(
'3.0.3'
,
ISPC_APP_VERSION
)
>=
0
)
{
//* Do incremental DB updates only on installed ISPConfig versions >
=
3.0.3
if
(
version_compare
(
'3.0.3'
,
ISPC_APP_VERSION
,
'<='
)
)
{
swriteln
(
$inst
->
lng
(
'Starting incremental database update.'
));
...
...
install/sql/ispconfig3.sql
View file @
eb3ab433
...
...
@@ -2280,7 +2280,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
INSERT
INTO
sys_config
VALUES
(
'db'
,
'db_version'
,
'3.0.5.
3
'
);
INSERT
INTO
sys_config
VALUES
(
'db'
,
'db_version'
,
'3.0.5.
4dev
'
);
INSERT
INTO
sys_config
VALUES
(
'interface'
,
'session_timeout'
,
'0'
);
SET
FOREIGN_KEY_CHECKS
=
1
;
install/tpl/config.inc.php.master
View file @
eb3ab433
...
...
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define
(
'ISPC_APP_TITLE'
,
'ISPConfig'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
3
'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
4dev
'
);
define
(
'DEVSYSTEM'
,
0
);
...
...
interface/lib/config.inc.php
View file @
eb3ab433
...
...
@@ -44,7 +44,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision);
//** Application
define
(
'ISPC_APP_TITLE'
,
'ISPConfig'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
3
'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5.
4dev
'
);
define
(
'DEVSYSTEM'
,
0
);
...
...
server/scripts/ispconfig_update.php
View file @
eb3ab433
...
...
@@ -93,7 +93,7 @@ $method = simple_query('Select update method', array('stable', 'svn'), 'stable')
if
(
$method
==
'stable'
)
{
$new_version
=
@
file_get_contents
(
'http://www.ispconfig.org/downloads/ispconfig3_version.txt'
)
or
die
(
'Unable to retrieve version file.'
);
$new_version
=
trim
(
$new_version
);
if
(
$new_version
!=
ISPC_APP_VERSION
)
{
if
(
version_compare
(
$new_version
,
ISPC_APP_VERSION
,
'>'
)
{
passthru
(
'/usr/local/ispconfig/server/scripts/update_from_tgz.sh'
);
exit
;
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment