Update false evaluations

update false to is_null where needed.
pull/464/head
Adam Magness 2017-12-06 16:02:21 -05:00
parent f974346d9a
commit cdc69179fa
4 changed files with 22 additions and 14 deletions

View File

@ -51,7 +51,7 @@ function fromapp_settings(&$a,&$s) {
/* Get the current state of our config variable */ /* Get the current state of our config variable */
$fromapp = PConfig::get(local_user(),'fromapp','app'); $fromapp = PConfig::get(local_user(),'fromapp','app');
if($fromapp === false) if(is_null($fromapp))
$fromapp = ''; $fromapp = '';
$force = intval(PConfig::get(local_user(),'fromapp','force')); $force = intval(PConfig::get(local_user(),'fromapp','force'));
@ -84,24 +84,29 @@ function fromapp_settings(&$a,&$s) {
} }
function fromapp_post_hook(&$a,&$item) { function fromapp_post_hook(&$a,&$item)
if(! local_user()) {
return; if(! local_user()) {
return;
}
if(local_user() != $item['uid']) if(local_user() != $item['uid']) {
return; return;
}
$app = PConfig::get(local_user(), 'fromapp', 'app'); $app = PConfig::get(local_user(), 'fromapp', 'app');
$force = intval(PConfig::get(local_user(), 'fromapp','force')); $force = intval(PConfig::get(local_user(), 'fromapp','force'));
if(($app === false) || (! strlen($app))) if(is_null($app) || (! strlen($app))) {
return;
if(strlen(trim($item['app'])) && (! $force))
return; return;
}
if(strlen(trim($item['app'])) && (! $force)) {
return;
}
$apps = explode(',',$app); $apps = explode(',',$app);
$item['app'] = trim($apps[mt_rand(0,count($apps)-1)]); $item['app'] = trim($apps[mt_rand(0,count($apps)-1)]);
return; return;
} }

View File

@ -45,8 +45,9 @@ function notimeline_settings(&$a,&$s) {
/* Get the current state of our config variable */ /* Get the current state of our config variable */
$notimeline = PConfig::get(local_user(),'system','no_wall_archive_widget'); $notimeline = PConfig::get(local_user(),'system','no_wall_archive_widget');
if($notimeline === false) if(is_null($notimeline)) {
$notimeline = false; $notimeline = false;
}
$notimeline_checked = (($notimeline) ? ' checked="checked" ' : ''); $notimeline_checked = (($notimeline) ? ' checked="checked" ' : '');

View File

@ -69,8 +69,9 @@ function numfriends_settings(&$a,&$s) {
/* Get the current state of our config variable */ /* Get the current state of our config variable */
$numfriends = PConfig::get(local_user(),'system','display_friend_count'); $numfriends = PConfig::get(local_user(),'system','display_friend_count');
if($numfriends === false) if(is_null($numfriends)) {
$numfriends = 24; $numfriends = 24;
}
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */

View File

@ -49,8 +49,9 @@ function qcomment_addon_settings(&$a,&$s) {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
$words = PConfig::get(local_user(),'qcomment','words'); $words = PConfig::get(local_user(),'qcomment','words');
if($words === false) if(is_null($words)) {
$words = t(':-)') . "\n" . t(':-(') . "\n" . t('lol'); $words = t(':-)') . "\n" . t(':-(') . "\n" . t('lol');
}
$s .= '<div class="settings-block">'; $s .= '<div class="settings-block">';
$s .= '<h3>' . t('Quick Comment Settings') . '</h3>'; $s .= '<h3>' . t('Quick Comment Settings') . '</h3>';