alxarafe / alixar

dolibarr/htdocs/core/actions_setnotes.inc.php

Indentation +29 added lines, -29 removed lines

@@ -30,41 +30,41 @@
 // Set public note
 if ($action == 'setnote_public' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
+    if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
+    if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
 	
-	$result_update=$object->update_note(dol_html_entity_decode(GETPOST('note_public', 'none'), ENT_QUOTES),'_public');
+    $result_update=$object->update_note(dol_html_entity_decode(GETPOST('note_public', 'none'), ENT_QUOTES),'_public');
 
-	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
-	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
-	{
-		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			$model=$object->modelpdf;
-			$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-			$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-			$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+    if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
+    elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
+    {
+        // Define output language
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+        {
+            $outputlangs = $langs;
+            $newlang = '';
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+            if (! empty($newlang)) {
+                $outputlangs = new Translate("", $conf);
+                $outputlangs->setDefaultLang($newlang);
+            }
+            $model=$object->modelpdf;
+            $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+            $hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+            $hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-			$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			
-			if ($result < 0) dol_print_error($db,$result);
-		}
-	}
+            if ($result < 0) dol_print_error($db,$result);
+        }
+    }
 }
 // Set public note
 else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
-	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private', 'none'), ENT_QUOTES),'_private');
-	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+    if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
+    if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
+    $result=$object->update_note(dol_html_entity_decode(GETPOST('note_private', 'none'), ENT_QUOTES),'_private');
+    if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }

Spacing +16 added lines, -16 removed lines

@@ -28,12 +28,12 @@ 
 // $id must be defined (object is loaded in this file with fetch)
 
 // Set public note
-if ($action == 'setnote_public' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
+if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel', 'alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
+	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
+	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
 	
-	$result_update=$object->update_note(dol_html_entity_decode(GETPOST('note_public', 'none'), ENT_QUOTES),'_public');
+	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'none'), ENT_QUOTES), '_public');
 
 	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
 	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
@@ -43,28 +43,28 @@ 
 		{
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			$model=$object->modelpdf;
-			$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-			$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-			$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+			$model = $object->modelpdf;
+			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-			$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			
-			if ($result < 0) dol_print_error($db,$result);
+			if ($result < 0) dol_print_error($db, $result);
 		}
 	}
 }
 // Set public note
-else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
+else if ($action == 'setnote_private' && !empty($permissionnote) && !GETPOST('cancel', 'alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
-	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private', 'none'), ENT_QUOTES),'_private');
+	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
+	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
+	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'none'), ENT_QUOTES), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }

Braces +30 added lines, -11 removed lines

@@ -30,21 +30,31 @@ 
 // Set public note
 if ($action == 'setnote_public' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
+	if (empty($action) || ! is_object($object) || empty($id)) {
+	    dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
+	}
+	if (empty($object->id)) {
+	    $object->fetch($id);
+	}
+	// Fetch may not be already done
 	
 	$result_update=$object->update_note(dol_html_entity_decode(GETPOST('note_public', 'none'), ENT_QUOTES),'_public');
 
-	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
-	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
+	if ($result_update < 0) {
+	    setEventMessages($object->error, $object->errors, 'errors');
+	} elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
 	{
 		// Define output language
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+			    $newlang = GETPOST('lang_id','aZ09');
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+			    $newlang = $object->thirdparty->default_lang;
+			}
 			if (! empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -56,15 +66,24 @@ 
 
 			$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			
-			if ($result < 0) dol_print_error($db,$result);
+			if ($result < 0) {
+			    dol_print_error($db,$result);
+			}
 		}
 	}
 }
 // Set public note
 else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('cancel','alpha'))
 {
-	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
+	if (empty($action) || ! is_object($object) || empty($id)) {
+	    dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
+	}
+	if (empty($object->id)) {
+	    $object->fetch($id);
+	}
+	// Fetch may not be already done
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private', 'none'), ENT_QUOTES),'_private');
-	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-}
+	if ($result < 0) {
+	    setEventMessages($object->error, $object->errors, 'errors');
+	}
+	}

dolibarr/htdocs/core/photos_resize.php

Indentation +233 added lines, -233 removed lines

@@ -43,79 +43,79 @@ 
 $accessallowed=0;
 if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
-	$result=restrictedArea($user,'produit|service',$id,'product&product');
-	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'produit|service',$id,'product&product');
+    if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'project')
 {
     $result=restrictedArea($user,'projet',$id);
-	if (! $user->rights->projet->lire) accessforbidden();
-	$accessallowed=1;
+    if (! $user->rights->projet->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'expensereport')
 {
-	$result=restrictedArea($user,'expensereport',$id,'expensereport');
-	if (! $user->rights->expensereport->lire) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'expensereport',$id,'expensereport');
+    if (! $user->rights->expensereport->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'holiday')
 {
-	$result=restrictedArea($user,'holiday',$id,'holiday');
-	if (! $user->rights->holiday->read) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'holiday',$id,'holiday');
+    if (! $user->rights->holiday->read) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'member')
 {
-	$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (! $user->rights->adherent->lire) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
+    if (! $user->rights->adherent->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'user')
 {
-	$result=restrictedArea($user,'user',$id,'user');
-	if (! $user->rights->user->user->lire) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'user',$id,'user');
+    if (! $user->rights->user->user->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'societe')
 {
-	$result=restrictedArea($user,'societe',$id,'societe');
-	if (! $user->rights->societe->lire) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'societe',$id,'societe');
+    if (! $user->rights->societe->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'tax')
 {
-	$result=restrictedArea($user, 'tax', $id, 'chargesociales','charges');
-	if (! $user->rights->tax->charges->lire) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user, 'tax', $id, 'chargesociales','charges');
+    if (! $user->rights->tax->charges->lire) accessforbidden();
+    $accessallowed=1;
 }
 elseif ($modulepart == 'ticket')
 {
-	$result=restrictedArea($user,'ticket',$id,'ticket');
-	if (! $user->rights->ticket->read) accessforbidden();
-	$accessallowed=1;
+    $result=restrictedArea($user,'ticket',$id,'ticket');
+    if (! $user->rights->ticket->read) accessforbidden();
+    $accessallowed=1;
 }
 
 // Security:
 // Limit access if permissions are wrong
 if (! $accessallowed)
 {
-	accessforbidden();
+    accessforbidden();
 }
 
 // Define dir according to modulepart
 if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-	$object = new Product($db);
-	if ($id > 0)
-	{
-		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->product->multidir_output[$object->entity];	// By default
-		if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
-		if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
-	}
+    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+    $object = new Product($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->product->multidir_output[$object->entity];	// By default
+        if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
+        if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+    }
 }
 elseif ($modulepart == 'project')
 {
@@ -130,25 +130,25 @@ 
 }
 elseif ($modulepart == 'holiday')
 {
-	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-	$object = new Holiday($db);
-	if ($id > 0)
-	{
-		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->holiday->dir_output;	// By default
-	}
+    require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+    $object = new Holiday($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->holiday->dir_output;	// By default
+    }
 }
 elseif ($modulepart == 'member')
 {
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-	$object = new Adherent($db);
-	if ($id > 0)
-	{
-		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->adherent->dir_output;	// By default
-	}
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+    $object = new Adherent($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->adherent->dir_output;	// By default
+    }
 }
 elseif ($modulepart == 'societe')
 {
@@ -185,28 +185,28 @@ 
 }
 elseif ($modulepart == 'tax')
 {
-	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-	$object = new ChargeSociales($db);
-	if ($id > 0)
-	{
-		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->tax->dir_output;	// By default
-	}
+    require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+    $object = new ChargeSociales($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->tax->dir_output;	// By default
+    }
 }
 elseif ($modulepart == 'ticket')
 {
-	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
-	$object = new Ticket($db);
-	if ($id > 0)
-	{
-		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->ticket->dir_output;	// By default
-	}
+    require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+    $object = new Ticket($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->ticket->dir_output;	// By default
+    }
 }
 else {
-	print 'Action crop for module part '.$modulepart.' is not supported yet.';
+    print 'Action crop for module part '.$modulepart.' is not supported yet.';
 }
 
 if (empty($backtourl))
