From e1bb463ba945db3f05766651204bd8872fc255bf Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Wed, 6 Dec 2017 16:27:55 -0500 Subject: [PATCH] Default param use that default parameter!!! --- fromapp/fromapp.php | 22 ++++++++++------------ notimeline/notimeline.php | 13 +++++-------- numfriends/numfriends.php | 13 +++++-------- qcomment/qcomment.php | 37 +++++++++++++++++-------------------- 4 files changed, 37 insertions(+), 48 deletions(-) diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 2828f500d..51392ff57 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -50,9 +50,7 @@ function fromapp_settings(&$a,&$s) { /* Get the current state of our config variable */ - $fromapp = PConfig::get(local_user(),'fromapp','app'); - if(is_null($fromapp)) - $fromapp = ''; + $fromapp = PConfig::get(local_user(),'fromapp', 'app', ''); $force = intval(PConfig::get(local_user(),'fromapp','force')); @@ -84,29 +82,29 @@ function fromapp_settings(&$a,&$s) { } -function fromapp_post_hook(&$a,&$item) +function fromapp_post_hook(&$a, &$item) { - if(! local_user()) { + if (! local_user()) { return; } - if(local_user() != $item['uid']) { + if (local_user() != $item['uid']) { return; } - $app = PConfig::get(local_user(), 'fromapp', 'app'); - $force = intval(PConfig::get(local_user(), 'fromapp','force')); + $app = PConfig::get(local_user(), 'fromapp', 'app'); + $force = intval(PConfig::get(local_user(), 'fromapp', 'force')); - if(is_null($app) || (! strlen($app))) { + if (is_null($app) || (! strlen($app))) { return; } - if(strlen(trim($item['app'])) && (! $force)) { + if (strlen(trim($item['app'])) && (! $force)) { return; } - $apps = explode(',',$app); - $item['app'] = trim($apps[mt_rand(0,count($apps)-1)]); + $apps = explode(',', $app); + $item['app'] = trim($apps[mt_rand(0, count($apps)-1)]); return; } diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index 8f0727183..dcf969354 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -33,10 +33,11 @@ function notimeline_settings_post($a,$post) { info( t('No Timeline settings updated.') . EOL); } -function notimeline_settings(&$a,&$s) { - - if(! local_user()) +function notimeline_settings(&$a, &$s) +{ + if (! local_user()) { return; + } /* Add our stylesheet to the page so we can make our settings look nice */ @@ -44,10 +45,7 @@ function notimeline_settings(&$a,&$s) { /* Get the current state of our config variable */ - $notimeline = PConfig::get(local_user(),'system','no_wall_archive_widget'); - if(is_null($notimeline)) { - $notimeline = false; - } + $notimeline = PConfig::get(local_user(), 'system', 'no_wall_archive_widget', false); $notimeline_checked = (($notimeline) ? ' checked="checked" ' : ''); @@ -64,5 +62,4 @@ function notimeline_settings(&$a,&$s) { /* provide a submit button */ $s .= '
'; - } diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index b6d302d58..98295bfbb 100755 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -57,10 +57,11 @@ function numfriends_settings_post($a,$post) { -function numfriends_settings(&$a,&$s) { - - if(! local_user()) +function numfriends_settings(&$a, &$s) +{ + if (! local_user()) { return; + } /* Add our stylesheet to the page so we can make our settings look nice */ @@ -68,10 +69,7 @@ function numfriends_settings(&$a,&$s) { /* Get the current state of our config variable */ - $numfriends = PConfig::get(local_user(),'system','display_friend_count'); - if(is_null($numfriends)) { - $numfriends = 24; - } + $numfriends = PConfig::get(local_user(), 'system', 'display_friend_count', 24); /* Add some HTML to the existing form */ @@ -85,5 +83,4 @@ function numfriends_settings(&$a,&$s) { /* provide a submit button */ $s .= '
'; - } diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 2a44fcb09..f4b951843 100755 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -39,33 +39,30 @@ function qcomment_uninstall() { -function qcomment_addon_settings(&$a,&$s) { - - if(! local_user()) +function qcomment_addon_settings(&$a, &$s) +{ + if (! local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - $a->page['htmlhead'] .= '' . "\r\n"; - - $words = PConfig::get(local_user(),'qcomment','words'); - if(is_null($words)) { - $words = t(':-)') . "\n" . t(':-(') . "\n" . t('lol'); } - $s .= '
'; - $s .= '

' . t('Quick Comment Settings') . '

'; - $s .= '
'; - $s .= '
' . t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '
'; - $s .= ''; - $s .= ''; - $s .= '
'; + /* Add our stylesheet to the page so we can make our settings look nice */ - $s .= '
'; + $a->page['htmlhead'] .= '' . "\r\n"; + + $words = PConfig::get(local_user(), 'qcomment', 'words', t(':-)') . "\n" . t(':-(') . "\n" . t('lol')); + + $s .= '
'; + $s .= '

' . t('Quick Comment Settings') . '

'; + $s .= '
'; + $s .= '
' . t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; $s .= '
'; return; - } function qcomment_addon_settings_post(&$a,&$b) {