EGroupware / egroupware

importexport/inc/class.importexport_definition.inc.php

Braces +84 added lines, -40 removed lines

@@ -20,7 +20,8 @@ 
  * are in one assiozative array which is complely managed by {Im|Ex}port plugins
  * @todo testing
  */
-class importexport_definition implements importexport_iface_egw_record {
+class importexport_definition implements importexport_iface_egw_record
+{
 
 	const _appname = 'importexport';
 	const _defintion_talbe = 'egw_importexport_definitions';
@@ -65,26 +66,36 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
+	public function __construct( $_identifier='' )
+	{
 		$this->so_sql = new Api\Storage\Base(self::_appname ,self::_defintion_talbe);
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->is_admin = $GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_setup'] ? true : false;
 		// compability to string identifiers
-		if (!is_numeric($_identifier) && strlen($_identifier) > 3) $_identifier = $this->name2identifier($_identifier);
+		if (!is_numeric($_identifier) && strlen($_identifier) > 3)
+		{
+			$_identifier = $this->name2identifier($_identifier);
+		}
 
-		if ((int)$_identifier != 0) {
+		if ((int)$_identifier != 0)
+		{
 			$this->definition = $this->so_sql->read(array('definition_id' => $_identifier));
-			if ( empty( $this->definition ) ) {
+			if ( empty( $this->definition ) )
+			{
 				throw new Exception('Error: No such definition with identifier :"'.$_identifier.'"!');
 			}
-			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
+			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin))
+			{
 				throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
 			}
 			try
 			{
 				$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
 				$this->definition['plugin_options'] = (array)$options_data['root'];
-				if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				if($this->definition['filter'])
+				{
+					$filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				}
 				$this->definition['filter'] = $filter['root'];
 			}
 			catch (Exception $e)
@@ -100,12 +111,15 @@ 
 	 * @param string $_name
 	 * @return int
 	 */
-	private function name2identifier( $_name ) {
+	private function name2identifier( $_name )
+	{
 		$identifiers = $this->so_sql->search(array('name' => $_name),true);
-		if (isset($identifiers[1])) {
+		if (isset($identifiers[1]))
+		{
 			throw new Exception('Error: Definition: "'.$_name. '" is not unique! Can\'t convert to identifier');
 		}
-		if ( empty( $identifiers[0] ) ) {
+		if ( empty( $identifiers[0] ) )
+		{
 			// not a good idea, till we don't have different exceptions so far
 			// throw new Exception('Error: No such definition :"'.$_name.'"!');
 			$identifiers = array( array( 'definition_id' => 0 ) );
@@ -113,11 +127,14 @@ 
 		return $identifiers[0]['definition_id'];
 	}
 
-	public function __get($_attribute_name) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __get($_attribute_name)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->get_allowed_users();
 			case 'plugin_options' :
@@ -129,11 +146,14 @@ 
 		}
 	}
 
-	public function __set($_attribute_name,$_data) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __set($_attribute_name,$_data)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->set_allowed_users($_data);
 			case 'plugin_options' :
@@ -151,7 +171,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_allowed_users() {
+	private function get_allowed_users()
+	{
 		return explode(',',substr($this->definition['allowed_users'],1,-1));
 	}
 
@@ -160,7 +181,8 @@ 
 	 *
 	 * @param array $_allowed_users
 	 */
-	private function set_allowed_users( $_allowed_users ) {
+	private function set_allowed_users( $_allowed_users )
+	{
 		$this->definition['allowed_users'] = ','.implode(',',(array)$_allowed_users) .',';
 	}
 
@@ -169,7 +191,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_options() {
+	private function get_options()
+	{
 		return $this->definition['plugin_options'];
 	}
 
@@ -178,9 +201,11 @@ 
 	 *
 	 * @param array $options
 	 */
-	private function set_options(array $_plugin_options) {
+	private function set_options(array $_plugin_options)
+	{
 		// Check conditions
-		foreach ( $_plugin_options['conditions'] as $key => $condition ) {
+		foreach ( $_plugin_options['conditions'] as $key => $condition )
+		{
 			if(!$condition['string'])
 			{
 				unset($_plugin_options['conditions'][$key]);
@@ -194,7 +219,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_filter() {
+	private function get_filter()
+	{
 		return $this->definition['filter'];
 	}
 
@@ -203,7 +229,8 @@ 
 	 *
 	 * @param filter array of field => settings
 	 */
-	private function set_filter(Array $filter) {
+	private function set_filter(Array $filter)
+	{
 		$this->definition['filter'] = $filter;
 	}
 
@@ -215,7 +242,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		$definition = $this->definition;
 		$definition['allowed_users'] = $this->get_allowed_users();
 		$definition['plugin_options'] = $this->get_options();
@@ -228,7 +256,8 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return $this->definition['name'];
 	}
 
@@ -237,13 +266,16 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_record( array $_record ) {
+	public function set_record( array $_record )
+	{
 		$this->definition = array_intersect_key( $_record, $this->attributes );
 
 		// anything which is not an attribute is perhaps a plugin_option.
 		// If not, it gets whiped out on save time.
-		foreach ( $_record as $attribute => $value) {
-			if ( !array_key_exists( $attribute, $this->attributes ) ) {
+		foreach ( $_record as $attribute => $value)
+		{
+			if ( !array_key_exists( $attribute, $this->attributes ) )
+			{
 				$this->definition['plugin_options'][$attribute] = $value;
 			}
 		}
@@ -261,7 +293,8 @@ 
 	 *
 	 * @return int identifier of this record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->definition['definition_id'];
 	}
 
@@ -272,7 +305,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return self::_appname . '/navbar';
 	}
 
@@ -281,8 +315,10 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		if ( strlen($this->definition['name']) < 3 ) {
+	public function save ( $_dst_identifier )
+	{
+		if ( strlen($this->definition['name']) < 3 )
+		{
 			throw new Exception('Error: Can\'t save definition, no valid name given!');
 		}
 
@@ -290,7 +326,8 @@ 
 		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml( $this->definition['plugin_options'] );
 		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml( $this->definition['filter'] );
 		$this->so_sql->data['modified'] = time();
-		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier ))) {
+		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier )))
+		{
 			throw new Exception('Error: Api\Storage\Base was not able to save definition: '.$this->get_identifier());
 		}
 
@@ -303,7 +340,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		$dst_object = clone $this;
 		try {
 			$dst_object->set_owner($this->user);
@@ -324,8 +362,10 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		if ($this->user != $this->get_owner() && !$this->is_admin) {
+	public function move ( $_dst_identifier )
+	{
+		if ($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to move definition '.$this->get_identifier());
 		}
 		$old_object = clone $this;
@@ -346,11 +386,14 @@ 
 	 * @return void
 	 *
 	 */
-	public function delete () {
-		if($this->user != $this->get_owner() && !$this->is_admin) {
+	public function delete ()
+	{
+		if($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to delete definition '.$this->get_identifier());
 		}
-		if(!$this->so_sql->delete()) {
+		if(!$this->so_sql->delete())
+		{
 			throw('Error: Api\Storage\Base was not able to delete definition: '.$this->get_identifier());
 		}
 	}
@@ -359,7 +402,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset($this->so_sql);
 	}
 

addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php

Braces +18 added lines, -8 removed lines

@@ -46,11 +46,13 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if(count($cat_list) > 0)
+		{
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach($bocontacts->customfields as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
@@ -75,7 +77,8 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if($content['field_mapping'][0] == lang('Categories'))
+		{
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
@@ -86,7 +89,10 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -108,13 +114,16 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options'])
+			{
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
@@ -124,7 +133,8 @@ 
 			{
 				$sel_options['contact_owner'][$content['contact_owner']] = lang("'%1' is not allowed ('%2')!", $content['contact_owner'], implode(',',array_keys($sel_options['contact_owner'])));
 			}
-			if(!in_array('owner', $content['field_mapping'])) {
+			if(!in_array('owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}