EGroupware / egroupware

api/src/Framework/Ajax.php

Indentation +18 added lines, -18 removed lines

@@ -337,16 +337,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip
-	* @todo implement in a reasonable way for jdots
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip Api\Html, or null of no tooltip
+	 * @todo implement in a reasonable way for jdots
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id,$icon_src,$iconlink,$blink,$tooltip);	// not used
@@ -354,14 +354,14 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		switch($app_data['name'])

api/src/Framework/Minimal.php

Indentation +54 added lines, -54 removed lines

@@ -21,29 +21,29 @@ 
 class Minimal extends Api\Framework
 {
 	/**
-	* Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
-	*
-	* @var Template
-	*/
+	 * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
+	 *
+	 * @var Template
+	 */
 	var $tpl;
 
 	/**
-	* Constructor
-	*
-	* @param string $template ='default' name of the template
-	* @return idots_framework
-	*/
+	 * Constructor
+	 *
+	 * @param string $template ='default' name of the template
+	 * @return idots_framework
+	 */
 	function __construct($template='default')
 	{
 		parent::__construct($template);		// call the constructor of the extended class
 	}
 
 	/**
-	* Returns the html-header incl. the opening body tag
-	*
-	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
-	* @return string with html
-	*/
+	 * Returns the html-header incl. the opening body tag
+	 *
+	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
+	 * @return string with html
+	 */
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
@@ -76,10 +76,10 @@ 
 	}
 
 	/**
-	* Returns the html from the body-tag til the main application area (incl. opening div tag)
-	*
-	* @return string with html
-	*/
+	 * Returns the html from the body-tag til the main application area (incl. opening div tag)
+	 *
+	 * @return string with html
+	 */
 	function navbar()
 	{
 		return '';
@@ -101,37 +101,37 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		unset($app_data, $alt_label);
 	}
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_info_item($content, $id=null)
 	{
 		unset($content, $id);
 	}
 
 	/**
-	* Returns the html from the closing div of the main application area to the closing html-tag
-	*
-	* @return string html or null if no footer needed/wanted
-	*/
+	 * Returns the html from the closing div of the main application area to the closing html-tag
+	 *
+	 * @return string html or null if no footer needed/wanted
+	 */
 	function footer()
 	{
 		static $footer_done=0;
@@ -141,29 +141,29 @@ 
 	}
 
 	/**
-	* Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
-	*
-	* @param string $appname
-	* @param string $menu_title
-	* @param array $file
-	* @param string $type =null 'admin', 'preferences', 'favorites', ...
-	*/
+	 * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
+	 *
+	 * @param string $appname
+	 * @param string $menu_title
+	 * @param array $file
+	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
+	 */
 	function sidebox($appname,$menu_title,$file,$type=null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);

api/src/Ldap/ServerInfo.php

Indentation +40 added lines, -40 removed lines

@@ -32,33 +32,33 @@ 
 	const SAMBA4 = 2;
 
 	/**
-	* @var array $namingContext holds the supported namingcontexts
-	*/
+	 * @var array $namingContext holds the supported namingcontexts
+	 */
 	var $namingContext = array();
 
 	/**
-	* @var string $version holds the LDAP server version
-	*/
+	 * @var string $version holds the LDAP server version
+	 */
 	var $version = 2;
 
 	/**
-	* @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
-	*/
+	 * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
+	 */
 	var $serverType = 0;
 
 	/**
-	* @var string $_subSchemaEntry the subschema entry DN
-	*/
+	 * @var string $_subSchemaEntry the subschema entry DN
+	 */
 	var $subSchemaEntry = '';
 
 	/**
-	* @var array $supportedObjectClasses the supported objectclasses
-	*/
+	 * @var array $supportedObjectClasses the supported objectclasses
+	 */
 	var $supportedObjectClasses = array();
 
 	/**
-	* @var array $supportedOIDs the supported OIDs
-	*/
+	 * @var array $supportedOIDs the supported OIDs
+	 */
 	var $supportedOIDs = array();
 
 	/**
@@ -79,50 +79,50 @@ 
 	}
 
 	/**
-	* gets the version
-	*
-	* @return integer the supported ldap version
-	*/
+	 * gets the version
+	 *
+	 * @return integer the supported ldap version
+	 */
 	function getVersion()
 	{
 		return $this->version;
 	}
 
 	/**
-	* sets the namingcontexts
-	*
-	* @param array $_namingContext the supported namingcontexts
-	*/
+	 * sets the namingcontexts
+	 *
+	 * @param array $_namingContext the supported namingcontexts
+	 */
 	function setNamingContexts($_namingContext)
 	{
 		$this->namingContext = $_namingContext;
 	}
 
 	/**
-	* sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
-	*
-	* @param integer $_serverType the type of ldap server
-	*/
+	 * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
+	 *
+	 * @param integer $_serverType the type of ldap server
+	 */
 	function setServerType($_serverType)
 	{
 		$this->serverType = $_serverType;
 	}
 
 	/**
-	* sets the DN for the subschema entry
-	*
-	* @param string $_subSchemaEntry the subschema entry DN
-	*/
+	 * sets the DN for the subschema entry
+	 *
+	 * @param string $_subSchemaEntry the subschema entry DN
+	 */
 	function setSubSchemaEntry($_subSchemaEntry)
 	{
 		$this->subSchemaEntry = $_subSchemaEntry;
 	}
 
 	/**
-	* sets the supported objectclasses
-	*
-	* @param array $_supportedObjectClasses the supported objectclasses
-	*/
+	 * sets the supported objectclasses
+	 *
+	 * @param array $_supportedObjectClasses the supported objectclasses
+	 */
 	function setSupportedObjectClasses($_supportedObjectClasses)
 	{
 		$this->supportedOIDs = $_supportedObjectClasses;
@@ -130,20 +130,20 @@ 
 	}
 
 	/**
-	* sets the version
-	*
-	* @param integer $_version the supported ldap version
-	*/
+	 * sets the version
+	 *
+	 * @param integer $_version the supported ldap version
+	 */
 	function setVersion($_version)
 	{
 		$this->version = $_version;
 	}
 
 	/**
-	* checks for supported objectclasses
-	*
-	* @return bool returns true if the ldap server supports this objectclass
-	*/
+	 * checks for supported objectclasses
+	 *
+	 * @return bool returns true if the ldap server supports this objectclass
+	 */
 	function supportsObjectClass($_objectClass)
 	{
 		if($this->supportedObjectClasses[strtolower($_objectClass)])

api/src/Json/Response.php

Indentation +7 added lines, -7 removed lines

@@ -242,13 +242,13 @@
 		if ($ret === false && ($err = json_last_error()))
 		{
 			static $json_err2str = array(
-	        	JSON_ERROR_NONE => 'No errors',
-	        	JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-	        	JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
-	        	JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-	        	JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-	        	JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
-	        );
+				JSON_ERROR_NONE => 'No errors',
+				JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+				JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
+				JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+				JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+				JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+			);
 			error_log(__METHOD__.'('.array2string($var).') json_last_error()='.$err.'='.$json_err2str[$err]);
 
 			if (($var = self::fix_content($var)))

api/src/CalDAV/IcalIterator.php

Indentation +6 added lines, -6 removed lines

@@ -249,12 +249,12 @@
 
 		$this->component = Horde_Icalendar::newComponent($type, $this);
 		//error_log(__METHOD__."() this->component = Horde_Icalendar::newComponent('$type', \$this) = ".array2string($this->component));
-        if ($this->component === false)
-        {
-        	error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
-        	return;
-            //return PEAR::raiseError("Unable to create object for type $type");
-        }
+		if ($this->component === false)
+		{
+			error_log(__METHOD__."() Horde_Icalendar::newComponent('$type', \$this) returned FALSE");
+			return;
+			//return PEAR::raiseError("Unable to create object for type $type");
+		}
 		if ($this->charset && $this->charset != 'utf-8')
 		{
 			$data = Api\Translation::convert($data, $this->charset, 'utf-8');

api/src/Categories.php

Indentation +7 added lines, -7 removed lines

@@ -1044,13 +1044,13 @@
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int|string $_cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int|string $_cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($_cats)
 	{
 		static $cat2color = array();

api/src/Link/Storage.php

Indentation +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 			echo "<p>solink.link('$app1',$id1,'$app2',$id2,'$remark',$owner)</p>\n";
 		}
 		if ($app1 == $app2 && $id1 == $id2 ||
-		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
+			$id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
 			return False;	// dont link to self or other nosense
 		}
@@ -412,26 +412,26 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
-                        	'join'=>" a
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                       		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
-                        	'join'=>" a
+					   		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->projectmanager and infolog->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                     		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
-                       		'join'=>" a
+					 		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+					   		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
 			),

api/src/Storage/Base.php

Indentation +8 added lines, -8 removed lines

@@ -1367,14 +1367,14 @@
 	}
 
 	/**
-	* Get a default list of columns to search
-	* This is to be used as a fallback, for when the extending class does not define
-	* $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
-	* their name are discarded because these columns are expected to be foreign keys or other numeric
-	* values with no meaning to the user.
-	*
-	* @return array of column names
-	*/
+	 * Get a default list of columns to search
+	 * This is to be used as a fallback, for when the extending class does not define
+	 * $this->columns_to_search.  All the columns are considered, and any with $skip_columns_with in
+	 * their name are discarded because these columns are expected to be foreign keys or other numeric
+	 * values with no meaning to the user.
+	 *
+	 * @return array of column names
+	 */
 	protected function get_default_search_columns()
 	{
 		$skip_columns_with = array('_id', 'modified', 'modifier', 'status', 'cat_id', 'owner');

api/src/Db/Backup.php

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -719,9 +719,9 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+				self::remove_dir_content($dir.'/'.$file);
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+				unlink($dir.'/'.$file);
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -967,8 +967,8 @@ 
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
 			}
 
-		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+			fclose($f);
+			if (file_exists($name)) unlink($name);
 			return TRUE;
 		}
 		// save files ....