alxarafe / alixar

dolibarr/htdocs/core/class/html.formwebsite.class.php

Indentation +83 added lines, -83 removed lines

@@ -30,9 +30,9 @@ 
     private $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -56,7 +56,7 @@ 
      */
     function selectWebsite($selected='',$htmlname='exportmodelid',$useempty=0)
     {
-    	$out='';
+        $out='';
 
         $sql = "SELECT rowid, ref";
         $sql.= " FROM ".MAIN_DB_PREFIX."website";
@@ -109,55 +109,55 @@ 
      */
     function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$sql = "SELECT rowid, code, label, entity";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-    	$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-    	$sql.= " ORDER BY label";
-
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
-
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
-    		{
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $sql = "SELECT rowid, code, label, entity";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+        $sql.= " ORDER BY label";
+
+        dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num)
+            {
+                print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1))
+                {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid || $selected == $obj->code)
+                    {
+                        print '<option value="'.$obj->code.'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$obj->code.'">';
+                    }
+                    print $obj->label;
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
+            else
+            {
+                print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
     }
 
 
@@ -172,35 +172,35 @@ 
      */
     function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
-
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
-
-    	foreach($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
-
-    	return $out;
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+
+        $out = '';
+        $out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+
+        if ($useempty == 1 || $useempty == 2)
+        {
+            $out .= '<option value="-1">&nbsp;</option>';
+        }
+
+        foreach($arrayofsamples as $key => $val)
+        {
+            if ($selected == $key)
+            {
+                $out .= '<option value="'.$key.'" selected>';
+            }
+            else
+            {
+                $out .= '<option value="'.$key.'">';
+            }
+            $out .= $langs->trans($val);
+            $out .= '</option>';
+        }
+        $out .= "</select>";
+
+        return $out;
     }
 }

dolibarr/htdocs/core/actions_addupdatedelete.inc.php

Indentation +158 added lines, -158 removed lines

@@ -32,187 +32,187 @@
 
 if ($cancel)
 {
-	if (! empty($backtopage))
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-	$action='';
+    if (! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+    $action='';
 }
 
 // Action to add record
 if ($action == 'add' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to insert
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->create($user);
-		if ($result > 0)
-		{
-			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
-			header("Location: ".$urltogo);
-			exit;
-		}
-		else
-		{
-			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
-		}
-	}
-	else
-	{
-		$action='create';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to insert
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->create($user);
+        if ($result > 0)
+        {
+            // Creation OK
+            $urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+            header("Location: ".$urltogo);
+            exit;
+        }
+        else
+        {
+            // Creation KO
+            if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+            else  setEventMessages($object->error, null, 'errors');
+            $action='create';
+        }
+    }
+    else
+    {
+        $action='create';
+    }
 }
 
 // Action to update record
 if ($action == 'update' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to update
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->update($user);
-		if ($result > 0)
-		{
-			$action='view';
-		}
-		else
-		{
-			// Creation KO
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
-		}
-	}
-	else
-	{
-		$action='edit';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to update
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->update($user);
+        if ($result > 0)
+        {
+            $action='view';
+        }
+        else
+        {
+            // Creation KO
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action='edit';
+        }
+    }
+    else
+    {
+        $action='edit';
+    }
 }
 
 // Action to update one extrafield
 if ($action == "update_extras" && ! empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
-	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
-
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
-	if ($result > 0)
-	{
-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-		$action = 'view';
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$action = 'edit_extras';
-	}
+    $object->fetch(GETPOST('id','int'));
+    $attributekey = GETPOST('attribute','alpha');
+    $attributekeylong = 'options_'.$attributekey;
+    $object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+
+    $result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+    if ($result > 0)
+    {
+        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+        $action = 'view';
+    }
+    else
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+        $action = 'edit_extras';
+    }
 }
 
 // Action to delete
 if ($action == 'confirm_delete' && ! empty($permissiontodelete))
 {
-	$result=$object->delete($user);
-	if ($result > 0)
-	{
-		// Delete OK
-		setEventMessages("RecordDeleted", null, 'mesgs');
-		header("Location: ".$backurlforlist);
-		exit;
-	}
-	else
-	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
-	}
+    $result=$object->delete($user);
+    if ($result > 0)
+    {
+        // Delete OK
+        setEventMessages("RecordDeleted", null, 'mesgs');
+        header("Location: ".$backurlforlist);
+        exit;
+    }
+    else
+    {
+        if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+        else setEventMessages($object->error, null, 'errors');
+    }
 }
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
-	{
-		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
-		if ($object->id > 0)
-		{
-			// Because createFromClone modifies the object, we must clone it so that we can restore it later
-			$orig = clone $object;
-
-			$result=$object->createFromClone($user, $object->id);
-			if ($result > 0)
-			{
-				$newid = 0;
-				if (is_object($result)) $newid = $result->id;
-				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$object = $orig;
-				$action='';
-			}
-		}
-	}
+    if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+    {
+        setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+    }
+    else
+    {
+        if ($object->id > 0)
+        {
+            // Because createFromClone modifies the object, we must clone it so that we can restore it later
+            $orig = clone $object;
+
+            $result=$object->createFromClone($user, $object->id);
+            if ($result > 0)
+            {
+                $newid = 0;
+                if (is_object($result)) $newid = $result->id;
+                else $newid = $result;
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $object = $orig;
+                $action='';
+            }
+        }
+    }
 }

dolibarr/htdocs/core/actions_comments.inc.php

Indentation +35 added lines, -35 removed lines

