From 28d1b5301d44caa8dd89f66c758b68cb91984a8a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 30 Jun 2011 16:03:36 -0400
Subject: [PATCH] Fixed Template generator functions to avoid mixed Linux / Windows line endings.
---
interface/lib/classes/tform_tpl_generator.inc.php | 4 ++--
interface/lib/classes/listform_tpl_generator.inc.php | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index 7d5f72d..25505f7 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -61,7 +61,7 @@
$lang["list_head_txt"] = $listDef["name"];
foreach($listDef["item"] as $field) {
$key = $field["field"];
- $html .= " <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\r\n";
+ $html .= " <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\n";
$lang[$key."_txt"] = $key;
}
@@ -73,9 +73,9 @@
foreach($listDef["item"] as $field) {
$key = $field["field"];
if($field["formtype"] == 'SELECT') {
- $html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\r\n";
+ $html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\n";
} else {
- $html .= " <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\r\n";
+ $html .= " <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\n";
}
}
@@ -89,7 +89,7 @@
foreach($listDef["item"] as $field) {
$key = $field["field"];
- $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>\r\n";
+ $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";
}
$html .= " <td class=\"tbl_col_buttons\">
@@ -164,9 +164,9 @@
if(is_array($wb_out)) {
$fp = fopen ($lng_file, "w");
- fwrite($fp,"<?php\r\n");
+ fwrite($fp,"<?php\n");
foreach($wb_out as $key => $val) {
- $new_line = '$wb["'.$key.'"] = '."'$val';\r\n";
+ $new_line = '$wb["'.$key.'"] = '."'$val';\n";
fwrite($fp,$new_line);
}
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index d9b8261..053e8df 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -309,9 +309,9 @@
if(is_array($wb_out)) {
$fp = fopen ($lng_file, "w");
- fwrite($fp,"<?php\r\n");
+ fwrite($fp,"<?php\n");
foreach($wb_out as $key => $val) {
- $new_line = '$wb["'.$key.'"] = '."'$val';\r\n";
+ $new_line = '$wb["'.$key.'"] = '."'$val';\n";
fwrite($fp,$new_line);
}
--
Gitblit v1.9.1