Index: branches/5.1.x/core/kernel/nparser/nparser.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 12127) +++ branches/5.1.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 12453) @@ -1,6 +1,6 @@ DataExists; $this->DataExists = false; Index: branches/5.1.x/core/install/install_toolkit.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 12127) +++ branches/5.1.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 12453) @@ -1,6 +1,6 @@ 0) { //echo $line . " - "; - if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) { + if (preg_match('/^\[[a-z]+\]$/i', str_replace(' ', '', $line))) { //echo 'section'; $section = mb_substr($line, 1, (mb_strlen($line) - 2)); if ($parse_section) { $retval[$section] = array(); } continue; - } elseif (eregi('=',$line)) { + } elseif (strpos($line, '=') !== false) { //echo 'main element'; list ($key, $val) = explode(' = ', $line); if (!$parse_section) { Index: branches/5.1.x/core/kernel/utility/debugger.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 12127) +++ branches/5.1.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 12453) @@ -1,6 +1,6 @@ $error_codes) { if (in_array($error_code, $error_codes)) { return $error_name; Index: branches/5.1.x/core/kernel/session/session.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/kernel/session/session.php (.../session.php) (revision 12127) +++ branches/5.1.x/core/kernel/session/session.php (.../session.php) (revision 12453) @@ -1,6 +1,6 @@ setSID($sid_part_1.$sid_part_2.$sid_part_3); Index: branches/5.1.x/core/kernel/globals.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/kernel/globals.php (.../globals.php) (revision 12127) +++ branches/5.1.x/core/kernel/globals.php (.../globals.php) (revision 12453) @@ -1,6 +1,6 @@ 0) { //echo $line . " - "; - if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) { + if (preg_match('/^\[[a-z]+\]$/i', str_replace(' ', '', $line))) { //echo 'section'; $section = mb_substr($line,1,(mb_strlen($line)-2)); if ($parse_section) { $retval[$section] = array(); } continue; - } elseif(eregi('=',$line)) { + } elseif(strpos($line, '=') !== false) { //echo 'main element'; list($key,$val) = explode(' = ',$line); if (!$parse_section) { Index: branches/5.1.x/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 12127) +++ branches/5.1.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 12453) @@ -1,6 +1,6 @@ $this->chopchop($entry), 'filesize' => filesize($dirName. '/'. $entry) @@ -995,10 +995,11 @@ function chopchop ($filename) { $p = pathinfo($filename); - $ext = '.'.$p["extension"]; + $ext = '.'.$p['extension']; $filename; - $filename= ereg_replace("dump","",$filename); - $filename= ereg_replace($ext,"",$filename); + $filename = str_replace('dump', '',$filename); + $filename = str_replace($ext, '', $filename); + return $filename; } Index: branches/5.1.x/core/units/users/users_tag_processor.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 12127) +++ branches/5.1.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 12453) @@ -1,6 +1,6 @@ 0) { + $replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO '); + foreach ($replacements as $replacement) { + $sql = str_replace($replacement, $replacement . $table_prefix, $sql); + } + } - $what = "INSERT INTO "; - $replace = "INSERT INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + $sql = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sql); + $sql = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sql); - $what = "UPDATE "; - $replace = "UPDATE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "ALTER TABLE "; - $replace = "ALTER TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - } - $commands = explode("# --------------------------------------------------------",$sql); if(count($commands)>0) { @@ -1070,36 +1058,17 @@ if(strlen(trim($sql))>0 && substr($sql,0,1)!="#") { $table_prefix = 'restore'.TABLE_PREFIX; - if(strlen($table_prefix)) - { - $what = "CREATE TABLE "; - $replace = "CREATE TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - $what = "DELETE FROM "; - $replace = "DELETE FROM ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + if (strlen($table_prefix) > 0) { + $replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO '); + foreach ($replacements as $replacement) { + $sql = str_replace($replacement, $replacement . $table_prefix, $sql); + } + } - $what = "DROP TABLE "; - $replace = "DROP TABLE IF EXISTS ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + $sql = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sql); + $sql = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sql); - $what = "INSERT INTO "; - $replace = "INSERT INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "REPLACE INTO "; - $replace = "REPLACE INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "UPDATE "; - $replace = "UPDATE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "ALTER TABLE "; - $replace = "ALTER TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - } $sql = trim($sql); if(strlen($sql)>0) { Index: branches/5.1.x/core/kernel/languages/phrases_cache.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 12127) +++ branches/5.1.x/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 12453) @@ -1,6 +1,6 @@ 0) - { - $label = substr($label, 1, -1); //cut exclamation marks + // cut exclamation marks - depricated form of passing phrase name from templates + $label = preg_replace('/^!(.*)!$/', '\\1', $label); + + if (strlen($label) == 0) { + return ''; } - if( strlen($label) == 0 ) return ''; - $original_label = $label; $label = mb_strtoupper($label); if(isset($this->Phrases[$label])) {