alxarafe / alixar

htdocs/core/ajax/flowjs-server.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 $flowChunkSize = GETPOST('flowChunkSize', 'alpha');
 $flowTotalSize = GETPOST('flowTotalSize', 'alpha');
 
-$result = restrictedArea($user, $module, 0, '', 0, 'fk_soc', 'rowid', 0, 1);    // Call with mode return
+$result = restrictedArea($user, $module, 0, '', 0, 'fk_soc', 'rowid', 0, 1); // Call with mode return
 
 if ($action != 'upload') {
     httponly_accessforbidden("Param action must be 'upload'");
@@ -163,7 +163,7 @@ 
 
     // check that all the parts are present
     // the size of the last part is between chunkSize and 2*$chunkSize
-    if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+    if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) {
         // create the final destination file
         if (($fp = fopen($upload_dir . '/' . $fileName, 'w')) !== false) {
             for ($i = 1; $i <= $total_files; $i++) {

htdocs/core/ajax/selectobject.php

Spacing +2 added lines, -2 removed lines

@@ -93,9 +93,9 @@
     $vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);
     $reg = array();
     if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
-        $InfoFieldList[4] = $reg[1];    // take the sort field
+        $InfoFieldList[4] = $reg[1]; // take the sort field
     }
-    $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field
+    $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp); // take the filter field
 
     $classname = $InfoFieldList[0];
     $classpath = $InfoFieldList[1];

htdocs/core/ajax/selectsearchbox.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED') && $user->hasRight('supplier_proposal', 'lire')) {
     $arrayresult['searchintosupplierpropal'] = array('position' => 100, 'img' => 'object_supplier_proposal', 'label' => $langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text' => img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"') . ' ' . $langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url' => DOL_URL_ROOT . '/supplier_proposal/list.php' . ($search_boxvalue ? '?search_all=' . urlencode($search_boxvalue) : ''));
 }
-if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') &&  $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) {
+if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) {
     $arrayresult['searchintosupplierorder'] = array('position' => 110, 'img' => 'object_supplier_order', 'label' => $langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text' => img_picto('', 'object_supplier_order', 'class="pictofixedwidth"') . ' ' . $langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url' => DOL_URL_ROOT . '/fourn/commande/list.php' . ($search_boxvalue ? '?search_all=' . urlencode($search_boxvalue) : ''));
 }
 if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED')) {

htdocs/core/ajax/objectonoff.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 // Load object according to $id and $element
 $object = fetchObjectByElement($id, $element);
 if (!is_object($object)) {
-    httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found.");   // This includes the exit.
+    httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found."); // This includes the exit.
 }
 
 $object->fields[$field] = array('type' => $format, 'enabled' => 1);
@@ -72,7 +72,7 @@ 
 if (!empty($user->socid)) {
     $socid = $user->socid;
     if (!empty($object->socid) && $socid != $object->socid) {
-        httponly_accessforbidden("Access on object not allowed for this external user.");   // This includes the exit.
+        httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit.
     }
 }
 
@@ -83,7 +83,7 @@ 
 } elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) { // Special case for products
     restrictedArea($user, 'produit|service', $object, 'product&product', '', '', 'rowid');
 } else {
-    httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported.");    // This includes the exit.
+    httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported."); // This includes the exit.
 }
 
 

htdocs/core/ajax/check_notifications.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
     $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = ' . ((int) $user->id);
     $sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '" . $db->idate(dol_now()) . "'";
     $sql .= " AND ar.status = 0";
-    $sql .= " AND ar.entity = " . ((int) $conf->entity);  // No sharing of entity for alerts
+    $sql .= " AND ar.entity = " . ((int) $conf->entity); // No sharing of entity for alerts
     $sql .= $db->order('datep', 'ASC');
     $sql .= $db->plimit(10); // Avoid too many notification at once
 

htdocs/core/ajax/onlineSign.php

Spacing +19 added lines, -19 removed lines

@@ -60,7 +60,7 @@ 
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');    // 'proposal', ...
+$mode = GETPOST('mode', 'aZ09'); // 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 $online_sign_name = GETPOST("onlinesignname") ? GETPOST("onlinesignname") : '';
 
@@ -114,8 +114,8 @@ 
             $upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output;
             $upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
 
-            $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-            $default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+            $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+            $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
             $langs->loadLangs(array("main", "companies"));
 
             $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -138,7 +138,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('proposal');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc
 
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
@@ -159,13 +159,13 @@ 
                         }
 
                         //$pdf->Open();
-                        $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                        $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                         $param = array();
                         $param['online_sign_name'] = $online_sign_name;
                         $param['pathtoimage'] = $upload_dir . $filename;
 
