diff --git a/lib/ajax.php b/lib/ajax.php index e701b955..39c962e0 100644 --- a/lib/ajax.php +++ b/lib/ajax.php @@ -15,7 +15,7 @@ * @package AJAX * */ - + if(isset($_POST['action'])) { $action = $_POST['action']; } elseif(isset($_GET['action'])) { @@ -25,22 +25,25 @@ if(isset($_POST['action'])) { } if ($action == "newsfeed") { - $feed = "http://forum.froxlor.org/index.php/rss/forums/1-froxlor-announcements/"; + $feed = "http://inside.froxlor.org/news/"; if (function_exists("simplexml_load_file") == false) { die(); } - if (ini_get('allow_url_fopen')) { - $news = simplexml_load_file($feed, null, LIBXML_NOCDATA); + if (function_exists('curl_version')) { + // get version + require './tables.inc.php'; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $feed); + curl_setopt($ch, CURLOPT_USERAGENT, 'Froxlor/'.$version); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + $output = curl_exec($ch); + curl_close($ch); + $news = simplexml_load_string(trim($output)); } else { - if (function_exists('curl_version')) { - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $feed); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - $output = curl_exec($ch); - curl_close($ch); - $news = simplexml_load_string(trim($output)); + if (ini_get('allow_url_fopen')) { + $news = simplexml_load_file($feed, null, LIBXML_NOCDATA); } else { $news = false; } diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 61376883..181c6e28 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -1137,7 +1137,7 @@ $lng['serversettings']['froxlordirectlyviahostname'] = 'Froxlor is direct toegan // ADDED IN FROXLOR 0.9.11-svn1 $lng['serversettings']['panel_password_regex']['title'] = 'Reguliere expressie voor wachtwoorden'; -$lng['serversettings']['panel_password_regex']['description'] = 'Hier kunt u een reguliere expressie opgeven voor de complexiteit van wachtwoorden.
Leeg betekent geen speciale complexiteit
(regex hulp/voorbeelden)'; +$lng['serversettings']['panel_password_regex']['description'] = 'Hier kunt u een reguliere expressie opgeven voor de complexiteit van wachtwoorden.
Leeg betekent geen speciale complexiteit'; $lng['error']['notrequiredpasswordcomplexity'] = 'Er is niet voldaan aan de complexiteit voor het wachtwoord (regex: %s)'; // ADDED IN FROXLOR 0.9.11-svn2 @@ -1151,7 +1151,7 @@ $lng['serversettings']['perl_path']['description'] = 'Alleen relevant voor light // ADDED IN FROXLOR 0.9.12-svn1 $lng['admin']['fcgid_settings'] = 'FCGID'; $lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'FCGID inschakelen voor de VHost voor Froxlor'; -$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Indien ingeschakeld wordt Froxlor ook uitgevoerd onder een lokale gebruiker
Let op:Dit vereist handmatige configuratie, zie FCGID - handbook'; +$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Indien ingeschakeld wordt Froxlor ook uitgevoerd onder een lokale gebruiker
Let op:Dit vereist handmatige configuratie, zie FCGID - handbook'; $lng['admin']['mod_fcgid_user'] = 'Lokale gebruiker voor FCGID (Froxlor vhost)'; $lng['admin']['mod_fcgid_group'] = 'Lokale groep voor FCGID (Froxlor vhost)'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 82d73d9c..59d7f265 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -537,7 +537,7 @@ $lng['panel']['back'] = 'Back'; // ADDED IN 1.2.16-svn12 $lng['serversettings']['mod_fcgid']['title'] = 'Enable FCGID'; -$lng['serversettings']['mod_fcgid']['description'] = 'Use this to run PHP with the corresponding useraccount.

This needs a special webserver configuration for Apache, see FCGI - handbook'; +$lng['serversettings']['mod_fcgid']['description'] = 'Use this to run PHP with the corresponding useraccount.

This needs a special webserver configuration for Apache, see FCGID - handbook'; $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address'; $lng['serversettings']['sendalternativemail']['description'] = 'Send the password-email to a different address during email-account-creation'; $lng['emails']['alternative_emailaddress'] = 'Alternative e-mail-address'; @@ -1216,7 +1216,7 @@ $lng['serversettings']['froxlordirectlyviahostname'] = 'Access Froxlor directly // ADDED IN FROXLOR 0.9.11-svn1 $lng['serversettings']['panel_password_regex']['title'] = 'Regular expression for passwords'; -$lng['serversettings']['panel_password_regex']['description'] = 'Here you can set a regular expression for passwords-complexity.
Empty = no specific requirement
(regex help/examples)'; +$lng['serversettings']['panel_password_regex']['description'] = 'Here you can set a regular expression for passwords-complexity.
Empty = no specific requirement'; $lng['error']['notrequiredpasswordcomplexity'] = 'The specified password-complexity was not satisfied.
Please contact your administrator if you have any questions about the complexity-specification'; // ADDED IN FROXLOR 0.9.11-svn2 @@ -1298,7 +1298,8 @@ $lng['serversettings']['phpreload_command']['description'] = 'this is used to re $lng['error']['intvaluetoolow'] = 'The given number is too low (field %s)'; $lng['error']['intvaluetoohigh'] = 'The given number is too high (field %s)'; $lng['admin']['phpfpm_settings'] = 'PHP-FPM'; -$lng['serversettings']['phpfpm'] = 'Enable php-fpm'; +$lng['serversettings']['phpfpm']['title'] = 'Enable php-fpm'; +$lng['serversettings']['phpfpm']['description'] = 'This needs a special webserver configuration see FPM-handbook for Apache2 or nginx'; $lng['serversettings']['phpfpm_settings']['configdir'] = 'Configuration directory of php-fpm'; $lng['serversettings']['phpfpm_settings']['aliasconfigdir'] = 'Configuration Alias-directory of php-fpm'; $lng['serversettings']['phpfpm_settings']['reload'] = 'php-fpm restart command'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 3c6cb5a2..4c26e0f0 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -536,7 +536,7 @@ $lng['panel']['back'] = 'Zurück'; // ADDED IN 1.2.16-svn12 $lng['serversettings']['mod_fcgid']['title'] = 'PHP über mod_fcgid/suexec einbinden'; -$lng['serversettings']['mod_fcgid']['description'] = 'PHP unter dem jeweiligen Useraccount laufen lassen.

Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe FCGID-Handbuch.'; +$lng['serversettings']['mod_fcgid']['description'] = 'PHP wird unter dem Benutzer des Kunden ausgeführt.

Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe FCGID-Handbuch.'; $lng['serversettings']['sendalternativemail']['title'] = 'Alternative E-Mail-Adresse benutzen'; $lng['serversettings']['sendalternativemail']['description'] = 'Während des Erstellens eines Accounts das Passwort an eine andere E-Mail-Adresse senden'; $lng['emails']['alternative_emailaddress'] = 'Alternative E-Mail-Adresse'; @@ -1195,7 +1195,7 @@ $lng['serversettings']['froxlordirectlyviahostname'] = 'Froxlor direkt über den // ADDED IN FROXLOR 0.9.11-svn1 $lng['serversettings']['panel_password_regex']['title'] = 'Regulärer Ausdruck für Passwörter'; -$lng['serversettings']['panel_password_regex']['description'] = 'Hier können Sie einen regulären Ausdruck für Passwort-Komplexität festlegen.
Leer = keine bestimmten Anforderungen
(RegEx Hilfe/Beispiele)'; +$lng['serversettings']['panel_password_regex']['description'] = 'Hier können Sie einen regulären Ausdruck für Passwort-Komplexität festlegen.
Leer = keine bestimmten Anforderungen'; $lng['error']['notrequiredpasswordcomplexity'] = 'Die vorgegebene Passwort-Komplexität wurde nicht erfüllt.
Bitte kontaktieren Sie Ihren Administrator, wenn Sie Fragen zur Komplexitäts-Vorgabe haben.'; // ADDED IN FROXLOR 0.9.11-svn2 @@ -1277,7 +1277,8 @@ $lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benöt $lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld "%s")'; $lng['error']['intvaluetoohigh'] = 'Die angegebene Zahl ist zu groß (Feld "%s")'; $lng['admin']['phpfpm_settings'] = 'PHP-FPM'; -$lng['serversettings']['phpfpm'] = 'Aktiviere php-fpm'; +$lng['serversettings']['phpfpm']['title'] = 'Aktiviere PHP-FPM'; +$lng['serversettings']['phpfpm']['description'] = 'Dies benötigt eine spezielle Webserver-Konfiguration, siehe FPM-Handbuch für Apache2 oder nginx'; $lng['serversettings']['phpfpm_settings']['configdir'] = 'Pfad zu php-fpm-Konfigurationen'; $lng['serversettings']['phpfpm_settings']['aliasconfigdir'] = 'Alias-Ordner der php-fpm Konfiguration'; $lng['serversettings']['phpfpm_settings']['reload'] = 'Kommando zum Neustarten von php-fpm'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index dfb686a3..5073c7e9 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -1179,7 +1179,7 @@ $lng['serversettings']['froxlordirectlyviahostname'] = 'Accedi direttamente a Fr // ADDED IN FROXLOR 0.9.11-svn1 $lng['serversettings']['panel_password_regex']['title'] = 'Espressione per le password'; -$lng['serversettings']['panel_password_regex']['description'] = 'Qui è possibile impostare una espressione regolare per la complessità delle password.
Vuoto = nessun requisito specificato
(aiuto/esempi regex)'; +$lng['serversettings']['panel_password_regex']['description'] = 'Qui è possibile impostare una espressione regolare per la complessità delle password.
Vuoto = nessun requisito specificato'; $lng['error']['notrequiredpasswordcomplexity'] = 'La complessita della password specificata non è soddisfacente.
Si prega di contattare l\'amministratore se avete domande sulla complessità della password'; // ADDED IN FROXLOR 0.9.11-svn2 @@ -1193,7 +1193,7 @@ $lng['serversettings']['perl_path']['description'] = 'Rilevante solo se si utili // ADDED IN FROXLOR 0.9.12-svn1 $lng['admin']['fcgid_settings'] = 'FCGID'; $lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'Abilita FCGID per i vhost Froxlor'; -$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Se attivato, Froxlor verrà eseguito con un utente locale
ATTENZIONE:Questo richiede una configurazione manuale, vedi FCGID - handbook'; +$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Se attivato, Froxlor verrà eseguito con un utente locale
ATTENZIONE:Questo richiede una configurazione manuale, vedi FCGID - handbook'; $lng['admin']['mod_fcgid_user'] = 'Utente locale per FCGID (Froxlor vhost)'; $lng['admin']['mod_fcgid_group'] = 'Gruppo locale per FCGID (Froxlor vhost)';