@@ -229,154 +229,154 @@ 
 
 if ($cancel)
 {
-	if ($backtourl)
-	{
-		header("Location: ".$backtourl);
-		exit;
-	}
-	else
-	{
-	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
-	    exit;
-	}
+    if ($backtourl)
+    {
+        header("Location: ".$backtourl);
+        exit;
+    }
+    else
+    {
+        dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
+        exit;
+    }
 }
 
 if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != ""))
 {
-	$fullpath=$dir."/".$original_file;
-
-	$result=dol_imageResizeOrCrop($fullpath,0,$_POST['sizex'],$_POST['sizey']);
-
-	if ($result == $fullpath)
-	{
-		$object->addThumbs($fullpath);
-
-		// Update/create database for file $fullpath
-		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
-		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
-
-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
-		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
-		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
-		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
-		}
-
-		if ($backtourl)
-		{
-			header("Location: ".$backtourl);
-			exit;
-		}
-		else
-		{
-    	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
-		}
-	}
-	else
-	{
-		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
-	}
+    $fullpath=$dir."/".$original_file;
+
+    $result=dol_imageResizeOrCrop($fullpath,0,$_POST['sizex'],$_POST['sizey']);
+
+    if ($result == $fullpath)
+    {
+        $object->addThumbs($fullpath);
+
+        // Update/create database for file $fullpath
+        $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
+        $rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        $ecmfile=new EcmFiles($db);
+        $result = $ecmfile->fetch(0, '', $rel_filename);
+        if ($result > 0)   // If found
+        {
+            $filename = basename($rel_filename);
+            $rel_dir = dirname($rel_filename);
+            $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+            $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+            $ecmfile->label = md5_file(dol_osencode($fullpath));
+            $result = $ecmfile->update($user);
+        }
+        elseif ($result == 0)   // If not found
+        {
+            $filename = basename($rel_filename);
+            $rel_dir = dirname($rel_filename);
+            $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+            $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+            $ecmfile->filepath = $rel_dir;
+            $ecmfile->filename = $filename;
+            $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+            $ecmfile->fullpath_orig = $fullpath;
+            $ecmfile->gen_or_uploaded = 'unknown';
+            $ecmfile->description = '';    // indexed content
+            $ecmfile->keyword = '';        // keyword content
+            $result = $ecmfile->create($user);
+            if ($result < 0)
+            {
+                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+            }
+            $result = $ecmfile->create($user);
+        }
+
+        if ($backtourl)
+        {
+            header("Location: ".$backtourl);
+            exit;
+        }
+        else
+        {
+            dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
+            exit;
+        }
+    }
+    else
+    {
+        setEventMessages($result, null, 'errors');
+        $_GET['file']=$_POST["file"];
+        $action='';
+    }
 }
 
 // Crop d'une image
 if ($action == 'confirm_crop')
 {
-	$fullpath=$dir."/".$original_file;
-
-	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
-	$result=dol_imageResizeOrCrop($fullpath,1,$_POST['w'],$_POST['h'],$_POST['x'],$_POST['y']);
-
-	if ($result == $fullpath)
-	{
-		$object->addThumbs($fullpath);
-
-		// Update/create database for file $fullpath
-		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
-		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
-
-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
-		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
-		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
-		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
-		}
-
-		if ($backtourl)
-		{
-			header("Location: ".$backtourl);
-			exit;
-		}
-		else
-		{
-    	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
-		}
-	}
-	else
-	{
-		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
-	}
+    $fullpath=$dir."/".$original_file;
+
+    //var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
+    $result=dol_imageResizeOrCrop($fullpath,1,$_POST['w'],$_POST['h'],$_POST['x'],$_POST['y']);
+
+    if ($result == $fullpath)
+    {
+        $object->addThumbs($fullpath);
+
+        // Update/create database for file $fullpath
+        $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
+        $rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        $ecmfile=new EcmFiles($db);
+        $result = $ecmfile->fetch(0, '', $rel_filename);
+        if ($result > 0)   // If found
+        {
+            $filename = basename($rel_filename);
+            $rel_dir = dirname($rel_filename);
+            $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+            $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+            $ecmfile->label = md5_file(dol_osencode($fullpath));
+            $result = $ecmfile->update($user);
+        }
+        elseif ($result == 0)   // If not found
+        {
+            $filename = basename($rel_filename);
+            $rel_dir = dirname($rel_filename);
+            $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+            $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+            $ecmfile->filepath = $rel_dir;
+            $ecmfile->filename = $filename;
+            $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+            $ecmfile->fullpath_orig = $fullpath;
+            $ecmfile->gen_or_uploaded = 'unknown';
+            $ecmfile->description = '';    // indexed content
+            $ecmfile->keyword = '';        // keyword content
+            $result = $ecmfile->create($user);
+            if ($result < 0)
+            {
+                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+            }
+            $result = $ecmfile->create($user);
+        }
+
+        if ($backtourl)
+        {
+            header("Location: ".$backtourl);
+            exit;
+        }
+        else
+        {
+            dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
+            exit;
+        }
+    }
+    else
+    {
+        setEventMessages($result, null, 'errors');
+        $_GET['file']=$_POST["file"];
+        $action='';
+    }
 }
 
 
@@ -433,28 +433,28 @@ 
 
 if (! empty($conf->use_javascript_ajax))
 {
-	$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
-	$height=$infoarray['height'];
-	$width=$infoarray['width'];
-	$widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
-	// If image is too large, we use another scale.
-	if (! empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth']/2)))
-	{
-		$ratioforcrop=2;
-		$widthforcrop=round($_SESSION['dol_screenwidth'] / $ratioforcrop);
-		$refsizeforcrop='screenwidth';
-	}
-
-	print '<!-- Form to crop -->'."\n";
-	print '<fieldset id="redim_file">';
-	print '<legend>'.$langs->trans("Recenter").'</legend>';
-	print $langs->trans("DefineNewAreaToPick").'...<br>';
-	print '<br><div class="center">';
-	print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
-	print '</div>';
-	print '</div><br>';
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">
+    $infoarray=dol_getImageSize($dir."/".GETPOST("file"));
+    $height=$infoarray['height'];
+    $width=$infoarray['width'];
+    $widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
+    // If image is too large, we use another scale.
+    if (! empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth']/2)))
+    {
+        $ratioforcrop=2;
+        $widthforcrop=round($_SESSION['dol_screenwidth'] / $ratioforcrop);
+        $refsizeforcrop='screenwidth';
+    }
+
+    print '<!-- Form to crop -->'."\n";
+    print '<fieldset id="redim_file">';
+    print '<legend>'.$langs->trans("Recenter").'</legend>';
+    print $langs->trans("DefineNewAreaToPick").'...<br>';
+    print '<br><div class="center">';
+    print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
+    print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
+    print '</div>';
+    print '</div><br>';
+    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">
 	      <div class="jc_coords">
 	         '.$langs->trans("NewSizeAfterCropping").':
 	         <label>X1 <input type="number" class="flat maxwidth50" id="x" name="x" /></label>
@@ -477,8 +477,8 @@ 
 	      &nbsp;
 	      <input type="submit" id="cancelcrop" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />
 	   </form>'."\n";
-	print '</fieldset>'."\n";
-	print '<br>';
+    print '</fieldset>'."\n";
+    print '<br>';
 }
 
 /* Check that mandatory fields are filled */

Braces +117 added lines, -81 removed lines

@@ -39,60 +39,72 @@ 
 $cancel=GETPOST('cancel','alpha');
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for modulepart');
+if (empty($modulepart)) {
+    accessforbidden('Bad value for modulepart');
+}
 $accessallowed=0;
 if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
 	$result=restrictedArea($user,'produit|service',$id,'product&product');
-	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
+	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     $result=restrictedArea($user,'projet',$id);
-	if (! $user->rights->projet->lire) accessforbidden();
+	if (! $user->rights->projet->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'expensereport')
+} elseif ($modulepart == 'expensereport')
 {
 	$result=restrictedArea($user,'expensereport',$id,'expensereport');
-	if (! $user->rights->expensereport->lire) accessforbidden();
+	if (! $user->rights->expensereport->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'holiday')
+} elseif ($modulepart == 'holiday')
 {
 	$result=restrictedArea($user,'holiday',$id,'holiday');
-	if (! $user->rights->holiday->read) accessforbidden();
+	if (! $user->rights->holiday->read) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (! $user->rights->adherent->lire) accessforbidden();
+	if (! $user->rights->adherent->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
 	$result=restrictedArea($user,'user',$id,'user');
-	if (! $user->rights->user->user->lire) accessforbidden();
+	if (! $user->rights->user->user->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'societe')
+} elseif ($modulepart == 'societe')
 {
 	$result=restrictedArea($user,'societe',$id,'societe');
-	if (! $user->rights->societe->lire) accessforbidden();
+	if (! $user->rights->societe->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	$result=restrictedArea($user, 'tax', $id, 'chargesociales','charges');
-	if (! $user->rights->tax->charges->lire) accessforbidden();
+	if (! $user->rights->tax->charges->lire) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
-}
-elseif ($modulepart == 'ticket')
+} elseif ($modulepart == 'ticket')
 {
 	$result=restrictedArea($user,'ticket',$id,'ticket');
-	if (! $user->rights->ticket->read) accessforbidden();
+	if (! $user->rights->ticket->read) {
+	    accessforbidden();
+	}
 	$accessallowed=1;
 }
 
@@ -111,116 +123,139 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		if ($result <= 0) {
+		    dol_print_error($db,'Failed to load object');
+		}
 		$dir=$conf->product->multidir_output[$object->entity];	// By default
-		if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
-		if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+		if ($object->type == Product::TYPE_PRODUCT) {
+		    $dir=$conf->product->multidir_output[$object->entity];
+		}
+		if ($object->type == Product::TYPE_SERVICE) {
+		    $dir=$conf->service->multidir_output[$object->entity];
+		}
 	}
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $object = new Project($db);
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        if ($result <= 0) {
+            dol_print_error($db,'Failed to load object');
+        }
         $dir=$conf->projet->dir_output;	// By default
     }
-}
-elseif ($modulepart == 'holiday')
+} elseif ($modulepart == 'holiday')
 {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$object = new Holiday($db);
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		if ($result <= 0) {
+		    dol_print_error($db,'Failed to load object');
+		}
 		$dir=$conf->holiday->dir_output;	// By default
 	}
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$object = new Adherent($db);
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		if ($result <= 0) {
+		    dol_print_error($db,'Failed to load object');
+		}
 		$dir=$conf->adherent->dir_output;	// By default
 	}
-}
-elseif ($modulepart == 'societe')
+} elseif ($modulepart == 'societe')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new Societe($db);
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        if ($result <= 0) {
+            dol_print_error($db,'Failed to load object');
+        }
         $dir=$conf->societe->dir_output;
     }
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new User($db);
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        if ($result <= 0) {
+            dol_print_error($db,'Failed to load object');
+        }
         $dir=$conf->user->dir_output;	// By default
     }
-}
-elseif ($modulepart == 'expensereport')
+} elseif ($modulepart == 'expensereport')
 {
     require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $object = new ExpenseReport($db);
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        if ($result <= 0) {
+            dol_print_error($db,'Failed to load object');
+        }
         $dir=$conf->expensereport->dir_output;	// By default
     }
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 	$object = new ChargeSociales($db);
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		if ($result <= 0) {
+		    dol_print_error($db,'Failed to load object');
+		}
 		$dir=$conf->tax->dir_output;	// By default
 	}
-}
-elseif ($modulepart == 'ticket')
+} elseif ($modulepart == 'ticket')
 {
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 	$object = new Ticket($db);
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
+		if ($result <= 0) {
+		    dol_print_error($db,'Failed to load object');
+		}
 		$dir=$conf->ticket->dir_output;	// By default
 	}
