Dolibarr / dolibarr

htdocs/main.inc.php

Indentation +2 added lines, -2 removed lines

@@ -568,8 +568,8 @@
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('beforeLoginAuthentication', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) {
-		    $test = false;
-		    $error++;
+			$test = false;
+			$error++;
 		}
 
 		// Verification security graphic code

htdocs/core/modules/modStock.class.php

Indentation +4 added lines, -4 removed lines

@@ -380,9 +380,9 @@ 
 				'e.phone'=>'(+33)(0)123456789',
 				'e.fax'=>'(+33)(0)123456790',
 				'e.statut'=>'1',
-                'e.fk_parent'=>'id or ref of warehouse'
-        );
-        $this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+				'e.fk_parent'=>'id or ref of warehouse'
+		);
+		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
 
 		// Import stocks
 		$r++;
@@ -398,7 +398,7 @@ 
 			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-		    'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
+			'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.

htdocs/exports/export.php

Indentation +25 added lines, -25 removed lines

@@ -54,14 +54,14 @@ 
 	'subscription' => 'payment',
 	'payment'      => 'payment',
 	'tax'          => 'generic',
-    'tax_type'     => 'generic',
-    'other'        => 'generic',
+	'tax_type'     => 'generic',
+	'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
 	'virtualproduct'=>'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
-    'stock'        => 'stock',
+	'stock'        => 'stock',
 	'warehouse'    => 'stock',
 	'batch'        => 'stock',
 	'stockbatch'   => 'stock',
@@ -505,14 +505,14 @@ 
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
-    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
@@ -888,14 +888,14 @@ 
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
 	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
 	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	// List of exported fields
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
@@ -1156,14 +1156,14 @@ 
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Dataset to export
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
-    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	// Dataset to export
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	// List of exported fields
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';

htdocs/user/passwordforgotten.php

Indentation +87 added lines, -87 removed lines

@@ -67,96 +67,96 @@
 $parameters = array('username' => $username);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
-    $message = $hookmanager->error;
+	$message = $hookmanager->error;
 }
 
 if (empty($reshook)) {
-    // Validate new password
-    if ($action == 'validatenewpassword' && $username && $passwordhash)
-    {
-        $edituser = new User($db);
-        $result = $edituser->fetch('', $_GET["username"]);
-        if ($result < 0)
-        {
-            $message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
-        } else {
-            if (dol_verifyHash($edituser->pass_temp, $passwordhash))
-            {
-                // Clear session
-                unset($_SESSION['dol_login']);
-                $_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
-
-                $newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
-                dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
-                header("Location: ".DOL_URL_ROOT.'/');
-                exit;
-            } else {
-                $langs->load("errors");
-                $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
-            }
-        }
-    }
-    // Action modif mot de passe
-    if ($action == 'buildnewpassword' && $username)
-    {
-        $sessionkey = 'dol_antispam_value';
-        $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
-
-        // Verify code
-        if (!$ok)
-        {
-            $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-        } else {
-            $isanemail = preg_match('/@/', $username);
-
-            $edituser = new User($db);
-            $result = $edituser->fetch('', $username, '', 1);
-            if ($result == 0 && $isanemail)
-            {
-                $result = $edituser->fetch('', '', '', 1, -1, $username);
-            }
-
-            if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
-            {
-                $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-                if (!$isanemail) {
-                    $message .= $langs->trans("IfLoginExistPasswordRequestSent");
-                } else {
-                    $message .= $langs->trans("IfEmailExistPasswordRequestSent");
-                }
-                $message .= '</div>';
-                $username = '';
-            } else {
-                if (!$edituser->email)
-                {
-                    $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-                } else {
-                    $newpassword = $edituser->setPassword($user, '', 1);
-                    if ($newpassword < 0)
-                    {
-                        // Failed
-                        $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-                    } else {
-                        // Success
-                        if ($edituser->send_password($user, $newpassword, 1) > 0)
-                        {
-                            $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-                            if (!$isanemail) {
-                                $message .= $langs->trans("IfLoginExistPasswordRequestSent");
-                            } else {
-                                $message .= $langs->trans("IfEmailExistPasswordRequestSent");
-                            }
-                            //$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
-                            $message .= '</div>';
-                            $username = '';
-                        } else {
-                            $message .= '<div class="error">'.$edituser->error.'</div>';
-                        }
-                    }
-                }
-            }
-        }
-    }
+	// Validate new password
+	if ($action == 'validatenewpassword' && $username && $passwordhash)
+	{
+		$edituser = new User($db);
+		$result = $edituser->fetch('', $_GET["username"]);
+		if ($result < 0)
+		{
+			$message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
+		} else {
+			if (dol_verifyHash($edituser->pass_temp, $passwordhash))
+			{
+				// Clear session
+				unset($_SESSION['dol_login']);
+				$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
+
+				$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
+				dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
+				header("Location: ".DOL_URL_ROOT.'/');
+				exit;
+			} else {
+				$langs->load("errors");
+				$message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
+			}
+		}
+	}
+	// Action modif mot de passe
+	if ($action == 'buildnewpassword' && $username)
+	{
+		$sessionkey = 'dol_antispam_value';
+		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+
+		// Verify code
+		if (!$ok)
+		{
+			$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
+		} else {
+			$isanemail = preg_match('/@/', $username);
+
+			$edituser = new User($db);
+			$result = $edituser->fetch('', $username, '', 1);
+			if ($result == 0 && $isanemail)
+			{
+				$result = $edituser->fetch('', '', '', 1, -1, $username);
+			}
+
+			if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
+			{
+				$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+				if (!$isanemail) {
+					$message .= $langs->trans("IfLoginExistPasswordRequestSent");
+				} else {
+					$message .= $langs->trans("IfEmailExistPasswordRequestSent");
+				}
+				$message .= '</div>';
+				$username = '';
+			} else {
+				if (!$edituser->email)
+				{
+					$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+				} else {
+					$newpassword = $edituser->setPassword($user, '', 1);
+					if ($newpassword < 0)
+					{
+						// Failed
+						$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
+					} else {
+						// Success
+						if ($edituser->send_password($user, $newpassword, 1) > 0)
+						{
+							$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+							if (!$isanemail) {
+								$message .= $langs->trans("IfLoginExistPasswordRequestSent");
+							} else {
+								$message .= $langs->trans("IfEmailExistPasswordRequestSent");
+							}
+							//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
+							$message .= '</div>';
+							$username = '';
+						} else {
+							$message .= '<div class="error">'.$edituser->error.'</div>';
+						}
+					}
+				}
+			}
+		}
+	}
 }