[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.5, 1.6 conversion.class.php, 1.2, 1.3 downloader.class.php, 1.13, 1.14 navbar.class.php, 1.3, 1.4 search.class.php, 1.62, 1.63 story.class.php, 1.17, 1.18 template.class.php, 1.7, 1.8 upload.class.php, 1.49, 1.50

Oliver ospiess at qs1489.pair.com
Sun Nov 25 01:59:58 EST 2007


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

Modified Files:
	config.class.php conversion.class.php downloader.class.php 
	navbar.class.php search.class.php story.class.php 
	template.class.php upload.class.php 
Log Message:
XHTML optional updates

Index: search.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** search.class.php	6 May 2007 19:20:19 -0000	1.62
--- search.class.php	25 Nov 2007 06:59:56 -0000	1.63
***************
*** 503,506 ****
--- 503,507 ----
          $searchmain = new Template ($_CONF['path_layout'] . 'search');
          $searchmain->set_file(array ('searchresults' => 'searchresults.thtml'));
+         $searchmain->set_var ( 'xhtml', XHTML );
          $searchmain->set_var ('num_matches', '');
  
***************
*** 527,530 ****
--- 528,532 ----
          $cur_plugin = new Plugin();
          $searchresults = new Template($_CONF['path_layout'] . 'search');
+         $searchresults->set_var( 'xhtml', XHTML );
  
          $maxdisplayed = 0;
***************
*** 602,606 ****
                  if ($cur_plugin->num_searchresults == 0) {
                      $searchresults->set_var('results',
!                             '<tr><td colspan="4" align="center"><br>'
                              . $LANG09[31] . '</td></tr>');
                  }
--- 604,608 ----
                  if ($cur_plugin->num_searchresults == 0) {
                      $searchresults->set_var('results',
!                             '<tr><td colspan="4" align="center"><br' . XHTML . '>'
                              . $LANG09[31] . '</td></tr>');
                  }
***************
*** 735,738 ****
--- 737,741 ----
          $login = new Template($_CONF['path_layout'] . 'submit');
          $login->set_file (array ('login'=>'submitloginrequired.thtml'));
+         $login->set_var ( 'xhtml', XHTML );
          $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
***************
*** 831,834 ****
--- 834,838 ----
          $searchform->set_file (array ('searchform' => 'searchform.thtml',
                                        'authors'    => 'searchauthors.thtml'));
+         $searchform->set_var( 'xhtml', XHTML );
          $searchform->set_var('search_intro', $LANG09[19]);
          $searchform->set_var('site_url', $_CONF['site_url']);
***************
*** 942,950 ****
                  $searchform->parse('author_form_element', 'authors', true);
              } else {
!                 $searchform->set_var('author_form_element', '<input type="hidden" name="author" value="0">');
              }
          } else {
              $searchform->set_var ('author_form_element',
!                     '<input type="hidden" name="author" value="0">');
          }
          $searchform->set_var('lang_search', $LANG09[10]);
--- 946,954 ----
                  $searchform->parse('author_form_element', 'authors', true);
              } else {
!                 $searchform->set_var('author_form_element', '<input type="hidden" name="author" value="0"' . XHTML . '>');
              }
          } else {
              $searchform->set_var ('author_form_element',
!                     '<input type="hidden" name="author" value="0"' . XHTML . '>');
          }
          $searchform->set_var('lang_search', $LANG09[10]);

Index: navbar.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/navbar.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** navbar.class.php	9 Sep 2006 14:41:53 -0000	1.3
--- navbar.class.php	25 Nov 2007 06:59:56 -0000	1.4
***************
*** 151,154 ****
--- 151,155 ----
              'menuitem'     => 'menuitem.thtml'));
  
+         $navtemplate->set_var( 'xhtml', XHTML );
          if ($this->_parms != '') {
              $navtemplate->set_var( 'parms',  $this->_parms);
***************
*** 159,163 ****
              $linkurl = current($this->_menuitems);
              if ( is_array($this->_onclick) AND array_key_exists($label,$this->_onclick) ) {
!                 $onclick = " onClick='{$this->_onclick[$label]}'";
                  $navtemplate->set_var( 'onclick', $onclick);
                  $navtemplate->set_var( 'link', ($linkurl == '') ? '#' : $linkurl);
--- 160,164 ----
              $linkurl = current($this->_menuitems);
              if ( is_array($this->_onclick) AND array_key_exists($label,$this->_onclick) ) {
!                 $onclick = " onclick='{$this->_onclick[$label]}'";
                  $navtemplate->set_var( 'onclick', $onclick);
                  $navtemplate->set_var( 'link', ($linkurl == '') ? '#' : $linkurl);
***************
*** 188,191 ****
--- 189,193 ----
              'breadcrumbs'   => 'breadcrumbs.thtml',
              'link'          => 'breadcrumb_link.thtml'));
+         $this->_bctemplate->set_var( 'xhtml', XHTML );
      }
      

Index: config.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.class.php	12 Oct 2007 03:33:08 -0000	1.5
--- config.class.php	25 Nov 2007 06:59:56 -0000	1.6
***************
*** 326,329 ****
--- 326,330 ----
          $t = new Template($GLOBALS['_CONF']['path_layout'] . 'admin/config');
          $t->set_file('main','configuration.thtml');
+         $t->set_var( 'xhtml', XHTML );
          $t->set_var('site_url',$GLOBALS['_CONF']['site_url']);
          $t->set_var('open_group', $this->ref);
***************
*** 421,424 ****
--- 422,426 ----
              $t->set_block('element', $block);
  
+         $t->set_var( 'xhtml', XHTML );
          $t->set_var('name', $name);
          $t->set_var('display_name', $display_name);
***************
*** 462,466 ****
                  }
                  $t->set_var('opt_name', $sName);
!                 $t->set_var('selected', ($val == $sVal ? 'SELECTED' : ''));
                  $t->parse('myoptions', 'select-options', true);
              }
--- 464,468 ----
                  }
                  $t->set_var('opt_name', $sName);
!                 $t->set_var('selected', ($val == $sVal ? 'selected="selected"' : ''));
                  $t->parse('myoptions', 'select-options', true);
              }