-}
-else {
+} else {
 	print 'Action crop for module part '.$modulepart.' is not supported yet.';
 }
 
 if (empty($backtourl))
 {
-    if (in_array($modulepart, array('product','produit','service','produit|service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('expensereport'))) $backtourl=DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('holiday')))       $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('member')))        $backtourl=DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('project')))       $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('societe')))       $backtourl=DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('tax')))           $backtourl=DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('ticket')))        $backtourl=DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('user')))          $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-}
+    if (in_array($modulepart, array('product','produit','service','produit|service'))) {
+        $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('expensereport'))) {
+        $backtourl=DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('holiday'))) {
+        $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('member'))) {
+        $backtourl=DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('project'))) {
+        $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('societe'))) {
+        $backtourl=DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('tax'))) {
+        $backtourl=DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('ticket'))) {
+        $backtourl=DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    } else if (in_array($modulepart, array('user'))) {
+        $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    }
+    }
 
 
 /*
@@ -233,8 +268,7 @@ 
 	{
 		header("Location: ".$backtourl);
 		exit;
-	}
-	else
+	} else
 	{
 	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
 	    exit;
@@ -258,19 +292,22 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile=new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
+		if ($result > 0) {
+		    // If found
 		{
 		    $filename = basename($rel_filename);
+		}
 		    $rel_dir = dirname($rel_filename);
 		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0) {
+		    // If not found
 		{
 		    $filename = basename($rel_filename);
+		}
 		    $rel_dir = dirname($rel_filename);
 		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -294,14 +331,12 @@ 
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
+		} else
 		{
     	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($result, null, 'errors');
 		$_GET['file']=$_POST["file"];
@@ -328,19 +363,22 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile=new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
+		if ($result > 0) {
+		    // If found
 		{
 		    $filename = basename($rel_filename);
+		}
 		    $rel_dir = dirname($rel_filename);
 		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0) {
+		    // If not found
 		{
 		    $filename = basename($rel_filename);
+		}
 		    $rel_dir = dirname($rel_filename);
 		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -364,14 +402,12 @@ 
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
+		} else
 		{
     	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($result, null, 'errors');
 		$_GET['file']=$_POST["file"];

Spacing +99 added lines, -99 removed lines

@@ -26,81 +26,81 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("products","other"));
+$langs->loadLangs(array("products", "other"));
 
-$id=GETPOST('id','int');
-$action=GETPOST('action','alpha');
-$modulepart=GETPOST('modulepart','alpha')?GETPOST('modulepart','alpha'):'produit|service';
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$modulepart = GETPOST('modulepart', 'alpha') ?GETPOST('modulepart', 'alpha') : 'produit|service';
 $original_file = GETPOST("file");
-$backtourl=GETPOST('backtourl');
-$cancel=GETPOST('cancel','alpha');
+$backtourl = GETPOST('backtourl');
+$cancel = GETPOST('cancel', 'alpha');
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
-$accessallowed=0;
+$accessallowed = 0;
 if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
-	$result=restrictedArea($user,'produit|service',$id,'product&product');
-	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
+	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'project')
 {
-    $result=restrictedArea($user,'projet',$id);
-	if (! $user->rights->projet->lire) accessforbidden();
-	$accessallowed=1;
+    $result = restrictedArea($user, 'projet', $id);
+	if (!$user->rights->projet->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'expensereport')
 {
-	$result=restrictedArea($user,'expensereport',$id,'expensereport');
-	if (! $user->rights->expensereport->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'expensereport', $id, 'expensereport');
+	if (!$user->rights->expensereport->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'holiday')
 {
-	$result=restrictedArea($user,'holiday',$id,'holiday');
-	if (! $user->rights->holiday->read) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'holiday', $id, 'holiday');
+	if (!$user->rights->holiday->read) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'member')
 {
-	$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (! $user->rights->adherent->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
+	if (!$user->rights->adherent->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'user')
 {
-	$result=restrictedArea($user,'user',$id,'user');
-	if (! $user->rights->user->user->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'user', $id, 'user');
+	if (!$user->rights->user->user->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'societe')
 {
-	$result=restrictedArea($user,'societe',$id,'societe');
-	if (! $user->rights->societe->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'societe', $id, 'societe');
+	if (!$user->rights->societe->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'tax')
 {
-	$result=restrictedArea($user, 'tax', $id, 'chargesociales','charges');
-	if (! $user->rights->tax->charges->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
+	if (!$user->rights->tax->charges->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'ticket')
 {
-	$result=restrictedArea($user,'ticket',$id,'ticket');
-	if (! $user->rights->ticket->read) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'ticket', $id, 'ticket');
+	if (!$user->rights->ticket->read) accessforbidden();
+	$accessallowed = 1;
 }
 
 // Security:
 // Limit access if permissions are wrong
-if (! $accessallowed)
+if (!$accessallowed)
 {
 	accessforbidden();
 }
@@ -113,10 +113,10 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->product->multidir_output[$object->entity];	// By default
-		if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
-		if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->product->multidir_output[$object->entity]; // By default
+		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
+		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
 	}
 }
 elseif ($modulepart == 'project')
@@ -126,8 +126,8 @@ 
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
-        $dir=$conf->projet->dir_output;	// By default
+        if ($result <= 0) dol_print_error($db, 'Failed to load object');
+        $dir = $conf->projet->dir_output; // By default
     }
 }
 elseif ($modulepart == 'holiday')
@@ -137,8 +137,8 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->holiday->dir_output;	// By default
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->holiday->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'member')
@@ -148,8 +148,8 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->adherent->dir_output;	// By default
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->adherent->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'societe')
@@ -159,8 +159,8 @@ 
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
-        $dir=$conf->societe->dir_output;
+        if ($result <= 0) dol_print_error($db, 'Failed to load object');
+        $dir = $conf->societe->dir_output;
     }
 }
 elseif ($modulepart == 'user')
@@ -170,8 +170,8 @@ 
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
-        $dir=$conf->user->dir_output;	// By default
+        if ($result <= 0) dol_print_error($db, 'Failed to load object');
+        $dir = $conf->user->dir_output; // By default
     }
 }
 elseif ($modulepart == 'expensereport')
@@ -181,8 +181,8 @@ 
     if ($id > 0)
     {
         $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db,'Failed to load object');
-        $dir=$conf->expensereport->dir_output;	// By default
+        if ($result <= 0) dol_print_error($db, 'Failed to load object');
+        $dir = $conf->expensereport->dir_output; // By default
     }
 }
 elseif ($modulepart == 'tax')
@@ -192,8 +192,8 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->tax->dir_output;	// By default
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->tax->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'ticket')
@@ -203,8 +203,8 @@ 
 	if ($id > 0)
 	{
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db,'Failed to load object');
-		$dir=$conf->ticket->dir_output;	// By default
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->ticket->dir_output; // By default
 	}
 }
 else {
@@ -213,15 +213,15 @@ 
 
 if (empty($backtourl))
 {
-    if (in_array($modulepart, array('product','produit','service','produit|service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('expensereport'))) $backtourl=DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('holiday')))       $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('member')))        $backtourl=DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('project')))       $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('societe')))       $backtourl=DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('tax')))           $backtourl=DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('ticket')))        $backtourl=DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else if (in_array($modulepart, array('user')))          $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
 }
 
 
@@ -245,20 +245,20 @@ 
 
 if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != ""))
 {
-	$fullpath=$dir."/".$original_file;
+	$fullpath = $dir."/".$original_file;
 
-	$result=dol_imageResizeOrCrop($fullpath,0,$_POST['sizex'],$_POST['sizey']);
+	$result = dol_imageResizeOrCrop($fullpath, 0, $_POST['sizex'], $_POST['sizey']);
 
 	if ($result == $fullpath)
 	{
 		$object->addThumbs($fullpath);
 
 		// Update/create database for file $fullpath
-		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
-		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $fullpath);
+		$rel_filename = preg_replace('/^[\\/]/', '', $rel_filename);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
@@ -279,11 +279,11 @@ 
 
 		    $ecmfile->filepath = $rel_dir;
 		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
 		    $ecmfile->fullpath_orig = $fullpath;
 		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
+		    $ecmfile->description = ''; // indexed content
+		    $ecmfile->keyword = ''; // keyword content
 		    $result = $ecmfile->create($user);
 		    if ($result < 0)
 		    {
@@ -306,29 +306,29 @@ 
 	else
 	{
 		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
+		$_GET['file'] = $_POST["file"];
+		$action = '';
 	}
 }
 
 // Crop d'une image
 if ($action == 'confirm_crop')
 {
-	$fullpath=$dir."/".$original_file;
+	$fullpath = $dir."/".$original_file;
 
 	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
-	$result=dol_imageResizeOrCrop($fullpath,1,$_POST['w'],$_POST['h'],$_POST['x'],$_POST['y']);
+	$result = dol_imageResizeOrCrop($fullpath, 1, $_POST['w'], $_POST['h'], $_POST['x'], $_POST['y']);
 
 	if ($result == $fullpath)
 	{
 		$object->addThumbs($fullpath);
 
 		// Update/create database for file $fullpath
-		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
-		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $fullpath);
+		$rel_filename = preg_replace('/^[\\/]/', '', $rel_filename);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
@@ -349,11 +349,11 @@ 
 
 		    $ecmfile->filepath = $rel_dir;
 		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
 		    $ecmfile->fullpath_orig = $fullpath;
 		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
+		    $ecmfile->description = ''; // indexed content
+		    $ecmfile->keyword = ''; // keyword content
 		    $result = $ecmfile->create($user);
 		    if ($result < 0)
 		    {
@@ -376,8 +376,8 @@ 
 	else
 	{
 		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
+		$_GET['file'] = $_POST["file"];
+		$action = '';
 	}
 }
 
@@ -386,14 +386,14 @@ 
  * View
  */
 
-llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
+llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js', '/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
 
 
 print load_fiche_titre($langs->trans("ImageEditor"));
 
-$infoarray=dol_getImageSize($dir."/".GETPOST("file",'alpha'));
-$height=$infoarray['height'];
-$width=$infoarray['width'];
+$infoarray = dol_getImageSize($dir."/".GETPOST("file", 'alpha'));
+$height = $infoarray['height'];
+$width = $infoarray['width'];
 print $langs->trans("CurrentInformationOnImage").': ';
 print $langs->trans("Width").': <strong>'.$width.'</strong> x '.$langs->trans("Height").': <strong>'.$height.'</strong><br>';
 
@@ -433,18 +433,18 @@ 
 
 print '<br>'."\n";
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
-	$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
-	$height=$infoarray['height'];
-	$width=$infoarray['width'];
-	$widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
+	$infoarray = dol_getImageSize($dir."/".GETPOST("file"));
+	$height = $infoarray['height'];
+	$width = $infoarray['width'];
+	$widthforcrop = $width; $refsizeforcrop = 'orig'; $ratioforcrop = 1;
 	// If image is too large, we use another scale.
-	if (! empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth']/2)))
+	if (!empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth'] / 2)))
 	{
-		$ratioforcrop=2;
-		$widthforcrop=round($_SESSION['dol_screenwidth'] / $ratioforcrop);
-		$refsizeforcrop='screenwidth';
+		$ratioforcrop = 2;
+		$widthforcrop = round($_SESSION['dol_screenwidth'] / $ratioforcrop);
+		$refsizeforcrop = 'screenwidth';
 	}
 
 	print '<!-- Form to crop -->'."\n";

dolibarr/htdocs/core/boxes/box_factures_imp.php

Indentation +96 added lines, -96 removed lines

@@ -33,107 +33,107 @@ 
  */
 class box_factures_imp extends ModeleBoxes
 {
-	var $boxcode="oldestunpaidcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxOldestUnpaidCustomerBills";
-	var $depends = array("facture");
+    var $boxcode="oldestunpaidcustomerbills";
+    var $boximg="object_bill";
+    var $boxlabel="BoxOldestUnpaidCustomerBills";
+    var $depends = array("facture");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->facture->lire);
-	}
+        $this->hidden=! ($user->rights->facture->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
         $facturestatic = new Facture($db);
         $societestatic = new Societe($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
 
-		if ($user->rights->facture->lire)
-		{
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
+        if ($user->rights->facture->lire)
+        {
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
             $sql.= " s.code_client,";
             $sql.= " s.logo,";
-			$sql.= " f.ref, f.date_lim_reglement as datelimite,";
+            $sql.= " f.ref, f.date_lim_reglement as datelimite,";
             $sql.= " f.type,";
-			$sql.= " f.amount, f.datef as df,";
+            $sql.= " f.amount, f.datef as df,";
             $sql.= " f.total as total_ht,";
             $sql.= " f.tva as total_tva,";
             $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
-			$sql.= ", sum(pf.amount) as am";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			$sql.= " AND f.paye = 0";
-			$sql.= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
-			$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
-			//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-			$sql.= " ORDER BY datelimite ASC, f.ref ASC ";
-			$sql.= $db->plimit($max, 0);
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$now=dol_now();
-
-				$line = 0;
-				$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
-
-				while ($line < $num)
-				{
-					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
+            $sql.= " f.paye, f.fk_statut, f.rowid as facid";
+            $sql.= ", sum(pf.amount) as am";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= ", ".MAIN_DB_PREFIX."facture as f";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND f.entity = ".$conf->entity;
+            $sql.= " AND f.paye = 0";
+            $sql.= " AND fk_statut = 1";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
+            $sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
+            //$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+            $sql.= " ORDER BY datelimite ASC, f.ref ASC ";
+            $sql.= $db->plimit($max, 0);
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $now=dol_now();
+
+                $line = 0;
+                $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
+
+                while ($line < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $datelimite=$db->jdate($objp->datelimite);
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
                     $facturestatic->type = $objp->type;
                     $facturestatic->total_ht = $objp->total_ht;
                     $facturestatic->total_tva = $objp->total_tva;
                     $facturestatic->total_ttc = $objp->total_ttc;
-					$facturestatic->statut = $objp->fk_statut;
-					$facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
+                    $facturestatic->statut = $objp->fk_statut;
+                    $facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
 
                     $societestatic->id = $objp->socid;
                     $societestatic->name = $objp->name;
@@ -142,10 +142,10 @@ 
                     $societestatic->code_client = $objp->code_client;
                     $societestatic->logo = $objp->logo;
 
-					$late='';
-					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
-					}
+                    $late='';
+                    if ($facturestatic->hasDelay()) {
+                        $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
+                    }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -175,40 +175,40 @@ 
                         'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am),
                     );
 
-					$line++;
-				}
+                    $line++;
+                }
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
 
-				$db->free($result);
-			}
-			else
-			{
+                $db->free($result);
+            }
+            else
+            {
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
-			}
-		}
-		else {
+            }
+        }
+        else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_factures_imp extends ModeleBoxes
 {
-	var $boxcode="oldestunpaidcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxOldestUnpaidCustomerBills";
+	var $boxcode = "oldestunpaidcustomerbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxOldestUnpaidCustomerBills";
 	var $depends = array("facture");
 
 	/**
@@ -55,13 +55,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->facture->lire);
+	    $this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -82,42 +82,42 @@ 
         $facturestatic = new Facture($db);
         $societestatic = new Societe($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $max));
 
 		if ($user->rights->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
-            $sql.= " s.code_client,";
-            $sql.= " s.logo,";
-			$sql.= " f.ref, f.date_lim_reglement as datelimite,";
-            $sql.= " f.type,";
-			$sql.= " f.amount, f.datef as df,";
-            $sql.= " f.total as total_ht,";
-            $sql.= " f.tva as total_tva,";
-            $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
-			$sql.= ", sum(pf.amount) as am";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			$sql.= " AND f.paye = 0";
-			$sql.= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
-			$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
+            $sql .= " s.code_client,";
+            $sql .= " s.logo,";
+			$sql .= " f.ref, f.date_lim_reglement as datelimite,";
+            $sql .= " f.type,";
+			$sql .= " f.amount, f.datef as df,";
+            $sql .= " f.total as total_ht,";
+            $sql .= " f.tva as total_tva,";
+            $sql .= " f.total_ttc,";
+			$sql .= " f.paye, f.fk_statut, f.rowid as facid";
+			$sql .= ", sum(pf.amount) as am";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			$sql .= " AND f.paye = 0";
+			$sql .= " AND fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+			$sql .= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
+			$sql .= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-			$sql.= " ORDER BY datelimite ASC, f.ref ASC ";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " ORDER BY datelimite ASC, f.ref ASC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$now=dol_now();
+				$now = dol_now();
 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
@@ -125,7 +125,7 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
+					$datelimite = $db->jdate($objp->datelimite);
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
                     $facturestatic->type = $objp->type;
@@ -142,9 +142,9 @@ 
                     $societestatic->code_client = $objp->code_client;
                     $societestatic->logo = $objp->logo;
 
-					$late='';
+					$late = '';
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
 					}
 
                     $this->info_box_contents[$line][] = array(
@@ -167,18 +167,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite,'day'),
+                        'text' => dol_print_date($datelimite, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
                     );
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoUnpaidCustomerBills"));
 
 				$db->free($result);
 			}
@@ -207,7 +207,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +14 added lines, -8 removed lines

@@ -98,15 +98,21 @@ 
 			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
 			$sql.= ", sum(pf.amount) as am";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= ", ".MAIN_DB_PREFIX."facture as f";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
 			$sql.= " AND f.paye = 0";
 			$sql.= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+			    $sql.= " AND s.rowid = ".$user->societe_id;
+			}
 			$sql.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
 			$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
@@ -178,11 +184,12 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				if ($num==0) {
+				    $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				}
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
@@ -190,8 +197,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_external_rss.php

Indentation +58 added lines, -58 removed lines

@@ -39,12 +39,12 @@ 
     var $boxlabel="BoxLastRssInfos";
     var $depends = array("externalrss");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $paramdef;	// Params of box definition (not user params)
+    var $paramdef;	// Params of box definition (not user params)
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -58,14 +58,14 @@ 
      */
     function __construct($db,$param)
     {
-		$this->db=$db;
-		$this->paramdef=$param;
+        $this->db=$db;
+        $this->paramdef=$param;
     }
 
     /**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        	Maximum number of records to load
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        	Maximum number of records to load
      *  @param	int		$cachedelay		Delay we accept for cache file
      *  @return	void
      */
@@ -74,28 +74,28 @@ 
         global $user, $langs, $conf;
         $langs->load("boxes");
 
-		$this->max=$max;
+        $this->max=$max;
 
-		// On recupere numero de param de la boite
-		preg_match('/^([0-9]+) /',$this->paramdef,$reg);
-		$site=$reg[1];
+        // On recupere numero de param de la boite
+        preg_match('/^([0-9]+) /',$this->paramdef,$reg);
+        $site=$reg[1];
 
-		// Create dir nor required
-		// documents/externalrss is created by module activation
-		// documents/externalrss/tmp is created by rssparser
+        // Create dir nor required
+        // documents/externalrss is created by module activation
+        // documents/externalrss/tmp is created by rssparser
 
-		$keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
-		$keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
+        $keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
+        $keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
 
-		// Get RSS feed
-		$url=$conf->global->$keyforparamurl;
+        // Get RSS feed
+        $url=$conf->global->$keyforparamurl;
 
         $rssparser=new RssParser($this->db);
-		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
+        $result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
 
-		// INFO on channel
-		$description=$rssparser->getDescription();
-		$link=$rssparser->getLink();
+        // INFO on channel
+        $description=$rssparser->getDescription();
+        $link=$rssparser->getLink();
 
         $title=$langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
         if ($result < 0 || ! empty($rssparser->error))
@@ -111,42 +111,42 @@ 
                 'sublink' => $link,
                 'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(),"dayhourtext"):$langs->trans("Unknown")),
                 'subpicto'=>'help',
-		'target'=>'_blank',
+        'target'=>'_blank',
             );
-		}
+        }
 
-		// INFO on items
-		$items=$rssparser->getItems();
+        // INFO on items
+        $items=$rssparser->getItems();
         //print '<pre>'.print_r($items,true).'</pre>';
-		$nbitems=count($items);
+        $nbitems=count($items);
         for($line = 0; $line < $max && $line < $nbitems; $line++)
         {
             $item = $items[$line];
 
-			// Feed common fields
+            // Feed common fields
             $href  = $item['link'];
-        	$title = urldecode($item['title']);
-			$date  = $item['date_timestamp'];       // date will be empty if conversion into timestamp failed
-			if ($rssparser->getFormat() == 'rss')   // If RSS
-			{
-				if (! $date && isset($item['pubdate']))    $date=$item['pubdate'];
-				if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];
-				//$item['dc']['language']
-				//$item['dc']['publisher']
-			}
-			if ($rssparser->getFormat() == 'atom')	// If Atom
-			{
-				if (! $date && isset($item['issued']))    $date=$item['issued'];
-				if (! $date && isset($item['modified']))  $date=$item['modified'];
-				//$item['issued']
-				//$item['modified']
-				//$item['atom_content']
-			}
-			if (is_numeric($date)) $date=dol_print_date($date,"dayhour");
-
-			$isutf8 = utf8_check($title);
-	        if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title);
-	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title);
+            $title = urldecode($item['title']);
+            $date  = $item['date_timestamp'];       // date will be empty if conversion into timestamp failed
+            if ($rssparser->getFormat() == 'rss')   // If RSS
+            {
+                if (! $date && isset($item['pubdate']))    $date=$item['pubdate'];
+                if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];
+                //$item['dc']['language']
+                //$item['dc']['publisher']
+            }
+            if ($rssparser->getFormat() == 'atom')	// If Atom
+            {
+                if (! $date && isset($item['issued']))    $date=$item['issued'];
+                if (! $date && isset($item['modified']))  $date=$item['modified'];
+                //$item['issued']
+                //$item['modified']
+                //$item['atom_content']
+            }
+            if (is_numeric($date)) $date=dol_print_date($date,"dayhour");
+
+            $isutf8 = utf8_check($title);
+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title);
+            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title);
 
             $title=preg_replace("/([[:alnum:]])\?([[:alnum:]])/","\\1'\\2",$title);   // Gere probleme des apostrophes mal codee/decodee par utf8
             $title=preg_replace("/^\s+/","",$title);                                  // Supprime espaces de debut
