Merge branch 'trunk'

class/error.class.php

@@ -104,7 +104,7 @@ class ErrorHandler {
      * @private
      * @since 1.5.1
      */
-    function SquirrelMailErrorhandler($iErrNo, $sErrStr, $sErrFile, $iErrLine, $aContext=null) {
+    function SquirrelMailErrorhandler($iErrNo, $sErrStr, $sErrFile, $iErrLine, $aContext=NULL) {
         $aError = array(
                         'type'     => SQM_NOTICE,// Error type, notice, warning or fatal error;
                         'category' => NULL,      // SquirrelMail error category;

functions/imap_general.php

@@ -1406,7 +1406,7 @@ function sqimap_parse_namespace(&$input) {
                 $namespace[$ns_strings[$i]] = array();
             } else {
                 // Pop-out the first ( and last ) for easier parsing
-                $ns = substr($regs[$i], 1, strlen($regs[$i])-2);
+                $ns = substr($regs[$i], 1, -1);
                 if($c = preg_match_all('/\((?:(.*?)\s*?)\)/', $ns, $regs2)) {
                     $namespace[$ns_strings[$i]] = array();
                     for($j=0; $j<sizeof($regs2[1]); $j++) {