-                        $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                        $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                         for ($i = 1; $i < ($pagecount + 1); $i++) {
                             try {
                                 $tppl = $pdf->importPage($i);
@@ -296,7 +296,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('contrat');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
                     $newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
@@ -316,13 +316,13 @@ 
                         }
 
                         //$pdf->Open();
-                        $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                        $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                         $param = array();
                         $param['online_sign_name'] = $online_sign_name;
                         $param['pathtoimage'] = $upload_dir . $filename;
 
-                        $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                        $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                         for ($i = 1; $i < ($pagecount + 1); $i++) {
                             try {
                                 $tppl = $pdf->importPage($i);
@@ -386,7 +386,7 @@ 
 
             $langs->loadLangs(array("main", "companies"));
 
-            $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
+            $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
             $default_font = pdf_getPDFFont($langs); // Must be
 
             $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -409,7 +409,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('fichinter');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
                     $newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
@@ -429,13 +429,13 @@ 
                         }
 
                         //$pdf->Open();
-                        $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                        $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                         $param = array();
                         $param['online_sign_name'] = $online_sign_name;
                         $param['pathtoimage'] = $upload_dir . $filename;
 
-                        $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                        $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                         for ($i = 1; $i < ($pagecount + 1); $i++) {
                             try {
                                 $tppl = $pdf->importPage($i);
@@ -501,8 +501,8 @@ 
 
                 $upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName($object->thirdparty->id) . '/';
 
-                $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-                $default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+                $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+                $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
                 $langs->loadLangs(array("main", "companies"));
 
                 $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -526,7 +526,7 @@ 
                     // Defined modele of doc
                     $last_main_doc_file = $object->last_main_doc;
                     $last_modelpdf = $object->model_pdf;
-                    $directdownloadlink = $object->getLastMainDocLink('company');    // url to download the $object->last_main_doc
+                    $directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc
 
                     if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                         $sourcefile = '';
@@ -549,9 +549,9 @@ 
                             }
 
                             //$pdf->Open();
-                            $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                            $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-                            $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                            $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                             for ($i = 1; $i < ($pagecount + 1); $i++) {
                                 try {
                                     $tppl = $pdf->importPage($i);
@@ -703,7 +703,7 @@ 
  */
 function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
 {
-    $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
+    $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
     $default_font = pdf_getPDFFont($langs); // Must be
     $xforimgstart = $params['xforimgstart'];
     $yforimgstart = $params['yforimgstart'];

htdocs/core/ajax/locationincoterms.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 // Security check
 if (!isModEnabled('incoterm')) {
-    httponly_accessforbidden("Module incoterm not enabled");    // This includes the exit.
+    httponly_accessforbidden("Module incoterm not enabled"); // This includes the exit.
 }
 // There is no other permission on this component. Everybody connected can read content of the incoterm table
 

htdocs/core/ajax/row.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
     if ($reshook > 0) {
         $perm = $hookmanager->resArray['perm'];
     }
-    if (! $perm) {
+    if (!$perm) {
         // We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
         // If we are here, it is a hack attempt, so we report a warning.
         print 'Bad permission to modify position of lines for object in table ' . $table_element_line;
@@ -161,7 +161,7 @@ 
 
     // Reorder line to have position of children lines sharing same counter than parent lines
     // This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-    if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) {
+    if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) {
         $result = $row->line_order(true);
     }
 } else {

htdocs/core/actions_setmoduleoptions.inc.php

Spacing +6 added lines, -6 removed lines

@@ -81,19 +81,19 @@ 
     $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 
     foreach ($listofdir as $key => $tmpdir) {
-        $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);  // Clean string if we found a hardcoded DOL_DATA_ROOT
+        $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
         if (!$tmpdir) {
             unset($listofdir[$key]);
             continue;
         }
-        $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir;    // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+        $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
         if (!is_dir($tmpdir)) {
             if (empty($nomessageinsetmoduleoptions)) {
                 setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
             }
         } else {
             $upload_dir = $tmpdir;
-            break;  // So we take the first directory found into setup $conf->global->$keyforuploaddir
+            break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
         }
     }
 
@@ -133,19 +133,19 @@ 
 
         foreach ($listofdir as $key => $tmpdir) {
             $tmpdir = trim($tmpdir);
-            $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);  // Clean string if we found a hardcoded DOL_DATA_ROOT
+            $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
             if (!$tmpdir) {
                 unset($listofdir[$key]);
                 continue;
             }
-            $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir;    // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+            $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
             if (!is_dir($tmpdir)) {
                 if (empty($nomessageinsetmoduleoptions)) {
                     setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
                 }
             } else {
                 $upload_dir = $tmpdir;
-                break;  // So we take the first directory found into setup $conf->global->$keyforuploaddir
+                break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
             }
         }