avoid the second use of query in install.php

Florian Schaal

2015-05-07 7eade0da5ec04ec86a89aed3c98e27cba3dae491

 install/dist/lib/opensuse.lib.php

@@ -159,6 +159,9 @@
      //* mysql-virtual_sender.cf
      $this->process_postfix_config('mysql-virtual_sender.cf');

      //* mysql-virtual_sender_login_maps.cf
      $this->process_postfix_config('mysql-virtual_sender_login_maps.cf');
		
      //* mysql-virtual_client.cf
      $this->process_postfix_config('mysql-virtual_client.cf');

@@ -225,23 +228,28 @@
         }
      }
      unset($rbl_hosts);
      unset($server_ini_array);

      //* If Postgrey is installed, configure it
      $greylisting = '';
      if($conf['postgrey']['installed'] == true) {
         $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
         $greylisting = ', check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
      }
      
      //* These postconf commands will be executed on installation and update
      $reject_sender_login_mismatch = '';
      if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
         $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
      }
      unset($server_ini_array);
		
      $postconf_placeholders = array('{config_dir}' => $config_dir,
         '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
         '{vmail_userid}' => $cf['vmail_userid'],
         '{vmail_groupid}' => $cf['vmail_groupid'],
         '{rbl_list}' => $rbl_list,
         '{greylisting}' => $greylisting,
         '{reject_slm}' => $reject_sender_login_mismatch,
      );

		
      $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
      $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
      $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
@@ -562,6 +570,7 @@
      $content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
      $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
      wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
      chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);


      // Adding the amavisd commands to the postfix configuration
@@ -865,7 +874,7 @@
      if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
   }

   public function configure_firewall()
   public function configure_bastille_firewall()
   {
      global $conf;

@@ -1391,7 +1400,12 @@
      
      // Add symlink for patch tool
      if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');

		
      // Change mode of a few files from amavisd
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
      if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);

   }