Merge pull request #464 from zeroadam/ConfigFalse

Update false evaluations
pull/466/head
Hypolite Petovan 2017-12-06 16:31:00 -05:00 committed by GitHub
commit e4b38a30e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 50 deletions

View File

@ -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($fromapp === false)
$fromapp = '';
$fromapp = PConfig::get(local_user(),'fromapp', 'app', '');
$force = intval(PConfig::get(local_user(),'fromapp','force'));
@ -84,24 +82,29 @@ function fromapp_settings(&$a,&$s) {
}
function fromapp_post_hook(&$a,&$item) {
if(! local_user())
return;
if(local_user() != $item['uid'])
return;
$app = PConfig::get(local_user(), 'fromapp', 'app');
$force = intval(PConfig::get(local_user(), 'fromapp','force'));
if(($app === false) || (! strlen($app)))
return;
if(strlen(trim($item['app'])) && (! $force))
function fromapp_post_hook(&$a, &$item)
{
if (! local_user()) {
return;
}
if (local_user() != $item['uid']) {
return;
}
$app = PConfig::get(local_user(), 'fromapp', 'app');
$force = intval(PConfig::get(local_user(), 'fromapp', 'force'));
if (is_null($app) || (! strlen($app))) {
return;
}
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;
}

View File

@ -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,9 +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($notimeline === false)
$notimeline = false;
$notimeline = PConfig::get(local_user(), 'system', 'no_wall_archive_widget', false);
$notimeline_checked = (($notimeline) ? ' checked="checked" ' : '');
@ -63,5 +62,4 @@ function notimeline_settings(&$a,&$s) {
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="notimeline-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}

View File

@ -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,9 +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($numfriends === false)
$numfriends = 24;
$numfriends = PConfig::get(local_user(), 'system', 'display_friend_count', 24);
/* Add some HTML to the existing form */
@ -84,5 +83,4 @@ function numfriends_settings(&$a,&$s) {
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="numfriends-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}

View File

@ -39,32 +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 */
/* Add our stylesheet to the page so we can make our settings look nice */
$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');
if($words === false)
$words = t(':-)') . "\n" . t(':-(') . "\n" . t('lol');
$words = PConfig::get(local_user(), 'qcomment', 'words', t(':-)') . "\n" . t(':-(') . "\n" . t('lol'));
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Quick Comment Settings') . '</h3>';
$s .= '<div id="qcomment-wrapper">';
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Quick Comment Settings') . '</h3>';
$s .= '<div id="qcomment-wrapper">';
$s .= '<div id="qcomment-desc">' . t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
$s .= '<label id="qcomment-label" for="qcomment-words">' . t('Enter quick comments, one per line') . ' </label>';
$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<label id="qcomment-label" for="qcomment-words">' . t('Enter quick comments, one per line') . ' </label>';
$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
$s .= '</div>';
return;
}
function qcomment_addon_settings_post(&$a,&$b) {