@@ -187,14 +187,14 @@ 
     }
 
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);

Spacing +45 added lines, -45 removed lines

@@ -34,9 +34,9 @@ 
  */
 class box_external_rss extends ModeleBoxes
 {
-    var $boxcode="lastrssinfos";
-    var $boximg="object_rss";
-    var $boxlabel="BoxLastRssInfos";
+    var $boxcode = "lastrssinfos";
+    var $boximg = "object_rss";
+    var $boxlabel = "BoxLastRssInfos";
     var $depends = array("externalrss");
 
 	/**
@@ -44,7 +44,7 @@ 
      */
     public $db;
     
-	var $paramdef;	// Params of box definition (not user params)
+	var $paramdef; // Params of box definition (not user params)
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -56,10 +56,10 @@ 
      * 	@param	DoliDB	$db			Database handler
      *  @param	string	$param		More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
-		$this->db=$db;
-		$this->paramdef=$param;
+		$this->db = $db;
+		$this->paramdef = $param;
     }
 
     /**
@@ -69,98 +69,98 @@ 
      *  @param	int		$cachedelay		Delay we accept for cache file
      *  @return	void
      */
-    function loadBox($max=5, $cachedelay=3600)
+    function loadBox($max = 5, $cachedelay = 3600)
     {
         global $user, $langs, $conf;
         $langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
 		// On recupere numero de param de la boite
-		preg_match('/^([0-9]+) /',$this->paramdef,$reg);
-		$site=$reg[1];
+		preg_match('/^([0-9]+) /', $this->paramdef, $reg);
+		$site = $reg[1];
 
 		// Create dir nor required
 		// documents/externalrss is created by module activation
 		// documents/externalrss/tmp is created by rssparser
 
-		$keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
-		$keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
+		$keyforparamurl = "EXTERNAL_RSS_URLRSS_".$site;
+		$keyforparamtitle = "EXTERNAL_RSS_TITLE_".$site;
 
 		// Get RSS feed
-		$url=$conf->global->$keyforparamurl;
+		$url = $conf->global->$keyforparamurl;
 
-        $rssparser=new RssParser($this->db);
+        $rssparser = new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
 
 		// INFO on channel
-		$description=$rssparser->getDescription();
-		$link=$rssparser->getLink();
+		$description = $rssparser->getDescription();
+		$link = $rssparser->getLink();
 
-        $title=$langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
-        if ($result < 0 || ! empty($rssparser->error))
+        $title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
+        if ($result < 0 || !empty($rssparser->error))
         {
             // Show warning
-            $title.=" ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate",($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(),"dayhourtext"):$langs->trans("Unknown"))));
-            $this->info_box_head = array('text' => $title,'limit' => 0);
+            $title .= " ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown"))));
+            $this->info_box_head = array('text' => $title, 'limit' => 0);
         }
         else
         {
             $this->info_box_head = array(
                 'text' => $title,
                 'sublink' => $link,
-                'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(),"dayhourtext"):$langs->trans("Unknown")),
+                'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
                 'subpicto'=>'help',
 		'target'=>'_blank',
             );
 		}
 
 		// INFO on items
-		$items=$rssparser->getItems();
+		$items = $rssparser->getItems();
         //print '<pre>'.print_r($items,true).'</pre>';
-		$nbitems=count($items);
-        for($line = 0; $line < $max && $line < $nbitems; $line++)
+		$nbitems = count($items);
+        for ($line = 0; $line < $max && $line < $nbitems; $line++)
         {
             $item = $items[$line];
 
 			// Feed common fields
-            $href  = $item['link'];
+            $href = $item['link'];
         	$title = urldecode($item['title']);
-			$date  = $item['date_timestamp'];       // date will be empty if conversion into timestamp failed
+			$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
 			if ($rssparser->getFormat() == 'rss')   // If RSS
 			{
-				if (! $date && isset($item['pubdate']))    $date=$item['pubdate'];
-				if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];
+				if (!$date && isset($item['pubdate']))    $date = $item['pubdate'];
+				if (!$date && isset($item['dc']['date'])) $date = $item['dc']['date'];
 				//$item['dc']['language']
 				//$item['dc']['publisher']
 			}
 			if ($rssparser->getFormat() == 'atom')	// If Atom
 			{
-				if (! $date && isset($item['issued']))    $date=$item['issued'];
-				if (! $date && isset($item['modified']))  $date=$item['modified'];
+				if (!$date && isset($item['issued']))    $date = $item['issued'];
+				if (!$date && isset($item['modified']))  $date = $item['modified'];
 				//$item['issued']
 				//$item['modified']
 				//$item['atom_content']
 			}
-			if (is_numeric($date)) $date=dol_print_date($date,"dayhour");
+			if (is_numeric($date)) $date = dol_print_date($date, "dayhour");
 
 			$isutf8 = utf8_check($title);
-	        if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title);
-	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title);
+	        if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
+	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
 
-            $title=preg_replace("/([[:alnum:]])\?([[:alnum:]])/","\\1'\\2",$title);   // Gere probleme des apostrophes mal codee/decodee par utf8
-            $title=preg_replace("/^\s+/","",$title);                                  // Supprime espaces de debut
-            $this->info_box_contents["$href"]="$title";
+            $title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
+            $title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
+            $this->info_box_contents["$href"] = "$title";
 
             $tooltip = $title;
-            $description = ! empty($item['description'])?$item['description']:'';
+            $description = !empty($item['description']) ? $item['description'] : '';
             $isutf8 = utf8_check($description);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $description=utf8_encode($description);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description=utf8_decode($description);
-            $description=preg_replace("/([[:alnum:]])\?([[:alnum:]])/","\\1'\\2",$description);
-            $description=preg_replace("/^\s+/","",$description);
-            $description=str_replace("\r\n","",$description);
-            $tooltip.= '<br>'.$description;
+            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
+            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
+            $description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
+            $description = preg_replace("/^\s+/", "", $description);
+            $description = str_replace("\r\n", "", $description);
+            $tooltip .= '<br>'.$description;
 
             $this->info_box_contents[$line][0] = array(
                 'td' => 'align="left" width="16"',
@@ -195,7 +195,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +26 added lines, -11 removed lines

@@ -103,8 +103,7 @@ 
             // Show warning
             $title.=" ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate",($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(),"dayhourtext"):$langs->trans("Unknown"))));
             $this->info_box_head = array('text' => $title,'limit' => 0);
-        }
-        else
+        } else
         {
             $this->info_box_head = array(
                 'text' => $title,
@@ -127,26 +126,39 @@ 
             $href  = $item['link'];
         	$title = urldecode($item['title']);
 			$date  = $item['date_timestamp'];       // date will be empty if conversion into timestamp failed
-			if ($rssparser->getFormat() == 'rss')   // If RSS
+			if ($rssparser->getFormat() == 'rss') {
+			    // If RSS
 			{
 				if (! $date && isset($item['pubdate']))    $date=$item['pubdate'];
-				if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];
+			}
+				if (! $date && isset($item['dc']['date'])) {
+				    $date=$item['dc']['date'];
+				}
 				//$item['dc']['language']
 				//$item['dc']['publisher']
 			}
-			if ($rssparser->getFormat() == 'atom')	// If Atom
+			if ($rssparser->getFormat() == 'atom') {
+			    // If Atom
 			{
 				if (! $date && isset($item['issued']))    $date=$item['issued'];
-				if (! $date && isset($item['modified']))  $date=$item['modified'];
+			}
+				if (! $date && isset($item['modified'])) {
+				    $date=$item['modified'];
+				}
 				//$item['issued']
 				//$item['modified']
 				//$item['atom_content']
 			}
-			if (is_numeric($date)) $date=dol_print_date($date,"dayhour");
+			if (is_numeric($date)) {
+			    $date=dol_print_date($date,"dayhour");
+			}
 
 			$isutf8 = utf8_check($title);
-	        if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title);
-	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title);
+	        if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+	            $title=utf8_encode($title);
+	        } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+	            $title=utf8_decode($title);
+	        }
 
             $title=preg_replace("/([[:alnum:]])\?([[:alnum:]])/","\\1'\\2",$title);   // Gere probleme des apostrophes mal codee/decodee par utf8
             $title=preg_replace("/^\s+/","",$title);                                  // Supprime espaces de debut
@@ -155,8 +167,11 @@ 
             $tooltip = $title;
             $description = ! empty($item['description'])?$item['description']:'';
             $isutf8 = utf8_check($description);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $description=utf8_encode($description);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description=utf8_decode($description);
+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                $description=utf8_encode($description);
+            } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                $description=utf8_decode($description);
+            }
             $description=preg_replace("/([[:alnum:]])\?([[:alnum:]])/","\\1'\\2",$description);
             $description=preg_replace("/^\s+/","",$description);
             $description=str_replace("\r\n","",$description);

dolibarr/htdocs/core/boxes/box_factures.php

Indentation +63 added lines, -63 removed lines

@@ -30,48 +30,48 @@ 
  */
 class box_factures extends ModeleBoxes
 {
-	var $boxcode="lastcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastCustomerBills";
-	var $depends = array("facture");
+    var $boxcode="lastcustomerbills";
+    var $boximg="object_bill";
+    var $boxlabel="BoxLastCustomerBills";
+    var $depends = array("facture");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->facture->lire);
-	}
+        $this->hidden=! ($user->rights->facture->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
         include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -81,11 +81,11 @@ 
 
         $langs->load("bills");
 
-		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
-		$this->info_box_head = array(
-				'text' => $text,
-				'limit'=> dol_strlen($text)
-		);
+        $text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
+        $this->info_box_head = array(
+                'text' => $text,
+                'limit'=> dol_strlen($text)
+        );
 
         if ($user->rights->facture->lire) {
             $sql = "SELECT f.rowid as facid";
@@ -93,28 +93,28 @@ 
             $sql.= ", f.tva as total_tva";
             $sql.= ", f.total_ttc";
             $sql.= ", f.datef as df";
-			$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
+            $sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
             $sql.= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
-			$sql.= ", f.date_lim_reglement as datelimite";
-			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ")";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= ", f.date_lim_reglement as datelimite";
+            $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= ")";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND f.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
             if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
             else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql.= $db->plimit($max, 0);
 
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$now=dol_now();
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $now=dol_now();
 
-				$line = 0;
-				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+                $line = 0;
+                $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
                 while ($line < $num) {
                     $objp = $db->fetch_object($result);
@@ -143,8 +143,8 @@ 
                     $societestatic->idprof5 = $objp->idprof5;
                     $societestatic->idprof6 = $objp->idprof6;
 
-					$late = '';
-					if ($facturestatic->hasDelay()) {
+                    $late = '';
+                    if ($facturestatic->hasDelay()) {
                         $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
                     }
 
@@ -201,16 +201,16 @@ 
         }
     }
 
-	/**
-	 *  Method to show box
-	 *
-	 *  @param  array   $head       Array with properties of box title
-	 *  @param  array   $contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *  Method to show box
+     *
+     *  @param  array   $head       Array with properties of box title
+     *  @param  array   $contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -30,9 +30,9 @@ 
  */
 class box_factures extends ModeleBoxes
 {
-	var $boxcode="lastcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastCustomerBills";
+	var $boxcode = "lastcustomerbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxLastCustomerBills";
 	var $depends = array("facture");
 
 	/**
@@ -52,13 +52,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->facture->lire);
+	    $this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
@@ -67,11 +67,11 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -81,7 +81,7 @@ 
 
         $langs->load("bills");
 
-		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
+		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text)
@@ -89,29 +89,29 @@ 
 
         if ($user->rights->facture->lire) {
             $sql = "SELECT f.rowid as facid";
-            $sql.= ", f.ref, f.type, f.total as total_ht";
-            $sql.= ", f.tva as total_tva";
-            $sql.= ", f.total_ttc";
-            $sql.= ", f.datef as df";
-			$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
-            $sql.= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
-			$sql.= ", f.date_lim_reglement as datelimite";
-			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ")";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql .= ", f.ref, f.type, f.total as total_ht";
+            $sql .= ", f.tva as total_tva";
+            $sql .= ", f.total_ttc";
+            $sql .= ", f.datef as df";
+			$sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
+            $sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+			$sql .= ", f.date_lim_reglement as datelimite";
+			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ")";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id)	$sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$now=dol_now();
+				$now = dol_now();
 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
@@ -145,7 +145,7 @@ 
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
                     }
 
                     $this->info_box_contents[$line][] = array(
@@ -168,18 +168,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedInvoices"),
@@ -209,7 +209,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +17 added lines, -7 removed lines

@@ -97,14 +97,23 @@ 
             $sql.= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql.= ", f.date_lim_reglement as datelimite";
 			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= ")";
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+			    $sql.= " AND s.rowid = ".$user->societe_id;
+			}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+                $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+            } else {
+                $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+            }
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -179,11 +188,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedInvoices"),
                     );
+                }
 
                 $db->free($result);
             } else {

dolibarr/htdocs/core/boxes/box_factures_fourn.php

Indentation +71 added lines, -71 removed lines

@@ -31,96 +31,96 @@ 
  */
 class box_factures_fourn extends ModeleBoxes
 {
-	var $boxcode="lastsupplierbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastSupplierBills";
-	var $depends = array("facture","fournisseur");
+    var $boxcode="lastsupplierbills";
+    var $boximg="object_bill";
+    var $boxlabel="BoxLastSupplierBills";
+    var $depends = array("facture","fournisseur");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
-	}
+        $this->hidden=! ($user->rights->fournisseur->facture->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
         $facturestatic = new FactureFournisseur($db);
         $thirdpartytmp = new Fournisseur($db);
 
-		$this->info_box_head = array(
-				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
-		);
+        $this->info_box_head = array(
+                'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
+        );
 
-		if ($user->rights->fournisseur->facture->lire)
-		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
+        if ($user->rights->fournisseur->facture->lire)
+        {
+            $sql = "SELECT s.nom as name, s.rowid as socid,";
             $sql.= " s.code_fournisseur,";
             $sql.= " s.logo,";
-			$sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
+            $sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
             $sql.= " f.total_ht,";
             $sql.= " f.total_tva,";
             $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut,";
-			$sql.= ' f.datef as df,';
-			$sql.= ' f.datec as datec,';
-			$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= " f.paye, f.fk_statut,";
+            $sql.= ' f.datef as df,';
+            $sql.= ' f.datec as datec,';
+            $sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND f.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
             if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
             else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql.= $db->plimit($max, 0);
 
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
 
-				$line = 0;
-				$l_due_date =  $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+                $line = 0;
+                $l_due_date =  $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
                 while ($line < $num) {
-					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
-					$date=$db->jdate($objp->df);
-					$datem=$db->jdate($objp->tms);
+                    $objp = $db->fetch_object($result);
+                    $datelimite=$db->jdate($objp->datelimite);
+                    $date=$db->jdate($objp->df);
+                    $datem=$db->jdate($objp->tms);
 
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
@@ -137,9 +137,9 @@ 
                     $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
                     $thirdpartytmp->logo = $objp->logo;
 
-					$late = '';
+                    $late = '';
 
-					if ($facturestatic->hasDelay()) {
+                    if ($facturestatic->hasDelay()) {
                         $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
                     }
 
@@ -206,17 +206,17 @@ 
         }
     }
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +41 added lines, -41 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_factures_fourn extends ModeleBoxes
 {
-	var $boxcode="lastsupplierbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastSupplierBills";
-	var $depends = array("facture","fournisseur");
+	var $boxcode = "lastsupplierbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxLastSupplierBills";
+	var $depends = array("facture", "fournisseur");
 
 	/**
      * @var DoliDB Database handler.
@@ -53,13 +53,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
+	    $this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
@@ -68,11 +68,11 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
@@ -81,32 +81,32 @@ 
         $thirdpartytmp = new Fournisseur($db);
 
 		$this->info_box_head = array(
-				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
+				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
 		);
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_fournisseur,";
-            $sql.= " s.logo,";
-			$sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
-            $sql.= " f.total_ht,";
-            $sql.= " f.total_tva,";
-            $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut,";
-			$sql.= ' f.datef as df,';
-			$sql.= ' f.datec as datec,';
-			$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql .= " s.code_fournisseur,";
+            $sql .= " s.logo,";
+			$sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
+            $sql .= " f.total_ht,";
+            $sql .= " f.total_tva,";
+            $sql .= " f.total_ttc,";
+			$sql .= " f.paye, f.fk_statut,";
+			$sql .= ' f.datef as df,';
+			$sql .= ' f.datec as datec,';
+			$sql .= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -114,13 +114,13 @@ 
 				$num = $db->num_rows($result);
 
 				$line = 0;
-				$l_due_date =  $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
                 while ($line < $num) {
 					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
-					$date=$db->jdate($objp->df);
-					$datem=$db->jdate($objp->tms);
+					$datelimite = $db->jdate($objp->datelimite);
+					$date = $db->jdate($objp->df);
+					$datem = $db->jdate($objp->tms);
 
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
@@ -140,7 +140,7 @@ 
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-                        $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
                     }
 
                     $this->info_box_contents[$line][] = array(
@@ -153,7 +153,7 @@ 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="tdoverflowmax50"',
                         'text' => $objp->ref_supplier,
-                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
                         'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
                     );
 
@@ -170,21 +170,21 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $fac = new FactureFournisseur($db);
                     $fac->fetch($objp->facid);
-                    $alreadypaid=$fac->getSommePaiement();
+                    $alreadypaid = $fac->getSommePaiement();
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoModifiedSupplierBills"),
@@ -214,7 +214,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +17 added lines, -7 removed lines

@@ -99,13 +99,22 @@ 
 			$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+			    $sql.= " AND s.rowid = ".$user->societe_id;
+			}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+                $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+            } else {
+                $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+            }
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -184,11 +193,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoModifiedSupplierBills"),
                     );
+                }
 
                 $db->free($result);
             } else {

dolibarr/htdocs/core/boxes/box_goodcustomers.php

Indentation +114 added lines, -114 removed lines

@@ -33,145 +33,145 @@
  */
 class box_goodcustomers extends ModeleBoxes
 {
-	var $boxcode="goodcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxGoodCustomers";
-	var $depends = array("societe");
+    var $boxcode="goodcustomers";
+    var $boximg="object_company";
+    var $boxlabel="BoxGoodCustomers";
+    var $depends = array("societe");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $enabled = 1;
+    var $enabled = 1;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB	$db      	Database handler
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param='')
-	{
-		global $conf, $user;
+     */
+    function __construct($db,$param='')
+    {
+        global $conf, $user;
 
-		$this->db = $db;
+        $this->db = $db;
 
-		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+        // disable box for such cases
+        if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+        if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
 
-		$this->hidden = ! ($user->rights->societe->lire);
-	}
+        $this->hidden = ! ($user->rights->societe->lire);
+    }
 
-	/**
+    /**
      *  Load data for box to show them later
      *
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
-		$langs->load("boxes");
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+        $langs->load("boxes");
 
-		$this->max=$max;
+        $this->max=$max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
         $thirdpartystatic=new Societe($db);
 
         $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
 
-		if ($user->rights->societe->lire)
-		{
-
-			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
-			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
-			$sql.= ' AND s.rowid = f.fk_soc';
-			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
-			$sql.= $db->order("nbfact","DESC");
-			$sql.= $db->plimit($max,0);
-
-			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-
-				$line = 0;
-				while ($line < $num)
-				{
-					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
-					$thirdpartystatic->id = $objp->rowid;
-					$thirdpartystatic->name = $objp->name;
-					$thirdpartystatic->code_client = $objp->code_client;
-					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-					$thirdpartystatic->client = $objp->client;
-					$thirdpartystatic->fournisseur = $objp->fournisseur;
-					$thirdpartystatic->logo = $objp->logo;
-					$nbfact = $objp->nbfact;
-					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => '',
-					    'text' => $thirdpartystatic->getNomUrl(1),
-					    'asis' => 1,
-					);
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => dol_print_date($datem, "day")
-					);
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
-					);
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status,3)
-					);
-
-					$line++;
-				}
-
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
-
-				$db->free($result);
-			}
-			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
-    	        										'maxlength'=>500,
-	            										'text' => ($db->error().' sql='.$sql));
-			}
-		}
-		else {
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+        if ($user->rights->societe->lire)
+        {
+
+            $sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
+            $sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+            $sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
+            $sql.= ' AND s.rowid = f.fk_soc';
+            $sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
+            $sql.= $db->order("nbfact","DESC");
+            $sql.= $db->plimit($max,0);
+
+            dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+
+                $line = 0;
+                while ($line < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $datem=$db->jdate($objp->tms);
+                    $thirdpartystatic->id = $objp->rowid;
+                    $thirdpartystatic->name = $objp->name;
+                    $thirdpartystatic->code_client = $objp->code_client;
+                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+                    $thirdpartystatic->client = $objp->client;
+                    $thirdpartystatic->fournisseur = $objp->fournisseur;
+                    $thirdpartystatic->logo = $objp->logo;
+                    $nbfact = $objp->nbfact;
+                    $nbimpaye = $objp->nbfact - $objp->nbfactpaye;
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => '',
+                        'text' => $thirdpartystatic->getNomUrl(1),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'class="right"',
+                        'text' => dol_print_date($datem, "day")
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'class="right"',
+                        'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="right" width="18"',
+                        'text' => $thirdpartystatic->LibStatut($objp->status,3)
+                    );
+
+                    $line++;
+                }
+
+                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+
+                $db->free($result);
+            }
+            else {
+                $this->info_box_contents[0][0] = array(	'td' => '',
+                                                        'maxlength'=>500,
+                                                        'text' => ($db->error().' sql='.$sql));
+            }
+        }
+        else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+            );
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_goodcustomers extends ModeleBoxes
 {
-	var $boxcode="goodcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxGoodCustomers";
+	var $boxcode = "goodcustomers";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxGoodCustomers";
 	var $depends = array("societe");
 
 	/**
@@ -55,17 +55,17 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled = 0; // not enabled by default. Very slow on large database
 
-		$this->hidden = ! ($user->rights->societe->lire);
+		$this->hidden = !($user->rights->societe->lire);
 	}
 
 	/**
@@ -74,29 +74,29 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+        $thirdpartystatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
 
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
-			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
-			$sql.= ' AND s.rowid = f.fk_soc';
-			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
-			$sql.= $db->order("nbfact","DESC");
-			$sql.= $db->plimit($max,0);
+			$sql .= " count(*) as nbfact, sum(".$db->ifsql('f.paye=1', '1', '0').") as nbfactpaye";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
+			$sql .= ' AND s.rowid = f.fk_soc';
+			$sql .= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
+			$sql .= $db->order("nbfact", "DESC");
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
@@ -108,7 +108,7 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->rowid;
 					$thirdpartystatic->name = $objp->name;
 					$thirdpartystatic->code_client = $objp->code_client;
@@ -132,23 +132,23 @@ 
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'class="right"',
-					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
+					    'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
 					);
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status,3)
+					    'text' => $thirdpartystatic->LibStatut($objp->status, 3)
 					);
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
 
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
@@ -169,7 +169,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +13 added lines, -7 removed lines

@@ -62,8 +62,14 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		    $this->enabled=0;
+		}
+		// disabled by this option
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) {
+		    $this->enabled=0;
+		}
+		// not enabled by default. Very slow on large database
 
 		$this->hidden = ! ($user->rights->societe->lire);
 	}
@@ -143,17 +149,17 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num==0) {
+				    $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				}
 
 				$db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_services_contracts.php

Indentation +184 added lines, -184 removed lines

@@ -32,218 +32,218 @@
  */
 class box_services_contracts extends ModeleBoxes
 {
-	var $boxcode="lastproductsincontract";
-	var $boximg="object_product";
-	var $boxlabel="BoxLastProductsInContract";
-	var $depends = array("service","contrat");
+    var $boxcode="lastproductsincontract";
+    var $boximg="object_product";
+    var $boxlabel="BoxLastProductsInContract";
+    var $depends = array("service","contrat");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->service->lire && $user->rights->contrat->lire);
-	}
+        $this->hidden=! ($user->rights->service->lire && $user->rights->contrat->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
-
-		$this->max=$max;
-
-		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-
-		$form = new Form($db);
-
-		$this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max));
-
-		if ($user->rights->service->lire && $user->rights->contrat->lire)
-		{
-		    $contractstatic=new Contrat($db);
-		    $contratlignestatic=new ContratLigne($db);
-		    $thirdpartytmp = new Societe($db);
-		    $productstatic = new Product($db);
-
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-			$sql.= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
-			$sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
-			$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity";
-			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
-			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
-			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			$sql.= ")";
-			$sql.= " WHERE c.entity = ".$conf->entity;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= $db->order("c.tms","DESC");
-			$sql.= $db->plimit($max, 0);
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$now=dol_now();
-
-				$i = 0;
-
-				while ($i < $num)
-				{
-					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->datem);
-
-					$contratlignestatic->id=$objp->cdid;
-					$contratlignestatic->fk_contrat=$objp->rowid;
-					$contratlignestatic->label=$objp->label;
-					$contratlignestatic->description=$objp->description;
-					$contratlignestatic->type=$objp->type;
-					$contratlignestatic->product_id=$objp->product_id;
-					$contratlignestatic->product_ref=$objp->product_ref;
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+
+        $this->max=$max;
+
+        include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+        $form = new Form($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max));
+
+        if ($user->rights->service->lire && $user->rights->contrat->lire)
+        {
+            $contractstatic=new Contrat($db);
+            $contratlignestatic=new ContratLigne($db);
+            $thirdpartytmp = new Societe($db);
+            $productstatic = new Product($db);
+
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+            $sql.= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
+            $sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
+            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity";
+            $sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
+            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
+            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            $sql.= ")";
+            $sql.= " WHERE c.entity = ".$conf->entity;
+            if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            $sql.= $db->order("c.tms","DESC");
+            $sql.= $db->plimit($max, 0);
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $now=dol_now();
+
+                $i = 0;
+
+                while ($i < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $datem=$db->jdate($objp->datem);
+
+                    $contratlignestatic->id=$objp->cdid;
+                    $contratlignestatic->fk_contrat=$objp->rowid;
+                    $contratlignestatic->label=$objp->label;
+                    $contratlignestatic->description=$objp->description;
+                    $contratlignestatic->type=$objp->type;
+                    $contratlignestatic->product_id=$objp->product_id;
+                    $contratlignestatic->product_ref=$objp->product_ref;
 
                     $contractstatic->statut=$objp->contract_status;
-					$contractstatic->id=$objp->rowid;
-					$contractstatic->ref=$objp->ref;
-					$contractstatic->ref_customer=$objp->ref_customer;
-					$contractstatic->ref_supplier=$objp->ref_supplier;
-
-					$thirdpartytmp->name = $objp->name;
-					$thirdpartytmp->id = $objp->socid;
-					$thirdpartytmp->email = $objp->email;
-					$thirdpartytmp->client = $objp->client;
-					$thirdpartytmp->fournisseur = $objp->fournisseur;
-					$thirdpartytmp->code_client = $objp->code_client;
-					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-					$thirdpartytmp->code_compta = $objp->code_compta;
-					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
-
-					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
-					{
-						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->product_id;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
-
-						$resultd = $db->query($sqld);
-						if ($resultd)
-						{
-							$objtp = $db->fetch_object($resultd);
-							if ($objtp->label != '') $contratlignestatic->label = $objtp->label;
-						}
-					}
-
-					// Label
-					if ($objp->product_id > 0)
-					{
-						$productstatic->id=$objp->product_id;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->product_ref;
-						$productstatic->entity=$objp->pentity;
-						$productstatic->label=$objp->plabel;
-						$text = $productstatic->getNomUrl(1,'',20);
-						if ($objp->plabel)
-						{
-							$text .= ' - ';
-							//$productstatic->ref=$objp->label;
-							//$text .= $productstatic->getNomUrl(0,'',16);
-							$text .= $objp->plabel;
-						}
-						$description = $objp->description;
-
-						// Add description in form
-						if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
-							//$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-							$description = '';	// Already added into main visible desc
-						}
-
-						$s = $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-					}
-					else
-					{
-						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
-					}
-
-
-					$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+                    $contractstatic->id=$objp->rowid;
+                    $contractstatic->ref=$objp->ref;
+                    $contractstatic->ref_customer=$objp->ref_customer;
+                    $contractstatic->ref_supplier=$objp->ref_supplier;
+
+                    $thirdpartytmp->name = $objp->name;
+                    $thirdpartytmp->id = $objp->socid;
+                    $thirdpartytmp->email = $objp->email;
+                    $thirdpartytmp->client = $objp->client;
+                    $thirdpartytmp->fournisseur = $objp->fournisseur;
+                    $thirdpartytmp->code_client = $objp->code_client;
+                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+                    $thirdpartytmp->code_compta = $objp->code_compta;
+                    $thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+
+                    // Multilangs
+                    if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
+                    {
+                        $sqld = "SELECT label";
+                        $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
+                        $sqld.= " WHERE fk_product=".$objp->product_id;
+                        $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
+                        $sqld.= " LIMIT 1";
+
+                        $resultd = $db->query($sqld);
+                        if ($resultd)
+                        {
+                            $objtp = $db->fetch_object($resultd);
+                            if ($objtp->label != '') $contratlignestatic->label = $objtp->label;
+                        }
+                    }
+
+                    // Label
+                    if ($objp->product_id > 0)
+                    {
+                        $productstatic->id=$objp->product_id;
+                        $productstatic->type=$objp->ptype;
+                        $productstatic->ref=$objp->product_ref;
+                        $productstatic->entity=$objp->pentity;
+                        $productstatic->label=$objp->plabel;
+                        $text = $productstatic->getNomUrl(1,'',20);
+                        if ($objp->plabel)
+                        {
+                            $text .= ' - ';
+                            //$productstatic->ref=$objp->label;
+                            //$text .= $productstatic->getNomUrl(0,'',16);
+                            $text .= $objp->plabel;
+                        }
+                        $description = $objp->description;
+
+                        // Add description in form
+                        if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                        {
+                            //$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                            $description = '';	// Already added into main visible desc
+                        }
+
+                        $s = $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+                    }
+                    else
+                    {
+                        $s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
+                    }
+
+
+                    $this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                     'text' => $s,
-					'asis' => 1
+                    'asis' => 1
                     );
 
-					$this->info_box_contents[$i][] = array('td' => '',
+                    $this->info_box_contents[$i][] = array('td' => '',
                     'text' => $contractstatic->getNomUrl(1),
-					'asis' => 1
+                    'asis' => 1
                     );
 
-					$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+                    $this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                     'text' => $thirdpartytmp->getNomUrl(1),
-					'asis' => 1
+                    'asis' => 1
                     );
 
-					$this->info_box_contents[$i][] = array('td' => '',
+                    $this->info_box_contents[$i][] = array('td' => '',
                     'text' => dol_print_date($datem,'day'));
 
-					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
+                    $this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
                     'text' => $contratlignestatic->LibStatut($objp->statut,3)
-					);
-
-					$i++;
-				}
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
-
-				$db->free($result);
-			}
-			else
-			{
-				$this->info_box_contents[0][0] = array(	'td' => '',
-    	        										'maxlength'=>500,
-	            										'text' => ($db->error().' sql='.$sql));
-			}
-		}
-		else {
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+                    );
+
+                    $i++;
+                }
+                if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
+
+                $db->free($result);
+            }
+            else
+            {
+                $this->info_box_contents[0][0] = array(	'td' => '',
+                                                        'maxlength'=>500,
+                                                        'text' => ($db->error().' sql='.$sql));
+            }
+        }
+        else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+            );
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +60 added lines, -60 removed lines

