diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index c1716dc18af..790a71f96f4 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -648,7 +648,7 @@ if ($num > 0) // Document date if (! empty($arrayfields['t.doc_date']['checked'])) { - print '' . dol_print_date($line->doc_date, 'day') . ''; + print '' . dol_print_date($line->doc_date, 'day') . ''; if (! $i) $totalarray['nbfield']++; } @@ -701,7 +701,7 @@ if ($num > 0) // Lettering code if (! empty($arrayfields['t.lettering_code']['checked'])) { - print '' . $line->lettering_code . ''; + print '' . $line->lettering_code . ''; if (! $i) $totalarray['nbfield']++; } @@ -711,26 +711,26 @@ if ($num > 0) $accountingjournal = new AccountingJournal($db); $result = $accountingjournal->fetch('', $line->code_journal); $journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal); - print '' . $journaltoshow . ''; + print '' . $journaltoshow . ''; if (! $i) $totalarray['nbfield']++; } // Creation operation date if (! empty($arrayfields['t.date_creation']['checked'])) { - print '' . dol_print_date($line->date_creation, 'dayhour') . ''; + print '' . dol_print_date($line->date_creation, 'dayhour') . ''; if (! $i) $totalarray['nbfield']++; } // Modification operation date if (! empty($arrayfields['t.tms']['checked'])) { - print '' . dol_print_date($line->date_modification, 'dayhour') . ''; + print '' . dol_print_date($line->date_modification, 'dayhour') . ''; if (! $i) $totalarray['nbfield']++; } // Action column - print ''; + print ''; print '' . img_edit() . ' '; print '' . img_delete() . ''; print ''; diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php index 09f7aa22032..3f901539380 100644 --- a/htdocs/adherents/admin/adherent_emails.php +++ b/htdocs/adherents/admin/adherent_emails.php @@ -161,7 +161,7 @@ $helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, form_constantes($constantes, 0, $helptext); -//print '
'; +//print '
'; //print ''; dol_fiche_end(); diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php index 50c66a88f69..742c11d5160 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php @@ -120,7 +120,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?> - "> + ">
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php index 96d1a571e8a..3b25467860b 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php @@ -134,7 +134,7 @@ echo $this->control->tpl['ajax_selectcountry']; - + ">  "> diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 8dca985af70..d88d775e0c1 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -128,7 +128,7 @@ if ($id > 0) // Morphy print ''.$langs->trans("Nature").''.$object->getmorphylib().''; - /*print ''; + /*print ''; print $form->showphoto('memberphoto',$object); print '';*/ print ''; @@ -140,10 +140,10 @@ if ($id > 0) print ''.$langs->trans("UserTitle").''.$object->getCivilityLabel().' '; print ''; - // Nbre fichiers + // Number of Attached Files print ''.$langs->trans("NbOfAttachedFiles").''.count($filearray).''; - //Total taille + //Total Size Of Attached Files print ''.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).''; print ''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index d1ae80378ee..1d1232a9d58 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -162,7 +162,7 @@ if ($conf->use_javascript_ajax) print '
'; print ''; print ''; - print ''; } if (! empty($arrayfields['d.firstname']['checked'])) { - print ''; } if (! empty($arrayfields['d.lastname']['checked'])) { - print ''; } if (! empty($arrayfields['d.gender']['checked'])) @@ -463,17 +463,17 @@ if (! empty($arrayfields['d.gender']['checked'])) } if (! empty($arrayfields['d.company']['checked'])) { - print ''; } if (! empty($arrayfields['d.login']['checked'])) { - print ''; } if (! empty($arrayfields['d.morphy']['checked'])) { - print ''; } if (! empty($arrayfields['t.libelle']['checked'])) @@ -486,18 +486,18 @@ if (! empty($arrayfields['t.libelle']['checked'])) if (! empty($arrayfields['d.address']['checked'])) { - print ''; } if (! empty($arrayfields['d.zip']['checked'])) { - print ''; } if (! empty($arrayfields['d.town']['checked'])) { - print ''; } // State @@ -510,38 +510,38 @@ if (! empty($arrayfields['state.nom']['checked'])) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; } // Phone pro if (! empty($arrayfields['d.phone']['checked'])) { - print ''; } // Phone perso if (! empty($arrayfields['d.phone_perso']['checked'])) { - print ''; } // Phone mobile if (! empty($arrayfields['d.phone_mobile']['checked'])) { - print ''; } // Email if (! empty($arrayfields['d.email']['checked'])) { - print ''; } if (! empty($arrayfields['d.datefin']['checked'])) { - print ''; } // Extra fields @@ -576,7 +576,7 @@ if (! empty($arrayfields['d.statut']['checked'])) print ''; } // Action column -print ''; @@ -647,7 +647,7 @@ while ($i < min($num, $limit)) if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } @@ -753,7 +753,7 @@ while ($i < min($num, $limit)) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; @@ -794,7 +794,7 @@ while ($i < min($num, $limit)) { if ($datefin) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -834,7 +834,7 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['d.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -848,7 +848,7 @@ while ($i < min($num, $limit)) if (! $i) $totalarray['nbfield']++; } // Action column - print ''; - /*print '';*/ print ''; diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index 6ba88e7771b..1832e14e6eb 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -121,8 +121,8 @@ print '
'.$langs->trans("Statistics").'
'; + print '
'; $SommeA=0; $SommeB=0; diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 35e1fd1553f..1d16f82ec04 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -441,17 +441,17 @@ if (! empty($arrayfields['d.ref']['checked'])) } if (! empty($arrayfields['d.civility']['checked'])) { - print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100'); print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''.$obj->rowid.''.$obj->rowid.''; + print ''; $tmparray=getCountry($obj->country, 'all'); print $tmparray['label']; print ''; + print ''; print dol_print_date($datefin, 'day'); if ($memberstatic->hasDelay()) { $textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay/60/60/24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay/60/60/24).' '.$langs->trans("days").')'; @@ -804,7 +804,7 @@ while ($i < min($num, $limit)) } else { - print ''; + print ''; if ($obj->subscription == 'yes') { print $langs->trans("SubscriptionNotReceived"); @@ -826,7 +826,7 @@ while ($i < min($num, $limit)) // Date creation if (! empty($arrayfields['d.datec']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 0acd98a9ead..b3e18f543be 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -93,7 +93,7 @@ if ($id) // Morphy print '
'.$langs->trans("Nature").''.$object->getmorphylib().''; + /*print ''; print $form->showphoto('memberphoto',$member); print '
'; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'', 'lastsubscriptiondate'=>''); @@ -133,8 +133,8 @@ foreach ($data as $val) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; } diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 568c8ea6af9..2ae7e2d0001 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -287,7 +287,7 @@ if (count($arrayjs) && $mode == 'memberbycountry') print "\n"; // print the div tag that will contain the map - print '
'."\n"; + print '
'."\n"; print '
'; } @@ -297,10 +297,10 @@ if ($mode) print '
'.$langs->trans("Nature").''.$langs->trans("NbOfMembers").''.$langs->trans("LastMemberDate").''.$langs->trans("LatestSubscriptionDate").''.$langs->trans("LastMemberDate").''.$langs->trans("LatestSubscriptionDate").'
'.$memberstatic->getmorphylib($val['label']).''.$val['nb'].''.dol_print_date($val['lastdate'], 'dayhour').''.dol_print_date($val['lastsubscriptiondate'], 'dayhour').''.dol_print_date($val['lastdate'], 'dayhour').''.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'
'; print ''; print ''; - if ($label2) print ''; + if ($label2) print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; foreach ($data as $val) @@ -308,10 +308,10 @@ if ($mode) $year = $val['year']; print ''; print ''; - if ($label2) print ''; + if ($label2) print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; } diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 2492e0c0602..4a7229af5ef 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -157,7 +157,7 @@ print ''; print ''; -print ''; +print ''; print '
'.$label.''.$label2.''.$label2.''.$langs->trans("NbOfMembers").''.$langs->trans("LastMemberDate").''.$langs->trans("LatestSubscriptionDate").''.$langs->trans("LastMemberDate").''.$langs->trans("LatestSubscriptionDate").'
'.$val['label'].''.$val['label2'].''.$val['label2'].''.$val['nb'].''.dol_print_date($val['lastdate'], 'dayhour').''.dol_print_date($val['lastsubscriptiondate'], 'dayhour').''.dol_print_date($val['lastdate'], 'dayhour').''.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'
'.$langs->trans("User").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'; print ''; print '

'; @@ -170,7 +170,7 @@ $data = $stats->getAllByYear(); print '
'; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -184,7 +184,7 @@ foreach ($data as $val) { // If we have empty year $oldyear--; print ''; - print ''; } print ''; - print '
'.$langs->trans("Year").''.$langs->trans("Year").''.$langs->trans("NbOfSubscriptions").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").'
'; + print ''; print ''; print $oldyear; print ''; @@ -195,7 +195,7 @@ foreach ($data as $val) print '
'; + print ''; //print ''; print $year; //print ''; @@ -215,7 +215,7 @@ print '
'; // Show graphs -print '
'; +print ''; print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder); - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; if (! empty($conf->banque->enabled)) { @@ -713,9 +713,9 @@ if ($rowid > 0) print ''; print ''; - print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; + print '\n"; print ''; if (! empty($conf->banque->enabled)) { diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index e123669342d..3c4632f3a85 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -299,33 +299,33 @@ if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) // Ref if (! empty($arrayfields['d.ref']['checked'])) { - print ''; } // Type if (! empty($arrayfields['d.fk_type']['checked'])) { - print ''; } if (! empty($arrayfields['d.lastname']['checked'])) { - print ''; } if (! empty($arrayfields['d.firstname']['checked'])) { - print ''; } if (! empty($arrayfields['d.login']['checked'])) { - print ''; } @@ -529,13 +529,13 @@ while ($i < min($num, $limit)) // Date start if (! empty($arrayfields['c.dateadh']['checked'])) { - print '\n"; + print '\n"; if (! $i) $totalarray['nbfield']++; } // Date end if (! empty($arrayfields['c.datef']['checked'])) { - print '\n"; + print '\n"; if (! $i) $totalarray['nbfield']++; } // Price @@ -555,7 +555,7 @@ while ($i < min($num, $limit)) // Date creation if (! empty($arrayfields['c.datec']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -563,13 +563,13 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['c.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; } // Action column - print ' - - + + '; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print "\n"; @@ -277,9 +277,9 @@ if (! $rowid && $action != 'create' && $action != 'edit') //'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.' print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; - print ''; - print ''; print ''; - print ''; print ''; @@ -663,7 +663,7 @@ if ($rowid > 0) // Date end subscription if ($datefin) { - print ' - + - '; diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index cda216a452b..5b1cb8e5f4b 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -84,13 +84,13 @@ dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1); print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index d72d6ce8978..39466e8ae8a 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -692,9 +692,9 @@ if ($rowid > 0) print '
'.$langs->trans("DateCreation").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("DateCreation").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("Amount").'
'.$subscriptionstatic->getNomUrl(1).''.dol_print_date($db->jdate($objp->datec), 'dayhour')."'.dol_print_date($db->jdate($objp->dateh), 'day')."'.dol_print_date($db->jdate($objp->datef), 'day')."'.dol_print_date($db->jdate($objp->datec), 'dayhour')."'.dol_print_date($db->jdate($objp->dateh), 'day')."'.dol_print_date($db->jdate($objp->datef), 'day')."'.price($objp->subscription).''; + print ''; print ''; + print ''; print ''; print''; + print ''; print ''; + print ''; print ''; + print ''; print ''.dol_print_date($db->jdate($obj->dateadh), 'day')."'.dol_print_date($db->jdate($obj->dateadh), 'day')."'.dol_print_date($db->jdate($obj->datef), 'day')."'.dol_print_date($db->jdate($obj->datef), 'day')."'; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php index 622d20f7d42..e85eed336fb 100644 --- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php +++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php @@ -44,8 +44,8 @@ foreach($linkedObjectBlock as $key => $objectlink)
trans("Subscription"); ?> getNomUrl(1); ?>dateh, 'day'); ?>dateh, 'day'); ?> rights->adherent->lire) { $total = $total + $objectlink->amount; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 2f4040b254f..18c0ba28348 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -256,9 +256,9 @@ if (! $rowid && $action != 'create' && $action != 'edit') print '
'.$langs->trans("Ref").''.$langs->trans("Label").''.$langs->trans("SubscriptionRequired").''.$langs->trans("VoteAllowed").''.$langs->trans("Status").''.$langs->trans("SubscriptionRequired").''.$langs->trans("VoteAllowed").''.$langs->trans("Status").' 
'.dol_escape_htmltag($objp->label).''.yn($objp->subscription).''.yn($objp->vote).''; + print ''.yn($objp->subscription).''.yn($objp->vote).''; if ( !empty($objp->statut) ) { print img_picto($langs->trans("InActivity"), 'statut4'); } else { @@ -586,15 +586,15 @@ if ($rowid > 0) // Lignes des champs de filtre print '
'; + print ''; print ''; + print ''; print ' '; + print ''; print ' '; + print ''; if ($datefin < dol_now() && $objp->statut > 0) { print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate")); @@ -676,7 +676,7 @@ if ($rowid > 0) } else { - print ''; + print ''; if ($objp->subscription == 'yes') { print $langs->trans("SubscriptionNotReceived"); @@ -690,7 +690,7 @@ if ($rowid > 0) } // Actions - print ''; + print ''; if ($user->rights->adherent->creer) { print ''.img_edit().''; diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php index 8a27072fad1..619af090805 100644 --- a/htdocs/admin/dolistore/class/dolistore.class.php +++ b/htdocs/admin/dolistore/class/dolistore.class.php @@ -282,12 +282,12 @@ class Dolistore //output template $html .= '
'.$newapp.$images.'
'.$newapp.$images.'

'.$product->name->language[$this->lang] .'
'.$version.'

'.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'

'.$product->description_short->language[$this->lang].'
'.$price.' + '.$price.' '.$download_link.'
'; print ''; print ''; -print ''; +print ''; print ''; // Hide unauthorized menu print ''; print ''; -print ''; print ''."\n"; print ''."\n"; - if (empty($conf->multicompany->enabled) || !$user->entity) print ''."\n"; // If superadmin or multicompany disabled + if (empty($conf->multicompany->enabled) || !$user->entity) print ''."\n"; // If superadmin or multicompany disabled print "\n"; $i++; diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 94d8909e063..9d7d10b932a 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -171,8 +171,8 @@ if (! $error && $xml) $out.=''; $out.=''; $out.=''; - $out.=''; - $out.=''; + $out.=''; + $out.=''; $out.=''."\n"; $i = 0; @@ -192,8 +192,8 @@ if (! $error && $xml) $out.=''; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } @@ -239,7 +239,7 @@ if (! $error && $xml) $out.=''; $out.=''; $out.=''; - $out.=''; + $out.=''; $out.=''."\n"; $tmpfilelist = dol_sort_array($file_list['missing'], 'filename'); if (is_array($tmpfilelist) && count($tmpfilelist)) @@ -251,7 +251,7 @@ if (! $error && $xml) $out.=''; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } } @@ -273,8 +273,8 @@ if (! $error && $xml) $out.=''; $out.=''; $out.=''; - $out.=''; - $out.=''; + $out.=''; + $out.=''; $out.=''; $out.=''; $out.=''."\n"; @@ -288,8 +288,8 @@ if (! $error && $xml) $out.=''; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; $out.='' . "\n"; @@ -299,8 +299,8 @@ if (! $error && $xml) $out.=''; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.='' . "\n"; $out.='' . "\n"; $out.="\n"; @@ -323,8 +323,8 @@ if (! $error && $xml) $out.=''; $out.=''; $out.=''; - $out.=''; - $out.=''; + $out.=''; + $out.=''; $out.=''; $out.=''; $out.=''."\n"; @@ -343,8 +343,8 @@ if (! $error && $xml) $out.=' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i); } $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; $out.='' . "\n"; @@ -354,8 +354,8 @@ if (! $error && $xml) $out.=''; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.='' . "\n"; $out.='' . "\n"; $out.="\n"; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 7c713749b55..3269542a7bf 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -107,7 +107,7 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Status").''.$langs->trans("Status").'
'.$langs->trans("HideUnauthorizedMenu").''; +print ''; if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index da27efd9dc6..6cb56b4490e 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -446,7 +446,7 @@ if ($resql) print '
'.$obj->name.''.dol_escape_htmltag($obj->value).''.$obj->entity.''.$obj->entity.'
#' . $langs->trans("Constant") . '' . $langs->trans("ExpectedValue") . '' . $langs->trans("Value") . '' . $langs->trans("ExpectedValue") . '' . $langs->trans("Value") . '
'.$i.''.$constname.''.$constvalue.''.$valueforchecksum.''.$constvalue.''.$valueforchecksum.'
#' . $langs->trans("Filename") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("ExpectedChecksum") . '
'.$i.''.$file['filename'].''.$file['expectedmd5'].''.$file['expectedmd5'].'
#' . $langs->trans("Filename") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '
'.$i.''.$file['filename'].''.$file['expectedmd5'].''.$file['md5'].''.$file['expectedmd5'].''.$file['md5'].''.dol_print_size($size).'
'.$langs->trans("Total").''.dol_print_size($totalsize).'
#' . $langs->trans("Filename") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '
'.$file['expectedmd5'].''.$file['md5'].''.$file['expectedmd5'].''.$file['md5'].''.dol_print_size($size).'
'.$langs->trans("Total").''.dol_print_size($totalsize).'
'; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; $var=false; @@ -134,7 +134,7 @@ foreach($sortorder as $numero=>$name) // Version print ''; // Id - print ''; + print ''; // Permissions if ($modules[$numero]->rights) {
'.$langs->trans("Modules").''.$langs->trans("Version").''.$langs->trans("IdModule").''.$langs->trans("IdModule").''.$langs->trans("IdPermissions").'
'.$modules[$numero]->getVersion().''.$numero.''.$numero.'