Index: downloader.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/downloader.class.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** downloader.class.php	1 May 2007 17:32:57 -0000	1.13
--- downloader.class.php	25 Nov 2007 06:59:56 -0000	1.14
***************
*** 332,338 ****
              for ($i = 1; $i <= $nerrors; $i++) {
                  if ($verbose) {
!                     print current($this->_errors) . "<BR>\n";
                  } else {
!                     $retval .= current($this->_errors) . "<BR>\n";
                  }
                  next($this->_errors);
--- 332,338 ----
              for ($i = 1; $i <= $nerrors; $i++) {
                  if ($verbose) {
!                     print current($this->_errors) . "<br" . XHTML . ">\n";
                  } else {
!                     $retval .= current($this->_errors) . "<br" . XHTML . ">\n";
                  }
                  next($this->_errors);
***************
*** 352,356 ****
              $nwarnings = count($this->_warnings);
              for ($i = 1; $i <= $nwarnings; $i++) {
!                 print current($this->_warnings) . "<BR>\n";
                  next($this->_warnings);
              }
--- 352,356 ----
              $nwarnings = count($this->_warnings);
              for ($i = 1; $i <= $nwarnings; $i++) {
!                 print current($this->_warnings) . "<br" . XHTML . ">\n";
                  next($this->_warnings);
              }
***************
*** 368,372 ****
              $nmsgs = count($this->_debugMessages);
              for ($i = 1; $i <= $nmsgs; $i++) {
!                 print current($this->_debugMessages) . "<BR>\n";
                  next($this->_debugMessages);
              }
--- 368,372 ----
              $nmsgs = count($this->_debugMessages);
              for ($i = 1; $i <= $nmsgs; $i++) {
!                 print current($this->_debugMessages) . "<br" . XHTML . ">\n";
                  next($this->_debugMessages);
              }
***************
*** 489,493 ****
  
          if(!is_file($this->_sourceDirectory . $fileName)) {
!             echo "<br>{$this->sourceDirectory}{$filename} does not exist";
          }
  
--- 489,493 ----
  
          if(!is_file($this->_sourceDirectory . $fileName)) {
!             echo "<br" . XHTML . ">{$this->sourceDirectory}{$filename} does not exist";
          }
  

Index: story.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** story.class.php	30 Sep 2007 16:45:44 -0000	1.17
--- story.class.php	25 Nov 2007 06:59:56 -0000	1.18
***************
*** 973,979 ****
  
                      // Build image tags for each flavour of the image:
!                     $img_noalign = '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">';
!                     $img_leftalgn = '<img ' . $sizeattributes . 'class="floatleft" src="' . $imgSrc . '" alt="">';
!                     $img_rightalgn = '<img ' . $sizeattributes . 'class="floatright" src="' . $imgSrc . '" alt="">';
  
  
--- 973,979 ----
  
                      // Build image tags for each flavour of the image:
!                     $img_noalign = '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>';
!                     $img_leftalgn = '<img ' . $sizeattributes . 'class="floatleft" src="' . $imgSrc . '" alt=""' . XHTML . '>';
!                     $img_rightalgn = '<img ' . $sizeattributes . 'class="floatright" src="' . $imgSrc . '" alt=""' . XHTML . '>';
  
  
***************
*** 1028,1042 ****
  
                          $intro = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' .
!                                              $imgSrc . '" alt="">', $intro);
                          $body  = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' .
!                                              $imgSrc . '" alt="">', $body);
                          $intro = str_replace($unscaledleft, '<img ' . $sizeattributes .
!                                              'align="left" src="' . $imgSrc . '" alt="">', $intro);
                          $body  = str_replace($unscaledleft, '<img ' . $sizeattributes .
!                                              'align="left" src="' . $imgSrc . '" alt="">', $body);
                          $intro = str_replace($unscaledright, '<img ' . $sizeattributes .
!                                              'align="right" src="' . $imgSrc. '" alt="">', $intro);
                          $body  = str_replace($unscaledright, '<img ' . $sizeattributes .
!                                              'align="right" src="' . $imgSrc . '" alt="">', $body);
                      }
                  }
--- 1028,1042 ----
  
                          $intro = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' .
!                                              $imgSrc . '" alt=""' . XHTML . '>', $intro);
                          $body  = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' .
!                                              $imgSrc . '" alt=""' . XHTML . '>', $body);
                          $intro = str_replace($unscaledleft, '<img ' . $sizeattributes .
!                                              'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>', $intro);
                          $body  = str_replace($unscaledleft, '<img ' . $sizeattributes .
!                                              'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>', $body);
                          $intro = str_replace($unscaledright, '<img ' . $sizeattributes .
!                                              'align="right" src="' . $imgSrc. '" alt=""' . XHTML . '>', $intro);
                          $body  = str_replace($unscaledright, '<img ' . $sizeattributes .
!                                              'align="right" src="' . $imgSrc . '" alt=""' . XHTML . '>', $body);
                      }
                  }
***************
*** 1127,1134 ****
              }
  
!             $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
!             $left = $lLinkPrefix . '<img ' . $sizeattributes . 'class="floatleft" src="' . $imgSrc . '" alt="">'
                      . $lLinkSuffix;
!             $right = $lLinkPrefix . '<img ' . $sizeattributes . 'class="floatright" src="' . $imgSrc . '" alt="">'
                      . $lLinkSuffix;
  
--- 1127,1134 ----
              }
  
!             $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix;
!             $left = $lLinkPrefix . '<img ' . $sizeattributes . 'class="floatleft" src="' . $imgSrc . '" alt=""' . XHTML . '>'
                      . $lLinkSuffix;
