Skip to content

Commit 43b345c

Browse files
tbrehmtbrehm
committed
Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be merged to trunk.
1 parent 2de9fd7 commit 43b345c

File tree

222 files changed

+1144
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+1144
-560
lines changed

‎interface/lib/classes/db_mysql.inc.php‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ public function __construct($prefix = '') {
6161
if ($this->connect_error) {
6262
$this->updateError('DB::__construct');
6363
return false;
64+
} else {
65+
$this->setCharacterEncoding();
6466
}
65-
parent::query( 'SET NAMES '.$this->dbCharset);
66-
parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
67-
6867
}
6968

7069
public function __destruct() {
@@ -89,14 +88,36 @@ public function updateError($location) {
8988
// This right here will allow us to use the samefile for server & interface
9089
if($this->show_error_messages) {
9190
echo $error_msg;
92-
} else if(method_exists($app, 'log')) {
91+
} else if(is_object($app) && method_exists($app, 'log')) {
9392
$app->log($error_msg, LOGLEVEL_WARN);
9493
}
9594
}
9695
}
96+
97+
private function setCharacterEncoding() {
98+
parent::query( 'SET NAMES '.$this->dbCharset);
99+
parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
100+
}
97101

98102
public function query($queryString) {
99-
parent::ping();
103+
$try = 0;
104+
do {
105+
$try++;
106+
$ok = parent::ping();
107+
if(!$ok) {
108+
if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
109+
if($try > 9) {
110+
$this->updateError('DB::query -> reconnect');
111+
return false;
112+
} else {
113+
sleep(1);
114+
}
115+
} else {
116+
$this->setCharacterEncoding();
117+
$ok = true;
118+
}
119+
}
120+
} while($ok == false);
100121
$this->queryId = parent::query($queryString);
101122
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
102123
if($this->errorNumber) debug_print_backtrace();
@@ -184,10 +205,10 @@ public function diffrec($record_old, $record_new) {
184205
if(is_array($record_old) && count($record_old) > 0) {
185206
foreach($record_old as $key => $val) {
186207
// if(!isset($record_new[$key]) || $record_new[$key] != $val) {
187-
if($record_new[$key] != $val) {
208+
if(@$record_new[$key] != $val) {
188209
// Record has changed
189210
$diffrec_full['old'][$key] = $val;
190-
$diffrec_full['new'][$key] = $record_new[$key];
211+
$diffrec_full['new'][$key] = @$record_new[$key];
191212
$diff_num++;
192213
} else {
193214
$diffrec_full['old'][$key] = $val;

‎interface/lib/classes/listform_tpl_generator.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function buildHTML($listDef,$module = '') {
9494

9595
$html .= " <td class=\"tbl_col_buttons\">
9696
<div class=\"buttons icons16\">
97-
<a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
97+
<a class=\"button icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
9898
</div>
9999
</td>
100100
</tr>

‎interface/lib/classes/remoting_lib.inc.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,9 @@ function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '
681681
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
682682
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
683683
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
684-
$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
684+
$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
685+
$record[$key] = $tmp['crypted'];
686+
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
685687
} else {
686688
$record[$key] = md5(stripslashes($record[$key]));
687689
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
@@ -708,7 +710,9 @@ function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '
708710
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
709711
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
710712
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
711-
$sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
713+
$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
714+
$record[$key] = $tmp['crypted'];
715+
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
712716
} else {
713717
$record[$key] = md5(stripslashes($record[$key]));
714718
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";

‎interface/lib/classes/tform.inc.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,9 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
10571057
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
10581058
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
10591059
} elseif ($field['encryption'] == 'MYSQL') {
1060-
$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
1060+
$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
1061+
$record[$key] = $tmp['crypted'];
1062+
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
10611063
} elseif ($field['encryption'] == 'CLEARTEXT') {
10621064
$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
10631065
} else {
@@ -1084,7 +1086,9 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
10841086
$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
10851087
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
10861088
} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
1087-
$sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
1089+
$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
1090+
$record[$key] = $tmp['crypted'];
1091+
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
10881092
} elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
10891093
$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
10901094
} else {

‎interface/lib/lang/cz.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,5 @@ $wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře
131131
$wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem';
132132
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
133133
?>
134+
135+

‎interface/web/admin/lib/lang/cz.lng‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ $wb['Getmail'] = 'Getmail';
2525
$wb['Web'] = 'Web';
2626
$wb['FastCGI'] = 'FastCGI';
2727
$wb['Jailkit'] = 'Jailkit';
28-
$wb['Rescue'] = 'Monitorování';
28+
$wb['Rescue'] = 'Zachrána';
2929
$wb['Server IP addresses'] = 'IP adresy serveru';
30-
$wb['Additional PHP Versions'] = 'Další PHP verze';
30+
$wb['Additional PHP Versions'] = 'Další verze PHP';
3131
$wb['Firewall'] = 'Firewall';
3232
$wb['Interface'] = 'Rozhraní';
3333
$wb['Interface Config'] = 'Hlavní konfigurace';
@@ -48,3 +48,5 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém';
4848
$wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
4949
$wb['Directive Snippets'] = 'Directive Snippets';
5050
?>
51+
52+

‎interface/web/admin/lib/lang/cz_directive_snippets.lng‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22
$wb['Directive Snippets'] = 'Directive Snippets';
33
$wb['name_txt'] = 'Name of Snippet';
4-
$wb['type_txt'] = 'Type';
4+
$wb['type_txt'] = 'Verze';
55
$wb['snippet_txt'] = 'Snippet';
66
$wb['active_txt'] = 'Aktivní';
77
$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
88
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
99
?>
10+
11+

‎interface/web/admin/lib/lang/cz_directive_snippets_list.lng‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
$wb['list_head_txt'] = 'Directive Snippets';
33
$wb['active_txt'] = 'Aktivní';
44
$wb['name_txt'] = 'Name of Snippet';
5-
$wb['type_txt'] = 'Type';
5+
$wb['type_txt'] = 'Verze';
66
$wb['add_new_record_txt'] = 'Add Directive Snippet';
77
?>
8+
9+

‎interface/web/admin/lib/lang/cz_firewall.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
99
$wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.';
1010
$wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
1111
?>
12+
13+

‎interface/web/admin/lib/lang/cz_firewall_list.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
66
$wb['udp_port_txt'] = 'Otevřené UDP porty';
77
$wb['add_new_record_txt'] = 'Přidat záznam';
88
?>
9+
10+

0 commit comments

Comments
 (0)