EGroupware / egroupware

setup/inc/class.setup.inc.php

Indentation +27 added lines, -27 removed lines

@@ -151,10 +151,10 @@ 
 	}
 
 	/**
-	* Set the domain used for cookies
-	*
-	* @return string domain
-	*/
+	 * Set the domain used for cookies
+	 *
+	 * @return string domain
+	 */
 	static function cookiedomain()
 	{
 		// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
@@ -175,12 +175,12 @@ 
 	}
 
 	/**
-	* Set a cookie
-	*
-	* @param string $cookiename name of cookie to be set
-	* @param string $cookievalue value to be used, if unset cookie is cleared (optional)
-	* @param int $cookietime when cookie should expire, 0 for session only (optional)
-	*/
+	 * Set a cookie
+	 *
+	 * @param string $cookiename name of cookie to be set
+	 * @param string $cookievalue value to be used, if unset cookie is cleared (optional)
+	 * @param int $cookietime when cookie should expire, 0 for session only (optional)
+	 */
 	function set_cookie($cookiename,$cookievalue='',$cookietime=0)
 	{
 		if(!isset($this->cookie_domain))
@@ -344,19 +344,19 @@ 
 		return true;
 	}
 
-    /**
-    * check if username and password is valid
-    *
-    * this function compares the supplied and stored username and password
-	* as any of the passwords can be clear text or md5 we convert them to md5
-	* internal and compare always the md5 hashs
-    *
-    * @param string $user the user supplied username
-    * @param string $pw the user supplied password
-    * @param string $conf_user the configured username
-    * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
-    * @returns bool true on success
-    */
+	/**
+	 * check if username and password is valid
+	 *
+	 * this function compares the supplied and stored username and password
+	 * as any of the passwords can be clear text or md5 we convert them to md5
+	 * internal and compare always the md5 hashs
+	 *
+	 * @param string $user the user supplied username
+	 * @param string $pw the user supplied password
+	 * @param string $conf_user the configured username
+	 * @param string $hash hash to check password agains (no {prefix} for plain and md5!)
+	 * @returns bool true on success
+	 */
 	static function check_auth($user, $pw, $conf_user, $hash)
 	{
 		if ($user !== $conf_user)
@@ -728,10 +728,10 @@ 
 	}
 
 	/**
-	  * call the hooks for a single application
-	  *
-	  * @param $location hook location - required
-	  * @param $appname application name - optional
+	 * call the hooks for a single application
+	 *
+	 * @param $location hook location - required
+	 * @param $appname application name - optional
 	 */
 	static function hook($location, $appname='')
 	{

setup/index.php

Indentation +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
 					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+										 "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:

setup/applications.php

Indentation +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
 			{
 				echo lang('because it depends upon') . ':<br />' . "\n";
 				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
-                            $depapp_count = count($depapp);
+							$depapp_count = count($depapp);
 				for ($i=0; $i<$depapp_count; $i++)
 				{
 					echo '<br />' . $depapp[$i] . ': ';

importexport/inc/class.importexport_iface_import_plugin.inc.php

Indentation +21 added lines, -21 removed lines

@@ -88,33 +88,33 @@
 	public function get_selectors_etpl();
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*	record_# => error message
-	*	)
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => error message
+	 *	)
+	 */
 	public function get_errors();
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*	record_# => warning message
-	*	)
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => warning message
+	 *	)
+	 */
 	public function get_warnings();
 
 	/**
-	* 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
-	* )
-	*/
+	 * 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();
 
 } // end of iface_export_plugin

