[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.660,1.661

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv83181

Modified Files:
	lib-common.php 
Log Message:
simplify function

Index: lib-common.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.660
retrieving revision 1.661
diff -C2 -d -r1.660 -r1.661
*** lib-common.php	10 Oct 2007 01:24:31 -0000	1.660
--- lib-common.php	10 Oct 2007 01:56:00 -0000	1.661
***************
*** 4326,4330 ****
  
      $retval = '';
! 
      if($msg > 0) {
          if(!empty($plugin)) {
--- 4326,4330 ----
  
      $retval = '';
!     $timestamp = strftime( $_CONF['daytime'] );
      if($msg > 0) {
          if(!empty($plugin)) {
***************
*** 4340,4362 ****
              $message = $MESSAGE[$msg];
          }
- 
-         $timestamp = strftime( $_CONF['daytime'] );
-         $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
-                            COM_getBlockTemplate( '_msg_block', 'header' ))
-             . '<p style="padding:5px"><img src="' . $_CONF['layout_url']
-             . '/images/sysmessage.' . $_IMAGE_TYPE . '" border="0" align="left"'
-             . ' alt="" style="padding-right:5px; padding-bottom:3px">'
-             . $message . '</p>'
-             . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
      } else if (strlen($msg) > 0) {
!         $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
!                            COM_getBlockTemplate( '_msg_block', 'header' ))
!             . '<p style="padding:5px"><img src="' . $_CONF['layout_url']
!             . '/images/sysmessage.' . $_IMAGE_TYPE . '" border="0" align="left"'
!             . ' alt="" style="padding-right:5px; padding-bottom:3px">'
!             . $msg . '</p>'
!             . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
      }
! 
      return $retval;
  }
--- 4340,4353 ----
              $message = $MESSAGE[$msg];
          }
      } else if (strlen($msg) > 0) {
!         $message = $msg;
      }
!     $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
!                        COM_getBlockTemplate( '_msg_block', 'header' ))
!         . '<p style="padding:5px"><img src="' . $_CONF['layout_url']
!         . '/images/sysmessage.' . $_IMAGE_TYPE . '" border="0" align="left"'
!         . ' alt="" style="padding-right:5px; padding-bottom:3px">'
!         . $msg . '</p>'
!         . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
      return $retval;
  }