[geeklog-cvs] geeklog-1.3/public_html usersettings.php,1.88,1.89 lib-common.php,1.277,1.278

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv18573

Modified Files:
	usersettings.php lib-common.php 
Log Message:
Fixed bold display of "default blocks" in the user's preferences (actually only replaced one hack with another ...).


Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** usersettings.php	1 Feb 2004 10:49:12 -0000	1.88
--- usersettings.php	1 Feb 2004 17:34:25 -0000	1.89
***************
*** 567,571 ****
      $whereblock .= "((type != 'layout' AND type != 'gldefault' AND is_enabled = 1) OR (type = 'gldefault' AND is_enabled = 1 AND name IN ('whats_new_block','poll_block','events_block','older_stories'))) ORDER BY onleft desc,blockorder,title";
      $preferences->set_var ('boxes_checklist', COM_checkList ($_TABLES['blocks'],
!             'bid,title,blockorder', $whereblock, $selectedblocks));
      $preferences->parse ('boxes_block', 'boxes', true);
  
--- 567,571 ----
      $whereblock .= "((type != 'layout' AND type != 'gldefault' AND is_enabled = 1) OR (type = 'gldefault' AND is_enabled = 1 AND name IN ('whats_new_block','poll_block','events_block','older_stories'))) ORDER BY onleft desc,blockorder,title";
      $preferences->set_var ('boxes_checklist', COM_checkList ($_TABLES['blocks'],
!             'bid,title,type', $whereblock, $selectedblocks));
      $preferences->parse ('boxes_block', 'boxes', true);
  

Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.277
retrieving revision 1.278
diff -C2 -d -r1.277 -r1.278
*** lib-common.php	1 Feb 2004 11:04:31 -0000	1.277
--- lib-common.php	1 Feb 2004 17:34:25 -0000	1.278
***************
*** 1283,1287 ****
          $A = DB_fetchArray( $result );
  
!         if( $table == 'topics' AND SEC_hasTopicAccess( $A['tid'] ) == 0 )
          {
              $access = false;
--- 1283,1287 ----
          $A = DB_fetchArray( $result );
  
!         if( $table == $_TABLES['topics'] AND SEC_hasTopicAccess( $A['tid'] ) == 0 )
          {
              $access = false;
***************
*** 1296,1304 ****
                  if( $A[0] == $S[$x] )
                  {
!                     $retval .= ' checked="CHECKED"';
                  }
              }
  
!             if( isset( $A[2] ) && ( $A[2] < 10 && $A[2] > 0 ))
              {
                  $retval .= '><b>' . stripslashes( $A[1] ) . '</b><br>' . LB;
--- 1296,1304 ----
                  if( $A[0] == $S[$x] )
                  {
!                     $retval .= ' checked="checked"';
                  }
              }
  
!             if(( $table == $_TABLES['blocks'] ) && isset( $A[2] ) && ( $A[2] == 'gldefault' ))
              {
                  $retval .= '><b>' . stripslashes( $A[1] ) . '</b><br>' . LB;