@@ -142,7 +142,7 @@ |
||
| 142 | 142 | |
| 143 | 143 | $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local; |
| 144 | 144 | // Affiche en-tete du rapport |
| 145 | -$description=''; |
|
| 145 | +$description = ''; |
|
| 146 | 146 | if ($calc == 0 || $calc == 1) { // Calculate on invoice for goods and services |
| 147 | 147 | $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec"); |
| 148 | 148 | $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>'; |
@@ -124,8 +124,8 @@ |
||
| 124 | 124 | // Ref customer |
| 125 | 125 | //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1); |
| 126 | 126 | //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1); |
| 127 | - $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
| 128 | - $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
| 127 | + $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
| 128 | + $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
| 129 | 129 | // Thirdparty |
| 130 | 130 | $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer'); |
| 131 | 131 | // Project |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | unset($_SESSION["dol_login"]); |
| 51 | 51 | unset($_SESSION['dol_entity']); |
| 52 | 52 | unset($_SESSION['urlfrom']); |
| 53 | - die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 53 | + die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | //global $conf, $langs, $user; |
@@ -142,12 +142,12 @@ |
||
| 142 | 142 | $messagewarning .= '</div>'; |
| 143 | 143 | |
| 144 | 144 | if ($result <= 0 && $edituser->error == 'USERNOTFOUND') { |
| 145 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 145 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 146 | 146 | $message .= $messagewarning; |
| 147 | 147 | $username = ''; |
| 148 | 148 | } else { |
| 149 | 149 | if (empty($edituser->email)) { |
| 150 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 150 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 151 | 151 | $message .= $messagewarning; |
| 152 | 152 | } else { |
| 153 | 153 | $newpassword = $edituser->setPassword($user, '', 1); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $type = GETPOST('type', 'alpha'); |
| 44 | 44 | $value = GETPOST('value', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $label = GETPOST('label', 'alpha'); |
| 48 | 48 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | print '<div class="div-table-responsive-no-min">'; |
| 200 | 200 | print '<table class="noborder centpercent">'; |
| 201 | 201 | print '<tr class="liste_titre">'; |
| 202 | -print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '') . "\n"; |
|
| 202 | +print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n"; |
|
| 203 | 203 | print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
| 204 | 204 | print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
| 205 | -print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
| 205 | +print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
| 206 | 206 | if (isModEnabled('multicompany') && !$user->entity) { |
| 207 | - print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
| 207 | + print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
| 208 | 208 | } |
| 209 | 209 | print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center '); |
| 210 | 210 | print "</tr>\n"; |
@@ -227,12 +227,12 @@ discard block |
||
| 227 | 227 | // Limit to superadmin |
| 228 | 228 | if (isModEnabled('multicompany') && !$user->entity) { |
| 229 | 229 | print '<td>'; |
| 230 | - print '<input type="text" class="flat" size="1" name="entity" value="' . $conf->entity . '">'; |
|
| 230 | + print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">'; |
|
| 231 | 231 | print '</td>'; |
| 232 | 232 | print '<td class="center">'; |
| 233 | 233 | } else { |
| 234 | 234 | print '<td class="center">'; |
| 235 | - print '<input type="hidden" name="entity" value="' . $conf->entity . '">'; |
|
| 235 | + print '<input type="hidden" name="entity" value="'.$conf->entity.'">'; |
|
| 236 | 236 | } |
| 237 | 237 | print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">'; |
| 238 | 238 | print "</td>\n"; |
@@ -56,8 +56,8 @@ |
||
| 56 | 56 | |
| 57 | 57 | // Permissions |
| 58 | 58 | $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php |
| 59 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 60 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 59 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 60 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | /* |
@@ -85,8 +85,8 @@ |
||
| 85 | 85 | // Init Hooks |
| 86 | 86 | $hookmanager->initHooks(array('ordersuppliercardinfo')); |
| 87 | 87 | |
| 88 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 89 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 88 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 89 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | /* |
@@ -21,11 +21,11 @@ |
||
| 21 | 21 | protected $openned = false; |
| 22 | 22 | protected $filename; |
| 23 | 23 | protected $pclzip; |
| 24 | - /** |
|
| 25 | - * Class constructor |
|
| 26 | - * |
|
| 27 | - * @throws PclZipProxyException |
|
| 28 | - */ |
|
| 24 | + /** |
|
| 25 | + * Class constructor |
|
| 26 | + * |
|
| 27 | + * @throws PclZipProxyException |
|
| 28 | + */ |
|
| 29 | 29 | public function __construct($forcedir='') |
| 30 | 30 | { |
| 31 | 31 | if (! class_exists('PclZip')) { |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (! defined('ODTPHP_PATHTOPCLZIP')) define('ODTPHP_PATHTOPCLZIP','pclzip/'); |
|
| 2 | +if (!defined('ODTPHP_PATHTOPCLZIP')) define('ODTPHP_PATHTOPCLZIP', 'pclzip/'); |
|
| 3 | 3 | require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php'; |
| 4 | 4 | require_once 'ZipInterface.php'; |
| 5 | 5 | class PclZipProxyException extends Exception |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @throws PclZipProxyException |
| 28 | 28 | */ |
| 29 | - public function __construct($forcedir='') |
|
| 29 | + public function __construct($forcedir = '') |
|
| 30 | 30 | { |
| 31 | - if (! class_exists('PclZip')) { |
|
| 31 | + if (!class_exists('PclZip')) { |
|
| 32 | 32 | throw new PclZipProxyException('PclZip class not loaded - PclZip library |
| 33 | 33 | is required for using PclZipProxy'); ; |
| 34 | 34 | } |
| 35 | - if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir); // $this->tmpdir must not contains / at the end |
|
| 35 | + if ($forcedir) $this->tmpdir = preg_replace('|[//\/]$|', '', $forcedir); // $this->tmpdir must not contains / at the end |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | $localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname); |
| 91 | 91 | $localpath = dirname($localname); |
| 92 | - $tmpfilename = $this->tmpdir . '/' . basename($localname); |
|
| 92 | + $tmpfilename = $this->tmpdir.'/'.basename($localname); |
|
| 93 | 93 | if (false !== file_put_contents($tmpfilename, $contents)) { |
| 94 | 94 | //print "tmpfilename=".$tmpfilename; |
| 95 | 95 | //print "localname=".$localname; |
| 96 | - $res=$this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname); |
|
| 96 | + $res = $this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname); |
|
| 97 | 97 | $add = $this->pclzip->add($tmpfilename, |
| 98 | 98 | PCLZIP_OPT_REMOVE_PATH, $this->tmpdir, |
| 99 | 99 | PCLZIP_OPT_ADD_PATH, $localpath); |
@@ -124,10 +124,10 @@ discard block |
||
| 124 | 124 | if (isSet($localname)) { |
| 125 | 125 | $localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname); |
| 126 | 126 | $localpath = dirname($localname); |
| 127 | - $tmpfilename = $this->tmpdir . '/' . basename($localname); |
|
| 127 | + $tmpfilename = $this->tmpdir.'/'.basename($localname); |
|
| 128 | 128 | } else { |
| 129 | 129 | $localname = basename($filename); |
| 130 | - $tmpfilename = $this->tmpdir . '/' . $localname; |
|
| 130 | + $tmpfilename = $this->tmpdir.'/'.$localname; |
|
| 131 | 131 | $localpath = ''; |
| 132 | 132 | } |
| 133 | 133 | if (file_exists($filename)) { |
@@ -1,5 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (! defined('ODTPHP_PATHTOPCLZIP')) define('ODTPHP_PATHTOPCLZIP','pclzip/'); |
|
| 2 | +if (! defined('ODTPHP_PATHTOPCLZIP')) { |
|
| 3 | + define('ODTPHP_PATHTOPCLZIP','pclzip/'); |
|
| 4 | +} |
|
| 3 | 5 | require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php'; |
| 4 | 6 | require_once 'ZipInterface.php'; |
| 5 | 7 | class PclZipProxyException extends Exception |
@@ -32,7 +34,10 @@ discard block |
||
| 32 | 34 | throw new PclZipProxyException('PclZip class not loaded - PclZip library |
| 33 | 35 | is required for using PclZipProxy'); ; |
| 34 | 36 | } |
| 35 | - if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir); // $this->tmpdir must not contains / at the end |
|
| 37 | + if ($forcedir) { |
|
| 38 | + $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir); |
|
| 39 | + } |
|
| 40 | + // $this->tmpdir must not contains / at the end |
|
| 36 | 41 | } |
| 37 | 42 | |
| 38 | 43 | /** |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | || !file_exists($filename)) { |
| 122 | 122 | return false; |
| 123 | 123 | } |
| 124 | - if (isSet($localname)) { |
|
| 124 | + if (isset($localname)) { |
|
| 125 | 125 | $localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname); |
| 126 | 126 | $localpath = dirname($localname); |
| 127 | 127 | $tmpfilename = $this->tmpdir . '/' . basename($localname); |