Sync: Drop netmirror from spartacus

This commit is contained in:
onli 2018-03-28 21:09:53 +02:00
parent 270c370c2a
commit b0fb8d2d12

View File

@ -27,7 +27,7 @@ class serendipity_event_spartacus extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_SPARTACUS_DESC); $propbag->add('description', PLUGIN_EVENT_SPARTACUS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '2.37.3'); $propbag->add('version', '2.37.4');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.6', 'serendipity' => '1.6',
)); ));
@ -81,45 +81,32 @@ class serendipity_event_spartacus extends serendipity_event
static $mirror = array( static $mirror = array(
'xml' => array( 'xml' => array(
'github.com', 'github.com',
'Netmirror.org', 's9y.org',
's9y.org'
// 'openmirror.org'
), ),
'files' => array( 'files' => array(
'github.com', 'github.com',
'Netmirror.org',
'SourceForge.net', 'SourceForge.net',
's9y.org' 's9y.org'
// 'BerliOS.de (inactive)',
// 'openmirror.org'
) )
); );
static $http = array( static $http = array(
'xml' => array( 'xml' => array(
'https://raw.github.com/s9y/additional_plugins/master/', 'https://raw.github.com/s9y/additional_plugins/master/',
'http://netmirror.org/mirror/serendipity/', 'http://s9y.org/mirror/',
'http://s9y.org/mirror/'
// 'http://openmirror.org/pub/s9y/',
), ),
'files' => array( 'files' => array(
'https://raw.github.com/s9y/', 'https://raw.github.com/s9y/',
'http://netmirror.org/mirror/serendipity/',
'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/', 'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/',
'http://s9y.org/mirror/' 'http://s9y.org/mirror/',
// 'http://svn.berlios.de/viewcvs/serendipity/',
// 'http://openmirror.org/pub/s9y/',
), ),
'files_health' => array( 'files_health' => array(
'https://raw.github.com/' => 'https://raw.github.com/',
'http://netmirror.org/' => 'http://netmirror.org/mirror/serendipity/last.txt',
'http://php-blog.cvs.sourceforge.net/' => 'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/serendipity/docs/LICENSE', 'http://php-blog.cvs.sourceforge.net/' => 'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/serendipity/docs/LICENSE',
'http://s9y.org/' => 'http://s9y.org/' 'http://s9y.org/' => 'http://s9y.org/',
// 'http://svn.berlios.de/' => 'http://svn.berlios.de/viewcvs/serendipity/', 'https://raw.github.com/' => 'https://raw.github.com/',
// 'http://openmirror.org/' => 'http://openmirror.org/pub/s9y/last.txt',
) )
); );
@ -611,6 +598,9 @@ class serendipity_event_spartacus extends serendipity_event
} else { } else {
$mirror = $mirrors[$this->get_config('mirror_xml', 0)]; $mirror = $mirrors[$this->get_config('mirror_xml', 0)];
if ($mirror == null) {
$mirror = $mirrors[0];
}
$url = $mirror . '/package_' . $url_type . $lang . '.xml'; $url = $mirror . '/package_' . $url_type . $lang . '.xml';
$cacheTimeout = 60*60*12; // XML file is cached for half a day $cacheTimeout = 60*60*12; // XML file is cached for half a day
$target = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/package_' . $url_type . $lang . '.xml'; $target = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/package_' . $url_type . $lang . '.xml';
@ -1012,7 +1002,9 @@ class serendipity_event_spartacus extends serendipity_event
$mirrors = $this->getMirrors('files', true); $mirrors = $this->getMirrors('files', true);
$mirror = $mirrors[$this->get_config('mirror_files', 0)]; $mirror = $mirrors[$this->get_config('mirror_files', 0)];
if ($mirror == null) {
$mirror = $mirrors[0];
}
$custom = $this->get_config('custommirror'); $custom = $this->get_config('custommirror');
if (strlen($custom) > 2) { if (strlen($custom) > 2) {
$servers = explode('|', $custom); $servers = explode('|', $custom);