[geeklog-cvs] geeklog-1.3/public_html/admin moderation.php,1.37,1.38

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv12894/admin

Modified Files:
	moderation.php 
Log Message:
Changed the block headers and footers to call COM_getBlockTemplate().


Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** moderation.php	25 Apr 2003 09:07:02 -0000	1.37
--- moderation.php	16 Jun 2003 18:00:31 -0000	1.38
***************
*** 58,62 ****
                                          'ccitem' => 'ccitem.thtml'));
      
!     $retval .= COM_startBlock($LANG29[34]);
  
      if (SEC_hasRights('story.edit')) {
--- 58,63 ----
                                          'ccitem' => 'ccitem.thtml'));
      
!     $retval .= COM_startBlock ($LANG29[34], '',
!                                COM_getBlockTemplate ('_admin_block', 'header'));
  
      if (SEC_hasRights('story.edit')) {
***************
*** 136,140 ****
      $retval .= $admin_templates->parse('output','cc');
  
!     $retval .= COM_endBlock();
  		
      if (SEC_hasRights('story.moderate')) {
--- 137,141 ----
      $retval .= $admin_templates->parse('output','cc');
  
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  		
      if (SEC_hasRights('story.moderate')) {
***************
*** 179,188 ****
      switch ($type) {
      case 'event':
!         $retval .= COM_startBlock($LANG29[37],'cceventsubmission.html');
          $sql = "SELECT eid AS id,title,datestart as day,url FROM {$_TABLES['eventsubmission']} ORDER BY datestart ASC";
          $H = array($LANG29[10],$LANG29[11],$LANG29[12]);
          break;
      case 'link':
!         $retval .= COM_startBlock($LANG29[36],'cclinksubmission.html');
          $sql = "SELECT lid AS id,title,category,url FROM {$_TABLES['linksubmission']} ORDER BY title ASC";
          $H = array($LANG29[10],$LANG29[13],$LANG29[12]);
--- 180,191 ----
      switch ($type) {
      case 'event':
!         $retval .= COM_startBlock ($LANG29[37], 'cceventsubmission.html',
!                 COM_getBlockTemplate ('_admin_block', 'header'));
          $sql = "SELECT eid AS id,title,datestart as day,url FROM {$_TABLES['eventsubmission']} ORDER BY datestart ASC";
          $H = array($LANG29[10],$LANG29[11],$LANG29[12]);
          break;
      case 'link':
!         $retval .= COM_startBlock ($LANG29[36], 'cclinksubmission.html',
!                 COM_getBlockTemplate ('_admin_block', 'header'));
          $sql = "SELECT lid AS id,title,category,url FROM {$_TABLES['linksubmission']} ORDER BY title ASC";
          $H = array($LANG29[10],$LANG29[13],$LANG29[12]);
***************
*** 196,202 ****
                  $plugin = $function();
                  if (!empty($plugin->submissionhelpfile)) {
!                     $retval .= COM_startBlock($plugin->submissionlabel, $plugin->submissionhelpfile);
                  } else {
!                     $retval .= COM_startBlock($plugin->submissionlabel);
                  }
                  $sql = $plugin->getsubmissionssql;
--- 199,208 ----
                  $plugin = $function();
                  if (!empty($plugin->submissionhelpfile)) {
!                     $retval .= COM_startBlock ($plugin->submissionlabel,
!                             $plugin->submissionhelpfile,
!                             COM_getBlockTemplate ('_admin_block', 'header'));
                  } else {
!                     $retval .= COM_startBlock ($plugin->submissionlabel, '',
!                             COM_getBlockTemplate ('_admin_block', 'header'));
                  }
                  $sql = $plugin->getsubmissionssql;
***************
*** 206,210 ****
              }
          } else {
!             $retval .= COM_startBlock($LANG29[35],'ccstorysubmission.html');
              $sql = "SELECT sid AS id,title,UNIX_TIMESTAMP(date) AS day,tid FROM {$_TABLES['storysubmission']} ORDER BY date ASC";
              $H =  array($LANG29[10],$LANG29[14],$LANG29[15]);
--- 212,217 ----
              }
          } else {
!             $retval .= COM_startBlock ($LANG29[35], 'ccstorysubmission.html',
!                     COM_getBlockTemplate ('_admin_block', 'header'));
              $sql = "SELECT sid AS id,title,UNIX_TIMESTAMP(date) AS day,tid FROM {$_TABLES['storysubmission']} ORDER BY date ASC";
              $H =  array($LANG29[10],$LANG29[14],$LANG29[15]);
***************
*** 276,280 ****
      }
  
!     $retval .= COM_endBlock();
  
      return $retval;
--- 283,287 ----
      }
  
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
***************
*** 293,297 ****
      global $_TABLES, $_CONF, $LANG29;
  
!     $retval .= COM_startBlock ($LANG29[40]);
      $emptypwd = md5('');
      $result = DB_query ("SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE passwd = '$emptypwd'");
--- 300,305 ----
      global $_TABLES, $_CONF, $LANG29;
  
!     $retval .= COM_startBlock ($LANG29[40], '',
!                                COM_getBlockTemplate ('_admin_block', 'header'));
      $emptypwd = md5('');
      $result = DB_query ("SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE passwd = '$emptypwd'");
***************
*** 330,334 ****
          }
      }
!     $retval .= COM_endBlock ();
  
      return $retval;
--- 338,342 ----
          }
      }
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
***************
*** 347,351 ****
      global $_TABLES, $_CONF, $LANG24, $LANG29;
  
!     $retval .= COM_startBlock ($LANG29[35] . ' (' . $LANG24[34] . ')');
      $result = DB_query ("SELECT sid AS id,title,UNIX_TIMESTAMP(date) AS day,tid FROM {$_TABLES['stories']} WHERE (draft_flag = 1)" . COM_getPermSQL ('AND', 0, 3) . " ORDER BY date ASC");
      $nrows = DB_numRows($result);
--- 355,360 ----
      global $_TABLES, $_CONF, $LANG24, $LANG29;
  
!     $retval .= COM_startBlock ($LANG29[35] . ' (' . $LANG24[34] . ')', '',
!             COM_getBlockTemplate ('_admin_block', 'header'));
      $result = DB_query ("SELECT sid AS id,title,UNIX_TIMESTAMP(date) AS day,tid FROM {$_TABLES['stories']} WHERE (draft_flag = 1)" . COM_getPermSQL ('AND', 0, 3) . " ORDER BY date ASC");
      $nrows = DB_numRows($result);
***************
*** 384,388 ****
          }
      }
!     $retval .= COM_endBlock ();
  
      return $retval;
--- 393,397 ----
          }
      }
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;