Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

 install/dist/lib/fedora.lib.php

@@ -152,6 +152,19 @@
      //* mysql-virtual_relayrecipientmaps.cf
        $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');

   //* postfix-dkim
   $full_file_name=$config_dir.'/tag_as_originating.re';
   if(is_file($full_file_name)) {
      copy($full_file_name, $config_dir.$configfile.'~');
   }
   wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');

   $full_file_name=$config_dir.'/tag_as_foreign.re';
   if(is_file($full_file_name)) {
      copy($full_file_name, $config_dir.$configfile.'~');
   }
   wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');

      //* Changing mode and group of the new created config files.
      caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
                 __FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
@@ -845,6 +858,7 @@
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
      
      wf("$install_dir/interface/lib/$configfile", $content);
      
@@ -869,6 +883,7 @@
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

      wf("$install_dir/server/lib/$configfile", $content);