EGroupware / egroupware

api/src/Vfs/WebDAV.php

Switch Indentation +10 added lines, -10 removed lines

@@ -171,16 +171,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";
             }
         }
 

api/src/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;
             }
         }
     }

api/src/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 = "";
             }

api/src/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";
             }
         }
 

api/src/Mail/Imap.php

Switch Indentation +30 added lines, -30 removed lines

@@ -580,16 +580,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -664,16 +664,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -730,16 +730,16 @@ 
 
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$mailbox = $reference."*";
-				break;
-			case 1:
-				$mailbox = $reference;
-				$reference = '%';
-				break;
-			case 2:
-				$mailbox = "%";
-				break;
+				case 0:
+					$mailbox = $reference."*";
+					break;
+				case 1:
+					$mailbox = $reference;
+					$reference = '%';
+					break;
+				case 2:
+					$mailbox = "%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

@@ -68,91 +68,91 @@
 
 switch($action)
 {
-	case '--version':
-	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
-		break;
-
-	case '--create-header':
-	case '--edit-header':
-	case '--upgrade-header':
-	case '--update-header':
-		do_header($action == '--create-header',$arguments);
-		break;
-
-	case '--install':
-		do_install($arguments);
-		break;
-
-	case '--config':
-		do_config($arguments);
-		break;
-
-	case '--admin':
-		do_admin($arguments[0]);
-		break;
-
-	case '--update':
-		do_update($arguments[0]);
-		break;
-
-	case '--register-hooks':
-	case '--register-all-hooks':
-		do_hooks($arguments[0]);
-		break;
-
-	case '--backup':
-		do_backup($arguments[0]);
-		break;
-
-	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
-		break;
-
-	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
-		break;
-
-	case '--exit-codes':
-		list_exit_codes();
-		break;
-
-	case '--help':
-	case '--usage':
-		do_usage($arguments[0]);
-		break;
-
-	default:
-		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
-		{
-			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+		case '--version':
+		case '--check':
+			setup_cmd::check_installed($arguments[0],0,true);
+			break;
+
+		case '--create-header':
+		case '--edit-header':
+		case '--upgrade-header':
+		case '--update-header':
+			do_header($action == '--create-header',$arguments);
+			break;
+
+		case '--install':
+			do_install($arguments);
+			break;
+
+		case '--config':
+			do_config($arguments);
+			break;
+
+		case '--admin':
+			do_admin($arguments[0]);
+			break;
+
+		case '--update':
+			do_update($arguments[0]);
+			break;
+
+		case '--register-hooks':
+		case '--register-all-hooks':
+			do_hooks($arguments[0]);
+			break;
+
+		case '--backup':
+			do_backup($arguments[0]);
+			break;
+
+		case '--languages':
+			echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+			break;
+
+		case '--charsets':
+			echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+			break;
+
+		case '--exit-codes':
+			list_exit_codes();
+			break;
+
+		case '--help':
+		case '--usage':
+			do_usage($arguments[0]);
+			break;
+
+		default:
+			// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
+			if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
+				is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
-				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
-				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				$args = array();
+				list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
+				foreach($arguments as $arg)
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
-					$args[$name][$sub] = $value;
-				}
-				else
-				{
-					$args[$name] = $value;
+					list($name,$value) = explode('=',$arg,2);
+					if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+					{
+						throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					}
+					if (substr($name,-1) == ']')	// allow 1-dim. arrays
+					{
+						list($name,$sub) = explode('[',substr($name,0,-1),2);
+						$args[$name][$sub] = $value;
+					}
+					else
+					{
+						$args[$name] = $value;
+					}
 				}
+				$cmd = new $class($args);
+				$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
+				if (is_array($msg)) $msg = print_r($msg,true);
+				echo "$msg\n";
+				break;
 			}
-			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
-			echo "$msg\n";
-			break;
-		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

setup/index.php

Switch Indentation +93 added lines, -93 removed lines

