From 361f3a638ae5685a75a0f8679c2083c110000747 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Jul 2013 15:24:34 +0200 Subject: [PATCH 1/4] Fix: W3C --- htdocs/core/class/html.formfile.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index b4103974a03..992f5c51fdd 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -528,10 +528,9 @@ class FormFile $out.= ($param?'&'.$param:''); $out.= '">'.img_printer().''; } + $out.= ''; } - $out.= ''; - $this->numoffiles++; } } From 6f262b3a5b717235359f2df1ae837a42b7c12dee Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 23 Jul 2013 15:52:41 +0200 Subject: [PATCH 2/4] Avoid PHP warning --- htdocs/core/class/extrafields.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 206856c3530..ceca4575f50 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -906,7 +906,11 @@ class ExtraFields else if (in_array($key_type,array('checkbox'))) { $value_arr=GETPOST("options_".$key); - $value_key=implode($value_arr,','); + if (!empty($value_arr)) { + $value_key=implode($value_arr,','); + }else { + $value_key=''; + } } else if (in_array($key_type,array('price','double'))) { From 8f39d30ea58751dcd8ea323e3703edddb978837c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Jul 2013 18:22:10 +0200 Subject: [PATCH 3/4] Fix: Bad parameter --- htdocs/adherents/document.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 01c4da22ba9..3df950ad187 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -93,15 +93,15 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') */ $form = new Form($db); -$member=new Adherent($db); +$object=new Adherent($db); $membert=new AdherentType($db); llxHeader(); if ($id > 0) { - $result=$member->fetch($id); - $result=$membert->fetch($member->typeid); + $result=$object->fetch($id); + $result=$membert->fetch($object->typeid); if ($result > 0) { /* @@ -110,7 +110,7 @@ if ($id > 0) if (! empty($conf->notification->enabled)) $langs->load("mails"); - $head = member_prepare_head($member); + $head = member_prepare_head($object); $form=new Form($db); @@ -133,19 +133,19 @@ if ($id > 0) // Ref print ''.$langs->trans("Ref").''; print ''; - print $form->showrefnav($member, 'rowid', $linkback); + print $form->showrefnav($object, 'rowid', $linkback); print ''; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { - print ''.$langs->trans("Login").' / '.$langs->trans("Id").''.$member->login.' '; + print ''.$langs->trans("Login").' / '.$langs->trans("Id").''.$object->login.' '; } // Morphy - print ''.$langs->trans("Nature").''.$member->getmorphylib().''; + print ''.$langs->trans("Nature").''.$object->getmorphylib().''; /*print ''; - print $form->showphoto('memberphoto',$member); + print $form->showphoto('memberphoto',$object); print '';*/ print ''; @@ -153,22 +153,22 @@ if ($id > 0) print ''.$langs->trans("Type").''.$membert->getNomUrl(1)."\n"; // Company - print ''.$langs->trans("Company").''.$member->societe.''; + print ''.$langs->trans("Company").''.$object->societe.''; // Civility - print ''.$langs->trans("UserTitle").''.$member->getCivilityLabel().' '; + print ''.$langs->trans("UserTitle").''.$object->getCivilityLabel().' '; print ''; // Lastname - print ''.$langs->trans("Lastname").''.$member->lastname.' '; + print ''.$langs->trans("Lastname").''.$object->lastname.' '; print ''; // Firstname - print ''.$langs->trans("Firstname").''.$member->firstname.' '; + print ''.$langs->trans("Firstname").''.$object->firstname.' '; print ''; // Status - print ''.$langs->trans("Status").''.$member->getLibStatut(4).''; + print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; // Nbre fichiers print ''.$langs->trans("NbOfAttachedFiles").''.count($filearray).''; @@ -185,18 +185,18 @@ if ($id > 0) */ if ($action == 'delete') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$member->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); + $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); if ($ret == 'html') print '
'; } // Affiche formulaire upload $formfile=new FormFile($db); - $formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$member->id,'',0,0,$user->rights->adherent->creer,50,$object); + $formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$object->id,'',0,0,$user->rights->adherent->creer,50,$object); // List of document - $formfile->list_of_documents($filearray,$member,'member','', 0, get_exdir($member->id,2,0,1).'/'.$member->id.'/'); + $formfile->list_of_documents($filearray,$object,'member','', 0, get_exdir($object->id,2,0,1).'/'.$object->id.'/'); print "

"; } From 15c4c5d6b9a74fe66dcbda8bbee79fa0adbfa6b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Jul 2013 20:48:37 +0200 Subject: [PATCH 4/4] Some fixes into css --- htdocs/theme/amarok/style.css.php | 22 +++++++++++----------- htdocs/theme/auguria/style.css.php | 1 + htdocs/theme/eldy/style.css.php | 8 ++++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index b09a3f13b39..39c2f072441 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -919,7 +919,7 @@ a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:dol_optimize_smallscreen)?'11':'14'; // Eldy colors if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { - $conf->global->THEME_ELDY_TOPMENU_BACK1='200,216,246'; // topmenu + $conf->global->THEME_ELDY_TOPMENU_BACK1=($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10)?'230,232,232':'200,216,246'; // topmenu $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236'; $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) @@ -1353,7 +1353,7 @@ div.tabBar { background-image: -ms-linear-gradient(bottom, rgb() 25%, rgb() 100%); background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%); - background: #dee7ec url() repeat-x; + background: rgb() repeat-x; -moz-box-shadow: 4px 4px 4px #DDD; @@ -1411,7 +1411,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); - background: #dee7ec; + background: #ffffff; } @@ -1420,7 +1420,7 @@ a.tab#active { border-bottom: 1px solid rgb() !important; background-color: rgb() !important; - background: #ffffff; + background: rgb(); background-image: none !important; }