!             $right = $lLinkPrefix . '<img ' . $sizeattributes . 'class="floatright" src="' . $imgSrc . '" alt=""' . XHTML . '>'
                      . $lLinkSuffix;
  
***************
*** 1144,1150 ****
                  if (file_exists($lFilename_large_complete)) {
                      $sizeattributes = COM_getImgSizeAttributes($lFilename_large_complete);
!                     $norm = '<img ' . $sizeattributes . 'src="' . $lFilename_large_URL . '" alt="">';
!                     $left = '<img ' . $sizeattributes . 'align="left" src="' . $lFilename_large_URL . '" alt="">';
!                     $right = '<img ' . $sizeattributes . 'align="right" src="' . $lFilename_large_URL . '" alt="">';
                  }
  
--- 1144,1150 ----
                  if (file_exists($lFilename_large_complete)) {
                      $sizeattributes = COM_getImgSizeAttributes($lFilename_large_complete);
!                     $norm = '<img ' . $sizeattributes . 'src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
!                     $left = '<img ' . $sizeattributes . 'align="left" src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
!                     $right = '<img ' . $sizeattributes . 'align="right" src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
                  }
  
***************
*** 1668,1672 ****
  
          // fix for bug in advanced editor
!         if ($_CONF['advanced_editor'] && ($body == '<br>')) {
              $body = '';
          }
--- 1668,1672 ----
  
          // fix for bug in advanced editor
!         if ($_CONF['advanced_editor'] && ($body == '<br' . XHTML . '>')) {
              $body = '';
          }

Index: template.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/template.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** template.class.php	25 Feb 2007 20:36:58 -0000	1.7
--- template.class.php	25 Nov 2007 06:59:56 -0000	1.8
***************
*** 356,360 ****
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>set_var:</b> (with scalar) <b>%s</b> = '%s'<br>\n", $varname, htmlentities($value));
          }
          $this->varkeys[$varname] = "/".$this->varname($varname)."/";
--- 356,360 ----
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>set_var:</b> (with scalar) <b>%s</b> = '%s'<br" . XHTML . ">\n", $varname, htmlentities($value));
          }
          $this->varkeys[$varname] = "/".$this->varname($varname)."/";
***************
*** 369,373 ****
          if (!empty($k)) {
            if ($this->debug & 1) {
!             printf("<b>set_var:</b> (with array) <b>%s</b> = '%s'<br>\n", $k, htmlentities($v));
            }
            $this->varkeys[$k] = "/".$this->varname($k)."/";
--- 369,373 ----
          if (!empty($k)) {
            if ($this->debug & 1) {
!             printf("<b>set_var:</b> (with array) <b>%s</b> = '%s'<br" . XHTML . ">\n", $k, htmlentities($v));
            }
            $this->varkeys[$k] = "/".$this->varname($k)."/";
***************
*** 406,410 ****
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>clear_var:</b> (with scalar) <b>%s</b><br>\n", $varname);
          }
          $this->set_var($varname, "");
--- 406,410 ----
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>clear_var:</b> (with scalar) <b>%s</b><br" . XHTML . ">\n", $varname);
          }
          $this->set_var($varname, "");