@@ -184,17 +184,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -227,77 +227,77 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
-			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
+				isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -376,7 +376,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (Api\Db\Exception $e)
 		{
@@ -388,21 +388,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

admin/apcu.php

Switch Indentation +284 added lines, -284 removed lines

@@ -344,105 +344,105 @@ 
 
 	switch ($MYREQUEST['IMG']) {
 
-	case 1:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=$y=$size/2;
-		$fuzz = 0.000001;
-
-		// This block of code creates the pie chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		$angle_from = 0;
-		$string_placement=array();
-		for($i=0; $i<$mem['num_seg']; $i++) {
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$angle_to = $angle_from+($block['offset']-$ptr)/$s;
+		case 1:
+			$s=$mem['num_seg']*$mem['seg_size'];
+			$a=$mem['avail_mem'];
+			$x=$y=$size/2;
+			$fuzz = 0.000001;
+
+			// This block of code creates the pie chart.  It is a lot more complex than you
+			// would expect because we try to visualize any memory fragmentation as well.
+			$angle_from = 0;
+			$string_placement=array();
+			for($i=0; $i<$mem['num_seg']; $i++) {
+				$ptr = 0;
+				$free = $mem['block_lists'][$i];
+				uasort($free, 'block_sort');
+				foreach($free as $block) {
+					if($block['offset']!=$ptr) {       // Used block
+						$angle_to = $angle_from+($block['offset']-$ptr)/$s;
+						if(($angle_to+$fuzz)>1) $angle_to = 1;
+						if( ($angle_to*360) - ($angle_from*360) >= 1) {
+							fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+							if (($angle_to-$angle_from)>0.05) {
+								array_push($string_placement, array($angle_from,$angle_to));
+							}
+						}
+						$angle_from = $angle_to;
+					}
+					$angle_to = $angle_from+($block['size'])/$s;
 					if(($angle_to+$fuzz)>1) $angle_to = 1;
 					if( ($angle_to*360) - ($angle_from*360) >= 1) {
-						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
 						if (($angle_to-$angle_from)>0.05) {
 							array_push($string_placement, array($angle_from,$angle_to));
 						}
 					}
 					$angle_from = $angle_to;
+					$ptr = $block['offset']+$block['size'];
 				}
-				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				if( ($angle_to*360) - ($angle_from*360) >= 1) {
-					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
+				if ($ptr < $mem['seg_size']) { // memory at the end
+					$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
+					if(($angle_to+$fuzz)>1) $angle_to = 1;
+					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
 					if (($angle_to-$angle_from)>0.05) {
 						array_push($string_placement, array($angle_from,$angle_to));
 					}
 				}
-				$angle_from = $angle_to;
-				$ptr = $block['offset']+$block['size'];
 			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
-				$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-				if (($angle_to-$angle_from)>0.05) {
-					array_push($string_placement, array($angle_from,$angle_to));
-				}
+			foreach ($string_placement as $angle) {
+				text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
 			}
-		}
-		foreach ($string_placement as $angle) {
-			text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
-		}
-		break;
-
-	case 2:
-		$s=$cache['num_hits']+$cache['num_misses'];
-		$a=$cache['num_hits'];
+			break;
 
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['num_hits']*100/$s : 0));
-		fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%",$s ? $cache['num_misses']*100/$s : 0));
-		break;
-
-	case 3:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=130;
-		$y=1;
-		$j=1;
+		case 2:
+			$s=$cache['num_hits']+$cache['num_misses'];
+			$a=$cache['num_hits'];
 
-		// This block of code creates the bar chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		for($i=0; $i<$mem['num_seg']; $i++) {
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
+			fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['num_hits']*100/$s : 0));
+			fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%",$s ? $cache['num_misses']*100/$s : 0));
+			break;
+
+		case 3:
+			$s=$mem['num_seg']*$mem['seg_size'];
+			$a=$mem['avail_mem'];
+			$x=130;
+			$y=1;
+			$j=1;
+
+			// This block of code creates the bar chart.  It is a lot more complex than you
+			// would expect because we try to visualize any memory fragmentation as well.
+			for($i=0; $i<$mem['num_seg']; $i++) {
+				$ptr = 0;
+				$free = $mem['block_lists'][$i];
+				uasort($free, 'block_sort');
+				foreach($free as $block) {
+					if($block['offset']!=$ptr) {       // Used block
+						$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
+						if ($h>0) {
+                                                	$j++;
+							if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
+                                                	else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+                                        	}
+						$y+=$h;
+					}
+					$h=(GRAPH_SIZE-5)*($block['size'])/$s;
 					if ($h>0) {
-                                                $j++;
-						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
-                                        }
+                                        	$j++;
+						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
+						else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+                                	}
 					$y+=$h;
+					$ptr = $block['offset']+$block['size'];
 				}
-				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
-				if ($h>0) {
-                                        $j++;
-					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
-					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
-                                }
-				$y+=$h;
-				$ptr = $block['offset']+$block['size'];
-			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
-				$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
-				if ($h > 0) {
-					fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+				if ($ptr < $mem['seg_size']) { // memory at the end
+					$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
+					if ($h > 0) {
+						fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+					}
 				}
 			}
-		}
-		break;
+			break;
 
 		case 4:
 			$s=$cache['num_hits']+$cache['num_misses'];
@@ -769,40 +769,40 @@ 
 // -----------------------------------------------
 // Host Stats
 // -----------------------------------------------
-case OB_HOST_STATS:
-	$mem_size = $mem['num_seg']*$mem['seg_size'];
-	$mem_avail= $mem['avail_mem'];
-	$mem_used = $mem_size-$mem_avail;
-	$seg_size = bsize($mem['seg_size']);
-	$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'])/($time-$cache['start_time'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/($time-$cache['start_time'])) : 0);
-	$apcversion = phpversion('apcu');
-	$phpversion = phpversion();
-	$number_vars = $cache['num_entries'];
-    $size_vars = bsize($cache['mem_size']);
-	$i=0;
-	echo <<< EOB
+	case OB_HOST_STATS:
+		$mem_size = $mem['num_seg']*$mem['seg_size'];
+		$mem_avail= $mem['avail_mem'];
+		$mem_used = $mem_size-$mem_avail;
+		$seg_size = bsize($mem['seg_size']);
+		$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])) : 0);
+		$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'])/($time-$cache['start_time'])) : 0);
+		$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses'])/($time-$cache['start_time'])) : 0);
+		$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/($time-$cache['start_time'])) : 0);
+		$apcversion = phpversion('apcu');
+		$phpversion = phpversion();
+		$number_vars = $cache['num_entries'];
+    	$size_vars = bsize($cache['mem_size']);
+		$i=0;
+		echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
 		<table cellspacing=0><tbody>
 		<tr class=tr-0><td class=td-0>APCu Version</td><td>$apcversion</td></tr>
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
-EOB;
+	EOB;
 
-	if(!empty($_SERVER['SERVER_NAME']))
-		echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
-	if(!empty($_SERVER['SERVER_SOFTWARE']))
-		echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
+		if(!empty($_SERVER['SERVER_NAME']))
+			echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
+		if(!empty($_SERVER['SERVER_SOFTWARE']))
+			echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
 
-	echo <<<EOB
-		<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
+		echo <<<EOB
+			<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
     <br/> ({$cache['memory_type']} memory)
     </td></tr>
 EOB;
-	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
-	echo <<<EOB
+		echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
+		echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
+		echo <<<EOB
 		</tbody></table>
 		</div>
 
@@ -824,46 +824,46 @@ 
 		<div class="info div2"><h2>Runtime Settings</h2><table cellspacing=0><tbody>
 EOB;
 
-	$j = 0;
-	foreach (ini_get_all('apcu') as $k => $v) {
-		echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
-		$j = 1 - $j;
-	}
+		$j = 0;
+		foreach (ini_get_all('apcu') as $k => $v) {
+			echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
+			$j = 1 - $j;
+		}
 
-	if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
-		$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
-	else
-		$mem_note = "Memory Usage";
+		if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
+			$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
+		else
+			$mem_note = "Memory Usage";
 
-	echo <<< EOB
+		echo <<< EOB
 		</tbody></table>
 		</div>
 
 		<div class="graph div3"><h2>Host Status Diagrams</h2>
 		<table cellspacing=0><tbody>
 EOB;
-	$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
-echo <<<EOB
+		$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
+	echo <<<EOB
 		<tr>
 		<td class=td-0>$mem_note</td>
 		<td class=td-1>Hits &amp; Misses</td>
 		</tr>
 EOB;
 
