@@ -129,7 +129,9 @@ |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | $object->fields['fk_member']['visible'] = 0; |
132 | -if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1; |
|
132 | +if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) { |
|
133 | + $object->fields['reason_decline_or_cancel']['visible'] = 1; |
|
134 | +} |
|
133 | 135 | $object->fields['note_public']['visible'] = 1; |
134 | 136 | |
135 | 137 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php'; |
34 | 34 | |
35 | 35 | // Load translation files required by the page |
36 | -$langs->loadLangs(array("companies","members","partnership", "other")); |
|
36 | +$langs->loadLangs(array("companies", "members", "partnership", "other")); |
|
37 | 37 | |
38 | 38 | // Get parameters |
39 | 39 | $id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int'); |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | // Initialize technical objects |
55 | -$object = new Partnership($db); |
|
56 | -$extrafields = new ExtraFields($db); |
|
57 | -$adht = new AdherentType($db); |
|
55 | +$object = new Partnership($db); |
|
56 | +$extrafields = new ExtraFields($db); |
|
57 | +$adht = new AdherentType($db); |
|
58 | 58 | $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; |
59 | 59 | $hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array |
60 | 60 |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if ($backupold) { |
158 | 158 | dol_delete_file($filetpl.'.old'); |
159 | 159 | $result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0); |
160 | - if (! $result) { |
|
160 | + if (!$result) { |
|
161 | 161 | return false; |
162 | 162 | } |
163 | 163 | } else { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | $indexcontent .= " require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n"; |
347 | 347 | $indexcontent .= ' redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n"; |
348 | 348 | $indexcontent .= "}\n"; |
349 | - $indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of . |
|
349 | + $indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of . |
|
350 | 350 | $indexcontent .= '// END PHP ?>'."\n"; |
351 | 351 | $result = file_put_contents($fileindexsub, $indexcontent); |
352 | 352 | if ($result === false) { |
@@ -109,7 +109,9 @@ discard block |
||
109 | 109 | $filename = basename($filealias); |
110 | 110 | foreach (explode(',', $object->otherlang) as $sublang) { |
111 | 111 | // Avoid to erase main alias file if $sublang is empty string |
112 | - if (empty(trim($sublang))) continue; |
|
112 | + if (empty(trim($sublang))) { |
|
113 | + continue; |
|
114 | + } |
|
113 | 115 | $filealiassub = $dirname.'/'.$sublang.'/'.$filename; |
114 | 116 | |
115 | 117 | $aliascontent = '<?php'."\n"; |
@@ -332,7 +334,9 @@ discard block |
||
332 | 334 | $dirname = dirname($fileindex); |
333 | 335 | foreach (explode(',', $object->otherlang) as $sublang) { |
334 | 336 | // Avoid to erase main alias file if $sublang is empty string |
335 | - if (empty(trim($sublang))) continue; |
|
337 | + if (empty(trim($sublang))) { |
|
338 | + continue; |
|
339 | + } |
|
336 | 340 | $fileindexsub = $dirname.'/'.$sublang.'/index.php'; |
337 | 341 | |
338 | 342 | // Same indexcontent than previously but with ../ instead of ./ for master and tpl file include/require_once. |
@@ -354,7 +354,7 @@ |
||
354 | 354 | if (is_numeric($ValueField) && $ValueField > 0) { |
355 | 355 | $szFilterQuery = " ".$NameField." = ".((float) $ValueField); |
356 | 356 | } else { |
357 | - $szFilterQuery = " 1=1"; // Test always true |
|
357 | + $szFilterQuery = " 1=1"; // Test always true |
|
358 | 358 | } |
359 | 359 | break; |
360 | 360 | case 'Status': |
@@ -616,7 +616,7 @@ |
||
616 | 616 | $posy += 4; |
617 | 617 | $pdf->SetXY($posx, $posy); |
618 | 618 | $pdf->SetTextColor(0, 0, 60); |
619 | - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer") . " : " . dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R'); |
|
619 | + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R'); |
|
620 | 620 | } |
621 | 621 | |
622 | 622 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $colorseriesstat = array(); |
86 | 86 | if ($user->rights->ticket->read) { |
87 | 87 | $sql = "SELECT ctt.rowid, ctt.label, ctt.code"; |
88 | - $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt"; |
|
88 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as ctt"; |
|
89 | 89 | $sql .= " WHERE ctt.active = 1"; |
90 | 90 | $sql .= $this->db->order('ctt.rowid', 'ASC'); |
91 | 91 | $resql = $this->db->query($sql); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $dataseries = array(); |
118 | 118 | $data = array(); |
119 | 119 | $sql = "SELECT t.type_code, COUNT(t.type_code) as nb"; |
120 | - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; |
|
120 | + $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; |
|
121 | 121 | $sql .= " WHERE t.fk_statut <> 8"; |
122 | 122 | $sql .= " GROUP BY t.type_code"; |
123 | 123 | $resql = $this->db->query($sql); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | } |
132 | 132 | foreach ($listofoppcode as $rowid => $code) { |
133 | 133 | $dataseries[] = array( |
134 | - 'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code), |
|
134 | + 'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort'.$code, 'c_ticket_type', 'code', 'label', $code), |
|
135 | 135 | 'data' => (empty($data[$code]) ? 0 : $data[$code]) |
136 | 136 | ); |
137 | 137 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $stringtoprint .= $px1->show($totalnb ? 0 : 1); |
171 | 171 | } |
172 | 172 | $stringtoprint .= '</div>'; |
173 | - $this->info_box_contents[][]=array( |
|
173 | + $this->info_box_contents[][] = array( |
|
174 | 174 | 'td' => 'class="center"', |
175 | 175 | 'text' => $stringtoprint |
176 | 176 | ); |
@@ -254,7 +254,7 @@ |
||
254 | 254 | // Clean data |
255 | 255 | // $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml'); |
256 | 256 | |
257 | - if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) { |
|
257 | + if ($this->knowledgerecord->create(DolibarrApiAccess::$user) < 0) { |
|
258 | 258 | throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors)); |
259 | 259 | } |
260 | 260 | return $this->knowledgerecord->id; |
@@ -220,7 +220,7 @@ |
||
220 | 220 | // Clean data |
221 | 221 | // $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml'); |
222 | 222 | |
223 | - if ($this->myobject->create(DolibarrApiAccess::$user)<0) { |
|
223 | + if ($this->myobject->create(DolibarrApiAccess::$user) < 0) { |
|
224 | 224 | throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors)); |
225 | 225 | } |
226 | 226 | return $this->myobject->id; |
@@ -366,7 +366,7 @@ |
||
366 | 366 | $param .= "&type_element=".urlencode($type_element); |
367 | 367 | |
368 | 368 | $total_qty = 0; |
369 | -$num=0; |
|
369 | +$num = 0; |
|
370 | 370 | if ($sql_select) { |
371 | 371 | $resql = $db->query($sql); |
372 | 372 | if (!$resql) { |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | $sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'"; |
34 | 34 | } elseif (is_array($crit)) { |
35 | 35 | if ($crit['start'] !== '' && $crit['end'] !== '') { |
36 | - $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." BETWEEN '". $db->idate($crit['start']). "' AND '".$db->idate($crit['end']) . "')"; |
|
36 | + $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." BETWEEN '".$db->idate($crit['start'])."' AND '".$db->idate($crit['end'])."')"; |
|
37 | 37 | } elseif ($crit['start'] !== '') { |
38 | - $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." >= '". $db->idate($crit['start'])."')"; |
|
38 | + $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." >= '".$db->idate($crit['start'])."')"; |
|
39 | 39 | } elseif ($crit['end'] !== '') { |
40 | - $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')"; |
|
40 | + $sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." <= '".$db->idate($crit['end'])."')"; |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | } elseif (in_array($typ, array('boolean'))) { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $mode_search = 2; // Search on a foreign key int |
58 | 58 | } |
59 | 59 | if (in_array($typ, array('sellist')) && !is_numeric($crit)) { |
60 | - $mode_search = 0;// Search on a foreign key string |
|
60 | + $mode_search = 0; // Search on a foreign key string |
|
61 | 61 | } |
62 | 62 | if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) { |
63 | 63 | $mode_search = 4; // Search on a multiselect field with sql type = text |