***************
*** 414,418 ****
          if (!empty($v)) {
            if ($this->debug & 1) {
!             printf("<b>clear_var:</b> (with array) <b>%s</b><br>\n", $v);
            }
            $this->set_var($v, "");
--- 414,418 ----
          if (!empty($v)) {
            if ($this->debug & 1) {
!             printf("<b>clear_var:</b> (with array) <b>%s</b><br" . XHTML . ">\n", $v);
            }
            $this->set_var($v, "");
***************
*** 446,450 ****
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>unset_var:</b> (with scalar) <b>%s</b><br>\n", $varname);
          }
          unset($this->varkeys[$varname]);
--- 446,450 ----
        if (!empty($varname)) {
          if ($this->debug & 1) {
!           printf("<b>unset_var:</b> (with scalar) <b>%s</b><br" . XHTML . ">\n", $varname);
          }
          unset($this->varkeys[$varname]);
***************
*** 455,459 ****
          if (!empty($v)) {
            if ($this->debug & 1) {
!             printf("<b>unset_var:</b> (with array) <b>%s</b><br>\n", $v);
            }
            unset($this->varkeys[$v]);
--- 455,459 ----
          if (!empty($v)) {
            if ($this->debug & 1) {
!             printf("<b>unset_var:</b> (with array) <b>%s</b><br" . XHTML . ">\n", $v);
            }
            unset($this->varkeys[$v]);
***************
*** 674,678 ****
        }
        if ($this->debug & 2) {
!         printf ("<b>get_var</b> (with scalar) <b>%s</b> = '%s'<br>\n", $varname, htmlentities($str));
        }
        return $str;
--- 674,678 ----
        }
        if ($this->debug & 2) {
!         printf ("<b>get_var</b> (with scalar) <b>%s</b> = '%s'<br" . XHTML . ">\n", $varname, htmlentities($str));
        }
        return $str;
***************
*** 685,689 ****
          }
          if ($this->debug & 2) {
!           printf ("<b>get_var:</b> (with array) <b>%s</b> = '%s'<br>\n", $v, htmlentities($str));
          }
          $result[$v] = $str;
--- 685,689 ----
          }
          if ($this->debug & 2) {
!           printf ("<b>get_var:</b> (with array) <b>%s</b> = '%s'<br" . XHTML . ">\n", $v, htmlentities($str));
          }
          $result[$v] = $str;
***************
*** 903,907 ****
  
      if ($this->debug & 4) {
!       printf("<b>loadfile:</b> loaded $filename into $varname<br>\n");
      }
      $this->set_var($varname, $str);
--- 903,907 ----
  
      if ($this->debug & 4) {
!       printf("<b>loadfile:</b> loaded $filename into $varname<br" . XHTML . ">\n");
      }
      $this->set_var($varname, $str);
***************
*** 953,957 ****
    */
    function haltmsg($msg) {
!     printf("<b>Template Error:</b> %s<br>\n", $msg);
    }
  
--- 953,957 ----
    */
    function haltmsg($msg) {
!     printf("<b>Template Error:</b> %s<br" . XHTML . ">\n", $msg);
    }
  

Index: conversion.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/conversion.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** conversion.class.php	6 Sep 2006 05:31:01 -0000	1.2
--- conversion.class.php	25 Nov 2007 06:59:56 -0000	1.3
***************
*** 94,102 ****
  
              $formvert['optsel'][1]='/<input(.*)type=\"radio\"(.*)value=\"(.*)\"(.*)(SELECTED|CHECKED)(.*)>(.*)<\/input>/i';
!             $formvert['optsel'][2]='<input\\1 type="hidden"\\2 value="\\3"><img src="'.$_CONF['host'].$_CONF['urlpath'].'../images/rchecked.gif"><B>\\7</B>';
              $file = preg_replace($formvert['optsel'][1],$formvert['optsel'][2],$file);
  
              $formvert['optsel'][1]='/<input(.*)type=\"checkbox\"(.*)value=\"(.*)\"(.*)(SELECTED|CHECKED)(.*)>(.*)<\/input>/i';
!             $formvert['optsel'][2]='<input\\1 type="hidden"\\2 value="\\3"><img src="'.$_CONF['host'].$_CONF['urlpath'].'../images/checked.gif"><B>\\7</B>';
              $file = preg_replace($formvert['optsel'][1],$formvert['optsel'][2],$file);
  
--- 94,102 ----
  
              $formvert['optsel'][1]='/<input(.*)type=\"radio\"(.*)value=\"(.*)\"(.*)(SELECTED|CHECKED)(.*)>(.*)<\/input>/i';
