[geeklog-cvs] geeklog-1.3/public_html 404.php,1.7,1.8 usersettings.php,1.60,1.61

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

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

Modified Files:
	404.php usersettings.php 
Log Message:
There's no need to display the parameters on the 404 page (and we better filter them anyway).


Index: 404.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/404.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** 404.php	11 May 2002 18:09:07 -0000	1.7
--- 404.php	8 Jun 2003 08:22:07 -0000	1.8
***************
*** 1,12 ****
  <?php
  
! require_once('lib-common.php');
  
! $display = COM_siteHeader('menu');
! $display .= COM_startBlock($LANG_404[1]);
! $display .= $LANG_404[2];
  $display .= $LANG_404[3];
! $display .= COM_endBlock();
! $display .= COM_siteFooter();
  
  echo $display
--- 1,23 ----
  <?php
  
! require_once ('lib-common.php');
  
! $display = COM_siteHeader ('menu');
! $display .= COM_startBlock ($LANG_404[1]);
! if (isset ($HTTP_SERVER_VARS['SCRIPT_URI'])) {
!     $url = strip_tags ($HTTP_SERVER_VARS['SCRIPT_URI']);
! } else {
!     $pos = strpos ($HTTP_SERVER_VARS['REQUEST_URI'], '?');
!     if ($pos === false) {
!         $request = $HTTP_SERVER_VARS['REQUEST_URI'];
!     } else {
!         $request = substr ($HTTP_SERVER_VARS['REQUEST_URI'], 0, $pos);
!     }
!     $url = 'http://' . $HTTP_SERVER_VARS['HTTP_HOST'] . strip_tags ($request);
! }
! $display .= sprintf ($LANG_404[2], $url);
  $display .= $LANG_404[3];
! $display .= COM_endBlock ();
! $display .= COM_siteFooter ();
  
  echo $display

Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** usersettings.php	23 May 2003 11:43:27 -0000	1.60
--- usersettings.php	8 Jun 2003 08:22:07 -0000	1.61
***************
*** 287,298 ****
                  $language_options .= '<option value="' . $file . '"';
                  if ($userlang == $file) {
!                     $language_options .= ' selected="SELECTED"';
                  }
                  $uscore = strpos ($file, '_');
                  if ($uscore !== false) {
!                     $lngname = substr ($file, 0, $uscore);
!                     $lngadd = substr ($file, $uscore + 1);
!                     $lngname = strtoupper ($lngname{0}) . substr ($lngname, 1);
!                     $lngadd = strtoupper ($lngadd{0}) . substr ($lngadd, 1);
                      $file = $lngname . ' (' . $lngadd . ')';
                  } else {
--- 287,296 ----
                  $language_options .= '<option value="' . $file . '"';
                  if ($userlang == $file) {
!                     $language_options .= ' selected="selected"';
                  }
                  $uscore = strpos ($file, '_');
                  if ($uscore !== false) {
!                     $lngname = ucfirst (substr ($file, 0, $uscore));
!                     $lngadd = ucfirst (substr ($file, $uscore + 1));
                      $file = $lngname . ' (' . $lngadd . ')';
                  } else {
***************
*** 323,334 ****
              $selection .= '<option value="' . current ($themes) . '"';
              if ($usertheme == current ($themes)) {
!                 $selection .= ' selected="SELECTED"';
              }
              // some theme name beautifying ...
              $th = str_replace ('_', ' ', current ($themes));
!             if ((strtolower ($th{0}) == $th{0}) &&
!                 (strtolower ($th{1}) == $th{1})) {
!                 $th = strtoupper ($th{0}) . substr ($th, 1);
!             }
              $selection .= '>' . $th . '</option>' . LB;
              next ($themes);
--- 321,329 ----
              $selection .= '<option value="' . current ($themes) . '"';
              if ($usertheme == current ($themes)) {
!                 $selection .= ' selected="selected"';
              }
              // some theme name beautifying ...
              $th = str_replace ('_', ' ', current ($themes));
!             $th = ucwords ($th);
              $selection .= '>' . $th . '</option>' . LB;
              next ($themes);