EGroupware / egroupware

calendar/inc/class.calendar_import_ical.inc.php

Indentation +31 added lines, -31 removed lines

@@ -64,8 +64,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -94,9 +94,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.
@@ -202,39 +202,39 @@ 
 	}
 
 	/**
-        * 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;
+		}
 } // end of iface_export_plugin
 ?>

calendar/inc/class.calendar_ui.inc.php

Indentation +8 added lines, -8 removed lines

@@ -455,11 +455,11 @@ 
 	}
 
 	/**
-	* gets the icons displayed for a given event
-	*
-	* @param array $event
-	* @return array of 'img' / 'title' pairs
-	*/
+	 * gets the icons displayed for a given event
+	 *
+	 * @param array $event
+	 * @return array of 'img' / 'title' pairs
+	 */
 	function event_icons($event)
 	{
 		$is_private = !$event['public'] && !$this->bo->check_perms(EGW_ACL_READ,$event);
@@ -519,9 +519,9 @@ 
 	}
 
 	/**
-	* Create a select-box item in the sidebox-menu
-	* @privat used only by sidebox_menu !
-	*/
+	 * Create a select-box item in the sidebox-menu
+	 * @privat used only by sidebox_menu !
+	 */
 	function _select_box($title,$name,$options,$width='99%')
 	{
 		$select = " <select style=\"width: $width;\" name=\"".$name.'" id="calendar_'.$name.'" title="'.

calendar/inc/class.calendar_sif.inc.php

Indentation +22 added lines, -22 removed lines

@@ -407,14 +407,14 @@ 
 	}
 
 	/**
-	* @return int event id
-	* @param string	$_sifdata   the SIFE data
-	* @param int	$_calID=-1	the internal addressbook id
-	* @param boolean $merge=false	merge data with existing entry
-	* @param int $recur_date=0 if set, import the recurrence at this timestamp,
-	*                          default 0 => import whole series (or events, if not recurring)
-	* @desc import a SIFE into the calendar
-	*/
+	 * @return int event id
+	 * @param string	$_sifdata   the SIFE data
+	 * @param int	$_calID=-1	the internal addressbook id
+	 * @param boolean $merge=false	merge data with existing entry
+	 * @param int $recur_date=0 if set, import the recurrence at this timestamp,
+	 *                          default 0 => import whole series (or events, if not recurring)
+	 * @desc import a SIFE into the calendar
+	 */
 	function addSIF($_sifdata, $_calID=-1, $merge=false, $recur_date=0)
 	{
 		if ($this->log)
@@ -794,13 +794,13 @@ 
 	}
 
 	/**
-	* return a sife
-	*
-	* @param int	$_id		the id of the event
-	* @param int $recur_date=0	if set export the next recurrence at or after the timestamp,
-	*                          	default 0 => export whole series (or events, if not recurring)
-	* @return string containing the SIFE
-	*/
+	 * return a sife
+	 *
+	 * @param int	$_id		the id of the event
+	 * @param int $recur_date=0	if set export the next recurrence at or after the timestamp,
+	 *                          	default 0 => export whole series (or events, if not recurring)
+	 * @return string containing the SIFE
+	 */
 	function getSIF($_id, $recur_date=0)
 	{
 		if ($this->log)
@@ -1166,13 +1166,13 @@ 
 	}
 
 	/**
-	* Set the supported fields
-	*
-	* Currently we only store name and version, manucfacturer is always Funambol
-	*
-	* @param string $_productName
-	* @param string $_productSoftwareVersion
-	*/
+	 * Set the supported fields
+	 *
+	 * Currently we only store name and version, manucfacturer is always Funambol
+	 *
+	 * @param string $_productName
+	 * @param string $_productSoftwareVersion
+	 */
 	function setSupportedFields($_productName='', $_productSoftwareVersion='')
 	{
 		$state =& $_SESSION['SyncML.state'];

calendar/inc/class.calendar_activesync.inc.php

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();

calendar/inc/class.calendar_uiforms.inc.php

Indentation +3 added lines, -3 removed lines

@@ -2452,7 +2452,7 @@ 
 	 */
 	function export($content=0,$return_error=false)
 	{
-        $boical = new calendar_ical();
+		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
@@ -2616,8 +2616,8 @@ 
 	}
 
 	/**
-	* Set up the required fields to get the history tab
-	*/
+	 * Set up the required fields to get the history tab
+	 */
 	public function setup_history(&$content, &$sel_options)
 	{
 		$status = 'history_status';

calendar/inc/class.calendar_ical.inc.php

Indentation +49 added lines, -49 removed lines

@@ -480,15 +480,15 @@ 
 									{
 										$user = $this->resource_info($this->user);
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
-			    						$parameters['ATTENDEE'][] = array(
-			    							'CN'		=>	$user['name'],
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
+										$parameters['ATTENDEE'][] = array(
+											'CN'		=>	$user['name'],
+											'ROLE'		=> 'REQ-PARTICIPANT',
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
-			    						);
-			    						$event['participants'][$this->user] = true;
+										);
+										$event['participants'][$this->user] = true;
 									}
 									break;
 								case 'r':
@@ -540,24 +540,24 @@ 
 						}
 						break;
 
-    				case 'ORGANIZER':
-	    				if (!$organizerURL)
-	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
-			    			if ($version == '1.0')
-			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
-			    			}
-			    			else
-			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
-			    			}
-			    			$organizerUID = $event['owner'];
-		    				if (!isset($event['participants'][$event['owner']]))
-		    				{
-			    				$options = array(
+					case 'ORGANIZER':
+						if (!$organizerURL)
+						{
+							$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
+								. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
+							$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+							if ($version == '1.0')
+							{
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+							}
+							else
+							{
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+							}
+							$organizerUID = $event['owner'];
+							if (!isset($event['participants'][$event['owner']]))
+							{
+								$options = array(
 									'ROLE'     => 'CHAIR',
 									'PARTSTAT' => 'DELEGATED',
 									'CUTYPE'   => 'INDIVIDUAL',
@@ -567,20 +567,20 @@ 
 								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
 								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
 								$attributes['ATTENDEE'][] = $organizerURL;
-			    				$parameters['ATTENDEE'][] = $options;
-		    				}
-	    				}
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
-	    				{
-		    				$attributes['ORGANIZER'] = $organizerURL;
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
-		    				if (!empty($organizerUID))
-		    				{
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
-		    				}
-	    				}
-	    				break;
+								$parameters['ATTENDEE'][] = $options;
+							}
+						}
+						// do NOT use ORGANIZER for events without further participants or a different organizer
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
+						{
+							$attributes['ORGANIZER'] = $organizerURL;
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
+							if (!empty($organizerUID))
+							{
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+							}
+						}
+						break;
 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
@@ -989,12 +989,12 @@ 
 				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
 				{
 					$valueData = translation::convert($valueData,translation::charset(),$charset);
-                    $paramData = (array) translation::convert(is_array($value) ?
-                    		$parameters[$key][$valueID] : $parameters[$key],
-                            translation::charset(),$charset);
-                    $valuesData = (array) translation::convert($values[$key],
-                    		translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+					$paramData = (array) translation::convert(is_array($value) ?
+							$parameters[$key][$valueID] : $parameters[$key],
+							translation::charset(),$charset);
+					$valuesData = (array) translation::convert($values[$key],
+							translation::charset(),$charset);
+					$content = $valueData . implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2230,7 +2230,7 @@ 
 	 * @param string|resource $_vcalData
 	 * @param string $principalURL ='' Used for CalDAV imports
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
 	function icaltoegw($_vcalData, $principalURL='', $charset=null)
@@ -2747,10 +2747,10 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
-				    }
-				    if (isset($attributes['params']['STATUS']))
+					{
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
+					}
+					if (isset($attributes['params']['STATUS']))
 					{
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
 						if (empty($status)) $status = 'X';
@@ -3141,7 +3141,7 @@ 
 				array2string($event)."\n",3,$this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 

phpgwapi/js/jscalendar/test.php

Indentation +22 added lines, -22 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
 if (preg_match('/^[a-z0-9-]+$/i', $_REQUEST['lang'])) {
-    $lang = $_REQUEST['lang'];
+	$lang = $_REQUEST['lang'];
 }
 else {
-    $lang = 'en';
+	$lang = 'en';
 }
 setcookie('lang', $lang);
 
@@ -47,7 +47,7 @@ 
 <h1>Form submitted</h1>
 
 <?php foreach ($_REQUEST as $key => $val) {
-    echo htmlspecialchars($key) . ' = ' . htmlspecialchars($val) . '<br />';
+	echo htmlspecialchars($key) . ' = ' . htmlspecialchars($val) . '<br />';
 } ?>
 
 <?php } else { ?>
@@ -60,16 +60,16 @@ 
 $cwd = getcwd();
 chdir('lang');
 foreach (glob('*.js') as $filename) {
-    $l = preg_replace('/(^calendar-|.js$)/', '', $filename);
-    $selected = '';
-    if ($l == $lang)
-        $selected = 'selected="selected" ';
-    $display = $l;
-    if ($l == 'en')
-        $display = 'EN';
-    echo '<option ' . $selected . 'value="' . $l . '">' . $display . '</option>';
+	$l = preg_replace('/(^calendar-|.js$)/', '', $filename);
+	$selected = '';
+	if ($l == $lang)
+		$selected = 'selected="selected" ';
+	$display = $l;
+	if ($l == 'en')
+		$display = 'EN';
+	echo '<option ' . $selected . 'value="' . $l . '">' . $display . '</option>';
 }
-     ?>
+	 ?>
      </select>
      <blockquote style="font-size: 90%">
        <b>NOTE</b>: as of this release, 0.9.6, only "EN" and "RO", which I
@@ -90,16 +90,16 @@ 
      </td>
      <td>
        <?php $calendar->make_input_field(
-           // calendar options go here; see the documentation and/or calendar-setup.js
-           array('firstDay'       => 1, // show Monday first
-                 'showsTime'      => true,
-                 'showOthers'     => true,
-                 'ifFormat'       => '%Y-%m-%d %I:%M %P',
-                 'timeFormat'     => '12'),
-           // field attributes go here
-           array('style'       => 'width: 15em; color: #840; background-color: #ff8; border: 1px solid #000; text-align: center',
-                 'name'        => 'date1',
-                 'value'       => strftime('%Y-%m-%d %I:%M %P', strtotime('now')))); ?>
+		   // calendar options go here; see the documentation and/or calendar-setup.js
+		   array('firstDay'       => 1, // show Monday first
+				 'showsTime'      => true,
+				 'showOthers'     => true,
+				 'ifFormat'       => '%Y-%m-%d %I:%M %P',
+				 'timeFormat'     => '12'),
+		   // field attributes go here
+		   array('style'       => 'width: 15em; color: #840; background-color: #ff8; border: 1px solid #000; text-align: center',
+				 'name'        => 'date1',
+				 'value'       => strftime('%Y-%m-%d %I:%M %P', strtotime('now')))); ?>
      </td>
      </tr>
      </table>

phpgwapi/js/jscalendar/calendar.php

Indentation +101 added lines, -101 removed lines

@@ -13,107 +13,107 @@
 define('NEWLINE', "\n");
 
 class DHTML_Calendar {
-    var $calendar_lib_path;
-
-    var $calendar_file;
-    var $calendar_lang_file;
-    var $calendar_setup_file;
-    var $calendar_theme_file;
-    var $calendar_options;
-
-    function DHTML_Calendar($calendar_lib_path = '/calendar/',
-                            $lang              = 'en',
-                            $theme             = 'calendar-win2k-1',
-                            $stripped          = true) {
-        if ($stripped) {
-            $this->calendar_file = 'calendar_stripped.js';
-            $this->calendar_setup_file = 'calendar-setup_stripped.js';
-        } else {
-            $this->calendar_file = 'calendar.js';
-            $this->calendar_setup_file = 'calendar-setup.js';
-        }
-        $this->calendar_lang_file = 'lang/calendar-' . $lang . '.js';
-        $this->calendar_theme_file = $theme.'.css';
-        $this->calendar_lib_path = preg_replace('/\/+$/', '/', $calendar_lib_path);
-        $this->calendar_options = array('ifFormat' => '%Y/%m/%d',
-                                        'daFormat' => '%Y/%m/%d');
-    }
-
-    function set_option($name, $value) {
-        $this->calendar_options[$name] = $value;
-    }
-
-    function load_files() {
-        echo $this->get_load_files_code();
-    }
-
-    function get_load_files_code() {
-        $code  = ( '<link rel="stylesheet" type="text/css" media="all" href="' .
-                   $this->calendar_lib_path . $this->calendar_theme_file .
-                   '" />' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_file .
-                   '"></script>' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_lang_file .
-                   '"></script>' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_setup_file .
-                   '"></script>' );
-        return $code;
-    }
-
-    function _make_calendar($other_options = array()) {
-        $js_options = $this->_make_js_hash(array_merge($this->calendar_options, $other_options));
-        $code  = ( '<script type="text/javascript">Calendar.setup({' .
-                   $js_options .
-                   '});</script>' );
-        return $code;
-    }
-
-    function make_input_field($cal_options = array(), $field_attributes = array()) {
-        $id = $this->_gen_id();
-        $attrstr = $this->_make_html_attr(array_merge($field_attributes,
-                                                      array('id'   => $this->_field_id($id),
-                                                            'type' => 'text')));
-        echo '<input ' . $attrstr .'/>';
-        echo '<a href="#" id="'. $this->_trigger_id($id) . '">' .
-            '<img align="middle" border="0" src="' . $this->calendar_lib_path . 'img.gif" alt="" /></a>';
-
-        $options = array_merge($cal_options,
-                               array('inputField' => $this->_field_id($id),
-                                     'button'     => $this->_trigger_id($id)));
-        echo $this->_make_calendar($options);
-    }
-
-    /// PRIVATE SECTION
-
-    function _field_id($id) { return 'f-calendar-field-' . $id; }
-    function _trigger_id($id) { return 'f-calendar-trigger-' . $id; }
-    function _gen_id() { static $id = 0; return ++$id; }
-
-    function _make_js_hash($array) {
-        $jstr = '';
-        reset($array);
-        while (list($key, $val) = each($array)) {
-            if (is_bool($val))
-                $val = $val ? 'true' : 'false';
-            else if (!is_numeric($val))
-                $val = '"'.$val.'"';
-            if ($jstr) $jstr .= ',';
-            $jstr .= '"' . $key . '":' . $val;
-        }
-        return $jstr;
-    }
-
-    function _make_html_attr($array) {
-        $attrstr = '';
-        reset($array);
-        while (list($key, $val) = each($array)) {
-            $attrstr .= $key . '="' . $val . '" ';
-        }
-        return $attrstr;
-    }
+	var $calendar_lib_path;
+
+	var $calendar_file;
+	var $calendar_lang_file;
+	var $calendar_setup_file;
+	var $calendar_theme_file;
+	var $calendar_options;
+
+	function DHTML_Calendar($calendar_lib_path = '/calendar/',
+							$lang              = 'en',
+							$theme             = 'calendar-win2k-1',
+							$stripped          = true) {
+		if ($stripped) {
+			$this->calendar_file = 'calendar_stripped.js';
+			$this->calendar_setup_file = 'calendar-setup_stripped.js';
+		} else {
+			$this->calendar_file = 'calendar.js';
+			$this->calendar_setup_file = 'calendar-setup.js';
+		}
+		$this->calendar_lang_file = 'lang/calendar-' . $lang . '.js';
+		$this->calendar_theme_file = $theme.'.css';
+		$this->calendar_lib_path = preg_replace('/\/+$/', '/', $calendar_lib_path);
+		$this->calendar_options = array('ifFormat' => '%Y/%m/%d',
+										'daFormat' => '%Y/%m/%d');
+	}
+
+	function set_option($name, $value) {
+		$this->calendar_options[$name] = $value;
+	}
+
+	function load_files() {
+		echo $this->get_load_files_code();
+	}
+
+	function get_load_files_code() {
+		$code  = ( '<link rel="stylesheet" type="text/css" media="all" href="' .
+				   $this->calendar_lib_path . $this->calendar_theme_file .
+				   '" />' . NEWLINE );
+		$code .= ( '<script type="text/javascript" src="' .
+				   $this->calendar_lib_path . $this->calendar_file .
+				   '"></script>' . NEWLINE );
+		$code .= ( '<script type="text/javascript" src="' .
+				   $this->calendar_lib_path . $this->calendar_lang_file .
+				   '"></script>' . NEWLINE );
+		$code .= ( '<script type="text/javascript" src="' .
+				   $this->calendar_lib_path . $this->calendar_setup_file .
+				   '"></script>' );
+		return $code;
+	}
+
+	function _make_calendar($other_options = array()) {
+		$js_options = $this->_make_js_hash(array_merge($this->calendar_options, $other_options));
+		$code  = ( '<script type="text/javascript">Calendar.setup({' .
+				   $js_options .
+				   '});</script>' );
+		return $code;
+	}
+
+	function make_input_field($cal_options = array(), $field_attributes = array()) {
+		$id = $this->_gen_id();
+		$attrstr = $this->_make_html_attr(array_merge($field_attributes,
+													  array('id'   => $this->_field_id($id),
+															'type' => 'text')));
+		echo '<input ' . $attrstr .'/>';
+		echo '<a href="#" id="'. $this->_trigger_id($id) . '">' .
+			'<img align="middle" border="0" src="' . $this->calendar_lib_path . 'img.gif" alt="" /></a>';
+
+		$options = array_merge($cal_options,
+							   array('inputField' => $this->_field_id($id),
+									 'button'     => $this->_trigger_id($id)));
+		echo $this->_make_calendar($options);
+	}
+
+	/// PRIVATE SECTION
+
+	function _field_id($id) { return 'f-calendar-field-' . $id; }
+	function _trigger_id($id) { return 'f-calendar-trigger-' . $id; }
+	function _gen_id() { static $id = 0; return ++$id; }
+
+	function _make_js_hash($array) {
+		$jstr = '';
+		reset($array);
+		while (list($key, $val) = each($array)) {
+			if (is_bool($val))
+				$val = $val ? 'true' : 'false';
+			else if (!is_numeric($val))
+				$val = '"'.$val.'"';
+			if ($jstr) $jstr .= ',';
+			$jstr .= '"' . $key . '":' . $val;
+		}
+		return $jstr;
+	}
+
+	function _make_html_attr($array) {
+		$attrstr = '';
+		reset($array);
+		while (list($key, $val) = each($array)) {
+			$attrstr .= $key . '="' . $val . '" ';
+		}
+		return $attrstr;
+	}
 };
 
 ?>
\ No newline at end of file

phpgwapi/inc/class.accounts.inc.php

Indentation +7 added lines, -7 removed lines

@@ -225,13 +225,13 @@
 	 * @param int $accountId
 	 * @deprecated
 	 */
-    function setAccountId($accountId)
-    {
-        if($accountId && is_numeric($accountId))
-        {
-            $this->account_id = (int)$accountId;
-        }
-    }
+	function setAccountId($accountId)
+	{
+		if($accountId && is_numeric($accountId))
+		{
+			$this->account_id = (int)$accountId;
+		}
+	}
 
 	/**
 	 * Searches / lists accounts: users and/or groups