!             $formvert['optsel'][2]='<input\\1 type="hidden"\\2 value="\\3"><img src="'.$_CONF['host'].$_CONF['urlpath'].'../images/rchecked.gif"><b>\\7</b>';
              $file = preg_replace($formvert['optsel'][1],$formvert['optsel'][2],$file);
  
              $formvert['optsel'][1]='/<input(.*)type=\"checkbox\"(.*)value=\"(.*)\"(.*)(SELECTED|CHECKED)(.*)>(.*)<\/input>/i';
!             $formvert['optsel'][2]='<input\\1 type="hidden"\\2 value="\\3"><img src="'.$_CONF['host'].$_CONF['urlpath'].'../images/checked.gif"><b>\\7</b>';
              $file = preg_replace($formvert['optsel'][1],$formvert['optsel'][2],$file);
  
***************
*** 140,145 ****
          } else {
              $formvert['textbox'][1]='/<input(.*?)type="submit"(.*?)value="(.*?)"(.*?)>/i';
!             $formvert['textbox'][2]='<table bgcolor="#555555" border=1 class="borderon" cellpadding="1"\\4><tr><td>';
!             $formvert['textbox'][2].='<table bgcolor="#eeeeee" border=0 class="borderon" cellpadding="0"\\4><tr><td>\\3</td></tr></table>';
              $formvert['textbox'][2].='</td></tr></table>';
              $file = preg_replace($formvert['textbox'][1],$formvert['textbox'][2],$file);
--- 140,145 ----
          } else {
              $formvert['textbox'][1]='/<input(.*?)type="submit"(.*?)value="(.*?)"(.*?)>/i';
!             $formvert['textbox'][2]='<table bgcolor="#555555" border="1" class="borderon" cellpadding="1"\\4><tr><td>';
!             $formvert['textbox'][2].='<table bgcolor="#eeeeee" border="0" class="borderon" cellpadding="0"\\4><tr><td>\\3</td></tr></table>';
              $formvert['textbox'][2].='</td></tr></table>';
              $file = preg_replace($formvert['textbox'][1],$formvert['textbox'][2],$file);

Index: upload.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/classes/upload.class.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** upload.class.php	30 Sep 2007 04:43:36 -0000	1.49
--- upload.class.php	25 Nov 2007 06:59:56 -0000	1.50
***************
*** 955,961 ****
              for ($i = 1; $i <= $nerrors; $i++) {
                  if ($verbose) {
!                     print current($this->_errors) . "<BR>\n";
                  } else {
!                     $retval .= current($this->_errors) . "<BR>\n";
                  }
                  next($this->_errors);
--- 955,961 ----
              for ($i = 1; $i <= $nerrors; $i++) {
                  if ($verbose) {
!                     print current($this->_errors) . "<br" . XHTML . ">\n";
                  } else {
!                     $retval .= current($this->_errors) . "<br" . XHTML . ">\n";
                  }
                  next($this->_errors);
***************
*** 975,979 ****
              $nwarnings = count($this->_warnings);
              for ($i = 1; $i <= $nwarnings; $i++) {
!                 print current($this->_warnings) . "<BR>\n";
                  next($this->_warnings);
              }
--- 975,979 ----
              $nwarnings = count($this->_warnings);
              for ($i = 1; $i <= $nwarnings; $i++) {
!                 print current($this->_warnings) . "<br" . XHTML . ">\n";
                  next($this->_warnings);
              }
***************
*** 991,995 ****
              $nmsgs = count($this->_debugMessages);
              for ($i = 1; $i <= $nmsgs; $i++) {
!                 print current($this->_debugMessages) . "<BR>\n";
                  next($this->_debugMessages);
              }
--- 991,995 ----
              $nmsgs = count($this->_debugMessages);
              for ($i = 1; $i <= $nmsgs; $i++) {
!                 print current($this->_debugMessages) . "<br" . XHTML . ">\n";
                  next($this->_debugMessages);
              }




More information about the geeklog-cvs mailing list