Commit 3bd0d086 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 0e3cf6f5 2e998b93
......@@ -139,7 +139,7 @@ $wb['email_error_isemail'] = 'Indtast en gyldig e-mail adresse.';
$wb['customer_no_error_unique'] = 'Kunde nr. skal være unikke (eller tomt).';
$wb['paypal_email_error_isemail'] = 'Indtast en gyldig PayPal e-mail adresse.';
$wb['paypal_email_txt'] = 'PayPal E-mail';
$wb['err_msg_master_tpl_set'] = 'Alle brugerdefinerede grænse indstillinger ignoreres, hvis nogen anden master skabelonen end \"custom\" er valgt.';
$wb['err_msg_master_tpl_set'] = 'Alle brugerdefinerede grænse indstillinger ignoreres, hvis nogen anden master skabelonen end \\"custom\\" er valgt.';
$wb['aps_limits_txt'] = 'APS Installer Begrænsninger';
$wb['limit_aps_txt'] = 'Max. antal af APS forekomster';
$wb['limit_aps_error_notint'] = 'APS forekomster grænse skal være et tal.';
......@@ -156,7 +156,7 @@ $wb['none_txt'] = 'ingen';
$wb['contact_firstname_txt'] = 'Contact firstname';
$wb['password_click_to_set_txt'] = 'Click to set';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['xmpp_limits_txt'] = 'XMPP Limits';
$wb['web_servers_txt'] = 'Webservers';
$wb['web_servers_placeholder'] = 'Select webservers';
......
......@@ -95,7 +95,7 @@ $wb['default_dnsserver_txt'] = 'Default DNS Server';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['default_dbserver_txt'] = 'Default Database Server';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['limit_database_quota_txt'] = 'Database quota';
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
$wb['xmpp_limits_txt'] = 'XMPP Limits';
......
......@@ -156,12 +156,12 @@ $wb['added_date_txt'] = 'Tilføjet d.';
$wb['limit_domainmodule_error_notint'] = 'Domænemodul grænse skal være et tal.';
$wb['limit_domainmodule_txt'] = 'Domænemodul Begrænsning';
$wb['client_limits_txt'] = 'Kunde Begrænsninger';
$wb['err_msg_master_tpl_set'] = 'Alle brugerdefinerede grænse indstillinger ignoreres, hvis nogen anden master skabelonen end \"custom\" er valgt.';
$wb['err_msg_master_tpl_set'] = 'Alle brugerdefinerede grænse indstillinger ignoreres, hvis nogen anden master skabelonen end \\"custom\\" er valgt.';
$wb['contact_firstname_txt'] = 'Contact firstname';
$wb['password_click_to_set_txt'] = 'Click to set';
$wb['limit_database_user_txt'] = 'Max. Database users';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
$wb['web_servers_txt'] = 'Webservers';
$wb['web_servers_placeholder'] = 'Select Webservers';
......
......@@ -139,7 +139,7 @@ $wb['email_error_isemail'] = 'Lütfen geçerli bir e-posta adresi yazın.';
$wb['customer_no_error_unique'] = 'Müşteri numarası eşsiz (ya da boş) olmalıdır.';
$wb['paypal_email_error_isemail'] = 'Lütfen geçerli bir PayPal e-posta adresi yazın.';
$wb['paypal_email_txt'] = 'PayPal E-posta Adresi';
$wb['err_msg_master_tpl_set'] = '\"Özel\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
$wb['err_msg_master_tpl_set'] = '\\"Özel\\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
$wb['aps_limits_txt'] = 'APS Yükleyici Sınırları';
$wb['limit_aps_txt'] = 'En Fazla APS Kopyası Sayısı';
$wb['limit_aps_error_notint'] = 'APS kopya sayısı sınırı bir sayı olmalıdır.';
......@@ -156,7 +156,7 @@ $wb['none_txt'] = 'yok';
$wb['contact_firstname_txt'] = 'Contact firstname';
$wb['password_click_to_set_txt'] = 'Click to set';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['xmpp_limits_txt'] = 'XMPP Limits';
$wb['web_servers_txt'] = 'Webservers';
$wb['web_servers_placeholder'] = 'Select webservers';
......
......@@ -95,7 +95,7 @@ $wb['default_dnsserver_txt'] = 'Default DNS Server';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['default_dbserver_txt'] = 'Default Database Server';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['limit_database_quota_txt'] = 'Database quota';
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
$wb['xmpp_limits_txt'] = 'XMPP Limits';
......
......@@ -156,12 +156,12 @@ $wb['added_date_txt'] = 'Eklendiği Tarih';
$wb['limit_domainmodule_error_notint'] = 'Alan adı modülü sınırı bir sayı olmalıdır.';
$wb['limit_domainmodule_txt'] = 'Alan Adı Modülü Sınırı';
$wb['client_limits_txt'] = 'Müşteri Sınırları';
$wb['err_msg_master_tpl_set'] = '\"Özel\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
$wb['err_msg_master_tpl_set'] = '\\"Özel\\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
$wb['contact_firstname_txt'] = 'Contact firstname';
$wb['password_click_to_set_txt'] = 'Click to set';
$wb['limit_database_user_txt'] = 'Max. Database users';
$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\\'s Encrypt available';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
$wb['web_servers_txt'] = 'Webservers';
$wb['web_servers_placeholder'] = 'Select Webservers';
......
......@@ -92,7 +92,8 @@ $liste["item"][] = array( 'field' => "sys_groupid",
'prefix' => "",
'suffix' => "",
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT a.groupid, a.name FROM sys_group a, domain b WHERE (a.groupid = b.sys_groupid) AND ({AUTHSQL-B}) ORDER BY name',
//'querystring' => 'SELECT a.groupid, a.name FROM sys_group a, domain b WHERE (a.groupid = b.sys_groupid) AND ({AUTHSQL-B}) ORDER BY name',
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
'keyfield'=> 'groupid',
'valuefield'=> 'name'
),
......
......@@ -33,6 +33,19 @@ require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('dashboard');
//* Hide modules
if(isset($_GET['hide'])) {
if($_GET['hide'] == 'donate') {
$timeout = time()+31536000;
$tmp = $app->db->queryOneRecord("SELECT value FROM sys_config WHERE group = 'interface' AND name = 'hide_donation_dashlet'");
if(is_array($tmp)) {
$app->db->query("UPDATE sys_config SET value = ? WHERE group = 'interface' AND name = 'hide_donation_dashlet')",$timeout);
} else {
$app->db->query("INSERT INTO `sys_config` (`group`,`name`,`value`) VALUES ('interface','hide_donation_dashlet',?)",$timeout);
}
}
}
//* Loading Template
$app->uses('tpl');
$app->tpl->newTemplate("templates/dashboard.htm");
......@@ -189,6 +202,14 @@ if($dashlets_config[$role.'_dashlets_right'] != ''){
}
/******************************************************************************/
/* Donation dashlet */
if($app->auth->is_admin()) {
$tmp = $app->db->queryOneRecord("SELECT `value` FROM `sys_config` WHERE `group` = 'interface' AND `name` = 'hide_donation_dashlet'");
if(!is_array($tmp) || $tmp['value'] < time()) {
array_unshift($leftcol_dashlets,'donate');
}
}
/* Fill the left column */
$leftcol = array();
......
<?php
class dashlet_donate {
function show() {
global $app, $conf;
if($app->auth->is_admin()) {
//* Check if dashlet is not hidden
//* Loading Template
$app->uses('tpl');
$tpl = new tpl;
$tpl->newTemplate("dashlets/templates/donate.htm");
$wb = array();
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_donate.lng';
if(is_file($lng_file)) include $lng_file;
$tpl->setVar($wb);
return $tpl->grab();
} else {
return '';
}
}
}
?>
<div style="background-color:#FFFFFF;padding:1em;">
<h4>{tmpl_var name='donate_txt'}<button type="button" class="btn btn-link btn-xs">{tmpl_var name='more_btn_txt'}</button></h4>
<p id="description">{tmpl_var name='donate2_txt'}<p>
<p style="text-align:right;">
<a href="#" class="btn btn-default" data-load-content="dashboard/dashboard.php?hide=donate">{tmpl_var name='hide_btn_txt'}</a>
<a href="https://www.ispconfig.org/donation/" target="_blank" class="btn btn-success">{tmpl_var name='donate_btn_txt'}</a>
</p>
</div>
<script>
$(document).ready(function(){
$("#description").toggle();
$("button").click(function(){
$("#description").toggle();
});
});
</script>
<?php
$wb['donate_txt'] = 'The ISPConfig Hosting Control Panel is free software. Maybe you are aware, that it takes a lot of time and effort to develop, maintain and support a software project of this complexity. If you want to support the further development of ISPConfig, please consider making a donation. As a bonus you will get a copy of the new ISPConfig manual.';
$wb['donate2_txt'] = 'The donation amount can be 5 EUR or more, the amount is chosen during checkout. The payment method is PayPal. You will receive an receipt as PDF from ISPConfig UG.';
$wb['hide_btn_txt'] = 'Hide';
$wb['donate_btn_txt'] = 'Support ISPConfig and get the Manual';
$wb['more_btn_txt'] = 'More';
?>
<?php
$wb['donate_txt'] = 'The ISPConfig Hosting Control Panel is free software. Maybe you are aware, that it takes a lot of time and effort to develop, maintain and support a software project of this complexity. If you want to support the further development of ISPConfig, please consider making a donation. As a bonus you will get a copy of the new ISPConfig manual.';
$wb['donate2_txt'] = 'The donation amount can be 5 EUR or more, the amount is chosen during checkout. The payment method is PayPal. You will receive an receipt as PDF from ISPConfig UG.';
$wb['hide_btn_txt'] = 'Hide';
$wb['donate_btn_txt'] = 'Support ISPConfig and get the Manual';
$wb['more_btn_txt'] = 'More';
?>
<?php
$wb['donate_txt'] = 'The ISPConfig Hosting Control Panel is free software. Maybe you are aware, that it takes a lot of time and effort to develop, maintain and support a software project of this complexity. If you want to support the further development of ISPConfig, please consider making a donation. As a bonus you will get a copy of the new ISPConfig manual.';
$wb['donate2_txt'] = 'The donation amount can be 5 EUR or more, the amount is chosen during checkout. The payment method is PayPal. You will receive an receipt as PDF from ISPConfig UG.';
$wb['hide_btn_txt'] = 'Hide';
$wb['donate_btn_txt'] = 'Support ISPConfig and get the Manual';
$wb['more_btn_txt'] = 'More';
?>
<?php
$wb['donate_txt'] = 'The ISPConfig Hosting Control Panel is free software. Maybe you are aware, that it takes a lot of time and effort to develop, maintain and support a software project of this complexity. If you want to support the further development of ISPConfig, please consider making a donation. As a bonus you will get a copy of the new ISPConfig manual.';
$wb['donate2_txt'] = 'The donation amount can be 5 EUR or more, the amount is chosen during checkout. The payment method is PayPal. You will receive an receipt as PDF from ISPConfig UG.';
$wb['hide_btn_txt'] = 'Hide';
$wb['donate_btn_txt'] = 'Support ISPConfig and get the Manual';
$wb['more_btn_txt'] = 'More';
?>
......@@ -3,5 +3,3 @@ $wb['welcome_user_txt'] = 'Vítejte %s';
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
......@@ -3,5 +3,3 @@ $wb['customerdata_txt'] = 'My Data';
$wb['edit_txt'] = 'Editovat';
?>
......@@ -6,5 +6,3 @@ $wb['no_database_accounts_txt'] = 'Nebyla nalezena žádná databáze.';
$wb['databasequota_txt'] = 'Kvóty databází';
?>
<?php
$wb['donate_txt'] = 'ISPConfig Hosting Ovládací panel je svobodný software. Možná jste si vědomi, že to vyžaduje hodně času a úsilí rozvíjet, udržovat a podporovat softwarový projekt této složitosti. Chcete-li podpořit další rozvoj ISPConfigu, prosím zvažte poskytnutí daru. Jako bonus dostanete kopii nového ISPConfig manuálu.';
$wb['donate2_txt'] = 'Výše daru může být 5 EUR nebo více, částku si zvolíte při objednávce manuálu. Způsob platby je PayPal. Obdržíte pokladní lístek jako PDF z ISPConfig UG.';
$wb['hide_btn_txt'] = 'Skrýt';
$wb['donate_btn_txt'] = 'Podpořit ISPConfig a získat manuál';
$wb['more_btn_txt'] = 'Více';
?>
......@@ -3,5 +3,3 @@ $wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
$wb['edit_txt'] = 'Editovat';
?>
......@@ -17,5 +17,3 @@ $wb['invoice_type_refund_txt'] = 'Refund';
$wb['invoice_type_reminder_txt'] = 'Reminder';
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment