EGroupware / egroupware

filemanager/inc/class.filemanager_admin.inc.php

Spacing +24 added lines, -24 removed lines

@@ -78,14 +78,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -96,14 +96,14 @@ 
 				$backup = Vfs::$is_root;
 				Vfs::$is_root = true;
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -119,18 +119,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -140,7 +140,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -151,8 +151,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -197,8 +197,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -212,7 +212,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -235,10 +235,10 @@ 
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files']) $content['percent_files'] = number_format(100.0 * $content['version_files'] / $content['total_files'], 1).'%';
+			if ($content['total_size']) $content['percent_size'] = number_format(100.0 * $content['version_size'] / $content['total_size'], 1).'%';
 		}
-		if (!($content['is_root']=Vfs::$is_root))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -254,16 +254,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -274,13 +274,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new Etemplate('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -300,10 +300,10 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= Api\Html::form('<p>'.($check_only&&is_array($msgs) ?
+		$content .= Api\Html::form('<p>'.($check_only && is_array($msgs) ?
 			Api\Html::submit_button('fix', lang('Fix reported problems')) : '').
 			Api\Html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

filemanager/inc/class.filemanager_select.inc.php

Spacing +36 added lines, -36 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function select(array $content=null)
+	function select(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -76,10 +76,10 @@ 
 				$content['msg'] = $_GET['msg'];
 				$_GET['mode'] = 'open';
 				$_GET['method'] = 'ckeditor_return';
-				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager','ckeditorfuncnum');
+				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager', 'ckeditorfuncnum');
 			}
 			$content['mode'] = $_GET['mode'];
-			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			if (!in_array($content['mode'], array('open', 'open-multiple', 'saveas', 'select-dir')))
 			{
 				throw new Api\Exception\WrongParameter("Wrong or unset required mode parameter!");
 			}
@@ -94,7 +94,7 @@ 
 			{
 				if (isset($_GET['CKEditorFuncNum']) && is_numeric($_GET['CKEditorFuncNum']))
 				{
-					Api\Cache::setSession('filemanager','ckeditorfuncnum',
+					Api\Cache::setSession('filemanager', 'ckeditorfuncnum',
 						$content['ckeditorfuncnum'] = $_GET['CKEditorFuncNum']);
 				}
 				else
@@ -102,20 +102,20 @@ 
 					throw new Api\Exception\WrongParameter("chkeditor_return has been specified as a method but some parameters are missing or invalid.");
 				}
 			}
-			$content['id']     = $_GET['id'];
+			$content['id'] = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
 			if (($content['options-mime'] = isset($_GET['mime'])))
 			{
 				$sel_options['mime'] = array();
-				foreach((array)$_GET['mime'] as $key => $value)
+				foreach ((array)$_GET['mime'] as $key => $value)
 				{
 					if (is_numeric($key))
 					{
-						$sel_options['mime'][$value] = lang('%1 files',strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
+						$sel_options['mime'][$value] = lang('%1 files', strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
 					}
 					else
 					{
-						$sel_options['mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+						$sel_options['mime'][$key] = lang('%1 files', strtoupper($value)).' ('.$key.')';
 					}
 				}
 
@@ -123,11 +123,11 @@ 
 				error_log(array2string($content['options-mime']));
 			}
 		}
-		elseif(isset($content['button']))
+		elseif (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'home':
 					$content['path'] = filemanager_ui::get_home_dir();
@@ -139,10 +139,10 @@ 
 						//Set the "content" name filed accordingly to the uploaded file
 						// encode chars which special meaning in url/vfs (some like / get removed!)
 						$content['name'] = Vfs::encodePathComponent($content['file_upload']['name']);
-						$to_path = Vfs::concat($content['path'],$content['name']);
+						$to_path = Vfs::concat($content['path'], $content['name']);
 
 						$copy_result = (Vfs::is_writable($content['path']) || Vfs::is_writable($to_path)) &&
-							copy($content['file_upload']['tmp_name'],Vfs::PREFIX.$to_path);
+							copy($content['file_upload']['tmp_name'], Vfs::PREFIX.$to_path);
 					}
 
 					//Break on an error condition
@@ -161,12 +161,12 @@ 
 						break;
 					}
 
-					switch($content['mode'])
+					switch ($content['mode'])
 					{
 						case 'open-multiple':
-							foreach((array)$content['dir']['selected'] as $name)
+							foreach ((array)$content['dir']['selected'] as $name)
 							{
-								$files[] = Vfs::concat($content['path'],$name);
+								$files[] = Vfs::concat($content['path'], $name);
 							}
 							//Add an uploaded file to the files result array2string
 							if ($copy_result === true) $files[] = $to_path;
@@ -182,33 +182,33 @@ 
 							// Fall through
 
 						default:
-							$files = Vfs::concat($content['path'],$content['name']);
+							$files = Vfs::concat($content['path'], $content['name']);
 							break;
 					}
 
 					if ($content['method'] && $content['method'] != 'ckeditor_return')
 					{
-						$js = ExecMethod2($content['method'],$content['id'],$files);
+						$js = ExecMethod2($content['method'], $content['id'], $files);
 					}
 					else if ($content['method'] == 'ckeditor_return')
 					{
-						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
+						$download_url = Vfs::download_url(Vfs::concat($content['path'], $content['name']));
 						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
 							"'');\negw(window).close();";
 					}
-					if(Api\Json\Response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
+					if (Api\Json\Response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
 					{
 						$response = Api\Json\Response::get();
-						if($js)
+						if ($js)
 						{
 							$response->script($js);
 						}
 						// Ahh!
 						// The vfs-select widget looks for this
-						$response->script('this.selected_files = '.json_encode($files) . '; egw(this).close();');
+						$response->script('this.selected_files = '.json_encode($files).'; egw(this).close();');
 					}
 					else
 					{
@@ -220,7 +220,7 @@ 
 
 			$sel_options['mime'] = $content['options-mime'];
 		}
-		elseif(isset($content['apps']))
+		elseif (isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
 			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
@@ -229,7 +229,7 @@ 
 		//Deactivate the opload field if the current directory is not writeable or
 		//we're currently not in the single file open mode.
 		$content['no_upload'] = !Vfs::is_writable($content['path']) ||
-			!in_array($content['mode'],array('open'));
+			!in_array($content['mode'], array('open'));
 
 		$content['apps'] = array_keys(self::get_apps());
 
@@ -239,7 +239,7 @@ 
 		}
 
 		// Set a flag for easy detection as we go
-		$favorites_flag = substr($content['path'],0,strlen('/apps/favorites')) == '/apps/favorites';
+		$favorites_flag = substr($content['path'], 0, strlen('/apps/favorites')) == '/apps/favorites';
 
 		if (!$favorites_flag && (!$content['path'] || !Vfs::is_dir($content['path'])))
 		{
@@ -253,12 +253,12 @@ 
 			$files = array();
 			$favorites = Framework\Favorites::get_favorites('filemanager');
 			$n = 0;
-			foreach($favorites as $favorite)
+			foreach ($favorites as $favorite)
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if (!$path) continue;
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -274,29 +274,29 @@ 
 				++$n;
 			}
 		}
-		else if (!($files = Vfs::find($content['path'],array(
+		else if (!($files = Vfs::find($content['path'], array(
 			'dirsontop' => true,
 			'order' => 'name',
 			'sort' => 'ASC',
 			'maxdepth' => 1,
 		))))
 		{
-			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+			$content['msg'] = lang("Can't open directory %1!", $content['path']);
 		}
 		else
 		{
 			$n = 0;
 			$content['dir'] = array('mode' => $content['mode']);
-			foreach($files as $path)
+			foreach ($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
 				$mime = Vfs::mime_content_type($path);
 				if ($content['mime'] && !$is_dir && $mime != $content['mime'])
 				{
-					continue;	// does not match mime-filter --> ignore
+					continue; // does not match mime-filter --> ignore
 				}
 				$content['dir'][$n] = array(
 					'name' => $name,
@@ -310,7 +310,7 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -337,7 +337,7 @@ 
 		{
 			Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 		}
-		$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_select.select', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -347,11 +347,11 @@ 
 	 */
 	static function get_apps()
 	{
-		$apps = array(false);	// index starting from 1
+		$apps = array(false); // index starting from 1
 		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
 		$apps += Link::app_list('query');
 
-		unset($apps['mydms']);	// they do NOT support adding files to VFS
+		unset($apps['mydms']); // they do NOT support adding files to VFS
 		unset($apps['wiki']);
 		unset($apps['api-accounts']);
 		unset($apps['addressbook-email']);

Braces +35 added lines, -8 removed lines

@@ -169,7 +169,10 @@ 
 								$files[] = Vfs::concat($content['path'],$name);
 							}
 							//Add an uploaded file to the files result array2string
-							if ($copy_result === true) $files[] = $to_path;
+							if ($copy_result === true)
+							{
+								$files[] = $to_path;
+							}
 							break;
 
 						case 'select-dir':
@@ -193,7 +196,10 @@ 
 					else if ($content['method'] == 'ckeditor_return')
 					{
 						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
-						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
+						if ($download_url[0] == '/')
+						{
+							$download_url = Egw::link($download_url);
+						}
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
@@ -223,7 +229,10 @@ 
 		elseif(isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
-			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
+			if ($app == 'home')
+			{
+				$content['path'] = filemanager_ui::get_home_dir();
+			}
 		}
 
 		//Deactivate the opload field if the current directory is not writeable or
@@ -257,8 +266,15 @@ 
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if(!$path)
+				{
+					continue;
+				}
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -289,7 +305,11 @@ 
 			$content['dir'] = array('mode' => $content['mode']);
 			foreach($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
@@ -310,7 +330,11 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n)
+			{
+				$readonlys['selected[]'] = true;
+			}
+			// remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -348,7 +372,10 @@ 
 	static function get_apps()
 	{
 		$apps = array(false);	// index starting from 1
-		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
+		if (isset($GLOBALS['egw_info']['apps']['stylite']))
+		{
+			$apps = array('favorites' => lang('Favorites'));
+		}
 		$apps += Link::app_list('query');
 
 		unset($apps['mydms']);	// they do NOT support adding files to VFS

filemanager/inc/class.filemanager_merge.inc.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+				{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 

Spacing +35 added lines, -35 removed lines

@@ -60,7 +60,7 @@ 
 	{
 		parent::__construct();
 
-		if($_dir)
+		if ($_dir)
 		{
 			$this->dir = $_dir;
 		}
@@ -76,7 +76,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->filemanager_replacements($id, '', $content)))
 		{
@@ -92,27 +92,27 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function filemanager_replacements($id,$prefix='', &$content = null)
+	public function filemanager_replacements($id, $prefix = '', &$content = null)
 	{
 		$info = array();
-		$file = Vfs::lstat($id,true);
+		$file = Vfs::lstat($id, true);
 
 		$file['mtime'] = Api\DateTime::to($file['mtime']);
 		$file['ctime'] = Api\DateTime::to($file['ctime']);
 
 		$file['name'] = Vfs::basename($id);
 		$file['dir'] = Vfs::decodePath(Vfs::dirname($id));
-		$dirlist = explode('/',$file['dir']);
+		$dirlist = explode('/', $file['dir']);
 		$file['folder'] = array_pop($dirlist);
-		$file['folder_file'] = $file['folder'] . '/'.$file['name'];
+		$file['folder_file'] = $file['folder'].'/'.$file['name'];
 		$file['path'] = $id;
 		$file['rel_path'] = str_replace($this->dir.'/', '', $id);
 		$file['hsize'] = Vfs::hsize($file['size']);
 		$file['mime'] = Vfs::mime_content_type($id);
-		$file['gid'] *= -1;  // our widgets use negative gid's
+		$file['gid'] *= -1; // our widgets use negative gid's
 		if (($props = Vfs::propfind($id)))
 		{
-			foreach($props as $prop)
+			foreach ($props as $prop)
 			{
 				$file[$prop['name']] = $prop['val'];
 			}
@@ -122,22 +122,22 @@ 
 			$file['symlink'] = Vfs::readlink($id);
 		}
 		// Custom fields
-		if($content && strpos($content, '#') !== 0)
+		if ($content && strpos($content, '#') !== 0)
                 {
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
-			foreach(Api\Storage\Customfields::get('filemanager') as $name => $field)
+			foreach (Api\Storage\Customfields::get('filemanager') as $name => $field)
 			{
 				// Set any missing custom fields, or the marker will stay
-				if(!$file['#'.$name])
+				if (!$file['#'.$name])
 				{
 					$file['#'.$name] = '';
 					continue;
 				}
 
 				// Format date cfs per user Api\Preferences
-				if($field['type'] == 'date' || $field['type'] == 'date-time')
+				if ($field['type'] == 'date' || $field['type'] == 'date-time')
 				{
 					$this->date_fields[] = '#'.$name;
 					$file['#'.$name] = Api\DateTime::to($file['#'.$name], $field['type'] == 'date' ? true : '');
@@ -146,51 +146,51 @@ 
 		}
 
 		// If in apps folder, try for app-specific placeholders
-		if($dirlist[1] == 'apps' && count($dirlist) > 1)
+		if ($dirlist[1] == 'apps' && count($dirlist) > 1)
 		{
 			// Try this first - a normal path /apps/appname/id/file
-			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
+			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/') + 5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
-				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
-				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+				$resolved = Vfs::resolve_url_symlinks(implode('/', array_slice(explode('/', $file['dir']), 0, 4)));
+				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
-					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 				}
 			}
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				if($app && $GLOBALS['egw_info']['user']['apps'][$app])
+				if ($app && $GLOBALS['egw_info']['user']['apps'][$app])
 				{
 					$app_merge = null;
 					try
 					{
-						$classname = $app .'_merge';
-						if(class_exists($classname))
+						$classname = $app.'_merge';
+						if (class_exists($classname))
 						{
 							$app_merge = new $classname();
-							if($app_merge && method_exists($app_merge, 'get_replacements'))
+							if ($app_merge && method_exists($app_merge, 'get_replacements'))
 							{
 								$app_placeholders = $app_merge->get_replacements($app_id, $content);
 							}
 						}
 					}
 					// Silently discard & continue
-					catch(Exception $e) {
-						unset($e);	// not used
+					catch (Exception $e) {
+						unset($e); // not used
 					}
 				}
 			}
 		}
 		$link = Link::mime_open($file['url'], $file['mime']);
-		if(is_array($link))
+		if (is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if ($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -209,12 +209,12 @@ 
 		$file['url'] = $link;
 
 		// Add markers
-		foreach($file as $key => &$value)
+		foreach ($file as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
-		if($app_placeholders)
+		if ($app_placeholders)
 		{
 			$info = array_merge($app_placeholders, $info);
 		}
@@ -250,7 +250,7 @@ 
 			'hsize' => 'Size',
 			'size' => 'Size (in bytes)',
 		);
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
@@ -259,7 +259,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach(Api\Storage\Customfields::get('filemanager') as $name => $field)
+		foreach (Api\Storage\Customfields::get('filemanager') as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -268,7 +268,7 @@ 
 		echo '<tr><td colspan="4">'.lang('For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),

Braces +21 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+		{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
@@ -151,12 +151,14 @@ 
 			// Try this first - a normal path /apps/appname/id/file
 			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+			{
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
 				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
 				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+				{
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
 					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
@@ -190,7 +192,10 @@ 
 		if(is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if($link['path'] && strpos($link['path'], '://') !== false)
+			{
+				$link['path'] = $file['path'];
+			}
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -211,7 +216,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -252,9 +260,15 @@ 
 		);
 		foreach($fields as $name => $label)
 		{
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 

filemanager/inc/class.filemanager_favorite_portlet.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,13 +28,13 @@ 
 		$context['appname'] = 'filemanager';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->nm_settings += array(
 			'get_rows'       => 'filemanager.filemanager_favorite_portlet.get_rows',
 			'csv_export'     => true,
 			// Use a different template so it can be accessed from client side
-			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows' ),
+			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows'),
 			// Filemanager needs this header, it's an important component for actions, but we reduce it to the minimum
 			'header_left'    => 'filemanager.home.header_left',
 			// Use a reduced column set for home, user can change if needed
@@ -46,11 +46,11 @@ 
 			'parent_id'      => 'dir',
 			'is_parent'      => 'mime',
 			'is_parent_value'=> Vfs::DIR_MIME_TYPE,
-			'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+			'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 
 		$this->context['sel_options']['filter'] = array(
@@ -80,7 +80,7 @@ 
 		$ui = new filemanager_ui();
 		$total = $ui->get_rows($query, $rows, $readonlys);
 		// Change template to match selected view
-		if($query['view'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.home.rows' : 'filemanager.tile');
 		}
@@ -103,14 +103,14 @@ 
 		// the etemplate exec to fire again.
 		if ($content['nm']['action'])
 		{
-			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
-			foreach($content['nm']['selected'] as &$id)
+			$msg = filemanager_ui::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+			if ($msg) Api\Json\Response::get()->apply('egw.message', array($msg));
+			foreach ($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;
 			}
 			// Directly request an update - this will get filemanager tab too
-			Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+			Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 		}
 	}
  }
\ No newline at end of file

Doc Comments -2 removed lines

@@ -86,8 +86,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($content = array())
 	{

Braces +4 added lines, -1 removed lines

@@ -104,7 +104,10 @@
 		if ($content['nm']['action'])
 		{
 			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
+			if($msg)
+			{
+				Api\Json\Response::get()->apply('egw.message',array($msg));
+			}
 			foreach($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

filemanager/cli.php

Spacing +136 added lines, -141 removed lines

@@ -16,9 +16,9 @@ 
 use EGroupware\Api;
 use EGroupware\Api\Vfs;
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
+error_reporting(error_reporting()&~E_NOTICE&~E_DEPRECATED);
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
 {
@@ -47,7 +47,7 @@ 
  *
  * @param string $error_msg ='' error-message to be printed in front of usage
  */
-function usage($error_msg='')
+function usage($error_msg = '')
 {
 	if ($error_msg)
 	{
@@ -81,8 +81,8 @@ 
 }
 $long = $numeric = $recursive = $perms = $all = $inode = false;
 $args = $_SERVER['argv'];
-$cmd = basename(array_shift($args),'.php');
-if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0],'://') === false)
+$cmd = basename(array_shift($args), '.php');
+if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0], '://') === false)
 {
 	$cmd = array_shift($args);
 }
@@ -90,7 +90,7 @@ 
 if (!$args) $args = array('-h');
 
 $argv = $find_options = array();
-while(!is_null($option = array_shift($args)))
+while (!is_null($option = array_shift($args)))
 {
 	if ($option == '-' || $option[0] != '-')	// no option --> argument
 	{
@@ -98,34 +98,34 @@ 
 		continue;
 	}
 
-	switch($option)
+	switch ($option)
 	{
 		default:
 			if ($cmd == 'find')
 			{
-				if (!in_array($option,array('-type','-depth','-mindepth','-maxdepth','-name','-path',
-					'-uid','-user','-nouser','-gid','-group','-nogroup','-mime',
-					'-empty','-size','-cmin','-ctime','-mmin','-mtime','-limit','-order','-sort',
-					'-hidden','-show-deleted','-name-preg','-path','-path-preg')))
+				if (!in_array($option, array('-type', '-depth', '-mindepth', '-maxdepth', '-name', '-path',
+					'-uid', '-user', '-nouser', '-gid', '-group', '-nogroup', '-mime',
+					'-empty', '-size', '-cmin', '-ctime', '-mmin', '-mtime', '-limit', '-order', '-sort',
+					'-hidden', '-show-deleted', '-name-preg', '-path', '-path-preg')))
 				{
 					usage("Unknown find option '$option'!");
 				}
-				if (in_array($option,array('-empty','-depth','-nouser','-nogroup','-hidden','-show-deleted')))
+				if (in_array($option, array('-empty', '-depth', '-nouser', '-nogroup', '-hidden', '-show-deleted')))
 				{
-					$find_options[substr($option,1)] = true;
+					$find_options[substr($option, 1)] = true;
 				}
 				else
 				{
-					$find_options[str_replace('-','_',substr($option,1))] = array_shift($args);
+					$find_options[str_replace('-', '_', substr($option, 1))] = array_shift($args);
 				}
 				break;
 			}
 			// multiple options, eg. -rp --> -r -p
-			elseif($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
+			elseif ($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
 			{
-				for($i = 1; $i < strlen($option); ++$i)
+				for ($i = 1; $i < strlen($option); ++$i)
 				{
-					array_unshift($args,'-'.$option[$i]);
+					array_unshift($args, '-'.$option[$i]);
 				}
 				break;
 			}
@@ -181,11 +181,11 @@ 
 }
 if ($user && $passwd)
 {
-	load_egw($user,$passwd,$domain ? $domain : 'default');
+	load_egw($user, $passwd, $domain ? $domain : 'default');
 }
 $argc = count($argv);
 
-switch($cmd)
+switch ($cmd)
 {
 	case 'umount':
 		if ($argc != 1 && !$all)
@@ -193,13 +193,13 @@ 
 			usage('Wrong number of parameters!');
 		}
 		if (($url = $argv[0])) load_wrapper($url);
-		if(!Vfs::$is_root)
+		if (!Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
 		if ($all)
 		{
-			Api\Config::save_value('vfs_fstab',$GLOBALS['egw_info']['server']['vfs_fstab']='','phpgwapi');
+			Api\Config::save_value('vfs_fstab', $GLOBALS['egw_info']['server']['vfs_fstab'] = '', 'phpgwapi');
 			echo "Restored default mounts:\n";
 		}
 		elseif (!Vfs::umount($url))
@@ -216,16 +216,16 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		load_wrapper($url=$argv[0]);
+		load_wrapper($url = $argv[0]);
 
-		if($argc > 1 && !Vfs::$is_root)
+		if ($argc > 1 && !Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
-		$fstab = Vfs::mount($url,$path=$argv[1]);
+		$fstab = Vfs::mount($url, $path = $argv[1]);
 		if (is_array($fstab))
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
@@ -245,7 +245,7 @@ 
 		break;
 
 	case 'find':
-		do_find($argv,$find_options);
+		do_find($argv, $find_options);
 		break;
 
 	case 'lntree':
@@ -253,14 +253,14 @@ 
 		break;
 
 	case 'cp':
-		do_cp($argv,$recursive,$perms);
+		do_cp($argv, $recursive, $perms);
 		break;
 
 	case 'rename':
 		if (count($argv) != 2) usage('Wrong number of parameters!');
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
-		rename($argv[0],$argv[1]);
+		rename($argv[0], $argv[1]);
 		break;
 
 	case 'migrate-db2fs':
@@ -268,21 +268,21 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit; // we need write access, error msg already given
 		$fstab = Vfs::mount();
-		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
+		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'], 'storage=db') === false)
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
 			die("\n/ NOT mounted with 'storage=db' --> no need to convert!\n\n");
 		}
-		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs();	// throws exception on error
+		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs(); // throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
-		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
-		if (Vfs::mount($new_url,'/'))
+		$new_url = preg_replace('/storage=db&?/', '', $fstab['/']);
+		if (substr($new_url, -1) == '?') $new_url = substr($new_url, 0, -1);
+		if (Vfs::mount($new_url, '/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
 		}
@@ -293,24 +293,24 @@ 
 		break;
 
 	default:
-		while($argv)
+		while ($argv)
 		{
 			$url = array_shift($argv);
 
 			load_wrapper($url);
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.")\n";
 
-			switch($cmd)
+			switch ($cmd)
 			{
 				case 'rm':
 					if ($recursive)
 					{
 						if (!class_exists('egw_vfs'))
 						{
-							die("rm -r only implemented for eGW streams!");	// dont want to repeat the code here
+							die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here
 						}
-						array_unshift($argv,$url);
-						Vfs::remove($argv,true);
+						array_unshift($argv, $url);
+						Vfs::remove($argv, true);
 						$argv = array();
 					}
 					else
@@ -324,27 +324,27 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url, null, $recursive)) echo "Can't create directory, permission denied!\n";
 					break;
 
 				case 'touch':
 				case 'chmod':
 				case 'chown':
 				case 'chgrp':
-					switch($cmd)
+					switch ($cmd)
 					{
 						case 'touch':
-							$params = array($url,$time);
+							$params = array($url, $time);
 							break;
 						case 'chmod':
 							if (!isset($mode))
 							{
-								$mode = $url;	// first param is mode
+								$mode = $url; // first param is mode
 								$url = array_shift($argv);
 							}
-							if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or Vfs::mode2int otherwise!
+							if (Vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // cant use stat or Vfs::mode2int otherwise!
 
-							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
+							if (strpos($mode, '+') !== false || strpos($mode, '-') !== false)
 							{
 								$stat = stat($url);
 								$set = $stat['mode'];
@@ -355,19 +355,19 @@ 
 							}
 							if (!class_exists('egw_vfs'))
 							{
-								die("chmod only implemented for eGW streams!");	// dont want to repeat the code here
+								die("chmod only implemented for eGW streams!"); // dont want to repeat the code here
 							}
-							$set = Vfs::mode2int($mode,$set);
-							$params = array($url,$set);
+							$set = Vfs::mode2int($mode, $set);
+							$params = array($url, $set);
 							break;
 						case 'chown':
 						case 'chgrp':
 							$type = $cmd == 'chgrp' ? 'group' : 'user';
 							if (!isset($owner))
 							{
-								$owner = $url;	// first param is owner/group
+								$owner = $url; // first param is owner/group
 								$url = array_shift($argv);
-								if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (Vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -378,34 +378,34 @@ 
 									{
 										die("only numeric user/group-id's allowed for non eGW streams!");
 									}
-									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
+									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was = $owner, 'account_lid', $type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
 										die("Unknown $type '$owner_was'!");
 									}
 								}
-								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
+								elseif ($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
 									die("Unknown $type '$owner_was'!");
 								}
 							}
-							$params = array($url,$owner);
+							$params = array($url, $owner);
 							break;
 					}
-					if (($scheme = Vfs::parse_url($url,PHP_URL_SCHEME)))
+					if (($scheme = Vfs::parse_url($url, PHP_URL_SCHEME)))
 					{
 						load_wrapper($url);
 					}
 					if ($recursive && class_exists('egw_vfs'))
 					{
-						array_unshift($argv,$url);
-						$params = array($argv,null,$cmd,$params[1]);
-						$cmd = array('egw_vfs','find');
-						$argv = array();	// we processed all url's
+						array_unshift($argv, $url);
+						$params = array($argv, null, $cmd, $params[1]);
+						$cmd = array('egw_vfs', 'find');
+						$argv = array(); // we processed all url's
 					}
 					//echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n";
-					call_user_func_array($cmd,$params);
+					call_user_func_array($cmd, $params);
 					break;
 
 				case 'cat':
@@ -415,35 +415,35 @@ 
 					if ($cmd != 'cat' && $recursive && class_exists('egw_vfs'))
 					{
 						load_wrapper($url);
-						array_unshift($argv,$url);
-						Vfs::find($argv,array('url'=>true,),'do_stat',array($long,$numeric,true,$inode));
+						array_unshift($argv, $url);
+						Vfs::find($argv, array('url'=>true,), 'do_stat', array($long, $numeric, true, $inode));
 						$argv = array();
 					}
 					elseif (is_dir($url) && ($dir = opendir($url)))
 					{
 						if ($argc)
 						{
-							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(Vfs::parse_url($url, PHP_URL_PATH)))) $name = '/';
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
-						list($url,$query) = explode('?',$url,2);
+						list($url, $query) = explode('?', $url, 2);
 						if ($query) $query = '?'.$query;
 
-						if (substr($url,-1) == '/')
+						if (substr($url, -1) == '/')
 						{
-							$url = substr($url,0,-1);
+							$url = substr($url, 0, -1);
 						}
-						while(($file = readdir($dir)) !== false)
+						while (($file = readdir($dir)) !== false)
 						{
-							do_stat($url.'/'.$file.$query,$long,$numeric,false,$inode);
+							do_stat($url.'/'.$file.$query, $long, $numeric, false, $inode);
 						}
 						closedir($dir);
 					}
 					elseif ($cmd == 'cat')
 					{
-						if (!($f = fopen($url,'r')))
+						if (!($f = fopen($url, 'r')))
 						{
 							echo "File $url not found !!!\n\n";
 						}
@@ -451,7 +451,7 @@ 
 						{
 							if ($argc)
 							{
-								echo "\n".basename(Vfs::parse_url($url,PHP_URL_PATH)).":\n";
+								echo "\n".basename(Vfs::parse_url($url, PHP_URL_PATH)).":\n";
 							}
 							fpassthru($f);
 							fclose($f);
@@ -459,7 +459,7 @@ 
 					}
 					else
 					{
-						do_stat($url,$long,$numeric,false,$inode);
+						do_stat($url, $long, $numeric, false, $inode);
 					}
 					if (!$long && $cmd == 'ls') echo "\n";
 					break;
@@ -474,11 +474,11 @@ 
  */
 function load_wrapper($url)
 {
-	$scheme = parse_url($url,PHP_URL_SCHEME);
+	$scheme = parse_url($url, PHP_URL_SCHEME);
 
-	if (!in_array($scheme,stream_get_wrappers()))
+	if (!in_array($scheme, stream_get_wrappers()))
 	{
-		switch($scheme)
+		switch ($scheme)
 		{
 			case 'webdav':
 			case 'webdavs':
@@ -487,9 +487,9 @@ 
 			case '':	// default scheme is file and always available
 				break;
 			default:
-				if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')))
+				if (!isset($GLOBALS['egw']) && !in_array($scheme, array('smb', 'imap')))
 				{
-					load_egw(parse_url($url,PHP_URL_USER), parse_url($url,PHP_URL_PASS), parse_url($url,PHP_URL_HOST));
+					load_egw(parse_url($url, PHP_URL_USER), parse_url($url, PHP_URL_PASS), parse_url($url, PHP_URL_HOST));
 				}
 				// get eGW's __autoload() function
 				include_once(EGW_API_INC.'/common_functions.inc.php');
@@ -510,7 +510,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -522,7 +522,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -534,7 +534,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -560,7 +560,7 @@ 
 	}
 
 	$cmd = $GLOBALS['cmd'];
-	if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
+	if (!in_array($cmd, array('ls', 'find', 'mount', 'umount', 'eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
 	{
 		echo "\nError: eGroupWare's files directory {$GLOBALS['egw_info']['server']['files_dir']} is NOT writable by the user running ".basename(__FILE__)."!\n".
 			"--> Please run it as the same user the webserver uses or root, otherwise the $cmd command will fail!\n\n";
@@ -591,22 +591,22 @@ 
 	}
 	if ($argc == 1)
 	{
-		foreach(Vfs::get_eacl($url) as $acl)
+		foreach (Vfs::get_eacl($url) as $acl)
 		{
-			$mode = ($acl['rights'] & Vfs::READABLE ? 'r' : '-').
-				($acl['rights'] & Vfs::WRITABLE ? 'w' : '-').
-				($acl['rights'] & Vfs::EXECUTABLE ? 'x' : '-');
+			$mode = ($acl['rights']&Vfs::READABLE ? 'r' : '-').
+				($acl['rights']&Vfs::WRITABLE ? 'w' : '-').
+				($acl['rights']&Vfs::EXECUTABLE ? 'x' : '-');
 			echo $acl['path']."\t$mode\t".$GLOBALS['egw']->accounts->id2name($acl['owner'])."\n";
 		}
 		return;
 	}
 	if ($argc > 1 && !is_numeric($argv[1]))
 	{
-		$mode=$argv[1];
+		$mode = $argv[1];
 		$argv[1] = null;
-		for($i = 0; $mode[$i]; ++$i)
+		for ($i = 0; $mode[$i]; ++$i)
 		{
-			switch($mode[$i])
+			switch ($mode[$i])
 			{
 				case 'x': $argv[1] |= Vfs::EXECUTABLE; break;
 				case 'w': $argv[1] |= Vfs::WRITABLE; break;
@@ -614,7 +614,7 @@ 
 			}
 		}
 	}
-	if (!Vfs::eacl($url,$argv[1],$argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
+	if (!Vfs::eacl($url, $argv[1], $argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
 	{
 		echo "Error setting extended Acl for $argv[0]!\n";
 	}
@@ -629,10 +629,10 @@ 
  * @param boolean $full_path =false true=give full path instead of just filename
  * @param boolean $inode =false true=display inode (sqlfs id)
  */
-function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
+function do_stat($url, $long = false, $numeric = false, $full_path = false, $inode = false)
 {
 	//echo "do_stat($url,$long,$numeric,$full_path)\n";
-	$bname = Vfs::parse_url($url,PHP_URL_PATH);
+	$bname = Vfs::parse_url($url, PHP_URL_PATH);
 
 	if (!$full_path)
 	{
@@ -663,25 +663,23 @@ 
 		{
 			if ($stat['uid'])
 			{
-				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
-					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
+				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) : (function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
 				if (is_array($uid)) $uid = $uid['name'];
 				if (empty($uid)) $uid = $stat['uid'];
 			}
 			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
-				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
-					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
+				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) : (function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
 				if (is_array($gid)) $gid = $gid['name'];
 				if (empty($gid)) $gid = $stat['gid'];
 			}
 			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
-		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
+		$mtime = date('Y-m-d H:i:s', $stat['mtime']);
 		$nlink = $stat['nlink'];
-		if (($stat['mode'] & 0xA000) == 0xA000)
+		if (($stat['mode']&0xA000) == 0xA000)
 		{
 			$symlink = " -> ".(class_exists('egw_vfs') ? Vfs::readlink($url) : readlink($url));
 		}
@@ -700,12 +698,12 @@ 
 function hsize($size)
 {
 	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-	return sprintf('%3.1lfM',(float)$size/(1024*1024));
+	if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+	return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
 }
 
 
-function do_cp($argv,$recursive=false,$perms=false)
+function do_cp($argv, $recursive = false, $perms = false)
 {
 	$to = array_pop($argv);
 	load_wrapper($to);
@@ -717,13 +715,13 @@ 
 		usage("No such directory '$to'!");
 	}
 	$anz_dirs = $anz_files = 0;
-	foreach($argv as $from)
+	foreach ($argv as $from)
 	{
 		if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('egw_vfs'))
 		{
-			foreach(Vfs::find($from,array('url' => true)) as $f)
+			foreach (Vfs::find($from, array('url' => true)) as $f)
 			{
-				$t = $to.substr($f,strlen($from));
+				$t = $to.substr($f, strlen($from));
 				if (is_dir($f))
 				{
 					++$anz_dirs;
@@ -732,43 +730,43 @@ 
 				else
 				{
 					++$anz_files;
-					_cp($f,$t);
+					_cp($f, $t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms) _cp_perms($f, $t);
 			}
-			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
+			echo ($anz_dirs ? "$anz_dirs dir(s) created and " : '')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
-			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			_cp($from, $to, true);
+			if ($perms) _cp_perms($from, $to);
 		}
 	}
 }
 
-function _cp($from,$to,$verbose=false)
+function _cp($from, $to, $verbose = false)
 {
 	load_wrapper($from);
 
 	if (is_dir($to))
 	{
-		$path = Vfs::parse_url($from,PHP_URL_PATH);
+		$path = Vfs::parse_url($from, PHP_URL_PATH);
 		if (is_dir($to))
 		{
-			list($to,$query) = explode('?',$to,2);
+			list($to, $query) = explode('?', $to, 2);
 			$to .= '/'.basename($path).($query ? '?'.$query : '');
 		}
 	}
-	if (!($from_fp = fopen($from,'r')))
+	if (!($from_fp = fopen($from, 'r')))
 	{
 		die("File $from not found!\n");
 	}
-	if (!($to_fp = fopen($to,'w')))
+	if (!($to_fp = fopen($to, 'w')))
 	{
 		die("Can't open $to for writing!\n");
 	}
 	//stream_filter_append($from_fp,'convert.base64-decode');
-	$count = stream_copy_to_stream($from_fp,$to_fp);
+	$count = stream_copy_to_stream($from_fp, $to_fp);
 
 	if ($verbose) echo hsize($count)." bytes written to $to\n";
 
@@ -781,11 +779,11 @@ 
 }
 
 
-function _cp_perms($from,$to)
+function _cp_perms($from, $to)
 {
 	if (($from_stat = stat($from)) && ($to_stat = stat($to)))
 	{
-		foreach(array(
+		foreach (array(
 			'mode' => 'chmod',
 			'uid'  => 'chown',
 			'gid'  => 'chgrp',
@@ -794,27 +792,27 @@ 
 			if ($from_stat[$perm] != $to_stat[$perm])
 			{
 				//echo "egw_vfs::$cmd($to,{$from_stat[$perm]}\n";
-				call_user_func(array('egw_vfs',$cmd),$to,$from_stat[$perm]);
+				call_user_func(array('egw_vfs', $cmd), $to, $from_stat[$perm]);
 			}
 		}
 	}
 }
 
-function do_find($bases,$options)
+function do_find($bases, $options)
 {
-	foreach($bases as $url)
+	foreach ($bases as $url)
 	{
 		load_wrapper($url);
 	}
-	$options['url'] = true;	// we use url's not vfs pathes in filemanager/cli.php
+	$options['url'] = true; // we use url's not vfs pathes in filemanager/cli.php
 
-	foreach(Vfs::find($bases,$options) as $path)
+	foreach (Vfs::find($bases, $options) as $path)
 	{
 		echo "$path\n";
 	}
 }
 
-function do_lntree($from,$to)
+function do_lntree($from, $to)
 {
 	echo "lntree $from $to\n";
 	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
@@ -877,33 +875,33 @@ 
  * @param int $mode
  * @return string
  */
-function int2mode( $mode )
+function int2mode($mode)
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if (($mode&0xA000) == 0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	elseif (($mode&0xC000) == 0xC000) // Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	elseif ($mode&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	elseif ($mode&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	elseif ($mode&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	elseif ($mode&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	elseif ($mode&0x8000) // Regular
 	{
 		$sP = '-';
 	}
@@ -913,22 +911,19 @@ 
 	}
 
 	// owner
-	$sP .= (($mode & 0x0100) ? 'r' : '-') .
-	(($mode & 0x0080) ? 'w' : '-') .
-	(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-	(($mode & 0x0800) ? 'S' : '-'));
+	$sP .= (($mode&0x0100) ? 'r' : '-').
+	(($mode&0x0080) ? 'w' : '-').
+	(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($mode & 0x0020) ? 'r' : '-') .
-	(($mode & 0x0010) ? 'w' : '-') .
-	(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-	(($mode & 0x0400) ? 'S' : '-'));
+	$sP .= (($mode&0x0020) ? 'r' : '-').
+	(($mode&0x0010) ? 'w' : '-').
+	(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($mode & 0x0004) ? 'r' : '-') .
-	(($mode & 0x0002) ? 'w' : '-') .
-	(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-	(($mode & 0x0200) ? 'T' : '-'));
+	$sP .= (($mode&0x0004) ? 'r' : '-').
+	(($mode&0x0002) ? 'w' : '-').
+	(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 	return $sP;
 }

Braces +131 added lines, -32 removed lines

@@ -20,10 +20,13 @@ 
 
 error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling filemanager/cli.php as web-page
 {
 	die('<h1>'.basename(__FILE__).' must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * callback if the session-check fails, creates session from user/passwd in $GLOBALS['egw_login_data']
@@ -87,14 +90,20 @@ 
 	$cmd = array_shift($args);
 }
 
-if (!$args) $args = array('-h');
+if (!$args)
+{
+	$args = array('-h');
+}
 
 $argv = $find_options = array();
 while(!is_null($option = array_shift($args)))
 {
-	if ($option == '-' || $option[0] != '-')	// no option --> argument
+	if ($option == '-' || $option[0] != '-')
+	{
+		// no option --> argument
 	{
 		$argv[] = $option;
+	}
 		continue;
 	}
 
@@ -192,7 +201,10 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		if (($url = $argv[0])) load_wrapper($url);
+		if (($url = $argv[0]))
+		{
+			load_wrapper($url);
+		}
 		if(!Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
@@ -257,7 +269,10 @@ 
 		break;
 
 	case 'rename':
-		if (count($argv) != 2) usage('Wrong number of parameters!');
+		if (count($argv) != 2)
+		{
+			usage('Wrong number of parameters!');
+		}
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
 		rename($argv[0],$argv[1]);
@@ -268,7 +283,11 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir']))
+		{
+			exit;
+		}
+		// we need write access, error msg already given
 		$fstab = Vfs::mount();
 		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
 		{
@@ -281,7 +300,10 @@ 
 		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs();	// throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
 		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
+		if (substr($new_url,-1) == '?')
+		{
+			$new_url = substr($new_url,0,-1);
+		}
 		if (Vfs::mount($new_url,'/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
@@ -324,7 +346,10 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url,null,$recursive))
+					{
+						echo "Can't create directory, permission denied!\n";
+					}
 					break;
 
 				case 'touch':
@@ -342,7 +367,11 @@ 
 								$mode = $url;	// first param is mode
 								$url = array_shift($argv);
 							}
-							if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or Vfs::mode2int otherwise!
+							if (Vfs::parse_url($url,PHP_URL_SCHEME))
+							{
+								load_wrapper($url);
+							}
+							// cant use stat or Vfs::mode2int otherwise!
 
 							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
 							{
@@ -367,7 +396,11 @@ 
 							{
 								$owner = $url;	// first param is owner/group
 								$url = array_shift($argv);
-								if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (Vfs::parse_url($url,PHP_URL_SCHEME))
+								{
+									load_wrapper($url);
+								}
+								// we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -423,13 +456,19 @@ 
 					{
 						if ($argc)
 						{
-							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH))))
+							{
+								$name = '/';
+							}
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
 						list($url,$query) = explode('?',$url,2);
-						if ($query) $query = '?'.$query;
+						if ($query)
+						{
+							$query = '?'.$query;
+						}
 
 						if (substr($url,-1) == '/')
 						{
@@ -461,7 +500,10 @@ 
 					{
 						do_stat($url,$long,$numeric,false,$inode);
 					}
-					if (!$long && $cmd == 'ls') echo "\n";
+					if (!$long && $cmd == 'ls')
+					{
+						echo "\n";
+					}
 					break;
 			}
 		}
@@ -665,18 +707,36 @@ 
 			{
 				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
 					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
-				if (is_array($uid)) $uid = $uid['name'];
-				if (empty($uid)) $uid = $stat['uid'];
+				if (is_array($uid))
+				{
+					$uid = $uid['name'];
+				}
+				if (empty($uid))
+				{
+					$uid = $stat['uid'];
+				}
+			}
+			if (!isset($uid))
+			{
+				$uid = 'root';
 			}
-			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
 				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
 					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
-				if (is_array($gid)) $gid = $gid['name'];
-				if (empty($gid)) $gid = $stat['gid'];
+				if (is_array($gid))
+				{
+					$gid = $gid['name'];
+				}
+				if (empty($gid))
+				{
+					$gid = $stat['gid'];
+				}
+			}
+			if (!isset($gid))
+			{
+				$gid = 'root';
 			}
-			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
 		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
@@ -699,8 +759,14 @@ 
 
 function hsize($size)
 {
-	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
+	if ($size < 1024)
+	{
+		return $size;
+	}
+	if ($size < 1024*1024)
+	{
+		return sprintf('%3.1lfk',(float)$size/1024);
+	}
 	return sprintf('%3.1lfM',(float)$size/(1024*1024));
 }
 
@@ -734,14 +800,20 @@ 
 					++$anz_files;
 					_cp($f,$t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms)
+				{
+					_cp_perms($f,$t);
+				}
 			}
 			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
 			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			if ($perms)
+			{
+				_cp_perms($from,$to);
+			}
 		}
 	}
 }
@@ -770,7 +842,10 @@ 
 	//stream_filter_append($from_fp,'convert.base64-decode');
 	$count = stream_copy_to_stream($from_fp,$to_fp);
 
-	if ($verbose) echo hsize($count)." bytes written to $to\n";
+	if ($verbose)
+	{
+		echo hsize($count)." bytes written to $to\n";
+	}
 
 	fclose($from_fp);
 
@@ -817,7 +892,10 @@ 
 function do_lntree($from,$to)
 {
 	echo "lntree $from $to\n";
-	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
+	if ($from[0] == '/')
+	{
+		$from = 'sqlfs://default'.$from;
+	}
 	load_wrapper($from);
 
 	if (!file_exists($from))
@@ -879,34 +957,55 @@ 
  */
 function int2mode( $mode )
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if(($mode & 0xA000) == 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	}
+	elseif(($mode & 0xC000) == 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	}
+	elseif($mode & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	}
+	elseif($mode & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	}
+	elseif($mode & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	}
+	elseif($mode & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	}
+	elseif($mode & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -381,13 +381,13 @@ 
 									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
-										die("Unknown $type '$owner_was'!");
+										die("unknown $type '$owner_was'!");
 									}
 								}
 								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
-									die("Unknown $type '$owner_was'!");
+									die("unknown $type '$owner_was'!");
 								}
 							}
 							$params = array($url,$owner);
@@ -445,7 +445,7 @@ 
 					{
 						if (!($f = fopen($url,'r')))
 						{
-							echo "File $url not found !!!\n\n";
+							echo "file $url not found !!!\n\n";
 						}
 						else
 						{
@@ -761,7 +761,7 @@ 
 	}
 	if (!($from_fp = fopen($from,'r')))
 	{
-		die("File $from not found!\n");
+		die("file $from not found!\n");
 	}
 	if (!($to_fp = fopen($to,'w')))
 	{

filemanager/test.php

Spacing +15 added lines, -15 removed lines

@@ -18,13 +18,13 @@ 
 );
 include('../header.inc.php');
 
-if (!($path = Api\Cache::getSession('filemanger','test')))
+if (!($path = Api\Cache::getSession('filemanger', 'test')))
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
 if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
-echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
-	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
+echo Api\Html::form("<p>Path: ".Api\Html::input('path', $path, 'text', 'size="40"').
+	Api\Html::submit_button('', lang('Submit'))."</p>\n", array(), '', '', '', '', 'GET');
 
 if (isset($path) && !empty($path))
 {
@@ -32,13 +32,13 @@ 
 	{
 		throw new Api\Exception\WrongUserinput('Not an absolute path!');
 	}
-	Api\Cache::setSession('filemanger','test',$path);
+	Api\Cache::setSession('filemanger', 'test', $path);
 
 	echo "<h2>";
-	foreach(explode('/',$path) as $n => $part)
+	foreach (explode('/', $path) as $n => $part)
 	{
 		$p .= ($p != '/' ? '/' : '').$part;
-		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ','/filemanager/test.php',array('path'=>$p));
+		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ', '/filemanager/test.php', array('path'=>$p));
 	}
 	echo "</h2>\n";
 
@@ -50,29 +50,29 @@ 
 
 	$time = microtime(true);
 	$stat = Vfs::stat($path);
-	$stime = number_format(1000*(microtime(true)-$time),1);
+	$stime = number_format(1000 * (microtime(true) - $time), 1);
 
 	$time2 = microtime(true);
 	if ($is_dir)// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
 		//while(($file = readdir($d)))
-		foreach(Vfs::scandir($path) as $file)
+		foreach (Vfs::scandir($path) as $file)
 		{
-			if (Vfs::is_readable($fpath=Vfs::concat($path,$file)))
+			if (Vfs::is_readable($fpath = Vfs::concat($path, $file)))
 			{
-				$file = Api\Html::a_href($file,'/filemanager/test.php',array('path'=>$fpath));
+				$file = Api\Html::a_href($file, '/filemanager/test.php', array('path'=>$fpath));
 			}
 			$file .= ' ('.Vfs::mime_content_type($fpath).')';
 			$files[] = $file;
 		}
 		//closedir($d);
-		$time2f = number_format(1000*(microtime(true)-$time2),1);
+		$time2f = number_format(1000 * (microtime(true) - $time2), 1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if ($files) echo '<ol><li>'.implode("</li>\n<li>", $files).'</ol>'."\n";
 	}
 
-	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';
+	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode']) ? sprintf('%o', $stat['mode']).' = '.Vfs::int2mode($stat['mode']) : 'NULL').')';
 	if (is_array($stat))
 	{
 		_debug_array($stat);
@@ -89,8 +89,8 @@ 
 	echo "<p><b>readlink('$path')</b>=".array2string(Vfs::readlink($path))."</p>\n";
 	$time3 = microtime(true);
 	$lstat = Vfs::lstat($path);
-	$time3f = number_format(1000*(microtime(true)-$time3),1);
-	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode'])?sprintf('%o',$lstat['mode']).' = '.Vfs::int2mode($lstat['mode']):'NULL').')';
+	$time3f = number_format(1000 * (microtime(true) - $time3), 1);
+	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode']) ? sprintf('%o', $lstat['mode']).' = '.Vfs::int2mode($lstat['mode']) : 'NULL').')';
 	if (is_array($lstat))
 	{
 		_debug_array($lstat);

Braces +12 added lines, -3 removed lines

@@ -22,7 +22,10 @@ 
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
-if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
+if (isset($_REQUEST['path']))
+{
+	$path = $_REQUEST['path'];
+}
 echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
 	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
 
@@ -53,9 +56,12 @@ 
 	$stime = number_format(1000*(microtime(true)-$time),1);
 
 	$time2 = microtime(true);
-	if ($is_dir)// && ($d = Vfs::opendir($path)))
+	if ($is_dir)
+	{
+		// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
+	}
 		//while(($file = readdir($d)))
 		foreach(Vfs::scandir($path) as $file)
 		{
@@ -69,7 +75,10 @@ 
 		//closedir($d);
 		$time2f = number_format(1000*(microtime(true)-$time2),1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if($files)
+		{
+			echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		}
 	}
 
 	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';

updateGruntfile.php

Spacing +10 added lines, -10 removed lines

@@ -36,11 +36,11 @@ 
 }
 //print_r($config); exit;
 
-$uglify =& $config['uglify'];
+$uglify = & $config['uglify'];
 
-foreach(Bundle::all() as $name => $files)
+foreach (Bundle::all() as $name => $files)
 {
-	if ($name == '.ts') continue;	// ignore timestamp
+	if ($name == '.ts') continue; // ignore timestamp
 
 	// remove leading / from file-names
 	array_walk($files, function(&$path)
@@ -79,16 +79,16 @@ 
 }
 
 // add css for all templates and themes
-$cssmin =& $config['cssmin'];
-$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*';	// to no find any app.css files
-$GLOBALS['egw_info']['server']['debug_minify'] = 'True';	// otherwise we would only get minified file
-foreach(array('pixelegg','jdots')/*array_keys(Framework::list_templates())*/ as $template)
+$cssmin = & $config['cssmin'];
+$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*'; // to no find any app.css files
+$GLOBALS['egw_info']['server']['debug_minify'] = 'True'; // otherwise we would only get minified file
+foreach (array('pixelegg', 'jdots')/*array_keys(Framework::list_templates())*/ as $template)
 {
 	$GLOBALS['egw_info']['server']['template_set'] = $template;
 	$tpl = Framework::factory();
 	$themes = $tpl->list_themes();
-	if ($template == 'pixelegg') $themes[] = 'fw_mobile';	// this is for mobile devices
-	foreach($themes as $theme)
+	if ($template == 'pixelegg') $themes[] = 'fw_mobile'; // this is for mobile devices
+	foreach ($themes as $theme)
 	{
 		// skip not working cssmin of pixelegg/traditional: Broken @import declaration of "../../etemplate/templates/default/etemplate2.css"
 		if ($template == 'pixelegg' && $theme == 'traditional') continue;
@@ -114,7 +114,7 @@ 
 $new_json = str_replace("\n", "\n\t",
 	preg_replace_callback('/^( *)/m', function($matches)
 	{
-		return str_repeat("\t", strlen($matches[1])/4);
+		return str_repeat("\t", strlen($matches[1]) / 4);
 	}, json_encode($config, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)));
 
 $new_content = preg_replace('/^(\s*)"([a-z0-9]+)":/mi', '$1$2:', $new_json);

Braces +22 added lines, -5 removed lines

@@ -13,7 +13,10 @@ 
 use EGroupware\Api\Framework;
 use EGroupware\Api\Framework\Bundle;
 
-if (php_sapi_name() !== 'cli') die("This is a commandline ONLY tool!\n");
+if (php_sapi_name() !== 'cli')
+{
+	die("This is a commandline ONLY tool!\n");
+}
 
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
@@ -40,12 +43,19 @@ 
 
 foreach(Bundle::all() as $name => $files)
 {
-	if ($name == '.ts') continue;	// ignore timestamp
+	if ($name == '.ts')
+	{
+		continue;
+	}
+	// ignore timestamp
 
 	// remove leading / from file-names
 	array_walk($files, function(&$path)
 	{
-		if ($path[0] == '/') $path = substr($path, 1);
+		if ($path[0] == '/')
+		{
+			$path = substr($path, 1);
+		}
 	});
 
 	// api/js/jsapi/egw.js loaded via own tag, and we must not load it twice!
@@ -87,11 +97,18 @@ 
 	$GLOBALS['egw_info']['server']['template_set'] = $template;
 	$tpl = Framework::factory();
 	$themes = $tpl->list_themes();
-	if ($template == 'pixelegg') $themes[] = 'fw_mobile';	// this is for mobile devices
+	if ($template == 'pixelegg')
+	{
+		$themes[] = 'fw_mobile';
+	}
+	// this is for mobile devices
 	foreach($themes as $theme)
 	{
 		// skip not working cssmin of pixelegg/traditional: Broken @import declaration of "../../etemplate/templates/default/etemplate2.css"
-		if ($template == 'pixelegg' && $theme == 'traditional') continue;
+		if ($template == 'pixelegg' && $theme == 'traditional')
+		{
+			continue;
+		}
 		$GLOBALS['egw_info']['user']['preferences']['common']['theme'] = $theme;
 		// empty include list by not-existing file plus last true
 		Framework\CssIncludes::add('*grunt*', null, true, true);

calendar/sitemgr/class.module_calendar_planner.inc.php

Spacing +33 added lines, -33 removed lines

@@ -48,7 +48,7 @@ 
 			'cat_id' => array(
 				'type' => 'select',
 				'label' => lang('Choose a category'),
-				'options' => array(),	// done by get_user_interface()
+				'options' => array(), // done by get_user_interface()
 				'multiple' => true,
 			),
 			'owner' => array(
@@ -93,10 +93,10 @@ 
 	 */
 	function get_user_interface()
 	{
-		$cats = new Api\Categories('','calendar');
-		foreach($cats->return_array('all',0,False,'','cat_name','',True) as $cat)
+		$cats = new Api\Categories('', 'calendar');
+		foreach ($cats->return_array('all', 0, False, '', 'cat_name', '', True) as $cat)
 		{
-			$this->arguments['cat_id']['options'][$cat['id']] = str_repeat('  ',$cat['level']).$cat['name'];
+			$this->arguments['cat_id']['options'][$cat['id']] = str_repeat('  ', $cat['level']).$cat['name'];
 		}
 		if (count($this->arguments['cat_id']['options']) > 5)
 		{
@@ -107,7 +107,7 @@ 
 		{
 			$GLOBALS['egw']->accounts = new Api\Accounts();
 		}
-		$this->accounts =& $GLOBALS['egw']->accounts;
+		$this->accounts = & $GLOBALS['egw']->accounts;
 		$search_params = array(
 			'type' => 'both',
 			'app' => 'calendar',
@@ -117,8 +117,8 @@ 
 		$users = array();
 		$groups = array();
 		// sort users and groups separately.
-		$anon_user = $this->accounts->name2id($GLOBALS['Common_BO']->sites->current_site['anonymous_user'],'account_lid','u');
-		$anon_groups = $this->accounts->memberships($anon_user,true);
+		$anon_user = $this->accounts->name2id($GLOBALS['Common_BO']->sites->current_site['anonymous_user'], 'account_lid', 'u');
+		$anon_groups = $this->accounts->memberships($anon_user, true);
 		foreach ($accounts as $entry)
 		{
 			$is_group = false;
@@ -126,9 +126,9 @@ 
 			$acl = new Acl($entry['account_id']);
 			$acl->read_repository();
 			// get the rights for each account to check whether the anon user has read permissions.
-			$rights = $acl->get_rights($anon_user,'calendar');
+			$rights = $acl->get_rights($anon_user, 'calendar');
 			// also add the anon user if it's his own calendar.
-			if ($calendar_bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$entry['account_id'],'ts',null,$anon_user) || ($entry['account_id'] == $anon_user))
+			if ($calendar_bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $entry['account_id'], 'ts', null, $anon_user) || ($entry['account_id'] == $anon_user))
 			{
 				$has_read_permissions = true;
 			}
@@ -138,8 +138,8 @@ 
 				// or ass permissions if this is the anon group's calendar.
 				foreach ($anon_groups as $parent_group)
 				{
-					$rights = $acl->get_rights($parent_group,'calendar');
-					if (($rights & Acl::READ) || ($entry['account_id'] == $parent_group))
+					$rights = $acl->get_rights($parent_group, 'calendar');
+					if (($rights&Acl::READ) || ($entry['account_id'] == $parent_group))
 					{
 						$has_read_permissions = true;
 						break;
@@ -155,7 +155,7 @@ 
 				}
 				else
 				{
-					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']);
+					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']);
 				}
 			}
 		}
@@ -180,17 +180,17 @@ 
  		foreach ($calendar_bo->resources as $type => $data)
 		{
 			// Check anon user's permissions - must have at least run for the hook to be available
-			if($acl->check('run',EGW_ACL_READ, $data['app']) &&
+			if ($acl->check('run', EGW_ACL_READ, $data['app']) &&
 				$type != '' && $data['app'] && Link::get_registry($data['app'], 'query')
 			)
 			{
-				$_results = Link::query($data['app'], $query,$options);
+				$_results = Link::query($data['app'], $query, $options);
 			}
-			if(!$_results) continue;
+			if (!$_results) continue;
 			$_results = array_unique($_results);
 			foreach ($_results as $key => $value)
 			{
-				if($calendar_bo->check_perms(Acl::READ,0,$type.$key,'ts',null,$anon_user))
+				if ($calendar_bo->check_perms(Acl::READ, 0, $type.$key, 'ts', null, $anon_user))
 				{
 					$this->arguments['resources']['options'][$type.$key] = $value;
 				}
@@ -209,7 +209,7 @@ 
 	 * @param $arguments
 	 * @param $properties
 	 */
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 
@@ -221,15 +221,15 @@ 
 		if ($arguments['sortby'] == 'yearly')
 		{
 			$arguments['sortby'] = 'month';
-			$arguments['date'] = substr($arguments['date'],0,4).'0101';
+			$arguments['date'] = substr($arguments['date'], 0, 4).'0101';
 		}
 		if (isset($_GET['date'])) $arguments['date'] = $_GET['date'];
 		if (empty($arguments['cat_id'])) $arguments['cat_id'] = '';
-		if(isset($arguments['resources']) && in_array('r0', $arguments['resources']))
+		if (isset($arguments['resources']) && in_array('r0', $arguments['resources']))
 		{
-			foreach($arguments['resources'] as $index => $value)
+			foreach ($arguments['resources'] as $index => $value)
 			{
-				if($value == 'r0')
+				if ($value == 'r0')
 				{
 					unset($arguments['resources'][$index]);
 				}
@@ -272,11 +272,11 @@ 
 			{
 				if ($ui->day < 15)	// show one complete month
 				{
-					$ui->_week_align_month($ui->first,$ui->last);
+					$ui->_week_align_month($ui->first, $ui->last);
 				}
 				else	// show 2 half month
 				{
-					$ui->_week_align_month($ui->first,$ui->last,15);
+					$ui->_week_align_month($ui->first, $ui->last, 15);
 				}
 			}
 			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')	// weeekview
@@ -285,7 +285,7 @@ 
 				$start->setWeekstart();
 				$ui->first = $start->format('ts');
 				$ui->last = $ui->bo->date2array($this->first);
-				$ui->last['day'] += ($ui->planner_view == 'week' ? 7 : 7 * $ui->cal_prefs['multiple_weeks'])-1;
+				$ui->last['day'] += ($ui->planner_view == 'week' ? 7 : 7 * $ui->cal_prefs['multiple_weeks']) - 1;
 				$ui->last['hour'] = 23; $ui->last['minute'] = $ui->last['sec'] = 59;
 				unset($ui->last['raw']);
 				$ui->last = $ui->bo->date2ts($ui->last);
@@ -310,22 +310,22 @@ 
 			$content = array();
 			$sel_options = array();
 			$content['planner'] = $ui->bo->search($search_params);
-			foreach($content['planner'] as &$event)
+			foreach ($content['planner'] as &$event)
 			{
 				$ui->to_client($event);
 			}
 
 			$tmpl = new Etemplate('calendar.planner');
 
-			$tmpl->setElementAttribute('planner','start_date', Api\DateTime::to($ui->first, Api\DateTime::ET2));
-			$tmpl->setElementAttribute('planner','end_date', Api\DateTime::to($ui->last, Api\DateTime::ET2));
-			$tmpl->setElementAttribute('planner','owner', $search_params['owner']);
-			$tmpl->setElementAttribute('planner','group_by', $ui->sortby);
+			$tmpl->setElementAttribute('planner', 'start_date', Api\DateTime::to($ui->first, Api\DateTime::ET2));
+			$tmpl->setElementAttribute('planner', 'end_date', Api\DateTime::to($ui->last, Api\DateTime::ET2));
+			$tmpl->setElementAttribute('planner', 'owner', $search_params['owner']);
+			$tmpl->setElementAttribute('planner', 'group_by', $ui->sortby);
 
 			// Make sure all used owners are there, faking
 			// calendar_owner_etemplate_widget::beforeSendToClient() since the
 			// rest of the calendar app is probably missing.
-			foreach($search_params['owner'] as $owner)
+			foreach ($search_params['owner'] as $owner)
 			{
 				$sel_options['owner'][] = Array(
 					'id' => $owner,
@@ -333,11 +333,11 @@ 
 					'label' => calendar_owner_etemplate_widget::get_owner_label($owner)
 				);
 			}
-			$tmpl->exec(__METHOD__, $content,$sel_options, array('__ALL__' => true),array(),2);
+			$tmpl->exec(__METHOD__, $content, $sel_options, array('__ALL__' => true), array(), 2);
 			$html .= ob_get_contents();
 			$html .= '<script>'
 			. '	window.egw_LAB.wait(function() {$j(function() {'
-			. 'app.calendar.set_state(' . json_encode(array(
+			. 'app.calendar.set_state('.json_encode(array(
 					'owner' => $search_params['owner'],
 					'sortby' => $ui->sortby,
 					'filter' => $arguments['filter']
@@ -350,7 +350,7 @@ 
 			$html .= '<div class="message" align="center">'.lang('No owner selected').'</div>';
 		}
 
-		while(@ob_end_clean());
+		while (@ob_end_clean());
 
 		return $html;
 	}

Braces +24 added lines, -9 removed lines

@@ -178,15 +178,17 @@ 
 		$acl = new Acl($anon_user);
 		$acl->read_repository();
  		foreach ($calendar_bo->resources as $type => $data)
-		{
+ 		{
 			// Check anon user's permissions - must have at least run for the hook to be available
 			if($acl->check('run',EGW_ACL_READ, $data['app']) &&
 				$type != '' && $data['app'] && Link::get_registry($data['app'], 'query')
-			)
-			{
+			) {
 				$_results = Link::query($data['app'], $query,$options);
 			}
-			if(!$_results) continue;
+			if(!$_results)
+			{
+				continue;
+			}
 			$_results = array_unique($_results);
 			foreach ($_results as $key => $value)
 			{
@@ -223,8 +225,14 @@ 
 			$arguments['sortby'] = 'month';
 			$arguments['date'] = substr($arguments['date'],0,4).'0101';
 		}
-		if (isset($_GET['date'])) $arguments['date'] = $_GET['date'];
-		if (empty($arguments['cat_id'])) $arguments['cat_id'] = '';
+		if (isset($_GET['date']))
+		{
+			$arguments['date'] = $_GET['date'];
+		}
+		if (empty($arguments['cat_id']))
+		{
+			$arguments['cat_id'] = '';
+		}
 		if(isset($arguments['resources']) && in_array('r0', $arguments['resources']))
 		{
 			foreach($arguments['resources'] as $index => $value)
@@ -259,7 +267,8 @@ 
 		if (is_array($params['owner']))
 		{
 			// Buffer, and add anything that gets cleared to the content
-			ob_start(function($buffer) use(&$html) {
+			ob_start(function($buffer) use(&$html)
+			{
 				$html .= $buffer;
 				return '';
 			});
@@ -268,20 +277,26 @@ 
 			$ui->sortby = $arguments['sortby'];
 			$ui->owner = $params['owner'];
 
-			if (!$ui->planner_view || $ui->planner_view == 'month')	// planner monthview
+			if (!$ui->planner_view || $ui->planner_view == 'month')
+			{
+				// planner monthview
 			{
 				if ($ui->day < 15)	// show one complete month
 				{
 					$ui->_week_align_month($ui->first,$ui->last);
+			}
 				}
 				else	// show 2 half month
 				{
 					$ui->_week_align_month($ui->first,$ui->last,15);
 				}
 			}
-			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')	// weeekview
+			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')
+			{
+				// weeekview
 			{
 				$start = new Api\DateTime($ui->date);
+			}
 				$start->setWeekstart();
 				$ui->first = $start->format('ts');
 				$ui->last = $ui->bo->date2array($this->first);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -327,7 +327,7 @@
 			// rest of the calendar app is probably missing.
 			foreach($search_params['owner'] as $owner)
 			{
-				$sel_options['owner'][] = Array(
+				$sel_options['owner'][] = array(
 					'id' => $owner,
 					'value' => $owner,
 					'label' => calendar_owner_etemplate_widget::get_owner_label($owner)

calendar/sitemgr/class.module_calendar.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,12 +27,12 @@
 		$this->description = lang('This module displays the current month');
  	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
-		$date = (int) (strtotime(get_var('date',array('POST','GET'))));
+		$date = (int)(strtotime(get_var('date', array('POST', 'GET'))));
 		$redirect = $arguments['redirect'] ? $arguments['redirect'] : '#';
 
 		return $GLOBALS['egw']->jscalendar->get_javascript().
-			$GLOBALS['egw']->jscalendar->flat($redirect,$date);
+			$GLOBALS['egw']->jscalendar->flat($redirect, $date);
 	}
 }

Braces +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 /**
  * Calendar day selection for sitemgr
  */
-class module_calendar extends Module 
+class module_calendar extends Module
 {
-	function module_calendar()  
+	function module_calendar()
 	{
 		$this->arguments = array(
 			'redirect' => array(