From 36d164f77918e5aba21b3cb8000baeacc90f69f6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 May 2015 23:43:57 +0200 Subject: [PATCH 1/4] Add field gender into table of user. --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 2 ++ htdocs/install/mysql/tables/llx_user.sql | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 74133f977c8..73e7694c040 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -614,6 +614,8 @@ ALTER TABLE llx_user DROP INDEX idx_user_fk_societe; ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER; ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc); +ALTER TABLE llx_user ADD gender VARCHAR(10); + -- API module ALTER TABLE llx_user ADD api_key VARCHAR(128) DEFAULT NULL AFTER pass_temp; ALTER TABLE llx_user ADD INDEX idx_user_api_key (api_key); diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index c673331687a..a11b0ec6b50 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -34,7 +34,8 @@ create table llx_user pass varchar(32), pass_crypted varchar(128), pass_temp varchar(32), -- temporary password when asked for forget password - api_key varchar(128), + api_key varchar(128), -- key to use REST API by this user + gender varchar(10), civility varchar(6), lastname varchar(50), firstname varchar(50), From d25a2af70c869b667b918de8d917010a795a681e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 May 2015 23:47:15 +0200 Subject: [PATCH 2/4] Fix PHPCS --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 9472118d64f..18eb95fdbb8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2876,7 +2876,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so * @param string $options Other url paramaters to propagate ("" by default) * @param integer $nextpage Do we show a next page button * @param string $betweenarrows HTML content to show between arrows. Must contains '
    • ' tags. - * @param string $afterarraws HTML content to show after arrows. Must NOT contains '
    • ' tags. + * @param string $afterarrows HTML content to show after arrows. Must NOT contains '
    • ' tags. * @return void */ function print_fleche_navigation($page,$file,$options='',$nextpage=0,$betweenarrows='',$afterarrows='') From 684686e0f6b87955f3e6871ecf6af6bddde50392 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 May 2015 08:59:58 +0200 Subject: [PATCH 3/4] Fix restore compatibility of new navigation style with jmobile --- htdocs/core/lib/functions.lib.php | 14 +++++++------- htdocs/theme/eldy/style.css.php | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 18eb95fdbb8..f067dcaf417 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2826,7 +2826,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so { if ($totalnboflines) // If we know total nb of lines { - $maxnbofpage=10; // nb before and after selected page + $maxnbofpage=(empty($conf->dol_optimize_smallscreen)?10:3); // nb before and after selected page $nbpages=ceil($totalnboflines/$conf->liste_limit); $cpt=($page-$maxnbofpage); @@ -2834,31 +2834,31 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so if ($cpt>=1) { - $pagelist.= '
  • 1
    • '; + $pagelist.= ''; if ($cpt >= 2) $pagelist.='
  • ...
    • '; } do { if ($cpt==$page) { - $pagelist.= '
  • '.($page+1).'
    • '; + $pagelist.= ''; } else { - $pagelist.= '
  • '.($cpt+1).'
    • '; + $pagelist.= ''; } $cpt++; } while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage); if ($cpt<$nbpages) { - if ($cpt<$nbpages-1) $pagelist.= '
  • ...
    • '; - $pagelist.= '
  • '.$nbpages.'
    • '; + if ($cpt<$nbpages-1) $pagelist.= ''; + $pagelist.= ''; } } else { - $pagelist.= '
  • '.($page+1)."
    • "; + $pagelist.= '"; } } print_fleche_navigation($page,$file,$options,$nextpage,$pagelist,$morehtml); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d987741eb26..fbdf781a677 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1863,17 +1863,18 @@ div.pagination li { padding-left: 0; border-radius: 4px; } - -div.pagination li a, -div.pagination li span { - /*position: relative;*/ - /*float: left;*/ +div.pagination li.pagination a, +div.pagination li.pagination span { padding: 6px 12px; margin-left: -1px; line-height: 1.42857143; color: #000; text-decoration: none; - background-color: #fff; +} +dol_use_jmobile)) { ?> +div.pagination li a, +div.pagination li span { + background-color: #fff; border: 1px solid #ddd; } div.pagination li:first-child a, @@ -1918,7 +1919,8 @@ div.pagination .disabled a:focus { background-color: #fff; border-color: #ddd; } -div.pagination li .active { + +div.pagination li.pagination .active { text-decoration: underline; } div.pagination li.paginationafterarrows { From 756de27a12a6ae0e27a4de2cac0c783af8bf37db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 May 2015 09:11:34 +0200 Subject: [PATCH 4/4] Fix syntax error --- htdocs/asterisk/cidlookup.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index d1d965d99a7..ef4eaefe9c2 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -17,27 +17,25 @@ /** * \file htdocs/asterisk/cidlookup.php - * \brief Script to search companies names based on incoming calls + * \brief Script to search companies names based on incoming calls, from caller phone number * \remarks To use this script, your Asterisk must be compiled with CURL, * and your dialplan must be something like this: * - * exten => s,1,Set(CALLERID(name)=${CURL(http://IP-DOLIBARR:80/asterisk/cidlookup.php?phone=${CALLERID(num)})}) - * - * Change IP-DOLIBARR to the IP address of your dolibarr - * server + * exten => s,1,Set(CALLERID(name)=${CURL(http://IP-DOLIBARR:80/asterisk/cidlookup.php?phone=${CALLERID(num)})}) * + * Change IP-DOLIBARR to the IP address of your dolibarr server */ include '../master.inc.php'; $phone = GETPOST('phone'); -$notfound = "Not found"; -$error = "Error" - +$notfound = $langs->trans("Unknown"); + // Security check -if (empty($conf->clicktodial->enabled)) { - print "Error: Module Click to dial not active\n"; +if (empty($conf->clicktodial->enabled)) +{ + print "Error: Module Click to dial is not enabled.\n"; exit; } @@ -73,7 +71,7 @@ if ($resql) else { dol_print_error($db,'Error'); - $found = $error; + $found = 'Error'; } echo $found;