@@ -32,10 +32,10 @@ 
  */
 class box_services_contracts extends ModeleBoxes
 {
-	var $boxcode="lastproductsincontract";
-	var $boximg="object_product";
-	var $boxlabel="BoxLastProductsInContract";
-	var $depends = array("service","contrat");
+	var $boxcode = "lastproductsincontract";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxLastProductsInContract";
+	var $depends = array("service", "contrat");
 
 	/**
      * @var DoliDB Database handler.
@@ -54,13 +54,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->service->lire && $user->rights->contrat->lire);
+	    $this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
 	}
 
 	/**
@@ -69,66 +69,66 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 		$form = new Form($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract", $max));
 
 		if ($user->rights->service->lire && $user->rights->contrat->lire)
 		{
-		    $contractstatic=new Contrat($db);
-		    $contratlignestatic=new ContratLigne($db);
+		    $contractstatic = new Contrat($db);
+		    $contratlignestatic = new ContratLigne($db);
 		    $thirdpartytmp = new Societe($db);
 		    $productstatic = new Product($db);
 
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-			$sql.= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
-			$sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
-			$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity";
-			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
-			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
-			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			$sql.= ")";
-			$sql.= " WHERE c.entity = ".$conf->entity;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= $db->order("c.tms","DESC");
-			$sql.= $db->plimit($max, 0);
+			$sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
+			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
+			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity";
+			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			$sql .= ")";
+			$sql .= " WHERE c.entity = ".$conf->entity;
+			if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+			$sql .= $db->order("c.tms", "DESC");
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$now=dol_now();
+				$now = dol_now();
 
 				$i = 0;
 
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->datem);
-
-					$contratlignestatic->id=$objp->cdid;
-					$contratlignestatic->fk_contrat=$objp->rowid;
-					$contratlignestatic->label=$objp->label;
-					$contratlignestatic->description=$objp->description;
-					$contratlignestatic->type=$objp->type;
-					$contratlignestatic->product_id=$objp->product_id;
-					$contratlignestatic->product_ref=$objp->product_ref;
-
-                    $contractstatic->statut=$objp->contract_status;
-					$contractstatic->id=$objp->rowid;
-					$contractstatic->ref=$objp->ref;
-					$contractstatic->ref_customer=$objp->ref_customer;
-					$contractstatic->ref_supplier=$objp->ref_supplier;
+					$datem = $db->jdate($objp->datem);
+
+					$contratlignestatic->id = $objp->cdid;
+					$contratlignestatic->fk_contrat = $objp->rowid;
+					$contratlignestatic->label = $objp->label;
+					$contratlignestatic->description = $objp->description;
+					$contratlignestatic->type = $objp->type;
+					$contratlignestatic->product_id = $objp->product_id;
+					$contratlignestatic->product_ref = $objp->product_ref;
+
+                    $contractstatic->statut = $objp->contract_status;
+					$contractstatic->id = $objp->rowid;
+					$contractstatic->ref = $objp->ref;
+					$contractstatic->ref_customer = $objp->ref_customer;
+					$contractstatic->ref_supplier = $objp->ref_supplier;
 
 					$thirdpartytmp->name = $objp->name;
 					$thirdpartytmp->id = $objp->socid;
@@ -141,13 +141,13 @@ 
 					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
+					if (!empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
 					{
 						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->product_id;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
+						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sqld .= " WHERE fk_product=".$objp->product_id;
+						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
 						if ($resultd)
@@ -160,12 +160,12 @@ 
 					// Label
 					if ($objp->product_id > 0)
 					{
-						$productstatic->id=$objp->product_id;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->product_ref;
-						$productstatic->entity=$objp->pentity;
-						$productstatic->label=$objp->plabel;
-						$text = $productstatic->getNomUrl(1,'',20);
+						$productstatic->id = $objp->product_id;
+						$productstatic->type = $objp->ptype;
+						$productstatic->ref = $objp->product_ref;
+						$productstatic->entity = $objp->pentity;
+						$productstatic->label = $objp->plabel;
+						$text = $productstatic->getNomUrl(1, '', 20);
 						if ($objp->plabel)
 						{
 							$text .= ' - ';
@@ -176,13 +176,13 @@ 
 						$description = $objp->description;
 
 						// Add description in form
-						if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 						{
 							//$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-							$description = '';	// Already added into main visible desc
+							$description = ''; // Already added into main visible desc
 						}
 
-						$s = $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+						$s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 					}
 					else
 					{
@@ -206,21 +206,21 @@ 
                     );
 
 					$this->info_box_contents[$i][] = array('td' => '',
-                    'text' => dol_print_date($datem,'day'));
+                    'text' => dol_print_date($datem, 'day'));
 
 					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
-                    'text' => $contratlignestatic->LibStatut($objp->statut,3)
+                    'text' => $contratlignestatic->LibStatut($objp->statut, 3)
 					);
 
 					$i++;
 				}
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
+				if ($num == 0) $this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoContractedProducts"));
 
 				$db->free($result);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
@@ -241,7 +241,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +18 added lines, -11 removed lines

@@ -96,10 +96,14 @@ 
 			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
 			$sql.= ")";
 			$sql.= " WHERE c.entity = ".$conf->entity;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if($user->societe_id) {
+			    $sql.= " AND s.rowid = ".$user->societe_id;
+			}
 			$sql.= $db->order("c.tms","DESC");
 			$sql.= $db->plimit($max, 0);
 
@@ -141,9 +145,11 @@ 
 					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
+					if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) {
+					    // if option multilang is on
 					{
 						$sqld = "SELECT label";
+					}
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld.= " WHERE fk_product=".$objp->product_id;
 						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
@@ -153,7 +159,9 @@ 
 						if ($resultd)
 						{
 							$objtp = $db->fetch_object($resultd);
-							if ($objtp->label != '') $contratlignestatic->label = $objtp->label;
+							if ($objtp->label != '') {
+							    $contratlignestatic->label = $objtp->label;
+							}
 						}
 					}
 
@@ -183,8 +191,7 @@ 
 						}
 
 						$s = $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-					}
-					else
+					} else
 					{
 						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
 					}
@@ -214,18 +221,18 @@ 
 
 					$i++;
 				}
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
+				if ($num==0) {
+				    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
+				}
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_last_ticket.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
  *     \ingroup     ticket
  *     \brief       This box shows latest created tickets
  */
-require_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
 /**
  * Class to manage the box
@@ -82,17 +82,17 @@ 
             $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
             $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
             $sql .= ", s.nom as company_name";
-            $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid=t.fk_soc";
+            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 
-            $sql .= " WHERE t.entity = " . $conf->entity;
+            $sql .= " WHERE t.entity = ".$conf->entity;
             //          $sql.= " AND e.rowid = er.fk_event";
             //if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) {
-                $sql .= " AND t.fk_soc= " . $user->societe_id;
+                $sql .= " AND t.fk_soc= ".$user->societe_id;
             }
 
             //$sql.= " AND t.fk_statut > 9";
@@ -122,21 +122,21 @@ 
                     $this->info_box_contents[$i][0] = array(
                         'td' => 'align="left" width="16"',
                         'logo' => $this->boximg,
-                        'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Id
                     $this->info_box_contents[$i][$r] = array(
                         'td' => 'align="left"',
                         'text' => $objp->ref,
-                        'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Subject
                     $this->info_box_contents[$i][$r] = array(
                         'td' => 'align="left"',
                         'text' => $objp->subject, // Some event have no ref
-                        'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Customer
@@ -144,7 +144,7 @@ 
                         'td' => 'align="left"',
                         'logo' => ($objp->fk_soc > 0 ? 'company' : ''),
                         'text' => ($objp->company_name ? $objp->company_name : $objp->origin_email),
-                        'url' => ($objp->fk_soc > 0 ? DOL_URL_ROOT . "/comm/card.php?socid=" . $objp->fk_soc : ''),
+                        'url' => ($objp->fk_soc > 0 ? DOL_URL_ROOT . "/comm/card.php?socid=".$objp->fk_soc : ''),
                     );
                     $r++;
 
@@ -187,7 +187,7 @@ 
      *     @param  int   $nooutput No print, only return string
      *     @return string
      */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }