Skip to content

Commit e270864

Browse files
author
mcramer
committed
Fixed: onClick attributes changed to valid onclick (lower case)
Fixed: password match function blocked tabs incorrectly Fixed: set focus on username input field threw an error if this field did not exist on a page
1 parent c9435bc commit e270864

File tree

237 files changed

+757
-746
lines changed

Some content is hidden

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

237 files changed

+757
-746
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ private function ptree($myobj, $tiefe, &$optionlist){
100100
*/
101101
$val_id = $val->id;
102102
if($_SESSION['s']['cat_open'][$val_id] == 1) {
103-
$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onClick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder.png' border='0'> ".$val->btext."</a></div>";
103+
$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onclick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder.png' border='0'> ".$val->btext."</a></div>";
104104
} else {
105-
$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onClick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder_closed.png' border='0'> ".$val->btext."</a></div>";
105+
$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onclick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder_closed.png' border='0'> ".$val->btext."</a></div>";
106106
}
107107

108108
$optionlist[] = array( media_cat => $kategorie,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function buildHTML($listDef,$module = '') {
4444
<div class="pnl_toolsarea">
4545
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
4646
<div class="buttons">
47-
<button class="iconstxt icoAdd" type="button" onClick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
47+
<button class="iconstxt icoAdd" type="button" onclick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
4848
<span>{tmpl_var name="add_new_record_txt"}</span>
4949
</button>
5050
</div>
@@ -79,7 +79,7 @@ function buildHTML($listDef,$module = '') {
7979
}
8080
}
8181

82-
$html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
82+
$html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
8383
</tr>
8484
</thead>
8585
<tbody>
@@ -89,7 +89,7 @@ function buildHTML($listDef,$module = '') {
8989

9090
foreach($listDef["item"] as $field) {
9191
$key = $field["field"];
92-
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\n";
92+
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onclick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\n";
9393
}
9494

9595
$html .= " <td class=\"tbl_col_buttons\">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ function onShow() {
486486
$navibar .= '<a href="'.$app->tform->formDef['action'].'?id='.$this->id.'&print_form=1" target="_blank"><img src="../themes/iprg/icons/printer.png" border="0" alt="Drucken" /></a> &nbsp;';
487487
}
488488
if($app->tform->formDef['template_mailsend'] != '') {
489-
$navibar .= "<a href=\"#\" onClick=\"window.open('".$app->tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\"><img src=\"../themes/iprg/icons/mail.png\" border=\"0\" alt=\"Als E-Mail versenden\" /></a>";
489+
$navibar .= "<a href=\"#\" onclick=\"window.open('".$app->tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\"><img src=\"../themes/iprg/icons/mail.png\" border=\"0\" alt=\"Als E-Mail versenden\" /></a>";
490490
}
491491
$app->tpl->setVar('form_navibar',$navibar);
492492
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ function buildHTML($formDef,$tab) {
136136
<input type=\"hidden\" name=\"id\" value=\"{tmpl_var name='id'}\">
137137
138138
<div class=\"buttonHolder buttons\">
139-
<button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onClick=\"submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
140-
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" onClick=\"loadContent('".$module."/".$formDef["list_default"]."');\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
139+
<button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
140+
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" onclick=\"loadContent('".$module."/".$formDef["list_default"]."');\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
141141
</div>
142142
</div>
143143

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ templates/iptables_list.htm: <th class="tbl_col_protocol" scope="col"
1313
templates/iptables_list.htm: <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
1414
templates/iptables_list.htm: <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
1515
templates/iptables_list.htm: <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
16-
templates/iptables_list.htm: <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');">
16+
templates/iptables_list.htm: <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');">
1717
templates/iptables_list.htm: <span>{tmpl_var name="filter_txt"}filter_txt</span></button></div>
1818
templates/iptables_list.htm: <span>{tmpl_var name='delete_txt'}</span></a>
1919
*/

‎interface/web/admin/login_as.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<input type="hidden" name="s_mod" value="login" />
7979
<input type="hidden" name="s_pg" value="index" />
8080
<div class="wf_actions buttons">
81-
<button class="positive iconstxt icoPositive" type="button" value="Yes, login as Client" onClick="submitLoginForm(' . "'pageForm'" . ');"><span>Yes, login as Client</span></button>
82-
<button class="negative iconstxt icoNegative" type="button" value="No, back to list" onClick="loadContent('. "'$backlink'" . ');"><span>No, back to list</span></button>
81+
<button class="positive iconstxt icoPositive" type="button" value="Yes, login as Client" onclick="submitLoginForm(' . "'pageForm'" . ');"><span>Yes, login as Client</span></button>
82+
<button class="negative iconstxt icoNegative" type="button" value="No, back to list" onclick="loadContent('. "'$backlink'" . ');"><span>No, back to list</span></button>
8383
</div>
8484
';
8585
?>

‎interface/web/admin/software_package_install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
//* Add the record to start the install process
130130
$insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$install_server_id', '$software_update_id','installing')";
131131
$app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
132-
$message_ok = 'Starting package installation '."<a href=\"#\" onClick=\"submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
132+
$message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
133133

134134
}
135135

‎interface/web/admin/software_package_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
if($p['package_installable'] == 'no') {
166166
$installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
167167
} else {
168-
$installed_txt .= $s['server_name'].": <a href=\"#\" onClick=\"loadContent('admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."');\">Install now</a><br />";
168+
$installed_txt .= $s['server_name'].": <a href=\"#\" onclick=\"loadContent('admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."');\">Install now</a><br />";
169169
}
170170
}
171171
}

‎interface/web/admin/software_update_list.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
foreach($updates as $key => $u) {
177177
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
178-
$installed_txt = "<a href=\"#\" onClick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install Update</a><br />";
178+
$installed_txt = "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install Update</a><br />";
179179
$records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
180180

181181
}
@@ -199,7 +199,7 @@
199199
if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') {
200200
$installed_txt .= "Installed version $version<br />";
201201
} else {
202-
$installed_txt .= "<a href=\"#\" onClick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install now</a><br />";
202+
$installed_txt .= "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install now</a><br />";
203203
}
204204
$updates[$key]['installed'] = $installed_txt;
205205

‎interface/web/admin/templates/firewall_edit.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ <h2><tmpl_var name="list_head_txt"></h2>
3030
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3131

3232
<div class="buttonHolder buttons">
33-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
34-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
33+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
34+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
3535
</div>
3636
</div>
3737

0 commit comments

Comments
 (0)