diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..19e8f2222 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +/include/ext/rapid-in/nbproject/private/ +*.orig +*~ +*.patch +*.diff +db/ +html/tmp +attic/* +include/ext/amortis/* +include/ext/import_account/* +include/ext/rapport_avance/* +include/ext/invoicing/* +include/ext/import-advanced/* +include/ext/syndicat-adherent/* +include/ext/webservice/* +include/ext/noalyss_document/* +include/ext/dossier_demo/* +include/ext/profile_mgt/* +include/ext/doc/* +include/ext/listing/* +include/ext/syndicat/* +include/ext/syndicat-tools/* +include/ext/tool_pcmn/* +include/ext/noalyss-timesheet/* +include/ext/import_doli/* +include/ext/transform/* +include/ext/nbproject/* +include/ext/backup_noadmin/* +include/ext/modop/* +include/ext/noalyss-portal-client/* +include/ext/tva/* +include/ext/sav/* +include/ext/coprop/* +include/ext/noalyss-export/* +include/ext/plugin-portal-client/* +include/ext/import_card/* +include/ext/skel/* +include/ext/syndicat-direct-debit/* +include/ext/etat_annexe_ohada/* +include/ext/bilan_interne/* +include/ext/importbank/* +include/ext/coprop-fake/* +include/ext/tools/* +include/ext/etat_annexe_ohada/* +local/* diff --git a/html/js/card.js b/html/js/card.js index a6fee8619..3eb1947c6 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -606,8 +606,8 @@ function fill_ipopcard(obj) var str_top="top:"+calcy(nTop)+"px"; var str_style=str_top+";width:45em;height:auto;position:absolute"; - - var popup={'id': content,'cssclass':'inner_box','style':str_style,'html':loading(),'drag':false}; + waiting_box(); + var popup={'id': content,'cssclass':'inner_box','style':str_style,'html':"",'drag':false}; add_div(popup); var dossier=$('gDossier').value; diff --git a/include/class/card_property.class.php b/include/class/card_property.class.php index 27132987e..b01dc73f6 100644 --- a/include/class/card_property.class.php +++ b/include/class/card_property.class.php @@ -184,7 +184,7 @@ class Card_Property } else { // if there is a class base in fiche_def_ref, this account will be the // the default one - if (strlen(trim($p_fiche_def->class_base)) != 0) { + if (noalyss_strlen(noalyss_trim($p_fiche_def->class_base)) != 0) { $result['msg'] .= " " . _("Rappel: Poste par défaut sera ") . $p_fiche_def->class_base . " ! "; diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php index b6a6421df..f5de48483 100644 --- a/include/class/dossier.class.php +++ b/include/class/dossier.class.php @@ -140,6 +140,7 @@ class Dossier use_id, use_first_name, use_name, + use_email, use_login, use_active, use_admin, diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index d4c594302..ad7629754 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -1579,6 +1579,16 @@ function add_http_link($text) return $ret; } +//--------------------------------------------------------------------------------------------------------------------- +// +// PHP 8.2 fails with these functions when a NULL is given as argument +// +//--------------------------------------------------------------------------------------------------------------------- + +function noalyss_strlen($p_string) :int{ + if (empty ($p_string) ) return 0; + else return strlen($p_string); +} function noalyss_trim($p_string) { if ($p_string===null) return ""; else return trim($p_string); diff --git a/include/lib/inum.class.php b/include/lib/inum.class.php index 28a50825e..78923e206 100644 --- a/include/lib/inum.class.php +++ b/include/lib/inum.class.php @@ -91,7 +91,7 @@ class INum extends IText $extra=(isset($this->extra))?$this->extra:""; - $this->value=str_replace('"', '', $this->value); + $this->value=noalyss_str_replace('"', '', $this->value); $strAttribute=$this->get_node_attribute(); if (!isset($this->css_size) || empty ($this->css_size)) { diff --git a/include/user.inc.php b/include/user.inc.php index 12c837b0d..c714f83e5 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -215,6 +215,7 @@ $header->add(_("Nom"), $url," order by use_name asc,use_first_name asc", "order $header->add(_('Dossier'),$url,' order by ag_dossier asc','order by ag_dossier desc', 'da','dd'); $header->add(_("Actif"), $url," order by use_active asc", "order by use_active desc","aa", "ad"); +$header->add(_("Email"), $url," order by use_email asc,use_name asc,use_first_name asc", "order by use_email desc,use_name desc,use_first_name desc","na", "nd"); $ord=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la'; $sql=$header->get_sql_order($ord); @@ -231,6 +232,7 @@ if ( !empty ($a_user) ) echo ''.$header->get_header(0).''; echo ''.$header->get_header(1).''; echo th(_("Prénom")); + echo ''.$header->get_header(4).''; echo ''.$header->get_header(3).''; echo ""._('Type').""; echo ''.$header->get_header(2).''; @@ -257,6 +259,7 @@ if ( !empty ($a_user) ) echo td($r_user['use_name']); echo td($r_user['use_first_name']); + echo td($r_user['use_email']); echo td($Active); $type=($r_user['use_admin']==1)?_("Administrateur"):_("Utilisateur"); echo "".$type."";