EGroupware / egroupware

redirect.php

Spacing +9 added lines, -9 removed lines

@@ -22,11 +22,11 @@ 
 	  "<a href=\"$webserverURL/redirect.php?go=".htmlentities(urlencode('http://www.egroupware.org')).'">'
 	*/
 
-	if(!function_exists('html_entity_decode'))
+	if (!function_exists('html_entity_decode'))
 	{
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
-			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));
+			$trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style));
 			$trans_table['&#39;'] = "'";
 			return(strtr($given_html, $trans_table));
 		}
@@ -45,17 +45,17 @@ 
 
 	/* Only allow redirects from inside this eGroupware installation. */
 	$valid_referer = array();
-	$path = preg_replace('/\/[^\/]*$/','',$_SERVER['PHP_SELF']) . '/';
+	$path = preg_replace('/\/[^\/]*$/', '', $_SERVER['PHP_SELF']).'/';
 	array_push($valid_referer, $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$path);
 
 	$referrer = trim($_SERVER['HTTP_REFERER']);
 	if ((!isset($_SERVER['HTTP_REFERER'])) || (empty($referrer)))
 	{
 		echo "Only usable from within eGroupware.\n";
 	}
-	else if($_GET['go'])
+	else if ($_GET['go'])
 	{
 		$allow = false;
 		foreach ($valid_referer as $urlRoot)
@@ -69,15 +69,15 @@ 
 		}
 		if ($allow)
 		{
-			$url= html_entity_decode(urldecode($_GET['go']));
+			$url = html_entity_decode(urldecode($_GET['go']));
 			unset($_GET['go']);
 			/* Only add "&" if there is something to append. */
 			if (!empty($_GET))
 			{
-				$url=$url."&".http_build_query($_GET);
+				$url = $url."&".http_build_query($_GET);
 			}
 
-			Header('Location: ' . html_entity_decode(urldecode($url)));
+			Header('Location: '.html_entity_decode(urldecode($url)));
 			exit;
 		}
 		else

filemanager/setup/setup.inc.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['filemanager']['license']  = 'GPL';
+$setup_info['filemanager']['license'] = 'GPL';
 
 /* The hooks this app includes, needed for hooks registration */
 $setup_info['filemanager']['hooks']['settings'] = 'filemanager_hooks::settings';

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);
 	}

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']);

filemanager/inc/class.filemanager_merge.inc.php

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'),

filemanager/inc/class.filemanager_shares.inc.php

Spacing +12 added lines, -12 removed lines

@@ -89,7 +89,7 @@ 
 		$readonlys = null;
 		$total = Sharing::so()->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if (substr($row['share_path'], 0, strlen(self::$tmp_dir)) === self::$tmp_dir)
 			{
@@ -130,21 +130,21 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (!is_array($content))
 		{
 			$content = array(
 				'nm' => array(
-					'get_rows'       =>	'filemanager.filemanager_shares.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter'      => True,	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => false,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'share_created',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+					'get_rows'       =>	'filemanager.filemanager_shares.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter'      => True, // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => false, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'share_created', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 					//'default_cols'   => '!',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
@@ -156,7 +156,7 @@ 
 		}
 		elseif ($content['nm']['action'])
 		{
-			switch($content['nm']['action'])
+			switch ($content['nm']['action'])
 			{
 				case 'delete':
 					$where = array('share_owner' => $GLOBALS['egw_info']['user']['account_id']);

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

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);

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);