@@ -35,42 +35,42 @@
 
 if ($action == 'addcomment')
 {
-	$description = GETPOST('comment_description', 'none');
-	if (!empty($description))
-	{
-		$comment->description = $description;
-		$comment->datec = time();
-		$comment->fk_element = GETPOST('id','int');
-		$comment->element_type = GETPOST('comment_element_type','alpha');
-		$comment->fk_user_author = $user->id;
-		$comment->entity = $conf->entity;
-		if ($comment->create($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    $description = GETPOST('comment_description', 'none');
+    if (!empty($description))
+    {
+        $comment->description = $description;
+        $comment->datec = time();
+        $comment->fk_element = GETPOST('id','int');
+        $comment->element_type = GETPOST('comment_element_type','alpha');
+        $comment->fk_user_author = $user->id;
+        $comment->entity = $conf->entity;
+        if ($comment->create($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
 if ($action == 'deletecomment')
 {
-	if ($comment->fetch($idcomment) >= 0)
-	{
-		if ($comment->delete($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    if ($comment->fetch($idcomment) >= 0)
+    {
+        if ($comment->delete($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
\ No newline at end of file

dolibarr/htdocs/core/filemanagerdol/connectors/php/basexml.php

Indentation +48 added lines, -48 removed lines

@@ -30,21 +30,21 @@ 
  */
 function SetXmlHeaders()
 {
-	ob_end_clean();
-
-	// Prevent the browser from caching the result.
-	// Date in the past
-	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-	// always modified
-	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-	// HTTP/1.1
-	header('Cache-Control: no-store, no-cache, must-revalidate');
-	header('Cache-Control: post-check=0, pre-check=0', false);
-	// HTTP/1.0
-	header('Pragma: no-cache');
-
-	// Set the response format.
-	header('Content-Type: text/xml; charset=utf-8');
+    ob_end_clean();
+
+    // Prevent the browser from caching the result.
+    // Date in the past
+    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+    // always modified
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+    // HTTP/1.1
+    header('Cache-Control: no-store, no-cache, must-revalidate');
+    header('Cache-Control: post-check=0, pre-check=0', false);
+    // HTTP/1.0
+    header('Pragma: no-cache');
+
+    // Set the response format.
+    header('Content-Type: text/xml; charset=utf-8');
 }
 
 /**
@@ -57,18 +57,18 @@ 
  */
 function CreateXmlHeader( $command, $resourceType, $currentFolder )
 {
-	SetXmlHeaders();
+    SetXmlHeaders();
 
-	// Create the XML document header.
-	echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+    // Create the XML document header.
+    echo '<?xml version="1.0" encoding="utf-8" ?>' ;
 
-	// Create the main "Connector" node.
-	echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
+    // Create the main "Connector" node.
+    echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
 
-	// Add the current folder node.
-	echo '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)) . '" />' ;
+    // Add the current folder node.
+    echo '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)) . '" />' ;
 
-	$GLOBALS['HeaderSent'] = true ;
+    $GLOBALS['HeaderSent'] = true ;
 }
 
 /**
@@ -78,7 +78,7 @@ 
  */
 function CreateXmlFooter()
 {
-	echo '</Connector>' ;
+    echo '</Connector>' ;
 }
 
 /**
@@ -90,30 +90,30 @@ 
  */
 function SendError($number, $text)
 {
-	if ( $_GET['Command'] == 'FileUpload' )
-		SendUploadResults($number, "", "", $text);
-
-	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
-	{
-		SendErrorNode($number, $text);
-		CreateXmlFooter();
-	}
-	else
-	{
-		SetXmlHeaders();
-
-		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
+    if ( $_GET['Command'] == 'FileUpload' )
+        SendUploadResults($number, "", "", $text);
+
+    if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
+    {
+        SendErrorNode($number, $text);
+        CreateXmlFooter();
+    }
+    else
+    {
+        SetXmlHeaders();
+
+        dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
 		
-		// Create the XML document header
-		echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+        // Create the XML document header
+        echo '<?xml version="1.0" encoding="utf-8" ?>' ;
 
-		echo '<Connector>' ;
+        echo '<Connector>' ;
 
-		SendErrorNode($number, $text);
+        SendErrorNode($number, $text);
 
-		echo '</Connector>' ;
-	}
-	exit ;
+        echo '</Connector>' ;
+    }
+    exit ;
 }
 
 /**
@@ -125,8 +125,8 @@ 
  */
 function SendErrorNode($number, $text)
 {
-	if ($text)
-		echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
-	else
-		echo '<Error number="' . $number . '" />' ;
+    if ($text)
+        echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
+    else
+        echo '<Error number="' . $number . '" />' ;
 }

dolibarr/htdocs/core/filemanagerdol/connectors/php/connector.php

Indentation +37 added lines, -37 removed lines

@@ -31,7 +31,7 @@ 
 require 'commands.php';
 
 if ( !$Config['Enabled'] )
-	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
+    SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
 
 DoResponse();
 
@@ -45,47 +45,47 @@ 
     if (!isset($_GET)) {
         global $_GET;
     }
-	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
-		return;
+    if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
+        return;
 
-	// Get the main request informaiton.
-	$sCommand		= $_GET['Command'] ;
-	$sResourceType	= $_GET['Type'] ;
-	$sCurrentFolder	= GetCurrentFolder();
+    // Get the main request informaiton.
+    $sCommand		= $_GET['Command'] ;
+    $sResourceType	= $_GET['Type'] ;
+    $sCurrentFolder	= GetCurrentFolder();
 
-	// Check if it is an allowed command
-	if (! IsAllowedCommand($sCommand))
-	{
-		SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
-	}
-	// Check if it is an allowed type.
-	if (! IsAllowedType($sResourceType))
-		SendError(1, 'Invalid type specified');
+    // Check if it is an allowed command
+    if (! IsAllowedCommand($sCommand))
+    {
+        SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
+    }
+    // Check if it is an allowed type.
+    if (! IsAllowedType($sResourceType))
+        SendError(1, 'Invalid type specified');
 
-	// File Upload doesn't have to Return XML, so it must be intercepted before anything.
-	if ( $sCommand == 'FileUpload' )
-	{
-		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
-		return;
-	}
+    // File Upload doesn't have to Return XML, so it must be intercepted before anything.
+    if ( $sCommand == 'FileUpload' )
+    {
+        FileUpload($sResourceType, $sCurrentFolder, $sCommand);
+        return;
+    }
 
-	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
+    CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
 
-	// Execute the required command.
-	switch ( $sCommand )
-	{
-		case 'GetFolders' :
-			GetFolders($sResourceType, $sCurrentFolder);
-			break;
-		case 'GetFoldersAndFiles' :
-			GetFoldersAndFiles($sResourceType, $sCurrentFolder);
-			break;
-		case 'CreateFolder' :
-			CreateFolder($sResourceType, $sCurrentFolder);
-			break;
-	}
+    // Execute the required command.
+    switch ( $sCommand )
+    {
+        case 'GetFolders' :
+            GetFolders($sResourceType, $sCurrentFolder);
+            break;
+        case 'GetFoldersAndFiles' :
+            GetFoldersAndFiles($sResourceType, $sCurrentFolder);
+            break;
+        case 'CreateFolder' :
+            CreateFolder($sResourceType, $sCurrentFolder);
+            break;
+    }
 
-	CreateXmlFooter();
+    CreateXmlFooter();
 
-	exit;
+    exit;
 }

dolibarr/htdocs/core/filemanagerdol/connectors/php/upload.php

Indentation +3 added lines, -3 removed lines

@@ -36,13 +36,13 @@ 
  */
 function SendError($number, $text)
 {
-	SendUploadResults($number, '', '', $text);
+    SendUploadResults($number, '', '', $text);
 }
 
 
 // Check if this uploader has been enabled.
 if ( !$Config['Enabled'] )
-	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
+    SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
 
 $sCommand = 'QuickUpload' ;
 
@@ -53,7 +53,7 @@ 
 
 // Is enabled the upload?
 if (! IsAllowedCommand($sCommand))
-	SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
+    SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
 
 // Check if it is an allowed type.
 if (! IsAllowedType($sType))

dolibarr/htdocs/core/filemanagerdol/connectors/php/io.php

Indentation +162 added lines, -162 removed lines

@@ -31,7 +31,7 @@ 
  */
 function CombinePaths( $sBasePath, $sFolder )
 {
-	return RemoveFromEnd($sBasePath, '/') . '/' . RemoveFromStart($sFolder, '/');
+    return RemoveFromEnd($sBasePath, '/') . '/' . RemoveFromStart($sFolder, '/');
 }
 /**
  * GetResourceTypePath
@@ -42,12 +42,12 @@ 
  */
 function GetResourceTypePath($resourceType, $sCommand)
 {
-	global $Config ;
+    global $Config ;
 
-	if ($sCommand == "QuickUpload")
-		return $Config['QuickUploadPath'][$resourceType] ;
-	else
-		return $Config['FileTypesPath'][$resourceType] ;
+    if ($sCommand == "QuickUpload")
+        return $Config['QuickUploadPath'][$resourceType] ;
+    else
+        return $Config['FileTypesPath'][$resourceType] ;
 }
 
 /**
@@ -59,23 +59,23 @@ 
  */
 function GetResourceTypeDirectory($resourceType, $sCommand)
 {
-	global $Config ;
-	if ($sCommand == "QuickUpload")
-	{
-		if ( strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
-			return $Config['QuickUploadAbsolutePath'][$resourceType] ;
-
-		// Map the "UserFiles" path to a local directory.
-		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	}
-	else
-	{
-		if ( strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
-			return $Config['FileTypesAbsolutePath'][$resourceType] ;
-
-		// Map the "UserFiles" path to a local directory.
-		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
-	}
+    global $Config ;
+    if ($sCommand == "QuickUpload")
+    {
+        if ( strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
+            return $Config['QuickUploadAbsolutePath'][$resourceType] ;
+
+        // Map the "UserFiles" path to a local directory.
+        return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
+    }
+    else
+    {
+        if ( strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
+            return $Config['FileTypesAbsolutePath'][$resourceType] ;
+
+        // Map the "UserFiles" path to a local directory.
+        return Server_MapPath($Config['FileTypesPath'][$resourceType]);
+    }
 }
 
 /**
@@ -88,7 +88,7 @@ 
  */
 function GetUrlFromPath($resourceType, $folderPath, $sCommand)
 {
-	return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
+    return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
 }
 
 /**
@@ -99,7 +99,7 @@ 
  */
 function RemoveExtension($fileName)
 {
-	return substr($fileName, 0, strrpos($fileName, '.'));
+    return substr($fileName, 0, strrpos($fileName, '.'));
 }
 /**
  * ServerMapFolder
@@ -111,16 +111,16 @@ 
  */
 function ServerMapFolder($resourceType, $folderPath, $sCommand)
 {
-	// Get the resource type directory.
-	$sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
+    // Get the resource type directory.
+    $sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
 
-	// Ensure that the directory exists.
-	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ( $sErrorMsg != '' )
-		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+    // Ensure that the directory exists.
+    $sErrorMsg = CreateServerFolder($sResourceTypePath);
+    if ( $sErrorMsg != '' )
+        SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
 
-	// Return the resource type directory combined with the required path.
-	return CombinePaths($sResourceTypePath, $folderPath);
+    // Return the resource type directory combined with the required path.
+    return CombinePaths($sResourceTypePath, $folderPath);
 }
 
 /**
@@ -144,67 +144,67 @@ 
  */
 function CreateServerFolder($folderPath, $lastFolder = null)
 {
-	global $Config ;
-	$sParent = GetParentFolder($folderPath);
-
-	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
-	while ( strpos($folderPath, '//') !== false )
-	{
-		$folderPath = str_replace('//', '/', $folderPath);
-	}
-
-	// Check if the parent exists, or create it.
-	if ( !empty($sParent) && !file_exists($sParent))
-	{
-		//prevents agains infinite loop when we can't create root folder
-		if ( !is_null($lastFolder) && $lastFolder === $sParent) {
-			return "Can't create $folderPath directory" ;
-		}
-
-		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ( $sErrorMsg != '' )
-			return $sErrorMsg ;
-	}
-
-	if ( !file_exists($folderPath))
-	{
-		// Turn off all error reporting.
-		error_reporting(0);
-
-		$php_errormsg = '' ;
-		// Enable error tracking to catch the error.
-		ini_set('track_errors', '1');
-
-		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
-		{
-			mkdir($folderPath);
-		}
-		else
-		{
-			$permissions = '0777';
-			if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
-			{
-				$permissions = (string) $Config['ChmodOnFolderCreate'];
-			}
-			$permissionsdec = octdec($permissions);
-			$permissionsdec |= octdec('0111');  // Set x bit required for directories
-			dol_syslog("io.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
-			// To create the folder with 0777 permissions, we need to set umask to zero.
-			$oldumask = umask(0);
-			mkdir($folderPath, $permissionsdec);
-			umask($oldumask);
-		}
-
-		$sErrorMsg = $php_errormsg ;
-
-		// Restore the configurations.
-		ini_restore('track_errors');
-		ini_restore('error_reporting');
-
-		return $sErrorMsg ;
-	}
-	else
-		return '' ;
+    global $Config ;
+    $sParent = GetParentFolder($folderPath);
+
+    // Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
+    while ( strpos($folderPath, '//') !== false )
+    {
+        $folderPath = str_replace('//', '/', $folderPath);
+    }
+
+    // Check if the parent exists, or create it.
+    if ( !empty($sParent) && !file_exists($sParent))
+    {
+        //prevents agains infinite loop when we can't create root folder
+        if ( !is_null($lastFolder) && $lastFolder === $sParent) {
+            return "Can't create $folderPath directory" ;
+        }
+
+        $sErrorMsg = CreateServerFolder($sParent, $folderPath);
+        if ( $sErrorMsg != '' )
+            return $sErrorMsg ;
+    }
+
+    if ( !file_exists($folderPath))
+    {
+        // Turn off all error reporting.
+        error_reporting(0);
+
+        $php_errormsg = '' ;
+        // Enable error tracking to catch the error.
+        ini_set('track_errors', '1');
+
+        if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
+        {
+            mkdir($folderPath);
+        }
+        else
+        {
+            $permissions = '0777';
+            if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'])
+            {
+                $permissions = (string) $Config['ChmodOnFolderCreate'];
+            }
+            $permissionsdec = octdec($permissions);
+            $permissionsdec |= octdec('0111');  // Set x bit required for directories
+            dol_syslog("io.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
+            // To create the folder with 0777 permissions, we need to set umask to zero.
+            $oldumask = umask(0);
+            mkdir($folderPath, $permissionsdec);
+            umask($oldumask);
+        }
+
+        $sErrorMsg = $php_errormsg ;
+
+        // Restore the configurations.
+        ini_restore('track_errors');
+        ini_restore('error_reporting');
+
+        return $sErrorMsg ;
+    }
+    else
+        return '' ;
 }
 
 /**
@@ -260,18 +260,18 @@ 
  */
 function IsAllowedExt($sExtension, $resourceType)
 {
-	global $Config ;
-	// Get the allowed and denied extensions arrays.
-	$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
-	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
+    global $Config ;
+    // Get the allowed and denied extensions arrays.
+    $arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
+    $arDenied	= $Config['DeniedExtensions'][$resourceType] ;
 
-	if ( count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
-		return false ;
+    if ( count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
+        return false ;
 
-	if ( count($arDenied) > 0 && in_array($sExtension, $arDenied))
-		return false ;
+    if ( count($arDenied) > 0 && in_array($sExtension, $arDenied))
+        return false ;
 
-	return true ;
+    return true ;
 }
 
 /**
@@ -282,11 +282,11 @@ 
  */
 function IsAllowedType($resourceType)
 {
-	global $Config ;
-	if ( !in_array($resourceType, $Config['ConfigAllowedTypes']))
-		return false ;
+    global $Config ;
+    if ( !in_array($resourceType, $Config['ConfigAllowedTypes']))
+        return false ;
 
-	return true ;
+    return true ;
 }
 
 /**
@@ -297,12 +297,12 @@ 
  */
 function IsAllowedCommand($sCommand)
 {
-	global $Config ;
+    global $Config ;
 
-	if (! in_array($sCommand, $Config['ConfigAllowedCommands']))
-		return false ;
+    if (! in_array($sCommand, $Config['ConfigAllowedCommands']))
+        return false ;
 
-	return true ;
+    return true ;
 }
 
 /**
@@ -312,79 +312,79 @@ 
  */
 function GetCurrentFolder()
 {
-	if (!isset($_GET)) {
-		global $_GET;
-	}
-	$sCurrentFolder	= isset( $_GET['CurrentFolder'] ) ? GETPOST('CurrentFolder', '', 1) : '/' ;
-
-	// Check the current folder syntax (must begin and start with a slash).
-	if (!preg_match('|/$|', $sCurrentFolder))
-		$sCurrentFolder .= '/' ;
-	if (strpos($sCurrentFolder, '/') !== 0)
-		$sCurrentFolder = '/' . $sCurrentFolder ;
-
-	// Ensure the folder path has no double-slashes
-	while ( strpos($sCurrentFolder, '//') !== false ) {
-		$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
-	}
-
-	// Check for invalid folder paths (..)
-	if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
-		SendError(102, '');
-
-	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
-		SendError(102, '');
-
-	return $sCurrentFolder ;
+    if (!isset($_GET)) {
+        global $_GET;
+    }
+    $sCurrentFolder	= isset( $_GET['CurrentFolder'] ) ? GETPOST('CurrentFolder', '', 1) : '/' ;
+
+    // Check the current folder syntax (must begin and start with a slash).
+    if (!preg_match('|/$|', $sCurrentFolder))
+        $sCurrentFolder .= '/' ;
+    if (strpos($sCurrentFolder, '/') !== 0)
+        $sCurrentFolder = '/' . $sCurrentFolder ;
+
+    // Ensure the folder path has no double-slashes
+    while ( strpos($sCurrentFolder, '//') !== false ) {
+        $sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
+    }
+
+    // Check for invalid folder paths (..)
+    if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
+        SendError(102, '');
+
+    if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+        SendError(102, '');
+
+    return $sCurrentFolder ;
 }
 
 // Do a cleanup of the folder name to avoid possible problems
 function SanitizeFolderName( $sNewFolderName )
 {
-	$sNewFolderName = stripslashes($sNewFolderName);
+    $sNewFolderName = stripslashes($sNewFolderName);
 
-	// Remove . \ / | : ? * " < >
-	$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
+    // Remove . \ / | : ? * " < >
+    $sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
 
-	return $sNewFolderName ;
+    return $sNewFolderName ;
 }
 
 // Do a cleanup of the file name to avoid possible problems
 function SanitizeFileName( $sNewFileName )
 {
-	global $Config ;
+    global $Config ;
 
-	$sNewFileName = stripslashes($sNewFileName);
+    $sNewFileName = stripslashes($sNewFileName);
 
-	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ( $Config['ForceSingleExtension'] )
-		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+    // Replace dots in the name with underscores (only one dot can be there... security issue).
+    if ( $Config['ForceSingleExtension'] )
+        $sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
 
-	// Remove \ / | : ? * " < >
-	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
+    // Remove \ / | : ? * " < >
+    $sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
 
-	return $sNewFileName ;
+    return $sNewFileName ;
 }
 
 // This is the function that sends the results of the uploading process.
 function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
 {
-	// Minified version of the document.domain automatic fix script (#1919).
-	// The original script can be found at _dev/domain_fix_template.js
-	echo <<<EOF
+    // Minified version of the document.domain automatic fix script (#1919).
+    // The original script can be found at _dev/domain_fix_template.js
+    echo <<<EOF
 <script type="text/javascript">
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 EOF;
 
-	if ($errorNumber && $errorNumber != 201) {
-		$fileUrl = "";
-		$fileName = "";
-	}
+    if ($errorNumber && $errorNumber != 201) {
+        $fileUrl = "";
+        $fileName = "";
+    }
 
-	$rpl = array( '\\' => '\\\\', '"' => '\\"' );
-	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr($fileUrl, $rpl) . '","' . strtr($fileName, $rpl) . '", "' . strtr($customMsg, $rpl) . '");' ;
-	echo '</script>' ;
-	exit ;
+    $rpl = array( '\\' => '\\\\', '"' => '\\"' );
+    echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr($fileUrl, $rpl) . '","' . strtr($fileName, $rpl) . '", "' . strtr($customMsg, $rpl) . '");' ;
+    echo '</script>' ;
+    exit ;
 }
 
 
@@ -401,11 +401,11 @@ 
  */
 function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
-  echo '<script type="text/javascript">';
+    echo '<script type="text/javascript">';
 
-  $rpl = array( '\\' => '\\\\', '"' => '\\"' );
+    $rpl = array( '\\' => '\\\\', '"' => '\\"' );
 
-  echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'. strtr($sFileUrl, $rpl). '", "'. strtr($customMsg, $rpl). '");' ;
+    echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'. strtr($sFileUrl, $rpl). '", "'. strtr($customMsg, $rpl). '");' ;
 
-  echo '</script>';
+    echo '</script>';
 }

dolibarr/htdocs/core/filemanagerdol/connectors/php/commands.php

Indentation +246 added lines, -246 removed lines

@@ -31,33 +31,33 @@ 
  */
 function GetFolders($resourceType, $currentFolder)
 {
-	// Map the virtual path to the local server path.
-	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
+    // Map the virtual path to the local server path.
+    $sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
 
-	// Array that will hold the folders names.
-	$aFolders	= array();
+    // Array that will hold the folders names.
+    $aFolders	= array();
 
-	$oCurrentFolder = @opendir($sServerDir);
+    $oCurrentFolder = @opendir($sServerDir);
 
-	if ($oCurrentFolder !== false)
-	{
-		while ( $sFile = readdir($oCurrentFolder) )
-		{
-			if ( $sFile != '.' && $sFile != '..' && is_dir($sServerDir . $sFile) )
-				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
-		}
-		closedir($oCurrentFolder);
-	}
+    if ($oCurrentFolder !== false)
+    {
+        while ( $sFile = readdir($oCurrentFolder) )
+        {
+            if ( $sFile != '.' && $sFile != '..' && is_dir($sServerDir . $sFile) )
+                $aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+        }
+        closedir($oCurrentFolder);
+    }
 
-	// Open the "Folders" node.
-	echo "<Folders>" ;
+    // Open the "Folders" node.
+    echo "<Folders>" ;
 
-	natcasesort($aFolders);
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
+    natcasesort($aFolders);
+    foreach ( $aFolders as $sFolder )
+        echo $sFolder ;
 
-	// Close the "Folders" node.
-	echo "</Folders>" ;
+    // Close the "Folders" node.
+    echo "</Folders>" ;
 }
 
 /**
@@ -69,60 +69,60 @@ 
  */
 function GetFoldersAndFiles( $resourceType, $currentFolder )
 {
-	// Map the virtual path to the local server path.
-	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
-
-	// Arrays that will hold the folders and files names.
-	$aFolders	= array();
-	$aFiles		= array();
-
-	$oCurrentFolder = @opendir($sServerDir);
-
-	if ($oCurrentFolder !== false)
-	{
-		while ( $sFile = readdir($oCurrentFolder) )
-		{
-			if ( $sFile != '.' && $sFile != '..' )
-			{
-				if ( is_dir($sServerDir . $sFile) )
-					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
-				else
-				{
-					$iFileSize = @filesize($sServerDir . $sFile);
-					if ( !$iFileSize ) {
-						$iFileSize = 0 ;
-					}
-					if ( $iFileSize > 0 )
-					{
-						$iFileSize = round($iFileSize / 1024);
-						if ( $iFileSize < 1 )
-							$iFileSize = 1 ;
-					}
-
-					$aFiles[] = '<File name="' . ConvertToXmlAttribute($sFile) . '" size="' . $iFileSize . '" />' ;
-				}
-			}
-		}
-		closedir($oCurrentFolder);
-	}
-
-	// Send the folders
-	natcasesort($aFolders);
-	echo '<Folders>' ;
-
-	foreach ( $aFolders as $sFolder )
-		echo $sFolder ;
-
-	echo '</Folders>' ;
-
-	// Send the files
-	natcasesort($aFiles);
-	echo '<Files>' ;
-
-	foreach ( $aFiles as $sFiles )
-		echo $sFiles ;
-
-	echo '</Files>' ;
+    // Map the virtual path to the local server path.
+    $sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
+
+    // Arrays that will hold the folders and files names.
+    $aFolders	= array();
+    $aFiles		= array();
+
+    $oCurrentFolder = @opendir($sServerDir);
+
+    if ($oCurrentFolder !== false)
+    {
+        while ( $sFile = readdir($oCurrentFolder) )
+        {
+            if ( $sFile != '.' && $sFile != '..' )
+            {
+                if ( is_dir($sServerDir . $sFile) )
+                    $aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+                else
+                {
+                    $iFileSize = @filesize($sServerDir . $sFile);
+                    if ( !$iFileSize ) {
+                        $iFileSize = 0 ;
+                    }
+                    if ( $iFileSize > 0 )
+                    {
+                        $iFileSize = round($iFileSize / 1024);
+                        if ( $iFileSize < 1 )
+                            $iFileSize = 1 ;
+                    }
+
+                    $aFiles[] = '<File name="' . ConvertToXmlAttribute($sFile) . '" size="' . $iFileSize . '" />' ;
+                }
+            }
+        }
+        closedir($oCurrentFolder);
+    }
+
+    // Send the folders
+    natcasesort($aFolders);
+    echo '<Folders>' ;
+
+    foreach ( $aFolders as $sFolder )
+        echo $sFolder ;
+
+    echo '</Folders>' ;
+
+    // Send the files
+    natcasesort($aFiles);
+    echo '<Files>' ;
+
+    foreach ( $aFiles as $sFiles )
+        echo $sFiles ;
+
+    echo '</Files>' ;
 }
 
 /**
@@ -134,53 +134,53 @@ 
  */
 function CreateFolder( $resourceType, $currentFolder )
 {
-	if (!isset($_GET)) {
-		global $_GET;
-	}
-	$sErrorNumber	= '0' ;
-	$sErrorMsg		= '' ;
-
-	if ( isset( $_GET['NewFolderName'] ) )
-	{
-		$sNewFolderName = $_GET['NewFolderName'] ;
-		$sNewFolderName = SanitizeFolderName($sNewFolderName);
-
-		if (strpos($sNewFolderName, '..') !== false)
-			$sErrorNumber = '102' ;		// Invalid folder name.
-		else
-		{
-			// Map the virtual path to the local server path of the current folder.
-			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
-
-			if ( is_writable($sServerDir) )
-			{
-				$sServerDir .= $sNewFolderName ;
-
-				$sErrorMsg = CreateServerFolder($sServerDir);
-
-				switch ( $sErrorMsg )
-				{
-					case '':
-						$sErrorNumber = '0' ;
-						break;
-					case 'Invalid argument' :
-					case 'No such file or directory' :
-						$sErrorNumber = '102' ;		// Path too long.
-						break ;
-					default:
-						$sErrorNumber = '110' ;
-						break ;
-				}
-			}
-			else
-				$sErrorNumber = '103' ;
-		}
-	}
-	else
-		$sErrorNumber = '102' ;
-
-	// Create the "Error" node.
-	echo '<Error number="' . $sErrorNumber . '" />' ;
+    if (!isset($_GET)) {
+        global $_GET;
+    }
+    $sErrorNumber	= '0' ;
+    $sErrorMsg		= '' ;
+
+    if ( isset( $_GET['NewFolderName'] ) )
+    {
+        $sNewFolderName = $_GET['NewFolderName'] ;
+        $sNewFolderName = SanitizeFolderName($sNewFolderName);
+
+        if (strpos($sNewFolderName, '..') !== false)
+            $sErrorNumber = '102' ;		// Invalid folder name.
+        else
+        {
+            // Map the virtual path to the local server path of the current folder.
+            $sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
+
+            if ( is_writable($sServerDir) )
+            {
+                $sServerDir .= $sNewFolderName ;
+
+                $sErrorMsg = CreateServerFolder($sServerDir);
+
+                switch ( $sErrorMsg )
+                {
+                    case '':
+                        $sErrorNumber = '0' ;
+                        break;
+                    case 'Invalid argument' :
+                    case 'No such file or directory' :
+                        $sErrorNumber = '102' ;		// Path too long.
+                        break ;
+                    default:
+                        $sErrorNumber = '110' ;
+                        break ;
+                }
+            }
+            else
+                $sErrorNumber = '103' ;
+        }
+    }
+    else
+        $sErrorNumber = '102' ;
+
+    // Create the "Error" node.
+    echo '<Error number="' . $sErrorNumber . '" />' ;
 }
 
 // @CHANGE
@@ -196,134 +196,134 @@ 
  */
 function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 {
-	if (!isset($_FILES)) {
-		global $_FILES;
-	}
-	$sErrorNumber = '0' ;
-	$sFileName = '' ;
-
-	if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name'])
-       // This is for the QuickUpload tab box
+    if (!isset($_FILES)) {
+        global $_FILES;
+    }
+    $sErrorNumber = '0' ;
+    $sFileName = '' ;
+
+    if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name'])
+        // This is for the QuickUpload tab box
         or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
-	{
-		global $Config ;
-
-		$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
-
-		// Map the virtual path to the local server path.
-		$sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
-
-		// Get the uploaded file name.
-		$sFileName = $oFile['name'] ;
-		$sFileName = SanitizeFileName($sFileName);
-
-		$sOriginalFileName = $sFileName ;
-
-		// Get the extension.
-		$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
-		$sExtension = strtolower($sExtension);
-
-		if ( isset( $Config['SecureImageUploads'] ) )
-		{
-			if ( ( $isImageValid = IsImageValid($oFile['tmp_name'], $sExtension) ) === false )
-			{
-				$sErrorNumber = '202' ;
-			}
-		}
-
-		if ( isset( $Config['HtmlExtensions'] ) )
-		{
-			if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
-				($detectHtml = DetectHtml($oFile['tmp_name'])) === true)
-			{
-				$sErrorNumber = '202' ;
-			}
-		}
-
-		// Check if it is an allowed extension.
-		if ( !$sErrorNumber && IsAllowedExt($sExtension, $resourceType) )
-		{
-			$iCounter = 0 ;
-
-			while ( true )
-			{
-				$sFilePath = $sServerDir . $sFileName ;
-
-				if ( is_file($sFilePath) )
-				{
-					$iCounter++ ;
-					$sFileName = RemoveExtension($sOriginalFileName) . '(' . $iCounter . ').' . $sExtension ;
-					$sErrorNumber = '201' ;
-				}
-				else
-				{
-					move_uploaded_file($oFile['tmp_name'], $sFilePath);
-
-					if ( is_file($sFilePath) )
-					{
-						if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
-						{
-							break ;
-						}
-
-						$permissions = '0777';
-						if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
-						{
-							$permissions = (string) $Config['ChmodOnUpload'] ;
-						}
-						$permissionsdec = octdec($permissions);
-						dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
-						$oldumask = umask(0);
-						chmod($sFilePath, $permissionsdec);
-						umask($oldumask);
-					}
-
-					break ;
-				}
-			}
-
-			if ( file_exists($sFilePath) )
-			{
-				//previous checks failed, try once again
-				if ( isset( $isImageValid ) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false )
-				{
-					@unlink($sFilePath);
-					$sErrorNumber = '202' ;
-				}
-				else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
-				{
-					@unlink($sFilePath);
-					$sErrorNumber = '202' ;
-				}
-			}
-		}
-		else
-			$sErrorNumber = '202' ;
-	}
-	else
-		$sErrorNumber = '202' ;
-
-
-	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
-	$sFileUrl = CombinePaths($sFileUrl, $sFileName);
-
-
-	// @CHANGE
-	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
-	if($CKEcallback == '')
+    {
+        global $Config ;
+
+        $oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
+
+        // Map the virtual path to the local server path.
+        $sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
+
+        // Get the uploaded file name.
+        $sFileName = $oFile['name'] ;
+        $sFileName = SanitizeFileName($sFileName);
+
+        $sOriginalFileName = $sFileName ;
+
+        // Get the extension.
+        $sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
+        $sExtension = strtolower($sExtension);
+
+        if ( isset( $Config['SecureImageUploads'] ) )
+        {
+            if ( ( $isImageValid = IsImageValid($oFile['tmp_name'], $sExtension) ) === false )
+            {
+                $sErrorNumber = '202' ;
+            }
+        }
+
+        if ( isset( $Config['HtmlExtensions'] ) )
+        {
+            if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
+                ($detectHtml = DetectHtml($oFile['tmp_name'])) === true)
+            {
+                $sErrorNumber = '202' ;
+            }
+        }
+
+        // Check if it is an allowed extension.
+        if ( !$sErrorNumber && IsAllowedExt($sExtension, $resourceType) )
+        {
+            $iCounter = 0 ;
+
+            while ( true )
+            {
+                $sFilePath = $sServerDir . $sFileName ;
+
+                if ( is_file($sFilePath) )
+                {
+                    $iCounter++ ;
+                    $sFileName = RemoveExtension($sOriginalFileName) . '(' . $iCounter . ').' . $sExtension ;
+                    $sErrorNumber = '201' ;
+                }
+                else
+                {
+                    move_uploaded_file($oFile['tmp_name'], $sFilePath);
+
+                    if ( is_file($sFilePath) )
+                    {
+                        if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
+                        {
+                            break ;
+                        }
+
+                        $permissions = '0777';
+                        if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
+                        {
+                            $permissions = (string) $Config['ChmodOnUpload'] ;
+                        }
+                        $permissionsdec = octdec($permissions);
+                        dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
+                        $oldumask = umask(0);
+                        chmod($sFilePath, $permissionsdec);
+                        umask($oldumask);
+                    }
+
+                    break ;
+                }
+            }
+
+            if ( file_exists($sFilePath) )
+            {
+                //previous checks failed, try once again
+                if ( isset( $isImageValid ) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false )
+                {
+                    @unlink($sFilePath);
+                    $sErrorNumber = '202' ;
+                }
+                else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
+                {
+                    @unlink($sFilePath);
+                    $sErrorNumber = '202' ;
+                }
+            }
+        }
+        else
+            $sErrorNumber = '202' ;
+    }
+    else
+        $sErrorNumber = '202' ;
+
+
+    $sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
+    $sFileUrl = CombinePaths($sFileUrl, $sFileName);
+
+
+    // @CHANGE
+    //SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
+    if($CKEcallback == '')
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
     }
     else
-	{
-	    //issue the CKEditor Callback
-		SendCKEditorResults(
-			$CKEcallback,
-			$sFileUrl,
-			($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
-    	);
-	}
-
-	exit;
+    {
+        //issue the CKEditor Callback
+        SendCKEditorResults(
+            $CKEcallback,
+            $sFileUrl,
+            ($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
+        );
+    }
+
+    exit;
 }

dolibarr/htdocs/core/filemanagerdol/connectors/php/util.php

Indentation +117 added lines, -117 removed lines

@@ -31,8 +31,8 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|^' . $charToRemove . '+|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -44,8 +44,8 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|' . $charToRemove . '+$|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -56,24 +56,24 @@ 
  */
 function FindBadUtf8($string)
 {
-	$regex = '([\x00-\x7F]'.
-	'|[\xC2-\xDF][\x80-\xBF]'.
-	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
-	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
-	'|\xED[\x80-\x9F][\x80-\xBF]'.
-	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
-	'|[\xF1-\xF3][\x80-\xBF]{3}'.
-	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
-	'|(.{1}))';
-
-	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
-			return true;
-		}
-		$string = substr($string, strlen($matches[0]));
-	}
-
-	return false;
+    $regex = '([\x00-\x7F]'.
+    '|[\xC2-\xDF][\x80-\xBF]'.
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+    '|\xED[\x80-\x9F][\x80-\xBF]'.
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+    '|(.{1}))';
+
+    while (preg_match('/'.$regex.'/S', $string, $matches)) {
+        if ( isset($matches[2])) {
+            return true;
+        }
+        $string = substr($string, strlen($matches[0]));
+    }
+
+    return false;
 }
 
 /**
@@ -84,23 +84,23 @@ 
  */
 function ConvertToXmlAttribute( $value )
 {
-	if ( defined('PHP_OS') )
-	{
-		$os = PHP_OS ;
-	}
-	else
-	{
-		$os = php_uname();
-	}
-
-	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
-	{
-		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
-	{
-		return (htmlspecialchars($value));
-	}
+    if ( defined('PHP_OS') )
+    {
+        $os = PHP_OS ;
+    }
+    else
+    {
+        $os = php_uname();
+    }
+
+    if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
+    {
+        return (utf8_encode(htmlspecialchars($value)));
+    }
+    else
+    {
+        return (htmlspecialchars($value));
+    }
 }
 
 /**
@@ -112,16 +112,16 @@ 
  */
 function IsHtmlExtension( $ext, $formExtensions )
 {
-	if (!$formExtensions || !is_array($formExtensions) )
-	{
-		return false ;
-	}
-	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
-	{
-		$lcaseHtmlExtensions[$key] = strtolower($val);
-	}
-	return in_array($ext, $lcaseHtmlExtensions);
+    if (!$formExtensions || !is_array($formExtensions) )
+    {
+        return false ;
+    }
+    $lcaseHtmlExtensions = array();
+    foreach ( $formExtensions as $key => $val )
+    {
+        $lcaseHtmlExtensions[$key] = strtolower($val);
+    }
+    return in_array($ext, $lcaseHtmlExtensions);
 }
 
 /**
@@ -134,63 +134,63 @@ 
  */
 function DetectHtml( $filePath )
 {
-	$fp = @fopen($filePath, 'rb');
-
-	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
-	{
-		return -1 ;
-	}
-
-	$chunk = fread($fp, 1024);
-	flock($fp, LOCK_UN);
-	fclose($fp);
-
-	$chunk = strtolower($chunk);
-
-	if (!$chunk)
-	{
-		return false ;
-	}
-
-	$chunk = trim($chunk);
-
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
-	{
-		return true;
-	}
-
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
-
-	foreach( $tags as $tag )
-	{
-		if( false !== strpos($chunk, $tag) )
-		{
-			return true ;
-		}
-	}
-
-	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//href = javascript
-	//src = javascript
-	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	return false ;
+    $fp = @fopen($filePath, 'rb');
+
+    //open_basedir restriction, see #1906
+    if ( $fp === false || !flock($fp, LOCK_SH) )
+    {
+        return -1 ;
+    }
+
+    $chunk = fread($fp, 1024);
+    flock($fp, LOCK_UN);
+    fclose($fp);
+
+    $chunk = strtolower($chunk);
+
+    if (!$chunk)
+    {
+        return false ;
+    }
+
+    $chunk = trim($chunk);
+
+    if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+    {
+        return true;
+    }
+
+    $tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+
+    foreach( $tags as $tag )
+    {
+        if( false !== strpos($chunk, $tag) )
+        {
+            return true ;
+        }
+    }
+
+    //type = javascript
+    if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //href = javascript
+    //src = javascript
+    //data = javascript
+    if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //url(javascript
+    if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    return false ;
 }
 
 /**
@@ -204,11 +204,11 @@ 
  */
 function IsImageValid( $filePath, $extension )
 {
-	if (!@is_readable($filePath)) {
-		return -1;
-	}
+    if (!@is_readable($filePath)) {
+        return -1;
+    }
 
-	$imageCheckExtensions = array(
+    $imageCheckExtensions = array(
         'gif',
         'jpeg',
         'jpg',
@@ -228,14 +228,14 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
-		return true;
-	}
+    if (!in_array($extension, $imageCheckExtensions) ) {
+        return true;
+    }
 
-	if (@getimagesize($filePath) === false) {
-		return false ;
-	}
+    if (@getimagesize($filePath) === false) {
+        return false ;
+    }
 
-	return true;
+    return true;
 }