diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 903f61be444..cbd17fec1b0 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -152,7 +152,7 @@ var value: String;
function InitializeSetup(): Boolean;
begin
- Result := MsgBox('You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.' #13#13 'This setup install Dolibarr and third party softwares (Apache, Mysql and PHP) configured for a Dolibarr usage.' #13#13 'If you want to share your Apache, Mysql and PHP with other projects than Dolibarr, it is recommended to make ' #13 'a manual installation of Dolibarr on your own Apache, Mysql and PHP installation.' #13#13 'Do you want to continue install ?', mbConfirmation, MB_YESNO) = idYes;
+ Result := MsgBox('You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.' #13#13 'This setup install Dolibarr and third party softwares (Apache, Mysql and PHP) configured for a Dolibarr usage.' #13#13 'If you want to share your Apache, Mysql and PHP with other projects than Dolibarr, it is recommended to make ' #13 'a manual installation of Dolibarr on your own Apache, Mysql and PHP installation.' #13#13 'Do you want to start installation process ?', mbConfirmation, MB_YESNO) = idYes;
end;
procedure InitializeWizard();
@@ -197,7 +197,7 @@ begin
// Create a page wpInstalling
Page := CreateInputQueryPage(wpInstalling,
'Technical parameters', '',
- 'Please specify some technical parameters.' #13 'If you don''t understand, are not sure, or are doing an upgrade, just leave the ' #13 'default values.');
+ 'Please specify some technical parameters. If you don''t understand, are not sure, or are doing an upgrade, just leave the default values.');
// TODO Add control differently if first install or update
Page.Add('SMTP server (your own or ISP SMTP server) :', False);
diff --git a/build/exe/doliwamp/index.php.install b/build/exe/doliwamp/index.php.install
index 727f33e8f2c..4040560ba9c 100644
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -44,8 +44,11 @@ $langues = array(
'txtAlias' => 'Your aliased softwares',
'txtNoAlias' => 'No Alias found.',
'txtProjet' => 'Your Softwares',
- 'txtNoProjet' => 'No softwares yet. To create a new one, just create a directory in \'www\'.',
- 'faq' => 'http://www.en.wampserver.com/faq.php'
+ 'txtNoProjet' => 'No other softwares. To create a new one, just create a directory in \'www\'.',
+ 'txtApp' => 'Applications',
+ 'faq' => 'http://www.en.wampserver.com/faq.php',
+ 'ipserver' => 'Name/IP Server:',
+ 'askhelp' => 'Request a help support'
),
'fr' => array(
'langue' => 'Français',
@@ -61,8 +64,11 @@ $langues = array(
'txtAlias' => 'Alias d\'applications',
'txtNoAlias' => 'Aucun alias.',
'txtProjet' => 'Autres applications (sans alias)',
- 'txtNoProjet' => 'Aucune application hors alias. Pour en ajouter un nouveau, créez simplement un répertoire dans \'www\'.',
- 'faq' => 'http://www.wampserver.com/faq.php'
+ 'txtNoProjet' => 'Pas d\'autre application. Pour en ajouter une nouvelle, créez simplement un répertoire dans \'www\'.',
+ 'txtApp' => 'Applications',
+ 'faq' => 'http://www.wampserver.com/faq.php',
+ 'ipserver' => 'Name/IP Serveur:',
+ 'askhelp' => 'Demander une aide au support'
)
);
@@ -205,7 +211,16 @@ H+ABAB+AAQAAAAMAAAADAAAAAwAAAAcAAAAHAAAADwAAAB8AAAA/AAAAf4AAAf8=
EOFILE;
-//affichage du phpinfo
+
+// Ask help
+if (isset($_GET['askhelp']))
+{
+ print "Sorry, feature not yet available";
+ exit();
+}
+
+
+// Show PHPInfo
if (isset($_GET['phpinfo']))
{
phpinfo();
@@ -275,21 +290,29 @@ foreach ($loaded_extensions as $extension)
-// Read alias
+// Read alias directory
+$listoffile=array();
$aliasarray=array();
if (is_dir($aliasDir))
{
$handle=opendir($aliasDir);
while ($file = readdir($handle))
{
+ $listoffiles[]=$file;
+ }
+ sort($listoffiles);
+
+ foreach($listoffiles as $file)
+ {
if (is_file($aliasDir.$file) && ereg('.conf',$file))
{
$msg = '';
$aliasContents .= '';
$file = ereg_replace('.conf','',$file);
- if (eregi('dolibarr',$file)) $aliasContents .= $file.' (URL=http://ipofyourserver:81/'.$file.'/)';
- if (eregi('phpmyadmin',$file)) $aliasContents .= $file.' (URL=http://ipofyourserver:81/'.$file.'/)';
- $aliasContents.='';
+ if (eregi('dolibarr',$file)) $aliasContents .= $file.' (URL: http://ipofyourserver:81/'.$file.'/)';
+ elseif (eregi('phpmyadmin',$file)) $aliasContents .= $file.' (URL: http://ipofyourserver:81/'.$file.'/)';
+ else $aliasContents .= $file.'';
+ $aliasContents.='';
$aliasarray[]=$file;
}
}
@@ -300,22 +323,33 @@ if (!isset($aliasContents))
// Read projects in www dir
+$listoffiles=array();
$handle=opendir(".");
while ($file = readdir($handle))
{
- if (is_dir($file) && !in_array($file,$projectsListIgnore) && !in_array($file,$aliasarray))
- {
- $projectContents .= '';
- $projectContents .= $file;
- $projectContents .= '';
- }
+ $listoffiles[]=$file;
}
closedir($handle);
+
+foreach($listoffiles as $file)
+{
+ if (is_dir($file) && !in_array($file,$projectsListIgnore) && !in_array($file,$aliasarray))
+ {
+ $projectContents .= '';
+ $projectContents .= $file.' (URL: http://ipofyourserver:81/'.$file.'/)';
+ $projectContents .= '';
+ }
+}
+
if (!isset($projectContents))
$projectContents = $langues[$langue]['txtNoProjet'];
+$nameServer=getenv("COMPUTERNAME");
+$ipServer=$nameServer;
+
+
$pageContents = <<< EOPAGE
@@ -464,23 +498,27 @@ a:hover {
{$langues[$langue]['versm']}
${mysqlVersion}
+ {$langues[$langue]['ipserver']}
+ ${ipServer}
- {$langues[$langue]['titrePage']}
-
- {$langues[$langue]['txtAlias']}
+
+ {$langues[$langue]['txtApp']}
- {$langues[$langue]['txtProjet']}
+
+ {$langues[$langue]['titrePage']}
+
+
+