[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.691,1.692

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv98201/public_html

Modified Files:
	lib-common.php 
Log Message:
Revert earlier change - COM_showMessage should be restricted to fixed predefined messages


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.691
retrieving revision 1.692
diff -C2 -d -r1.691 -r1.692
*** lib-common.php	26 Apr 2008 17:58:37 -0000	1.691
--- lib-common.php	1 May 2008 15:43:16 -0000	1.692
***************
*** 4403,4408 ****
  * Displays a message on the webpage
  *
! * Receives either a message number and gets the according message from the
! * language file or gets a message in cleartext and displays it then to the user
  *
  * @param      int     $msg        ID of message to show
--- 4403,4408 ----
  * Displays a message on the webpage
  *
! * Pulls $msg off the URL string and gets the corresponding message and returns
! * it for display on the calling page
  *
  * @param      int     $msg        ID of message to show
***************
*** 4417,4444 ****
      $retval = '';
  
!     $timestamp = strftime( $_CONF['daytime'] );
!     if($msg > 0) {
!         if(!empty($plugin)) {
              $var = 'PLG_' . $plugin . '_MESSAGE' . $msg;
              global $$var;
!             if(isset($$var)) {
                  $message = $$var;
              } else {
!                 $message = sprintf( $MESSAGE[61], $plugin );
!                 COM_errorLog ($MESSAGE[61]. ": " . $var,1);
              }
          } else {
              $message = $MESSAGE[$msg];
          }
!     } else if (strlen($msg) > 0) {
!         $message = $msg;
      }
-     $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
-                        COM_getBlockTemplate( '_msg_block', 'header' ))
-         . '<p><img src="' . $_CONF['layout_url']
-         . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" '
-         . 'style="padding-right:5px; padding-bottom:3px; border:none; float:left;"' . XHTML . '>'
-         . $message . '</p>'
-         . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
  
      return $retval;
--- 4417,4443 ----
      $retval = '';
  
!     if ($msg > 0) {
!         $timestamp = strftime($_CONF['daytime']);
!         if (!empty($plugin)) {
              $var = 'PLG_' . $plugin . '_MESSAGE' . $msg;
              global $$var;
!             if (isset($$var)) {
                  $message = $$var;
              } else {
!                 $message = sprintf($MESSAGE[61], $plugin);
!                 COM_errorLog($MESSAGE[61] . ": " . $var, 1);
              }
          } else {
              $message = $MESSAGE[$msg];
          }
! 
!         $retval .= COM_startBlock($MESSAGE[40] . ' - ' . $timestamp, '',
!                                   COM_getBlockTemplate('_msg_block', 'header'))
!                 . '<p><img src="' . $_CONF['layout_url']
!                 . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" '
!                 . 'style="padding-right:5px; padding-bottom:3px; border:none; float:left;"' . XHTML . '>'
!                 . $message . '</p>'
!                 . COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
      }
  
      return $retval;