EGroupware / egroupware

phpgwapi/inc/horde/Horde/Browser.php

Switch Indentation +99 added lines, -99 removed lines

@@ -271,13 +271,13 @@ 
                 $this->setQuirk('no_filename_spaces');
 
                 switch ($this->_majorVersion) {
-                case 7:
-                    $this->setFeature('dom');
-                    $this->setFeature('iframes');
-                    $this->setFeature('accesskey');
-                    $this->setFeature('optgroup');
-                    $this->setQuirk('double_linebreak_textarea');
-                    break;
+                	case 7:
+                    	$this->setFeature('dom');
+                    	$this->setFeature('iframes');
+                    	$this->setFeature('accesskey');
+                    	$this->setFeature('optgroup');
+                    	$this->setQuirk('double_linebreak_textarea');
+                    	break;
                 }
             } elseif (strpos($this->_lowerAgent, 'elaine/') !== false ||
                       strpos($this->_lowerAgent, 'palmsource') !== false ||
@@ -345,55 +345,55 @@ 
                 }
 
                 switch ($this->_majorVersion) {
-                case 6:
-                    $this->setFeature('javascript', 1.4);
-                    $this->setFeature('dom');
-                    $this->setFeature('iframes');
-                    $this->setFeature('utf');
-                    $this->setFeature('rte');
-                    $this->setFeature('homepage');
-                    $this->setFeature('accesskey');
-                    $this->setFeature('optgroup');
-                    $this->setFeature('xmlhttpreq');
-                    $this->setQuirk('scrollbar_in_way');
-                    $this->setQuirk('broken_multipart_form');
-                    break;
-
-                case 5:
-                    if ($this->getPlatform() == 'mac') {
-                        $this->setFeature('javascript', 1.2);
-                        $this->setFeature('optgroup');
-                    } else {
-                        // MSIE 5 for Windows.
-                        $this->setFeature('javascript', 1.4);
-                        $this->setFeature('dom');
-                        $this->setFeature('xmlhttpreq');
-                        if ($this->_minorVersion >= 5) {
-                            $this->setFeature('rte');
-                        }
-                    }
-                    $this->setFeature('iframes');
-                    $this->setFeature('utf');
-                    $this->setFeature('homepage');
-                    $this->setFeature('accesskey');
-                    if ($this->_minorVersion == 5) {
-                        $this->setQuirk('break_disposition_header');
-                        $this->setQuirk('broken_multipart_form');
-                    }
-                    break;
-
-                case 4:
-                    $this->setFeature('javascript', 1.2);
-                    $this->setFeature('accesskey');
-                    if ($this->_minorVersion > 0) {
-                        $this->setFeature('utf');
-                    }
-                    break;
-
-                case 3:
-                    $this->setFeature('javascript', 1.1);
-                    $this->setQuirk('avoid_popup_windows');
-                    break;
+                	case 6:
+                    	$this->setFeature('javascript', 1.4);
+                    	$this->setFeature('dom');
+                    	$this->setFeature('iframes');
+                    	$this->setFeature('utf');
+                    	$this->setFeature('rte');
+                    	$this->setFeature('homepage');
+                    	$this->setFeature('accesskey');
+                    	$this->setFeature('optgroup');
+                    	$this->setFeature('xmlhttpreq');
+                    	$this->setQuirk('scrollbar_in_way');
+                    	$this->setQuirk('broken_multipart_form');
+                    	break;
+
+                	case 5:
+                    	if ($this->getPlatform() == 'mac') {
+                        	$this->setFeature('javascript', 1.2);
+                        	$this->setFeature('optgroup');
+                    	} else {
+                        	// MSIE 5 for Windows.
+                        	$this->setFeature('javascript', 1.4);
+                        	$this->setFeature('dom');
+                        	$this->setFeature('xmlhttpreq');
+                        	if ($this->_minorVersion >= 5) {
+                            	$this->setFeature('rte');
+                        	}
+                    	}
+                    	$this->setFeature('iframes');
+                    	$this->setFeature('utf');
+                    	$this->setFeature('homepage');
+                    	$this->setFeature('accesskey');
+                    	if ($this->_minorVersion == 5) {
+                        	$this->setQuirk('break_disposition_header');
+                        	$this->setQuirk('broken_multipart_form');
+                    	}
+                    	break;
+
+                	case 4:
+                    	$this->setFeature('javascript', 1.2);
+                    	$this->setFeature('accesskey');
+                    	if ($this->_minorVersion > 0) {
+                        	$this->setFeature('utf');
+                    	}
+                    	break;
+
+                	case 3:
+                    	$this->setFeature('javascript', 1.1);
+                    	$this->setQuirk('avoid_popup_windows');
+                    	break;
                 }
             } elseif (preg_match('|ANTFresco/([0-9]+)|', $this->_agent, $version)) {
                 $this->setBrowser('fresco');
@@ -432,10 +432,10 @@ 
                     // Konqueror.
                     $this->setFeature('javascript', 1.1);
                     switch ($this->_majorVersion) {
-                    case 3:
-                        $this->setFeature('dom');
-                        $this->setFeature('iframes');
-                        break;
+                    	case 3:
+                        	$this->setFeature('dom');
+                        	$this->setFeature('iframes');
+                        	break;
                     }
                 }
             } elseif (preg_match('|Mozilla/([0-9.]+)|', $this->_agent, $version)) {
@@ -444,36 +444,36 @@ 
 
                 list($this->_majorVersion, $this->_minorVersion) = explode('.', $version[1]);
                 switch ($this->_majorVersion) {
-                case 5:
-                    if ($this->getPlatform() == 'win') {
-                        $this->setQuirk('break_disposition_filename');
-                    }
-                    $this->setFeature('javascript', 1.4);
-                    $this->setFeature('dom');
-                    $this->setFeature('accesskey');
-                    $this->setFeature('optgroup');
-                    $this->setFeature('xmlhttpreq');
-                    $this->setFeature('cite');
-                    if (preg_match('|rv:(.*)\)|', $this->_agent, $revision)) {
-                        if ($revision[1] >= 1) {
-                            $this->setFeature('iframes');
-                        }
-                        if ($revision[1] >= 1.3) {
-                            $this->setFeature('rte');
-                        }
-                    }
-                    break;
-
-                case 4:
-                    $this->setFeature('javascript', 1.3);
-                    $this->setQuirk('buggy_compression');
-                    break;
-
-                case 3:
-                default:
-                    $this->setFeature('javascript', 1);
-                    $this->setQuirk('buggy_compression');
-                    break;
+                	case 5:
+                    	if ($this->getPlatform() == 'win') {
+                        	$this->setQuirk('break_disposition_filename');
+                    	}
+                    	$this->setFeature('javascript', 1.4);
+                    	$this->setFeature('dom');
+                    	$this->setFeature('accesskey');
+                    	$this->setFeature('optgroup');
+                    	$this->setFeature('xmlhttpreq');
+                    	$this->setFeature('cite');
+                    	if (preg_match('|rv:(.*)\)|', $this->_agent, $revision)) {
+                        	if ($revision[1] >= 1) {
+                            	$this->setFeature('iframes');
+                        	}
+                        	if ($revision[1] >= 1.3) {
+                            	$this->setFeature('rte');
+                        	}
+                    	}
+                    	break;
+
+                	case 4:
+                    	$this->setFeature('javascript', 1.3);
+                    	$this->setQuirk('buggy_compression');
+                    	break;
+
+                	case 3:
+                	default:
+                    	$this->setFeature('javascript', 1);
+                    	$this->setQuirk('buggy_compression');
+                    	break;
                 }
             } elseif (preg_match('|Lynx/([0-9]+)|', $this->_agent, $version)) {
                 $this->setBrowser('lynx');
@@ -831,17 +831,17 @@ 
             }
             $size = ini_get('upload_max_filesize');
             switch (strtolower(substr($size, -1, 1))) {
-            case 'k':
-                $size = intval(floatval($size) * 1024);
-                break;
+            	case 'k':
+                	$size = intval(floatval($size) * 1024);
+                	break;
 
-            case 'm':
-                $size = intval(floatval($size) * 1024 * 1024);
-                break;
+            	case 'm':
+                	$size = intval(floatval($size) * 1024 * 1024);
+                	break;
 
-            default:
-                $size = intval($size);
-                break;
+            	default:
+                	$size = intval($size);
+                	break;
             }
             return $size;
         } else {

phpgwapi/inc/horde/Horde.php

Switch Indentation +51 added lines, -51 removed lines

@@ -169,23 +169,23 @@ 
                                 array($error->getUserInfo()));
 
             switch ($error->getCode()) {
-            case HORDE_ERROR_DRIVER_CONFIG_MISSING:
-                $message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain some %s settings."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
-                break;
-
-            case HORDE_ERROR_DRIVER_CONFIG:
-                $message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain a %s setting."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
-                break;
-
-            default:
-                $message = $error->getMessage();
-                break;
+            	case HORDE_ERROR_DRIVER_CONFIG_MISSING:
+                	$message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
+                    	sprintf(_("The file %s should contain some %s settings."),
+                            	$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            	sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
+                	break;
+
+            	case HORDE_ERROR_DRIVER_CONFIG:
+                	$message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
+                    	sprintf(_("The file %s should contain a %s setting."),
+                            	$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            	sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
+                	break;
+
+            	default:
+                	$message = $error->getMessage();
+                	break;
             }
 
             $errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
@@ -334,32 +334,32 @@ 
         }
 
         switch ($type) {
-        case 'help':
-            if ($GLOBALS['browser']->hasFeature('javascript')) {
-                Horde::addScriptFile('open_help_win.js', 'horde');
-                return "javascript:open_help_win('$app');";
-            } else {
-                $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
-                return Util::addParameter($url, array('module' => $app,
-                                                      'show' => 'topics'));
-            }
-            break;
-
-        case 'problem':
-            return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
-
-        case 'logout':
-            return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
-
-        case 'login':
-            return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
-
-        case 'options':
-            global $conf;
-            if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
-                return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
-            }
-            break;
+        	case 'help':
+            	if ($GLOBALS['browser']->hasFeature('javascript')) {
+                	Horde::addScriptFile('open_help_win.js', 'horde');
+                	return "javascript:open_help_win('$app');";
+            	} else {
+                	$url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
+                	return Util::addParameter($url, array('module' => $app,
+                                                      	'show' => 'topics'));
+            	}
+            	break;
+
+        	case 'problem':
+            	return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
+
+        	case 'logout':
+            	return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
+
+        	case 'login':
+            	return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
+
+        	case 'options':
+            	global $conf;
+            	if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
+                	return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
+            	}
+            	break;
         }
 
         return false;
