Updated version number to 3.0.4.6

tbrehm

2012-06-11 897af06af9522ded99b1e0f46730299e89856ffe

 install/lib/installer_base.lib.php

@@ -158,10 +158,10 @@
         $this->error('Stopped: Database already contains some tables.');
      } else {
         if($conf['mysql']['admin_password'] == '') {
            caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
            caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
                  __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
         } else {
            caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
            caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
                  __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
         }
         $db_tables = $this->db->getTables();
@@ -750,9 +750,22 @@

   public function configure_saslauthd() {
      global $conf;
		
      //* Get saslsauthd version
      exec('saslauthd -v 2>&1',$out);
      $parts = explode(' ',$out[0]);
      $saslversion = $parts[1];
      unset($parts);
      unset($out);


      $configfile = 'sasl_smtpd.conf';
      if(version_compare($saslversion , '2.1.23') > 0) {
         //* Configfile for saslauthd versions 2.1.24 and newer
         $configfile = 'sasl_smtpd2.conf';
      } else {
         //* Configfile for saslauthd versions up to 2.1.23
         $configfile = 'sasl_smtpd.conf';
      }
		
      if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
      if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400);
      $content = rf('tpl/'.$configfile.'.master');
@@ -1392,7 +1405,7 @@
         $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
         $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
         $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
         $content = str_replace('{mysql_server_ip}',$conf['mysql']['host'],$content);
         $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
      }
      wf($conf['vlogger']['config_dir'].'/'.$configfile,$content);
      chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600);
@@ -1771,9 +1784,8 @@
      }
      
      if(is_dir($install_dir.'/interface/invoices')) {
         chmod($install_dir.'/interface/invoices', 0770);
         chown($install_dir.'/interface/invoices', 'ispconfig');
         chgrp($install_dir.'/interface/invoices', 'ispconfig');
         exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
         exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
      }

      // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing