EGroupware / egroupware

resources/inc/class.resources_import_csv.inc.php

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * 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;
 	}
 }

resources/inc/class.resources_tracking.inc.php

Indentation +14 added lines, -14 removed lines

@@ -26,20 +26,20 @@
 		$this->id_field = 'res_id';
 
 		$this->field2history = array(
-                        'res_id'        => 'res_id',
-                        'name'          => 'name',
-                        'short_description'     => 'short_description',
-                        'cat_id'        => 'cat_id',
-                        'quantity'      => 'quantity',
-                        'useable'       => 'useable',
-                        'location'      => 'location',
-                        'storage_info'  => 'storage_info',
-                        'bookable'      => 'bookable',
-                        'buyable'       => 'buyable',
-                        'prize'         => 'prize',
-                        'long_description'      => 'long_description',
-                        'inventory_number'      => 'inventory_number',
-                        'accessory_of'  => 'accessory_of'
+						'res_id'        => 'res_id',
+						'name'          => 'name',
+						'short_description'     => 'short_description',
+						'cat_id'        => 'cat_id',
+						'quantity'      => 'quantity',
+						'useable'       => 'useable',
+						'location'      => 'location',
+						'storage_info'  => 'storage_info',
+						'bookable'      => 'bookable',
+						'buyable'       => 'buyable',
+						'prize'         => 'prize',
+						'long_description'      => 'long_description',
+						'inventory_number'      => 'inventory_number',
+						'accessory_of'  => 'accessory_of'
 		);
 		parent::__construct($this->appname);
 	}

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_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_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'] ||

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

index.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 // or an uncoditional redirect to this file or copy groupdav.htaccess to your docroot as .htaccess
 if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND' || $_SERVER['REQUEST_METHOD'] == 'OPTIONS')
 {
-        header('Location: groupdav.php/');
-        exit;
+		header('Location: groupdav.php/');
+		exit;
 }
 
 // forward for not existing or empty header to setup

infolog/inc/class.infolog_egw_record.inc.php

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@
 	// Used in conversions
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
-                'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+				'select-cat' => array('info_cat'),
+				'select-account' => array('info_owner','info_responsible','info_modifier'),
+				'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
 		'links' => array('info_link_id'),
-        );
+		);
 
 	/**
 	 * constructor