Changeset 5773 for trunk/setup
- Timestamp:
- 03/21/12 14:00:25 (12 years ago)
- Location:
- trunk/setup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/setup/config.php
r328 r5773 65 65 66 66 /* Following to ensure windows file paths are saved correctly */ 67 set_magic_quotes_runtime(0);67 magic_quotes_runtime(0); 68 68 69 69 $GLOBALS['phpgw_setup']->loaddb(); … … 112 112 /* echo '<br>Updating: ' . $setting . '=' . $value; */ 113 113 /* Don't erase passwords, since we also do not print them below */ 114 if($value || (! ereg('passwd',$setting) && !ereg('password',$setting) && !ereg('root_pw',$setting)))114 if($value || (!preg_match('/passwd/',$setting) && !preg_match('/password/',$setting) && !preg_match('/root_pw/',$setting))) 115 115 { 116 116 @$GLOBALS['phpgw_setup']->db->query("DELETE FROM $configtbl WHERE config_name='" . $setting . "'"); -
trunk/setup/inc/functions.inc.php
r2 r5773 81 81 while($line = fgets($f,200)) 82 82 { 83 list($x,$y) = split("\t",$line);83 list($x,$y) = preg_split('/\t/',$line); 84 84 $languages[$x]['lang'] = trim($x); 85 85 $languages[$x]['descr'] = trim($y);
Note: See TracChangeset
for help on using the changeset viewer.