@@ -381,17 +381,17 @@ 
         }
 
         switch ($conf['menu']['links'][$type]) {
-        case 'all':
-            return true;
+        	case 'all':
+            	return true;
 
-        case 'never':
-            return false;
+        	case 'never':
+            	return false;
 
-        case 'authenticated':
-            return (bool)Auth::getAuth();
+        	case 'authenticated':
+            	return (bool)Auth::getAuth();
 
-        default:
-            return false;
+        	default:
+            	return false;
         }
     }
 

phpgwapi/inc/horde/XML/WBXML.php

Switch Indentation +10 added lines, -10 removed lines

@@ -142,20 +142,20 @@
     function getBits($num, $l)
     {
         switch ($num) {
-        case 0:
-            return $l & 127; // 0x7F
+        	case 0:
+            	return $l & 127; // 0x7F
 
-        case 1:
-            return ($l >> 7) & 127; // 0x7F
+        	case 1:
+            	return ($l >> 7) & 127; // 0x7F
 
-        case 2:
-            return ($l >> 14) & 127; // 0x7F
+        	case 2:
+            	return ($l >> 14) & 127; // 0x7F
 
-        case 3:
-            return ($l >> 21) & 127; // 0x7F
+        	case 3:
+            	return ($l >> 21) & 127; // 0x7F
 
-        case 4:
-            return ($l >> 28) & 127; // 0x7F
+        	case 4:
+            	return ($l >> 28) & 127; // 0x7F
         }
 
         return 0;

phpgwapi/inc/horde/XML/WBXML/Decoder.php

Switch Indentation +241 added lines, -241 removed lines

@@ -294,160 +294,160 @@ 
         // print "position: " . $this->_strpos . " token: " . $token . " str10: " . substr($input, $this->_strpos, 10) . "\n"; // @todo: remove debug output
 
         switch ($token) {
-        case XML_WBXML_GLOBAL_TOKEN_STR_I:
-            // Section 5.8.4.1
-            $str = $this->termstr($input);
-            $this->_ch->characters($str);
-            // print "str:$str\n"; // @TODO Remove debug code
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_STR_T:
-            // Section 5.8.4.1
-            $x = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
-            $str = $this->getStringTableEntry($x);
-            $this->_ch->characters($str);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_EXT_I_0:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_I_1:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_I_2:
-            // Section 5.8.4.2
-            $str = $this->termstr($input);
-            $this->_ch->characters($str);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_EXT_T_0:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_T_1:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_T_2:
-            // Section 5.8.4.2
-            $str = $this->getStringTableEnty(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-            $this->_ch->characters($str);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_EXT_0:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_1:
-        case XML_WBXML_GLOBAL_TOKEN_EXT_2:
-            // Section 5.8.4.2
-            $extension = $this->getByte($input);
-            $this->_ch->characters($extension);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_ENTITY:
-            // Section 5.8.4.3
-            // UCS-4 chracter encoding?
-            $entity = $this->entity(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-
-            $this->_ch->characters('&#' . $entity . ';');
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_PI:
-            // Section 5.8.4.4
-            // throw new IOException
-            // die("WBXML global token processing instruction(PI, " + token + ") is unsupported!\n");
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_LITERAL:
-            // Section 5.8.4.5
-            $str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-            $this->parseTag($input, $str, false, false);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_LITERAL_A:
-            // Section 5.8.4.5
-            $str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-            $this->parseTag($input, $str, true, false);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_LITERAL_AC:
-            // Section 5.8.4.5
-            $str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-            $this->parseTag($input, $string, true, true);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_LITERAL_C:
-            // Section 5.8.4.5
-            $str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-            $this->parseTag($input, $str, false, true);
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
-            // Section 5.8.4.6
-            $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
-            if ($size > 0) {
-                #Horde::logMessage("WBXML opaque document size=$size, next=" . ord($input{$this->_strpos}), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-                $b = $this->_substr($input, $this->_strpos, $size);
-                // print "opaque of size $size: ($b)\n"; // @todo remove debug
-                $this->_strpos += $size;
-                // opaque data inside a <data> element may or may not be
-                // a nested wbxml document (for example devinf data).
-                // We find out by checking the first byte of the data: if it's
-                // 1, 2 or 3 we expect it to be the version number of a wbxml
-                // document and thus start a new wbxml decoder instance on it.
-
-                if ($this->_isData && ord($b) < 10) {
-            	    #Horde::logMessage("WBXML opaque document size=$size, \$b[0]=" . ord($b), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-                    $decoder = new XML_WBXML_Decoder(true);
-                    $decoder->setContentHandler($this->_ch);
-                    $s = $decoder->decode($b);
-            //                /* // @todo: FIXME currently we can't decode Nokia
-                    // DevInf data. So ignore error for the time beeing.
-                    if (is_a($s, 'PEAR_Error')) {
-                        $this->_error = $s;
-                        return;
-                    }
-                    // */
-                    // $this->_ch->characters($s);
-                } else {
-                    /* normal opaque behaviour: just copy the raw data: */
-                    // print "opaque handled as string=$b\n"; // @todo remove debug
-                    $this->_ch->characters($b);
-                }
-            }
-            // old approach to deal with opaque data inside ContentHandler:
-            // FIXME Opaque is used by SYNCML.  Opaque data that depends on the context
-            // if (contentHandler instanceof OpaqueContentHandler) {
-            //     ((OpaqueContentHandler)contentHandler).opaque(b);
-            // } else {
-            //     String str = new String(b, 0, size, charset);
-            //     char[] chars = str.toCharArray();
-
-            //     contentHandler.characters(chars, 0, chars.length);
-            // }
-
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_END:
-            // Section 5.8.4.7.1
-            $str = $this->endTag();
-            break;
-
-        case XML_WBXML_GLOBAL_TOKEN_SWITCH_PAGE:
-            // Section 5.8.4.7.2
-            $codePage = $this->getByte($input);
-            // print "switch to codepage $codePage\n"; // @todo: remove debug code
-            $this->switchElementCodePage($codePage);
-            break;
-
-        default:
-            // Section 5.8.2
-            // Section 5.8.3
-            $hasAttributes = (($token & 0x80) != 0);
-            $hasContent = (($token & 0x40) != 0);
-            $realToken = $token & 0x3F;
-            $str = $this->getTag($realToken);
-
-            // print "element:$str\n"; // @TODO Remove debug code
-            $this->parseTag($input, $str, $hasAttributes, $hasContent);
-
-            if ($realToken == 0x0f) {
-                // store if we're inside a Data tag. This may contain
-                // an additional enclosed wbxml document on which we have
-                // to run a seperate encoder
-                $this->_isData = true;
-            } else {
-                $this->_isData = false;
-            }
-            break;
+        	case XML_WBXML_GLOBAL_TOKEN_STR_I:
+            	// Section 5.8.4.1
+            	$str = $this->termstr($input);
+            	$this->_ch->characters($str);
+            	// print "str:$str\n"; // @TODO Remove debug code
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_STR_T:
+            	// Section 5.8.4.1
+            	$x = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
+            	$str = $this->getStringTableEntry($x);
+            	$this->_ch->characters($str);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_I_0:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_I_1:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_I_2:
+            	// Section 5.8.4.2
+            	$str = $this->termstr($input);
+            	$this->_ch->characters($str);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_T_0:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_T_1:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_T_2:
+            	// Section 5.8.4.2
+            	$str = $this->getStringTableEnty(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+            	$this->_ch->characters($str);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_0:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_1:
+        	case XML_WBXML_GLOBAL_TOKEN_EXT_2:
+            	// Section 5.8.4.2
+            	$extension = $this->getByte($input);
+            	$this->_ch->characters($extension);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_ENTITY:
+            	// Section 5.8.4.3
+            	// UCS-4 chracter encoding?
+            	$entity = $this->entity(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+
+            	$this->_ch->characters('&#' . $entity . ';');
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_PI:
+            	// Section 5.8.4.4
+            	// throw new IOException
+            	// die("WBXML global token processing instruction(PI, " + token + ") is unsupported!\n");
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_LITERAL:
+            	// Section 5.8.4.5
+            	$str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+            	$this->parseTag($input, $str, false, false);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_LITERAL_A:
+            	// Section 5.8.4.5
+            	$str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+            	$this->parseTag($input, $str, true, false);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_LITERAL_AC:
+            	// Section 5.8.4.5
+            	$str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+            	$this->parseTag($input, $string, true, true);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_LITERAL_C:
+            	// Section 5.8.4.5
+            	$str = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+            	$this->parseTag($input, $str, false, true);
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
+            	// Section 5.8.4.6
+            	$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
+            	if ($size > 0) {
+                	#Horde::logMessage("WBXML opaque document size=$size, next=" . ord($input{$this->_strpos}), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                	$b = $this->_substr($input, $this->_strpos, $size);
+                	// print "opaque of size $size: ($b)\n"; // @todo remove debug
+                	$this->_strpos += $size;
+                	// opaque data inside a <data> element may or may not be
+                	// a nested wbxml document (for example devinf data).
+                	// We find out by checking the first byte of the data: if it's
+                	// 1, 2 or 3 we expect it to be the version number of a wbxml
+                	// document and thus start a new wbxml decoder instance on it.
+
+                	if ($this->_isData && ord($b) < 10) {
+            	    	#Horde::logMessage("WBXML opaque document size=$size, \$b[0]=" . ord($b), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                    	$decoder = new XML_WBXML_Decoder(true);
+                    	$decoder->setContentHandler($this->_ch);
+                    	$s = $decoder->decode($b);
+            	//                /* // @todo: FIXME currently we can't decode Nokia
+                    	// DevInf data. So ignore error for the time beeing.
+                    	if (is_a($s, 'PEAR_Error')) {
+                        	$this->_error = $s;
+                        	return;
+                    	}
+                    	// */
+                    	// $this->_ch->characters($s);
+                	} else {
+                    	/* normal opaque behaviour: just copy the raw data: */
+                    	// print "opaque handled as string=$b\n"; // @todo remove debug
+                    	$this->_ch->characters($b);
+                	}
+            	}
+            	// old approach to deal with opaque data inside ContentHandler:
+            	// FIXME Opaque is used by SYNCML.  Opaque data that depends on the context
+            	// if (contentHandler instanceof OpaqueContentHandler) {
+            	//     ((OpaqueContentHandler)contentHandler).opaque(b);
+            	// } else {
+            	//     String str = new String(b, 0, size, charset);
+            	//     char[] chars = str.toCharArray();
+
+            	//     contentHandler.characters(chars, 0, chars.length);
+            	// }
+
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_END:
+            	// Section 5.8.4.7.1
+            	$str = $this->endTag();
+            	break;
+
+        	case XML_WBXML_GLOBAL_TOKEN_SWITCH_PAGE:
+            	// Section 5.8.4.7.2
+            	$codePage = $this->getByte($input);
+            	// print "switch to codepage $codePage\n"; // @todo: remove debug code
+            	$this->switchElementCodePage($codePage);
+            	break;
+
+        	default:
+            	// Section 5.8.2
+            	// Section 5.8.3
+            	$hasAttributes = (($token & 0x80) != 0);
+            	$hasContent = (($token & 0x40) != 0);
+            	$realToken = $token & 0x3F;
+            	$str = $this->getTag($realToken);
+
+            	// print "element:$str\n"; // @TODO Remove debug code
+            	$this->parseTag($input, $str, $hasAttributes, $hasContent);
+
+            	if ($realToken == 0x0f) {
+                	// store if we're inside a Data tag. This may contain
+                	// an additional enclosed wbxml document on which we have
+                	// to run a seperate encoder
+                	$this->_isData = true;
+            	} else {
+                	$this->_isData = false;
+            	}
+            	break;
         }
     }
 
@@ -497,93 +497,93 @@ 
 
             switch ($token) {
             // Attribute specified.
-            case XML_WBXML_GLOBAL_TOKEN_LITERAL:
-                // Section 5.8.4.5
-                if (isset($attr)) {
-                    $attrs[] = array('attribute' => $attr,
-                                     'value' => $value);
-                }
-
-                $attr = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-                break;
-
-            // Value specified.
-            case XML_WBXML_GLOBAL_TOKEN_EXT_I_0:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_I_1:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_I_2:
-                // Section 5.8.4.2
-                $value .= $this->termstr($input);
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_EXT_T_0:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_T_1:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_T_2:
-                // Section 5.8.4.2
-                $value .= $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_EXT_0:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_1:
-            case XML_WBXML_GLOBAL_TOKEN_EXT_2:
-                // Section 5.8.4.2
-                $value .= $input[$this->_strpos++];
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_ENTITY:
-                // Section 5.8.4.3
-                $value .= $this->entity(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_STR_I:
-                // Section 5.8.4.1
-                $value .= $this->termstr($input);
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_STR_T:
-                // Section 5.8.4.1
-                $value .= $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
-                // Section 5.8.4.6
-                $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
-                $b = $this->_substr($input, $this->_strpos, $this->_strpos + $size);
-                $this->_strpos += $size;
-
-                $value .= $b;
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_END:
-                // Section 5.8.4.7.1
-                $hasMoreAttributes = false;
-                if (isset($attr)) {
-                    $attrs[] = array('attribute' => $attr,
-                                     'value' => $value);
-                }
-                break;
-
-            case XML_WBXML_GLOBAL_TOKEN_SWITCH_PAGE:
-                // Section 5.8.4.7.2
-                $codePage = $this->getByte($input);
-                if (!$this->_prevAttributeDTD) {
-                    $this->_prevAttributeDTD = $this->_attributeDTD;
-                }
-
-                $this->switchAttributeCodePage($codePage);
-                break;
-
-            default:
-                if ($token > 128) {
-                    if (isset($attr)) {
-                        $attrs[] = array('attribute' => $attr,
-                                         'value' => $value);
-                    }
-                    $attr = $this->_attributeDTD->toAttribute($token);
-                } else {
-                    // Value.
-                    $value .= $this->_attributeDTD->toAttribute($token);
-                }
-                break;
+            	case XML_WBXML_GLOBAL_TOKEN_LITERAL:
+                	// Section 5.8.4.5
+                	if (isset($attr)) {
+                    	$attrs[] = array('attribute' => $attr,
+                                     	'value' => $value);
+                	}
+
+                	$attr = $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+                	break;
+
+            	// Value specified.
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_I_0:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_I_1:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_I_2:
+                	// Section 5.8.4.2
+                	$value .= $this->termstr($input);
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_T_0:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_T_1:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_T_2:
+                	// Section 5.8.4.2
+                	$value .= $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_0:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_1:
+            	case XML_WBXML_GLOBAL_TOKEN_EXT_2:
+                	// Section 5.8.4.2
+                	$value .= $input[$this->_strpos++];
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_ENTITY:
+                	// Section 5.8.4.3
+                	$value .= $this->entity(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_STR_I:
+                	// Section 5.8.4.1
+                	$value .= $this->termstr($input);
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_STR_T:
+                	// Section 5.8.4.1
+                	$value .= $this->getStringTableEntry(XML_WBXML::MBUInt32ToInt($input, $this->_strpos));
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
+                	// Section 5.8.4.6
+                	$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
+                	$b = $this->_substr($input, $this->_strpos, $this->_strpos + $size);
+                	$this->_strpos += $size;
+
+                	$value .= $b;
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_END:
+                	// Section 5.8.4.7.1
+                	$hasMoreAttributes = false;
+                	if (isset($attr)) {
+                    	$attrs[] = array('attribute' => $attr,
+                                     	'value' => $value);
+                	}
+                	break;
+
+            	case XML_WBXML_GLOBAL_TOKEN_SWITCH_PAGE:
+                	// Section 5.8.4.7.2
+                	$codePage = $this->getByte($input);
+                	if (!$this->_prevAttributeDTD) {
+                    	$this->_prevAttributeDTD = $this->_attributeDTD;
+                	}
+
+                	$this->switchAttributeCodePage($codePage);
+                	break;
+
+            	default:
+                	if ($token > 128) {
+                    	if (isset($attr)) {
+                        	$attrs[] = array('attribute' => $attr,
+                                         	'value' => $value);
+                    	}
+                    	$attr = $this->_attributeDTD->toAttribute($token);
+                	} else {
+                    	// Value.
+                    	$value .= $this->_attributeDTD->toAttribute($token);
+                	}
+                	break;
             }
         }
 

phpgwapi/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php

Switch Indentation +10 added lines, -10 removed lines

@@ -179,16 +179,16 @@
         } else if ($ns == "DAV:") {
             // parse only the essential tags
             switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
+            	case "write":
+                	$this->locktype = $tag;
+                	break;
+            	case "exclusive":
+            	case "shared":
+                	$this->lockscope = $tag;
+                	break;
+            	case "owner":
+                	$this->collect_owner = true;
+                	break;
             }
         }
     }

phpgwapi/inc/HTTP/WebDAV/Server/Filesystem.php

Switch Indentation +22 added lines, -22 removed lines

@@ -365,18 +365,18 @@ 
             //       the registry)
             // TODO: have a seperate PEAR class for mimetype detection?
             switch (strtolower(strrchr(basename($fspath), "."))) {
-            case ".html":
-                $mime_type = "text/html";
-                break;
-            case ".gif":
-                $mime_type = "image/gif";
-                break;
-            case ".jpg":
-                $mime_type = "image/jpeg";
-                break;
-            default:
-                $mime_type = "application/octet-stream";
-                break;
+            	case ".html":
+                	$mime_type = "text/html";
+                	break;
+            	case ".gif":
+                	$mime_type = "image/gif";
+                	break;
+            	case ".jpg":
+                	$mime_type = "image/jpeg";
+                	break;
+            	default:
+                	$mime_type = "application/octet-stream";
+                	break;
             }
         }
 
@@ -633,16 +633,16 @@ 
 
         if (is_dir($source)) { // resource is a collection
             switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
+            	case "infinity": // valid
+                	break;
+            	case "0": // valid for COPY only
+                	if ($del) { // MOVE?
+                    	return "400 Bad request";
+                	}
+                	break;
+            	case "1": // invalid for both COPY and MOVE
+            	default:
+                	return "400 Bad request";
             }
         }
 

