alxarafe /
alixar
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | /** |
| 36 | 36 | * @var string Error code (or message) |
| 37 | 37 | */ |
| 38 | - public $error=''; |
|
| 38 | + public $error = ''; |
|
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -61,42 +61,42 @@ discard block |
||
| 61 | 61 | * @param string $morecss Add more CSS on select |
| 62 | 62 | * @return void |
| 63 | 63 | */ |
| 64 | - function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1, $morecss='minwidth300') |
|
| 64 | + function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300') |
|
| 65 | 65 | { |
| 66 | 66 | // phpcs:enable |
| 67 | - global $conf,$db,$langs,$user,$mysoc; |
|
| 67 | + global $conf, $db, $langs, $user, $mysoc; |
|
| 68 | 68 | |
| 69 | 69 | if (empty($mysoc->country_id) && empty($mysoc->country_code)) |
| 70 | 70 | { |
| 71 | - dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined'); |
|
| 71 | + dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined'); |
|
| 72 | 72 | exit; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - if (! empty($mysoc->country_id)) |
|
| 75 | + if (!empty($mysoc->country_id)) |
|
| 76 | 76 | { |
| 77 | 77 | $sql = "SELECT c.id, c.libelle as type"; |
| 78 | - $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; |
|
| 79 | - $sql.= " WHERE c.active = 1"; |
|
| 80 | - $sql.= " AND c.fk_pays = ".$mysoc->country_id; |
|
| 81 | - $sql.= " ORDER BY c.libelle ASC"; |
|
| 78 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; |
|
| 79 | + $sql .= " WHERE c.active = 1"; |
|
| 80 | + $sql .= " AND c.fk_pays = ".$mysoc->country_id; |
|
| 81 | + $sql .= " ORDER BY c.libelle ASC"; |
|
| 82 | 82 | } |
| 83 | 83 | else |
| 84 | 84 | { |
| 85 | 85 | $sql = "SELECT c.id, c.libelle as type"; |
| 86 | - $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co"; |
|
| 87 | - $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid"; |
|
| 88 | - $sql.= " AND co.code = '".$mysoc->country_code."'"; |
|
| 89 | - $sql.= " ORDER BY c.libelle ASC"; |
|
| 86 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co"; |
|
| 87 | + $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid"; |
|
| 88 | + $sql .= " AND co.code = '".$mysoc->country_code."'"; |
|
| 89 | + $sql .= " ORDER BY c.libelle ASC"; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG); |
| 93 | - $resql=$db->query($sql); |
|
| 93 | + $resql = $db->query($sql); |
|
| 94 | 94 | if ($resql) |
| 95 | 95 | { |
| 96 | 96 | $num = $db->num_rows($resql); |
| 97 | 97 | if ($num) |
| 98 | 98 | { |
| 99 | - print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">'; |
|
| 99 | + print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">'; |
|
| 100 | 100 | $i = 0; |
| 101 | 101 | |
| 102 | 102 | if ($useempty) print '<option value="0"> </option>'; |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | $obj = $db->fetch_object($resql); |
| 106 | 106 | print '<option value="'.$obj->id.'"'; |
| 107 | 107 | if ($obj->id == $selected) print ' selected'; |
| 108 | - print '>'.dol_trunc($obj->type,$maxlen); |
|
| 108 | + print '>'.dol_trunc($obj->type, $maxlen); |
|
| 109 | 109 | $i++; |
| 110 | 110 | } |
| 111 | 111 | print '</select>'; |
| 112 | - if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); |
|
| 113 | - if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname); |
|
| 112 | + if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); |
|
| 113 | + if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname); |
|
| 114 | 114 | } |
| 115 | 115 | else |
| 116 | 116 | { |
| 117 | - print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code); |
|
| 117 | + print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | else |
| 121 | 121 | { |
| 122 | - dol_print_error($db,$db->lasterror()); |
|
| 122 | + dol_print_error($db, $db->lasterror()); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * @var string Error code (or message) |
| 42 | 42 | */ |
| 43 | - public $error=''; |
|
| 43 | + public $error = ''; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @var string[] Error codes (or messages) |
@@ -86,46 +86,46 @@ discard block |
||
| 86 | 86 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 87 | 87 | * @return int <0 if KO, Id of created object if OK |
| 88 | 88 | */ |
| 89 | - function create($user, $notrigger=0) |
|
| 89 | + function create($user, $notrigger = 0) |
|
| 90 | 90 | { |
| 91 | 91 | global $conf, $langs; |
| 92 | - $error=0; |
|
| 92 | + $error = 0; |
|
| 93 | 93 | |
| 94 | 94 | // Clean parameters |
| 95 | - if (isset($this->code)) $this->code=trim($this->code); |
|
| 96 | - if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso); |
|
| 97 | - if (isset($this->label)) $this->label=trim($this->label); |
|
| 98 | - if (isset($this->active)) $this->active=trim($this->active); |
|
| 95 | + if (isset($this->code)) $this->code = trim($this->code); |
|
| 96 | + if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso); |
|
| 97 | + if (isset($this->label)) $this->label = trim($this->label); |
|
| 98 | + if (isset($this->active)) $this->active = trim($this->active); |
|
| 99 | 99 | |
| 100 | 100 | // Check parameters |
| 101 | 101 | // Put here code to add control on parameters values |
| 102 | 102 | |
| 103 | 103 | // Insert request |
| 104 | 104 | $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country("; |
| 105 | - $sql.= "rowid,"; |
|
| 106 | - $sql.= "code,"; |
|
| 107 | - $sql.= "code_iso,"; |
|
| 108 | - $sql.= "label,"; |
|
| 109 | - $sql.= "active"; |
|
| 110 | - $sql.= ") VALUES ("; |
|
| 111 | - $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").","; |
|
| 112 | - $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").","; |
|
| 113 | - $sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").","; |
|
| 114 | - $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").","; |
|
| 115 | - $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").""; |
|
| 116 | - $sql.= ")"; |
|
| 105 | + $sql .= "rowid,"; |
|
| 106 | + $sql .= "code,"; |
|
| 107 | + $sql .= "code_iso,"; |
|
| 108 | + $sql .= "label,"; |
|
| 109 | + $sql .= "active"; |
|
| 110 | + $sql .= ") VALUES ("; |
|
| 111 | + $sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").","; |
|
| 112 | + $sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").","; |
|
| 113 | + $sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").","; |
|
| 114 | + $sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").","; |
|
| 115 | + $sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'").""; |
|
| 116 | + $sql .= ")"; |
|
| 117 | 117 | |
| 118 | 118 | $this->db->begin(); |
| 119 | 119 | |
| 120 | 120 | dol_syslog(get_class($this)."::create", LOG_DEBUG); |
| 121 | - $resql=$this->db->query($sql); |
|
| 122 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 121 | + $resql = $this->db->query($sql); |
|
| 122 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 123 | 123 | |
| 124 | - if (! $error) |
|
| 124 | + if (!$error) |
|
| 125 | 125 | { |
| 126 | 126 | $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country"); |
| 127 | 127 | |
| 128 | - if (! $notrigger) |
|
| 128 | + if (!$notrigger) |
|
| 129 | 129 | { |
| 130 | 130 | // Uncomment this and change MYOBJECT to your own tag if you |
| 131 | 131 | // want this action call a trigger. |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | // Commit or rollback |
| 143 | 143 | if ($error) |
| 144 | 144 | { |
| 145 | - foreach($this->errors as $errmsg) |
|
| 145 | + foreach ($this->errors as $errmsg) |
|
| 146 | 146 | { |
| 147 | 147 | dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR); |
| 148 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 148 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 149 | 149 | } |
| 150 | 150 | $this->db->rollback(); |
| 151 | - return -1*$error; |
|
| 151 | + return -1 * $error; |
|
| 152 | 152 | } |
| 153 | 153 | else |
| 154 | 154 | { |
@@ -165,28 +165,28 @@ discard block |
||
| 165 | 165 | * @param string $code Code |
| 166 | 166 | * @return int >0 if OK, 0 if not found, <0 if KO |
| 167 | 167 | */ |
| 168 | - function fetch($id,$code='') |
|
| 168 | + function fetch($id, $code = '') |
|
| 169 | 169 | { |
| 170 | 170 | global $langs; |
| 171 | 171 | $sql = "SELECT"; |
| 172 | - $sql.= " t.rowid,"; |
|
| 173 | - $sql.= " t.code,"; |
|
| 174 | - $sql.= " t.code_iso,"; |
|
| 175 | - $sql.= " t.label,"; |
|
| 176 | - $sql.= " t.active"; |
|
| 177 | - $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t"; |
|
| 178 | - if ($id) $sql.= " WHERE t.rowid = ".$id; |
|
| 179 | - elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'"; |
|
| 172 | + $sql .= " t.rowid,"; |
|
| 173 | + $sql .= " t.code,"; |
|
| 174 | + $sql .= " t.code_iso,"; |
|
| 175 | + $sql .= " t.label,"; |
|
| 176 | + $sql .= " t.active"; |
|
| 177 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t"; |
|
| 178 | + if ($id) $sql .= " WHERE t.rowid = ".$id; |
|
| 179 | + elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'"; |
|
| 180 | 180 | |
| 181 | 181 | dol_syslog(get_class($this)."::fetch", LOG_DEBUG); |
| 182 | - $resql=$this->db->query($sql); |
|
| 182 | + $resql = $this->db->query($sql); |
|
| 183 | 183 | if ($resql) |
| 184 | 184 | { |
| 185 | 185 | if ($this->db->num_rows($resql)) |
| 186 | 186 | { |
| 187 | 187 | $obj = $this->db->fetch_object($resql); |
| 188 | 188 | |
| 189 | - $this->id = $obj->rowid; |
|
| 189 | + $this->id = $obj->rowid; |
|
| 190 | 190 | $this->code = $obj->code; |
| 191 | 191 | $this->code_iso = $obj->code_iso; |
| 192 | 192 | $this->label = $obj->label; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | else |
| 203 | 203 | { |
| 204 | - $this->error="Error ".$this->db->lasterror(); |
|
| 204 | + $this->error = "Error ".$this->db->lasterror(); |
|
| 205 | 205 | return -1; |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -214,16 +214,16 @@ discard block |
||
| 214 | 214 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 215 | 215 | * @return int <0 if KO, >0 if OK |
| 216 | 216 | */ |
| 217 | - function update($user=null, $notrigger=0) |
|
| 217 | + function update($user = null, $notrigger = 0) |
|
| 218 | 218 | { |
| 219 | 219 | global $conf, $langs; |
| 220 | - $error=0; |
|
| 220 | + $error = 0; |
|
| 221 | 221 | |
| 222 | 222 | // Clean parameters |
| 223 | - if (isset($this->code)) $this->code=trim($this->code); |
|
| 224 | - if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso); |
|
| 225 | - if (isset($this->label)) $this->label=trim($this->label); |
|
| 226 | - if (isset($this->active)) $this->active=trim($this->active); |
|
| 223 | + if (isset($this->code)) $this->code = trim($this->code); |
|
| 224 | + if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso); |
|
| 225 | + if (isset($this->label)) $this->label = trim($this->label); |
|
| 226 | + if (isset($this->active)) $this->active = trim($this->active); |
|
| 227 | 227 | |
| 228 | 228 | |
| 229 | 229 | // Check parameters |
@@ -231,21 +231,21 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | // Update request |
| 233 | 233 | $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET"; |
| 234 | - $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").","; |
|
| 235 | - $sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").","; |
|
| 236 | - $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").","; |
|
| 237 | - $sql.= " active=".(isset($this->active)?$this->active:"null").""; |
|
| 238 | - $sql.= " WHERE rowid=".$this->id; |
|
| 234 | + $sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").","; |
|
| 235 | + $sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").","; |
|
| 236 | + $sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").","; |
|
| 237 | + $sql .= " active=".(isset($this->active) ? $this->active : "null").""; |
|
| 238 | + $sql .= " WHERE rowid=".$this->id; |
|
| 239 | 239 | |
| 240 | 240 | $this->db->begin(); |
| 241 | 241 | |
| 242 | 242 | dol_syslog(get_class($this)."::update", LOG_DEBUG); |
| 243 | 243 | $resql = $this->db->query($sql); |
| 244 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 244 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 245 | 245 | |
| 246 | - if (! $error) |
|
| 246 | + if (!$error) |
|
| 247 | 247 | { |
| 248 | - if (! $notrigger) |
|
| 248 | + if (!$notrigger) |
|
| 249 | 249 | { |
| 250 | 250 | // Uncomment this and change MYOBJECT to your own tag if you |
| 251 | 251 | // want this action call a trigger. |
@@ -262,13 +262,13 @@ discard block |
||
| 262 | 262 | // Commit or rollback |
| 263 | 263 | if ($error) |
| 264 | 264 | { |
| 265 | - foreach($this->errors as $errmsg) |
|
| 265 | + foreach ($this->errors as $errmsg) |
|
| 266 | 266 | { |
| 267 | 267 | dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); |
| 268 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 268 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 269 | 269 | } |
| 270 | 270 | $this->db->rollback(); |
| 271 | - return -1*$error; |
|
| 271 | + return -1 * $error; |
|
| 272 | 272 | } |
| 273 | 273 | else |
| 274 | 274 | { |
@@ -285,23 +285,23 @@ discard block |
||
| 285 | 285 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 286 | 286 | * @return int <0 if KO, >0 if OK |
| 287 | 287 | */ |
| 288 | - function delete($user, $notrigger=0) |
|
| 288 | + function delete($user, $notrigger = 0) |
|
| 289 | 289 | { |
| 290 | 290 | global $conf, $langs; |
| 291 | - $error=0; |
|
| 291 | + $error = 0; |
|
| 292 | 292 | |
| 293 | 293 | $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country"; |
| 294 | - $sql.= " WHERE rowid=".$this->id; |
|
| 294 | + $sql .= " WHERE rowid=".$this->id; |
|
| 295 | 295 | |
| 296 | 296 | $this->db->begin(); |
| 297 | 297 | |
| 298 | 298 | dol_syslog(get_class($this)."::delete", LOG_DEBUG); |
| 299 | 299 | $resql = $this->db->query($sql); |
| 300 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 300 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 301 | 301 | |
| 302 | - if (! $error) |
|
| 302 | + if (!$error) |
|
| 303 | 303 | { |
| 304 | - if (! $notrigger) |
|
| 304 | + if (!$notrigger) |
|
| 305 | 305 | { |
| 306 | 306 | // Uncomment this and change MYOBJECT to your own tag if you |
| 307 | 307 | // want this action call a trigger. |
@@ -318,13 +318,13 @@ discard block |
||
| 318 | 318 | // Commit or rollback |
| 319 | 319 | if ($error) |
| 320 | 320 | { |
| 321 | - foreach($this->errors as $errmsg) |
|
| 321 | + foreach ($this->errors as $errmsg) |
|
| 322 | 322 | { |
| 323 | 323 | dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); |
| 324 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 324 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 325 | 325 | } |
| 326 | 326 | $this->db->rollback(); |
| 327 | - return -1*$error; |
|
| 327 | + return -1 * $error; |
|
| 328 | 328 | } |
| 329 | 329 | else |
| 330 | 330 | { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | /** |
| 38 | 38 | * @var string Error code (or message) |
| 39 | 39 | */ |
| 40 | - public $error=''; |
|
| 40 | + public $error = ''; |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * @var string[] Array of error strings |
@@ -69,17 +69,17 @@ discard block |
||
| 69 | 69 | * @param Translate $outputlangs Language object for output |
| 70 | 70 | * @return array Array of substitution key->code |
| 71 | 71 | */ |
| 72 | - function get_substitutionarray_user($user,$outputlangs) |
|
| 72 | + function get_substitutionarray_user($user, $outputlangs) |
|
| 73 | 73 | { |
| 74 | 74 | // phpcs:enable |
| 75 | 75 | global $conf; |
| 76 | 76 | |
| 77 | - $logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo; |
|
| 77 | + $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo; |
|
| 78 | 78 | |
| 79 | 79 | return array( |
| 80 | 80 | 'myuser_lastname'=>$user->lastname, |
| 81 | 81 | 'myuser_firstname'=>$user->firstname, |
| 82 | - 'myuser_fullname'=>$user->getFullName($outputlangs,1), |
|
| 82 | + 'myuser_fullname'=>$user->getFullName($outputlangs, 1), |
|
| 83 | 83 | 'myuser_login'=>$user->login, |
| 84 | 84 | 'myuser_phone'=>$user->office_phone, |
| 85 | 85 | 'myuser_address'=>$user->address, |
@@ -107,25 +107,25 @@ discard block |
||
| 107 | 107 | * @param Translate $outputlangs Language object for output |
| 108 | 108 | * @return array Array of substitution key->code |
| 109 | 109 | */ |
| 110 | - function get_substitutionarray_mysoc($mysoc,$outputlangs) |
|
| 110 | + function get_substitutionarray_mysoc($mysoc, $outputlangs) |
|
| 111 | 111 | { |
| 112 | 112 | // phpcs:enable |
| 113 | 113 | global $conf; |
| 114 | 114 | |
| 115 | - if (empty($mysoc->forme_juridique) && ! empty($mysoc->forme_juridique_code)) |
|
| 115 | + if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code)) |
|
| 116 | 116 | { |
| 117 | - $mysoc->forme_juridique=getFormeJuridiqueLabel($mysoc->forme_juridique_code); |
|
| 117 | + $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code); |
|
| 118 | 118 | } |
| 119 | - if (empty($mysoc->country) && ! empty($mysoc->country_code)) |
|
| 119 | + if (empty($mysoc->country) && !empty($mysoc->country_code)) |
|
| 120 | 120 | { |
| 121 | - $mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code); |
|
| 121 | + $mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code); |
|
| 122 | 122 | } |
| 123 | - if (empty($mysoc->state) && ! empty($mysoc->state_code)) |
|
| 123 | + if (empty($mysoc->state) && !empty($mysoc->state_code)) |
|
| 124 | 124 | { |
| 125 | - $mysoc->state=getState($mysoc->state_code,0); |
|
| 125 | + $mysoc->state = getState($mysoc->state_code, 0); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small; |
|
| 128 | + $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small; |
|
| 129 | 129 | |
| 130 | 130 | return array( |
| 131 | 131 | 'mycompany_logo'=>$logotouse, |
@@ -167,18 +167,18 @@ discard block |
||
| 167 | 167 | * @param Translate $outputlangs Language object for output |
| 168 | 168 | * @return array Array of substitution key->code |
| 169 | 169 | */ |
| 170 | - function get_substitutionarray_thirdparty($object,$outputlangs) |
|
| 170 | + function get_substitutionarray_thirdparty($object, $outputlangs) |
|
| 171 | 171 | { |
| 172 | 172 | // phpcs:enable |
| 173 | 173 | global $conf; |
| 174 | 174 | |
| 175 | - if (empty($object->country) && ! empty($object->country_code)) |
|
| 175 | + if (empty($object->country) && !empty($object->country_code)) |
|
| 176 | 176 | { |
| 177 | - $object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code); |
|
| 177 | + $object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code); |
|
| 178 | 178 | } |
| 179 | - if (empty($object->state) && ! empty($object->state_code)) |
|
| 179 | + if (empty($object->state) && !empty($object->state_code)) |
|
| 180 | 180 | { |
| 181 | - $object->state=getState($object->state_code,0); |
|
| 181 | + $object->state = getState($object->state_code, 0); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | $array_thirdparty = array( |
@@ -217,24 +217,24 @@ discard block |
||
| 217 | 217 | ); |
| 218 | 218 | |
| 219 | 219 | // Retrieve extrafields |
| 220 | - if(is_array($object->array_options) && count($object->array_options)) |
|
| 220 | + if (is_array($object->array_options) && count($object->array_options)) |
|
| 221 | 221 | { |
| 222 | 222 | require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
| 223 | 223 | $extrafields = new ExtraFields($this->db); |
| 224 | - $extralabels = $extrafields->fetch_name_optionals_label('societe',true); |
|
| 224 | + $extralabels = $extrafields->fetch_name_optionals_label('societe', true); |
|
| 225 | 225 | $object->fetch_optionals(); |
| 226 | 226 | |
| 227 | - foreach($extrafields->attribute_label as $key=>$label) |
|
| 227 | + foreach ($extrafields->attribute_label as $key=>$label) |
|
| 228 | 228 | { |
| 229 | - if($extrafields->attribute_type[$key] == 'price') |
|
| 229 | + if ($extrafields->attribute_type[$key] == 'price') |
|
| 230 | 230 | { |
| 231 | - $object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency); |
|
| 231 | + $object->array_options['options_'.$key] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency); |
|
| 232 | 232 | } |
| 233 | - else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 233 | + else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 234 | 234 | { |
| 235 | 235 | $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]]; |
| 236 | 236 | } |
| 237 | - $array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key])); |
|
| 237 | + $array_thirdparty = array_merge($array_thirdparty, array('company_options_'.$key => $object->array_options ['options_'.$key])); |
|
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | 240 | return $array_thirdparty; |
@@ -254,61 +254,61 @@ discard block |
||
| 254 | 254 | // phpcs:enable |
| 255 | 255 | global $conf; |
| 256 | 256 | |
| 257 | - if(empty($object->country) && ! empty($object->country_code)) |
|
| 257 | + if (empty($object->country) && !empty($object->country_code)) |
|
| 258 | 258 | { |
| 259 | - $object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code); |
|
| 259 | + $object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code); |
|
| 260 | 260 | } |
| 261 | - if(empty($object->state) && ! empty($object->state_code)) |
|
| 261 | + if (empty($object->state) && !empty($object->state_code)) |
|
| 262 | 262 | { |
| 263 | 263 | $object->state = getState($object->state_code, 0); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - $array_contact = array ( |
|
| 267 | - $array_key . '_fullname' => $object->getFullName($outputlangs, 1), |
|
| 268 | - $array_key . '_lastname' => $object->lastname, |
|
| 269 | - $array_key . '_firstname' => $object->firstname, |
|
| 270 | - $array_key . '_address' => $object->address, |
|
| 271 | - $array_key . '_zip' => $object->zip, |
|
| 272 | - $array_key . '_town' => $object->town, |
|
| 273 | - $array_key . '_state_id' => $object->state_id, |
|
| 274 | - $array_key . '_state_code' => $object->state_code, |
|
| 275 | - $array_key . '_state' => $object->state, |
|
| 276 | - $array_key . '_country_id' => $object->country_id, |
|
| 277 | - $array_key . '_country_code' => $object->country_code, |
|
| 278 | - $array_key . '_country' => $object->country, |
|
| 279 | - $array_key . '_poste' => $object->poste, |
|
| 280 | - $array_key . '_socid' => $object->socid, |
|
| 281 | - $array_key . '_statut' => $object->statut, |
|
| 282 | - $array_key . '_code' => $object->code, |
|
| 283 | - $array_key . '_email' => $object->email, |
|
| 284 | - $array_key . '_jabberid' => $object->jabberid, |
|
| 285 | - $array_key . '_phone_pro' => $object->phone_pro, |
|
| 286 | - $array_key . '_phone_perso' => $object->phone_perso, |
|
| 287 | - $array_key . '_phone_mobile' => $object->phone_mobile, |
|
| 288 | - $array_key . '_fax' => $object->fax, |
|
| 289 | - $array_key . '_birthday' => $object->birthday, |
|
| 290 | - $array_key . '_default_lang' => $object->default_lang, |
|
| 291 | - $array_key . '_note_public' => $object->note_public, |
|
| 292 | - $array_key . '_note_private' => $object->note_private |
|
| 266 | + $array_contact = array( |
|
| 267 | + $array_key.'_fullname' => $object->getFullName($outputlangs, 1), |
|
| 268 | + $array_key.'_lastname' => $object->lastname, |
|
| 269 | + $array_key.'_firstname' => $object->firstname, |
|
| 270 | + $array_key.'_address' => $object->address, |
|
| 271 | + $array_key.'_zip' => $object->zip, |
|
| 272 | + $array_key.'_town' => $object->town, |
|
| 273 | + $array_key.'_state_id' => $object->state_id, |
|
| 274 | + $array_key.'_state_code' => $object->state_code, |
|
| 275 | + $array_key.'_state' => $object->state, |
|
| 276 | + $array_key.'_country_id' => $object->country_id, |
|
| 277 | + $array_key.'_country_code' => $object->country_code, |
|
| 278 | + $array_key.'_country' => $object->country, |
|
| 279 | + $array_key.'_poste' => $object->poste, |
|
| 280 | + $array_key.'_socid' => $object->socid, |
|
| 281 | + $array_key.'_statut' => $object->statut, |
|
| 282 | + $array_key.'_code' => $object->code, |
|
| 283 | + $array_key.'_email' => $object->email, |
|
| 284 | + $array_key.'_jabberid' => $object->jabberid, |
|
| 285 | + $array_key.'_phone_pro' => $object->phone_pro, |
|
| 286 | + $array_key.'_phone_perso' => $object->phone_perso, |
|
| 287 | + $array_key.'_phone_mobile' => $object->phone_mobile, |
|
| 288 | + $array_key.'_fax' => $object->fax, |
|
| 289 | + $array_key.'_birthday' => $object->birthday, |
|
| 290 | + $array_key.'_default_lang' => $object->default_lang, |
|
| 291 | + $array_key.'_note_public' => $object->note_public, |
|
| 292 | + $array_key.'_note_private' => $object->note_private |
|
| 293 | 293 | ); |
| 294 | 294 | |
| 295 | 295 | // Retrieve extrafields |
| 296 | - require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
| 296 | + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
| 297 | 297 | $extrafields = new ExtraFields($this->db); |
| 298 | 298 | $extralabels = $extrafields->fetch_name_optionals_label('socpeople', true); |
| 299 | 299 | $object->fetch_optionals(); |
| 300 | 300 | |
| 301 | - foreach($extrafields->attribute_label as $key => $label) |
|
| 301 | + foreach ($extrafields->attribute_label as $key => $label) |
|
| 302 | 302 | { |
| 303 | 303 | if ($extrafields->attribute_type[$key] == 'price') |
| 304 | 304 | { |
| 305 | - $object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency); |
|
| 305 | + $object->array_options['options_'.$key] = price($object->array_options ['options_'.$key], 0, $outputlangs, 0, 0, - 1, $conf->currency); |
|
| 306 | 306 | } |
| 307 | - elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 307 | + elseif ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 308 | 308 | { |
| 309 | - $object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]]; |
|
| 309 | + $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]]; |
|
| 310 | 310 | } |
| 311 | - $array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key])); |
|
| 311 | + $array_contact = array_merge($array_contact, array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); |
|
| 312 | 312 | } |
| 313 | 313 | return $array_contact; |
| 314 | 314 | } |
@@ -326,22 +326,22 @@ discard block |
||
| 326 | 326 | // phpcs:enable |
| 327 | 327 | global $conf; |
| 328 | 328 | |
| 329 | - $now=dol_now('gmt'); // gmt |
|
| 329 | + $now = dol_now('gmt'); // gmt |
|
| 330 | 330 | $array_other = array( |
| 331 | 331 | // Date in default language |
| 332 | - 'current_date'=>dol_print_date($now,'day','tzuser'), |
|
| 333 | - 'current_datehour'=>dol_print_date($now,'dayhour','tzuser'), |
|
| 334 | - 'current_server_date'=>dol_print_date($now,'day','tzserver'), |
|
| 335 | - 'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'), |
|
| 332 | + 'current_date'=>dol_print_date($now, 'day', 'tzuser'), |
|
| 333 | + 'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'), |
|
| 334 | + 'current_server_date'=>dol_print_date($now, 'day', 'tzserver'), |
|
| 335 | + 'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'), |
|
| 336 | 336 | // Date in requested output language |
| 337 | - 'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs), |
|
| 338 | - 'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs), |
|
| 339 | - 'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs), |
|
| 340 | - 'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs), |
|
| 337 | + 'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs), |
|
| 338 | + 'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs), |
|
| 339 | + 'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs), |
|
| 340 | + 'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs), |
|
| 341 | 341 | ); |
| 342 | 342 | |
| 343 | 343 | |
| 344 | - foreach($conf->global as $key => $val) |
|
| 344 | + foreach ($conf->global as $key => $val) |
|
| 345 | 345 | { |
| 346 | 346 | if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****'; |
| 347 | 347 | else $newval = $val; |
@@ -361,15 +361,15 @@ discard block |
||
| 361 | 361 | * @param string $array_key Name of the key for return array |
| 362 | 362 | * @return array Array of substitution |
| 363 | 363 | */ |
| 364 | - function get_substitutionarray_object($object,$outputlangs,$array_key='object') |
|
| 364 | + function get_substitutionarray_object($object, $outputlangs, $array_key = 'object') |
|
| 365 | 365 | { |
| 366 | 366 | // phpcs:enable |
| 367 | 367 | global $conf; |
| 368 | 368 | |
| 369 | - $sumpayed=$sumdeposit=$sumcreditnote=''; |
|
| 369 | + $sumpayed = $sumdeposit = $sumcreditnote = ''; |
|
| 370 | 370 | if ($object->element == 'facture') |
| 371 | 371 | { |
| 372 | - $invoice_source=new Facture($this->db); |
|
| 372 | + $invoice_source = new Facture($this->db); |
|
| 373 | 373 | if ($object->fk_facture_source > 0) |
| 374 | 374 | { |
| 375 | 375 | $invoice_source->fetch($object->fk_facture_source); |
@@ -381,38 +381,38 @@ discard block |
||
| 381 | 381 | |
| 382 | 382 | $date = ($object->element == 'contrat' ? $object->date_contrat : $object->date); |
| 383 | 383 | |
| 384 | - $resarray=array( |
|
| 384 | + $resarray = array( |
|
| 385 | 385 | $array_key.'_id'=>$object->id, |
| 386 | 386 | $array_key.'_ref'=>$object->ref, |
| 387 | 387 | $array_key.'_ref_ext'=>$object->ref_ext, |
| 388 | - $array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)), |
|
| 389 | - $array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)), |
|
| 388 | + $array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)), |
|
| 389 | + $array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)), |
|
| 390 | 390 | $array_key.'_source_invoice_ref'=>$invoice_source->ref, |
| 391 | 391 | // Dates |
| 392 | - $array_key.'_hour'=>dol_print_date($date,'hour'), |
|
| 393 | - $array_key.'_date'=>dol_print_date($date,'day'), |
|
| 394 | - $array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'), |
|
| 395 | - $array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''), |
|
| 396 | - $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''), |
|
| 397 | - $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'), |
|
| 398 | - $array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''), |
|
| 399 | - $array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''), |
|
| 400 | - $array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''), |
|
| 401 | - $array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''), |
|
| 392 | + $array_key.'_hour'=>dol_print_date($date, 'hour'), |
|
| 393 | + $array_key.'_date'=>dol_print_date($date, 'day'), |
|
| 394 | + $array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'), |
|
| 395 | + $array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''), |
|
| 396 | + $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''), |
|
| 397 | + $array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'), |
|
| 398 | + $array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''), |
|
| 399 | + $array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''), |
|
| 400 | + $array_key.'_date_delivery_planed'=>(!empty($object->date_livraison) ?dol_print_date($object->date_livraison, 'day') : ''), |
|
| 401 | + $array_key.'_date_close'=>(!empty($object->date_cloture) ?dol_print_date($object->date_cloture, 'dayhour') : ''), |
|
| 402 | 402 | |
| 403 | 403 | $array_key.'_payment_mode_code'=>$object->mode_reglement_code, |
| 404 | - $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement), |
|
| 404 | + $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement), |
|
| 405 | 405 | $array_key.'_payment_term_code'=>$object->cond_reglement_code, |
| 406 | - $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)), |
|
| 406 | + $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)), |
|
| 407 | 407 | |
| 408 | 408 | $array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs), |
| 409 | - $array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)), |
|
| 409 | + $array_key.'_total_vat_locale'=>(!empty($object->total_vat) ?price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)), |
|
| 410 | 410 | $array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs), |
| 411 | 411 | $array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs), |
| 412 | 412 | $array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs), |
| 413 | 413 | |
| 414 | 414 | $array_key.'_total_ht'=>price2num($object->total_ht), |
| 415 | - $array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)), |
|
| 415 | + $array_key.'_total_vat'=>(!empty($object->total_vat) ?price2num($object->total_vat) : price2num($object->total_tva)), |
|
| 416 | 416 | $array_key.'_total_localtax1'=>price2num($object->total_localtax1), |
| 417 | 417 | $array_key.'_total_localtax2'=>price2num($object->total_localtax2), |
| 418 | 418 | $array_key.'_total_ttc'=>price2num($object->total_ttc), |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | |
| 429 | 429 | $array_key.'_note_private'=>$object->note, |
| 430 | 430 | $array_key.'_note_public'=>$object->note_public, |
| 431 | - $array_key.'_note'=>$object->note_public, // For backward compatibility |
|
| 431 | + $array_key.'_note'=>$object->note_public, // For backward compatibility |
|
| 432 | 432 | |
| 433 | 433 | // Payments |
| 434 | 434 | $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs), |
@@ -455,9 +455,9 @@ discard block |
||
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | // Fetch project information if there is a project assigned to this object |
| 458 | - if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0) |
|
| 458 | + if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0) |
|
| 459 | 459 | { |
| 460 | - if (! is_object($object->project)) |
|
| 460 | + if (!is_object($object->project)) |
|
| 461 | 461 | { |
| 462 | 462 | $object->fetch_projet(); |
| 463 | 463 | } |
@@ -470,32 +470,32 @@ discard block |
||
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | // Add vat by rates |
| 473 | - if (is_array($object->lines) && count($object->lines)>0) |
|
| 473 | + if (is_array($object->lines) && count($object->lines) > 0) |
|
| 474 | 474 | { |
| 475 | 475 | foreach ($object->lines as $line) |
| 476 | 476 | { |
| 477 | 477 | // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility |
| 478 | - if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0; |
|
| 479 | - $resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva; |
|
| 480 | - $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]); |
|
| 478 | + if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0; |
|
| 479 | + $resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva; |
|
| 480 | + $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]); |
|
| 481 | 481 | // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example) |
| 482 | - $vatformated=vatrate($line->tva_tx); |
|
| 483 | - if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0; |
|
| 484 | - $resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva; |
|
| 485 | - $resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]); |
|
| 482 | + $vatformated = vatrate($line->tva_tx); |
|
| 483 | + if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0; |
|
| 484 | + $resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva; |
|
| 485 | + $resarray[$array_key.'_total_vat_locale_'.$vatformated] = price($resarray[$array_key.'_total_vat_'.$vatformated]); |
|
| 486 | 486 | } |
| 487 | 487 | } |
| 488 | 488 | // Retrieve extrafields |
| 489 | 489 | if (is_array($object->array_options) && count($object->array_options)) |
| 490 | 490 | { |
| 491 | - $extrafieldkey=$object->element; |
|
| 491 | + $extrafieldkey = $object->element; |
|
| 492 | 492 | |
| 493 | 493 | require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
| 494 | 494 | $extrafields = new ExtraFields($this->db); |
| 495 | - $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); |
|
| 495 | + $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true); |
|
| 496 | 496 | $object->fetch_optionals(); |
| 497 | 497 | |
| 498 | - $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs); |
|
| 498 | + $resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs); |
|
| 499 | 499 | } |
| 500 | 500 | return $resarray; |
| 501 | 501 | } |
@@ -513,18 +513,18 @@ discard block |
||
| 513 | 513 | // phpcs:enable |
| 514 | 514 | global $conf; |
| 515 | 515 | |
| 516 | - $resarray= array( |
|
| 517 | - 'line_fulldesc'=>doc_getlinedesc($line,$outputlangs), |
|
| 516 | + $resarray = array( |
|
| 517 | + 'line_fulldesc'=>doc_getlinedesc($line, $outputlangs), |
|
| 518 | 518 | 'line_product_ref'=>$line->product_ref, |
| 519 | 519 | 'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines |
| 520 | 520 | 'line_product_label'=>$line->product_label, |
| 521 | 521 | 'line_product_type'=>$line->product_type, |
| 522 | 522 | 'line_desc'=>$line->desc, |
| 523 | - 'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits), |
|
| 523 | + 'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits), |
|
| 524 | 524 | 'line_up'=>price2num($line->subprice), |
| 525 | 525 | 'line_up_locale'=>price($line->subprice, 0, $outputlangs), |
| 526 | 526 | 'line_qty'=>$line->qty, |
| 527 | - 'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''), |
|
| 527 | + 'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''), |
|
| 528 | 528 | 'line_price_ht'=>price2num($line->total_ht), |
| 529 | 529 | 'line_price_ttc'=>price2num($line->total_ttc), |
| 530 | 530 | 'line_price_vat'=>price2num($line->total_tva), |
@@ -553,26 +553,26 @@ discard block |
||
| 553 | 553 | // Units |
| 554 | 554 | if ($conf->global->PRODUCT_USE_UNITS) |
| 555 | 555 | { |
| 556 | - $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long')); |
|
| 557 | - $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short')); |
|
| 556 | + $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long')); |
|
| 557 | + $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short')); |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | // Retrieve extrafields |
| 561 | - $extrafieldkey=$line->element; |
|
| 562 | - $array_key="line"; |
|
| 561 | + $extrafieldkey = $line->element; |
|
| 562 | + $array_key = "line"; |
|
| 563 | 563 | require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
| 564 | 564 | $extrafields = new ExtraFields($this->db); |
| 565 | - $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); |
|
| 565 | + $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true); |
|
| 566 | 566 | $line->fetch_optionals(); |
| 567 | 567 | |
| 568 | - $resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs); |
|
| 568 | + $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key = $array_key, $outputlangs); |
|
| 569 | 569 | |
| 570 | 570 | // Load product data optional fields to the line -> enables to use "line_options_{extrafield}" |
| 571 | 571 | if (isset($line->fk_product) && $line->fk_product > 0) |
| 572 | 572 | { |
| 573 | 573 | $tmpproduct = new Product($this->db); |
| 574 | 574 | $result = $tmpproduct->fetch($line->fk_product); |
| 575 | - foreach($tmpproduct->array_options as $key=>$label) |
|
| 575 | + foreach ($tmpproduct->array_options as $key=>$label) |
|
| 576 | 576 | $resarray["line_product_".$key] = $label; |
| 577 | 577 | } |
| 578 | 578 | |
@@ -588,22 +588,22 @@ discard block |
||
| 588 | 588 | * @param array $array_key Name of the key for return array |
| 589 | 589 | * @return array Array of substitution |
| 590 | 590 | */ |
| 591 | - function get_substitutionarray_shipment($object,$outputlangs,$array_key='object') |
|
| 591 | + function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object') |
|
| 592 | 592 | { |
| 593 | 593 | // phpcs:enable |
| 594 | 594 | global $conf; |
| 595 | 595 | dol_include_once('/core/lib/product.lib.php'); |
| 596 | 596 | $object->list_delivery_methods($object->shipping_method_id); |
| 597 | - $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth); |
|
| 597 | + $calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth); |
|
| 598 | 598 | |
| 599 | - $array_shipment=array( |
|
| 599 | + $array_shipment = array( |
|
| 600 | 600 | $array_key.'_id'=>$object->id, |
| 601 | 601 | $array_key.'_ref'=>$object->ref, |
| 602 | 602 | $array_key.'_ref_ext'=>$object->ref_ext, |
| 603 | 603 | $array_key.'_ref_customer'=>$object->ref_customer, |
| 604 | - $array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'), |
|
| 605 | - $array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'), |
|
| 606 | - $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'), |
|
| 604 | + $array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'), |
|
| 605 | + $array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'), |
|
| 606 | + $array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'), |
|
| 607 | 607 | $array_key.'_total_ht'=>price($object->total_ht), |
| 608 | 608 | $array_key.'_total_vat'=>price($object->total_tva), |
| 609 | 609 | $array_key.'_total_ttc'=>price($object->total_ttc), |
@@ -623,8 +623,8 @@ discard block |
||
| 623 | 623 | // Add vat by rates |
| 624 | 624 | foreach ($object->lines as $line) |
| 625 | 625 | { |
| 626 | - if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0; |
|
| 627 | - $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva; |
|
| 626 | + if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0; |
|
| 627 | + $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva; |
|
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | // Retrieve extrafields |
@@ -632,10 +632,10 @@ discard block |
||
| 632 | 632 | { |
| 633 | 633 | require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
| 634 | 634 | $extrafields = new ExtraFields($this->db); |
| 635 | - $extralabels = $extrafields->fetch_name_optionals_label('expedition',true); |
|
| 635 | + $extralabels = $extrafields->fetch_name_optionals_label('expedition', true); |
|
| 636 | 636 | $object->fetch_optionals(); |
| 637 | 637 | |
| 638 | - $array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs); |
|
| 638 | + $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs); |
|
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | return $array_shipment; |
@@ -657,23 +657,23 @@ discard block |
||
| 657 | 657 | dol_include_once('/core/lib/product.lib.php'); |
| 658 | 658 | |
| 659 | 659 | $resarray = array( |
| 660 | - 'line_fulldesc'=>doc_getlinedesc($line,$outputlangs), |
|
| 660 | + 'line_fulldesc'=>doc_getlinedesc($line, $outputlangs), |
|
| 661 | 661 | 'line_product_ref'=>$line->product_ref, |
| 662 | 662 | 'line_product_label'=>$line->product_label, |
| 663 | 663 | 'line_desc'=>$line->desc, |
| 664 | - 'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits), |
|
| 664 | + 'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits), |
|
| 665 | 665 | 'line_up'=>price($line->subprice), |
| 666 | 666 | 'line_qty'=>$line->qty, |
| 667 | 667 | 'line_qty_shipped'=>$line->qty_shipped, |
| 668 | 668 | 'line_qty_asked'=>$line->qty_asked, |
| 669 | - 'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''), |
|
| 669 | + 'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''), |
|
| 670 | 670 | 'line_price_ht'=>price($line->total_ht), |
| 671 | 671 | 'line_price_ttc'=>price($line->total_ttc), |
| 672 | 672 | 'line_price_vat'=>price($line->total_tva), |
| 673 | - 'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'), |
|
| 674 | - 'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'), |
|
| 675 | - 'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'), |
|
| 676 | - 'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'), |
|
| 673 | + 'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'), |
|
| 674 | + 'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'), |
|
| 675 | + 'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'), |
|
| 676 | + 'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'), |
|
| 677 | 677 | ); |
| 678 | 678 | |
| 679 | 679 | // Retrieve extrafields |
@@ -699,18 +699,18 @@ discard block |
||
| 699 | 699 | * @param boolean $recursive Want to fetch child array or child object |
| 700 | 700 | * @return array Array of substitution key->code |
| 701 | 701 | */ |
| 702 | - function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) |
|
| 702 | + function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true) |
|
| 703 | 703 | { |
| 704 | 704 | // phpcs:enable |
| 705 | 705 | $array_other = array(); |
| 706 | 706 | if (!empty($object)) { |
| 707 | - foreach($object as $key => $value) { |
|
| 707 | + foreach ($object as $key => $value) { |
|
| 708 | 708 | if (!empty($value)) { |
| 709 | 709 | if (!is_array($value) && !is_object($value)) { |
| 710 | 710 | $array_other['object_'.$key] = $value; |
| 711 | 711 | } |
| 712 | 712 | if (is_array($value) && $recursive) { |
| 713 | - $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false); |
|
| 713 | + $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false); |
|
| 714 | 714 | } |
| 715 | 715 | } |
| 716 | 716 | } |
@@ -730,31 +730,31 @@ discard block |
||
| 730 | 730 | * @param Translate $outputlangs Lang object to use for output |
| 731 | 731 | * @return array Substitution array |
| 732 | 732 | */ |
| 733 | - function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs) |
|
| 733 | + function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs) |
|
| 734 | 734 | { |
| 735 | 735 | // phpcs:enable |
| 736 | 736 | global $conf; |
| 737 | - foreach($extrafields->attribute_label as $key=>$label) |
|
| 737 | + foreach ($extrafields->attribute_label as $key=>$label) |
|
| 738 | 738 | { |
| 739 | - if($extrafields->attribute_type[$key] == 'price') |
|
| 739 | + if ($extrafields->attribute_type[$key] == 'price') |
|
| 740 | 740 | { |
| 741 | 741 | $object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]); |
| 742 | - $object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency); |
|
| 742 | + $object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency); |
|
| 743 | 743 | //Add value to store price with currency |
| 744 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency'])); |
|
| 744 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency'])); |
|
| 745 | 745 | } |
| 746 | - else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 746 | + else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox') |
|
| 747 | 747 | { |
| 748 | 748 | $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]]; |
| 749 | 749 | } |
| 750 | - else if($extrafields->attribute_type[$key] == 'date') |
|
| 750 | + else if ($extrafields->attribute_type[$key] == 'date') |
|
| 751 | 751 | { |
| 752 | - if (strlen($object->array_options['options_'.$key])>0) |
|
| 752 | + if (strlen($object->array_options['options_'.$key]) > 0) |
|
| 753 | 753 | { |
| 754 | 754 | $date = $object->array_options['options_'.$key]; |
| 755 | - $object->array_options['options_'.$key] = dol_print_date($date,'day'); // using company output language |
|
| 756 | - $object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs); // using output language format |
|
| 757 | - $object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc'); // international format |
|
| 755 | + $object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language |
|
| 756 | + $object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format |
|
| 757 | + $object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format |
|
| 758 | 758 | } |
| 759 | 759 | else |
| 760 | 760 | { |
@@ -762,29 +762,29 @@ discard block |
||
| 762 | 762 | $object->array_options['options_'.$key.'_locale'] = ''; |
| 763 | 763 | $object->array_options['options_'.$key.'_rfc'] = ''; |
| 764 | 764 | } |
| 765 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale'])); |
|
| 766 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc'])); |
|
| 765 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale'])); |
|
| 766 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc'])); |
|
| 767 | 767 | } |
| 768 | - else if($extrafields->attribute_type[$key] == 'datetime') |
|
| 768 | + else if ($extrafields->attribute_type[$key] == 'datetime') |
|
| 769 | 769 | { |
| 770 | 770 | $datetime = $object->array_options['options_'.$key]; |
| 771 | - $object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):''); // using company output language |
|
| 772 | - $object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):''); // using output language format |
|
| 773 | - $object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):''); // international format |
|
| 774 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale'])); |
|
| 775 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc'])); |
|
| 771 | + $object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language |
|
| 772 | + $object->array_options['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format |
|
| 773 | + $object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format |
|
| 774 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale'])); |
|
| 775 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc'])); |
|
| 776 | 776 | } |
| 777 | - else if($extrafields->attribute_type[$key] == 'link') |
|
| 777 | + else if ($extrafields->attribute_type[$key] == 'link') |
|
| 778 | 778 | { |
| 779 | 779 | $id = $object->array_options['options_'.$key]; |
| 780 | 780 | if ($id != "") |
| 781 | 781 | { |
| 782 | 782 | $param = $extrafields->attribute_param[$key]; |
| 783 | - $param_list=array_keys($param['options']); // $param_list='ObjectName:classPath' |
|
| 783 | + $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath' |
|
| 784 | 784 | $InfoFieldList = explode(":", $param_list[0]); |
| 785 | - $classname=$InfoFieldList[0]; |
|
| 786 | - $classpath=$InfoFieldList[1]; |
|
| 787 | - if (! empty($classpath)) |
|
| 785 | + $classname = $InfoFieldList[0]; |
|
| 786 | + $classpath = $InfoFieldList[1]; |
|
| 787 | + if (!empty($classpath)) |
|
| 788 | 788 | { |
| 789 | 789 | dol_include_once($InfoFieldList[1]); |
| 790 | 790 | if ($classname && class_exists($classname)) |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | } |
| 799 | 799 | } |
| 800 | 800 | |
| 801 | - $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); |
|
| 801 | + $array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); |
|
| 802 | 802 | } |
| 803 | 803 | |
| 804 | 804 | return $array_to_fill; |
@@ -817,12 +817,12 @@ discard block |
||
| 817 | 817 | * @param int $hidebottom Hide bottom |
| 818 | 818 | * @return void |
| 819 | 819 | */ |
| 820 | - function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0) |
|
| 820 | + function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0) |
|
| 821 | 821 | { |
| 822 | - if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y); |
|
| 823 | - $pdf->line($x+$l, $y, $x+$l, $y+$h); |
|
| 824 | - if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h); |
|
| 825 | - $pdf->line($x, $y+$h, $x, $y); |
|
| 822 | + if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y); |
|
| 823 | + $pdf->line($x + $l, $y, $x + $l, $y + $h); |
|
| 824 | + if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h); |
|
| 825 | + $pdf->line($x, $y + $h, $x, $y); |
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | |
@@ -835,8 +835,8 @@ discard block |
||
| 835 | 835 | */ |
| 836 | 836 | function columnSort($a, $b) |
| 837 | 837 | { |
| 838 | - if(empty($a['rank'])){ $a['rank'] = 0; } |
|
| 839 | - if(empty($b['rank'])){ $b['rank'] = 0; } |
|
| 838 | + if (empty($a['rank'])) { $a['rank'] = 0; } |
|
| 839 | + if (empty($b['rank'])) { $b['rank'] = 0; } |
|
| 840 | 840 | if ($a['rank'] == $b['rank']) { |
| 841 | 841 | return 0; |
| 842 | 842 | } |
@@ -853,38 +853,38 @@ discard block |
||
| 853 | 853 | * @param int $hideref Do not show ref |
| 854 | 854 | * @return null |
| 855 | 855 | */ |
| 856 | - function prepareArrayColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0) |
|
| 856 | + function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0) |
|
| 857 | 857 | { |
| 858 | 858 | global $conf; |
| 859 | 859 | |
| 860 | - $this->defineColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref); |
|
| 860 | + $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref); |
|
| 861 | 861 | |
| 862 | 862 | |
| 863 | 863 | // Sorting |
| 864 | - uasort ( $this->cols, array( $this, 'columnSort' ) ); |
|
| 864 | + uasort($this->cols, array($this, 'columnSort')); |
|
| 865 | 865 | |
| 866 | 866 | // Positionning |
| 867 | - $curX = $this->page_largeur-$this->marge_droite; // start from right |
|
| 867 | + $curX = $this->page_largeur - $this->marge_droite; // start from right |
|
| 868 | 868 | |
| 869 | 869 | // Array witdh |
| 870 | - $arrayWidth = $this->page_largeur-$this->marge_droite-$this->marge_gauche; |
|
| 870 | + $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche; |
|
| 871 | 871 | |
| 872 | 872 | // Count flexible column |
| 873 | 873 | $totalDefinedColWidth = 0; |
| 874 | 874 | $countFlexCol = 0; |
| 875 | 875 | foreach ($this->cols as $colKey =>& $colDef) |
| 876 | 876 | { |
| 877 | - if(!$this->getColumnStatus($colKey)) continue; // continue if desable |
|
| 877 | + if (!$this->getColumnStatus($colKey)) continue; // continue if desable |
|
| 878 | 878 | |
| 879 | - if(!empty($colDef['scale'])){ |
|
| 879 | + if (!empty($colDef['scale'])) { |
|
| 880 | 880 | // In case of column widht is defined by percentage |
| 881 | - $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100 ); |
|
| 881 | + $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100); |
|
| 882 | 882 | } |
| 883 | 883 | |
| 884 | - if(empty($colDef['width'])){ |
|
| 884 | + if (empty($colDef['width'])) { |
|
| 885 | 885 | $countFlexCol++; |
| 886 | 886 | } |
| 887 | - else{ |
|
| 887 | + else { |
|
| 888 | 888 | $totalDefinedColWidth += $colDef['width']; |
| 889 | 889 | } |
| 890 | 890 | } |
@@ -892,25 +892,25 @@ discard block |
||
| 892 | 892 | foreach ($this->cols as $colKey =>& $colDef) |
| 893 | 893 | { |
| 894 | 894 | // setting empty conf with default |
| 895 | - if(!empty($colDef['title'])){ |
|
| 895 | + if (!empty($colDef['title'])) { |
|
| 896 | 896 | $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']); |
| 897 | 897 | } |
| 898 | - else{ |
|
| 898 | + else { |
|
| 899 | 899 | $colDef['title'] = $this->defaultTitlesFieldsStyle; |
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | // setting empty conf with default |
| 903 | - if(!empty($colDef['content'])){ |
|
| 903 | + if (!empty($colDef['content'])) { |
|
| 904 | 904 | $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']); |
| 905 | 905 | } |
| 906 | - else{ |
|
| 906 | + else { |
|
| 907 | 907 | $colDef['content'] = $this->defaultContentsFieldsStyle; |
| 908 | 908 | } |
| 909 | 909 | |
| 910 | - if($this->getColumnStatus($colKey)) |
|
| 910 | + if ($this->getColumnStatus($colKey)) |
|
| 911 | 911 | { |
| 912 | 912 | // In case of flexible column |
| 913 | - if(empty($colDef['width'])){ |
|
| 913 | + if (empty($colDef['width'])) { |
|
| 914 | 914 | $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol; |
| 915 | 915 | } |
| 916 | 916 | |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | */ |
| 957 | 957 | function getColumnRank($colKey) |
| 958 | 958 | { |
| 959 | - if(!isset($this->cols[$colKey]['rank'])) return -1; |
|
| 959 | + if (!isset($this->cols[$colKey]['rank'])) return -1; |
|
| 960 | 960 | return $this->cols[$colKey]['rank']; |
| 961 | 961 | } |
| 962 | 962 | |
@@ -975,22 +975,22 @@ discard block |
||
| 975 | 975 | $rank = -1; |
| 976 | 976 | |
| 977 | 977 | // try to get rank from target column |
| 978 | - if(!empty($targetCol)){ |
|
| 978 | + if (!empty($targetCol)) { |
|
| 979 | 979 | $rank = $this->getColumnRank($targetCol); |
| 980 | - if($rank>=0 && $insertAfterTarget){ $rank++; } |
|
| 980 | + if ($rank >= 0 && $insertAfterTarget) { $rank++; } |
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | // get rank from new column definition |
| 984 | - if($rank<0 && !empty($defArray['rank'])){ |
|
| 984 | + if ($rank < 0 && !empty($defArray['rank'])) { |
|
| 985 | 985 | $rank = $defArray['rank']; |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | // error: no rank |
| 989 | - if($rank<0){ return -1; } |
|
| 989 | + if ($rank < 0) { return -1; } |
|
| 990 | 990 | |
| 991 | 991 | foreach ($this->cols as $colKey =>& $colDef) |
| 992 | 992 | { |
| 993 | - if( $rank <= $colDef['rank']) |
|
| 993 | + if ($rank <= $colDef['rank']) |
|
| 994 | 994 | { |
| 995 | 995 | $colDef['rank'] = $colDef['rank'] + 1; |
| 996 | 996 | } |
@@ -1016,19 +1016,19 @@ discard block |
||
| 1016 | 1016 | { |
| 1017 | 1017 | global $hookmanager; |
| 1018 | 1018 | |
| 1019 | - $parameters=array( |
|
| 1019 | + $parameters = array( |
|
| 1020 | 1020 | 'curY' => &$curY, |
| 1021 | 1021 | 'columnText' => $columnText, |
| 1022 | 1022 | 'colKey' => $colKey |
| 1023 | 1023 | ); |
| 1024 | - $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this); // Note that $action and $object may have been modified by hook |
|
| 1025 | - if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors'); |
|
| 1024 | + $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook |
|
| 1025 | + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 1026 | 1026 | if (!$reshook) |
| 1027 | 1027 | { |
| 1028 | - if(empty($columnText)) return; |
|
| 1029 | - $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position |
|
| 1028 | + if (empty($columnText)) return; |
|
| 1029 | + $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position |
|
| 1030 | 1030 | $colDef = $this->cols[$colKey]; |
| 1031 | - $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']); |
|
| 1031 | + $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 0, 0, true, $colDef['content']['align']); |
|
| 1032 | 1032 | } |
| 1033 | 1033 | } |
| 1034 | 1034 | |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | */ |
| 1042 | 1042 | function getColumnStatus($colKey) |
| 1043 | 1043 | { |
| 1044 | - if( !empty($this->cols[$colKey]['status'])){ |
|
| 1044 | + if (!empty($this->cols[$colKey]['status'])) { |
|
| 1045 | 1045 | return true; |
| 1046 | 1046 | } |
| 1047 | 1047 | else return false; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | /** |
| 37 | 37 | * @var string Error code (or message) |
| 38 | 38 | */ |
| 39 | - public $error=''; |
|
| 39 | + public $error = ''; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @var string[] Error codes (or messages) |
@@ -45,13 +45,13 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | public $actiontype; |
| 47 | 47 | |
| 48 | - public $dirmodule; // Module directory |
|
| 49 | - public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...) |
|
| 50 | - public $canvas; // Name of canvas (ex: company, individual, product, service, ...) |
|
| 51 | - public $card; // Tab (sub-canvas) |
|
| 48 | + public $dirmodule; // Module directory |
|
| 49 | + public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...) |
|
| 50 | + public $canvas; // Name of canvas (ex: company, individual, product, service, ...) |
|
| 51 | + public $card; // Tab (sub-canvas) |
|
| 52 | 52 | |
| 53 | - public $template_dir; // Initialized by getCanvas with templates directory |
|
| 54 | - public $control; // Initialized by getCanvas with controller instance |
|
| 53 | + public $template_dir; // Initialized by getCanvas with templates directory |
|
| 54 | + public $control; // Initialized by getCanvas with controller instance |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @param DoliDB $db Database handler |
| 61 | 61 | * @param string $actiontype Action type ('create', 'view', 'edit', 'list') |
| 62 | 62 | */ |
| 63 | - function __construct($db, $actiontype='view') |
|
| 63 | + function __construct($db, $actiontype = 'view') |
|
| 64 | 64 | { |
| 65 | 65 | $this->db = $db; |
| 66 | 66 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | private function _cleanaction($action) |
| 77 | 77 | { |
| 78 | 78 | $newaction = $action; |
| 79 | - if ($newaction == 'add') $newaction='create'; |
|
| 80 | - if ($newaction == 'update') $newaction='edit'; |
|
| 81 | - if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view'; |
|
| 79 | + if ($newaction == 'add') $newaction = 'create'; |
|
| 80 | + if ($newaction == 'update') $newaction = 'edit'; |
|
| 81 | + if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view'; |
|
| 82 | 82 | return $newaction; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $this->card = $card; |
| 102 | 102 | $this->dirmodule = $module; |
| 103 | 103 | // Correct values if canvas is into an external module |
| 104 | - if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs)) |
|
| 104 | + if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs)) |
|
| 105 | 105 | { |
| 106 | 106 | $this->canvas = $regs[1]; |
| 107 | 107 | $this->dirmodule = $regs[2]; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | if (file_exists($controlclassfile)) |
| 115 | 115 | { |
| 116 | 116 | // Include actions class (controller) |
| 117 | - $this->control_file=$controlclassfile; |
|
| 117 | + $this->control_file = $controlclassfile; |
|
| 118 | 118 | require_once $controlclassfile; |
| 119 | 119 | |
| 120 | 120 | // Instantiate actions class (controller) |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | // Template dir |
| 126 | 126 | $this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/'); |
| 127 | - if (! is_dir($this->template_dir)) |
|
| 127 | + if (!is_dir($this->template_dir)) |
|
| 128 | 128 | { |
| 129 | - $this->template_dir=''; |
|
| 129 | + $this->template_dir = ''; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>'; |
@@ -142,10 +142,10 @@ discard block |
||
| 142 | 142 | * @param string $ref Object ref (if id not provided) |
| 143 | 143 | * @return void |
| 144 | 144 | */ |
| 145 | - function assign_values(&$action='view', $id=0, $ref='') |
|
| 145 | + function assign_values(&$action = 'view', $id = 0, $ref = '') |
|
| 146 | 146 | { |
| 147 | 147 | // phpcs:enable |
| 148 | - if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref); |
|
| 148 | + if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | { |
| 159 | 159 | if (empty($this->template_dir)) return 0; |
| 160 | 160 | |
| 161 | - if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1; |
|
| 161 | + if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1; |
|
| 162 | 162 | else return 0; |
| 163 | 163 | } |
| 164 | 164 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | global $db, $conf, $langs, $user, $canvas; |
| 177 | 177 | global $form, $formfile; |
| 178 | 178 | |
| 179 | - include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template |
|
| 179 | + include $this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | * @return mixed Return return code of doActions of canvas |
| 205 | 205 | * @see http://wiki.dolibarr.org/index.php/Canvas_development |
| 206 | 206 | */ |
| 207 | - function doActions(&$action='view', $id=0) |
|
| 207 | + function doActions(&$action = 'view', $id = 0) |
|
| 208 | 208 | { |
| 209 | - if (method_exists($this->control,'doActions')) |
|
| 209 | + if (method_exists($this->control, 'doActions')) |
|
| 210 | 210 | { |
| 211 | 211 | $ret = $this->control->doActions($action, $id); |
| 212 | 212 | return $ret; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * @var Array $_fields Fields to synchronize with Database |
| 34 | 34 | */ |
| 35 | - protected $fields=array(); |
|
| 35 | + protected $fields = array(); |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * Constructor |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | else $this->{$field} = ''; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $this->to_delete=false; |
|
| 70 | - $this->is_clone=false; |
|
| 69 | + $this->to_delete = false; |
|
| 70 | + $this->is_clone = false; |
|
| 71 | 71 | |
| 72 | 72 | return true; |
| 73 | 73 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | public function fetch($id, $loadChild = true) |
| 107 | 107 | { |
| 108 | 108 | $res = $this->fetchCommon($id); |
| 109 | - if($res>0) { |
|
| 109 | + if ($res > 0) { |
|
| 110 | 110 | if ($loadChild) $this->fetchChild(); |
| 111 | 111 | } |
| 112 | 112 | |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | * @param bool $try_to_load Force the fetch if an id is given |
| 124 | 124 | * @return int |
| 125 | 125 | */ |
| 126 | - public function addChild($tabName, $id=0, $key='id', $try_to_load = false) |
|
| 126 | + public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false) |
|
| 127 | 127 | { |
| 128 | - if(!empty($id)) |
|
| 128 | + if (!empty($id)) |
|
| 129 | 129 | { |
| 130 | - foreach($this->{$tabName} as $k=>&$object) |
|
| 130 | + foreach ($this->{$tabName} as $k=>&$object) |
|
| 131 | 131 | { |
| 132 | - if($object->{$key} === $id) return $k; |
|
| 132 | + if ($object->{$key} === $id) return $k; |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | |
| 138 | 138 | $className = ucfirst($tabName); |
| 139 | 139 | $this->{$tabName}[$k] = new $className($this->db); |
| 140 | - if($id>0 && $key==='id' && $try_to_load) |
|
| 140 | + if ($id > 0 && $key === 'id' && $try_to_load) |
|
| 141 | 141 | { |
| 142 | 142 | $this->{$tabName}[$k]->fetch($id); |
| 143 | 143 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * @param string $key Attribute name of the object id |
| 155 | 155 | * @return bool |
| 156 | 156 | */ |
| 157 | - public function removeChild($tabName, $id, $key='id') |
|
| 157 | + public function removeChild($tabName, $id, $key = 'id') |
|
| 158 | 158 | { |
| 159 | 159 | foreach ($this->{$tabName} as &$object) |
| 160 | 160 | { |
@@ -175,22 +175,22 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | public function fetchChild() |
| 177 | 177 | { |
| 178 | - if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) |
|
| 178 | + if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) |
|
| 179 | 179 | { |
| 180 | - foreach($this->childtables as &$childTable) |
|
| 180 | + foreach ($this->childtables as &$childTable) |
|
| 181 | 181 | { |
| 182 | 182 | $className = ucfirst($childTable); |
| 183 | 183 | |
| 184 | - $this->{$className}=array(); |
|
| 184 | + $this->{$className} = array(); |
|
| 185 | 185 | |
| 186 | 186 | $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id; |
| 187 | 187 | $res = $this->db->query($sql); |
| 188 | 188 | |
| 189 | - if($res) |
|
| 189 | + if ($res) |
|
| 190 | 190 | { |
| 191 | - while($obj = $this->db->fetch_object($res)) |
|
| 191 | + while ($obj = $this->db->fetch_object($res)) |
|
| 192 | 192 | { |
| 193 | - $o=new $className($this->db); |
|
| 193 | + $o = new $className($this->db); |
|
| 194 | 194 | $o->fetch($obj->rowid); |
| 195 | 195 | |
| 196 | 196 | $this->{$className}[] = $o; |
@@ -212,19 +212,19 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function saveChild(User &$user) |
| 214 | 214 | { |
| 215 | - if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) |
|
| 215 | + if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) |
|
| 216 | 216 | { |
| 217 | - foreach($this->childtables as &$childTable) |
|
| 217 | + foreach ($this->childtables as &$childTable) |
|
| 218 | 218 | { |
| 219 | 219 | $className = ucfirst($childTable); |
| 220 | - if(!empty($this->{$className})) |
|
| 220 | + if (!empty($this->{$className})) |
|
| 221 | 221 | { |
| 222 | - foreach($this->{$className} as $i => &$object) |
|
| 222 | + foreach ($this->{$className} as $i => &$object) |
|
| 223 | 223 | { |
| 224 | 224 | $object->{$this->fk_element} = $this->id; |
| 225 | 225 | |
| 226 | 226 | $object->update($user); |
| 227 | - if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]); |
|
| 227 | + if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]); |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | public function update(User &$user) |
| 242 | 242 | { |
| 243 | 243 | if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed |
| 244 | - elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user); |
|
| 244 | + elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user); |
|
| 245 | 245 | |
| 246 | 246 | $error = 0; |
| 247 | 247 | $this->db->begin(); |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $res = $this->updateCommon($user); |
| 250 | 250 | if ($res) |
| 251 | 251 | { |
| 252 | - $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user); |
|
| 252 | + $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user); |
|
| 253 | 253 | if ($result < 0) $error++; |
| 254 | 254 | else $this->saveChild($user); |
| 255 | 255 | } |
@@ -280,17 +280,17 @@ discard block |
||
| 280 | 280 | */ |
| 281 | 281 | public function create(User &$user) |
| 282 | 282 | { |
| 283 | - if($this->id > 0) return $this->update($user); |
|
| 283 | + if ($this->id > 0) return $this->update($user); |
|
| 284 | 284 | |
| 285 | 285 | $error = 0; |
| 286 | 286 | $this->db->begin(); |
| 287 | 287 | |
| 288 | 288 | $res = $this->createCommon($user); |
| 289 | - if($res) |
|
| 289 | + if ($res) |
|
| 290 | 290 | { |
| 291 | 291 | $this->id = $this->db->last_insert_id($this->table_element); |
| 292 | 292 | |
| 293 | - $result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user); |
|
| 293 | + $result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user); |
|
| 294 | 294 | if ($result < 0) $error++; |
| 295 | 295 | else $this->saveChild($user); |
| 296 | 296 | } |
@@ -326,20 +326,20 @@ discard block |
||
| 326 | 326 | $error = 0; |
| 327 | 327 | $this->db->begin(); |
| 328 | 328 | |
| 329 | - $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user); |
|
| 329 | + $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user); |
|
| 330 | 330 | if ($result < 0) $error++; |
| 331 | 331 | |
| 332 | 332 | if (!$error) |
| 333 | 333 | { |
| 334 | 334 | $this->deleteCommon($user); |
| 335 | - if($this->withChild && !empty($this->childtables)) |
|
| 335 | + if ($this->withChild && !empty($this->childtables)) |
|
| 336 | 336 | { |
| 337 | - foreach($this->childtables as &$childTable) |
|
| 337 | + foreach ($this->childtables as &$childTable) |
|
| 338 | 338 | { |
| 339 | 339 | $className = ucfirst($childTable); |
| 340 | 340 | if (!empty($this->{$className})) |
| 341 | 341 | { |
| 342 | - foreach($this->{$className} as &$object) |
|
| 342 | + foreach ($this->{$className} as &$object) |
|
| 343 | 343 | { |
| 344 | 344 | $object->delete($user); |
| 345 | 345 | } |
@@ -370,9 +370,9 @@ discard block |
||
| 370 | 370 | * @param string $format Output date format |
| 371 | 371 | * @return string |
| 372 | 372 | */ |
| 373 | - public function getDate($field, $format='') |
|
| 373 | + public function getDate($field, $format = '') |
|
| 374 | 374 | { |
| 375 | - if(empty($this->{$field})) return ''; |
|
| 375 | + if (empty($this->{$field})) return ''; |
|
| 376 | 376 | else |
| 377 | 377 | { |
| 378 | 378 | return dol_print_date($this->{$field}, $format); |
@@ -412,19 +412,19 @@ discard block |
||
| 412 | 412 | { |
| 413 | 413 | foreach ($Tab as $key => $value) |
| 414 | 414 | { |
| 415 | - if($this->checkFieldType($key, 'date')) |
|
| 415 | + if ($this->checkFieldType($key, 'date')) |
|
| 416 | 416 | { |
| 417 | 417 | $this->setDate($key, $value); |
| 418 | 418 | } |
| 419 | - else if( $this->checkFieldType($key, 'array')) |
|
| 419 | + else if ($this->checkFieldType($key, 'array')) |
|
| 420 | 420 | { |
| 421 | 421 | $this->{$key} = $value; |
| 422 | 422 | } |
| 423 | - else if( $this->checkFieldType($key, 'float') ) |
|
| 423 | + else if ($this->checkFieldType($key, 'float')) |
|
| 424 | 424 | { |
| 425 | 425 | $this->{$key} = (double) price2num($value); |
| 426 | 426 | } |
| 427 | - else if( $this->checkFieldType($key, 'int') ) { |
|
| 427 | + else if ($this->checkFieldType($key, 'int')) { |
|
| 428 | 428 | $this->{$key} = (int) price2num($value); |
| 429 | 429 | } |
| 430 | 430 | else |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * @var string Error code (or message) |
| 42 | 42 | */ |
| 43 | - public $error=''; |
|
| 43 | + public $error = ''; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @var string[] Error codes (or messages) |
@@ -62,12 +62,12 @@ discard block |
||
| 62 | 62 | * @deprecated |
| 63 | 63 | * @see name |
| 64 | 64 | */ |
| 65 | - public $nom=''; |
|
| 65 | + public $nom = ''; |
|
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * @var string name |
| 69 | 69 | */ |
| 70 | - public $name=''; |
|
| 70 | + public $name = ''; |
|
| 71 | 71 | |
| 72 | 72 | public $active; |
| 73 | 73 | |
@@ -92,43 +92,43 @@ discard block |
||
| 92 | 92 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 93 | 93 | * @return int <0 if KO, Id of created object if OK |
| 94 | 94 | */ |
| 95 | - function create($user, $notrigger=0) |
|
| 95 | + function create($user, $notrigger = 0) |
|
| 96 | 96 | { |
| 97 | 97 | global $conf, $langs; |
| 98 | - $error=0; |
|
| 98 | + $error = 0; |
|
| 99 | 99 | |
| 100 | 100 | // Clean parameters |
| 101 | - if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement); |
|
| 102 | - if (isset($this->nom)) $this->nom=trim($this->nom); |
|
| 103 | - if (isset($this->active)) $this->active=trim($this->active); |
|
| 101 | + if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement); |
|
| 102 | + if (isset($this->nom)) $this->nom = trim($this->nom); |
|
| 103 | + if (isset($this->active)) $this->active = trim($this->active); |
|
| 104 | 104 | |
| 105 | 105 | // Check parameters |
| 106 | 106 | // Put here code to add control on parameters values |
| 107 | 107 | |
| 108 | 108 | // Insert request |
| 109 | 109 | $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements("; |
| 110 | - $sql.= "rowid,"; |
|
| 111 | - $sql.= "code_departement,"; |
|
| 112 | - $sql.= "nom,"; |
|
| 113 | - $sql.= "active"; |
|
| 114 | - $sql.= ") VALUES ("; |
|
| 115 | - $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").","; |
|
| 116 | - $sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").","; |
|
| 117 | - $sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").","; |
|
| 118 | - $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").""; |
|
| 119 | - $sql.= ")"; |
|
| 110 | + $sql .= "rowid,"; |
|
| 111 | + $sql .= "code_departement,"; |
|
| 112 | + $sql .= "nom,"; |
|
| 113 | + $sql .= "active"; |
|
| 114 | + $sql .= ") VALUES ("; |
|
| 115 | + $sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").","; |
|
| 116 | + $sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").","; |
|
| 117 | + $sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").","; |
|
| 118 | + $sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'").""; |
|
| 119 | + $sql .= ")"; |
|
| 120 | 120 | |
| 121 | 121 | $this->db->begin(); |
| 122 | 122 | |
| 123 | 123 | dol_syslog(get_class($this)."::create", LOG_DEBUG); |
| 124 | - $resql=$this->db->query($sql); |
|
| 125 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 124 | + $resql = $this->db->query($sql); |
|
| 125 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 126 | 126 | |
| 127 | - if (! $error) |
|
| 127 | + if (!$error) |
|
| 128 | 128 | { |
| 129 | 129 | $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements"); |
| 130 | 130 | |
| 131 | - if (! $notrigger) |
|
| 131 | + if (!$notrigger) |
|
| 132 | 132 | { |
| 133 | 133 | // Uncomment this and change MYOBJECT to your own tag if you |
| 134 | 134 | // want this action call a trigger. |
@@ -145,13 +145,13 @@ discard block |
||
| 145 | 145 | // Commit or rollback |
| 146 | 146 | if ($error) |
| 147 | 147 | { |
| 148 | - foreach($this->errors as $errmsg) |
|
| 148 | + foreach ($this->errors as $errmsg) |
|
| 149 | 149 | { |
| 150 | 150 | dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR); |
| 151 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 151 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 152 | 152 | } |
| 153 | 153 | $this->db->rollback(); |
| 154 | - return -1*$error; |
|
| 154 | + return -1 * $error; |
|
| 155 | 155 | } |
| 156 | 156 | else |
| 157 | 157 | { |
@@ -168,27 +168,27 @@ discard block |
||
| 168 | 168 | * @param string $code Code |
| 169 | 169 | * @return int <0 if KO, >0 if OK |
| 170 | 170 | */ |
| 171 | - function fetch($id,$code='') |
|
| 171 | + function fetch($id, $code = '') |
|
| 172 | 172 | { |
| 173 | 173 | global $langs; |
| 174 | 174 | $sql = "SELECT"; |
| 175 | - $sql.= " t.rowid,"; |
|
| 176 | - $sql.= " t.code_departement,"; |
|
| 177 | - $sql.= " t.nom,"; |
|
| 178 | - $sql.= " t.active"; |
|
| 179 | - $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t"; |
|
| 180 | - if ($id) $sql.= " WHERE t.rowid = ".$id; |
|
| 181 | - elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'"; |
|
| 175 | + $sql .= " t.rowid,"; |
|
| 176 | + $sql .= " t.code_departement,"; |
|
| 177 | + $sql .= " t.nom,"; |
|
| 178 | + $sql .= " t.active"; |
|
| 179 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t"; |
|
| 180 | + if ($id) $sql .= " WHERE t.rowid = ".$id; |
|
| 181 | + elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'"; |
|
| 182 | 182 | |
| 183 | 183 | dol_syslog(get_class($this)."::fetch", LOG_DEBUG); |
| 184 | - $resql=$this->db->query($sql); |
|
| 184 | + $resql = $this->db->query($sql); |
|
| 185 | 185 | if ($resql) |
| 186 | 186 | { |
| 187 | 187 | if ($this->db->num_rows($resql)) |
| 188 | 188 | { |
| 189 | 189 | $obj = $this->db->fetch_object($resql); |
| 190 | 190 | |
| 191 | - $this->id = $obj->rowid; |
|
| 191 | + $this->id = $obj->rowid; |
|
| 192 | 192 | $this->code_departement = $obj->code_departement; |
| 193 | 193 | $this->nom = $obj->nom; |
| 194 | 194 | $this->active = $obj->active; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | else |
| 201 | 201 | { |
| 202 | - $this->error="Error ".$this->db->lasterror(); |
|
| 202 | + $this->error = "Error ".$this->db->lasterror(); |
|
| 203 | 203 | return -1; |
| 204 | 204 | } |
| 205 | 205 | } |
@@ -212,15 +212,15 @@ discard block |
||
| 212 | 212 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 213 | 213 | * @return int <0 if KO, >0 if OK |
| 214 | 214 | */ |
| 215 | - function update($user=null, $notrigger=0) |
|
| 215 | + function update($user = null, $notrigger = 0) |
|
| 216 | 216 | { |
| 217 | 217 | global $conf, $langs; |
| 218 | - $error=0; |
|
| 218 | + $error = 0; |
|
| 219 | 219 | |
| 220 | 220 | // Clean parameters |
| 221 | - if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement); |
|
| 222 | - if (isset($this->nom)) $this->nom=trim($this->nom); |
|
| 223 | - if (isset($this->active)) $this->active=trim($this->active); |
|
| 221 | + if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement); |
|
| 222 | + if (isset($this->nom)) $this->nom = trim($this->nom); |
|
| 223 | + if (isset($this->active)) $this->active = trim($this->active); |
|
| 224 | 224 | |
| 225 | 225 | |
| 226 | 226 | // Check parameters |
@@ -228,20 +228,20 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | // Update request |
| 230 | 230 | $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET"; |
| 231 | - $sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").","; |
|
| 232 | - $sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").","; |
|
| 233 | - $sql.= " active=".(isset($this->active)?$this->active:"null").""; |
|
| 234 | - $sql.= " WHERE rowid=".$this->id; |
|
| 231 | + $sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").","; |
|
| 232 | + $sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").","; |
|
| 233 | + $sql .= " active=".(isset($this->active) ? $this->active : "null").""; |
|
| 234 | + $sql .= " WHERE rowid=".$this->id; |
|
| 235 | 235 | |
| 236 | 236 | $this->db->begin(); |
| 237 | 237 | |
| 238 | 238 | dol_syslog(get_class($this)."::update", LOG_DEBUG); |
| 239 | 239 | $resql = $this->db->query($sql); |
| 240 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 240 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 241 | 241 | |
| 242 | - if (! $error) |
|
| 242 | + if (!$error) |
|
| 243 | 243 | { |
| 244 | - if (! $notrigger) |
|
| 244 | + if (!$notrigger) |
|
| 245 | 245 | { |
| 246 | 246 | // Uncomment this and change MYOBJECT to your own tag if you |
| 247 | 247 | // want this action call a trigger. |
@@ -258,13 +258,13 @@ discard block |
||
| 258 | 258 | // Commit or rollback |
| 259 | 259 | if ($error) |
| 260 | 260 | { |
| 261 | - foreach($this->errors as $errmsg) |
|
| 261 | + foreach ($this->errors as $errmsg) |
|
| 262 | 262 | { |
| 263 | 263 | dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); |
| 264 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 264 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 265 | 265 | } |
| 266 | 266 | $this->db->rollback(); |
| 267 | - return -1*$error; |
|
| 267 | + return -1 * $error; |
|
| 268 | 268 | } |
| 269 | 269 | else |
| 270 | 270 | { |
@@ -281,23 +281,23 @@ discard block |
||
| 281 | 281 | * @param int $notrigger 0=launch triggers after, 1=disable triggers |
| 282 | 282 | * @return int <0 if KO, >0 if OK |
| 283 | 283 | */ |
| 284 | - function delete($user, $notrigger=0) |
|
| 284 | + function delete($user, $notrigger = 0) |
|
| 285 | 285 | { |
| 286 | 286 | global $conf, $langs; |
| 287 | - $error=0; |
|
| 287 | + $error = 0; |
|
| 288 | 288 | |
| 289 | 289 | $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements"; |
| 290 | - $sql.= " WHERE rowid=".$this->id; |
|
| 290 | + $sql .= " WHERE rowid=".$this->id; |
|
| 291 | 291 | |
| 292 | 292 | $this->db->begin(); |
| 293 | 293 | |
| 294 | 294 | dol_syslog(get_class($this)."::delete", LOG_DEBUG); |
| 295 | 295 | $resql = $this->db->query($sql); |
| 296 | - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } |
|
| 296 | + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } |
|
| 297 | 297 | |
| 298 | - if (! $error) |
|
| 298 | + if (!$error) |
|
| 299 | 299 | { |
| 300 | - if (! $notrigger) |
|
| 300 | + if (!$notrigger) |
|
| 301 | 301 | { |
| 302 | 302 | // Uncomment this and change MYOBJECT to your own tag if you |
| 303 | 303 | // want this action call a trigger. |
@@ -314,13 +314,13 @@ discard block |
||
| 314 | 314 | // Commit or rollback |
| 315 | 315 | if ($error) |
| 316 | 316 | { |
| 317 | - foreach($this->errors as $errmsg) |
|
| 317 | + foreach ($this->errors as $errmsg) |
|
| 318 | 318 | { |
| 319 | 319 | dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); |
| 320 | - $this->error.=($this->error?', '.$errmsg:$errmsg); |
|
| 320 | + $this->error .= ($this->error ? ', '.$errmsg : $errmsg); |
|
| 321 | 321 | } |
| 322 | 322 | $this->db->rollback(); |
| 323 | - return -1*$error; |
|
| 323 | + return -1 * $error; |
|
| 324 | 324 | } |
| 325 | 325 | else |
| 326 | 326 | { |
@@ -21,11 +21,11 @@ discard block |
||
| 21 | 21 | * \ingroup ticket |
| 22 | 22 | * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire |
| 23 | 23 | */ |
| 24 | -require_once DOL_DOCUMENT_ROOT . "/core/class/html.form.class.php"; |
|
| 25 | -require_once DOL_DOCUMENT_ROOT . "/core/class/html.formmail.class.php"; |
|
| 24 | +require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php"; |
|
| 25 | +require_once DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php"; |
|
| 26 | 26 | |
| 27 | 27 | if (!class_exists('FormCompany')) { |
| 28 | - include DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; |
|
| 28 | + include DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $this->withcreatereadonly = 1; |
| 115 | 115 | $this->withemail = 0; |
| 116 | 116 | $this->withref = 0; |
| 117 | - $this->withextrafields = 0; // Show extrafields or not |
|
| 117 | + $this->withextrafields = 0; // Show extrafields or not |
|
| 118 | 118 | //$this->withtopicreadonly=0; |
| 119 | 119 | } |
| 120 | 120 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @param int $withdolfichehead With dol_fiche_head |
| 125 | 125 | * @return void |
| 126 | 126 | */ |
| 127 | - public function showForm($withdolfichehead=0) |
|
| 127 | + public function showForm($withdolfichehead = 0) |
|
| 128 | 128 | { |
| 129 | 129 | global $conf, $langs, $user, $hookmanager; |
| 130 | 130 | |
@@ -149,25 +149,25 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, ''); |
| 151 | 151 | |
| 152 | - print '<form method="POST" '.($withdolfichehead?'':'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">'; |
|
| 153 | - print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; |
|
| 154 | - print '<input type="hidden" name="action" value="' . $this->action . '">'; |
|
| 152 | + print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'; |
|
| 153 | + print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; |
|
| 154 | + print '<input type="hidden" name="action" value="'.$this->action.'">'; |
|
| 155 | 155 | foreach ($this->param as $key => $value) { |
| 156 | - print '<input type="hidden" name="' . $key . '" value="' . $value . '">'; |
|
| 156 | + print '<input type="hidden" name="'.$key.'" value="'.$value.'">'; |
|
| 157 | 157 | } |
| 158 | - print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">'; |
|
| 158 | + print '<input type="hidden" name="fk_user_create" value="'.$this->fk_user_create.'">'; |
|
| 159 | 159 | |
| 160 | 160 | print '<table class="border">'; |
| 161 | 161 | |
| 162 | 162 | if ($this->withref) { |
| 163 | 163 | // Ref |
| 164 | 164 | $defaultref = $ticketstat->getDefaultRef(); |
| 165 | - print '<tr><td class="titlefield"><span class="fieldrequired">' . $langs->trans("Ref") . '</span></td><td><input size="18" type="text" name="ref" value="' . (GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref) . '"></td></tr>'; |
|
| 165 | + print '<tr><td class="titlefield"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="18" type="text" name="ref" value="'.(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'"></td></tr>'; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // FK_USER_CREATE |
| 169 | 169 | if ($this->withusercreate > 0 && $this->fk_user_create) { |
| 170 | - print '<tr><td class="titlefield">' . $langs->trans("CreatedBy") . '</td><td>'; |
|
| 170 | + print '<tr><td class="titlefield">'.$langs->trans("CreatedBy").'</td><td>'; |
|
| 171 | 171 | $langs->load("users"); |
| 172 | 172 | $fuser = new User($this->db); |
| 173 | 173 | |
@@ -185,12 +185,12 @@ discard block |
||
| 185 | 185 | // altairis: force company and contact id for external user |
| 186 | 186 | if (empty($user->socid)) { |
| 187 | 187 | // Company |
| 188 | - print '<tr><td class="titlefield">' . $langs->trans("ThirdParty") . '</td><td>'; |
|
| 188 | + print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td>'; |
|
| 189 | 189 | $events = array(); |
| 190 | 190 | $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); |
| 191 | 191 | print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events, 0, 'minwidth200'); |
| 192 | 192 | print '</td></tr>'; |
| 193 | - if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) { |
|
| 193 | + if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) { |
|
| 194 | 194 | $htmlname = 'socid'; |
| 195 | 195 | print '<script type="text/javascript"> |
| 196 | 196 | $(document).ready(function () { |
@@ -245,23 +245,23 @@ discard block |
||
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // Contact and type |
| 248 | - print '<tr><td>' . $langs->trans("Contact") . '</td><td>'; |
|
| 248 | + print '<tr><td>'.$langs->trans("Contact").'</td><td>'; |
|
| 249 | 249 | // If no socid, set to -1 to avoid full contacts list |
| 250 | 250 | $selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1; |
| 251 | 251 | $nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200'); |
| 252 | 252 | $formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly'); |
| 253 | 253 | print '</td></tr>'; |
| 254 | 254 | } else { |
| 255 | - print '<tr><td class="titlefield"><input type="hidden" name="socid" value="' . $user->socid . '"/></td>'; |
|
| 256 | - print '<td><input type="hidden" name="contactid" value="' . $user->contactid . '"/></td>'; |
|
| 255 | + print '<tr><td class="titlefield"><input type="hidden" name="socid" value="'.$user->socid.'"/></td>'; |
|
| 256 | + print '<td><input type="hidden" name="contactid" value="'.$user->contactid.'"/></td>'; |
|
| 257 | 257 | print '<td><input type="hidden" name="type" value="Z"/></td></tr>'; |
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | // TITLE |
| 262 | 262 | if ($this->withemail) { |
| 263 | - print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">' . $langs->trans("Email") . '</span></label></td><td>'; |
|
| 264 | - print '<input class="text minwidth200" id="email" name="email" value="' . (GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject) . '" />'; |
|
| 263 | + print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("Email").'</span></label></td><td>'; |
|
| 264 | + print '<input class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" />'; |
|
| 265 | 265 | print '</td></tr>'; |
| 266 | 266 | } |
| 267 | 267 | |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | $subelement = $regs[2]; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); |
|
| 277 | + dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); |
|
| 278 | 278 | $classname = ucfirst($subelement); |
| 279 | 279 | $objectsrc = new $classname($this->db); |
| 280 | - $objectsrc->fetch(GETPOST('originid','int')); |
|
| 280 | + $objectsrc->fetch(GETPOST('originid', 'int')); |
|
| 281 | 281 | |
| 282 | 282 | if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) { |
| 283 | 283 | $objectsrc->fetch_lines(); |
@@ -285,58 +285,58 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | $objectsrc->fetch_thirdparty(); |
| 287 | 287 | $newclassname = $classname; |
| 288 | - print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2"><input name="' . $subelement . 'id" value="' . GETPOST('originid') . '" type="hidden" />' . $objectsrc->getNomUrl(1) . '</td></tr>'; |
|
| 288 | + print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2"><input name="'.$subelement.'id" value="'.GETPOST('originid').'" type="hidden" />'.$objectsrc->getNomUrl(1).'</td></tr>'; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | // Type |
| 292 | - print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">' . $langs->trans("TicketTypeRequest") . '</span></label></td><td>'; |
|
| 292 | + print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>'; |
|
| 293 | 293 | print $this->selectTypesTickets((GETPOST('type_code') ? GETPOST('type_code') : $this->type_code), 'type_code', '', '2'); |
| 294 | 294 | print '</td></tr>'; |
| 295 | 295 | |
| 296 | 296 | // Category |
| 297 | - print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">' . $langs->trans("TicketCategory") . '</span></label></td><td>'; |
|
| 297 | + print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>'; |
|
| 298 | 298 | print $this->selectCategoriesTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2'); |
| 299 | 299 | print '</td></tr>'; |
| 300 | 300 | |
| 301 | 301 | // Severity |
| 302 | - print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">' . $langs->trans("TicketSeverity") . '</span></label></td><td>'; |
|
| 302 | + print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>'; |
|
| 303 | 303 | print $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2'); |
| 304 | 304 | print '</td></tr>'; |
| 305 | 305 | |
| 306 | 306 | // Notify thirdparty at creation |
| 307 | 307 | if (empty($this->ispublic)) |
| 308 | 308 | { |
| 309 | - print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>'; |
|
| 310 | - print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>'; |
|
| 309 | + print '<tr><td><label for="notify_tiers_at_create">'.$langs->trans("TicketNotifyTiersAtCreation").'</label></td><td>'; |
|
| 310 | + print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>'; |
|
| 311 | 311 | print '</td></tr>'; |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | // TITLE |
| 315 | 315 | if ($this->withtitletopic) { |
| 316 | - print '<tr><td><label for="subject"><span class="fieldrequired">' . $langs->trans("Subject") . '</span></label></td><td>'; |
|
| 316 | + print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>'; |
|
| 317 | 317 | |
| 318 | 318 | // Réponse à un ticket : affichage du titre du thread en readonly |
| 319 | 319 | if ($this->withtopicreadonly) { |
| 320 | - print $langs->trans('SubjectAnswerToTicket') . ' ' . $this->topic_title; |
|
| 320 | + print $langs->trans('SubjectAnswerToTicket').' '.$this->topic_title; |
|
| 321 | 321 | print '</td></tr>'; |
| 322 | 322 | } else { |
| 323 | 323 | if ($this->withthreadid > 0) { |
| 324 | - $subject = $langs->trans('SubjectAnswerToTicket') . ' ' . $this->withthreadid . ' : ' . $this->topic_title . ''; |
|
| 324 | + $subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withthreadid.' : '.$this->topic_title.''; |
|
| 325 | 325 | } |
| 326 | - print '<input class="text" size="50" id="subject" name="subject" value="' . (GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject) . '" />'; |
|
| 326 | + print '<input class="text" size="50" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" />'; |
|
| 327 | 327 | print '</td></tr>'; |
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | // MESSAGE |
| 332 | 332 | $msg = GETPOST('message', 'alpha') ? GETPOST('message', 'alpha') : ''; |
| 333 | - print '<tr><td><label for="message"><span class="fieldrequired">' . $langs->trans("Message") . '</span></label></td><td>'; |
|
| 333 | + print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>'; |
|
| 334 | 334 | |
| 335 | 335 | // If public form, display more information |
| 336 | 336 | if ($this->ispublic) { |
| 337 | - print '<div class="warning">' . ($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')) . '</div>'; |
|
| 337 | + print '<div class="warning">'.($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')).'</div>'; |
|
| 338 | 338 | } |
| 339 | - include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
| 339 | + include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
| 340 | 340 | $uselocalbrowser = true; |
| 341 | 341 | $doleditor = new DolEditor('message', GETPOST('message', 'alpha'), '100%', 250, 'dolibarr_details', 'In', true, $uselocalbrowser); |
| 342 | 342 | $doleditor->Create(); |
@@ -361,33 +361,33 @@ discard block |
||
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | $out .= '<tr>'; |
| 364 | - $out .= '<td width="180">' . $langs->trans("MailFile") . '</td>'; |
|
| 364 | + $out .= '<td width="180">'.$langs->trans("MailFile").'</td>'; |
|
| 365 | 365 | $out .= '<td colspan="2">'; |
| 366 | 366 | // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript |
| 367 | - $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n"; |
|
| 367 | + $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n"; |
|
| 368 | 368 | $out .= '<script type="text/javascript" language="javascript">'; |
| 369 | 369 | $out .= 'jQuery(document).ready(function () {'; |
| 370 | 370 | $out .= ' jQuery(".removedfile").click(function() {'; |
| 371 | 371 | $out .= ' jQuery(".removedfilehidden").val(jQuery(this).val());'; |
| 372 | 372 | $out .= ' });'; |
| 373 | 373 | $out .= '})'; |
| 374 | - $out .= '</script>' . "\n"; |
|
| 374 | + $out .= '</script>'."\n"; |
|
| 375 | 375 | if (count($listofpaths)) { |
| 376 | 376 | foreach ($listofpaths as $key => $val) { |
| 377 | - $out .= '<div id="attachfile_' . $key . '">'; |
|
| 378 | - $out .= img_mime($listofnames[$key]) . ' ' . $listofnames[$key]; |
|
| 377 | + $out .= '<div id="attachfile_'.$key.'">'; |
|
| 378 | + $out .= img_mime($listofnames[$key]).' '.$listofnames[$key]; |
|
| 379 | 379 | if (!$this->withfilereadonly) { |
| 380 | - $out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />'; |
|
| 380 | + $out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />'; |
|
| 381 | 381 | } |
| 382 | 382 | $out .= '<br></div>'; |
| 383 | 383 | } |
| 384 | 384 | } else { |
| 385 | - $out .= $langs->trans("NoAttachedFiles") . '<br>'; |
|
| 385 | + $out .= $langs->trans("NoAttachedFiles").'<br>'; |
|
| 386 | 386 | } |
| 387 | 387 | if ($this->withfile == 2) { // Can add other files |
| 388 | - $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />'; |
|
| 388 | + $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />'; |
|
| 389 | 389 | $out .= ' '; |
| 390 | - $out .= '<input type="submit" class="button" id="addfile" name="addfile" value="' . $langs->trans("MailingAddFile") . '" />'; |
|
| 390 | + $out .= '<input type="submit" class="button" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />'; |
|
| 391 | 391 | } |
| 392 | 392 | $out .= "</td></tr>\n"; |
| 393 | 393 | |
@@ -406,11 +406,11 @@ discard block |
||
| 406 | 406 | if ($withdolfichehead) dol_fiche_end(); |
| 407 | 407 | |
| 408 | 408 | print '<center>'; |
| 409 | - print '<input class="button" type="submit" name="add_ticket" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />'; |
|
| 409 | + print '<input class="button" type="submit" name="add_ticket" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />'; |
|
| 410 | 410 | |
| 411 | 411 | if ($this->withcancel) { |
| 412 | 412 | print " "; |
| 413 | - print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"" . $langs->trans("Cancel") . "\">"; |
|
| 413 | + print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">"; |
|
| 414 | 414 | } |
| 415 | 415 | print "</center>\n"; |
| 416 | 416 | |
@@ -431,13 +431,13 @@ discard block |
||
| 431 | 431 | * @param string $morecss More CSS |
| 432 | 432 | * @return void |
| 433 | 433 | */ |
| 434 | - public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='') |
|
| 434 | + public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '') |
|
| 435 | 435 | { |
| 436 | 436 | global $langs, $user; |
| 437 | 437 | |
| 438 | 438 | $ticketstat = new Ticket($this->db); |
| 439 | 439 | |
| 440 | - dol_syslog(get_class($this) . "::select_types_tickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG); |
|
| 440 | + dol_syslog(get_class($this)."::select_types_tickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG); |
|
| 441 | 441 | |
| 442 | 442 | $filterarray = array(); |
| 443 | 443 | |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | |
| 448 | 448 | $ticketstat->loadCacheTypesTickets(); |
| 449 | 449 | |
| 450 | - print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">'; |
|
| 450 | + print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'; |
|
| 451 | 451 | if ($empty) { |
| 452 | 452 | print '<option value=""> </option>'; |
| 453 | 453 | } |
@@ -465,19 +465,19 @@ discard block |
||
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | if ($format == 0) { |
| 468 | - print '<option value="' . $id . '"'; |
|
| 468 | + print '<option value="'.$id.'"'; |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | if ($format == 1) { |
| 472 | - print '<option value="' . $arraytypes['code'] . '"'; |
|
| 472 | + print '<option value="'.$arraytypes['code'].'"'; |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | if ($format == 2) { |
| 476 | - print '<option value="' . $arraytypes['code'] . '"'; |
|
| 476 | + print '<option value="'.$arraytypes['code'].'"'; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | if ($format == 3) { |
| 480 | - print '<option value="' . $id . '"'; |
|
| 480 | + print '<option value="'.$id.'"'; |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | // Si selected est text, on compare avec code, sinon avec id |
@@ -531,13 +531,13 @@ discard block |
||
| 531 | 531 | * @param string $morecss More CSS |
| 532 | 532 | * @return void |
| 533 | 533 | */ |
| 534 | - public function selectCategoriesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='') |
|
| 534 | + public function selectCategoriesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '') |
|
| 535 | 535 | { |
| 536 | 536 | global $langs, $user; |
| 537 | 537 | |
| 538 | 538 | $ticketstat = new Ticket($this->db); |
| 539 | 539 | |
| 540 | - dol_syslog(get_class($this) . "::selectCategoryTickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG); |
|
| 540 | + dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG); |
|
| 541 | 541 | |
| 542 | 542 | $filterarray = array(); |
| 543 | 543 | |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | |
| 548 | 548 | $ticketstat->loadCacheCategoriesTickets(); |
| 549 | 549 | |
| 550 | - print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">'; |
|
| 550 | + print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'; |
|
| 551 | 551 | if ($empty) { |
| 552 | 552 | print '<option value=""> </option>'; |
| 553 | 553 | } |
@@ -565,19 +565,19 @@ discard block |
||
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | if ($format == 0) { |
| 568 | - print '<option value="' . $id . '"'; |
|
| 568 | + print '<option value="'.$id.'"'; |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | if ($format == 1) { |
| 572 | - print '<option value="' . $arraycategories['code'] . '"'; |
|
| 572 | + print '<option value="'.$arraycategories['code'].'"'; |
|
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | if ($format == 2) { |
| 576 | - print '<option value="' . $arraycategories['code'] . '"'; |
|
| 576 | + print '<option value="'.$arraycategories['code'].'"'; |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | 579 | if ($format == 3) { |
| 580 | - print '<option value="' . $id . '"'; |
|
| 580 | + print '<option value="'.$id.'"'; |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | // Si selected est text, on compare avec code, sinon avec id |
@@ -632,13 +632,13 @@ discard block |
||
| 632 | 632 | * @param string $morecss More CSS |
| 633 | 633 | * @return void |
| 634 | 634 | */ |
| 635 | - public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='') |
|
| 635 | + public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '') |
|
| 636 | 636 | { |
| 637 | 637 | global $langs, $user; |
| 638 | 638 | |
| 639 | 639 | $ticketstat = new Ticket($this->db); |
| 640 | 640 | |
| 641 | - dol_syslog(get_class($this) . "::selectSeveritiesTickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG); |
|
| 641 | + dol_syslog(get_class($this)."::selectSeveritiesTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG); |
|
| 642 | 642 | |
| 643 | 643 | $filterarray = array(); |
| 644 | 644 | |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | |
| 649 | 649 | $ticketstat->loadCacheSeveritiesTickets(); |
| 650 | 650 | |
| 651 | - print '<select id="select' . $htmlname . '" class="flat minwidth150'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">'; |
|
| 651 | + print '<select id="select'.$htmlname.'" class="flat minwidth150'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'; |
|
| 652 | 652 | if ($empty) { |
| 653 | 653 | print '<option value=""> </option>'; |
| 654 | 654 | } |
@@ -666,19 +666,19 @@ discard block |
||
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | if ($format == 0) { |
| 669 | - print '<option value="' . $id . '"'; |
|
| 669 | + print '<option value="'.$id.'"'; |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | if ($format == 1) { |
| 673 | - print '<option value="' . $arrayseverities['code'] . '"'; |
|
| 673 | + print '<option value="'.$arrayseverities['code'].'"'; |
|
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | if ($format == 2) { |
| 677 | - print '<option value="' . $arrayseverities['code'] . '"'; |
|
| 677 | + print '<option value="'.$arrayseverities['code'].'"'; |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | if ($format == 3) { |
| 681 | - print '<option value="' . $id . '"'; |
|
| 681 | + print '<option value="'.$id.'"'; |
|
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | // Si selected est text, on compare avec code, sinon avec id |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { |
| 761 | 761 | $newlang = $this->param['langsmodels']; |
| 762 | 762 | } |
| 763 | - if (! empty($newlang)) { |
|
| 763 | + if (!empty($newlang)) { |
|
| 764 | 764 | $outputlangs = new Translate("", $conf); |
| 765 | 765 | $outputlangs->setDefaultLang($newlang); |
| 766 | 766 | $outputlangs->load('other'); |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | // Example 1 : Adding jquery code |
| 774 | 774 | print '<script type="text/javascript" language="javascript"> |
| 775 | 775 | jQuery(document).ready(function() { |
| 776 | - send_email=' . $send_email . '; |
|
| 776 | + send_email=' . $send_email.'; |
|
| 777 | 777 | if (send_email) { |
| 778 | 778 | jQuery(".email_line").show(); |
| 779 | 779 | } else { |
@@ -791,42 +791,42 @@ discard block |
||
| 791 | 791 | print '}); |
| 792 | 792 | </script>'; |
| 793 | 793 | |
| 794 | - print '<form method="post" name="ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">'; |
|
| 795 | - print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; |
|
| 796 | - print '<input type="hidden" name="action" value="' . $this->action . '">'; |
|
| 794 | + print '<form method="post" name="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'; |
|
| 795 | + print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; |
|
| 796 | + print '<input type="hidden" name="action" value="'.$this->action.'">'; |
|
| 797 | 797 | foreach ($this->param as $key => $value) { |
| 798 | - print '<input type="hidden" name="' . $key . '" value="' . $value . '">'; |
|
| 798 | + print '<input type="hidden" name="'.$key.'" value="'.$value.'">'; |
|
| 799 | 799 | } |
| 800 | 800 | |
| 801 | 801 | // Get message template |
| 802 | - $model_id=0; |
|
| 802 | + $model_id = 0; |
|
| 803 | 803 | if (array_key_exists('models_id', $this->param)) { |
| 804 | - $model_id=$this->param["models_id"]; |
|
| 805 | - $arraydefaultmessage=$formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); |
|
| 804 | + $model_id = $this->param["models_id"]; |
|
| 805 | + $arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $result = $formmail->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs); |
| 809 | - if ($result<0) { |
|
| 809 | + if ($result < 0) { |
|
| 810 | 810 | setEventMessages($this->error, $this->errors, 'errors'); |
| 811 | 811 | } |
| 812 | - $modelmail_array=array(); |
|
| 812 | + $modelmail_array = array(); |
|
| 813 | 813 | foreach ($formmail->lines_model as $line) { |
| 814 | - $modelmail_array[$line->id]=$line->label; |
|
| 814 | + $modelmail_array[$line->id] = $line->label; |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | - print '<table class="border" width="' . $width . '">'; |
|
| 817 | + print '<table class="border" width="'.$width.'">'; |
|
| 818 | 818 | |
| 819 | 819 | |
| 820 | 820 | // External users can't send message email |
| 821 | 821 | if ($user->rights->ticket->write && !$user->socid) { |
| 822 | 822 | print '<tr><td width="30%"></td><td colspan="2">'; |
| 823 | - $checkbox_selected = ( GETPOST('send_email') == "1" ? ' checked' : ''); |
|
| 823 | + $checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ''); |
|
| 824 | 824 | print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> '; |
| 825 | - print '<label for="send_msg_email">' . $langs->trans('SendMessageByEmail') . '</label>'; |
|
| 825 | + print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>'; |
|
| 826 | 826 | print '</td></tr>'; |
| 827 | 827 | |
| 828 | 828 | // Zone to select its email template |
| 829 | - if (count($modelmail_array)>0) { |
|
| 829 | + if (count($modelmail_array) > 0) { |
|
| 830 | 830 | print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n"; |
| 831 | 831 | print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1); |
| 832 | 832 | if ($user->admin) { |
@@ -841,32 +841,32 @@ discard block |
||
| 841 | 841 | // Substitution array |
| 842 | 842 | if ($this->withsubstit) { |
| 843 | 843 | print '<tr class="email_line"><td></td><td colspan="2">'; |
| 844 | - $help=""; |
|
| 844 | + $help = ""; |
|
| 845 | 845 | foreach ($this->substit as $key => $val) { |
| 846 | - $help.=$key.' -> '.$langs->trans($val).'<br>'; |
|
| 846 | + $help .= $key.' -> '.$langs->trans($val).'<br>'; |
|
| 847 | 847 | } |
| 848 | 848 | print $form->textwithpicto($langs->trans("TicketMessageSubstitutionReplacedByGenericValues"), $help); |
| 849 | 849 | print "</td></tr>"; |
| 850 | 850 | } |
| 851 | 851 | |
| 852 | - if (! $user->socid) { |
|
| 852 | + if (!$user->socid) { |
|
| 853 | 853 | print '<tr><td width="30%"></td><td>'; |
| 854 | - $checkbox_selected = ( GETPOST('private_message') == "1" ? ' checked' : ''); |
|
| 854 | + $checkbox_selected = (GETPOST('private_message') == "1" ? ' checked' : ''); |
|
| 855 | 855 | print '<input type="checkbox" name="private_message" value="1" id="private_message" '.$checkbox_selected.'/> '; |
| 856 | - print '<label for="private_message">' . $langs->trans('MarkMessageAsPrivate') . '</label>'; |
|
| 856 | + print '<label for="private_message">'.$langs->trans('MarkMessageAsPrivate').'</label>'; |
|
| 857 | 857 | print '</td><td align="center">'; |
| 858 | 858 | print $form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help'); |
| 859 | 859 | print '</td></tr>'; |
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | |
| 863 | - print '<tr class="email_line"><td width=20%">' . $langs->trans('Subject') . '</td>'; |
|
| 863 | + print '<tr class="email_line"><td width=20%">'.$langs->trans('Subject').'</td>'; |
|
| 864 | 864 | $label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE; |
| 865 | - print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="[' . $label_title . ' - ticket #' . $this->track_id . '] ' . $langs->trans('TicketNewMessage') . '" />'; |
|
| 865 | + print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - ticket #'.$this->track_id.'] '.$langs->trans('TicketNewMessage').'" />'; |
|
| 866 | 866 | print '</td></tr>'; |
| 867 | 867 | |
| 868 | 868 | // Destinataires |
| 869 | - print '<tr class="email_line"><td>' . $langs->trans('MailRecipients') . '</td><td colspan="2">'; |
|
| 869 | + print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td colspan="2">'; |
|
| 870 | 870 | $ticketstat = new Ticket($this->db); |
| 871 | 871 | $res = $ticketstat->fetch('', '', $this->track_id); |
| 872 | 872 | if ($res) { |
@@ -878,13 +878,13 @@ discard block |
||
| 878 | 878 | if (is_array($contacts) && count($contacts) > 0) { |
| 879 | 879 | foreach ($contacts as $key => $info_sendto) { |
| 880 | 880 | if ($info_sendto['email'] != '') { |
| 881 | - $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . "> (" . $info_sendto['libelle'] . ")"); |
|
| 881 | + $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email']."> (".$info_sendto['libelle'].")"); |
|
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) { |
| 887 | - $sendto[] = $ticketstat->origin_email . "(origin)"; |
|
| 887 | + $sendto[] = $ticketstat->origin_email."(origin)"; |
|
| 888 | 888 | } |
| 889 | 889 | |
| 890 | 890 | if ($ticketstat->fk_soc > 0) { |
@@ -892,19 +892,19 @@ discard block |
||
| 892 | 892 | $ticketstat->fetch_thirdparty(); |
| 893 | 893 | |
| 894 | 894 | if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) { |
| 895 | - $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')'; |
|
| 895 | + $sendto[] = $ticketstat->thirdparty->email.'('.$langs->trans('Customer').')'; |
|
| 896 | 896 | } |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) { |
| 900 | - $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)'; |
|
| 900 | + $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.'(generic email)'; |
|
| 901 | 901 | } |
| 902 | 902 | |
| 903 | 903 | // Print recipient list |
| 904 | 904 | if (is_array($sendto) && count($sendto) > 0) { |
| 905 | 905 | print implode(', ', $sendto); |
| 906 | 906 | } else { |
| 907 | - print '<div class="warning">' . $langs->trans('WarningNoEMailsAdded') . ' ' . $langs->trans('TicketGoIntoContactTab') . '</div>'; |
|
| 907 | + print '<div class="warning">'.$langs->trans('WarningNoEMailsAdded').' '.$langs->trans('TicketGoIntoContactTab').'</div>'; |
|
| 908 | 908 | } |
| 909 | 909 | } |
| 910 | 910 | print '</td></tr>'; |
@@ -914,10 +914,10 @@ discard block |
||
| 914 | 914 | // External users can't send message email |
| 915 | 915 | if ($user->rights->ticket->write && !$user->socid) { |
| 916 | 916 | $mail_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO; |
| 917 | - print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailIntro") . '</label>'; |
|
| 917 | + print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailIntro").'</label>'; |
|
| 918 | 918 | |
| 919 | 919 | print '</td><td>'; |
| 920 | - include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
| 920 | + include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
| 921 | 921 | $uselocalbrowser = true; |
| 922 | 922 | |
| 923 | 923 | $doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70); |
@@ -929,11 +929,11 @@ discard block |
||
| 929 | 929 | } |
| 930 | 930 | |
| 931 | 931 | // MESSAGE |
| 932 | - $defaultmessage=""; |
|
| 932 | + $defaultmessage = ""; |
|
| 933 | 933 | if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) { |
| 934 | - $defaultmessage=$arraydefaultmessage->content; |
|
| 934 | + $defaultmessage = $arraydefaultmessage->content; |
|
| 935 | 935 | } |
| 936 | - $defaultmessage=str_replace('\n', "\n", $defaultmessage); |
|
| 936 | + $defaultmessage = str_replace('\n', "\n", $defaultmessage); |
|
| 937 | 937 | |
| 938 | 938 | // Deal with format differences between message and signature (text / HTML) |
| 939 | 939 | if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__SIGNATURE__'])) { |
@@ -941,17 +941,17 @@ discard block |
||
| 941 | 941 | } elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) { |
| 942 | 942 | $defaultmessage = dol_nl2br($defaultmessage); |
| 943 | 943 | } |
| 944 | - if (isset($_POST["message"]) && ! $_POST['modelselected']) { |
|
| 945 | - $defaultmessage=GETPOST('message'); |
|
| 944 | + if (isset($_POST["message"]) && !$_POST['modelselected']) { |
|
| 945 | + $defaultmessage = GETPOST('message'); |
|
| 946 | 946 | } else { |
| 947 | - $defaultmessage=make_substitutions($defaultmessage, $this->substit); |
|
| 947 | + $defaultmessage = make_substitutions($defaultmessage, $this->substit); |
|
| 948 | 948 | // Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty) |
| 949 | - $defaultmessage=preg_replace("/^(<br>)+/", "", $defaultmessage); |
|
| 950 | - $defaultmessage=preg_replace("/^\n+/", "", $defaultmessage); |
|
| 949 | + $defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage); |
|
| 950 | + $defaultmessage = preg_replace("/^\n+/", "", $defaultmessage); |
|
| 951 | 951 | } |
| 952 | 952 | |
| 953 | - print '<tr><td><label for="message"><span class="fieldrequired">' . $langs->trans("Message") . '</span></label></td><td>'; |
|
| 954 | - include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
| 953 | + print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>'; |
|
| 954 | + include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
| 955 | 955 | $doleditor = new DolEditor('message', $defaultmessage, '100%', 350, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70); |
| 956 | 956 | $doleditor->Create(); |
| 957 | 957 | print '</td><td align="center">'; |
@@ -965,10 +965,10 @@ discard block |
||
| 965 | 965 | // External users can't send message email |
| 966 | 966 | if ($user->rights->ticket->write && !$user->socid) { |
| 967 | 967 | $mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE; |
| 968 | - print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailSignature") . '</label>'; |
|
| 968 | + print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailSignature").'</label>'; |
|
| 969 | 969 | |
| 970 | 970 | print '</td><td>'; |
| 971 | - include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
| 971 | + include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
| 972 | 972 | $doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70); |
| 973 | 973 | $doleditor->Create(); |
| 974 | 974 | print '</td><td align="center">'; |
@@ -979,33 +979,33 @@ discard block |
||
| 979 | 979 | // Attached files |
| 980 | 980 | if (!empty($this->withfile)) { |
| 981 | 981 | $out .= '<tr>'; |
| 982 | - $out .= '<td width="180">' . $langs->trans("MailFile") . '</td>'; |
|
| 982 | + $out .= '<td width="180">'.$langs->trans("MailFile").'</td>'; |
|
| 983 | 983 | $out .= '<td colspan="2">'; |
| 984 | 984 | // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript |
| 985 | - $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n"; |
|
| 985 | + $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n"; |
|
| 986 | 986 | $out .= '<script type="text/javascript" language="javascript">'; |
| 987 | 987 | $out .= 'jQuery(document).ready(function () {'; |
| 988 | 988 | $out .= ' jQuery(".removedfile").click(function() {'; |
| 989 | 989 | $out .= ' jQuery(".removedfilehidden").val(jQuery(this).val());'; |
| 990 | 990 | $out .= ' });'; |
| 991 | 991 | $out .= '})'; |
| 992 | - $out .= '</script>' . "\n"; |
|
| 992 | + $out .= '</script>'."\n"; |
|
| 993 | 993 | if (count($listofpaths)) { |
| 994 | 994 | foreach ($listofpaths as $key => $val) { |
| 995 | - $out .= '<div id="attachfile_' . $key . '">'; |
|
| 996 | - $out .= img_mime($listofnames[$key]) . ' ' . $listofnames[$key]; |
|
| 995 | + $out .= '<div id="attachfile_'.$key.'">'; |
|
| 996 | + $out .= img_mime($listofnames[$key]).' '.$listofnames[$key]; |
|
| 997 | 997 | if (!$this->withfilereadonly) { |
| 998 | - $out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />'; |
|
| 998 | + $out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />'; |
|
| 999 | 999 | } |
| 1000 | 1000 | $out .= '<br></div>'; |
| 1001 | 1001 | } |
| 1002 | 1002 | } else { |
| 1003 | - $out .= $langs->trans("NoAttachedFiles") . '<br>'; |
|
| 1003 | + $out .= $langs->trans("NoAttachedFiles").'<br>'; |
|
| 1004 | 1004 | } |
| 1005 | 1005 | if ($this->withfile == 2) { // Can add other files |
| 1006 | - $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />'; |
|
| 1006 | + $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />'; |
|
| 1007 | 1007 | $out .= ' '; |
| 1008 | - $out .= '<input type="submit" class="button" id="' . $addfileaction . '" name="' . $addfileaction . '" value="' . $langs->trans("MailingAddFile") . '" />'; |
|
| 1008 | + $out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />'; |
|
| 1009 | 1009 | } |
| 1010 | 1010 | $out .= "</td></tr>\n"; |
| 1011 | 1011 | |
@@ -1014,11 +1014,11 @@ discard block |
||
| 1014 | 1014 | |
| 1015 | 1015 | print '<tr><td colspan="3">'; |
| 1016 | 1016 | print '<center>'; |
| 1017 | - print '<input class="button" type="submit" name="btn_add_message" value="' . $langs->trans("AddMessage") . '" />'; |
|
| 1017 | + print '<input class="button" type="submit" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />'; |
|
| 1018 | 1018 | |
| 1019 | 1019 | if ($this->withcancel) { |
| 1020 | 1020 | print " "; |
| 1021 | - print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"" . $langs->trans("Cancel") . "\">"; |
|
| 1021 | + print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">"; |
|
| 1022 | 1022 | } |
| 1023 | 1023 | print "</center>\n"; |
| 1024 | 1024 | print '</td></tr>'; |
@@ -72,11 +72,11 @@ discard block |
||
| 72 | 72 | * @param User $user Object of user that ask creation |
| 73 | 73 | * @return int >= 0 if OK, < 0 if KO |
| 74 | 74 | */ |
| 75 | - public function create($user='') |
|
| 75 | + public function create($user = '') |
|
| 76 | 76 | { |
| 77 | - global $langs,$conf; |
|
| 77 | + global $langs, $conf; |
|
| 78 | 78 | |
| 79 | - $error=0; |
|
| 79 | + $error = 0; |
|
| 80 | 80 | $langs->load("errors"); |
| 81 | 81 | // Clean parameters |
| 82 | 82 | if (empty($this->label)) { |
@@ -99,34 +99,34 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)"; |
| 101 | 101 | $sql .= " VALUES ('".$conf->entity."', '".$this->db->idate($this->datea)."'"; |
| 102 | - $sql .= ", '" . $this->db->escape($this->url) . "'"; |
|
| 103 | - $sql .= ", '" . $this->db->escape($this->label) . "'"; |
|
| 104 | - $sql .= ", '" . $this->db->escape($this->objecttype) . "'"; |
|
| 105 | - $sql .= ", " . $this->objectid . ")"; |
|
| 102 | + $sql .= ", '".$this->db->escape($this->url)."'"; |
|
| 103 | + $sql .= ", '".$this->db->escape($this->label)."'"; |
|
| 104 | + $sql .= ", '".$this->db->escape($this->objecttype)."'"; |
|
| 105 | + $sql .= ", ".$this->objectid.")"; |
|
| 106 | 106 | |
| 107 | 107 | dol_syslog(get_class($this)."::create", LOG_DEBUG); |
| 108 | 108 | $result = $this->db->query($sql); |
| 109 | 109 | if ($result) { |
| 110 | - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "links"); |
|
| 110 | + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links"); |
|
| 111 | 111 | |
| 112 | 112 | if ($this->id > 0) { |
| 113 | 113 | // Call trigger |
| 114 | - $result=$this->call_trigger('LINK_CREATE',$user); |
|
| 114 | + $result = $this->call_trigger('LINK_CREATE', $user); |
|
| 115 | 115 | if ($result < 0) $error++; |
| 116 | 116 | // End call triggers |
| 117 | 117 | } else { |
| 118 | 118 | $error++; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - if (! $error) |
|
| 121 | + if (!$error) |
|
| 122 | 122 | { |
| 123 | - dol_syslog(get_class($this)."::Create success id=" . $this->id); |
|
| 123 | + dol_syslog(get_class($this)."::Create success id=".$this->id); |
|
| 124 | 124 | $this->db->commit(); |
| 125 | 125 | return $this->id; |
| 126 | 126 | } |
| 127 | 127 | else |
| 128 | 128 | { |
| 129 | - dol_syslog(get_class($this)."::Create echec update " . $this->error, LOG_ERR); |
|
| 129 | + dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR); |
|
| 130 | 130 | $this->db->rollback(); |
| 131 | 131 | return -3; |
| 132 | 132 | } |
@@ -136,13 +136,13 @@ discard block |
||
| 136 | 136 | if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') |
| 137 | 137 | { |
| 138 | 138 | |
| 139 | - $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name); |
|
| 140 | - $result=-1; |
|
| 139 | + $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); |
|
| 140 | + $result = -1; |
|
| 141 | 141 | } |
| 142 | 142 | else |
| 143 | 143 | { |
| 144 | - $this->error=$this->db->lasterror(); |
|
| 145 | - $result=-2; |
|
| 144 | + $this->error = $this->db->lasterror(); |
|
| 145 | + $result = -2; |
|
| 146 | 146 | } |
| 147 | 147 | $this->db->rollback(); |
| 148 | 148 | return $result; |
@@ -156,15 +156,15 @@ discard block |
||
| 156 | 156 | * @param int $call_trigger 0=no, 1=yes |
| 157 | 157 | * @return int <0 if KO, >=0 if OK |
| 158 | 158 | */ |
| 159 | - public function update($user='', $call_trigger=1) |
|
| 159 | + public function update($user = '', $call_trigger = 1) |
|
| 160 | 160 | { |
| 161 | - global $langs,$conf; |
|
| 161 | + global $langs, $conf; |
|
| 162 | 162 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
| 163 | 163 | |
| 164 | 164 | $langs->load("errors"); |
| 165 | - $error=0; |
|
| 165 | + $error = 0; |
|
| 166 | 166 | |
| 167 | - dol_syslog(get_class($this)."::Update id = " . $this->id . " call_trigger = " . $call_trigger); |
|
| 167 | + dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger); |
|
| 168 | 168 | |
| 169 | 169 | // Check parameters |
| 170 | 170 | if (empty($this->url)) |
@@ -174,37 +174,37 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // Clean parameters |
| 177 | - $this->url = clean_url($this->url,1); |
|
| 177 | + $this->url = clean_url($this->url, 1); |
|
| 178 | 178 | if (empty($this->label)) $this->label = basename($this->url); |
| 179 | 179 | $this->label = trim($this->label); |
| 180 | 180 | |
| 181 | 181 | |
| 182 | 182 | $this->db->begin(); |
| 183 | 183 | |
| 184 | - $sql = "UPDATE " . MAIN_DB_PREFIX . "links SET "; |
|
| 185 | - $sql .= "entity = '" . $conf->entity ."'"; |
|
| 186 | - $sql .= ", datea = '" . $this->db->idate(dol_now()) . "'"; |
|
| 187 | - $sql .= ", url = '" . $this->db->escape($this->url) . "'"; |
|
| 188 | - $sql .= ", label = '" . $this->db->escape($this->label) . "'"; |
|
| 189 | - $sql .= ", objecttype = '" . $this->db->escape($this->objecttype) . "'"; |
|
| 190 | - $sql .= ", objectid = " . $this->objectid; |
|
| 191 | - $sql .= " WHERE rowid = " . $this->id; |
|
| 184 | + $sql = "UPDATE ".MAIN_DB_PREFIX."links SET "; |
|
| 185 | + $sql .= "entity = '".$conf->entity."'"; |
|
| 186 | + $sql .= ", datea = '".$this->db->idate(dol_now())."'"; |
|
| 187 | + $sql .= ", url = '".$this->db->escape($this->url)."'"; |
|
| 188 | + $sql .= ", label = '".$this->db->escape($this->label)."'"; |
|
| 189 | + $sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'"; |
|
| 190 | + $sql .= ", objectid = ".$this->objectid; |
|
| 191 | + $sql .= " WHERE rowid = ".$this->id; |
|
| 192 | 192 | |
| 193 | - dol_syslog(get_class($this)."::update sql = " .$sql); |
|
| 193 | + dol_syslog(get_class($this)."::update sql = ".$sql); |
|
| 194 | 194 | $resql = $this->db->query($sql); |
| 195 | 195 | if ($resql) |
| 196 | 196 | { |
| 197 | 197 | if ($call_trigger) |
| 198 | 198 | { |
| 199 | 199 | // Call trigger |
| 200 | - $result=$this->call_trigger('LINK_MODIFY',$user); |
|
| 200 | + $result = $this->call_trigger('LINK_MODIFY', $user); |
|
| 201 | 201 | if ($result < 0) $error++; |
| 202 | 202 | // End call triggers |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - if (! $error) |
|
| 205 | + if (!$error) |
|
| 206 | 206 | { |
| 207 | - dol_syslog(get_class($this) . "::Update success"); |
|
| 207 | + dol_syslog(get_class($this)."::Update success"); |
|
| 208 | 208 | $this->db->commit(); |
| 209 | 209 | return 1; |
| 210 | 210 | } else { |
@@ -219,12 +219,12 @@ discard block |
||
| 219 | 219 | { |
| 220 | 220 | // Doublon |
| 221 | 221 | $this->error = $langs->trans("ErrorDuplicateField"); |
| 222 | - $result = -1; |
|
| 222 | + $result = -1; |
|
| 223 | 223 | } |
| 224 | 224 | else |
| 225 | 225 | { |
| 226 | - $this->error = $langs->trans("Error sql = " . $sql); |
|
| 227 | - $result = -2; |
|
| 226 | + $this->error = $langs->trans("Error sql = ".$sql); |
|
| 227 | + $result = -2; |
|
| 228 | 228 | } |
| 229 | 229 | $this->db->rollback(); |
| 230 | 230 | return $result; |
@@ -241,18 +241,18 @@ discard block |
||
| 241 | 241 | * @param string $sortorder sort order |
| 242 | 242 | * @return int 1 if ok, 0 if no records, -1 if error |
| 243 | 243 | **/ |
| 244 | - public function fetchAll(&$links, $objecttype, $objectid, $sortfield=null, $sortorder=null) |
|
| 244 | + public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null) |
|
| 245 | 245 | { |
| 246 | 246 | global $conf; |
| 247 | 247 | |
| 248 | - $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links"; |
|
| 249 | - $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid; |
|
| 250 | - if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity; |
|
| 248 | + $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links"; |
|
| 249 | + $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid; |
|
| 250 | + if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity; |
|
| 251 | 251 | if ($sortfield) { |
| 252 | 252 | if (empty($sortorder)) { |
| 253 | 253 | $sortorder = "ASC"; |
| 254 | 254 | } |
| 255 | - $sql .= " ORDER BY " . $sortfield . " " . $sortorder; |
|
| 255 | + $sql .= " ORDER BY ".$sortfield." ".$sortorder; |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | if ($resql) |
| 261 | 261 | { |
| 262 | 262 | $num = $this->db->num_rows($resql); |
| 263 | - dol_syslog(get_class($this)."::fetchAll " . $num . "records", LOG_DEBUG); |
|
| 263 | + dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG); |
|
| 264 | 264 | if ($num > 0) |
| 265 | 265 | { |
| 266 | 266 | while ($obj = $this->db->fetch_object($resql)) |
@@ -296,9 +296,9 @@ discard block |
||
| 296 | 296 | { |
| 297 | 297 | global $conf; |
| 298 | 298 | |
| 299 | - $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "links"; |
|
| 300 | - $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid; |
|
| 301 | - if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity; |
|
| 299 | + $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links"; |
|
| 300 | + $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid; |
|
| 301 | + if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity; |
|
| 302 | 302 | |
| 303 | 303 | $resql = $db->query($sql); |
| 304 | 304 | if ($resql) |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | * @param int $rowid Id of link to load |
| 316 | 316 | * @return int 1 if ok, 0 if no record found, -1 if error |
| 317 | 317 | **/ |
| 318 | - public function fetch($rowid=null) |
|
| 318 | + public function fetch($rowid = null) |
|
| 319 | 319 | { |
| 320 | 320 | global $conf; |
| 321 | 321 | |
@@ -323,15 +323,15 @@ discard block |
||
| 323 | 323 | $rowid = $this->id; |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links"; |
|
| 327 | - $sql .= " WHERE rowid = " . $rowid; |
|
| 328 | - if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity; |
|
| 326 | + $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links"; |
|
| 327 | + $sql .= " WHERE rowid = ".$rowid; |
|
| 328 | + if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity; |
|
| 329 | 329 | |
| 330 | 330 | dol_syslog(get_class($this)."::fetch", LOG_DEBUG); |
| 331 | 331 | $resql = $this->db->query($sql); |
| 332 | 332 | if ($resql) |
| 333 | 333 | { |
| 334 | - if($this->db->num_rows($resql) > 0) |
|
| 334 | + if ($this->db->num_rows($resql) > 0) |
|
| 335 | 335 | { |
| 336 | 336 | $obj = $this->db->fetch_object($resql); |
| 337 | 337 | $this->entity = $obj->entity; |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | return 0; |
| 348 | 348 | } |
| 349 | 349 | } else { |
| 350 | - $this->error=$this->db->lasterror(); |
|
| 350 | + $this->error = $this->db->lasterror(); |
|
| 351 | 351 | return -1; |
| 352 | 352 | } |
| 353 | 353 | } |
@@ -365,24 +365,24 @@ discard block |
||
| 365 | 365 | $error = 0; |
| 366 | 366 | |
| 367 | 367 | // Call trigger |
| 368 | - $result=$this->call_trigger('LINK_DELETE',$user); |
|
| 368 | + $result = $this->call_trigger('LINK_DELETE', $user); |
|
| 369 | 369 | if ($result < 0) return -1; |
| 370 | 370 | // End call triggers |
| 371 | 371 | |
| 372 | 372 | $this->db->begin(); |
| 373 | 373 | |
| 374 | 374 | // Remove link |
| 375 | - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "links"; |
|
| 376 | - $sql.= " WHERE rowid = " . $this->id; |
|
| 375 | + $sql = "DELETE FROM ".MAIN_DB_PREFIX."links"; |
|
| 376 | + $sql .= " WHERE rowid = ".$this->id; |
|
| 377 | 377 | |
| 378 | 378 | dol_syslog(get_class($this)."::delete", LOG_DEBUG); |
| 379 | - if (! $this->db->query($sql)) |
|
| 379 | + if (!$this->db->query($sql)) |
|
| 380 | 380 | { |
| 381 | 381 | $error++; |
| 382 | 382 | $this->error = $this->db->lasterror(); |
| 383 | 383 | } |
| 384 | 384 | |
| 385 | - if (! $error) { |
|
| 385 | + if (!$error) { |
|
| 386 | 386 | $this->db->commit(); |
| 387 | 387 | |
| 388 | 388 | return 1; |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public $db; |
| 34 | 34 | |
| 35 | - var $output; // Used by Cron method to return message |
|
| 36 | - var $result; // Used by Cron method to return data |
|
| 35 | + var $output; // Used by Cron method to return message |
|
| 36 | + var $result; // Used by Cron method to return data |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Constructor |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * @param string $choice Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile') |
| 54 | 54 | * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) |
| 55 | 55 | */ |
| 56 | - function purgeFiles($choice='tempfilesold') |
|
| 56 | + function purgeFiles($choice = 'tempfilesold') |
|
| 57 | 57 | { |
| 58 | 58 | global $conf, $langs, $dolibarr_main_data_root; |
| 59 | 59 | |
@@ -62,80 +62,80 @@ discard block |
||
| 62 | 62 | dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG); |
| 63 | 63 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 64 | 64 | |
| 65 | - $filesarray=array(); |
|
| 66 | - if (empty($choice)) $choice='tempfilesold'; |
|
| 65 | + $filesarray = array(); |
|
| 66 | + if (empty($choice)) $choice = 'tempfilesold'; |
|
| 67 | 67 | |
| 68 | - if ($choice=='tempfiles' || $choice=='tempfilesold') |
|
| 68 | + if ($choice == 'tempfiles' || $choice == 'tempfilesold') |
|
| 69 | 69 | { |
| 70 | 70 | // Delete temporary files |
| 71 | 71 | if ($dolibarr_main_data_root) |
| 72 | 72 | { |
| 73 | - $filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks |
|
| 73 | + $filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks |
|
| 74 | 74 | if ($choice == 'tempfilesold') |
| 75 | 75 | { |
| 76 | 76 | $now = dol_now(); |
| 77 | - foreach($filesarray as $key => $val) |
|
| 77 | + foreach ($filesarray as $key => $val) |
|
| 78 | 78 | { |
| 79 | - if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]); // Discard files not older than 24h |
|
| 79 | + if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]); // Discard files not older than 24h |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - if ($choice=='allfiles') |
|
| 85 | + if ($choice == 'allfiles') |
|
| 86 | 86 | { |
| 87 | 87 | // Delete all files (except install.lock, do not follow symbolic links) |
| 88 | 88 | if ($dolibarr_main_data_root) |
| 89 | 89 | { |
| 90 | - $filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); |
|
| 90 | + $filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if ($choice=='logfile') |
|
| 94 | + if ($choice == 'logfile') |
|
| 95 | 95 | { |
| 96 | 96 | // Define files log |
| 97 | 97 | if ($dolibarr_main_data_root) |
| 98 | 98 | { |
| 99 | - $filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); |
|
| 99 | + $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - $filelog=''; |
|
| 103 | - if (! empty($conf->syslog->enabled)) |
|
| 102 | + $filelog = ''; |
|
| 103 | + if (!empty($conf->syslog->enabled)) |
|
| 104 | 104 | { |
| 105 | - $filelog=$conf->global->SYSLOG_FILE; |
|
| 106 | - $filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog); |
|
| 105 | + $filelog = $conf->global->SYSLOG_FILE; |
|
| 106 | + $filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog); |
|
| 107 | 107 | |
| 108 | - $alreadyincluded=false; |
|
| 108 | + $alreadyincluded = false; |
|
| 109 | 109 | foreach ($filesarray as $tmpcursor) |
| 110 | 110 | { |
| 111 | - if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; } |
|
| 111 | + if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; } |
|
| 112 | 112 | } |
| 113 | - if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file'); |
|
| 113 | + if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file'); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - $count=0; |
|
| 118 | - $countdeleted=0; |
|
| 119 | - $counterror=0; |
|
| 117 | + $count = 0; |
|
| 118 | + $countdeleted = 0; |
|
| 119 | + $counterror = 0; |
|
| 120 | 120 | if (count($filesarray)) |
| 121 | 121 | { |
| 122 | - foreach($filesarray as $key => $value) |
|
| 122 | + foreach ($filesarray as $key => $value) |
|
| 123 | 123 | { |
| 124 | 124 | //print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n"; |
| 125 | 125 | if ($filesarray[$key]['type'] == 'dir') |
| 126 | 126 | { |
| 127 | - $startcount=0; |
|
| 128 | - $tmpcountdeleted=0; |
|
| 129 | - $result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted); |
|
| 130 | - $count+=$result; |
|
| 131 | - $countdeleted+=$tmpcountdeleted; |
|
| 127 | + $startcount = 0; |
|
| 128 | + $tmpcountdeleted = 0; |
|
| 129 | + $result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted); |
|
| 130 | + $count += $result; |
|
| 131 | + $countdeleted += $tmpcountdeleted; |
|
| 132 | 132 | } |
| 133 | 133 | elseif ($filesarray[$key]['type'] == 'file') |
| 134 | 134 | { |
| 135 | 135 | // If (file that is not logfile) or (if mode is logfile) |
| 136 | - if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile') |
|
| 136 | + if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile') |
|
| 137 | 137 | { |
| 138 | - $result=dol_delete_file($filesarray[$key]['fullname'], 1, 1); |
|
| 138 | + $result = dol_delete_file($filesarray[$key]['fullname'], 1, 1); |
|
| 139 | 139 | if ($result) |
| 140 | 140 | { |
| 141 | 141 | $count++; |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | // Update cachenbofdoc |
| 153 | - if (! empty($conf->ecm->enabled) && $choice=='allfiles') |
|
| 153 | + if (!empty($conf->ecm->enabled) && $choice == 'allfiles') |
|
| 154 | 154 | { |
| 155 | 155 | require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; |
| 156 | 156 | $ecmdirstatic = new EcmDirectory($this->db); |
@@ -160,13 +160,13 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | if ($count > 0) |
| 162 | 162 | { |
| 163 | - $this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted); |
|
| 164 | - if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted)); |
|
| 163 | + $this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted); |
|
| 164 | + if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted)); |
|
| 165 | 165 | } |
| 166 | - else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':''); |
|
| 166 | + else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : ''); |
|
| 167 | 167 | |
| 168 | 168 | //return $count; |
| 169 | - return 0; // This function can be called by cron so must return 0 if OK |
|
| 169 | + return 0; // This function can be called by cron so must return 0 if OK |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * @param int $execmethod 0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method |
| 183 | 183 | * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) |
| 184 | 184 | */ |
| 185 | - function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0) |
|
| 185 | + function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0) |
|
| 186 | 186 | { |
| 187 | 187 | global $db, $conf, $langs, $dolibarr_main_data_root; |
| 188 | 188 | global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass; |
@@ -193,112 +193,112 @@ discard block |
||
| 193 | 193 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 194 | 194 | |
| 195 | 195 | // Check compression parameter |
| 196 | - if (! in_array($compression, array('none', 'gz', 'bz', 'zip'))) |
|
| 196 | + if (!in_array($compression, array('none', 'gz', 'bz', 'zip'))) |
|
| 197 | 197 | { |
| 198 | 198 | $langs->load("errors"); |
| 199 | - $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression"); |
|
| 199 | + $this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression"); |
|
| 200 | 200 | return -1; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | // Check type parameter |
| 204 | 204 | if ($type == 'auto') $type = $db->type; |
| 205 | - if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin'))) |
|
| 205 | + if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin'))) |
|
| 206 | 206 | { |
| 207 | 207 | $langs->load("errors"); |
| 208 | - $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype"); |
|
| 208 | + $this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype"); |
|
| 209 | 209 | return -1; |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | // Check file parameter |
| 213 | 213 | if ($file == 'auto') |
| 214 | 214 | { |
| 215 | - $prefix='dump'; |
|
| 216 | - $ext='sql'; |
|
| 217 | - if (in_array($type, array('mysql', 'mysqli'))) { $prefix='mysqldump'; $ext='sql'; } |
|
| 215 | + $prefix = 'dump'; |
|
| 216 | + $ext = 'sql'; |
|
| 217 | + if (in_array($type, array('mysql', 'mysqli'))) { $prefix = 'mysqldump'; $ext = 'sql'; } |
|
| 218 | 218 | //if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; } |
| 219 | - if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; } |
|
| 220 | - $file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext; |
|
| 219 | + if (in_array($type, array('pgsql'))) { $prefix = 'pg_dump'; $ext = 'sql'; } |
|
| 220 | + $file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - $outputdir = $conf->admin->dir_output.'/backup'; |
|
| 224 | - $result=dol_mkdir($outputdir); |
|
| 223 | + $outputdir = $conf->admin->dir_output.'/backup'; |
|
| 224 | + $result = dol_mkdir($outputdir); |
|
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | // MYSQL |
| 228 | 228 | if ($type == 'mysql' || $type == 'mysqli') |
| 229 | 229 | { |
| 230 | - $cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP; |
|
| 230 | + $cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP; |
|
| 231 | 231 | |
| 232 | 232 | |
| 233 | 233 | $outputfile = $outputdir.'/'.$file; |
| 234 | 234 | // for compression format, we add extension |
| 235 | - $compression=$compression ? $compression : 'none'; |
|
| 236 | - if ($compression == 'gz') $outputfile.='.gz'; |
|
| 237 | - if ($compression == 'bz') $outputfile.='.bz2'; |
|
| 235 | + $compression = $compression ? $compression : 'none'; |
|
| 236 | + if ($compression == 'gz') $outputfile .= '.gz'; |
|
| 237 | + if ($compression == 'bz') $outputfile .= '.bz2'; |
|
| 238 | 238 | $outputerror = $outputfile.'.err'; |
| 239 | 239 | dol_mkdir($conf->admin->dir_output.'/backup'); |
| 240 | 240 | |
| 241 | 241 | // Parameteres execution |
| 242 | - $command=$cmddump; |
|
| 243 | - if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command |
|
| 242 | + $command = $cmddump; |
|
| 243 | + if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command |
|
| 244 | 244 | |
| 245 | 245 | //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass); |
| 246 | - $param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host; |
|
| 247 | - $param.=" -u ".$dolibarr_main_db_user; |
|
| 248 | - if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port; |
|
| 249 | - if (! GETPOST("use_transaction")) $param.=" -l --single-transaction"; |
|
| 250 | - if (GETPOST("disable_fk") || $usedefault) $param.=" -K"; |
|
| 251 | - if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha")); |
|
| 252 | - if (GETPOST("drop_database")) $param.=" --add-drop-database"; |
|
| 246 | + $param = $dolibarr_main_db_name." -h ".$dolibarr_main_db_host; |
|
| 247 | + $param .= " -u ".$dolibarr_main_db_user; |
|
| 248 | + if (!empty($dolibarr_main_db_port)) $param .= " -P ".$dolibarr_main_db_port; |
|
| 249 | + if (!GETPOST("use_transaction")) $param .= " -l --single-transaction"; |
|
| 250 | + if (GETPOST("disable_fk") || $usedefault) $param .= " -K"; |
|
| 251 | + if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha")); |
|
| 252 | + if (GETPOST("drop_database")) $param .= " --add-drop-database"; |
|
| 253 | 253 | if (GETPOST("sql_structure") || $usedefault) |
| 254 | 254 | { |
| 255 | - if (GETPOST("drop") || $usedefault) $param.=" --add-drop-table=TRUE"; |
|
| 256 | - else $param.=" --add-drop-table=FALSE"; |
|
| 255 | + if (GETPOST("drop") || $usedefault) $param .= " --add-drop-table=TRUE"; |
|
| 256 | + else $param .= " --add-drop-table=FALSE"; |
|
| 257 | 257 | } |
| 258 | 258 | else |
| 259 | 259 | { |
| 260 | - $param.=" -t"; |
|
| 260 | + $param .= " -t"; |
|
| 261 | 261 | } |
| 262 | - if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE"; |
|
| 262 | + if (GETPOST("disable-add-locks")) $param .= " --add-locks=FALSE"; |
|
| 263 | 263 | if (GETPOST("sql_data") || $usedefault) |
| 264 | 264 | { |
| 265 | - $param.=" --tables"; |
|
| 266 | - if (GETPOST("showcolumns") || $usedefault) $param.=" -c"; |
|
| 267 | - if (GETPOST("extended_ins") || $usedefault) $param.=" -e"; |
|
| 268 | - else $param.=" --skip-extended-insert"; |
|
| 269 | - if (GETPOST("delayed")) $param.=" --delayed-insert"; |
|
| 270 | - if (GETPOST("sql_ignore")) $param.=" --insert-ignore"; |
|
| 271 | - if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob"; |
|
| 265 | + $param .= " --tables"; |
|
| 266 | + if (GETPOST("showcolumns") || $usedefault) $param .= " -c"; |
|
| 267 | + if (GETPOST("extended_ins") || $usedefault) $param .= " -e"; |
|
| 268 | + else $param .= " --skip-extended-insert"; |
|
| 269 | + if (GETPOST("delayed")) $param .= " --delayed-insert"; |
|
| 270 | + if (GETPOST("sql_ignore")) $param .= " --insert-ignore"; |
|
| 271 | + if (GETPOST("hexforbinary") || $usedefault) $param .= " --hex-blob"; |
|
| 272 | 272 | } |
| 273 | 273 | else |
| 274 | 274 | { |
| 275 | - $param.=" -d"; // No row information (no data) |
|
| 275 | + $param .= " -d"; // No row information (no data) |
|
| 276 | 276 | } |
| 277 | - $param.=" --default-character-set=utf8"; // We always save output into utf8 charset |
|
| 278 | - $paramcrypted=$param; |
|
| 279 | - $paramclear=$param; |
|
| 280 | - if (! empty($dolibarr_main_db_pass)) |
|
| 277 | + $param .= " --default-character-set=utf8"; // We always save output into utf8 charset |
|
| 278 | + $paramcrypted = $param; |
|
| 279 | + $paramclear = $param; |
|
| 280 | + if (!empty($dolibarr_main_db_pass)) |
|
| 281 | 281 | { |
| 282 | - $paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"'; |
|
| 283 | - $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"'; |
|
| 282 | + $paramcrypted .= ' -p"'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'"'; |
|
| 283 | + $paramclear .= ' -p"'.str_replace(array('"', '`'), array('\"', '\`'), $dolibarr_main_db_pass).'"'; |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $errormsg=''; |
|
| 286 | + $errormsg = ''; |
|
| 287 | 287 | $handle = ''; |
| 288 | 288 | |
| 289 | 289 | // Start call method to execute dump |
| 290 | - $fullcommandcrypted=$command." ".$paramcrypted." 2>&1"; |
|
| 291 | - $fullcommandclear=$command." ".$paramclear." 2>&1"; |
|
| 290 | + $fullcommandcrypted = $command." ".$paramcrypted." 2>&1"; |
|
| 291 | + $fullcommandclear = $command." ".$paramclear." 2>&1"; |
|
| 292 | 292 | if ($compression == 'none') $handle = fopen($outputfile, 'w'); |
| 293 | 293 | if ($compression == 'gz') $handle = gzopen($outputfile, 'w'); |
| 294 | 294 | if ($compression == 'bz') $handle = bzopen($outputfile, 'w'); |
| 295 | 295 | |
| 296 | 296 | if ($handle) |
| 297 | 297 | { |
| 298 | - if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN; |
|
| 299 | - if (empty($execmethod)) $execmethod=1; |
|
| 298 | + if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN; |
|
| 299 | + if (empty($execmethod)) $execmethod = 1; |
|
| 300 | 300 | |
| 301 | - $ok=0; |
|
| 301 | + $ok = 0; |
|
| 302 | 302 | dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG); |
| 303 | 303 | |
| 304 | 304 | // TODO Replace with executeCLI function |
@@ -312,35 +312,35 @@ discard block |
||
| 312 | 312 | $langs->load("errors"); |
| 313 | 313 | dol_syslog("Datadump retval after exec=".$retval, LOG_ERR); |
| 314 | 314 | $error = 'Error '.$retval; |
| 315 | - $ok=0; |
|
| 315 | + $ok = 0; |
|
| 316 | 316 | } |
| 317 | 317 | else |
| 318 | 318 | { |
| 319 | - $i=0; |
|
| 319 | + $i = 0; |
|
| 320 | 320 | if (!empty($readt)) |
| 321 | - foreach($readt as $key=>$read) |
|
| 321 | + foreach ($readt as $key=>$read) |
|
| 322 | 322 | { |
| 323 | - $i++; // output line number |
|
| 323 | + $i++; // output line number |
|
| 324 | 324 | if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue; |
| 325 | 325 | fwrite($handle, $read.($execmethod == 2 ? '' : "\n")); |
| 326 | - if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1; |
|
| 327 | - elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1; |
|
| 326 | + if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1; |
|
| 327 | + elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1; |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | } |
| 331 | 331 | if ($execmethod == 2) // With this method, there is no way to get the return code, only output |
| 332 | 332 | { |
| 333 | 333 | $handlein = popen($fullcommandclear, 'r'); |
| 334 | - $i=0; |
|
| 334 | + $i = 0; |
|
| 335 | 335 | while (!feof($handlein)) |
| 336 | 336 | { |
| 337 | - $i++; // output line number |
|
| 337 | + $i++; // output line number |
|
| 338 | 338 | $read = fgets($handlein); |
| 339 | 339 | // Exclude warning line we don't want |
| 340 | 340 | if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue; |
| 341 | - fwrite($handle,$read); |
|
| 342 | - if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1; |
|
| 343 | - elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1; |
|
| 341 | + fwrite($handle, $read); |
|
| 342 | + if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1; |
|
| 343 | + elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1; |
|
| 344 | 344 | } |
| 345 | 345 | pclose($handlein); |
| 346 | 346 | } |
@@ -350,14 +350,14 @@ discard block |
||
| 350 | 350 | if ($compression == 'gz') gzclose($handle); |
| 351 | 351 | if ($compression == 'bz') bzclose($handle); |
| 352 | 352 | |
| 353 | - if (! empty($conf->global->MAIN_UMASK)) |
|
| 353 | + if (!empty($conf->global->MAIN_UMASK)) |
|
| 354 | 354 | @chmod($outputfile, octdec($conf->global->MAIN_UMASK)); |
| 355 | 355 | } |
| 356 | 356 | else |
| 357 | 357 | { |
| 358 | 358 | $langs->load("errors"); |
| 359 | - dol_syslog("Failed to open file ".$outputfile,LOG_ERR); |
|
| 360 | - $errormsg=$langs->trans("ErrorFailedToWriteInDir"); |
|
| 359 | + dol_syslog("Failed to open file ".$outputfile, LOG_ERR); |
|
| 360 | + $errormsg = $langs->trans("ErrorFailedToWriteInDir"); |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | // Get errorstring |
@@ -367,23 +367,23 @@ discard block |
||
| 367 | 367 | if ($handle) |
| 368 | 368 | { |
| 369 | 369 | // Get 2048 first chars of error message. |
| 370 | - $errormsg = fgets($handle,2048); |
|
| 370 | + $errormsg = fgets($handle, 2048); |
|
| 371 | 371 | // Close file |
| 372 | 372 | if ($compression == 'none') fclose($handle); |
| 373 | 373 | if ($compression == 'gz') gzclose($handle); |
| 374 | 374 | if ($compression == 'bz') bzclose($handle); |
| 375 | - if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg=''; // Pas erreur |
|
| 375 | + if ($ok && preg_match('/^-- MySql/i', $errormsg)) $errormsg = ''; // Pas erreur |
|
| 376 | 376 | else |
| 377 | 377 | { |
| 378 | 378 | // Renommer fichier sortie en fichier erreur |
| 379 | 379 | //print "$outputfile -> $outputerror"; |
| 380 | 380 | @dol_delete_file($outputerror, 1, 0, 0, null, false, 0); |
| 381 | - @rename($outputfile,$outputerror); |
|
| 381 | + @rename($outputfile, $outputerror); |
|
| 382 | 382 | // Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide |
| 383 | - if (! $errormsg) |
|
| 383 | + if (!$errormsg) |
|
| 384 | 384 | { |
| 385 | 385 | $langs->load("errors"); |
| 386 | - $errormsg=$langs->trans("ErrorFailedToRunExternalCommand"); |
|
| 386 | + $errormsg = $langs->trans("ErrorFailedToRunExternalCommand"); |
|
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | 389 | } |
@@ -401,9 +401,9 @@ discard block |
||
| 401 | 401 | $outputfile = $outputdir.'/'.$file; |
| 402 | 402 | $outputfiletemp = $outputfile.'-TMP.sql'; |
| 403 | 403 | // for compression format, we add extension |
| 404 | - $compression=$compression ? $compression : 'none'; |
|
| 405 | - if ($compression == 'gz') $outputfile.='.gz'; |
|
| 406 | - if ($compression == 'bz') $outputfile.='.bz2'; |
|
| 404 | + $compression = $compression ? $compression : 'none'; |
|
| 405 | + if ($compression == 'gz') $outputfile .= '.gz'; |
|
| 406 | + if ($compression == 'bz') $outputfile .= '.bz2'; |
|
| 407 | 407 | $outputerror = $outputfile.'.err'; |
| 408 | 408 | dol_mkdir($conf->admin->dir_output.'/backup'); |
| 409 | 409 | |
@@ -425,51 +425,51 @@ discard block |
||
| 425 | 425 | // POSTGRESQL |
| 426 | 426 | if ($type == 'postgresql' || $type == 'pgsql') |
| 427 | 427 | { |
| 428 | - $cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; |
|
| 428 | + $cmddump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; |
|
| 429 | 429 | |
| 430 | 430 | $outputfile = $outputdir.'/'.$file; |
| 431 | 431 | // for compression format, we add extension |
| 432 | - $compression=$compression ? $compression : 'none'; |
|
| 433 | - if ($compression == 'gz') $outputfile.='.gz'; |
|
| 434 | - if ($compression == 'bz') $outputfile.='.bz2'; |
|
| 432 | + $compression = $compression ? $compression : 'none'; |
|
| 433 | + if ($compression == 'gz') $outputfile .= '.gz'; |
|
| 434 | + if ($compression == 'bz') $outputfile .= '.bz2'; |
|
| 435 | 435 | $outputerror = $outputfile.'.err'; |
| 436 | 436 | dol_mkdir($conf->admin->dir_output.'/backup'); |
| 437 | 437 | |
| 438 | 438 | // Parameteres execution |
| 439 | - $command=$cmddump; |
|
| 440 | - if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command |
|
| 439 | + $command = $cmddump; |
|
| 440 | + if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command |
|
| 441 | 441 | |
| 442 | 442 | //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass); |
| 443 | 443 | //$param="-F c"; |
| 444 | - $param="-F p"; |
|
| 445 | - $param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host; |
|
| 446 | - $param.=" -U ".$dolibarr_main_db_user; |
|
| 447 | - if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port; |
|
| 448 | - if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.=" --disable-dollar-quoting"; |
|
| 449 | - if (GETPOST("drop_database")) $param.=" -c -C"; |
|
| 444 | + $param = "-F p"; |
|
| 445 | + $param .= " --no-tablespaces --inserts -h ".$dolibarr_main_db_host; |
|
| 446 | + $param .= " -U ".$dolibarr_main_db_user; |
|
| 447 | + if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port; |
|
| 448 | + if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param .= " --disable-dollar-quoting"; |
|
| 449 | + if (GETPOST("drop_database")) $param .= " -c -C"; |
|
| 450 | 450 | if (GETPOST("sql_structure")) |
| 451 | 451 | { |
| 452 | - if (GETPOST("drop")) $param.=" --add-drop-table"; |
|
| 453 | - if (! GETPOST("sql_data")) $param.=" -s"; |
|
| 452 | + if (GETPOST("drop")) $param .= " --add-drop-table"; |
|
| 453 | + if (!GETPOST("sql_data")) $param .= " -s"; |
|
| 454 | 454 | } |
| 455 | 455 | if (GETPOST("sql_data")) |
| 456 | 456 | { |
| 457 | - if (! GETPOST("sql_structure")) $param.=" -a"; |
|
| 458 | - if (GETPOST("showcolumns")) $param.=" -c"; |
|
| 457 | + if (!GETPOST("sql_structure")) $param .= " -a"; |
|
| 458 | + if (GETPOST("showcolumns")) $param .= " -c"; |
|
| 459 | 459 | } |
| 460 | - $param.=' -f "'.$outputfile.'"'; |
|
| 460 | + $param .= ' -f "'.$outputfile.'"'; |
|
| 461 | 461 | //if ($compression == 'none') |
| 462 | - if ($compression == 'gz') $param.=' -Z 9'; |
|
| 462 | + if ($compression == 'gz') $param .= ' -Z 9'; |
|
| 463 | 463 | //if ($compression == 'bz') |
| 464 | - $paramcrypted=$param; |
|
| 465 | - $paramclear=$param; |
|
| 464 | + $paramcrypted = $param; |
|
| 465 | + $paramclear = $param; |
|
| 466 | 466 | /*if (! empty($dolibarr_main_db_pass)) |
| 467 | 467 | { |
| 468 | 468 | $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass); |
| 469 | 469 | $paramclear.=" -W".$dolibarr_main_db_pass; |
| 470 | 470 | }*/ |
| 471 | - $paramcrypted.=" -w ".$dolibarr_main_db_name; |
|
| 472 | - $paramclear.=" -w ".$dolibarr_main_db_name; |
|
| 471 | + $paramcrypted .= " -w ".$dolibarr_main_db_name; |
|
| 472 | + $paramclear .= " -w ".$dolibarr_main_db_name; |
|
| 473 | 473 | |
| 474 | 474 | $this->output = ""; |
| 475 | 475 | $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted); |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | if ($keeplastnfiles > 0) |
| 480 | 480 | { |
| 481 | 481 | $tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC); |
| 482 | - $i=0; |
|
| 483 | - foreach($tmpfiles as $key => $val) |
|
| 482 | + $i = 0; |
|
| 483 | + foreach ($tmpfiles as $key => $val) |
|
| 484 | 484 | { |
| 485 | 485 | $i++; |
| 486 | 486 | if ($i <= $keeplastnfiles) continue; |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | * @param int $execmethod 0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method |
| 502 | 502 | * @return array array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK. |
| 503 | 503 | */ |
| 504 | - function executeCLI($command, $outputfile, $execmethod=0) |
|
| 504 | + function executeCLI($command, $outputfile, $execmethod = 0) |
|
| 505 | 505 | { |
| 506 | 506 | global $conf, $langs; |
| 507 | 507 | |
@@ -509,15 +509,15 @@ discard block |
||
| 509 | 509 | $output = ''; |
| 510 | 510 | $error = ''; |
| 511 | 511 | |
| 512 | - $command=escapeshellcmd($command); |
|
| 513 | - $command.=" 2>&1"; |
|
| 512 | + $command = escapeshellcmd($command); |
|
| 513 | + $command .= " 2>&1"; |
|
| 514 | 514 | |
| 515 | - if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN; |
|
| 516 | - if (empty($execmethod)) $execmethod=1; |
|
| 515 | + if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN; |
|
| 516 | + if (empty($execmethod)) $execmethod = 1; |
|
| 517 | 517 | //$execmethod=1; |
| 518 | 518 | |
| 519 | 519 | dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG); |
| 520 | - $output_arr=array(); |
|
| 520 | + $output_arr = array(); |
|
| 521 | 521 | |
| 522 | 522 | if ($execmethod == 1) |
| 523 | 523 | { |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | } |
| 533 | 533 | if ($execmethod == 2) // With this method, there is no way to get the return code, only output |
| 534 | 534 | { |
| 535 | - $ok=0; |
|
| 535 | + $ok = 0; |
|
| 536 | 536 | $handle = fopen($outputfile, 'w+b'); |
| 537 | 537 | if ($handle) |
| 538 | 538 | { |
@@ -541,21 +541,21 @@ discard block |
||
| 541 | 541 | while (!feof($handlein)) |
| 542 | 542 | { |
| 543 | 543 | $read = fgets($handlein); |
| 544 | - fwrite($handle,$read); |
|
| 545 | - $output_arr[]=$read; |
|
| 544 | + fwrite($handle, $read); |
|
| 545 | + $output_arr[] = $read; |
|
| 546 | 546 | } |
| 547 | 547 | pclose($handlein); |
| 548 | 548 | fclose($handle); |
| 549 | 549 | } |
| 550 | - if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK)); |
|
| 550 | + if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK)); |
|
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | // Update with result |
| 554 | - if (is_array($output_arr) && count($output_arr)>0) |
|
| 554 | + if (is_array($output_arr) && count($output_arr) > 0) |
|
| 555 | 555 | { |
| 556 | - foreach($output_arr as $val) |
|
| 556 | + foreach ($output_arr as $val) |
|
| 557 | 557 | { |
| 558 | - $output.=$val.($execmethod == 2 ? '' : "\n"); |
|
| 558 | + $output .= $val.($execmethod == 2 ? '' : "\n"); |
|
| 559 | 559 | } |
| 560 | 560 | } |
| 561 | 561 | |
@@ -577,23 +577,23 @@ discard block |
||
| 577 | 577 | |
| 578 | 578 | $error = 0; |
| 579 | 579 | |
| 580 | - $modulelowercase=strtolower($module); |
|
| 580 | + $modulelowercase = strtolower($module); |
|
| 581 | 581 | |
| 582 | 582 | // Dir for module |
| 583 | 583 | $dir = $dirins.'/'.$modulelowercase; |
| 584 | 584 | // Zip file to build |
| 585 | - $FILENAMEDOC=''; |
|
| 585 | + $FILENAMEDOC = ''; |
|
| 586 | 586 | |
| 587 | 587 | // Load module |
| 588 | 588 | dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php'); |
| 589 | - $class='mod'.$module; |
|
| 589 | + $class = 'mod'.$module; |
|
| 590 | 590 | |
| 591 | 591 | if (class_exists($class)) |
| 592 | 592 | { |
| 593 | 593 | try { |
| 594 | 594 | $moduleobj = new $class($this->db); |
| 595 | 595 | } |
| 596 | - catch(Exception $e) |
|
| 596 | + catch (Exception $e) |
|
| 597 | 597 | { |
| 598 | 598 | $error++; |
| 599 | 599 | dol_print_error($e->getMessage()); |
@@ -607,41 +607,41 @@ discard block |
||
| 607 | 607 | exit; |
| 608 | 608 | } |
| 609 | 609 | |
| 610 | - $arrayversion=explode('.',$moduleobj->version,3); |
|
| 610 | + $arrayversion = explode('.', $moduleobj->version, 3); |
|
| 611 | 611 | if (count($arrayversion)) |
| 612 | 612 | { |
| 613 | - $FILENAMEASCII=strtolower($module).'.asciidoc'; |
|
| 614 | - $FILENAMEDOC=strtolower($module).'.html'; // TODO Use/text PDF |
|
| 613 | + $FILENAMEASCII = strtolower($module).'.asciidoc'; |
|
| 614 | + $FILENAMEDOC = strtolower($module).'.html'; // TODO Use/text PDF |
|
| 615 | 615 | |
| 616 | 616 | $dirofmodule = dol_buildpath(strtolower($module), 0).'/doc'; |
| 617 | 617 | $dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp'; |
| 618 | 618 | $outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC; |
| 619 | 619 | if ($dirofmodule) |
| 620 | 620 | { |
| 621 | - if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule); |
|
| 622 | - if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp); |
|
| 623 | - if (! is_writable($dirofmoduletmp)) |
|
| 621 | + if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule); |
|
| 622 | + if (!dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp); |
|
| 623 | + if (!is_writable($dirofmoduletmp)) |
|
| 624 | 624 | { |
| 625 | 625 | $this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable'; |
| 626 | 626 | return -1; |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | - $destfile=$dirofmoduletmp.'/'.$FILENAMEASCII; |
|
| 629 | + $destfile = $dirofmoduletmp.'/'.$FILENAMEASCII; |
|
| 630 | 630 | |
| 631 | 631 | $fhandle = fopen($destfile, 'w+'); |
| 632 | 632 | if ($fhandle) |
| 633 | 633 | { |
| 634 | - $specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); |
|
| 634 | + $specs = dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); |
|
| 635 | 635 | |
| 636 | 636 | $i = 0; |
| 637 | 637 | foreach ($specs as $spec) |
| 638 | 638 | { |
| 639 | - if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file |
|
| 640 | - if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file |
|
| 639 | + if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file |
|
| 640 | + if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file |
|
| 641 | 641 | |
| 642 | 642 | $pathtofile = strtolower($module).'/doc/'.$spec['relativename']; |
| 643 | - $format='asciidoc'; |
|
| 644 | - if (preg_match('/\.md$/i', $spec['name'])) $format='markdown'; |
|
| 643 | + $format = 'asciidoc'; |
|
| 644 | + if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown'; |
|
| 645 | 645 | |
| 646 | 646 | $filecursor = @file_get_contents($spec['fullname']); |
| 647 | 647 | if ($filecursor) |
@@ -665,15 +665,15 @@ discard block |
||
| 665 | 665 | fclose($fhandle); |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | - $conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor'; |
|
| 668 | + $conf->global->MODULEBUILDER_ASCIIDOCTOR = 'asciidoctor'; |
|
| 669 | 669 | if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR)) |
| 670 | 670 | { |
| 671 | 671 | dol_print_error('', 'Module setup not complete'); |
| 672 | 672 | exit; |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | - $command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC; |
|
| 676 | - $outfile=$dirofmoduletmp.'/out.tmp'; |
|
| 675 | + $command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC; |
|
| 676 | + $outfile = $dirofmoduletmp.'/out.tmp'; |
|
| 677 | 677 | |
| 678 | 678 | require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php'; |
| 679 | 679 | $utils = new Utils($db); |
@@ -721,18 +721,18 @@ discard block |
||
| 721 | 721 | { |
| 722 | 722 | global $conf; |
| 723 | 723 | |
| 724 | - if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled |
|
| 724 | + if (empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled |
|
| 725 | 725 | return 0; |
| 726 | 726 | } |
| 727 | 727 | |
| 728 | - if(! function_exists('gzopen')) { |
|
| 728 | + if (!function_exists('gzopen')) { |
|
| 729 | 729 | $this->error = 'Support for gzopen not available in this PHP'; |
| 730 | 730 | return -1; |
| 731 | 731 | } |
| 732 | 732 | |
| 733 | 733 | dol_include_once('/core/lib/files.lib.php'); |
| 734 | 734 | |
| 735 | - $nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14; |
|
| 735 | + $nbSaves = !empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14; |
|
| 736 | 736 | |
| 737 | 737 | if (empty($conf->global->SYSLOG_FILE)) { |
| 738 | 738 | $mainlogdir = DOL_DATA_ROOT; |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log |
| 747 | 747 | $tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir); |
| 748 | 748 | |
| 749 | - foreach($tabfiles as $file) { |
|
| 749 | + foreach ($tabfiles as $file) { |
|
| 750 | 750 | |
| 751 | 751 | $logname = $file['name']; |
| 752 | 752 | $logpath = $file['path']; |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | $gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter); |
| 761 | 761 | $gzfiles = array(); |
| 762 | 762 | |
| 763 | - foreach($gzfilestmp as $gzfile) { |
|
| 763 | + foreach ($gzfilestmp as $gzfile) { |
|
| 764 | 764 | $tabmatches = array(); |
| 765 | 765 | preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches); |
| 766 | 766 | |
@@ -771,15 +771,15 @@ discard block |
||
| 771 | 771 | |
| 772 | 772 | krsort($gzfiles, SORT_NUMERIC); |
| 773 | 773 | |
| 774 | - foreach($gzfiles as $numsave => $dummy) { |
|
| 775 | - if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) { |
|
| 774 | + foreach ($gzfiles as $numsave => $dummy) { |
|
| 775 | + if (dol_is_file($logpath.'/'.$logname.'.'.($numsave + 1).'.gz')) { |
|
| 776 | 776 | return -2; |
| 777 | 777 | } |
| 778 | 778 | |
| 779 | - if($numsave >= $nbSaves) { |
|
| 779 | + if ($numsave >= $nbSaves) { |
|
| 780 | 780 | dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0); |
| 781 | 781 | } else { |
| 782 | - dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0); |
|
| 782 | + dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave + 1).'.gz', 0, 1, 0, 0); |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | |
@@ -800,14 +800,14 @@ discard block |
||
| 800 | 800 | return -4; |
| 801 | 801 | } |
| 802 | 802 | |
| 803 | - while(! feof($sourcehandle)) { |
|
| 803 | + while (!feof($sourcehandle)) { |
|
| 804 | 804 | gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time |
| 805 | 805 | } |
| 806 | 806 | |
| 807 | 807 | fclose($sourcehandle); |
| 808 | 808 | gzclose($gzfilehandle); |
| 809 | 809 | |
| 810 | - @chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK)); |
|
| 810 | + @chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK)); |
|
| 811 | 811 | } |
| 812 | 812 | |
| 813 | 813 | dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0); |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | fclose($newlog); |
| 818 | 818 | |
| 819 | 819 | //var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK)); |
| 820 | - @chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK)); |
|
| 820 | + @chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK)); |
|
| 821 | 821 | } |
| 822 | 822 | } |
| 823 | 823 | |
@@ -835,7 +835,7 @@ discard block |
||
| 835 | 835 | * @param string $tables Table name or '*' for all |
| 836 | 836 | * @return int <0 if KO, >0 if OK |
| 837 | 837 | */ |
| 838 | - function backupTables($outputfile, $tables='*') |
|
| 838 | + function backupTables($outputfile, $tables = '*') |
|
| 839 | 839 | { |
| 840 | 840 | global $db, $langs; |
| 841 | 841 | global $errormsg; |
@@ -855,14 +855,14 @@ discard block |
||
| 855 | 855 | { |
| 856 | 856 | $tables = array(); |
| 857 | 857 | $result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\''); |
| 858 | - while($row = $db->fetch_row($result)) |
|
| 858 | + while ($row = $db->fetch_row($result)) |
|
| 859 | 859 | { |
| 860 | 860 | $tables[] = $row[0]; |
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | 863 | else |
| 864 | 864 | { |
| 865 | - $tables = is_array($tables) ? $tables : explode(',',$tables); |
|
| 865 | + $tables = is_array($tables) ? $tables : explode(',', $tables); |
|
| 866 | 866 | } |
| 867 | 867 | |
| 868 | 868 | //cycle through |
@@ -870,8 +870,8 @@ discard block |
||
| 870 | 870 | if (fwrite($handle, '') === false) |
| 871 | 871 | { |
| 872 | 872 | $langs->load("errors"); |
| 873 | - dol_syslog("Failed to open file ".$outputfile,LOG_ERR); |
|
| 874 | - $errormsg=$langs->trans("ErrorFailedToWriteInDir"); |
|
| 873 | + dol_syslog("Failed to open file ".$outputfile, LOG_ERR); |
|
| 874 | + $errormsg = $langs->trans("ErrorFailedToWriteInDir"); |
|
| 875 | 875 | return -1; |
| 876 | 876 | } |
| 877 | 877 | |
@@ -908,15 +908,15 @@ discard block |
||
| 908 | 908 | if (GETPOST("nobin_delayed")) $delayed = 'DELAYED '; |
| 909 | 909 | |
| 910 | 910 | // Process each table and print their definition + their datas |
| 911 | - foreach($tables as $table) |
|
| 911 | + foreach ($tables as $table) |
|
| 912 | 912 | { |
| 913 | 913 | // Saving the table structure |
| 914 | 914 | fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n"); |
| 915 | 915 | |
| 916 | - if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it |
|
| 917 | - fwrite($handle,"/*!40101 SET @saved_cs_client = @@character_set_client */;\n"); |
|
| 918 | - fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n"); |
|
| 919 | - $resqldrop=$db->query('SHOW CREATE TABLE '.$table); |
|
| 916 | + if (GETPOST("nobin_drop")) fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it |
|
| 917 | + fwrite($handle, "/*!40101 SET @saved_cs_client = @@character_set_client */;\n"); |
|
| 918 | + fwrite($handle, "/*!40101 SET character_set_client = utf8 */;\n"); |
|
| 919 | + $resqldrop = $db->query('SHOW CREATE TABLE '.$table); |
|
| 920 | 920 | $row2 = $db->fetch_row($resqldrop); |
| 921 | 921 | if (empty($row2[1])) |
| 922 | 922 | { |
@@ -924,7 +924,7 @@ discard block |
||
| 924 | 924 | } |
| 925 | 925 | else |
| 926 | 926 | { |
| 927 | - fwrite($handle,$row2[1].";\n"); |
|
| 927 | + fwrite($handle, $row2[1].";\n"); |
|
| 928 | 928 | //fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n"); |
| 929 | 929 | |
| 930 | 930 | // Dumping the data (locking the table and disabling the keys check while doing the process) |
@@ -933,22 +933,22 @@ discard block |
||
| 933 | 933 | if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n"); |
| 934 | 934 | else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n"); |
| 935 | 935 | |
| 936 | - $sql='SELECT * FROM '.$table; |
|
| 936 | + $sql = 'SELECT * FROM '.$table; |
|
| 937 | 937 | $result = $db->query($sql); |
| 938 | - while($row = $db->fetch_row($result)) |
|
| 938 | + while ($row = $db->fetch_row($result)) |
|
| 939 | 939 | { |
| 940 | 940 | // For each row of data we print a line of INSERT |
| 941 | - fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES ('); |
|
| 941 | + fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES ('); |
|
| 942 | 942 | $columns = count($row); |
| 943 | - for($j=0; $j<$columns; $j++) { |
|
| 943 | + for ($j = 0; $j < $columns; $j++) { |
|
| 944 | 944 | // Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier) |
| 945 | 945 | if ($row[$j] == null && !is_string($row[$j])) { |
| 946 | 946 | // IMPORTANT: if the field is NULL we set it NULL |
| 947 | 947 | $row[$j] = 'NULL'; |
| 948 | - } elseif(is_string($row[$j]) && $row[$j] == '') { |
|
| 948 | + } elseif (is_string($row[$j]) && $row[$j] == '') { |
|
| 949 | 949 | // if it's an empty string, we set it as an empty string |
| 950 | 950 | $row[$j] = "''"; |
| 951 | - } elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0) |
|
| 951 | + } elseif (is_numeric($row[$j]) && !strcmp($row[$j], $row[$j] + 0)) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0) |
|
| 952 | 952 | // if it's a number, we return it as-is |
| 953 | 953 | // $row[$j] = $row[$j]; |
| 954 | 954 | } else { // else for all other cases we escape the value and put quotes around |
@@ -957,11 +957,11 @@ discard block |
||
| 957 | 957 | $row[$j] = "'".$row[$j]."'"; |
| 958 | 958 | } |
| 959 | 959 | } |
| 960 | - fwrite($handle,implode(',', $row).");\n"); |
|
| 960 | + fwrite($handle, implode(',', $row).");\n"); |
|
| 961 | 961 | } |
| 962 | 962 | if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking |
| 963 | 963 | if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table |
| 964 | - fwrite($handle,"\n\n\n"); |
|
| 964 | + fwrite($handle, "\n\n\n"); |
|
| 965 | 965 | } |
| 966 | 966 | } |
| 967 | 967 | |
@@ -985,10 +985,10 @@ discard block |
||
| 985 | 985 | /* Backup Procedure structure*/ |
| 986 | 986 | |
| 987 | 987 | // Write the footer (restore the previous database settings) |
| 988 | - $sqlfooter="\n\n"; |
|
| 988 | + $sqlfooter = "\n\n"; |
|
| 989 | 989 | if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n"; |
| 990 | 990 | if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n"; |
| 991 | - $sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s'); |
|
| 991 | + $sqlfooter .= "\n\n-- Dump completed on ".date('Y-m-d G-i-s'); |
|
| 992 | 992 | fwrite($handle, $sqlfooter); |
| 993 | 993 | |
| 994 | 994 | fclose($handle); |
