|
@@ -1,11 +1,11 @@ discard block |
|
|
block discarded – undo |
|
1
|
1
|
<?php |
|
2
|
|
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
|
|
2
|
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0; |
|
3
|
3
|
|
|
4
|
4
|
// Determine upgradeability |
|
5
|
|
-$upgradeable= 0; |
|
|
5
|
+$upgradeable = 0; |
|
6
|
6
|
if ($installMode === 0) { |
|
7
|
|
- $database_name= ''; |
|
8
|
|
- $database_server= 'localhost'; |
|
|
7
|
+ $database_name = ''; |
|
|
8
|
+ $database_server = 'localhost'; |
|
9
|
9
|
$table_prefix = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_'; |
|
10
|
10
|
} else { |
|
11
|
11
|
$database_name = ''; |
|
@@ -17,13 +17,13 @@ discard block |
|
|
block discarded – undo |
|
17
|
17
|
if ($dbase) { |
|
18
|
18
|
$database_name = trim($dbase, '`'); |
|
19
|
19
|
if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) |
|
20
|
|
- $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
21
|
|
- elseif (! mysqli_select_db($conn, trim($dbase, '`'))) |
|
22
|
|
- $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
|
20
|
+ $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2; |
|
|
21
|
+ elseif (!mysqli_select_db($conn, trim($dbase, '`'))) |
|
|
22
|
+ $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2; |
|
23
|
23
|
else |
|
24
|
24
|
$upgradeable = 1; |
|
25
|
25
|
} |
|
26
|
|
- else $upgradable= 2; |
|
|
26
|
+ else $upgradable = 2; |
|
27
|
27
|
} |
|
28
|
28
|
} |
|
29
|
29
|
|
|
@@ -49,28 +49,28 @@ discard block |
|
|
block discarded – undo |
|
49
|
49
|
$database_connection_method = 'SET CHARACTER SET'; |
|
50
|
50
|
} |
|
51
|
51
|
|
|
52
|
|
-$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name']: $database_name; |
|
53
|
|
-$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix']: $table_prefix; |
|
|
52
|
+$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name'] : $database_name; |
|
|
53
|
+$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix'] : $table_prefix; |
|
54
|
54
|
$ph['selected_set_character_set'] = isset($database_connection_method) && $database_connection_method == 'SET CHARACTER SET' ? 'selected' : ''; |
|
55
|
55
|
$ph['selected_set_names'] = isset($database_connection_method) && $database_connection_method == 'SET NAMES' ? 'selected' : ''; |
|
56
|
56
|
$ph['show#connection_method'] = (($installMode == 0) || ($installMode == 2)) ? 'block' : 'none'; |
|
57
|
|
-$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation']: $database_collation; |
|
58
|
|
-$ph['show#AUH'] = ($installMode == 0) ? 'block':'none'; |
|
59
|
|
-$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin']:'admin'; |
|
60
|
|
-$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail']:""; |
|
61
|
|
-$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword']:""; |
|
62
|
|
-$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm']:""; |
|
|
57
|
+$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation'] : $database_collation; |
|
|
58
|
+$ph['show#AUH'] = ($installMode == 0) ? 'block' : 'none'; |
|
|
59
|
+$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin'] : 'admin'; |
|
|
60
|
+$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail'] : ""; |
|
|
61
|
+$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword'] : ""; |
|
|
62
|
+$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm'] : ""; |
|
63
|
63
|
$ph['managerLangs'] = getLangs($install_language); |
|
64
|
64
|
$ph['install_language'] = $install_language; |
|
65
|
65
|
$ph['installMode'] = $installMode; |
|
66
|
|
-$ph['checkedChkagree'] = isset($_POST['chkagree']) ? 'checked':""; |
|
|
66
|
+$ph['checkedChkagree'] = isset($_POST['chkagree']) ? 'checked' : ""; |
|
67
|
67
|
$ph['database_connection_method'] = isset($database_connection_method) ? $database_connection_method : ''; |
|
68
|
|
-$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost']: $database_server; |
|
69
|
|
-$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname']: ''; |
|
70
|
|
-$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword']: ""; |
|
|
68
|
+$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost'] : $database_server; |
|
|
69
|
+$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname'] : ''; |
|
|
70
|
+$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : ""; |
|
71
|
71
|
$ph['MGR_DIR'] = MGR_DIR; |
|
72
|
72
|
|
|
73
|
73
|
$content = file_get_contents('./actions/tpl_connection.html'); |
|
74
|
|
-$content = parse($content, $_lang, '[%','%]'); |
|
|
74
|
+$content = parse($content, $_lang, '[%', '%]'); |
|
75
|
75
|
$content = parse($content, $ph); |
|
76
|
76
|
echo $content; |
evolution-cms /
evolution