phpgwapi/inc/HTTP/WebDAV/Server.php

Switch Indentation +179 added lines, -179 removed lines

@@ -816,34 +816,34 @@ 
 	            	// this can happen if we have allprop and prop in one propfind:
 	            	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
 	                switch(is_array($props) ? $props[0] : $props) {
-	                case "all":
-	                    // nothing to remove
-	                    break;
-
-	                case "names":
-	                    // only the names of all existing properties were requested
-	                    // so we remove all values
-	                    unset($prop["val"]);
-	                    break;
-
-	                default:
-	                    $found = false;
-
-	                    // search property name in requested properties
-	                    foreach ((array)$props as $reqprop) {
-	                        if (   $reqprop["name"]  == $prop["name"]
-	                               && @$reqprop["xmlns"] == $prop["ns"]) {
-	                            $found = true;
-	                            break;
-	                        }
-	                    }
-
-	                    // unset property and continue with next one if not found/requested
-	                    if (!$found) {
-	                        $prop="";
-	                        continue(2);
-	                    }
-	                    break;
+	                	case "all":
+	                    	// nothing to remove
+	                    	break;
+
+	                	case "names":
+	                    	// only the names of all existing properties were requested
+	                    	// so we remove all values
+	                    	unset($prop["val"]);
+	                    	break;
+
+	                	default:
+	                    	$found = false;
+
+	                    	// search property name in requested properties
+	                    	foreach ((array)$props as $reqprop) {
+	                        	if (   $reqprop["name"]  == $prop["name"]
+	                               	&& @$reqprop["xmlns"] == $prop["ns"]) {
+	                            	$found = true;
+	                            	break;
+	                        	}
+	                    	}
+
+	                    	// unset property and continue with next one if not found/requested
+	                    	if (!$found) {
+	                        	$prop="";
+	                        	continue(2);
+	                    	}
+	                    	break;
 	                }
 
 	                // namespace handling
