harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow mailsent update locking to unlock after 24 hours. Also don't even try to do a DB update if the build number is 0. Something else will likely fail and likely in some horrible way, but we shouldn't try and update the DB - something is clearly wrong with it.

Browse Source
This commit is contained in:
friendica 2013-10-30 20:25:10 -07:00
parent bba188eae3
commit 39318e299e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
boot.php
View File

@ -1174,7 +1174,7 @@ function is_ajax() {
function check_config(&$a) { function check_config(&$a) {
$build = get_config('system','db_version'); $build = get_config('system','db_version');
if(! x($build)) if(! intval($build))
$build = set_config('system','db_version',DB_UPDATE_VERSION); $build = set_config('system','db_version',DB_UPDATE_VERSION);
$saved = get_config('system','urlverify'); $saved = get_config('system','urlverify');
@ -1207,6 +1207,10 @@ function check_config(&$a) {
if($build != DB_UPDATE_VERSION) { if($build != DB_UPDATE_VERSION) {
$stored = intval($build); $stored = intval($build);
if(! $stored) {
logger('Critical: check_config unable to determine database schema version');
return;
}
$current = intval(DB_UPDATE_VERSION); $current = intval(DB_UPDATE_VERSION);
if(($stored < $current) && file_exists('install/update.php')) { if(($stored < $current) && file_exists('install/update.php')) {
@ -1242,10 +1246,13 @@ function check_config(&$a) {
// Prevent sending hundreds of thousands of emails by creating // Prevent sending hundreds of thousands of emails by creating
// a lockfile. view/tpl/smarty3 is the only place we can // a lockfile. view/tpl/smarty3 is the only place we can
// guarantee the server can write to. // guarantee the server can write to.
if (file_exists('view/tpl/smarty3/mailsent')) $lockfile = 'view/tpl/smarty3/mailsent';
if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400)))
return; return;
@unlink($lockfile);
//send the administrator an e-mail //send the administrator an e-mail
file_put_contents('view/tpl/smarty3/mailsent', $x); file_put_contents($lockfile, $x);
$email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_tpl = get_intltext_template("update_fail_eml.tpl");
$email_msg = replace_macros($email_tpl, array( $email_msg = replace_macros($email_tpl, array(