@@ -167,7 +167,7 @@ |
||
| 167 | 167 | if ($key === 'count') |
| 168 | 168 | continue; |
| 169 | 169 | if (empty($userList[$userdn])) { // Récupération de l'utilisateur |
| 170 | - // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement |
|
| 170 | + // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement |
|
| 171 | 171 | if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') { |
| 172 | 172 | $userKey = array($userdn); |
| 173 | 173 | } else { // Pour les autres schémas, les membres sont listés sous forme de DN complets |
@@ -114,9 +114,9 @@ |
||
| 114 | 114 | |
| 115 | 115 | dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); |
| 116 | 116 | |
| 117 | - print '<div class="fichecenter">'; |
|
| 117 | + print '<div class="fichecenter">'; |
|
| 118 | 118 | |
| 119 | - print '<div class="underbanner clearboth"></div>'; |
|
| 119 | + print '<div class="underbanner clearboth"></div>'; |
|
| 120 | 120 | print '<table class="border centpercent tableforfield">'; |
| 121 | 121 | |
| 122 | 122 | // Number of files |
@@ -485,7 +485,7 @@ |
||
| 485 | 485 | if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) { |
| 486 | 486 | print '<td align="center" class="libre"><input type="submit" class="bouton ON" name="choixjourajout[]" value="'.$numerojour.'"></td>'."\n"; |
| 487 | 487 | } else { |
| 488 | - // grey button |
|
| 488 | + // grey button |
|
| 489 | 489 | print '<td align="center" class="avant">'.$numerojour.'</td>'."\n"; |
| 490 | 490 | } |
| 491 | 491 | } |
@@ -63,20 +63,20 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | */ |
| 65 | 65 | |
| 66 | - // Show more tabs from modules |
|
| 67 | - // Entries must be declared in modules descriptor with line |
|
| 68 | - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 69 | - // $this->tabs = array('entity:-tabname); to remove a tab |
|
| 70 | - complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock'); |
|
| 66 | + // Show more tabs from modules |
|
| 67 | + // Entries must be declared in modules descriptor with line |
|
| 68 | + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 69 | + // $this->tabs = array('entity:-tabname); to remove a tab |
|
| 70 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock'); |
|
| 71 | 71 | |
| 72 | - $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id; |
|
| 72 | + $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id; |
|
| 73 | 73 | $head[$h][1] = $langs->trans("Info"); |
| 74 | 74 | $head[$h][2] = 'info'; |
| 75 | 75 | $h++; |
| 76 | 76 | |
| 77 | - complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove'); |
|
| 77 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove'); |
|
| 78 | 78 | |
| 79 | - return $head; |
|
| 79 | + return $head; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -86,28 +86,28 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | function stock_admin_prepare_head() |
| 88 | 88 | { |
| 89 | - global $langs, $conf, $user; |
|
| 89 | + global $langs, $conf, $user; |
|
| 90 | 90 | |
| 91 | - $h = 0; |
|
| 92 | - $head = array(); |
|
| 91 | + $h = 0; |
|
| 92 | + $head = array(); |
|
| 93 | 93 | |
| 94 | - $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php'; |
|
| 95 | - $head[$h][1] = $langs->trans("Miscellaneous"); |
|
| 96 | - $head[$h][2] = 'general'; |
|
| 97 | - $h++; |
|
| 94 | + $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php'; |
|
| 95 | + $head[$h][1] = $langs->trans("Miscellaneous"); |
|
| 96 | + $head[$h][2] = 'general'; |
|
| 97 | + $h++; |
|
| 98 | 98 | |
| 99 | - // Show more tabs from modules |
|
| 100 | - // Entries must be declared in modules descriptor with line |
|
| 101 | - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 102 | - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 103 | - complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin'); |
|
| 99 | + // Show more tabs from modules |
|
| 100 | + // Entries must be declared in modules descriptor with line |
|
| 101 | + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 102 | + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 103 | + complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin'); |
|
| 104 | 104 | |
| 105 | - $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php'; |
|
| 106 | - $head[$h][1] = $langs->trans("ExtraFields"); |
|
| 107 | - $head[$h][2] = 'attributes'; |
|
| 108 | - $h++; |
|
| 105 | + $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php'; |
|
| 106 | + $head[$h][1] = $langs->trans("ExtraFields"); |
|
| 107 | + $head[$h][2] = 'attributes'; |
|
| 108 | + $h++; |
|
| 109 | 109 | |
| 110 | - complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove'); |
|
| 110 | + complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove'); |
|
| 111 | 111 | |
| 112 | - return $head; |
|
| 112 | + return $head; |
|
| 113 | 113 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | function llxHeader() |
| 31 | 31 | { |
| 32 | - print '<html><title>Build an import example file</title><body>'; |
|
| 32 | + print '<html><title>Build an import example file</title><body>'; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | function llxFooter() |
| 42 | 42 | { |
| 43 | - print '</body></html>'; |
|
| 43 | + print '</body></html>'; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | require '../main.inc.php'; |
@@ -55,17 +55,17 @@ |
||
| 55 | 55 | var list = jQuery("#list"); |
| 56 | 56 | var totalizable = jQuery("#totalizable"); |
| 57 | 57 | <?php |
| 58 | - if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist")) |
|
| 59 | - { |
|
| 60 | - print 'jQuery("#value_choice").hide();'; |
|
| 61 | - } |
|
| 58 | + if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist")) |
|
| 59 | + { |
|
| 60 | + print 'jQuery("#value_choice").hide();'; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - if (GETPOST('type', 'alpha') == "separate") |
|
| 64 | - { |
|
| 63 | + if (GETPOST('type', 'alpha') == "separate") |
|
| 64 | + { |
|
| 65 | 65 | print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);"; |
| 66 | - print 'jQuery("#value_choice").hide();'; |
|
| 67 | - } |
|
| 68 | - ?> |
|
| 66 | + print 'jQuery("#value_choice").hide();'; |
|
| 67 | + } |
|
| 68 | + ?> |
|
| 69 | 69 | |
| 70 | 70 | // Case of computed field |
| 71 | 71 | if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { |
@@ -186,16 +186,16 @@ discard block |
||
| 186 | 186 | ) |
| 187 | 187 | ); |
| 188 | 188 | |
| 189 | - $hookmanager->executeHooks( |
|
| 190 | - 'overrideUploadOptions', |
|
| 191 | - array( |
|
| 192 | - 'options' => &$options, |
|
| 193 | - 'element' => $element |
|
| 194 | - ), |
|
| 195 | - $object, |
|
| 196 | - $action, |
|
| 197 | - $hookmanager |
|
| 198 | - ); |
|
| 189 | + $hookmanager->executeHooks( |
|
| 190 | + 'overrideUploadOptions', |
|
| 191 | + array( |
|
| 192 | + 'options' => &$options, |
|
| 193 | + 'element' => $element |
|
| 194 | + ), |
|
| 195 | + $object, |
|
| 196 | + $action, |
|
| 197 | + $hookmanager |
|
| 198 | + ); |
|
| 199 | 199 | |
| 200 | 200 | if ($options) { |
| 201 | 201 | $this->options = array_replace_recursive($this->options, $options); |
@@ -521,26 +521,26 @@ discard block |
||
| 521 | 521 | // param_name is an array identifier like "files[]", |
| 522 | 522 | // $_FILES is a multi-dimensional array: |
| 523 | 523 | foreach ($upload['tmp_name'] as $index => $value) { |
| 524 | - $info[] = $this->handleFileUpload( |
|
| 525 | - $upload['tmp_name'][$index], |
|
| 526 | - isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index], |
|
| 527 | - isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index], |
|
| 528 | - isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index], |
|
| 529 | - $upload['error'][$index], |
|
| 530 | - $index |
|
| 531 | - ); |
|
| 524 | + $info[] = $this->handleFileUpload( |
|
| 525 | + $upload['tmp_name'][$index], |
|
| 526 | + isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index], |
|
| 527 | + isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index], |
|
| 528 | + isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index], |
|
| 529 | + $upload['error'][$index], |
|
| 530 | + $index |
|
| 531 | + ); |
|
| 532 | 532 | } |
| 533 | 533 | } elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) { |
| 534 | 534 | // param_name is a single object identifier like "file", |
| 535 | 535 | // $_FILES is a one-dimensional array: |
| 536 | - $info[] = $this->handleFileUpload( |
|
| 537 | - isset($upload['tmp_name']) ? $upload['tmp_name'] : null, |
|
| 538 | - isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null), |
|
| 539 | - isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null), |
|
| 540 | - isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null), |
|
| 541 | - isset($upload['error']) ? $upload['error'] : null, |
|
| 542 | - 0 |
|
| 543 | - ); |
|
| 536 | + $info[] = $this->handleFileUpload( |
|
| 537 | + isset($upload['tmp_name']) ? $upload['tmp_name'] : null, |
|
| 538 | + isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null), |
|
| 539 | + isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null), |
|
| 540 | + isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null), |
|
| 541 | + isset($upload['error']) ? $upload['error'] : null, |
|
| 542 | + 0 |
|
| 543 | + ); |
|
| 544 | 544 | } |
| 545 | 545 | header('Vary: Accept'); |
| 546 | 546 | $json = json_encode($info); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | print '<div name="topofform"></div><br>'; |
| 98 | 98 | print load_fiche_titre($langs->trans('NewAttribute')); |
| 99 | 99 | |
| 100 | - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; |
|
| 100 | + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /* ************************************************************************** */ |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | print '<div name="topofform"></div><br>'; |
| 111 | 111 | print load_fiche_titre($langs->trans("FieldEdition", $attrname)); |
| 112 | 112 | |
| 113 | - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; |
|
| 113 | + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // End of page |
@@ -29,30 +29,30 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | function inventoryAdminPrepareHead() |
| 31 | 31 | { |
| 32 | - global $langs, $conf; |
|
| 32 | + global $langs, $conf; |
|
| 33 | 33 | |
| 34 | - $langs->load("inventory"); |
|
| 34 | + $langs->load("inventory"); |
|
| 35 | 35 | |
| 36 | - $h = 0; |
|
| 37 | - $head = array(); |
|
| 36 | + $h = 0; |
|
| 37 | + $head = array(); |
|
| 38 | 38 | |
| 39 | - $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php"; |
|
| 40 | - $head[$h][1] = $langs->trans("Parameters"); |
|
| 41 | - $head[$h][2] = 'settings'; |
|
| 42 | - $h++; |
|
| 39 | + $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php"; |
|
| 40 | + $head[$h][1] = $langs->trans("Parameters"); |
|
| 41 | + $head[$h][2] = 'settings'; |
|
| 42 | + $h++; |
|
| 43 | 43 | |
| 44 | 44 | |
| 45 | - // Show more tabs from modules |
|
| 46 | - // Entries must be declared in modules descriptor with line |
|
| 47 | - //$this->tabs = array( |
|
| 48 | - // 'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__' |
|
| 49 | - //); // to add new tab |
|
| 50 | - //$this->tabs = array( |
|
| 51 | - // 'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__' |
|
| 52 | - //); // to remove a tab |
|
| 53 | - complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory'); |
|
| 45 | + // Show more tabs from modules |
|
| 46 | + // Entries must be declared in modules descriptor with line |
|
| 47 | + //$this->tabs = array( |
|
| 48 | + // 'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__' |
|
| 49 | + //); // to add new tab |
|
| 50 | + //$this->tabs = array( |
|
| 51 | + // 'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__' |
|
| 52 | + //); // to remove a tab |
|
| 53 | + complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory'); |
|
| 54 | 54 | |
| 55 | - return $head; |
|
| 55 | + return $head; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |