Implemented: FS#468 - Client name conversion in FTP user too restricted

tbrehm

2010-06-16 e28564dbde4f922a6a8263e3dea32d56b60b5b5b

 install/install.php

@@ -1,7 +1,7 @@
<?php

/*
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -36,12 +36,12 @@

//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
echo " _____ ___________   _____              __ _       
|_   _/  ___| ___ \ /  __ \            / _(_)      
  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _ 
  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |
 _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| |
 \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, |
echo " _____ ___________   _____              __ _         ____
|_   _/  ___| ___ \ /  __ \            / _(_)       /__  \
  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _    _/ /
  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |  |_ |
 _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| | ___\ \
 \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, | \____/
                                              __/ |
                                             |___/ ";
echo "\n".str_repeat('-',80)."\n";
@@ -93,6 +93,10 @@

if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
   die('This software can not be installed on a server wich runs ISPConfig 2.x.');
}

if(is_dir('/usr/local/ispconfig')) {
   die('ISPConfig 3 installation found. Please use update.php instead if install.php to update the installation.');
}

//** Detect the installed applications
@@ -162,18 +166,24 @@
   //* Configure jailkit
   swriteln('Configuring Jailkit');
   $inst->configure_jailkit();
	
   if($conf['dovecot']['installed'] == true) {
      //* Configure dovecot
      swriteln('Configuring Dovecot');
      $inst->configure_dovecot();
   } else {
      //* Configure saslauthd
      swriteln('Configuring SASL');
      $inst->configure_saslauthd();

   //* Configure saslauthd
   swriteln('Configuring SASL');
   $inst->configure_saslauthd();

   //* Configure PAM
   swriteln('Configuring PAM');
   $inst->configure_pam();

   //* Configure courier
   swriteln('Configuring Courier');
   $inst->configure_courier();
      //* Configure PAM
      swriteln('Configuring PAM');
      $inst->configure_pam();
		
      //* Configure courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
   }

   //* Configure Spamasassin
   swriteln('Configuring Spamassassin');
@@ -237,21 +247,22 @@
   $inst->install_crontab();
   
   swriteln('Restarting services ...');
   if($conf['mysql']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   if($conf['postfix']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   if($conf['saslauthd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   if($conf['amavis']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   if($conf['clamav']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   if($conf['courier']['courier-imap'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   if($conf['apache']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['pureftpd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
   if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
   if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
   if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
   if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
   
}else{
   
@@ -319,18 +330,25 @@
      //* Configure Postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix();
		
      //* Configure saslauthd
      swriteln('Configuring SASL');
      $inst->configure_saslauthd();
		
      //* Configure PAM
      swriteln('Configuring PAM');
      $inst->configure_pam();

      //* Configure courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
      if($conf['dovecot']['installed'] == true) {
         //* Configure dovecot
         swriteln('Configuring Dovecot');
         $inst->configure_dovecot();
      } else {
		
         //* Configure saslauthd
         swriteln('Configuring SASL');
         $inst->configure_saslauthd();
		
         //* Configure PAM
         swriteln('Configuring PAM');
         $inst->configure_pam();
			
         //* Configure courier
         swriteln('Configuring Courier');
         $inst->configure_courier();
      }

      //* Configure Spamasassin
      swriteln('Configuring Spamassassin');
@@ -353,6 +371,7 @@
      if($conf['courier']['courier-imap-ssl'] != '')       system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
      if($conf['courier']['courier-pop'] != '')          system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
      if($conf['courier']['courier-pop-ssl'] != '')       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
      if($conf['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
   }
   
   //** Configure Jailkit