-	echo
-		graphics_avail() ?
-			  '<tr>'.
-			  "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
-			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
-			: "",
-		'<tr>',
-		'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].@sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
-		'</tr>',
-		'<tr>',
-		'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].@sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
-	echo <<< EOB
+		echo
+			graphics_avail() ?
+			  	'<tr>'.
+			  	"<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
+			  	"<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
+				: "",
+			'<tr>',
+			'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
+			'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].@sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
+			'</tr>',
+			'<tr>',
+			'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
+			'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].@sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
+		echo <<< EOB
 		</tr>
 		</tbody></table>
 
@@ -874,141 +874,141 @@ 
 		<td class=td-0 colspan=2><br/>
 EOB;
 
-	// Fragementation: (freeseg - 1) / total_seg
-	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for($i=0; $i<$mem['num_seg']; $i++) {
-		$ptr = 0;
-		foreach($mem['block_lists'][$i] as $block) {
-			if ($block['offset'] != $ptr) {
-				++$nseg;
+		// Fragementation: (freeseg - 1) / total_seg
+		$nseg = $freeseg = $fragsize = $freetotal = 0;
+		for($i=0; $i<$mem['num_seg']; $i++) {
+			$ptr = 0;
+			foreach($mem['block_lists'][$i] as $block) {
+				if ($block['offset'] != $ptr) {
+					++$nseg;
+				}
+				$ptr = $block['offset'] + $block['size'];
+                        	/* Only consider blocks <5M for the fragmentation % */
+                        	if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+                        	$freetotal+=$block['size'];
 			}
-			$ptr = $block['offset'] + $block['size'];
-                        /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
+			$freeseg += count($mem['block_lists'][$i]);
 		}
-		$freeseg += count($mem['block_lists'][$i]);
-	}
 
-	if ($freeseg > 1) {
-		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
-	} else {
-		$frag = "0%";
-	}
+		if ($freeseg > 1) {
+			$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
+		} else {
+			$frag = "0%";
+		}
 
-	if (graphics_avail()) {
-		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+		if (graphics_avail()) {
+			$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+			echo <<<EOB
+				<img alt="" $size src="$PHP_SELF?IMG=3&$time">
+	EOB;
+		}
 		echo <<<EOB
-			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
-EOB;
-	}
-	echo <<<EOB
-		</br>Fragmentation: $frag
+			</br>Fragmentation: $frag
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
-            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
-          }
-        }
-        echo <<<EOB
+        	if(isset($mem['adist'])) {
+          	foreach($mem['adist'] as $i=>$v) {
+            	$cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
+            	if($i==0) $range = "1";
+            	else $range = "$cur - $nxt";
+            	echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
+          	}
+        	}
+        	echo <<<EOB
 		</tbody></table>
 		</div>
 EOB;
 
-	break;
+		break;
 
 
-// -----------------------------------------------
-// User Cache Entries
-// -----------------------------------------------
-case OB_USER_CACHE:
-	if (!$AUTHENTICATED) {
-    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
-		put_login_link("Login now!");
-		echo '</div>';
-		break;
-	}
-	$fieldname='info';
-	$fieldheading='User Entry Label';
-	$fieldkey='info';
+	// -----------------------------------------------
+	// User Cache Entries
+	// -----------------------------------------------
+	case OB_USER_CACHE:
+		if (!$AUTHENTICATED) {
+    	echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
+			put_login_link("Login now!");
+			echo '</div>';
+			break;
+		}
+		$fieldname='info';
+		$fieldheading='User Entry Label';
+		$fieldkey='info';
 
-	$cols=6;
-	echo <<<EOB
+		$cols=6;
+		echo <<<EOB
 		<div class=sorting><form>Scope:
 		<input type=hidden name=OB value={$MYREQUEST['OB']}>
 		<select name=SCOPE>
 EOB;
