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
a0076bba
Commit
a0076bba
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
parents
a82e551a
437a8b53
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/install/fileconf.php
+14
-14
14 additions, 14 deletions
htdocs/install/fileconf.php
htdocs/install/step4.php
+1
-1
1 addition, 1 deletion
htdocs/install/step4.php
test/phpunit/zenfusion/functional/DolibarrInstallTest.php
+33
-0
33 additions, 0 deletions
test/phpunit/zenfusion/functional/DolibarrInstallTest.php
with
48 additions
and
15 deletions
htdocs/install/fileconf.php
+
14
−
14
View file @
a0076bba
...
...
@@ -151,7 +151,7 @@ if (! empty($force_install_message))
<td
valign=
"top"
class=
"label"
><b>
<?php
print
$langs
->
trans
(
"DocumentsDirectory"
);
?>
</b>
</td>
<?php
$dolibarr_main_data_root
=
$force_install_main_data_root
;
$dolibarr_main_data_root
=
@
$force_install_main_data_root
;
if
(
empty
(
$dolibarr_main_data_root
))
{
$dolibarr_main_data_root
=
detect_dolibarr_main_data_root
(
$dolibarr_main_document_root
);
}
...
...
@@ -478,7 +478,7 @@ if (! empty($force_install_message))
id=
"db_user_root"
name=
"db_user_root"
class=
"needroot"
value=
"
<?php
print
(
!
empty
(
$force_install_databaserootlogin
))
?
$force_install_databaserootlogin
:
$db_user_root
;
?>
"
value=
"
<?php
print
(
!
empty
(
$force_install_databaserootlogin
))
?
$force_install_databaserootlogin
:
@
$db_user_root
;
?>
"
<?php
if
(
$force_install_noedit
==
2
&&
$force_install_databaserootlogin
!==
null
)
{
print
' disabled'
;
}
?>
...
...
@@ -506,7 +506,7 @@ if (! empty($force_install_message))
class=
"needroot"
value=
"
<?php
// We don't want to set password. It will be extracted from the forced install file at step1.
$autofill
=
((
!
empty
(
$force_install_database_rootpass
))
?
''
:
$db_pass_root
);
$autofill
=
((
!
empty
(
$force_install_database_rootpass
))
?
''
:
@
$db_pass_root
);
if
(
!
empty
(
$dolibarr_main_prod
))
{
$autofill
=
''
;
}
// Do not autofill password if instance is a production instance
...
...
This diff is collapsed.
Click to expand it.
htdocs/install/step4.php
+
1
−
1
View file @
a0076bba
...
...
@@ -79,7 +79,7 @@ $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db-
if
(
$db
->
ok
)
{
print
'<tr><td>'
.
$langs
->
trans
(
"DolibarrAdminLogin"
)
.
' :</td><td>'
;
print
'<input name="login" type="text" value="'
.
(
!
empty
(
$_GET
[
"login"
])
?
$_GET
[
"login"
]
:
(
isset
(
$force_install_dolibarrlogin
)
?
$force_install_dolibarrlogin
:
''
))
.
'"'
.
(
$force_install_noedit
==
2
&&
$force_install_dolibarrlogin
!==
null
?
' disabled'
:
''
)
.
'></td></tr>'
;
print
'<input name="login" type="text" value="'
.
(
!
empty
(
$_GET
[
"login"
])
?
$_GET
[
"login"
]
:
(
isset
(
$force_install_dolibarrlogin
)
?
$force_install_dolibarrlogin
:
''
))
.
'"'
.
(
@
$force_install_noedit
==
2
&&
$force_install_dolibarrlogin
!==
null
?
' disabled'
:
''
)
.
'></td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"Password"
)
.
' :</td><td>'
;
print
'<input type="password" name="pass"></td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"PasswordAgain"
)
.
' :</td><td>'
;
...
...
This diff is collapsed.
Click to expand it.
test/phpunit/zenfusion/functional/DolibarrInstallTest.php
0 → 100644
+
33
−
0
View file @
a0076bba
<?php
class
ZenFusionInstallTest
extends
PHPUnit_Extensions_Selenium2TestCase
{
public
function
setUp
()
{
$this
->
setHost
(
'localhost'
);
$this
->
setPort
(
4444
);
$this
->
setBrowserUrl
(
'http://dev.zenfusion.fr'
);
$this
->
setBrowser
(
'chrome'
);
}
public
function
setUpPage
()
{
$this
->
url
(
'/'
);
}
public
function
testInstallRedirect
()
{
$this
->
assertContains
(
'/install/index.php'
,
$this
->
url
());
}
public
function
testInstallPageTitle
()
{
$this
->
assertContains
(
'Dolibarr'
,
$this
->
title
());
}
public
function
testInstallProcess
()
{
$this
->
byName
(
'forminstall'
)
->
submit
();
$this
->
assertContains
(
'/install/check.php'
,
$this
->
url
());
}
}
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