diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f4f29695dbcb0dcab935f028cb23190fee02492d..60c52e8683f4c2bc0305126a828ea91232ac5b13 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2378,15 +2378,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-bottom-style: solid;
margin: 0px 0px 8px 0px;
-<<<<<<< HEAD
-=======
- /*
- -moz-box-shadow: 2px 2px 4px #CCC;
- -webkit-box-shadow: 2px 2px 4px #CCC;
- box-shadow: 2px 2px 4px #CCC;
- */
- /* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
-moz-border-radius: 0.1em;
-webkit-border-radius: 0.1em;
@@ -4532,11 +4523,7 @@ img.demothumb {
}
@media only screen and (max-width: 767px)
{
-<<<<<<< HEAD
.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
-=======
- .imgopensurveywizard { width:95%; height: auto; }
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
#tooltip {
position: absolute;
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 3f364fb8180fc166a2ad89eb730dc2919e8dd666..04871f110e9f4e32a3569c8bdde68a7c20c61783 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -251,89 +251,8 @@ if (! $result)
exit;
}
-<<<<<<< HEAD
$num = $db->num_rows($result);
-=======
- $param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall != '') $param.='&sall='.urlencode($sall);
- if ($search_user != '') $param.="&search_user=".$search_user;
- if ($search_login != '') $param.="&search_login=".$search_login;
- if ($search_lastname != '') $param.="&search_lastname=".$search_lastname;
- if ($search_firstname != '') $param.="&search_firstname=".$search_firstname;
- if ($search_gender != '') $param.="&search_gender=".$search_gender;
- if ($search_employee != '') $param.="&search_employee=".$search_employee;
- if ($search_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code;
- if ($search_email != '') $param.="&search_email=".$search_email;
- if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor;
- if ($search_statut != '') $param.="&search_statut=".$search_statut;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
- // Add $param from extra fields
- foreach ($search_array_options as $key => $val)
- {
- $crit=$val;
- $tmpkey=preg_replace('/search_options_/','',$key);
- if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
- }
-
-
- print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
- if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
- print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
- print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
- if ($sall)
- {
- foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
- print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
- }
-
- $moreforfilter='';
-
- $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
- $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
- print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
- print '<tr class="liste_titre">';
- if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.lastname']['checked'])) print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.firstname']['checked'])) print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.gender']['checked'])) print_liste_field_titre($langs->trans("Gender"),$_SERVER['PHP_SELF'],"u.gender",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.employee']['checked'])) print_liste_field_titre($langs->trans("Employee"),$_SERVER['PHP_SELF'],"u.employee",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.email']['checked'])) print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.fk_soc']['checked'])) print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.entity']['checked'])) print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.fk_user']['checked'])) print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
- if (! empty($arrayfields['u.datelastlogin']['checked'])) print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
- if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder);
- // Extra fields
- if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
- {
- foreach($extrafields->attribute_label as $key => $val)
- {
- if (! empty($arrayfields["ef.".$key]['checked']))
- {
- $align=$extrafields->getAlignFlag($key);
- print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
- }
- }
- }
- // Hook fields
- $parameters=array('arrayfields'=>$arrayfields);
- $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- if (! empty($arrayfields['u.datec']['checked'])) print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
- if (! empty($arrayfields['u.tms']['checked'])) print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
- if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
- print "</tr>\n";
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
-<<<<<<< HEAD
if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
{
$obj = $db->fetch_object($resql);
@@ -497,69 +416,6 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
$typeofextrafield=$extrafields->attribute_type[$key];
print '<td class="liste_titre'.($align?' '.$align:'').'">';
if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-=======
- // Search bar
- print '<tr class="liste_titre">';
- if (! empty($arrayfields['u.login']['checked']))
- {
- print '<td><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
- }
- if (! empty($arrayfields['u.lastname']['checked']))
- {
- print '<td><input type="text" name="search_lastname" size="6" value="'.$search_lastname.'"></td>';
- }
- if (! empty($arrayfields['u.firstname']['checked']))
- {
- print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
- }
- if (! empty($arrayfields['u.gender']['checked']))
- {
- print '<td>';
- $arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
- print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
- print '</td>';
- }
- if (! empty($arrayfields['u.employee']['checked']))
- {
- print '<td>';
- print $form->selectyesno('search_employee', $search_employee, 1, false, 1);
- print '</td>';
- }
- if (! empty($arrayfields['u.accountancy_code']['checked']))
- {
- print '<td><input type="text" name="search_accountancy_code" size="4" value="'.$search_accountancy_code.'"></td>';
- }
- if (! empty($arrayfields['u.email']['checked']))
- {
- print '<td><input type="text" name="search_email" size="6" value="'.$search_email.'"></td>';
- }
- if (! empty($arrayfields['u.fk_soc']['checked']))
- {
- print '<td><input type="text" name="search_thirdparty" size="6" value="'.$search_thirdparty.'"></td>';
- }
- if (! empty($arrayfields['u.entity']['checked']))
- {
- print '<td></td>';
- }
- if (! empty($arrayfields['u.fk_user']['checked']))
- {
- print '<td></td>';
- }
- if (! empty($arrayfields['u.datelastlogin']['checked']))
- {
- print '<td></td>';
- }
- if (! empty($arrayfields['u.datepreviouslogin']['checked']))
- {
- print '<td></td>';
- }
- // Extra fields
- if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
- {
- foreach($extrafields->attribute_label as $key => $val)
- {
- if (! empty($arrayfields["ef.".$key]['checked']))
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
{
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
@@ -791,222 +647,12 @@ while ($i < min($num,$limit))
print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
}
// Action column
-<<<<<<< HEAD
- print '<td></td>';
-=======
- print '<td class="liste_titre" align="right">';
- $searchpitco=$form->showFilterAndCheckAddButtons(0);
- print $searchpitco;
+ print '<td>';
print '</td>';
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
print "</tr>\n";
-<<<<<<< HEAD
- $i++;
-=======
-
- $user2=new User($db);
-
- $var=True;
- //while ($i < min($num,$conf->liste_limit))
- while ($i < $num)
- {
- $obj = $db->fetch_object($result);
- $var=!$var;
-
- $userstatic->id=$obj->rowid;
- $userstatic->ref=$obj->label;
- $userstatic->login=$obj->login;
- $userstatic->statut=$obj->statut;
- $userstatic->email=$obj->email;
- $userstatic->gender=$obj->gender;
- $userstatic->societe_id=$obj->fk_soc;
- $userstatic->firstname=$obj->firstname;
- $userstatic->lastname=$obj->lastname;
- $userstatic->employee=$obj->employee;
- $userstatic->photo=$obj->photo;
-
- $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
-
- print "<tr ".$bc[$var].">";
- if (! empty($arrayfields['u.login']['checked']))
- {
- print '<td>';
- print $li;
- if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
- {
- print img_picto($langs->trans("SuperAdministrator"),'redstar');
- }
- else if ($obj->admin)
- {
- print img_picto($langs->trans("Administrator"),'star');
- }
- print '</td>';
- }
- if (! empty($arrayfields['u.lastname']['checked']))
- {
- print '<td>'.$obj->lastname.'</td>';
- }
- if (! empty($arrayfields['u.firstname']['checked']))
- {
- print '<td>'.$obj->firstname.'</td>';
- }
- if (! empty($arrayfields['u.gender']['checked']))
- {
- print '<td>';
- if ($obj->gender) print $langs->trans("Gender".$obj->gender);
- print '</td>';
- }
- if (! empty($arrayfields['u.employee']['checked']))
- {
- print '<td>'.yn($obj->employee).'</td>';
- }
- if (! empty($arrayfields['u.accountancy_code']['checked']))
- {
- print '<td>'.$obj->accountancy_code.'</td>';
- }
- if (! empty($arrayfields['u.email']['checked']))
- {
- print '<td>'.$obj->email.'</td>';
- }
- if (! empty($arrayfields['u.fk_soc']['checked']))
- {
- print "<td>";
- if ($obj->fk_soc)
- {
- $companystatic->id=$obj->fk_soc;
- $companystatic->name=$obj->name;
- $companystatic->canvas=$obj->canvas;
- print $companystatic->getNomUrl(1);
- }
- else if ($obj->ldap_sid)
- {
- print $langs->trans("DomainUser");
- }
- else
- {
- print $langs->trans("InternalUser");
- }
- print '</td>';
- }
- // Multicompany enabled
- if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
- {
- if (! empty($arrayfields['u.entity']['checked']))
- {
- print '<td>';
- if (! $obj->entity)
- {
- print $langs->trans("AllEntities");
- }
- else
- {
- // $mc is defined in conf.class.php if multicompany enabled.
- if (is_object($mc))
- {
- $mc->getInfo($obj->entity);
- print $mc->label;
- }
- }
- print '</td>';
- }
- }
- // Supervisor
- if (! empty($arrayfields['u.fk_user']['checked']))
- {
- // Resp
- print '<td class="nowrap">';
- if ($obj->login2)
- {
- $user2->id=$obj->id2;
- $user2->login=$obj->login2;
- $user2->lastname=$obj->lastname2;
- $user2->firstname=$obj->firstname2;
- $user2->gender=$obj->gender2;
- $user2->photo=$obj->photo2;
- $user2->admin=$obj->admin2;
- $user2->email=$obj->email2;
- $user2->societe_id=$obj->fk_soc2;
- print $user2->getNomUrl(-1,'',0,0,24,0,'');
- if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
- {
- print img_picto($langs->trans("SuperAdministrator"),'redstar');
- }
- else if ($obj->admin2)
- {
- print img_picto($langs->trans("Administrator"),'star');
- }
- }
- print '</td>';
- }
- // Date last login
- if (! empty($arrayfields['u.datelastlogin']['checked']))
- {
- print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
- }
- // Date previous login
- if (! empty($arrayfields['u.datepreviouslogin']['checked']))
- {
- print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
- }
-
- // Extra fields
- if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
- {
- foreach($extrafields->attribute_label as $key => $val)
- {
- if (! empty($arrayfields["ef.".$key]['checked']))
- {
- print '<td';
- $align=$extrafields->getAlignFlag($key);
- if ($align) print ' align="'.$align.'"';
- print '>';
- $tmpkey='options_'.$key;
- print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
- print '</td>';
- }
- }
- }
- // Fields from hook
- $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
- $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- // Date creation
- if (! empty($arrayfields['u.datec']['checked']))
- {
- print '<td align="center">';
- print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
- print '</td>';
- }
- // Date modification
- if (! empty($arrayfields['u.tms']['checked']))
- {
- print '<td align="center">';
- print dol_print_date($db->jdate($obj->date_update), 'dayhour');
- print '</td>';
- }
- // Status
- if (! empty($arrayfields['u.statut']['checked']))
- {
- $userstatic->statut=$obj->statut;
- print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
- }
- // Action column
- print '<td></td>';
-
- print "</tr>\n";
- $i++;
- }
-
- $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
- $reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
-
- print "</table>";
- print "</form>\n";
- $db->free($result);
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
+ $i++;
}
$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);