-	echo
-		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
-		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
-		"</select>",
-		", Sorting:<select name=SORT1>",
-		"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
-		"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
-		"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
-		"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
-		"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
-		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
-		"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
-	if($fieldname=='info') echo
-		"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
-	echo
-		'</select>',
-		'<select name=SORT2>',
-		'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
-		'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
-		'</select>',
-		'<select name=COUNT onChange="form.submit()">',
-		'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
-		'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
-		'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
-		'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
-		'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
-		'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
-		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
-		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
-		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
-		'&nbsp;<input type=submit value="GO!">',
-		'</form></div>';
-
-  if (isset($MYREQUEST['SEARCH'])) {
-   // Don't use preg_quote because we want the user to be able to specify a
-   // regular expression subpattern.
-   $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
-   if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
-     echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
-     break;
-   }
-  }
-
-  echo
-		'<div class="info"><table cellspacing=0><tbody>',
-		'<tr>',
-		'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
-
-	if($fieldname=='info') {
-		$cols+=2;
-		 echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
-	}
-	echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
+		echo
+			"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
+			"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
+			"</select>",
+			", Sorting:<select name=SORT1>",
+			"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
+			"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
+			"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
+			"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
+			"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
+			"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
+			"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
+		if($fieldname=='info') echo
+			"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
+		echo
+			'</select>',
+			'<select name=SORT2>',
+			'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
+			'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
+			'</select>',
+			'<select name=COUNT onChange="form.submit()">',
+			'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
+			'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
+			'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
+			'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
+			'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
+			'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
+			'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
+			'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
+			'</select>',
+    	'&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+			'&nbsp;<input type=submit value="GO!">',
+			'</form></div>';
+
+  	if (isset($MYREQUEST['SEARCH'])) {
+   	// Don't use preg_quote because we want the user to be able to specify a
+   	// regular expression subpattern.
+   	$MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
+   	if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
+     	echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
+     	break;
+   	}
+  	}
+
+  	echo
+			'<div class="info"><table cellspacing=0><tbody>',
+			'<tr>',
+			'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
+
+		if($fieldname=='info') {
+			$cols+=2;
+		 	echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
+		}
+		echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
 
-	// builds list with alpha numeric sortable keys
-	//
-	$list = array();
+		// builds list with alpha numeric sortable keys
+		//
+		$list = array();
 
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
+		foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+			switch($MYREQUEST['SORT1']) {
 			case 'A': $k=sprintf('%015d-',$entry['access_time']);  	     break;
 			case 'H': $k=sprintf('%015d-',$entry['num_hits']); 	     break;
 			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 	     break;
@@ -1017,7 +1017,7 @@ 
 			case 'T': $k=sprintf('%015d-',$entry['ttl']);		     break;
 			case 'D': $k=sprintf('%015d-',$entry['deletion_time']);      break;
 			case 'S': $k=$entry["info"];				     break;
-		}
+			}
 		if (!$AUTHENTICATED) {
 			// hide all path entries if not logged in
 			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
@@ -1097,61 +1097,61 @@ 
 // -----------------------------------------------
 // Version check
 // -----------------------------------------------
-case OB_VERSION_CHECK:
-	echo <<<EOB
+	case OB_VERSION_CHECK:
+		echo <<<EOB
 		<div class="info"><h2>APCu Version Information</h2>
 		<table cellspacing=0><tbody>
 		<tr>
 		<th></th>
 		</tr>
 EOB;
-  if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
-  } else {
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
-  }
-	if (!$rss) {
-		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
-	} else {
-		$apcversion = phpversion('apcu');
-
-		preg_match('!<title>APCu ([0-9.]+)</title>!', $rss, $match);
-		echo '<tr class="tr-0 center"><td>';
-		if (version_compare($apcversion, $match[1], '>=')) {
-			echo '<div class="ok">You are running the latest version of APCu ('.$apcversion.')</div>';
-			$i = 3;
+  	if (defined('PROXY')) {
+    	$ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+    	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
+  	} else {
+    	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
+  	}
+		if (!$rss) {
+			echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
 		} else {
-			echo '<div class="failed">You are running an older version of APCu ('.$apcversion.'),
+			$apcversion = phpversion('apcu');
+
+			preg_match('!<title>APCu ([0-9.]+)</title>!', $rss, $match);
+			echo '<tr class="tr-0 center"><td>';
+			if (version_compare($apcversion, $match[1], '>=')) {
+				echo '<div class="ok">You are running the latest version of APCu ('.$apcversion.')</div>';
+				$i = 3;
+			} else {
+				echo '<div class="failed">You are running an older version of APCu ('.$apcversion.'),
 				newer version '.$match[1].' is available at <a href="http://pecl.php.net/package/APCu/'.$match[1].'">
 				http://pecl.php.net/package/APCu/'.$match[1].'</a>
 				</div>';
-			$i = -1;
-		}
-		echo '</td></tr>';
-		echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
-
-		preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
-		next($match[2]); next($match[2]);
-
-		while (list(,$v) = each($match[2])) {
-			list(,$ver) = explode(' ', $v, 2);
-			if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
-				break;
-			} else if (!$i--) {
-				break;
+				$i = -1;
+			}
+			echo '</td></tr>';
+			echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
+
+			preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
+			next($match[2]); next($match[2]);
+
+			while (list(,$v) = each($match[2])) {
+				list(,$ver) = explode(' ', $v, 2);
+				if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
+					break;
+				} else if (!$i--) {
+					break;
+				}
+				echo "<b><a href=\"http://pecl.php.net/package/APCu/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
+				echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
+				next($match[2]);
 			}
-			echo "<b><a href=\"http://pecl.php.net/package/APCu/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
-			echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
-			next($match[2]);
+			echo '</td></tr>';
 		}
-		echo '</td></tr>';
-	}
-	echo <<< EOB
+		echo <<< EOB
 		</tbody></table>
 		</div>
 EOB;
