From 632d9b11c203815c55449cf11daf0588efaaa27a Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 16 Oct 2017 20:00:04 -0700 Subject: [PATCH] Renamed commentOut() to cleanFile(). --- e107_admin/lancheck.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 9196a2da0..b5da70387 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -1901,31 +1901,33 @@ class lancheck /** - * Comment out definitions in a language file. + * Clean-up out definitions in a language file. * @param array $defKeys array of constants to comment out. * @param string $path path to the language file to edit. */ - function commentOut($defKeys, $path) + function cleanFile($path, $defKeys=null) { - if(empty($defKeys) || empty($path) || !file_exists($path) || stripos($path,'English')!==false) + if(empty($path) || !file_exists($path) || stripos($path,'English')!==false) { return null; } - $content = file_get_contents($path); $lines = explode("\n",$content); $srch = array(); $repl =array(); - foreach($defKeys as $const) + if(!empty($defKeys)) { - $srch[] = "define('".$const."'"; - $srch[] = 'define("'.$const.'"'; + foreach($defKeys as $const) + { + $srch[] = "define('".$const."'"; + $srch[] = 'define("'.$const.'"'; - $repl[] = "// define('".$const."'"; - $repl[] = '// define("'.$const.'"'; + $repl[] = "// define('".$const."'"; + $repl[] = '// define("'.$const.'"'; + } } $new = ''; @@ -1942,7 +1944,14 @@ class lancheck continue; } - $new .= str_replace($srch,$repl,$ln)."\n"; + if(!empty($srch)) + { + $new .= str_replace($srch,$repl,$ln)."\n"; + } + else + { + $new .= $ln."\n"; + } } if(file_put_contents($path,$new))