- $app object not available in this mysql lib

Marius Cramer

2015-04-16 c6d4e838cb8d789c2213e96803aca641e1d8575f

 install/lib/installer_base.lib.php

@@ -172,7 +172,7 @@
      }

      //* Set the database name in the DB library
      $this->db->dbName = $conf['mysql']['database'];
      $this->db->setDBName($conf['mysql']['database']);

      //* Load the database dump into the database, if database contains no tables
      $db_tables = $this->db->getTables();
@@ -224,7 +224,7 @@
      $this->db->query('FLUSH PRIVILEGES;');

      //* Set the database name in the DB library
      $this->db->dbName = $conf['mysql']['database'];
      $this->db->setDBName($conf['mysql']['database']);

      $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));

@@ -692,6 +692,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');

@@ -743,13 +746,18 @@
         }
      }
      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';
      }
		
      $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'],
@@ -757,6 +765,7 @@
         '{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/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');