-	break;
+		break;
 
 }
 

calendar/inc/class.calendar_uiforms.inc.php

Switch Indentation +229 added lines, -229 removed lines

@@ -584,214 +584,214 @@ 
 
 		switch((string)$button)
 		{
-		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
-			break;
+			case 'exception':	// create an exception in a recuring event
+				$msg = $this->_create_exception($event,$preserv);
+				break;
 
-		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
-			unset($event['id']);
-			unset($event['uid']);
-			unset($event['reference']);
-			unset($preserv['reference']);
-			unset($event['recurrence']);
-			unset($preserv['recurrence']);
-			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
-			unset($event['modified']);
-			unset($event['modifier']);
-			unset($event['caldav_name']);
-			$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD,0,$event['owner']) ? $this->user : $event['owner'];
+			case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+				unset($event['id']);
+				unset($event['uid']);
+				unset($event['reference']);
+				unset($preserv['reference']);
+				unset($event['recurrence']);
+				unset($preserv['recurrence']);
+				unset($event['recur_exception']);
+				unset($event['edit_single']);	// in case it has been set
+				unset($event['modified']);
+				unset($event['modifier']);
+				unset($event['caldav_name']);
+				$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD,0,$event['owner']) ? $this->user : $event['owner'];
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$p_response)
+					{
+						if($type == 'u' && $id == $event['owner']) continue;
+						calendar_so::split_status($p_response, $quantity, $role);
+						// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
+						$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+						$p_response = calendar_so::combine_status($status,$quantity,$role);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$p_response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
-					calendar_so::split_status($p_response, $quantity, $role);
-					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$p_response = calendar_so::combine_status($status,$quantity,$role);
+					foreach($event['alarm'] as $n => &$alarm)
+					{
+						unset($alarm['id']);
+						unset($alarm['cal_id']);
+					}
 				}
-			}
 
-			// Copy alarms
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $n => &$alarm)
+				// Get links to be copied
+				// With no ID, $content['link_to']['to_id'] is used
+				$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
+				foreach(Link::get_links('calendar', $content['id']) as $link)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
+							'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('Event copied - the copy can now be edited');
+				$event['title'] = lang('Copy of:').' '.$event['title'];
+				break;
 
-			// Get links to be copied
-			// With no ID, $content['link_to']['to_id'] is used
-			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(Link::get_links('calendar', $content['id']) as $link)
-			{
-				if ($link['app'] != Link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
 				{
-					Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == Link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
-						'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
-						'name' => $link['id'],
-					), $link['remark']);
+					$msg = lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
 				}
