EGroupware / egroupware

addressbook/inc/class.addressbook_wizard_export_vcard.inc.php

Indentation +43 added lines, -43 removed lines

@@ -27,54 +27,54 @@
 	}
 
 	/**
-         * choose charset
-         *
-         * @param array $content
-         * @param array $sel_options
-         * @param array $readonlys
-         * @param array $preserv
-         * @return string template name
-         */
-        function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
-        {
-                if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
-                // return from step40
-                if ($content['step'] == 'wizard_step40') {
-                        switch (array_search('pressed', $content['button']))
-                        {
-                                case 'next':
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
-                                case 'previous' :
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
-                                case 'finish':
-                                        return 'wizard_finish';
-                                default :
-                                        return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
-                        }
-                }
-                // init step40
-                else
-                {
-                        $content['msg'] = $this->steps['wizard_step40'];
-                        $content['step'] = 'wizard_step40';
+	 * choose charset
+	 *
+	 * @param array $content
+	 * @param array $sel_options
+	 * @param array $readonlys
+	 * @param array $preserv
+	 * @return string template name
+	 */
+		function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
+		{
+				if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+				// return from step40
+				if ($content['step'] == 'wizard_step40') {
+						switch (array_search('pressed', $content['button']))
+						{
+								case 'next':
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+								case 'previous' :
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+								case 'finish':
+										return 'wizard_finish';
+								default :
+										return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+						}
+				}
+				// init step40
+				else
+				{
+						$content['msg'] = $this->steps['wizard_step40'];
+						$content['step'] = 'wizard_step40';
 			if(!$content['charset'] && $content['plugin_options']['charset']) {
-                                $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
-                        }
+								$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
+						}
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
-                        array(
-                                'user'  => lang('User preference'),
-                        );
+						array(
+								'user'  => lang('User preference'),
+						);
 			$preserv = $content;
 
-                        // Add in extra allowed charsets
-                        $config = Api\Config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
-                        {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
-                        }
+						// Add in extra allowed charsets
+						$config = Api\Config::read('importexport');
+						$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
+						if($extra_charsets)
+						{
+								$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+						}
 			unset ($preserv['button']);
-                        return $this->step_templates[$content['step']];
+						return $this->step_templates[$content['step']];
 		}
 	}
 

addressbook/inc/class.addressbook_import_vcard.inc.php

Indentation +41 added lines, -41 removed lines

@@ -45,8 +45,8 @@ 
 	private $bocontacts;
 
 	/**
-	* For figuring out if a contact has changed
-	*/
+	 * For figuring out if a contact has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -76,9 +76,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -93,14 +93,14 @@ 
 		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-                // set contact owner
-                $contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
-                        $_definition->plugin_options['contact_owner'] : $this->user;
-                // Import into importer's personal addressbook
-                if($contact_owner == 'personal')
-                {
-                        $contact_owner = $this->user;
-                }
+				// set contact owner
+				$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
+						$_definition->plugin_options['contact_owner'] : $this->user;
+				// Import into importer's personal addressbook
+				if($contact_owner == 'personal')
+				{
+						$contact_owner = $this->user;
+				}
 
 		// dry run?
 		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
@@ -123,7 +123,7 @@ 
 		$this->errors = array();
 
 		// Fix for Apple Addressbook
-        $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
+		$vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
 
 		$contacts = new Api\CalDAV\IcalIterator($vCard, '', $charset, array($this, '_vcard'),array(
 			// Owner (addressbook)
@@ -277,7 +277,7 @@ 
 		foreach($this->preview_records as $record)
 		{
 			// Convert to human-friendly
-            importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
+			importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
 			$record = $record->get_record_array();
 			$row = array();
 			foreach(array_keys($labels) as $field)
@@ -350,38 +350,38 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 }

addressbook/inc/class.addressbook_export_contacts_csv.inc.php

Indentation +5 added lines, -5 removed lines

@@ -365,10 +365,10 @@ 
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* Dates, times, user IDs, category IDs
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * Dates, times, user IDs, category IDs
+	 */
 	public static function convert(addressbook_egw_record &$record, $options) {
 
 		if ($record->tel_prefer) {
@@ -436,7 +436,7 @@ 
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-    {
+	{
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

Indentation +26 added lines, -26 removed lines

@@ -381,38 +381,38 @@
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 }

addressbook/inc/class.addressbook_vcal.inc.php

Indentation +44 added lines, -44 removed lines

@@ -90,20 +90,20 @@ 
 	 */
 	var $clientProperties;
 	/**
-	* Set Logging
-	*
-	* @var string
-	* off = false;
-	*/
+	 * Set Logging
+	 *
+	 * @var string
+	 * off = false;
+	 */
 	var $log = false;
 	var $logfile="/tmp/log-vcard";
 	/**
-	* Constructor
-	*
-	* @param string $contact_app			the current application
-	* @param string	$_contentType			the content type (version)
-	* @param array $_clientProperties		client properties
-	*/
+	 * Constructor
+	 *
+	 * @param string $contact_app			the current application
+	 * @param string	$_contentType			the content type (version)
+	 * @param array $_clientProperties		client properties
+	 */
 	function __construct($contact_app='addressbook', $_contentType='text/x-vcard', &$_clientProperties = array())
 	{
 		parent::__construct($contact_app);
@@ -126,15 +126,15 @@ 
 		$this->supportedFields = $this->databaseFields;
 	}
 	/**
-	* import a vard into addressbook
-	*
-	* @param string	$_vcard		the vcard
-	* @param int/string	$_abID =null		the internal addressbook id or !$_abID for a new enty
-	* @param boolean $merge =false	merge data with existing entry
-	* @param string $charset  The encoding charset for $text. Defaults to
-    *                         utf-8 for new format, iso-8859-1 for old format.
-	* @return int contact id
-	*/
+	 * import a vard into addressbook
+	 *
+	 * @param string	$_vcard		the vcard
+	 * @param int/string	$_abID =null		the internal addressbook id or !$_abID for a new enty
+	 * @param boolean $merge =false	merge data with existing entry
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 * @return int contact id
+	 */
 	function addVCard($_vcard, $_abID=null, $merge=false, $charset=null)
 	{
 		if (!($contact = $this->vcardtoegw($_vcard, $charset))) return false;
@@ -174,17 +174,17 @@ 
 			$contact['id'] = $_abID;
 		}
 		else
-    	{
-    		if (is_array($contact['cat_id']))
+		{
+			if (is_array($contact['cat_id']))
 			{
 				$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
 			}
-    	}
-    	if (isset($contact['owner']) && $contact['owner'] != $this->user)
-    	{
-    		$contact['private'] = 0;	// foreign contacts are never private!
-    	}
-    	if ($this->log)
+		}
+		if (isset($contact['owner']) && $contact['owner'] != $this->user)
+		{
+			$contact['private'] = 0;	// foreign contacts are never private!
+		}
+		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
 				array2string($contact)."\n",3,$this->logfile);
@@ -193,13 +193,13 @@ 
 	}
 
 	/**
-	* return a vcard
-	*
-	* @param int/string	$_id the id of the contact
-	* @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8
-	* @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
-	* @return string containing the vcard
-	*/
+	 * return a vcard
+	 *
+	 * @param int/string	$_id the id of the contact
+	 * @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8
+	 * @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
+	 * @return string containing the vcard
+	 */
 	function getVCard($_id,$_charset='UTF-8',$extra_charset_attribute=true)
 	{
 		$vCard = new Horde_Icalendar_Vcard($this->version);
@@ -533,14 +533,14 @@ 
 	}
 
 	/**
-     * Parses a string containing vCard data.
-     *
-     * @param string $_vcard   The data to parse.
-     * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
-     * @return array|boolean   The contact data or false on errors.
-     */
+	 * Parses a string containing vCard data.
+	 *
+	 * @param string $_vcard   The data to parse.
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
+	 * @return array|boolean   The contact data or false on errors.
+	 */
 	function vcardtoegw($_vcard, $charset=null)
 	{
 		// the horde class does the charset conversion. DO NOT CONVERT HERE.
@@ -799,7 +799,7 @@ 
 					}
 					break;
 				case 'TEL;OTHER;VOICE':
-				    if (!in_array('TEL;OTHER', $rowNames)
+					if (!in_array('TEL;OTHER', $rowNames)
 							&& !isset($finalRowNames['TEL;OTHER']))
 					{
 						$finalRowNames['TEL;OTHER'] = $vcardKey;

addressbook/inc/class.addressbook_zpush.inc.php

Indentation +25 added lines, -25 removed lines

@@ -277,7 +277,7 @@ 
 	 * @param string $id folder id
 	 * @param int $cutoffdate =null
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		unset($cutoffdate);	// not used, but required by function signature
@@ -378,10 +378,10 @@ 
 				case 'bday':	// zpush seems to use a timestamp in utc (at least vcard backend does)
 					if (!empty($contact[$attr]))
 					{
-            			$tz = date_default_timezone_get();
-            			date_default_timezone_set('UTC');
-            			$message->birthday = strtotime($contact[$attr]);
-            			date_default_timezone_set($tz);
+						$tz = date_default_timezone_get();
+						date_default_timezone_set('UTC');
+						$message->birthday = strtotime($contact[$attr]);
+						date_default_timezone_set($tz);
 					}
 					break;
 
@@ -634,7 +634,7 @@ 
 	 * @param $folderid of the current folder
 	 * @param $id of the message
 	 * @param $newfolderid
-     * @param ContentParameters   $contentParameters
+	 * @param ContentParameters   $contentParameters
 	 *
 	 * @return $newid as a string | boolean false on error
 	 *
@@ -662,7 +662,7 @@ 
 	 *
 	 * @param $folderid
 	 * @param $id
-     * @param ContentParameters   $contentParameters
+	 * @param ContentParameters   $contentParameters
 	 *
 	 * @return boolean true on success, false on error, diffbackend does NOT use the returnvalue
 	 *
@@ -681,23 +681,23 @@ 
 		return $ret;
 	}
 
-    /**
-     * Changes the 'read' flag of a message on disk. The $flags
-     * parameter can only be '1' (read) or '0' (unread). After a call to
-     * SetReadFlag(), GetMessageList() should return the message with the
-     * new 'flags' but should not modify the 'mod' parameter. If you do
-     * change 'mod', simply setting the message to 'read' on the mobile will trigger
-     * a full resync of the item from the server.
-     *
-     * @param string              $folderid            id of the folder
-     * @param string              $id                  id of the message
-     * @param int                 $flags               read flag of the message
-     * @param ContentParameters   $contentParameters
-     *
-     * @access public
-     * @return boolean                      status of the operation
-     * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
-     */
+	/**
+	 * Changes the 'read' flag of a message on disk. The $flags
+	 * parameter can only be '1' (read) or '0' (unread). After a call to
+	 * SetReadFlag(), GetMessageList() should return the message with the
+	 * new 'flags' but should not modify the 'mod' parameter. If you do
+	 * change 'mod', simply setting the message to 'read' on the mobile will trigger
+	 * a full resync of the item from the server.
+	 *
+	 * @param string              $folderid            id of the folder
+	 * @param string              $id                  id of the message
+	 * @param int                 $flags               read flag of the message
+	 * @param ContentParameters   $contentParameters
+	 *
+	 * @access public
+	 * @return boolean                      status of the operation
+	 * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
+	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
 		unset($folderid, $id, $flags, $contentParameters);
@@ -713,7 +713,7 @@ 
 	 *
 	 *
 	 * @DESC The $flags parameter must contains the poommailflag Object
- 	 */
+	 */
 	function ChangeMessageFlag($folderid, $id, $flags)
 	{
 		unset($folderid, $id, $flags);

addressbook/inc/class.addressbook_ui.inc.php

Indentation +8 added lines, -8 removed lines

@@ -1885,12 +1885,12 @@ 
 	}
 
 	/**
-	* Edit a contact
-	*
-	* @param array $content=null submitted content
-	* @param int $_GET['contact_id'] contact_id mainly for popup use
-	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
-	*/
+	 * Edit a contact
+	 *
+	 * @param array $content=null submitted content
+	 * @param int $_GET['contact_id'] contact_id mainly for popup use
+	 * @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
+	 */
 	function edit($content=null)
 	{
 		if (is_array($content))
@@ -3069,8 +3069,8 @@ 
 	}
 
 	/**
-	* Set up history log widget
-	*/
+	 * Set up history log widget
+	 */
 	protected function setup_history(&$content, &$sel_options)
 	{
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||

addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php

Indentation +8 added lines, -8 removed lines

@@ -35,8 +35,8 @@ 
 	}
 
 	/**
-	* Overridden to be able to skip the next step
-	*/
+	 * Overridden to be able to skip the next step
+	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv) {
 
 		if ($content['step'] == 'wizard_step40' && array_search('pressed', $content['button']) == 'next') {
@@ -52,10 +52,10 @@ 
 		}
 	}
 
-        /**
-        * Choose how to export multi-selects (includes Api\Categories)
-        */
-        function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
+		/**
+		 * Choose how to export multi-selects (includes Api\Categories)
+		 */
+		function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
 		// return from step50
@@ -130,8 +130,8 @@ 
 	}
 
 	/**
-	* Get a list of multi-select fields
-	*/
+	 * Get a list of multi-select fields
+	 */
 	protected function get_field_list($content) {
 		$field_list = array();
 

login.php

Indentation +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 	// some apache mod_auth_* modules use REMOTE_USER instead of PHP_AUTH_USER, thanks to Sylvain Beucler
 	if ($GLOBALS['egw_info']['server']['auth_type'] == 'http' && !isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['REMOTE_USER']))
 	{
-        	$_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'];
+			$_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'];
 	}
 	if($GLOBALS['egw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
 	{