Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
5ce44eff
Commit
5ce44eff
authored
12 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: more simple
Fix: eclipse auto align is bad !!! ;-)
parent
622f5dff
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/admin/system/dolibarr.php
+151
-216
151 additions, 216 deletions
htdocs/admin/system/dolibarr.php
with
151 additions
and
216 deletions
htdocs/admin/system/dolibarr.php
+
151
−
216
View file @
5ce44eff
...
@@ -216,98 +216,52 @@ print '<br>';
...
@@ -216,98 +216,52 @@ print '<br>';
// Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
// Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
$configfileparameters
=
array
(
$configfileparameters
=
array
(
'dolibarr_main_url_root'
,
'dolibarr_main_url_root'
=>
$langs
->
trans
(
"URLRoot"
),
'dolibarr_main_url_root_alt'
,
'dolibarr_main_url_root_alt'
=>
$langs
->
trans
(
"URLRoot"
)
.
' (alt)'
,
'dolibarr_main_document_root'
,
'dolibarr_main_document_root'
=>
$langs
->
trans
(
"DocumentRootServer"
),
'dolibarr_main_document_root_alt'
,
'dolibarr_main_document_root_alt'
=>
$langs
->
trans
(
"DocumentRootServer"
)
.
' (alt)'
,
'dolibarr_main_data_root'
,
'dolibarr_main_data_root'
=>
$langs
->
trans
(
"DataRootServer"
),
'separator'
,
'separator'
=>
''
,
'dolibarr_main_db_host'
,
'dolibarr_main_db_host'
=>
$langs
->
trans
(
"DatabaseServer"
),
'dolibarr_main_db_port'
,
'dolibarr_main_db_port'
=>
$langs
->
trans
(
"DatabasePort"
),
'dolibarr_main_db_name'
,
'dolibarr_main_db_name'
=>
$langs
->
trans
(
"DatabaseName"
),
'dolibarr_main_db_type'
,
'dolibarr_main_db_type'
=>
$langs
->
trans
(
"DriverType"
),
'dolibarr_main_db_user'
,
'dolibarr_main_db_user'
=>
$langs
->
trans
(
"DatabaseUser"
),
'dolibarr_main_db_pass'
,
'dolibarr_main_db_pass'
=>
$langs
->
trans
(
"DatabasePassword"
),
'dolibarr_main_db_character_set'
,
'dolibarr_main_db_character_set'
=>
$langs
->
trans
(
"DBStoringCharset"
),
'dolibarr_main_db_collation'
,
'dolibarr_main_db_collation'
=>
$langs
->
trans
(
"DBSortingCollation"
),
'?dolibarr_main_db_prefix'
,
'?dolibarr_main_db_prefix'
=>
$langs
->
trans
(
"Prefix"
),
'separator'
,
'separator'
=>
''
,
'dolibarr_main_authentication'
,
'dolibarr_main_authentication'
=>
$langs
->
trans
(
"AuthenticationMode"
),
'separator'
,
'separator'
=>
''
,
'?dolibarr_main_auth_ldap_login_attribute'
,
'?dolibarr_main_auth_ldap_login_attribute'
=>
'dolibarr_main_auth_ldap_login_attribute'
,
'?dolibarr_main_auth_ldap_host'
,
'?dolibarr_main_auth_ldap_host'
=>
'dolibarr_main_auth_ldap_host'
,
'?dolibarr_main_auth_ldap_port'
,
'?dolibarr_main_auth_ldap_port'
=>
'dolibarr_main_auth_ldap_port'
,
'?dolibarr_main_auth_ldap_version'
,
'?dolibarr_main_auth_ldap_version'
=>
'dolibarr_main_auth_ldap_version'
,
'?dolibarr_main_auth_ldap_dn'
,
'?dolibarr_main_auth_ldap_dn'
=>
'dolibarr_main_auth_ldap_dn'
,
'?dolibarr_main_auth_ldap_admin_login'
,
'?dolibarr_main_auth_ldap_admin_login'
=>
'dolibarr_main_auth_ldap_admin_login'
,
'?dolibarr_main_auth_ldap_admin_pass'
,
'?dolibarr_main_auth_ldap_admin_pass'
=>
'dolibarr_main_auth_ldap_admin_pass'
,
'?dolibarr_main_auth_ldap_debug'
,
'?dolibarr_main_auth_ldap_debug'
=>
'dolibarr_main_auth_ldap_debug'
,
'separator'
,
'separator'
=>
''
,
'?dolibarr_lib_ADODB_PATH'
,
'?dolibarr_lib_ADODB_PATH'
=>
'dolibarr_lib_ADODB_PATH'
,
'?dolibarr_lib_TCPDF_PATH'
,
'?dolibarr_lib_TCPDF_PATH'
=>
'dolibarr_lib_TCPDF_PATH'
,
'?dolibarr_lib_FPDI_PATH'
,
'?dolibarr_lib_FPDI_PATH'
=>
'dolibarr_lib_FPDI_PATH'
,
'?dolibarr_lib_NUSOAP_PATH'
,
'?dolibarr_lib_NUSOAP_PATH'
=>
'dolibarr_lib_NUSOAP_PATH'
,
'?dolibarr_lib_PHPEXCEL_PATH'
,
'?dolibarr_lib_PHPEXCEL_PATH'
=>
'dolibarr_lib_PHPEXCEL_PATH'
,
'?dolibarr_lib_GEOIP_PATH'
,
'?dolibarr_lib_GEOIP_PATH'
=>
'dolibarr_lib_GEOIP_PATH'
,
'?dolibarr_lib_ODTPHP_PATH'
,
'?dolibarr_lib_ODTPHP_PATH'
=>
'dolibarr_lib_ODTPHP_PATH'
,
'?dolibarr_lib_ODTPHP_PATHTOPCLZIP'
,
'?dolibarr_lib_ODTPHP_PATHTOPCLZIP'
=>
'dolibarr_lib_ODTPHP_PATHTOPCLZIP'
,
'?dolibarr_js_CKEDITOR'
,
'?dolibarr_js_CKEDITOR'
=>
'dolibarr_js_CKEDITOR'
,
'?dolibarr_js_JQUERY'
,
'?dolibarr_js_JQUERY'
=>
'dolibarr_js_JQUERY'
,
'?dolibarr_js_JQUERY_UI'
,
'?dolibarr_js_JQUERY_UI'
=>
'dolibarr_js_JQUERY_UI'
,
'?dolibarr_js_JQUERY_FLOT'
,
'?dolibarr_js_JQUERY_FLOT'
=>
'dolibarr_js_JQUERY_FLOT'
,
'?dolibarr_font_DOL_DEFAULT_TTF'
,
'?dolibarr_font_DOL_DEFAULT_TTF'
=>
'dolibarr_font_DOL_DEFAULT_TTF'
,
'?dolibarr_font_DOL_DEFAULT_TTF_BOLD'
,
'?dolibarr_font_DOL_DEFAULT_TTF_BOLD'
=>
'dolibarr_font_DOL_DEFAULT_TTF_BOLD'
,
'separator'
,
'separator'
=>
''
,
'?dolibarr_mailing_limit_sendbyweb'
,
'?dolibarr_mailing_limit_sendbyweb'
=>
'Limit nb of email sent by page'
,
'?dolibarr_strict_mode'
'?dolibarr_strict_mode'
=>
'Strict mode is on/off'
);
$configfilelib
=
array
(
// 'separator',
$langs
->
trans
(
"URLRoot"
),
$langs
->
trans
(
"URLRoot"
)
.
' (alt)'
,
$langs
->
trans
(
"DocumentRootServer"
),
$langs
->
trans
(
"DocumentRootServer"
)
.
' (alt)'
,
$langs
->
trans
(
"DataRootServer"
),
'separator'
,
$langs
->
trans
(
"DatabaseServer"
),
$langs
->
trans
(
"DatabasePort"
),
$langs
->
trans
(
"DatabaseName"
),
$langs
->
trans
(
"DriverType"
),
$langs
->
trans
(
"DatabaseUser"
),
$langs
->
trans
(
"DatabasePassword"
),
$langs
->
trans
(
"DBStoringCharset"
),
$langs
->
trans
(
"DBSortingCharset"
),
$langs
->
trans
(
"Prefix"
),
'separator'
,
$langs
->
trans
(
"AuthenticationMode"
),
'separator'
,
'dolibarr_main_auth_ldap_login_attribute'
,
'dolibarr_main_auth_ldap_host'
,
'dolibarr_main_auth_ldap_port'
,
'dolibarr_main_auth_ldap_version'
,
'dolibarr_main_auth_ldap_dn'
,
'dolibarr_main_auth_ldap_admin_login'
,
'dolibarr_main_auth_ldap_admin_pass'
,
'dolibarr_main_auth_ldap_debug'
,
'separator'
,
'dolibarr_lib_ADODB_PATH'
,
'dolibarr_lib_TCPDF_PATH'
,
'dolibarr_lib_FPDI_PATH'
,
'dolibarr_lib_NUSOAP_PATH'
,
'dolibarr_lib_PHPEXCEL_PATH'
,
'dolibarr_lib_GEOIP_PATH'
,
'dolibarr_lib_ODTPHP_PATH'
,
'dolibarr_lib_ODTPHP_PATHTOPCLZIP'
,
'dolibarr_js_CKEDITOR'
,
'dolibarr_js_JQUERY'
,
'dolibarr_js_JQUERY_UI'
,
'dolibarr_js_JQUERY_FLOT'
,
'dolibarr_font_DOL_DEFAULT_TTF'
,
'dolibarr_font_DOL_DEFAULT_TTF_BOLD'
,
'separator'
,
'Limit nb of email sent by page'
,
'Strict mode is on/off'
);
);
$var
=
true
;
$var
=
true
;
print
'<table class="noborder" width="100%">'
;
print
'<table class="noborder" width="100%">'
;
print
'<tr class="liste_titre">'
;
print
'<tr class="liste_titre">'
;
...
@@ -317,32 +271,20 @@ print '</td>';
...
@@ -317,32 +271,20 @@ print '</td>';
print
'<td>'
.
$langs
->
trans
(
"Parameter"
)
.
'</td>'
;
print
'<td>'
.
$langs
->
trans
(
"Parameter"
)
.
'</td>'
;
print
'<td>'
.
$langs
->
trans
(
"Value"
)
.
'</td>'
;
print
'<td>'
.
$langs
->
trans
(
"Value"
)
.
'</td>'
;
print
'</tr>'
.
"
\n
"
;
print
'</tr>'
.
"
\n
"
;
$i
=
0
;
foreach
(
$configfileparameters
as
$key
)
foreach
(
$configfileparameters
as
$key
=>
$value
)
{
{
$ignore
=
0
;
$ignore
=
0
;
if
(
$key
==
'dolibarr_main_url_root_alt'
&&
empty
(
$
{
if
(
$key
==
'dolibarr_main_url_root_alt'
&&
empty
(
${$key}
))
$ignore
=
1
;
$key
}))
$ignore
=
1
;
if
(
$key
==
'dolibarr_main_document_root_alt'
&&
empty
(
${$key}
))
$ignore
=
1
;
if
(
$key
==
'dolibarr_main_document_root_alt'
&&
empty
(
$
{
$key
}))
$ignore
=
1
;
if
(
empty
(
$ignore
))
if
(
empty
(
$ignore
))
{
{
$newkey
=
preg_replace
(
'/^\?/'
,
''
,
$key
);
$newkey
=
preg_replace
(
'/^\?/'
,
''
,
$key
);
if
(
preg_match
(
'/^\?/'
,
$key
)
&&
empty
(
$
{
if
(
preg_match
(
'/^\?/'
,
$key
)
&&
empty
(
${$newkey}
))
continue
;
// We discard parametes starting with ?
$newkey
}))
if
(
$newkey
==
'separator'
&&
$lastkeyshown
==
'separator'
)
continue
;
{
$i
++
;
continue
;
// We discard parametes starting with ?
}
if
(
$newkey
==
'separator'
&&
$lastkeyshown
==
'separator'
)
{
$i
++
;
continue
;
}
$var
=!
$var
;
$var
=!
$var
;
print
"<tr "
.
$bc
[
$var
]
.
">"
;
print
"<tr "
.
$bc
[
$var
]
.
">"
;
...
@@ -353,28 +295,21 @@ foreach($configfileparameters as $key)
...
@@ -353,28 +295,21 @@ foreach($configfileparameters as $key)
else
else
{
{
// Label
// Label
print
"<td>"
.
$
configfilelib
[
$i
]
.
'</td>'
;
print
"<td>"
.
$
value
.
'</td>'
;
// Key
// Key
print
'<td>'
.
$newkey
.
'</td>'
;
print
'<td>'
.
$newkey
.
'</td>'
;
// Value
// Value
print
"<td>"
;
print
"<td>"
;
if
(
$newkey
==
'dolibarr_main_db_pass'
)
print
preg_replace
(
'/./i'
,
'*'
,
$
{
if
(
$newkey
==
'dolibarr_main_db_pass'
)
print
preg_replace
(
'/./i'
,
'*'
,
${$newkey}
);
$newkey
});
else
if
(
$newkey
==
'dolibarr_main_url_root'
&&
preg_match
(
'/__auto__/'
,
${$newkey}
))
print
${$newkey}
.
' => '
.
constant
(
'DOL_MAIN_URL_ROOT'
);
else
if
(
$newkey
==
'dolibarr_main_url_root'
&&
preg_match
(
'/__auto__/'
,
$
{
else
if
(
$newkey
==
'dolibarr_main_url_root_alt'
&&
preg_match
(
'/__auto__/'
,
${$newkey}
))
print
${$newkey}
.
' => '
.
constant
(
'DOL_MAIN_URL_ROOT_ALT'
);
$newkey
}))
print
$
{
else
print
${$newkey}
;
$newkey
}
.
' => '
.
constant
(
'DOL_MAIN_URL_ROOT'
);
else
if
(
$newkey
==
'dolibarr_main_url_root_alt'
&&
preg_match
(
'/__auto__/'
,
$
{
$newkey
}))
print
$
{
$newkey
}
.
' => '
.
constant
(
'DOL_MAIN_URL_ROOT_ALT'
);
else
print
$
{
$newkey
};
if
(
$newkey
==
'dolibarr_main_url_root'
&&
$newkey
!=
DOL_MAIN_URL_ROOT
)
print
' (currently used by autodetect: '
.
DOL_MAIN_URL_ROOT
.
')'
;
if
(
$newkey
==
'dolibarr_main_url_root'
&&
$newkey
!=
DOL_MAIN_URL_ROOT
)
print
' (currently used by autodetect: '
.
DOL_MAIN_URL_ROOT
.
')'
;
print
"</td>"
;
print
"</td>"
;
}
}
print
"</tr>
\n
"
;
print
"</tr>
\n
"
;
$lastkeyshown
=
$newkey
;
$lastkeyshown
=
$newkey
;
}
}
$i
++
;
}
}
print
'</table>'
;
print
'</table>'
;
print
'<br>'
;
print
'<br>'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment