smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

add support for mac/dos formatted config files (fix newlines)

Browse Source
This commit is contained in:
mohrt
2002-09-23 20:14:46 +00:00
parent f3f83938ec
commit 44da93da28
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Config_File.class.php
View File

@@ -60,6 +60,14 @@ class Config_File {
*/ */
var $read_hidden = true; var $read_hidden = true;
/**
* Controls whether or not to fix mac or dos formatted newlines.
* If set to true, \r or \r\n will be changed to \n.
*
* @access public
*/
var $fix_newlines = true;
/* Private variables */ /* Private variables */
var $_config_path = ""; var $_config_path = "";
var $_config_data = array(); var $_config_data = array();
@@ -253,6 +261,11 @@ class Config_File {
$contents = fread($fp, filesize($config_file)); $contents = fread($fp, filesize($config_file));
fclose($fp); fclose($fp);
if($this->fix_newlines) {
// fix mac/dos formatted newlines
$contents = preg_replace('!\r\n?!',"\n",$contents);
}
$config_data = array(); $config_data = array();

13
libs/Config_File.class.php
View File

@@ -60,6 +60,14 @@ class Config_File {
*/ */
var $read_hidden = true; var $read_hidden = true;
/**
* Controls whether or not to fix mac or dos formatted newlines.
* If set to true, \r or \r\n will be changed to \n.
*
* @access public
*/
var $fix_newlines = true;
/* Private variables */ /* Private variables */
var $_config_path = ""; var $_config_path = "";
var $_config_data = array(); var $_config_data = array();
@@ -253,6 +261,11 @@ class Config_File {
$contents = fread($fp, filesize($config_file)); $contents = fread($fp, filesize($config_file));
fclose($fp); fclose($fp);
if($this->fix_newlines) {
// fix mac/dos formatted newlines
$contents = preg_replace('!\r\n?!',"\n",$contents);
}
$config_data = array(); $config_data = array();