Changeset a63e10e in github

Timestamp:

Apr 14, 2008 6:11:50 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

9950110

Parents:

a901aa5

Message:

• removed strrstr() definition as it was needed only for php4

Location:

program

Files:

• include/rcube_shared.inc (modified) (1 diff)
• steps/mail/compose.inc (modified) (1 diff)

program/include/rcube_shared.inc

@@ -660 +660 @@
 
 /**
- * Return the last occurence of a string in another string
- *
- * @param haystack string string in which to search
- * @param needle string string for which to search
- * @return index of needle within haystack, or false if not found
- */
-function strrstr($haystack, $needle)
-{
-  $pver = phpversion();
-  if ($pver[0] >= 5)
-      return strrpos($haystack, $needle);
-  else
-  {
-    $index = strpos(strrev($haystack), strrev($needle));
-    if($index === false)
-        return false;
-    
-    $index = strlen($haystack) - strlen($needle) - $index;
-    return $index;
-  }
-}
-
-/**
  * A method to guess the mime_type of an attachment.
  *

program/steps/mail/compose.inc

@@ -500 +500 @@
 
     // try to remove the signature
-    if ($sp = strrstr($body, '-- '))
+    if ($sp = strrpos($body, '-- '))
       {
       if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r")