@@ -964,49 +964,49 @@ 
                     } else if ($prop["ns"] == "DAV:") {
                         // some WebDAV properties need special treatment
                         switch ($prop["name"]) {
-                        case "creationdate":
-                            echo '     <'.($this->crrnd?'':'D:')."creationdate ns0:dt=\"dateTime.tz\">"
-                                . gmdate("Y-m-d\\TH:i:s\\Z", $prop['val'])
-                                . '</'.($this->crrnd?'':'D:')."creationdate>\n";
-                            break;
-                        case "getlastmodified":
-                            echo '     <'.($this->crrnd?'':'D:')."getlastmodified ns0:dt=\"dateTime.rfc1123\">"
-                                . gmdate("D, d M Y H:i:s ", $prop['val'])
-                                . "GMT</".($this->crrnd?'':'D:')."getlastmodified>\n";
-                            break;
-                        case "supportedlock":
-                            echo '     <'.($this->crrnd?'':'D:')."supportedlock>$prop[val]</".($this->crrnd?'':'D:')."supportedlock>\n";
-                            break;
-                        case "lockdiscovery":
-                            echo '     <'.($this->crrnd?'':'D:')."lockdiscovery>\n";
-                            echo $prop["val"];
-                            echo '     </'.($this->crrnd?'':'D:')."lockdiscovery>\n";
-                            break;
-                        // the following are non-standard Microsoft extensions to the DAV namespace
-                        case "lastaccessed":
-                            echo '     <'.($this->crrnd?'':'D:')."lastaccessed ns0:dt=\"dateTime.rfc1123\">"
-                                . gmdate("D, d M Y H:i:s ", $prop['val'])
-                                . 'GMT</'.($this->crrnd?'':'D:')."lastaccessed>\n";
-                            break;
-                        case "ishidden":
-                            echo '     <'.($this->crrnd?'':'D:')."ishidden>"
-                                . is_string($prop['val']) ? $prop['val'] : ($prop['val'] ? 'true' : 'false')
-                                . '</'.($this->crrnd?'':'D:')."</D:ishidden>\n";
-                            break;
-                        default:
-                        	$ns_defs = '';
-                            if (is_array($prop['val']))
-                            {
-                            	$hns_hash = $ns_hash;
-                            	$val = $this->_hierarchical_prop_encode($prop['val'], 'DAV:', $ns_defs, $hns_hash);
-                            } elseif (isset($prop['raw'])) {
-                            	$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
-                            } else {
-	                    		$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
-                            }
-	                        echo '     <'.($this->crrnd?'':'D:')."$prop[name]$ns_defs>$val".
-	                        	'</'.($this->crrnd?'':'D:')."$prop[name]>\n";
-                            break;
+                        	case "creationdate":
+                            	echo '     <'.($this->crrnd?'':'D:')."creationdate ns0:dt=\"dateTime.tz\">"
+                                	. gmdate("Y-m-d\\TH:i:s\\Z", $prop['val'])
+                                	. '</'.($this->crrnd?'':'D:')."creationdate>\n";
+                            	break;
+                        	case "getlastmodified":
+                            	echo '     <'.($this->crrnd?'':'D:')."getlastmodified ns0:dt=\"dateTime.rfc1123\">"
+                                	. gmdate("D, d M Y H:i:s ", $prop['val'])
+                                	. "GMT</".($this->crrnd?'':'D:')."getlastmodified>\n";
+                            	break;
+                        	case "supportedlock":
+                            	echo '     <'.($this->crrnd?'':'D:')."supportedlock>$prop[val]</".($this->crrnd?'':'D:')."supportedlock>\n";
+                            	break;
+                        	case "lockdiscovery":
+                            	echo '     <'.($this->crrnd?'':'D:')."lockdiscovery>\n";
+                            	echo $prop["val"];
+                            	echo '     </'.($this->crrnd?'':'D:')."lockdiscovery>\n";
+                            	break;
+                        	// the following are non-standard Microsoft extensions to the DAV namespace
+                        	case "lastaccessed":
+                            	echo '     <'.($this->crrnd?'':'D:')."lastaccessed ns0:dt=\"dateTime.rfc1123\">"
+                                	. gmdate("D, d M Y H:i:s ", $prop['val'])
+                                	. 'GMT</'.($this->crrnd?'':'D:')."lastaccessed>\n";
+                            	break;
+                        	case "ishidden":
+                            	echo '     <'.($this->crrnd?'':'D:')."ishidden>"
+                                	. is_string($prop['val']) ? $prop['val'] : ($prop['val'] ? 'true' : 'false')
+                                	. '</'.($this->crrnd?'':'D:')."</D:ishidden>\n";
+                            	break;
+                        	default:
+                        		$ns_defs = '';
+                            	if (is_array($prop['val']))
+                            	{
+                            		$hns_hash = $ns_hash;
+                            		$val = $this->_hierarchical_prop_encode($prop['val'], 'DAV:', $ns_defs, $hns_hash);
+                            	} elseif (isset($prop['raw'])) {
+                            		$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
+                            	} else {
+	                    			$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
+                            	}
+	                        	echo '     <'.($this->crrnd?'':'D:')."$prop[name]$ns_defs>$val".
+	                        		'</'.($this->crrnd?'':'D:')."$prop[name]>\n";
+                            	break;
                         }
                     } else {
                         // allow multiple values and attributes, required eg. for caldav:supported-calendar-component-set
@@ -1761,9 +1761,9 @@ 
             foreach ($this->_SERVER as $key => $val) {
                 if (strncmp($key, "HTTP_CONTENT", 11)) continue;
                 switch ($key) {
-                case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
-		        	switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
-		        	{
+                	case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
+		        		switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
+		        		{
 		        		case 'gzip':
 		        		case 'deflate':	//zlib
 		        			if (extension_loaded('zlib')) break;
@@ -1772,67 +1772,67 @@ 
 					        $this->http_status('415 Unsupported Media Type');
 					        echo "The service does not support '$val' content encoding";
 					        return;
-		        	}
+		        		}
 		        	break;
 
-                case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
-                    // we assume it is not critical if this one is ignored
-                    // in the actual PUT implementation ...
-                    $options["content_language"] = $val;
-                    break;
+                	case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
+                    	// we assume it is not critical if this one is ignored
+                    	// in the actual PUT implementation ...
+                    	$options["content_language"] = $val;
+                    	break;
 
-                case 'HTTP_CONTENT_LENGTH':
-                    // defined on IIS and has the same value as CONTENT_LENGTH
-                    break;
+                	case 'HTTP_CONTENT_LENGTH':
+                    	// defined on IIS and has the same value as CONTENT_LENGTH
+                    	break;
 
-                case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
-                    /* The meaning of the Content-Location header in PUT
+                	case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
+                    	/* The meaning of the Content-Location header in PUT
                      or POST requests is undefined; servers are free
                      to ignore it in those cases. */
-                    break;
-
-                case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
-                    // single byte range requests are supported
-                    // the header format is also specified in RFC 2616 14.16
-                    // TODO we have to ensure that implementations support this or send 501 instead
-					$matches = null;
-                    if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
-                        $this->http_status("400 bad request");
-                        echo "The service does only support single byte ranges";
-                        return;
-                    }
-
-                    $range = array("start" => $matches[1], "end" => $matches[2]);
-                    if (is_numeric($matches[3])) {
-                        $range["total_length"] = $matches[3];
-                    }
-
-                    if (!isset($options['ranges'])) {
-                        $options['ranges'] = array();
-                    }
-
-                    $options["ranges"][] = $range;
-
-                    // TODO make sure the implementation supports partial PUT
-                    // this has to be done in advance to avoid data being overwritten
-                    // on implementations that do not support this ...
-                    break;
-
-                case 'HTTP_CONTENT_TYPE':
-                    // defined on IIS and has the same value as CONTENT_TYPE
-                    break;
-
-                case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
-                    // TODO: maybe we can just pretend here?
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support content MD5 checksum verification";
-                    return;
-
-                default:
-                    // any other unknown Content-* headers
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$key'";
-                    return;
+                    	break;
+
+                	case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
+                    	// single byte range requests are supported
+                    	// the header format is also specified in RFC 2616 14.16
+                    	// TODO we have to ensure that implementations support this or send 501 instead
+						$matches = null;
+                    	if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
+                        	$this->http_status("400 bad request");
+                        	echo "The service does only support single byte ranges";
+                        	return;
+                    	}
+
+                    	$range = array("start" => $matches[1], "end" => $matches[2]);
+                    	if (is_numeric($matches[3])) {
+                        	$range["total_length"] = $matches[3];
+                    	}
+
+                    	if (!isset($options['ranges'])) {
+                        	$options['ranges'] = array();
+                    	}
+
+                    	$options["ranges"][] = $range;
+
+                    	// TODO make sure the implementation supports partial PUT
+                    	// this has to be done in advance to avoid data being overwritten
+                    	// on implementations that do not support this ...
+                    	break;
+
+                	case 'HTTP_CONTENT_TYPE':
+                    	// defined on IIS and has the same value as CONTENT_TYPE
+                    	break;
+
+                	case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
+                    	// TODO: maybe we can just pretend here?
+                    	$this->http_status("501 not implemented");
+                    	echo "The service does not support content MD5 checksum verification";
+                    	return;
+
+                	default:
+                    	// any other unknown Content-* headers
+                    	$this->http_status("501 not implemented");
+                    	echo "The service does not support '$key'";
+                    	return;
                 }
             }
 
@@ -2390,34 +2390,34 @@ 
 
         // now it depends on what we found
         switch ($c) {
-        case "<":
-            // URIs are enclosed in <...>
-            $pos2 = strpos($string, ">", $pos);
-            $uri  = substr($string, $pos, $pos2 - $pos);
-            $pos  = $pos2 + 1;
-            return array("URI", $uri);
-
-        case "[":
-            //Etags are enclosed in [...]
-            if ($string{$pos} == "W") {
-                $type = "ETAG_WEAK";
-                $pos += 2;
-            } else {
-                $type = "ETAG_STRONG";
-            }
-            $pos2 = strpos($string, "]", $pos);
-            $etag = substr($string, $pos + 1, $pos2 - $pos - 2);
-            $pos  = $pos2 + 1;
-            return array($type, $etag);
-
-        case "N":
-            // "N" indicates negation
-            $pos += 2;
-            return array("NOT", "Not");
-
-        default:
-            // anything else is passed verbatim char by char
-            return array("CHAR", $c);
+        	case "<":
+            	// URIs are enclosed in <...>
+            	$pos2 = strpos($string, ">", $pos);
+            	$uri  = substr($string, $pos, $pos2 - $pos);
+            	$pos  = $pos2 + 1;
+            	return array("URI", $uri);
+
+        	case "[":
+            	//Etags are enclosed in [...]
+            	if ($string{$pos} == "W") {
+                	$type = "ETAG_WEAK";
+                	$pos += 2;
+            	} else {
+                	$type = "ETAG_STRONG";
+            	}
+            	$pos2 = strpos($string, "]", $pos);
+            	$etag = substr($string, $pos + 1, $pos2 - $pos - 2);
+            	$pos  = $pos2 + 1;
+            	return array($type, $etag);
+
+        	case "N":
+            	// "N" indicates negation
+            	$pos += 2;
+            	return array("NOT", "Not");
+
+        	default:
+            	// anything else is passed verbatim char by char
+            	return array("CHAR", $c);
         }
     }
 
