EGroupware / egroupware

preferences/inc/class.preferences_hooks.inc.php

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
 		);
 
 		$account_display = array(
-			'firstname' => lang('Firstname'). ' '.lang('Lastname'),
+			'firstname' => lang('Firstname').' '.lang('Lastname'),
 			'lastname'  => lang('Lastname').', '.lang('Firstname'),
 			'username'  => lang('username'),
 			'firstall'  => lang('Firstname').' '.lang('Lastname').' ['.lang('username').']',
@@ -95,7 +95,7 @@ 
 			$lang = setup::get_lang();
 		}
 		if (empty($lang)) $lang = 'en';
-		list(,$country) = explode('-',$lang);
+		list(,$country) = explode('-', $lang);
 		if (empty($country) && class_exists('Locale')) $country = Locale::getRegion(Locale::getDefault());
 		if (empty($country)) $country = 'de';
 		
@@ -104,7 +104,7 @@ 
 			substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px')
 		{
 			$prefs = $GLOBALS['egw']->preferences;
-			foreach(array('user','default','forced') as $type)
+			foreach (array('user', 'default', 'forced') as $type)
 			{
 				if (substr($prefs->{$type}['common']['rte_font_size'], -2) == 'px')
 				{
@@ -131,7 +131,7 @@ 
 				'size'  => 3,
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => 20,	// hidden as not used in eTemplate2
+				'forced' => 20, // hidden as not used in eTemplate2
 			),
 			'template_set' => array(
 				'type'   => 'select',
@@ -157,7 +157,7 @@ 
 				'type'   => 'select',
 				'label'  => 'Audio effect',
 				'name'   => 'audio_effect',
-				'values' => array('0'=>lang('Disable'),'1'=>lang('Enable')),
+				'values' => array('0'=>lang('Disable'), '1'=>lang('Enable')),
 				'help'   => 'Audio effect enables|disables sound effects used in the theme',
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -278,7 +278,7 @@ 
 				'type'   => 'multiselect',
 				'label'  => 'Permanent time zone selection',
 				'name'   => 'tz_selection',
-				'values' => $tzs ? call_user_func_array('array_merge',$tzs) : null,	// only flat arrays supported
+				'values' => $tzs ? call_user_func_array('array_merge', $tzs) : null, // only flat arrays supported
 				'help'   => 'Please select timezones, you want to be able to quickly switch between. Switch is NOT shown, if less then two are selected.',
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -409,7 +409,7 @@ 
 				'type'   => 'select',
 				'label'  => 'Features of the editor',
 				'name'   => 'rte_features',
-				'values' => array('simple'=>'simple','extended'=>'regular','advanced'=>'everything'),
+				'values' => array('simple'=>'simple', 'extended'=>'regular', 'advanced'=>'everything'),
 				'help'   => 'How many toolbar buttons are available',
 				'admin'  => false,
 				'default'=> 'extended'
@@ -430,7 +430,7 @@ 
 	{
 		$account_id = (int)$data['account_id'];
 
-		if($account_id > 0)	// user
+		if ($account_id > 0)	// user
 		{
 			$GLOBALS['egw']->preferences->delete_user($account_id);
 		}
@@ -462,10 +462,10 @@ 
 	 */
 	static function admin($args)
 	{
-		unset($args);	// unused, but required by function signature
+		unset($args); // unused, but required by function signature
 		$appname = 'preferences';
 		$file = Array(
-			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
+			'Site configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname='.$appname.'&ajax=true'),
 		);
 		display_section($appname, $file);
 	}

Braces +28 added lines, -7 removed lines

@@ -90,14 +90,26 @@ 
 			'all'       => '['.lang('username').'] '.lang('Lastname').','.lang('Firstname'),
 		);
 
-		if ($hook_data['setup'])	// called via setup
+		if ($hook_data['setup'])
+		{
+			// called via setup
 		{
 			$lang = setup::get_lang();
 		}
-		if (empty($lang)) $lang = 'en';
+		}
+		if (empty($lang))
+		{
+			$lang = 'en';
+		}
 		list(,$country) = explode('-',$lang);
-		if (empty($country) && class_exists('Locale')) $country = Locale::getRegion(Locale::getDefault());
-		if (empty($country)) $country = 'de';
+		if (empty($country) && class_exists('Locale'))
+		{
+			$country = Locale::getRegion(Locale::getDefault());
+		}
+		if (empty($country))
+		{
+			$country = 'de';
+		}
 		
 		// check for old rte_font_size pref including px and split it in size and unit
 		if (!isset($GLOBALS['egw_setup']) &&
@@ -416,7 +428,10 @@ 
 			),
 		);
 		// disable thumbnails, if no size configured by admin
-		if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($settings['link_list_thumbnail']);
+		if (!$GLOBALS['egw_info']['server']['link_list_thumbnail'])
+		{
+			unset($settings['link_list_thumbnail']);
+		}
 
 		return $settings;
 	}
@@ -430,14 +445,20 @@ 
 	{
 		$account_id = (int)$data['account_id'];
 
-		if($account_id > 0)	// user
+		if($account_id > 0)
+		{
+			// user
 		{
 			$GLOBALS['egw']->preferences->delete_user($account_id);
 		}
-		elseif ($account_id < 0)	// group
+		}
+		elseif ($account_id < 0)
+		{
+			// group
 		{
 			$GLOBALS['egw']->preferences->delete_group($account_id);
 		}
+		}
 	}
 
 	/**

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

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

preferences/inc/class.preferences_password.inc.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 
 		if (!is_array($content))
 		{
-			$content= array();
+			$content = array();
 		}
 		else
 		{
@@ -56,7 +56,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
 		$tmpl = new Etemplate('preferences.password');
 
-		$tmpl->exec('preferences.preferences_password.change', $content,array(),array(),array(),2);
+		$tmpl->exec('preferences.preferences_password.change', $content, array(), array(), array(), 2);
 	}
 
 	/**

preferences/inc/class.preferences_categories_ui.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 	function __construct()
 	{
-		if (false) parent::__construct ();	// parent constructor explicitly not called!
+		if (false) parent::__construct(); // parent constructor explicitly not called!
 
 		Framework::includeCSS('/admin/templates/default/app.css');
 	}

Braces +7 added lines, -2 removed lines

@@ -16,7 +16,8 @@ 
  * Preference UI extends Admin class to give regular users restricted
  * access to modify Api\Categories
  */
-class preferences_categories_ui extends admin_categories {
+class preferences_categories_ui extends admin_categories
+{
 
 	protected $appname = 'preferences';
 	protected $get_rows = 'preferences.preferences_categories_ui.get_rows';
@@ -26,7 +27,11 @@ 
 
 	function __construct()
 	{
-		if (false) parent::__construct ();	// parent constructor explicitly not called!
+		if (false)
+		{
+			parent::__construct ();
+		}
+		// parent constructor explicitly not called!
 
 		Framework::includeCSS('/admin/templates/default/app.css');
 	}

doc/check_namespace.php

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
 function check_namespace($file)
 {
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = file_get_contents($file)) === false) return false;
 
@@ -36,7 +36,7 @@ 
 
 	// find classes declared in file itself, in case they are used
 	$declared = array();
-	foreach(explode("\n", $lines) as $num => $line)
+	foreach (explode("\n", $lines) as $num => $line)
 	{
 		$matches = null;
 		if (preg_match('/class\s+([^ ]+)/', $line, $matches))
@@ -47,7 +47,7 @@ 
 	$namespace = '';
 	$use = array();
 	$allways = array('self', 'parent', 'static');
-	foreach(explode("\n", $lines) as $num => $line)
+	foreach (explode("\n", $lines) as $num => $line)
 	{
 		$matches = null;
 		if (preg_match('/namespace\s+([A-Za-z0-9_\\\\]+);/', $line, $matches))
@@ -59,7 +59,7 @@ 
 
 		if (preg_match('/use\s+([^;]+);/', $line, $matches))
 		{
-			foreach(preg_split('/,\s*/', $matches[1]) as $alias)
+			foreach (preg_split('/,\s*/', $matches[1]) as $alias)
 			{
 				$parts = explode('\\', $alias);
 				$use[$alias] = array_pop($parts);
@@ -75,7 +75,7 @@ 
 			$all_matches_raw = array_merge($all_matches_raw, $matches[1]);
 		}
 		$all_matches = array_unique($all_matches_raw);
-		foreach($all_matches as $c => $class)
+		foreach ($all_matches as $c => $class)
 		{
 			$parts = explode('\\', $class);
 			$first_part = array_shift($parts);
@@ -93,7 +93,7 @@ 
 		}
 		if ($all_matches)
 		{
-			echo (1+$num).":\t".$line."\n";
+			echo (1 + $num).":\t".$line."\n";
 			echo "--> ".implode(', ', $all_matches)."\n\n";
 		}
 	}
@@ -111,7 +111,7 @@ 
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -119,13 +119,13 @@ 
 		{
 			check_namespace_recursive($dir.'/'.$file);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
 			check_namespace($dir.'/'.$file);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -134,7 +134,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] file or dir\n\n";
@@ -148,9 +148,9 @@ 
 if (!$args) usage();
 
 $replace_file = false;
-while(($arg = array_shift($args)))
+while (($arg = array_shift($args)))
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -170,9 +170,9 @@ 
 
 if (!is_dir($arg))
 {
-	check_namespace($arg,$replace_file);
+	check_namespace($arg, $replace_file);
 }
 else
 {
-	check_namespace_recursive($arg,$replace_file);
+	check_namespace_recursive($arg, $replace_file);
 }
\ No newline at end of file

Braces +41 added lines, -10 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>check_namespace.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * Check namespace usage in converted code
@@ -24,9 +27,16 @@ 
 function check_namespace($file)
 {
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
-	if (($content = file_get_contents($file)) === false) return false;
+	if (($content = file_get_contents($file)) === false)
+	{
+		return false;
+	}
 
 	// replace commented lines with empty ones
 	$lines = preg_replace_callback('#(//.*$|/\\*.*\\*/)#msU', function($matches)
@@ -55,7 +65,10 @@ 
 			$namespace = $matches[1];
 			$use = array();
 		}
-		if ($namespace === '') continue;
+		if ($namespace === '')
+		{
+			continue;
+		}
 
 		if (preg_match('/use\s+([^;]+);/', $line, $matches))
 		{
@@ -109,11 +122,17 @@ 
  */
 function check_namespace_recursive($dir)
 {
-	if (!is_dir($dir)) return false;
+	if (!is_dir($dir))
+	{
+		return false;
+	}
 
 	foreach(scandir($dir) as $file)
 	{
-		if ($file == '.' || $file == '..') continue;
+		if ($file == '.' || $file == '..')
+		{
+			continue;
+		}
 
 		if (is_dir($dir.'/'.$file))
 		{
@@ -138,14 +157,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] file or dir\n\n";
-	if ($error) echo $error."\n\n";
+	if ($error)
+	{
+		echo $error."\n\n";
+	}
 	exit($error ? 1 : 0);
 }
 
 $args = $_SERVER['argv'];
 $prog = basename(array_shift($args));
 
-if (!$args) usage();
+if (!$args)
+{
+	usage();
+}
 
 $replace_file = false;
 while(($arg = array_shift($args)))
@@ -158,15 +183,21 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
-if (!file_exists($arg)) usage("Error: $arg not found!");
+if (!file_exists($arg))
+{
+	usage("Error: $arg not found!");
+}
 
 if (!is_dir($arg))
 {

doc/config2xet.php

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
 			</columns>
 			<rows>
 ';
-foreach($trs[2] as $n => $tr)
+foreach ($trs[2] as $n => $tr)
 {
 	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"')) continue;
 
@@ -64,25 +64,25 @@ 
 	{
 		die("No td tags found in $n. tr: $tr");
 	}
-	if (($commented = !empty($trs[1][$n])? $trs[1][$n] : ''))
+	if (($commented = !empty($trs[1][$n]) ? $trs[1][$n] : ''))
 	{
 		echo "\t\t\t\t$commented\n";
 	}
 	echo "\t\t\t\t<row>\n";
-	foreach($tds[2] as $t => $td)
+	foreach ($tds[2] as $t => $td)
 	{
 		if (preg_match('|^\s*<([^ >]+)\s*([^/>]+)/?>(.*)\s*$|sui', $td, $matches))
 		{
 			$attrs = preg_match_all('|\s*([^=]+)="([^"]+)"|', $matches[2], $attrs) ?
 				array_combine($attrs[1], $attrs[2]) : array();
 
-			switch($matches[1])
+			switch ($matches[1])
 			{
 				case 'input':
 				case 'textarea':
 					echo "\t\t\t\t\t<textbox id=\"".$attrs['name'].'"';
 					unset($attrs['value'], $attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						if ($name == 'type' && $value == 'password') $value = 'passwd';
 						echo " $name=\"$value\"";
@@ -103,14 +103,14 @@ 
 				case 'select':
 					echo "\t\t\t\t\t<select id=\"".$attrs['name'].'"';
 					unset($attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						echo " $name=\"$value\"";
 					}
 					echo ">\n";
 					if (preg_match_all('|<option\s+value="([^"]*)"\s*({selected_[^}]+})?>(.*)</option>|Usui', $matches[3], $options))
 					{
-						foreach($options[3] as $i => $label)
+						foreach ($options[3] as $i => $label)
 						{
 							$label = preg_replace_callback('/{lang_([^}]+)}/', function($matches)
 							{
@@ -153,7 +153,7 @@ 
 			echo "/>\n";
 			if (!$commented && !empty($matches[3]) && trim($matches[3])) echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
 		}
-		elseif(!$commented)
+		elseif (!$commented)
 		{
 			echo "\t\t\t\t\t<!-- ".trim($td)." -->\n";
 		}

Braces +16 added lines, -4 removed lines

@@ -58,7 +58,10 @@ 
 ';
 foreach($trs[2] as $n => $tr)
 {
-	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"')) continue;
+	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"'))
+	{
+		continue;
+	}
 
 	if (!preg_match_all('|<td\s*([^>]*)>(.*)</td>|Usui', $tr, $tds, PREG_PATTERN_ORDER))
 	{
@@ -84,7 +87,10 @@ 
 					unset($attrs['value'], $attrs['name']);
 					foreach($attrs as $name => $value)
 					{
-						if ($name == 'type' && $value == 'password') $value = 'passwd';
+						if ($name == 'type' && $value == 'password')
+						{
+							$value = 'passwd';
+						}
 						echo " $name=\"$value\"";
 					}
 					echo "/>\n";
@@ -139,7 +145,10 @@ 
 		elseif (preg_match('/^\s*([^{]*){lang_([^}]+)}\s*(.*)$/sui',
 			str_replace(array('&nbsp;', '<b>', '</b>'), '', $td), $matches))
 		{
-			if (!$commented && trim($matches[1])) echo "\t\t\t\t\t<!-- $matches[1] -->\n";
+			if (!$commented && trim($matches[1]))
+			{
+				echo "\t\t\t\t\t<!-- $matches[1] -->\n";
+			}
 			echo "\t\t\t\t\t<description value=\"".htmlspecialchars(str_replace('_', ' ', $matches[2])).'"';
 			if (trim($matches[3]) == ':')
 			{
@@ -151,7 +160,10 @@ 
 				echo ' span="all" class="subHeader"';
 			}
 			echo "/>\n";
-			if (!$commented && !empty($matches[3]) && trim($matches[3])) echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
+			if (!$commented && !empty($matches[3]) && trim($matches[3]))
+			{
+				echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
+			}
 		}
 		elseif(!$commented)
 		{

doc/rpm-build/header.inc.php

Indentation +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 // dummy setup file
 if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
 {
-        header('Location: /egroupware/setup/');
-        exit;
+		header('Location: /egroupware/setup/');
+		exit;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // dummy setup file
-if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
+if (strpos($_SERVER['PHP_SELF'], '/setup/') === false)
 {
         header('Location: /egroupware/setup/');
         exit;

doc/mail/dovecot_checkpassword_ads.php

Spacing +38 added lines, -38 removed lines

@@ -55,18 +55,18 @@ 
 //$bind_pw = 'secret';
 $version = 3;
 $use_tls = false;
-$search_base = $ldap_base;//'o=%d,dc=egroupware';
+$search_base = $ldap_base; //'o=%d,dc=egroupware';
 $passdb_filter = $userdb_filter = '(&(objectCategory=person)(sAMAccountName=%s))';
 // %d for domain and %s for username given by Dovecot is set automatic
 $user_attrs = array(
-	'%u' => 'samaccountname',	// do NOT remove!
+	'%u' => 'samaccountname', // do NOT remove!
 //	'%n' => 'uidnumber',
 //	'%h' => 'mailmessagestore',
 	'%q' => '{quota:}proxyaddresses',
 	'%x' => 'dn',
 );
-$user_name = '%u';	// '%u@%d';
-$user_home = '/var/dovecot/imap/gruene/%u';	//'/var/dovecot/imap/%d/%u';	// mailbox location
+$user_name = '%u'; // '%u@%d';
+$user_home = '/var/dovecot/imap/gruene/%u'; //'/var/dovecot/imap/%d/%u';	// mailbox location
 $extra = array(
 	'userdb_quota_rule' => '*:bytes=%q',
 /* only for director
@@ -87,26 +87,26 @@ 
 $group_base = $ldap_base;
 $group_filter = '(&(objectCategory=group)(member=%x))';
 $group_attr = 'cn';
-$group_append = '';	//'@%d';
+$group_append = ''; //'@%d';
 
-$master_dn = $bind_dn;	//"cn=admin,dc=egroupware";
+$master_dn = $bind_dn; //"cn=admin,dc=egroupware";
 //$domain_master_dn = "cn=admin,o=%d,dc=egroupware";
 
-ini_set('display_errors',false);
-error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+ini_set('display_errors', false);
+error_reporting(E_ALL&~E_NOTICE);
+if ($log) ini_set('error_log', $log);
 
 if ($_SERVER['argc'] < 2)
 {
-	fwrite(STDERR,"\nUsage: {$_SERVER['argv'][0]} prog-to-exec\n\n");
-	fwrite(STDERR,"To test run:\n");
-	fwrite(STDERR,"echo -en 'username\\0000''password\\0000' | {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
-	fwrite(STDERR,"echo -en 'username\\0000' | AUTHORIZED=1 {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
-	fwrite(STDERR,"echo -en '(dovecode-admin@domain|dovecot|cyrus)\\0000''master-password\\0000' | AUTH_LOGIN_USER=username {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n\n");
+	fwrite(STDERR, "\nUsage: {$_SERVER['argv'][0]} prog-to-exec\n\n");
+	fwrite(STDERR, "To test run:\n");
+	fwrite(STDERR, "echo -en 'username\\0000''password\\0000' | {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
+	fwrite(STDERR, "echo -en 'username\\0000' | AUTHORIZED=1 {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n");
+	fwrite(STDERR, "echo -en '(dovecode-admin@domain|dovecot|cyrus)\\0000''master-password\\0000' | AUTH_LOGIN_USER=username {$_SERVER['argv'][0]} env 3<&0 ; echo $?\n\n");
 	exit(2);
 }
 
-list($username,$password) = explode("\0",file_get_contents('php://fd/3'));
+list($username, $password) = explode("\0", file_get_contents('php://fd/3'));
 if (isset($_SERVER['AUTH_LOGIN_USER']))
 {
 	$master = $username;
@@ -121,16 +121,16 @@ 
 if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 {
 	error_log("Can't connect to LDAP server $ldap_uri!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
-list(,$domain) = explode('@',$username);
-if (preg_match('/^(.*)\.imapc$/',$domain,$matches))
+list(,$domain) = explode('@', $username);
+if (preg_match('/^(.*)\.imapc$/', $domain, $matches))
 {
 	$domain = $matches[1];
 
 	$username = explode('.', $username);
 	array_pop($username);
-	$username = implode('.',$username);
+	$username = implode('.', $username);
 
 	$user_home = '/var/tmp/imapc-%d/%s';
 	$extra = array(
@@ -154,17 +154,17 @@ 
 	// master user name is hardcoded "dovecot", "cyrus" or "dovecot-admin@domain" and mapped currently to cn=admin,[o=domain,]dc=egroupware
 	if (isset($master))
 	{
-		list($n,$d) = explode('@', $master);
-		if (!($n === 'dovecot-admin' && $d === $domain || in_array($master,array('dovecot','cyrus'))))
+		list($n, $d) = explode('@', $master);
+		if (!($n === 'dovecot-admin' && $d === $domain || in_array($master, array('dovecot', 'cyrus'))))
 		{
 			// no valid master-user for given domain
 			exit(1);
 		}
-		$dn = $d ? strtr($domain_master_dn,array('%d'=>$domain)) : $master_dn;
+		$dn = $d ? strtr($domain_master_dn, array('%d'=>$domain)) : $master_dn;
 		if (!@ldap_bind($ds, $dn, $password))
 		{
 			if ($log_verbose) error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
-			exit(111);	// 111 = temporary problem
+			exit(111); // 111 = temporary problem
 		}
 		if ($log_verbose) error_log("Authentication as master '$master' for user '$username' succeeded!");
 		$passdb_query = false;
@@ -180,12 +180,12 @@ 
 
 // remove prefixes eg. "{quota:}proxyaddresses"
 $attrs = $user_attrs;
-foreach($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
+foreach ($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
 
 if (!($sr = ldap_search($ds, $base, $filter, array_values($attrs))))
 {
 	error_log("Error ldap_search(\$ds, '$base', '$filter')!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
 $entries = ldap_get_entries($ds, $sr);
 
@@ -199,7 +199,7 @@ 
 {
 	// should not happen for passdb, but could happen for aliases ...
 	error_log("Error ldap_search(\$ds, '$base', '$filter') returned more then one user!");
-	exit(111);	// 111 = temporary problem
+	exit(111); // 111 = temporary problem
 }
 //print_r($entries);
 
@@ -219,12 +219,12 @@ 
 }
 
 // add additional placeholders from $user_attrs
-foreach($user_attrs as $placeholder => $attr)
+foreach ($user_attrs as $placeholder => $attr)
 {
 	if ($attr[0] == '{')	// prefix given --> ignore all values without and remove it
 	{
 		list($prefix, $attr) = explode('}', substr($attr, 1));
-		foreach($entries[0][$attr] as $key => $value)
+		foreach ($entries[0][$attr] as $key => $value)
 		{
 			if ($key === 'count') continue;
 			if (strpos($value, $prefix) !== 0) continue;
@@ -249,12 +249,12 @@ 
 	{
 		//print_r($groups);
 		$system_groups_user = array();
-		foreach($groups as $key => $group)
+		foreach ($groups as $key => $group)
 		{
 			if ($key === 'count') continue;
 			$system_groups_user[] = $group[$group_attr][0].$append;
 		}
-		$extra['system_groups_user'] = implode(',', $system_groups_user);	// todo: check separator
+		$extra['system_groups_user'] = implode(',', $system_groups_user); // todo: check separator
 	}
 	else
 	{
@@ -265,10 +265,10 @@ 
 // set host attribute for director to old imap
 if (isset($host_base) && isset($host_filter))
 {
-	if (!($sr = ldap_search($ds, $host_base, $filter=strtr($host_filter, quote($replace)), array($host_attr))))
+	if (!($sr = ldap_search($ds, $host_base, $filter = strtr($host_filter, quote($replace)), array($host_attr))))
 	{
 		error_log("Error ldap_search(\$ds, '$host_base', '$filter')!");
-		exit(111);	// 111 = temporary problem
+		exit(111); // 111 = temporary problem
 	}
 	$entries = ldap_get_entries($ds, $sr);
 	if ($entries['count'] && !isset($entries[0][$host_attr]))
@@ -282,7 +282,7 @@ 
 // build command to run
 array_shift($_SERVER['argv']);
 $cmd = array_shift($_SERVER['argv']);
-foreach($_SERVER['argv'] as $arg)
+foreach ($_SERVER['argv'] as $arg)
 {
 	$cmd .= ' '.escapeshellarg($arg);
 }
@@ -292,17 +292,17 @@ 
 if ($user_home) putenv('HOME='.strtr($user_home, $replace));
 if ($extra)
 {
-	foreach($extra as $name => $value)
+	foreach ($extra as $name => $value)
 	{
-		if (($pos = strpos($value,'%')) !== false)
+		if (($pos = strpos($value, '%')) !== false)
 		{
 			// check if replacement is set, otherwise skip whole extra-value
-			if (!isset($replace[substr($value,$pos,2)]))
+			if (!isset($replace[substr($value, $pos, 2)]))
 			{
 				unset($extra[$name]);
 				continue;
 			}
-			$value = strtr($value,$replace);
+			$value = strtr($value, $replace);
 		}
 		putenv($name.'='.$value);
 	}
@@ -326,5 +326,5 @@ 
  */
 function quote($string)
 {
-	return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+	return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 }

Braces +66 added lines, -18 removed lines

@@ -41,7 +41,10 @@ 
  */
 
 // protect from being called via HTTP
-if (php_sapi_name() !== 'cli') die('This is a command line only script!');
+if (php_sapi_name() !== 'cli')
+{
+	die('This is a command line only script!');
+}
 
 // uncomment to write to log-file, otherwise errors go to stderr
 //$log = '/var/log/dovecot_checkpassword.log';
@@ -94,7 +97,10 @@ 
 
 ini_set('display_errors',false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log)
+{
+	ini_set('error_log',$log);
+}
 
 if ($_SERVER['argc'] < 2)
 {
@@ -115,8 +121,14 @@ 
 //error_log("dovecot_checkpassword '{$_SERVER['argv'][1]}': username='$username', password='$password', master='$master'");
 
 $ds = ldap_connect($ldap_uri);
-if ($version) ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-if ($use_tls) ldap_start_tls($ds);
+if ($version)
+{
+	ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+}
+if ($use_tls)
+{
+	ldap_start_tls($ds);
+}
 
 if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 {
@@ -163,10 +175,16 @@ 
 		$dn = $d ? strtr($domain_master_dn,array('%d'=>$domain)) : $master_dn;
 		if (!@ldap_bind($ds, $dn, $password))
 		{
-			if ($log_verbose) error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
+			if ($log_verbose)
+			{
+				error_log("Can't bind as '$dn' with password '$password'! Authentication as master '$master' for user '$username' failed!");
+			}
 			exit(111);	// 111 = temporary problem
 		}
-		if ($log_verbose) error_log("Authentication as master '$master' for user '$username' succeeded!");
+		if ($log_verbose)
+		{
+			error_log("Authentication as master '$master' for user '$username' succeeded!");
+		}
 		$passdb_query = false;
 		$filter = $userdb_filter;
 	}
@@ -180,7 +198,10 @@ 
 
 // remove prefixes eg. "{quota:}proxyaddresses"
 $attrs = $user_attrs;
-foreach($attrs as &$a) if ($a[0] == '{') list(,$a) = explode('}', $a);
+foreach($attrs as &$a)
+{
+	if ($a[0] == '{') list(,$a) = explode('}', $a);
+}
 
 if (!($sr = ldap_search($ds, $base, $filter, array_values($attrs))))
 {
@@ -191,7 +212,10 @@ 
 
 if (!$entries['count'])
 {
-	if ($log_verbose) error_log("User '$username' NOT found!");
+	if ($log_verbose)
+	{
+		error_log("User '$username' NOT found!");
+	}
 	exit(3);
 }
 
@@ -208,26 +232,44 @@ 
 	// now authenticate user by trying to bind to found dn with given password
 	if (!@ldap_bind($ds, $entries[0]['dn'], $password))
 	{
-		if ($log_verbose) error_log("Can't bind as '{$entries[0]['dn']}' with password '$password'! Authentication for user '$username' failed!");
+		if ($log_verbose)
+		{
+			error_log("Can't bind as '{$entries[0]['dn']}' with password '$password'! Authentication for user '$username' failed!");
+		}
 		exit(1);
 	}
-	if ($log_verbose) error_log("Successfull authentication user '$username' dn='{$entries[0]['dn']}'.");
-}
+	if ($log_verbose)
+	{
+		error_log("Successfull authentication user '$username' dn='{$entries[0]['dn']}'.");
+	}
+	}
 else	// user-db query, no authentication
 {
-	if ($log_verbose) error_log("User-db query for user '$username' dn='{$entries[0]['dn']}'.");
-}
+	if ($log_verbose)
+	{
+		error_log("User-db query for user '$username' dn='{$entries[0]['dn']}'.");
+	}
+	}
 
 // add additional placeholders from $user_attrs
 foreach($user_attrs as $placeholder => $attr)
 {
-	if ($attr[0] == '{')	// prefix given --> ignore all values without and remove it
+	if ($attr[0] == '{')
+	{
+		// prefix given --> ignore all values without and remove it
 	{
 		list($prefix, $attr) = explode('}', substr($attr, 1));
+	}
 		foreach($entries[0][$attr] as $key => $value)
 		{
-			if ($key === 'count') continue;
-			if (strpos($value, $prefix) !== 0) continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
+			if (strpos($value, $prefix) !== 0)
+			{
+				continue;
+			}
 			$replace[$placeholder] = substr($value, strlen($prefix));
 			break;
 		}
@@ -251,7 +293,10 @@ 
 		$system_groups_user = array();
 		foreach($groups as $key => $group)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 			$system_groups_user[] = $group[$group_attr][0].$append;
 		}
 		$extra['system_groups_user'] = implode(',', $system_groups_user);	// todo: check separator
@@ -289,7 +334,10 @@ 
 
 // setting USER, HOME, EXTRA
 putenv('USER='.strtr($user_name, $replace));
-if ($user_home) putenv('HOME='.strtr($user_home, $replace));
+if ($user_home)
+{
+	putenv('HOME='.strtr($user_home, $replace));
+}
 if ($extra)
 {
 	foreach($extra as $name => $value)

doc/mail/postfix_tcp_map_ads.php

Spacing +39 added lines, -39 removed lines

@@ -98,14 +98,14 @@ 
 	'mailboxes' => array(
 		'base' => $base,
 		'filter' => '(&(objectCategory=person)(proxyAddresses=smtp:%s))',
-		'attrs' => 'samaccountname',	// result-attrs must be lowercase!
+		'attrs' => 'samaccountname', // result-attrs must be lowercase!
 		'port' => 2001,
 	),
 	// virtual alias maps
 	'aliases' => array(
 		'base' => $base,
 		'filter' => '(&(objectCategory=person)(proxyAddresses=smtp:%s))',
-		'attrs' => array('samaccountname','{forward:}proxyaddresses'),
+		'attrs' => array('samaccountname', '{forward:}proxyaddresses'),
 		'port' => 2002,
 	),
 	// groups as distribution list
@@ -115,20 +115,20 @@ 
 		'attrs' => 'dn',
 		// continue with resulting dn
 		'filter1' => '(&(objectCategory=person)(proxyAddresses=smtp:*)(memberOf=%s))',
-		'attrs1' => array('samaccountname','{forward:}proxyaddresses'),
+		'attrs1' => array('samaccountname', '{forward:}proxyaddresses'),
 		'port' => 2003,
 	),
 );
 
-ini_set('display_errors',false);
-error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+ini_set('display_errors', false);
+error_reporting(E_ALL&~E_NOTICE);
+if ($log) ini_set('error_log', $log);
 
-function usage($extra=null)
+function usage($extra = null)
 {
 	global $maps;
 	fwrite(STDERR, "\nUsage: $cmd [-v|--verbose] [-h|--help] [-l|--log (syslog|path)] [-q|--query <email-addresse> (mailboxes|alias|groups)] [host]\n\n");
-	fwrite(STDERR, print_r($maps,true)."\n");
+	fwrite(STDERR, print_r($maps, true)."\n");
 	if ($extra) fwrite(STDERR, "\n\n$extra\n\n");
 	exit(2);
 }
@@ -137,7 +137,7 @@ 
 
 while (($arg = array_shift($_SERVER['argv'])) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-v': case '--verbose':
 			$verbose = $log_verbose = true;
@@ -182,7 +182,7 @@ 
 $servers = $clients = $buffers = array();
 
 // Create the server socket
-foreach($maps as $map => $data)
+foreach ($maps as $map => $data)
 {
 	$addr = 'tcp://'.$host.':'.$data['port'];
 	if (!($server = stream_socket_server($addr, $errno, $errstr)))
@@ -198,20 +198,20 @@ 
 {
 	$read = $servers;
 	if ($clients) $read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
-	if ($verbose) print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
-	if (stream_select($read, $write=null, $except=null, null))	// null = block forever
+	if ($verbose) print 'about to call socket_select(array('.implode(',', $read).', ...) waiting... ';
+	if (stream_select($read, $write = null, $except = null, null))	// null = block forever
 	{
-		foreach($read as $sock)
+		foreach ($read as $sock)
 		{
 			if (($port = array_search($sock, $servers)) !== false)
 			{
-				$client = stream_socket_accept($sock,$timeout,$client_addr);	// @ required to get not timeout warning!
+				$client = stream_socket_accept($sock, $timeout, $client_addr); // @ required to get not timeout warning!
 
 				if ($verbose) echo "accepted connection $client from $client_addr on port $port\n";
 
-				if ($only_client && !preg_match($only_client,$client_addr))
+				if ($only_client && !preg_match($only_client, $client_addr))
 				{
-					fwrite($client,"Go away!\r\n");
+					fwrite($client, "Go away!\r\n");
 					fclose($client);
 					error_log(date('Y-m-d H:i:s').": Connection $client from wrong client $client_addr (does NOT match '$only_client') --> terminated");
 					continue;
@@ -222,7 +222,7 @@ 
 			{
 				if ($verbose) echo "client $sock closed connection\n";
 
-				foreach($clients as $port => &$socks)
+				foreach ($clients as $port => &$socks)
 				{
 					if (($key = array_search($sock, $socks, true)) !== false)
 					{
@@ -232,7 +232,7 @@ 
 			}
 			else	// client send something
 			{
-				$buffer =& $buffers[$sock];
+				$buffer = & $buffers[$sock];
 
 				$buffer .= fread($sock, 8096);
 
@@ -240,14 +240,14 @@ 
 				{
 					list($request, $buffer) = explode("\n", $buffer, 2);
 
-					foreach($maps as $map => $data)
+					foreach ($maps as $map => $data)
 					{
 						if (($key = array_search($sock, $clients[$data['port']], true)) !== false)
 						{
 							if ($verbose) echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
 
 							// Respond to client
-							fwrite($sock,  respond($request, $map));
+							fwrite($sock, respond($request, $map));
 							break;
 						}
 					}
@@ -277,16 +277,16 @@ 
  */
 function quote($string)
 {
-	return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+	return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 }
 
-function respond($request, $map, $extra='', $reconnect=false)
+function respond($request, $map, $extra = '', $reconnect = false)
 {
 	static $ds;
 	global $ldap_uri, $version, $use_tls, $bind_dn, $bind_pw;
 	global $maps, $log_verbose;
 
-	if (($map == 'aliases' || $map == 'groups') && strpos($request,'@') === false && !$extra)
+	if (($map == 'aliases' || $map == 'groups') && strpos($request, '@') === false && !$extra)
 	{
 		return "500 No domain aliases yet\n";
 	}
@@ -300,17 +300,17 @@ 
 		{
 			error_log("$map: Can't connect to LDAP server $ldap_uri!");
 			$ds = null;
-			return "400 Can't connect to LDAP server $ldap_uri!\n";	// 400 (temp.) error
+			return "400 Can't connect to LDAP server $ldap_uri!\n"; // 400 (temp.) error
 		}
 	}
 	if (!preg_match('/^get ([^\n]+)\n?$/', $request, $matches))
 	{
 		error_log("$map: Wrong format '$request'!");
-		return "400 Wrong format '$request'!\n";	// 400 (temp.) error
+		return "400 Wrong format '$request'!\n"; // 400 (temp.) error
 	}
 	$username = $matches[1];
 
-	list($name,$domain) = explode('@',$username);
+	list($name, $domain) = explode('@', $username);
 
 	/* check if we are responsible for the given domain
 	if ($domain && $map != 'domains' && (int)($response = respond("get $domain", 'domains')) != 200)
@@ -324,10 +324,10 @@ 
 	);
 	$base = strtr($maps[$map]['base'], $replace);
 	$filter = strtr($maps[$map]['filter'.$extra], $replace);
-	$prefix = isset($maps[$map]['prefix'.$extra]) ? str_replace(array('%n','%d','%s'),array($name,$domain,$username),$maps[$map]['prefix']) : '';
+	$prefix = isset($maps[$map]['prefix'.$extra]) ? str_replace(array('%n', '%d', '%s'), array($name, $domain, $username), $maps[$map]['prefix']) : '';
 	$search_attrs = $attrs = (array)$maps[$map]['attrs'.$extra];
 	// remove prefix like "{smtp:}proxyaddresses"
-	foreach($search_attrs as &$attr)
+	foreach ($search_attrs as &$attr)
 	{
 		if ($attr[0] == '{') list(,$attr) = explode('}', $attr);
 	}
@@ -345,13 +345,13 @@ 
 
 			error_log("$map: get '$username' --> 400 $error: !ldap_search(\$ds, '$base', '$filter')");
 			ldap_close($ds);
-			$ds = null;	// force new connection on next lookup
-			return "400 $error\n";	// 400 (temp.) error
+			$ds = null; // force new connection on next lookup
+			return "400 $error\n"; // 400 (temp.) error
 		}
 		else	// happens if base containing domain does not exist
 		{
 			if ($log_verbose) error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
-			return "500 Not found: $error\n";	// 500 not found
+			return "500 Not found: $error\n"; // 500 not found
 		}
 	}
 	$entries = ldap_get_entries($ds, $sr);
@@ -359,21 +359,21 @@ 
 	if (!$entries['count'])
 	{
 		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
-		return "500 Not found\n";	// 500: Query returned no result
+		return "500 Not found\n"; // 500: Query returned no result
 	}
 	$response = array();
-	foreach($entries as $key => $entry)
+	foreach ($entries as $key => $entry)
 	{
 		if ($key === 'count') continue;
 
-		foreach($attrs as $attr)
+		foreach ($attrs as $attr)
 		{
 			unset($filter_prefix);
 			if ($attr[0] == '{')
 			{
 				list($filter_prefix, $attr) = explode('}', substr($attr, 1));
 			}
-			foreach((array)$entry[$attr] as $k => $mail)
+			foreach ((array)$entry[$attr] as $k => $mail)
 			{
 				if ($k !== 'count' && ($mail = trim($mail)))
 				{
@@ -396,13 +396,13 @@ 
 	if (!$response)
 	{
 		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
-		return "500 Not found\n";	// 500: Query returned no result
+		return "500 Not found\n"; // 500: Query returned no result
 	}
-	if (isset($maps[$map]['filter'.(1+$extra)]) && isset($maps[$map]['attrs'.(1+$extra)]))
+	if (isset($maps[$map]['filter'.(1 + $extra)]) && isset($maps[$map]['attrs'.(1 + $extra)]))
 	{
-		return respond('get '.$response[0], $map, 1+$extra);
+		return respond('get '.$response[0], $map, 1 + $extra);
 	}
-	$response = '200 '.implode(',',$response)."\n";
+	$response = '200 '.implode(',', $response)."\n";
 	if ($log_verbose) error_log("$map: get '$username' --> $response");
 	return $response;
 }

Braces +90 added lines, -23 removed lines

@@ -71,7 +71,10 @@ 
  */
 
 // protect from being called via HTTP
-if (php_sapi_name() !== 'cli') die('This is a command line only script!');
+if (php_sapi_name() !== 'cli')
+{
+	die('This is a command line only script!');
+}
 
 // our defaults
 $default_host = 'localhost';
@@ -122,14 +125,20 @@ 
 
 ini_set('display_errors',false);
 error_reporting(E_ALL & ~E_NOTICE);
-if ($log) ini_set('error_log',$log);
+if ($log)
+{
+	ini_set('error_log',$log);
+}
 
 function usage($extra=null)
 {
 	global $maps;
 	fwrite(STDERR, "\nUsage: $cmd [-v|--verbose] [-h|--help] [-l|--log (syslog|path)] [-q|--query <email-addresse> (mailboxes|alias|groups)] [host]\n\n");
 	fwrite(STDERR, print_r($maps,true)."\n");
-	if ($extra) fwrite(STDERR, "\n\n$extra\n\n");
+	if ($extra)
+	{
+		fwrite(STDERR, "\n\n$extra\n\n");
+	}
 	exit(2);
 }
 
@@ -152,9 +161,12 @@ 
 			break;
 
 		case '-q': case '--query':
-			if (count($_SERVER['argv']) == 2)       // need 2 arguments
+			if (count($_SERVER['argv']) == 2)
+			{
+				// need 2 arguments
 			{
 				$request = 'get '.array_shift($_SERVER['argv'])."\n";
+			}
 				$map = array_shift($_SERVER['argv']);
 				echo respond($request, $map)."\n";
 				exit;
@@ -166,7 +178,10 @@ 
 			usage("Unknown option '$arg'!");
 	}
 }
-if ($_SERVER['argv']) usage();
+if ($_SERVER['argv'])
+{
+	usage();
+}
 
 if ($arg)
 {
@@ -177,7 +192,10 @@ 
 	$host = $default_host;
 }
 
-if ($verbose) echo "using $host\n";
+if ($verbose)
+{
+	echo "using $host\n";
+}
 
 $servers = $clients = $buffers = array();
 
@@ -194,20 +212,36 @@ 
 	$servers[$data['port']] = $server;
 	$clients[$data['port']] = array();
 }
-while (true)	// mail loop of tcp server --> never exits
+while (true)
+{
+	// mail loop of tcp server --> never exits
 {
 	$read = $servers;
-	if ($clients) $read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
-	if ($verbose) print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
-	if (stream_select($read, $write=null, $except=null, null))	// null = block forever
+}
+	if ($clients)
+	{
+		$read = array_merge($read, call_user_func_array('array_merge', array_values($clients)));
+	}
+	if ($verbose)
+	{
+		print 'about to call socket_select(array('.implode(',',$read).', ...) waiting... ';
+	}
+	if (stream_select($read, $write=null, $except=null, null))
+	{
+		// null = block forever
 	{
 		foreach($read as $sock)
 		{
 			if (($port = array_search($sock, $servers)) !== false)
 			{
-				$client = stream_socket_accept($sock,$timeout,$client_addr);	// @ required to get not timeout warning!
+				$client = stream_socket_accept($sock,$timeout,$client_addr);
+	}
+	// @ required to get not timeout warning!
 
-				if ($verbose) echo "accepted connection $client from $client_addr on port $port\n";
+				if ($verbose)
+				{
+					echo "accepted connection $client from $client_addr on port $port\n";
+				}
 
 				if ($only_client && !preg_match($only_client,$client_addr))
 				{
@@ -218,9 +252,12 @@ 
 				}
 				$clients[$port][] = $client;
 			}
-			elseif (feof($sock))	// client connection closed
+			elseif (feof($sock))
+			{
+				// client connection closed
 			{
 				if ($verbose) echo "client $sock closed connection\n";
+			}
 
 				foreach($clients as $port => &$socks)
 				{
@@ -244,7 +281,10 @@ 
 					{
 						if (($key = array_search($sock, $clients[$data['port']], true)) !== false)
 						{
-							if ($verbose) echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
+							if ($verbose)
+							{
+								echo date('Y-m-d H:i:s').": client send: $request for map $map\n";
+							}
 
 							// Respond to client
 							fwrite($sock,  respond($request, $map));
@@ -293,8 +333,14 @@ 
 	if (!isset($ds) || $reconnect)
 	{
 		$ds = ldap_connect($ldap_uri);
-		if ($version) ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
-		if ($use_tls) ldap_start_tls($ds);
+		if ($version)
+		{
+			ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $version);
+		}
+		if ($use_tls)
+		{
+			ldap_start_tls($ds);
+		}
 
 		if (!@ldap_bind($ds, $bind_dn, $bind_pw))
 		{
@@ -329,7 +375,10 @@ 
 	// remove prefix like "{smtp:}proxyaddresses"
 	foreach($search_attrs as &$attr)
 	{
-		if ($attr[0] == '{') list(,$attr) = explode('}', $attr);
+		if ($attr[0] == '{')
+		{
+			list(,$attr) = explode('}', $attr);
+		}
 	}
 	unset($attr);
 
@@ -338,10 +387,13 @@ 
 		$errno = ldap_errno($ds);
 		$error = ldap_error($ds).' ('.$errno.')';
 
-		if ($errno == -1)		// eg. -1 lost connection to ldap
+		if ($errno == -1)
+		{
+			// eg. -1 lost connection to ldap
 		{
 			// as DC closes connections quickly, first try to reconnect once, before returning a temp. failure
 			if (!$reconnect) return respond($request, $map, $extra, true);
+		}
 
 			error_log("$map: get '$username' --> 400 $error: !ldap_search(\$ds, '$base', '$filter')");
 			ldap_close($ds);
@@ -350,7 +402,10 @@ 
 		}
 		else	// happens if base containing domain does not exist
 		{
-			if ($log_verbose) error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
+			if ($log_verbose)
+			{
+				error_log("$map: get '$username' --> 500 Not found: $error: !ldap_search(\$ds, '$base', '$filter')");
+			}
 			return "500 Not found: $error\n";	// 500 not found
 		}
 	}
@@ -358,13 +413,19 @@ 
 
 	if (!$entries['count'])
 	{
-		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
+		if ($log_verbose)
+		{
+			error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no entries");
+		}
 		return "500 Not found\n";	// 500: Query returned no result
 	}
 	$response = array();
 	foreach($entries as $key => $entry)
 	{
-		if ($key === 'count') continue;
+		if ($key === 'count')
+		{
+			continue;
+		}
 
 		foreach($attrs as $attr)
 		{
@@ -395,7 +456,10 @@ 
 	}
 	if (!$response)
 	{
-		if ($log_verbose) error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
+		if ($log_verbose)
+		{
+			error_log("$map: get '$username' --> 500 not found ldap_search(\$ds, '$base', '$filter') no response");
+		}
 		return "500 Not found\n";	// 500: Query returned no result
 	}
 	if (isset($maps[$map]['filter'.(1+$extra)]) && isset($maps[$map]['attrs'.(1+$extra)]))
@@ -403,6 +467,9 @@ 
 		return respond('get '.$response[0], $map, 1+$extra);
 	}
 	$response = '200 '.implode(',',$response)."\n";
-	if ($log_verbose) error_log("$map: get '$username' --> $response");
+	if ($log_verbose)
+	{
+		error_log("$map: get '$username' --> $response");
+	}
 	return $response;
 }

doc/ldap/nis2rfc2307bis.php

Spacing +19 added lines, -19 removed lines

@@ -21,8 +21,8 @@ 
  * @version $Id: class.accounts.inc.php 22048 2006-07-08 21:41:42Z ralfbecker $
  */
 
-if ($argc <= 1 || in_array($argv[1],array('-v','--help')) || $argv[1] == '--accounts-dn' && $argc <= 3|| 
-	!is_readable($file = $argv[$argc-1]))
+if ($argc <= 1 || in_array($argv[1], array('-v', '--help')) || $argv[1] == '--accounts-dn' && $argc <= 3 || 
+	!is_readable($file = $argv[$argc - 1]))
 {
 	if ($file)
 	{
@@ -32,7 +32,7 @@ 
 }
 
 $lines = file($file);
-foreach($lines as $l => $line)
+foreach ($lines as $l => $line)
 {
 	$lines[$l] = rtrim($line);
 }
@@ -42,23 +42,23 @@ 
 {
 	$group2account = $argv[2];
 }
-$parts = explode('/',$group2account);
+$parts = explode('/', $group2account);
 if (count($parts) != 4)
 {
 	die("Wrong format for --group2accounts-dn, use something like '/cn=[^,]+,ou=groups/ou=accounts/'\n");
 }
 $replace_with = $parts[2]; unset($parts[2]);
-$replace = implode('/',$parts);
+$replace = implode('/', $parts);
 
 $block = array();
 $i = 0;
-$lines[] = '';	// extra empty line, if none is behind the last block
-foreach($lines as $l => $line)
+$lines[] = ''; // extra empty line, if none is behind the last block
+foreach ($lines as $l => $line)
 {
 	if ($line)
 	{
-		@list($attr,$value) = explode(': ',$line,2);
-		switch($attr)
+		@list($attr, $value) = explode(': ', $line, 2);
+		switch ($attr)
 		{
 			case 'dn':
 				$dn = $value;
@@ -70,8 +70,8 @@ 
 				$structural = $value;
 				break;
 			case 'memberUid':
-				$member_dn = 'uid='.$value.','.preg_replace($replace,$replace_with,$dn);
-				if (!in_array('dn: '.$member_dn,$lines)) continue;	// member does not exist --> ignore him!
+				$member_dn = 'uid='.$value.','.preg_replace($replace, $replace_with, $dn);
+				if (!in_array('dn: '.$member_dn, $lines)) continue; // member does not exist --> ignore him!
 				$members[] = 'member: '.$member_dn;
 				// fall-through
 			default:
@@ -84,17 +84,17 @@ 
 	if (!$block) continue;
 
 	// got a complete block
-	if (in_array('posixGroup',$objectclasses))
+	if (in_array('posixGroup', $objectclasses))
 	{
-		switch($structural)
+		switch ($structural)
 		{
 			case 'namedObject':	// regular SuSE
-				unset($objectclasses[array_search('namedObject',$objectclasses)]);
+				unset($objectclasses[array_search('namedObject', $objectclasses)]);
 				// fall-through
 			case 'posixGroup':	// nis
 				$objectclasses[] = $structural = 'groupOfNames';
-				if (!$members) $members[] = 'member: '.$dn;	// member is a required attribute!
-				$data = array_merge($members,$data);
+				if (!$members) $members[] = 'member: '.$dn; // member is a required attribute!
+				$data = array_merge($members, $data);
 				break;
 			case 'groupOfNames':	// ok, already what we want
 				break;
@@ -102,14 +102,14 @@ 
 				die("\nposixGroup dn: $dn has as structrualObjectClass $structural, not posixGroup, namedObject or groupOfNames!\n");
 		}
 		$block = array('dn: '.$dn,);
-		foreach($objectclasses as $class)
+		foreach ($objectclasses as $class)
 		{
 			$block[] = 'objectClass: '.$class;
 		}
 		$block[] = 'structuralObjectClass: '.$class;
-		$block = array_merge($block,$data);
+		$block = array_merge($block, $data);
 	}
-	echo implode("\n",$block)."\n\n";
+	echo implode("\n", $block)."\n\n";
 
 	// process next block
 	$block = $objectclasses = $members = $data = array();

Braces +14 added lines, -3 removed lines

@@ -71,7 +71,11 @@ 
 				break;
 			case 'memberUid':
 				$member_dn = 'uid='.$value.','.preg_replace($replace,$replace_with,$dn);
-				if (!in_array('dn: '.$member_dn,$lines)) continue;	// member does not exist --> ignore him!
+				if (!in_array('dn: '.$member_dn,$lines))
+				{
+					continue;
+				}
+				// member does not exist --> ignore him!
 				$members[] = 'member: '.$member_dn;
 				// fall-through
 			default:
@@ -81,7 +85,10 @@ 
 		$block[] = $line;
 		continue;
 	}
-	if (!$block) continue;
+	if (!$block)
+	{
+		continue;
+	}
 
 	// got a complete block
 	if (in_array('posixGroup',$objectclasses))
@@ -93,7 +100,11 @@ 
 				// fall-through
 			case 'posixGroup':	// nis
 				$objectclasses[] = $structural = 'groupOfNames';
-				if (!$members) $members[] = 'member: '.$dn;	// member is a required attribute!
+				if (!$members)
+				{
+					$members[] = 'member: '.$dn;
+				}
+				// member is a required attribute!
 				$data = array_merge($members,$data);
 				break;
 			case 'groupOfNames':	// ok, already what we want