ereg eradication
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 2896c9e..1e1ae7d 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -350,7 +350,7 @@
{
$protocol = 'image_process_'.$this->image_library;
- if (eregi("gd2$", $protocol))
+ if (preg_match('/gd2$/i', $protocol))
{
$protocol = 'image_process_gd';
}
@@ -373,7 +373,7 @@
{
$protocol = 'image_process_'.$this->image_library;
- if (eregi("gd2$", $protocol))
+ if (preg_match('/gd2$/i', $protocol))
{
$protocol = 'image_process_gd';
}
@@ -559,9 +559,9 @@
return FALSE;
}
- if ( ! eregi("convert$", $this->library_path))
+ if ( ! preg_match("/convert$/i", $this->library_path))
{
- if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/";
+ $this->library_path = rtrim($this->library_path, '/').'/';
$this->library_path .= 'convert';
}
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index 844e503..d53f17f 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -267,7 +267,7 @@
}
@fclose($fp);
- if ( ! eregi("<error>0</error>", $this->response))
+ if (stristr($this->response, '<error>0</error>') === FALSE)
{
$message = 'An unknown error was encountered';
@@ -370,10 +370,7 @@
}
else
{
- if (ereg("/$", $url))
- {
- $url = substr($url, 0, -1);
- }
+ $url = rtrim($url, '/');
$tb_array = explode('/', $url);
$tb_id = $tb_array[count($tb_array)-1];