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

minors to 8d65c37

Browse source
This commit is contained in:
Ian 2015-07-31 12:34:19 +02:00
parent 8d65c37914
commit b2514ae4fe
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
serendipity_event_autoupdate/serendipity_event_autoupdate.php
View file

@ -114,7 +114,7 @@ class serendipity_event_autoupdate extends serendipity_event {
break; break;
case 'backend_sidebar_entries_event_display_update': case 'backend_sidebar_entries_event_display_update':
if (! (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration'))) { if (!(serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration'))) {
return; return;
} }
if (!extension_loaded('zip')) { if (!extension_loaded('zip')) {
@ -249,7 +249,7 @@ EOS;
} }
} else { } else {
$this->show_message('<p class="msg_error"><span class="icon-error"></span>Unpacking the update failed</p>'); $this->show_message('<p class="msg_error"><span class="icon-error"></span>Unpacking the update failed</p>');
if (true === $this->cleanTemplatesC($nv, false) ) { if (true === $this->cleanTemplatesC($nv, false)) {
$this->show_message('<p class="msg_success"><span class="icon-ok"></span>Cleaning up the failed unpack directory!</p>'); $this->show_message('<p class="msg_success"><span class="icon-ok"></span>Cleaning up the failed unpack directory!</p>');
} }
$this->show_message('<p class="msg_notice"><span class="icon-attention"></span>Please reload this page by F5 to have another try upgrading your Blog successfully!</p>'); $this->show_message('<p class="msg_notice"><span class="icon-attention"></span>Please reload this page by F5 to have another try upgrading your Blog successfully!</p>');
@ -516,7 +516,7 @@ EOS;
foreach ($files as $file) { foreach ($files as $file) {
$target = $serendipity['serendipityPath'] . substr($file, 12); $target = $serendipity['serendipityPath'] . substr($file, 12);
if ((! is_writable($target)) && file_exists($target) ) { if ((!is_writable($target)) && file_exists($target)) {
$notWriteable[] = $target; $notWriteable[] = $target;
} }
} }
@ -601,13 +601,13 @@ EOS;
</div> </div>
</div> </div>
EOS; EOS;
if($terminate) { if ($terminate) {
echo <<<EOS echo <<<EOS
</body> </body>
</html> </html>
EOS; EOS;
} }
if($terminate) die(); if ($terminate) die();
} }
/** /**
@ -626,8 +626,8 @@ EOS;
if (die('<script type="text/javascript">alert("'.$msg.'"); window.location = "'.$serendipity['serendipityHTTPPath'].'";</script>'."\n </body>\n</html>")) { if (die('<script type="text/javascript">alert("'.$msg.'"); window.location = "'.$serendipity['serendipityHTTPPath'].'";</script>'."\n </body>\n</html>")) {
return; return;
} else { } else {
if(!headers_sent()) { if (!headers_sent()) {
if(header('Location: http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'])) exit; if (header('Location: http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'])) exit;
} else { } else {
echo '<script type="text/javascript">'; echo '<script type="text/javascript">';
echo ' window.location.href="' . $serendipity['serendipityHTTPPath'] . '"'; echo ' window.location.href="' . $serendipity['serendipityHTTPPath'] . '"';
@ -674,7 +674,7 @@ EOS;
$zipDir = (string)$serendipity['serendipityPath'] . 'templates_c/' . "serendipity-$version"; $zipDir = (string)$serendipity['serendipityPath'] . 'templates_c/' . "serendipity-$version";
// leave rm zip untouched here as not causing any errors // leave rm zip untouched here as not causing any errors
#unlink($zip);// if(unlink($zip)) { else error note? #unlink($zip);// if (unlink($zip)) { else error note?
#$this->show_message('<p class="msg_success"><span class="icon-ok"></span>Removing the zip file in templates_c done</p>'); #$this->show_message('<p class="msg_success"><span class="icon-ok"></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 // As trying to remove a directory that php is still using, we use open/closedir($handle) to be sure