importexport/inc/class.importexport_helper_functions.inc.php

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@ 
 	 * Relative date ranges for filtering
 	 */
 	public static $relative_dates = array(      // Start: year,month,day,week, End: year,month,day,week
-                'Today'       => array(0,0,0,0,  0,0,1,0),
-                'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-                'This week'   => array(0,0,0,0,  0,0,0,1),
-                'Last week'   => array(0,0,0,-1, 0,0,0,0),
-                'This month'  => array(0,0,0,0,  0,1,0,0),
-                'Last month'  => array(0,-1,0,0, 0,0,0,0),
-                'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
-                'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
-                'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
-                'This year'   => array(0,0,0,0,  1,0,0,0),
-                'Last year'   => array(-1,0,0,0, 0,0,0,0),
-                '2 years ago' => array(-2,0,0,0, -1,0,0,0),
-                '3 years ago' => array(-3,0,0,0, -2,0,0,0),
-        );
+				'Today'       => array(0,0,0,0,  0,0,1,0),
+				'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
+				'This week'   => array(0,0,0,0,  0,0,0,1),
+				'Last week'   => array(0,0,0,-1, 0,0,0,0),
+				'This month'  => array(0,0,0,0,  0,1,0,0),
+				'Last month'  => array(0,-1,0,0, 0,0,0,0),
+				'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
+				'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
+				'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
+				'This year'   => array(0,0,0,0,  1,0,0,0),
+				'Last year'   => array(-1,0,0,0, 0,0,0,0),
+				'2 years ago' => array(-2,0,0,0, -1,0,0,0),
+				'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		);
 
 	/**
-	* Files known to cause problems, and will be skipped in a plugin scan
-	* If you put appname => true, the whole app will be skipped.
-	*/
+	 * Files known to cause problems, and will be skipped in a plugin scan
+	 * If you put appname => true, the whole app will be skipped.
+	 */
 	protected static $blacklist_files = array(
 		'api' => true,
 		'etemplate' => true,
@@ -64,10 +64,10 @@ 
 	);
 
 	/**
-	* Class used to provide extra conversion functions
-	*
-	* Passed in as a param to conversion()
-	*/
+	 * Class used to provide extra conversion functions
+	 *
+	 * Passed in as a param to conversion()
+	 */
 	protected static $cclass = null;
 
 	/**

importexport/inc/class.importexport_schedule_ui.inc.php

Indentation +16 added lines, -16 removed lines

@@ -196,8 +196,8 @@ 
 	}
 
 	/**
-	* Get options for select boxes
-	*/
+	 * Get options for select boxes
+	 */
 	public static function get_select_options(Array $data)
 	{
 		$options = array(
@@ -261,8 +261,8 @@ 
 	}
 
 	/**
-	* Generate a async key
-	*/
+	 * Generate a async key
+	 */
 	public static function generate_id($data)
 	{
 
@@ -278,11 +278,11 @@ 
 	}
 
 	/**
-	* Check that the target is valid for the type (readable or writable)
-	* and that they're not trying to write directly to the filesystem
-	*
-	* $data should contain target & type
-	*/
+	 * Check that the target is valid for the type (readable or writable)
+	 * and that they're not trying to write directly to the filesystem
+	 *
+	 * $data should contain target & type
+	 */
 	public static function check_target(Array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
@@ -329,11 +329,11 @@ 
 	}
 
 	/**
-	* Writable that checks the folder too, in case the file does not exist yet
-	* http://ca3.php.net/manual/en/function.is-writable.php#73596
-	*
-	* @param path Path to check
-	*/
+	 * Writable that checks the folder too, in case the file does not exist yet
+	 * http://ca3.php.net/manual/en/function.is-writable.php#73596
+	 *
+	 * @param path Path to check
+	 */
 	private static function is__writable($path)
 	{
 		if ($path{strlen($path)-1}=='/')
@@ -365,8 +365,8 @@ 
 	}
 
 	/**
-	* Execute a scheduled import or export
-	*/
+	 * Execute a scheduled import or export
+	 */
 	public static function exec($data)
 	{
 		ob_start();

importexport/inc/class.importexport_definitions_bo.inc.php

Indentation +4 added lines, -4 removed lines

@@ -137,10 +137,10 @@
 	}
 
 	/**
-	* Save a definition
-	*
-	* @param definition $definition
-	*/
+	 * Save a definition
+	 *
+	 * @param definition $definition
+	 */
 	public function save(Array $data) {
 		$definition = new importexport_definition();
 		$definition->set_record($data);

importexport/inc/class.importexport_wizard_basic_export_csv.inc.php

Indentation +22 added lines, -22 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_export_csv.choose_fields',
 		'wizard_step40' => 'importexport.wizard_basic_export_csv.choosesepncharset',
@@ -38,19 +38,19 @@ 
 		
 
 	/**
-	* Destination fields for the export
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the export
+	 * Key is the field name, value is the human version
+	 */
 	protected $export_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -69,8 +69,8 @@ 
 	}
 
 	/**
-	* Choose fields to export
-	*/
+	 * Choose fields to export
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -206,16 +206,16 @@ 
 			);
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
 			array(
-                                'user'  => lang('User preference'),
-                        );
+								'user'  => lang('User preference'),
+						);
 
-                        // 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));
+						}
 			$sel_options['convert'] = array(
 				0	=> lang('Database values'),
 				1	=> lang('Human friendly values')

importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Indentation +20 added lines, -20 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_import_csv.sample_file',
 		'wizard_step40' => 'importexport.wizard_basic_import_csv.choosesepncharset',
@@ -39,19 +39,19 @@ 
 		
 
 	/**
-	* Destination fields for the mapping
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the mapping
+	 * Key is the field name, value is the human version
+	 */
 	protected $mapping_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -68,8 +68,8 @@ 
 	}
 
 	/**
-	* Take a sample CSV file.  It will be processed in later steps
-	*/
+	 * Take a sample CSV file.  It will be processed in later steps
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -263,11 +263,11 @@ 
 	}
 	
 	/**
-	* Process the sample file, get the fields out of it, then allow them to be mapped onto
-	* the fields the destination understands.  Also, set any translations to be done to the field.
-	*
-	* You can use the eTemplate
-	*/
+	 * Process the sample file, get the fields out of it, then allow them to be mapped onto
+	 * the fields the destination understands.  Also, set any translations to be done to the field.
+	 *
+	 * You can use the eTemplate
+	 */
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
@@ -348,8 +348,8 @@ 
 	}
 	
 	/**
-	* Edit conditions
-	*/
+	 * Edit conditions
+	 */
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));