[Noalyss-commit] [noalyss] 06/06: Merge branch 'rel691-phpcompta-administrator'

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 260111c2ae609470fdcb501a097e79d891648325
Merge: 12c15fb 0d57a61
Author: Dany De Bontridder <address@hidden>
Date:   Tue Feb 2 15:31:42 2016 +0100

    Merge branch 'rel691-phpcompta-administrator'

 html/install.php                          |   29 ++-
 html/lang/en_US/LC_MESSAGES/messages.po   |  413 ++++++++++++++++++++++++----
 html/lang/messages.po                     |  402 ++++++++++++++++++++++++---
 html/lang/nl_NL/LC_MESSAGES/messages.po   |  430 ++++++++++++++++++++++++++---
 include/class/class_acc_ledger.php        |    4 +-
 include/class/class_acc_operation.php     |    2 +-
 include/class/class_dossier.php           |    4 +-
 include/class/class_user.php              |    2 +-
 include/config.inc                        |   35 +--
 include/constant.php                      |    5 +
 include/lib/config_file.php               |   63 +++--
 include/param_sec.inc.php                 |   18 +-
 include/template/template_config_form.php |    8 +
 13 files changed, 1210 insertions(+), 205 deletions(-)

diff --cc include/constant.php
index fec5988,52eb76d..8ca7704
--- a/include/constant.php
+++ b/include/constant.php
@@@ -44,9 -44,14 +44,14 @@@ if ( !defined("NOALYSS_PLUGIN")) defin
  if ( !defined("NOALYSS_INCLUDE")) define ("NOALYSS_INCLUDE",$g_include_dir);
  if ( !defined("NOALYSS_TEMPLATE")) define 
("NOALYSS_TEMPLATE",$g_template_dir);
  // pdftk can deal with all the PDF , for some of them it is preferable to fix 
it
 -// with convert
 +// with convert , see also PDF2PS and PS2PDF if yes
  if ( !defined("FIX_BROKEN_PDF")) define ("FIX_BROKEN_PDF",'NO');
  
+ // version < 6.9.1.4 , the default administrator was Noalyss
+ if ( !defined('NOALYSS_ADMINISTRATOR')) {
+     define ('NOALYSS_ADMINISTRATOR','phpcompta');
+ }
+ 
  require_once NOALYSS_INCLUDE.'/constant.security.php';
  
  if ( strpos($inc_path,";") != 0 ) {