@@ -2461,33 +2461,33 @@ 
                     continue;
                 }
                 switch ($token[0]) {
-                case "CHAR":
-                    switch ($token[1]) {
-                    case "(":
-                        $level++;
-                        break;
-                    case ")":
-                        $level--;
-                        break;
-                    default:
-                        return false;
-                    }
+                	case "CHAR":
+                    	switch ($token[1]) {
+                    		case "(":
+                        		$level++;
+                        		break;
+                    		case ")":
+                        		$level--;
+                        		break;
+                    		default:
+                        		return false;
+                    	}
                     break;
 
-                case "URI":
-                    $list[] = $not."<$token[1]>";
-                    break;
+                	case "URI":
+                    	$list[] = $not."<$token[1]>";
+                    	break;
 
-                case "ETAG_WEAK":
-                    $list[] = $not."[W/'$token[1]']>";
-                    break;
+                	case "ETAG_WEAK":
+                    	$list[] = $not."[W/'$token[1]']>";
+                    	break;
 
-                case "ETAG_STRONG":
-                    $list[] = $not."['$token[1]']>";
-                    break;
+                	case "ETAG_STRONG":
+                    	$list[] = $not."['$token[1]']>";
+                    	break;
 
-                default:
-                    return false;
+                	default:
+                    	return false;
                 }
                 $not = "";
             }

phpgwapi/inc/savant2/Savant2.php

Switch Indentation +6 added lines, -6 removed lines

@@ -506,12 +506,12 @@
 		
 		// always add the fallback directories as last resort
 		switch (strtolower($type)) {
-		case 'template':
-			$this->addPath($type, '.');
-			break;
-		case 'resource':
-			$this->addPath($type, dirname(__FILE__) . '/Savant2/');
-			break;
+			case 'template':
+				$this->addPath($type, '.');
+				break;
+			case 'resource':
+				$this->addPath($type, dirname(__FILE__) . '/Savant2/');
+				break;
 		}
 		
 		// actually add the user-specified directories

phpgwapi/inc/savant2/Savant2/Savant2_Plugin_form.php

Switch Indentation +17 added lines, -17 removed lines

@@ -1023,17 +1023,17 @@ 
 		
 		switch (strtolower($action)) {
 		
-		case 'start':
-			return $this->_blockStart($label, $type, $float, $clear);
-			break;
+			case 'start':
+				return $this->_blockStart($label, $type, $float, $clear);
+				break;
 		
-		case 'split':
-			return $this->_blockSplit();
-			break;
+			case 'split':
+				return $this->_blockSplit();
+				break;
 		
-		case 'end':
-			return $this->_blockEnd();
-			break;
+			case 'end':
+				return $this->_blockEnd();
+				break;
 		
 		}
 		
@@ -1577,15 +1577,15 @@ 
 		// end the current block and start a new one
 		switch ($this->_blockType) {
 		
-		case 'row':
-			$xhtml .= '</tr>';
-			$xhtml .= $this->_tag('tr');
-			break;
+			case 'row':
+				$xhtml .= '</tr>';
+				$xhtml .= $this->_tag('tr');
+				break;
 		
-		case 'col':
-			$xhtml .= '</table>';
-			$xhtml .= $this->_tag('table');
-			break;
+			case 'col':
+				$xhtml .= '</table>';
+				$xhtml .= $this->_tag('table');
+				break;
 		}
 		
 		// done!