And some more places

diff --git a/include/items.php b/include/items.php
index 96340fc12dab18688a3ba8a410d28e89f08491f1..1dae871f8be4988a3df1b6daae324d2966acd9fc 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2021,22 +2021,16 @@ function item_expire($uid, $days, $network = "", $force = false) {
                return;
        }
 
-       $expire_items = PConfig::get($uid, 'expire', 'items');
-       $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1
+       $expire_items = PConfig::get($uid, 'expire', 'items', 1);
 
        // Forcing expiring of items - but not notes and marked items
        if ($force) {
                $expire_items = true;
        }
 
-       $expire_notes = PConfig::get($uid, 'expire', 'notes');
-       $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1
-
-       $expire_starred = PConfig::get($uid, 'expire', 'starred');
-       $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1
-
-       $expire_photos = PConfig::get($uid, 'expire', 'photos');
-       $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0
+       $expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
+       $expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
+       $expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
 
        logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 

diff --git a/mod/group.php b/mod/group.php
index 1646043a9f5791498fc39fa12235b55eb85e0376..5d624e90e43c945cc24cbe8925f8ed4aa3894a93 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -84,11 +84,8 @@ function group_content(App $a) {
        // Switch to text mode interface if we have more than 'n' contacts or group members
 
        $switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
-       if ($switchtotext === false) {
-               $switchtotext = Config::get('system', 'groupedit_image_limit');
-       }
-       if ($switchtotext === false) {
-               $switchtotext = 400;
+       if (is_null($switchtotext)) {
+               $switchtotext = Config::get('system', 'groupedit_image_limit', 400);
        }
 
        $tpl = get_markup_template('group_edit.tpl');

diff --git a/mod/profperm.php b/mod/profperm.php
index 2b3c07526be8dfeb78ac2684e2b5dc4c37a63999..c49fb7f282721434a29ea5d6fe5ac9fec3c9c19a 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -34,11 +34,9 @@ function profperm_content(App $a) {
        // Switch to text mod interface if we have more than 'n' contacts or group members
 
        $switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit');
-       if($switchtotext === false)
-               $switchtotext = Config::get('system','groupedit_image_limit');
-       if($switchtotext === false)
-               $switchtotext = 400;
-
+       if (is_null($switchtotext)) {
+               $switchtotext = Config::get('system','groupedit_image_limit', 400);
+       }
 
        if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
                $r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0

diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 4d89c4a3ff703aa4ca8fa4517b847e7d004ca33a..29fec2c37a503e4dffb9fe5770f779a21b2d242f 100644 (file)
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -5,27 +5,30 @@
 
        $uid = get_theme_uid();
 
-       $color=false;
-       $quattro_align=false;
-       $site_color = Config::get("quattro","color");
-       $site_quattro_align = Config::get("quattro", "align" );
-       
+       $color = false;
+       $quattro_align = false;
+       $site_color = Config::get("quattro", "color", "dark);
+       $site_quattro_align = Config::get("quattro", "align", false);
+
        if ($uid) {
-               $color = PConfig::get( $uid, "quattro","color");
-               $quattro_align = PConfig::get( $uid, 'quattro', 'align' );
-       }
-       
-       if ($color===false) $color=$site_color;
-       if ($color===false) $color="dark";
-       if ($quattro_align===false) $quattro_align=$site_quattro_align;
-       
-               
+               $color = PConfig::get($uid, "quattro", "color");
+               $quattro_align = PConfig::get($uid, 'quattro', 'align');
+       }
+
+       if ($color === false) {
+               $color = $site_color;
+       }
+
+       if ($quattro_align === false) {
+               $quattro_align = $site_quattro_align;
+       }
+
        if (file_exists("$THEMEPATH/$color/style.css")){
                echo file_get_contents("$THEMEPATH/$color/style.css");
        }
 
 
-       if($quattro_align=="center"){
+       if ($quattro_align == "center"){
                echo "
                        html { width: 100%; margin:0px; padding:0px; }
                        body {
@@ -35,27 +38,28 @@
                ";
        }
 
-    
-
-    $textarea_font_size = false;
-    $post_font_size = false;
-    
-    $site_textarea_font_size = Config::get("quattro","tfs");
-    $site_post_font_size = Config::get("quattro","pfs");
-    if ($site_textarea_font_size===false) $site_textarea_font_size="20";
-    if ($site_post_font_size===false) $site_post_font_size="12";
-    
-       if ($uid) {
-        $textarea_font_size = PConfig::get( $uid, "quattro","tfs");
-        $post_font_size = PConfig::get( $uid, "quattro","pfs");    
-       } 
-    
-    if ($textarea_font_size===false) $textarea_font_size = $site_textarea_font_size;
-    if ($post_font_size===false) $post_font_size = $site_post_font_size;
-
-    echo "
-        textarea { font-size: ${textarea_font_size}px; }
-        .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; }
-        #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
-        .wall-item-container .wall-item-content  { font-size: ${post_font_size}px; }
-    ";
\ No newline at end of file
+
+       $textarea_font_size = false;
+       $post_font_size = false;
+
+       $site_textarea_font_size = Config::get("quattro", "tfs", "20");
+       $site_post_font_size = Config::get("quattro", "pfs", "12");
+
+       if ($uid) {
+               $textarea_font_size = PConfig::get($uid, "quattro", "tfs", false);
+               $post_font_size = PConfig::get($uid, "quattro", "pfs", false);
+       }
+
+       if ($textarea_font_size === false) {
+               $textarea_font_size = $site_textarea_font_size;
+       }
+       if ($post_font_size === false) {
+               $post_font_size = $site_post_font_size;
+       }
+
+       echo "
+               textarea { font-size: ${textarea_font_size}px; }
+               .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; }
+               #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
+               .wall-item-container .wall-item-content  { font-size: ${post_font_size}px; }
+       ";