-			}
-			unset($link);
-			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('Event copied - the copy can now be edited');
-			$event['title'] = lang('Copy of:').' '.$event['title'];
-			break;
-
-		case 'mail':
-		case 'sendrequest':
-		case 'save':
-		case 'print':
-		case 'apply':
-		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
-			{
-				$msg = lang('Permission denied');
-				$button = '';
-				break;
-			}
-			if ($event['start'] > $event['end'])
-			{
-				$msg = lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
-			{
-				$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
-			{
-				$msg = lang('Error: Duration of event longer then recurrence interval!');
-				$button = '';
-				break;
-			}
-			if (!$event['participants'])
-			{
-				$msg = lang('Error: no participants selected !!!');
-				$button = '';
-				break;
-			}
-			// if private event with ressource reservation is forbidden
-			if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
-			{
-				foreach (array_keys($event['participants']) as $uid)
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
+				}
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+				{
+					$msg = lang('Error: Duration of event longer then recurrence interval!');
+					$button = '';
+					break;
+				}
+				if (!$event['participants'])
+				{
+					$msg = lang('Error: no participants selected !!!');
+					$button = '';
+					break;
+				}
+				// if private event with ressource reservation is forbidden
+				if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
+				{
+					foreach (array_keys($event['participants']) as $uid)
 					{
-						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
-						$button = '';
-						break 2; //break foreach and case
+						if ($uid[0] == 'r') //ressource detection
+						{
+							$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+							$button = '';
+							break 2; //break foreach and case
+						}
 					}
 				}
-			}
-			if ($content['edit_single'])	// we edited a single event from a series
-			{
-				$event['reference'] = $event['id'];
-				$event['recurrence'] = $content['edit_single'];
-				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
-				if (!is_array($conflicts) && $conflicts)
+				if ($content['edit_single'])	// we edited a single event from a series
 				{
-					// now we need to add the original start as recur-execption to the series
-					$recur_event = $this->bo->read($event['reference']);
-					$recur_event['recur_exception'][] = $content['edit_single'];
-					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					$event['reference'] = $event['id'];
+					$event['recurrence'] = $content['edit_single'];
+					unset($event['id']);
+					$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+					if (!is_array($conflicts) && $conflicts)
 					{
-						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
+						// now we need to add the original start as recur-execption to the series
+						$recur_event = $this->bo->read($event['reference']);
+						$recur_event['recur_exception'][] = $content['edit_single'];
+						// check if we need to move the alarms, because they are next on that exception
+						foreach($recur_event['alarm'] as $id => $alarm)
 						{
-							$rrule = calendar_rrule::event2rrule($recur_event, true);
-							foreach ($rrule as $time)
+							if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 							{
-								if ($content['edit_single'] < $time->format('ts'))
+								$rrule = calendar_rrule::event2rrule($recur_event, true);
+								foreach ($rrule as $time)
 								{
-									$alarm['time'] = $time->format('ts') - $alarm['offset'];
-									$this->bo->save_alarm($event['reference'], $alarm);
-									break;
+									if ($content['edit_single'] < $time->format('ts'))
+									{
+										$alarm['time'] = $time->format('ts') - $alarm['offset'];
+										$this->bo->save_alarm($event['reference'], $alarm);
+										break;
+									}
 								}
 							}
 						}
-					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+						unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
+						unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
+						$this->bo->update($recur_event,true);	// no conflict check here
 
-					if(Api\Json\Response::isJSONResponse())
+						if(Api\Json\Response::isJSONResponse())
+						{
+							// Sending null will trigger a removal of the original
+							// for that date
+							Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						}
+
+						unset($recur_event);
+						unset($event['edit_single']);			// if we further edit it, it's just a single event
+						unset($preserv['edit_single']);
+					}
+					else	// conflict or error, we need to reset everything to the state befor we tried to save it
 					{
-						// Sending null will trigger a removal of the original
-						// for that date
-						Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-
-					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
-					unset($preserv['edit_single']);
-				}
-				else	// conflict or error, we need to reset everything to the state befor we tried to save it
-				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
+					$update_type = 'edit';
 				}
-				$update_type = 'edit';
-			}
-			else	// we edited a non-reccuring event or the whole series
-			{
-				if (($old_event = $this->bo->read($event['id'])))
+				else	// we edited a non-reccuring event or the whole series
 				{
-					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					if (($old_event = $this->bo->read($event['id'])))
 					{
-						$update_type = 'edit';
-
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'] ||
-							$event['end'] != $old_event['end'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							// calculate offset against old series start or clicked recurrance,
-							// depending on which is smaller
-							$offset = $event['start'] - $old_event['start'];
-							if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
-							{
-								$offset = $off2;
-							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$update_type = 'edit';
+
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'] ||
+								$event['end'] != $old_event['end'])
 							{
-								$noerror = false;
+								// calculate offset against old series start or clicked recurrance,
+								// depending on which is smaller
+								$offset = $event['start'] - $old_event['start'];
+								if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
+								{
+									$offset = $off2;
+								}
+								$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
+								if($msg)
+								{
+									$noerror = false;
+								}
 							}
 						}
-					}
-					else
-					{
-						if ($old_event['start'] != $event['start'] ||
-							$old_event['end'] != $event['end'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						else
 						{
-							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							if ($old_event['start'] != $event['start'] ||
+								$old_event['end'] != $event['end'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
-								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
+								$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
+								foreach((array)$event['participants'] as $uid => $status)
 								{
-									$preferences = new Api\Preferences($uid);
-									$part_prefs = $preferences->read_repository();
-									switch ($part_prefs['calendar']['reset_stati'])
+									$q = $r = null;
+									calendar_so::split_status($status,$q,$r);
+									if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 									{
+										$preferences = new Api\Preferences($uid);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -800,7 +800,7 @@ 
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
 											// todo: report reset status to user
-									}
+										}
 								}
 							}
 							// check if we need to move the alarms, because they are relative
@@ -942,83 +942,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				Framework::refresh_opener($msg, 'calendar');
-			}
-			break;
-
-		case 'delete':					// delete of event (regular or series)
-			$exceptions_kept = null;
-			if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
-				$content['delete_exceptions'] == 'true', $exceptions_kept))
-			{
-				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+			case 'cancel':
+				if($content['cancel_needs_refresh'])
 				{
-					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					Framework::refresh_opener($msg, 'calendar');
 				}
-				else
+				break;
+
+			case 'delete':					// delete of event (regular or series)
+				$exceptions_kept = null;
+				if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
+					$content['delete_exceptions'] == 'true', $exceptions_kept))
 				{
-					$msg = lang('Event deleted');
-				}
+					if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+					{
+						$msg = lang('Series deleted');
+						if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					}
+					else
+					{
+						$msg = lang('Event deleted');
+					}
 
-			}
-			break;
+				}
+				break;
 
-		case 'freetime':
-			// the "click" has to be in onload, to make sure the button is already created
-			$event['button_was'] = $button;
-			break;
+			case 'freetime':
+				// the "click" has to be in onload, to make sure the button is already created
+				$event['button_was'] = $button;
+				break;
 
-		case 'add_alarm':
-			$time = $content['start'];
-			$offset = $time - $content['new_alarm']['date'];
-			if ($event['recur_type'] != MCAL_RECUR_NONE &&
-				($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
-				$time < $next_occurrence['start'])
-			{
-				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
-			}
-			if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
-			{
-				$alarm = array(
-					'offset' => $offset,
-					'time'   => $content['new_alarm']['date'],
-					'all'    => !$content['new_alarm']['owner'],
-					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
-				);
-				if ($alarm['time'] < $this->bo->now_su)
+			case 'add_alarm':
+				$time = $content['start'];
+				$offset = $time - $content['new_alarm']['date'];
+				if ($event['recur_type'] != MCAL_RECUR_NONE &&
+					($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
+					$time < $next_occurrence['start'])
 				{
-					$msg = lang("Can't add alarms in the past !!!");
+					$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					$alarm = array(
+						'offset' => $offset,
+						'time'   => $content['new_alarm']['date'],
+						'all'    => !$content['new_alarm']['owner'],
+						'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+					);
+					if ($alarm['time'] < $this->bo->now_su)
+					{
+						$msg = lang("Can't add alarms in the past !!!");
+					}
+					elseif ($event['id'])	// save the alarm immediatly
 					{
-						$alarm['id'] = $alarm_id;
-						$event['alarm'][$alarm_id] = $alarm;
+						if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+						{
+							$alarm['id'] = $alarm_id;
+							$event['alarm'][$alarm_id] = $alarm;
 
-						$msg = lang('Alarm added');
-						Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+							$msg = lang('Alarm added');
+							Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						}
+						else
+						{
+							$msg = lang('Error adding the alarm');
+						}
 					}
 					else
 					{
-						$msg = lang('Error adding the alarm');
+						for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+						$event['alarm'][$alarm['id']] = $alarm;
 					}
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
-					$event['alarm'][$alarm['id']] = $alarm;
+					$msg = lang('Permission denied');
 				}
-			}
-			else
-			{
-				$msg = lang('Permission denied');
-			}
-			break;
+				break;
 		}
 		// add notification-errors, if we have some
 		if (($notification_errors = notifications::errors(true)))