keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix notification msgs

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-15 22:43:42 -07:00
parent 35e29e10e6
commit 4bcf380296
2 changed files with 55 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
boot.php
View file

@ -167,36 +167,31 @@ function system_unavailable() {
if(! function_exists('check_config')) { if(! function_exists('check_config')) {
function check_config(&$a) { function check_config(&$a) {
$r = q("SELECT * FROM `config` WHERE `cat` = 'system' AND `k` IN ('url','build')");
if(! count($r)) {
q("INSERT INTO `config` (`cat`,`k`,`v`) VALUES ( 'system', 'url', '%s' )",
dbesc($a->get_baseurl())
);
q("INSERT INTO `config` (`cat`,`k`,`v`) VALUES ( 'system', 'build', '%s' )",
dbesc(BUILD_ID)
);
return;
}
foreach($r as $rr) {
if($rr['k'] == 'build') {
$stored = intval($rr['v']);
$current = intval(BUILD_ID);
if(($stored < $current) && file_exists('update.php')) {
// We're reporting a different version than what is currently installed. $build = get_config('system','build');
// Run any existing update scripts to bring the database up to current. if(! x($build))
$build = set_config('system','build',BUILD_ID);
require_once('update.php'); $url = get_config('system','url');
for($x = $stored; $x <= $current; $x ++) { if(! x($url))
if(function_exists('update_' . $x)) { $url = set_config('system','url',$a->get_baseurl());
$func = 'update_' . $x;
$func($a); if($build != BUILD_ID) {
} $stored = intval($build);
$current = intval(BUILD_ID);
if(($stored < $current) && file_exists('update.php')) {
// We're reporting a different version than what is currently installed.
// Run any existing update scripts to bring the database up to current.
require_once('update.php');
for($x = $stored; $x <= $current; $x ++) {
if(function_exists('update_' . $x)) {
$func = 'update_' . $x;
$func($a);
} }
q("UPDATE `config` SET `v` = '%s' WHERE `cat` = 'system' AND `k` = 'build' LIMIT 1",
dbesc(BUILD_ID)
);
} }
set_config('system','build', BUILD_ID);
} }
} }
return; return;
@ -546,3 +541,36 @@ function sanitise_acl(&$item) {
else else
unset($item); unset($item);
}} }}
if(! function_exists('get_config')) {
function get_config($family,$key) {
$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($family),
dbesc($key)
);
if(count($ret))
return $ret[0]['v'];
return false;
}}
if(! function_exists('set_config')) {
function set_config($family,$key,$value) {
if(get_config($family,$key) === false) {
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family),
dbesc($key),
dbesc($value)
);
if($ret)
return $value;
return $ret;
}
$ret = q("SUPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($value),
dbesc($family),
dbesc($key)
);
if($ret)
return $value;
return $ret;
}}

2
mod/notifications.php
View file

@ -27,7 +27,7 @@ function notifications_post(&$a) {
notice( t('Invalid request identifier.') . EOL); notice( t('Invalid request identifier.') . EOL);
return; return;
} }
if($_POST['submit'] == t('Discard'() { if($_POST['submit'] == t('Discard')) {
$r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", intval($intro_id)); $r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", intval($intro_id));
$r = q("DELETE `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("DELETE `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($request_id), intval($request_id),