summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-06-01 08:20:10 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-06-01 08:20:10 +0000
commit4e3a7d8f4c769a981423180d3843889aac02c530 (patch)
tree9ed334901a53dff65b6b723dff1cc78a83e0025f
parenta4f79cec4149dd806f0cb93368383fc3d65dff4c (diff)
- use preg functions instead of ereg functions
git-svn-id: https://svn.roundcube.net/trunk@2588 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/index.php2
-rw-r--r--roundcubemail/installer/rcube_install.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index 0904f2be6..5d37a93e0 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/index.php
@@ -221,7 +221,7 @@ while ($redirects < 5) {
$action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';
// execute a plugin action
- if (eregi('^plugin.', $RCMAIL->action)) {
+ if (preg_match('/^plugin\./', $RCMAIL->action)) {
$RCMAIL->plugins->exec_action($RCMAIL->action);
break;
}
diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index 89ebe9d89..05046879e 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -551,11 +551,11 @@ class rcube_install
if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
$buff = '';
foreach ($lines as $i => $line) {
- if (eregi('^--', $line))
+ if (preg_match('/^--/', $line))
continue;
$buff .= $line . "\n";
- if (eregi(';$', trim($line))) {
+ if (preg_match('/;$/', trim($line))) {
$DB->query($buff);
$buff = '';
if ($this->get_error())