qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

autoupdate 1.2.1: PHP 8 compatibility fixes

Browse source
This commit is contained in:
onli 2021-06-20 11:44:51 +02:00
parent b534dc3976
commit fea268104c
2 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
serendipity_event_autoupdate/ChangeLog
View file

@ -1,3 +1,7 @@
1.2.1:
* PHP 8 compatibility fix: Use language constant loading API,
ski[ dot files when emptying directory
1.2:
* Drop unnecessary time-elapsed messaged and microsleep steps
* Stop if plugins are not current

41
serendipity_event_autoupdate/serendipity_event_autoupdate.php
View file

@ -4,13 +4,7 @@ if (IN_serendipity !== true) {
die ("Don't hack!");
}
// Probe for a language include with constants. Still include defines later on, if some constants were missing
$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
if (file_exists($probelang)) {
include $probelang;
}
include dirname(__FILE__) . '/lang_en.inc.php';
@serendipity_plugin_api::load_language(dirname(__FILE__));
class serendipity_event_autoupdate extends serendipity_event {
var $title = PLUGIN_EVENT_AUTOUPDATE_NAME;
@ -22,7 +16,7 @@ class serendipity_event_autoupdate extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_AUTOUPDATE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'onli, Ian');
$propbag->add('version', '1.2');
$propbag->add('version', '1.2.1');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'php' => '5.2'
@ -633,23 +627,6 @@ EOS;
$msg = "Autoupdate successfully done!\\nWe now refresh to Serendipity Installer!\\n"; // escape for js
$this->show_message('<p class="msg_success"><span class="icon-ok" aria-hidden="true"></span>Autoupdate successfully done - refresh to Serendipity Installer</p>', 'Autoupdate');
//$this->close_page();
//if (die('<script type="text/javascript">alert("'.$msg.'"); window.location = "'.$serendipity['serendipityHTTPPath'].'";</script>'."\n </body>\n</html>")) {
//return;
//} else {
//if (!headers_sent()) {
//if (header('Location: http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'])) exit;
//} else {
//echo '<script type="text/javascript">';
//echo ' window.location.href="' . $serendipity['serendipityHTTPPath'] . '"';
//echo '</script>'."\n";
//echo '<noscript>';
//echo ' <meta http-equiv="refresh" content="0;url=' . $serendipity['serendipityHTTPPath'] . '" />';
//echo '</noscript>';
//exit;
//}
//}
}
/**
@ -659,13 +636,11 @@ EOS;
function empty_dir($dir) {
if (!is_dir($dir)) return;
try {
$_dir = new RecursiveDirectoryIterator($dir);
// NOTE: UnexpectedValueException thrown for PHP >= 5.3
} catch (Exception $e) {
return;
}
$_dir = new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS);
} catch (Exception $e) {
return;
}
$iterator = new RecursiveIteratorIterator($_dir, RecursiveIteratorIterator::CHILD_FIRST);
//$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::CHILD_FIRST);
foreach ($iterator as $file) {
if ($file->isFile()) {
unlink($file->__toString());
@ -685,10 +660,6 @@ EOS;
$zip = (string)$serendipity['serendipityPath'] . 'templates_c/' . "serendipity-$version.zip";
$zipDir = (string)$serendipity['serendipityPath'] . 'templates_c/' . "serendipity-$version";
// leave rm zip untouched here as not causing any errors
#unlink($zip);// if (unlink($zip)) { else error note?
#$this->show_message('<p class="msg_success"><span class="icon-ok" aria-hidden="true"></span>Removing the zip file in templates_c done</p>');
// As trying to remove a directory that php is still using, we use open/closedir($handle) to be sure
if ($handle = opendir($zipDir)) {
$this->empty_dir($zipDir);