Skip to content

Commit baac49e

Browse files
author
fantu
committed
fix some small xhtml error
1 parent 5dada30 commit baac49e

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎interface/lib/app.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public function error($msg, $next_link = '', $stop = true, $priority = 1)
124124
<br /><br /><br />
125125
<table width="100%" border="0" cellspacing="0" cellpadding="2">
126126
<tr>
127-
<td class="error"><b>Error:</b><br>'.$msg;
128-
if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br>';
127+
<td class="error"><b>Error:</b><br />'.$msg;
128+
if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br />';
129129
$msg .= '</td>
130130
</tr>
131131
</table>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private function getDatasourceData($field)
118118
$record = array();
119119
$values = $app->$datasource_class->$datasource_function($field, $record);
120120
} else {
121-
$this->errorMessage .= "Custom datasource class or function is empty<br>\r\n";
121+
$this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
122122
}
123123
}
124124
return $values;

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function getDatasourceData($field, $record) {
247247
$app->uses($datasource_class);
248248
$values = $app->$datasource_class->$datasource_function($field, $record);
249249
} else {
250-
$this->errorMessage .= "Custom datasource class or function is empty<br>\r\n";
250+
$this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
251251
}
252252
}
253253

@@ -527,7 +527,7 @@ function encode($record,$tab) {
527527
$field['regex'] .= 's';
528528
if(!preg_match($field['regex'], $record[$key])) {
529529
$errmsg = $field['errmsg'];
530-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
530+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
531531
}
532532
}
533533

@@ -561,9 +561,9 @@ function validateField($field_name, $field_value, $validators) {
561561
if(!preg_match($validator['regex'], $field_value)) {
562562
$errmsg = $validator['errmsg'];
563563
if(isset($this->wordbook[$errmsg])) {
564-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
564+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
565565
} else {
566-
$this->errorMessage .= $errmsg."<br>\r\n";
566+
$this->errorMessage .= $errmsg."<br />\r\n";
567567
}
568568
}
569569
break;
@@ -573,19 +573,19 @@ function validateField($field_name, $field_value, $validators) {
573573
if($num_rec["number"] > 0) {
574574
$errmsg = $validator['errmsg'];
575575
if(isset($this->wordbook[$errmsg])) {
576-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
576+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
577577
} else {
578-
$this->errorMessage .= $errmsg."<br>\r\n";
578+
$this->errorMessage .= $errmsg."<br />\r\n";
579579
}
580580
}
581581
} else {
582582
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
583583
if($num_rec["number"] > 0) {
584584
$errmsg = $validator['errmsg'];
585585
if(isset($this->wordbook[$errmsg])) {
586-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
586+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
587587
} else {
588-
$this->errorMessage .= $errmsg."<br>\r\n";
588+
$this->errorMessage .= $errmsg."<br />\r\n";
589589
}
590590
}
591591
}
@@ -594,19 +594,19 @@ function validateField($field_name, $field_value, $validators) {
594594
if(empty($field_value)) {
595595
$errmsg = $validator['errmsg'];
596596
if(isset($this->wordbook[$errmsg])) {
597-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
597+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
598598
} else {
599-
$this->errorMessage .= $errmsg."<br>\r\n";
599+
$this->errorMessage .= $errmsg."<br />\r\n";
600600
}
601601
}
602602
break;
603603
case 'ISEMAIL':
604604
if(!preg_match("/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) {
605605
$errmsg = $validator['errmsg'];
606606
if(isset($this->wordbook[$errmsg])) {
607-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
607+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
608608
} else {
609-
$this->errorMessage .= $errmsg."<br>\r\n";
609+
$this->errorMessage .= $errmsg."<br />\r\n";
610610
}
611611
}
612612
break;
@@ -615,19 +615,19 @@ function validateField($field_name, $field_value, $validators) {
615615
if($tmpval === 0 and !empty($field_value)) {
616616
$errmsg = $validator['errmsg'];
617617
if(isset($this->wordbook[$errmsg])) {
618-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
618+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
619619
} else {
620-
$this->errorMessage .= $errmsg."<br>\r\n";
620+
$this->errorMessage .= $errmsg."<br />\r\n";
621621
}
622622
}
623623
break;
624624
case 'ISPOSITIVE':
625625
if(!is_numeric($field_value) || $field_value <= 0){
626626
$errmsg = $validator['errmsg'];
627627
if(isset($this->wordbook[$errmsg])) {
628-
$this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
628+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
629629
} else {
630-
$this->errorMessage .= $errmsg."<br>\r\n";
630+
$this->errorMessage .= $errmsg."<br />\r\n";
631631
}
632632
}
633633
break;
@@ -639,7 +639,7 @@ function validateField($field_name, $field_value, $validators) {
639639
$app->uses($validator_class);
640640
$this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator);
641641
} else {
642-
$this->errorMessage .= "Custom validator class or function is empty<br>\r\n";
642+
$this->errorMessage .= "Custom validator class or function is empty<br />\r\n";
643643
}
644644
break;
645645
default:
@@ -671,9 +671,9 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
671671
// checking permissions
672672
if($this->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') {
673673
if($action == "INSERT") {
674-
if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.<br>\r\n";
674+
if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.<br />\r\n";
675675
} else {
676-
if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.<br>\r\n";
676+
if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.<br />\r\n";
677677
}
678678
}
679679

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ function onAfterInsert() {
263263
function onError() {
264264
global $app, $conf;
265265

266-
$app->tpl->setVar("error","<b>".$app->lng('Error').":</b><br>".$app->tform->errorMessage);
266+
$app->tpl->setVar("error","<b>".$app->lng('Error').":</b><br />".$app->tform->errorMessage);
267267
$app->tpl->setVar($this->dataRecord);
268268
$this->onShow();
269269
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function buildHTML($formDef,$tab) {
5151
<label for=\"".$key."\" class=\"wf_preField\">{tmpl_var name='".$key."_txt'}</label>
5252
<input type=\"text\" id=\"".$key."\" name=\"".$key."\" value=\"{tmpl_var name='".$key."'}\" size=\"".$field['width']."\" maxlength=\"".$field['maxlength']."\"";
5353
if ($field['required'] == true ) {
54-
$html .= " class=\"wf_required\"><span class=\"wf_reqMark\">*</span><br>";
54+
$html .= " class=\"wf_required\"><span class=\"wf_reqMark\">*</span><br />";
5555
} else {
5656
$html .= ">";
5757
}
@@ -68,7 +68,7 @@ function buildHTML($formDef,$tab) {
6868
}
6969
$html .= "{tmpl_var name='".$key."'}</textarea>";
7070
if ($field['required'] == true ) {
71-
$html .= "<span class=\"wf_reqMark\">*</span><br>";
71+
$html .= "<span class=\"wf_reqMark\">*</span><br />";
7272
}
7373
$html .= "\r\n </span>";
7474
break;
@@ -83,7 +83,7 @@ function buildHTML($formDef,$tab) {
8383
}
8484
$html .= "{tmpl_var name='".$key."'}</select>";
8585
if ($field['required'] == true ) {
86-
$html .= "<span class=\"wf_reqMark\">*</span><br>";
86+
$html .= "<span class=\"wf_reqMark\">*</span><br />";
8787
}
8888
$html .= "\r\n </span>";
8989
break;
@@ -98,7 +98,7 @@ function buildHTML($formDef,$tab) {
9898
}
9999
$html .= "{tmpl_var name='".$key."'}</select>";
100100
if ($field['required'] == true ) {
101-
$html .= "<span class=\"wf_reqMark\">*</span><br>";
101+
$html .= "<span class=\"wf_reqMark\">*</span><br />";
102102
}
103103
$html .= "\r\n </span>";
104104
break;
@@ -107,7 +107,7 @@ function buildHTML($formDef,$tab) {
107107
<label for=\"".$key."\" class=\"wf_preField\">{tmpl_var name='".$key."_txt'}</label>
108108
<input type=\"password\" id=\"".$key."\" name=\"".$key."\" value=\"{tmpl_var name='".$key."'}\" size=\"".$field['width']."\" maxlength=\"".$field['maxlength']."\"";
109109
if ($field['required'] == true ) {
110-
$html .= " class=\"wf_required\"><span class=\"wf_reqMark\">*</span><br>";
110+
$html .= " class=\"wf_required\"><span class=\"wf_reqMark\">*</span><br />";
111111
} else {
112112
$html .= ">";
113113
}
@@ -120,7 +120,7 @@ function buildHTML($formDef,$tab) {
120120
$html .= " <span class=\"wf_required\">
121121
{tmpl_var name='".$key."'}
122122
</span>
123-
<span class=\"wf_reqMark\">*</span><br>";
123+
<span class=\"wf_reqMark\">*</span><br />";
124124
} else {
125125
$html .= " <span class=\"\">
126126
{tmpl_var name='".$key."'}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function raiseError ($code, $level = null, $extra=null) {
3636

3737
$error_codes = array(
3838
'VT_ERROR_NOFILE' => 'vlibTemplate Error: Template ('.$extra.') file not found.',
39-
'VT_ERROR_PARSE' => 'vlibTemplate Error: Parse error!<br>To debug this file, use vlibTemplateDebug instead of vlibTemplate in the class instantiation(i.e. new vlibTemplateDebug).',
39+
'VT_ERROR_PARSE' => 'vlibTemplate Error: Parse error!<br />To debug this file, use vlibTemplateDebug instead of vlibTemplate in the class instantiation(i.e. new vlibTemplateDebug).',
4040
'VT_NOTICE_INVALID_TAG' => 'vlibTemplate Notice: Invalid tag ('.$extra.').',
4141
'VT_ERROR_INVALID_TAG' => 'vlibTemplate Error: Invalid tag ('.$extra.'). To disable this you must turn of the STRICT option.',
4242
'VT_NOTICE_INVALID_ATT' => 'vlibTemplate Notice: Invalid attribute ('.$extra.').',

0 commit comments

Comments
 (0)