maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-08 10:22:21 +01:00
parent 0c0c8c63a7 dde6581f9c
commit 0f80e66a01
10 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ajax.php
View File

@@ -31,9 +31,10 @@ if ($action == "newsfeed") {
die();
}
// get version
require './tables.inc.php';
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);
@@ -43,6 +44,7 @@ if ($action == "newsfeed") {
$news = simplexml_load_string(trim($output));
} else {
if (ini_get('allow_url_fopen')) {
ini_set('user_agent', 'Froxlor/'.$version);
$news = simplexml_load_file($feed, null, LIBXML_NOCDATA);
} else {
$news = false;

2
lib/tables.inc.php
View File

@@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
define('TABLE_DOMAINTOIP', 'panel_domaintoip');
// VERSION INFO
$version = '0.9.31-rc1';
$version = '0.9.31-rc2';
$dbversion = '2';
$branding = '';