Merge branch 'master' of /home/git/repositories/Schoene/ispconfig3

Till Brehm

2014-01-06 0b50f8f4d7f2dc23a1886599b2f14d70eaa8d705

Merge branch 'master' of /home/git/repositories/Schoene/ispconfig3

 interface/web/dashboard/lib/lang/ar_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/de_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains';
$wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten';
$wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliase';
$wb['limit_mailaliasdomain_txt'] = 'Anzahl der Domain Aliase';
$wb['limit_mailaliasdomain_txt'] = 'Anzahl der E-Mail Domain Aliase';
$wb['limit_mailforward_txt'] = 'Anzahl der E-Mail Weiterleitungen';
$wb['limit_mailcatchall_txt'] = 'Anzahl der E-Mail Catchall Konten';
$wb['limit_mailrouting_txt'] = 'Anzahl der E-Mail Routen';

 interface/web/dashboard/lib/lang/en_dashlet_limits.lng

@@ -6,7 +6,7 @@
$wb['limit_mailmailinglist_txt'] = "Number of mailing lists";
$wb['limit_mailbox_txt'] = "Number of mailboxes";
$wb["limit_mailalias_txt"] = 'Number of email aliases';
$wb["limit_mailaliasdomain_txt"] = 'Number of domain aliases';
$wb["limit_mailaliasdomain_txt"] = 'Number of email domain aliases';
$wb["limit_mailforward_txt"] = 'Number of email forwarders';
$wb["limit_mailcatchall_txt"] = 'Number of email catchall accounts';
$wb["limit_mailrouting_txt"] = 'Number of email routes';

 interface/web/dashboard/lib/lang/fi_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/ja_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/pt_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/ro_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/se_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/sk_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dashboard/lib/lang/tr_dashlet_limits.lng

@@ -5,7 +5,7 @@
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
$wb['limit_mailforward_txt'] = 'Number of email forwarders';
$wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
$wb['limit_mailrouting_txt'] = 'Number of email routes';

 interface/web/dns/templates/dns_wizard.htm

@@ -115,3 +115,18 @@
        resultBoxPosition: 'e'
    });    
</script>
<script language="JavaScript" type="text/javascript">
    jQuery('#ipv6').ispconfigSearch({
        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
        minChars: 0,
        cssPrefix: 'df-',
        fillSearchField: true,
        fillSearchFieldWith: 'fill_text',
        searchFieldWatermark: '',
        resultBoxPosition: 'e'
    });
</script>

 server/lib/classes/cron.d/150-awstats.inc.php

@@ -100,11 +100,20 @@
            }

            if(!is_file($awstats_website_conf_file)) {
                $awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
                if (is_file($awstats_conf_dir."/awstats.conf")) {
                                    $include_file = $awstats_conf_dir."/awstats.conf";
                } elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
                    $include_file = $awstats_conf_dir."/awstats.model.conf";
                }
                $awstats_conf_file_content = 'Include "'.$include_file.'"
        LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
        SiteDomain="'.$domain.'"
        HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
                file_put_contents($awstats_website_conf_file, $awstats_conf_file_content);
                if (isset($include_file)) {
                    file_put_contents($awstats_website_conf_file, $awstats_conf_file_content);
                } else {
                    $app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
                }
            }

            if(!@is_dir($statsdir)) mkdir($statsdir);

 server/plugins-available/apache2_plugin.inc.php

@@ -2626,13 +2626,22 @@
            }

            $content = '';
            $content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
            if (is_file($awstats_conf_dir."/awstats.conf")) {
                $include_file = $awstats_conf_dir."/awstats.conf";
            } elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
                $include_file = $awstats_conf_dir."/awstats.model.conf";
            }
            $content .= "Include \"".$include_file."\"\n";
            $content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
            $content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
            $content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";

            $app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
            $app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
            if (isset($include_file)) {
                $app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
                $app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
            } else {
                $app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
            }
        }

        if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");

 server/plugins-available/nginx_plugin.inc.php

@@ -2236,13 +2236,22 @@
            }

            $content = '';
            $content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
            if (is_file($awstats_conf_dir."/awstats.conf")) {
                $include_file = $awstats_conf_dir."/awstats.conf";
            } elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
                $include_file = $awstats_conf_dir."/awstats.model.conf";
            }
            $content .= "Include \"".$include_file."\"\n";
            $content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
            $content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
            $content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";

            $app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
            $app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
            if (isset($include_file)) {
                $app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
                $app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
            } else {
                $app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
            }
        }

        if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");