From 50dce892e07549f904a65bbbe4deda983163a069 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Nov 2008 00:36:47 +0000 Subject: [PATCH] Add enhancement in DoliWamp tools --- build/exe/doliwamp/doliwamp.iss | 4 +- build/exe/doliwamp/index.php.install | 88 +++++++++++++----- ...{Dolibarr v2.4.pml => Dolibarr v2.4.1.pml} | 14 +-- build/pad/pad_dolibarr.htm | Bin 6372 -> 6376 bytes build/pad/pad_dolibarr.xml | 14 +-- 5 files changed, 79 insertions(+), 41 deletions(-) rename build/pad/{Dolibarr v2.4.pml => Dolibarr v2.4.1.pml} (94%) 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']}

    + + + diff --git a/build/pad/Dolibarr v2.4.pml b/build/pad/Dolibarr v2.4.1.pml similarity index 94% rename from build/pad/Dolibarr v2.4.pml rename to build/pad/Dolibarr v2.4.1.pml index 9d2dd14ec20..a1bda8be6db 100644 --- a/build/pad/Dolibarr v2.4.pml +++ b/build/pad/Dolibarr v2.4.1.pml @@ -1,12 +1,12 @@ - PADGen 3.0.1.37 + PADGen 3.0.1.38 Dolibarr - 2.4 - 08 - 21 + 2.4.1 + 10 + 30 2008 @@ -59,11 +59,11 @@ http://www.dolibarr.org http://www.dolibarr.org/images/dolibarr_screenshot2.png http://www.dolibarr.org/images/dolibarr.gif - http://www.dolibarr.org/images/pad_dolibarr.xml + http://www.dolibarr.org/files/pad_dolibarr.xml - http://www.nltechno.com/files/dolibarr.tgz - http://www.nltechno.com/files/dolibarr.tgz + http://www.dolibarr.org/files/dolibarr.tgz + http://www.dolibarr.org/files/dolibarr.tgz diff --git a/build/pad/pad_dolibarr.htm b/build/pad/pad_dolibarr.htm index 9d90da19edbe74de12243cac58b586927aa5cc0e..3e864f76bd18dfa75dd5ca2be2b95f260e941f7e 100644 GIT binary patch delta 71 zcmaE2_`-0*Cnjb+2E)l8nU-@JG8i!EGZ-@%Y+lH`o_F#(HmS)|gj6Oc2uVTNUXv5} R^(IdeQiF+Yo+1>$1^`jH7VZE5 delta 151 zcmaE1_{4C-C#K2Yn3i!GFjz3?GZ--#ZeGf~o>x4NA%~%aA(bJSA%h{0A)i4H$jWEP eoop-Qh(}I+@*W|z$pS)Rc+}w4zj=?44jTZuF(mf@ diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index 1a9493a3f19..c833a84dc64 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -2,7 +2,7 @@ 3.01 - PADGen 3.0.1.37 http://www.padgen.org + PADGen 3.0.1.38 http://www.padgen.org Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad @@ -34,9 +34,9 @@ Dolibarr - 2.4 - 08 - 21 + 2.4.1 + 10 + 30 2008 @@ -89,11 +89,11 @@ http://www.dolibarr.org http://www.dolibarr.org/images/dolibarr_screenshot2.png http://www.dolibarr.org/images/dolibarr.gif - http://www.dolibarr.org/images/pad_dolibarr.xml + http://www.dolibarr.org/files/pad_dolibarr.xml - http://www.nltechno.com/files/dolibarr.tgz - http://www.nltechno.com/files/dolibarr.tgz + http://www.dolibarr.org/files/dolibarr.tgz + http://www.dolibarr.org/files/dolibarr.tgz