[geeklog-cvs] Geeklog-1.x/system/databases mssql.class.php, 1.5, 1.6 mysql.class.php, 1.26, 1.27

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/databases
In directory qs1489.pair.com:/tmp/cvs-serv10419/databases

Modified Files:
	mssql.class.php mysql.class.php 
Log Message:
XHTML optional updates

Index: mssql.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/databases/mssql.class.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mssql.class.php	25 Nov 2006 13:58:37 -0000	1.5
--- mssql.class.php	25 Nov 2007 06:59:56 -0000	1.6
***************
*** 118,122 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->_connect ***<br>");
          }
  
--- 118,122 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->_connect ***<br" . XHTML . ">");
          }
  
***************
*** 137,141 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n***leaving database->_connect***<br>");
          }
      }
--- 137,141 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n***leaving database->_connect***<br" . XHTML . ">");
          }
      }
***************
*** 208,213 ****
      {
          if ($this->_verbose && (empty($this->_errorlog_fn) || !function_exists($this->_errorlog_fn))) {
!             print "\n<BR><B>Can't run mssql.class.php verbosely because the errorlog "
!                 . "function wasn't set or doesn't exist<BR>\n";
              return false;
          }
--- 208,213 ----
      {
          if ($this->_verbose && (empty($this->_errorlog_fn) || !function_exists($this->_errorlog_fn))) {
!             print "\n<br" . XHTML . "><b>Can't run mssql.class.php verbosely because the errorlog "
!                 . "function wasn't set or doesn't exist</b><br" . XHTML . ">\n";
              return false;
          }
***************
*** 399,404 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n***inside database->dbQuery***<br>");
!             $this->_errorlog("\n*** sql to execute is $sql ***<br>");
          }
  
--- 399,404 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n***inside database->dbQuery***<br" . XHTML . ">");
!             $this->_errorlog("\n*** sql to execute is $sql ***<br" . XHTML . ">");
          }
  
***************
*** 443,447 ****
              }
          
!         //echo "<xmp>" . $sql . "</xmp>";
      
          // Run query
--- 443,447 ----
              }
          
!         //echo "<pre>" . $sql . "</pre>";
      
          // Run query
***************
*** 454,458 ****
              if($result==FALSE){
                  echo "Query Failed: ";
!                 echo "<xmp>".$this->dbError($sql) . "</xmp><HR>";
                  }
              }
--- 454,458 ----
              if($result==FALSE){
                  echo "Query Failed: ";
!                 echo "<pre>".$this->dbError($sql) . "</pre><hr" . XHTML . ">";
                  }
              }
***************
*** 536,540 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbSave ***<BR>");
          }
          $tempFields=$fields;
--- 536,540 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbSave ***<br" . XHTML . ">");
          }
          $tempFields=$fields;
***************
*** 570,579 ****
          $sql="EXEC doIndexInsert '{$table}', '{$fields}', '{$values}'";
          //$sql=$this->cleanseSQL($sql);
! //        echo "<XMP>" . $sql . "</XMP><HR>";
  //        exit(0);
          $result=$this->dbQuery($sql,1);
          mssql_free_result($result);
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbSave ***<BR>");
          }
      }
--- 570,579 ----
          $sql="EXEC doIndexInsert '{$table}', '{$fields}', '{$values}'";
          //$sql=$this->cleanseSQL($sql);
! //        echo "<pre>" . $sql . "</pre><hr" . XHTML . ">";
  //        exit(0);
          $result=$this->dbQuery($sql,1);
          mssql_free_result($result);
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbSave ***<br" . XHTML . ">");
          }
      }
***************
*** 599,603 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** inside database->dbDelete ***<BR>");
          }
  
--- 599,603 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** inside database->dbDelete ***<br" . XHTML . ">");
          }
  
***************
*** 632,636 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** inside database->dbDelete ***<BR>");
          }
  
--- 632,636 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** inside database->dbDelete ***<br" . XHTML . ">");
          }
  
***************
*** 691,695 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("dbChange sql = $sql<BR>");
          }
  
--- 691,695 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("dbChange sql = $sql<br" . XHTML . ">");
          }
  
***************
*** 717,721 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbCount ***<br>");
          }
  
--- 717,721 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbCount ***<br" . XHTML . ">");
          }
  
***************
*** 750,754 ****
          
          if ($this->isVerbose()) {
!             print "\n*** sql = $sql ***<br>";
          }
  
--- 750,754 ----
          
          if ($this->isVerbose()) {
!             print "\n*** sql = $sql ***<br" . XHTML . ">";
          }
  
***************
*** 756,760 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbCount ***<BR>");
          }
  
--- 756,760 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbCount ***<br" . XHTML . ">");
          }
  
***************
*** 781,785 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbCopy ***<BR>");
          }
  
--- 781,785 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbCopy ***<br" . XHTML . ">");
          }
  
***************
*** 814,818 ****
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbCopy ***<BR>");
          }
  
--- 814,818 ----
  
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Leaving database->dbCopy ***<br" . XHTML . ">");
          }
  
***************
*** 831,835 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbNumRows ***<BR>");
          }
  
--- 831,835 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbNumRows ***<br" . XHTML . ">");
          }
  
***************
*** 838,842 ****
              if ($this->isVerbose()) {
                  $this->_errorlog('got ' . @mssql_num_rows($recordset) . ' rows');
!                 $this->_errorlog("\n*** Inside database->dbNumRows ***<BR>");
              }
              if( (($this->_fastForwardRows["{$recordset}"]+$this->_limitRows["{$recordset}"])> @mssql_num_rows($recordset)) && $this->_fastForwardRows["{$recordset}"]!=0 ){
--- 838,842 ----
              if ($this->isVerbose()) {
                  $this->_errorlog('got ' . @mssql_num_rows($recordset) . ' rows');
!                 $this->_errorlog("\n*** Inside database->dbNumRows ***<br" . XHTML . ">");
              }
              if( (($this->_fastForwardRows["{$recordset}"]+$this->_limitRows["{$recordset}"])> @mssql_num_rows($recordset)) && $this->_fastForwardRows["{$recordset}"]!=0 ){
***************
*** 855,860 ****
          } else {
              if ($this->isVerbose()) {
!                 $this->_errorlog("got no rows<BR>");
!                 $this->_errorlog("\n*** Inside database->dbNumRows ***<BR>");
              }
              return 0;
--- 855,860 ----
          } else {
              if ($this->isVerbose()) {
!                 $this->_errorlog("got no rows<br" . XHTML . ">");
!                 $this->_errorlog("\n*** Inside database->dbNumRows ***<br" . XHTML . ">");
              }
              return 0;
***************
*** 874,884 ****
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbResult ***<BR>");
              if (empty($recordset)) {
!                 $this->_errorlog("\n*** Passed recordset isn't valid ***<br>");
              } else {
!                 $this->_errorlog("\n*** Everything looks good ***<br>");
              }
!             $this->_errorlog("\n*** Leaving database->dbResult ***<br>");
          }
          return @mssql_result($recordset,$row,$field);
--- 874,884 ----
      {
          if ($this->isVerbose()) {
!             $this->_errorlog("\n*** Inside database->dbResult ***<br" . XHTML . ">");
              if (empty($recordset)) {
!                 $this->_errorlog("\n*** Passed recordset isn't valid ***<br" . XHTML . ">");
              } else {
!                 $this->_errorlog("\n*** Everything looks good ***<br" . XHTML . ">");
              }
!             $this->_errorlog("\n*** Leaving database->dbResult ***<br" . XHTML . ">");
          }
          return @mssql_result($recordset,$row,$field);
***************
*** 943,947 ****
        $this->_numberOfRowsAskedFor["{$recordset}"] = $this->_numberOfRowsAskedFor["{$recordset}"] +1;
        if( ($this->_limitRows["{$recordset}"]) !=($this->_numberOfRowsAskedFor["{$recordset}"]-1)  || $this->_limitRows["{$recordset}"]=='' || $this->_limitRows["{$recordset}"]==0){
!           //echo $this->dbNumRows($recordset) ."-{$this->_numberOfRowsAskedFor["{$recordset}"]}-{$this->_limitRows["{$recordset}"]}<HR>";
          return @mssql_fetch_array($recordset);//, $result_type);  
          }
--- 943,947 ----
        $this->_numberOfRowsAskedFor["{$recordset}"] = $this->_numberOfRowsAskedFor["{$recordset}"] +1;
        if( ($this->_limitRows["{$recordset}"]) !=($this->_numberOfRowsAskedFor["{$recordset}"]-1)  || $this->_limitRows["{$recordset}"]=='' || $this->_limitRows["{$recordset}"]==0){
!           //echo $this->dbNumRows($recordset) ."-{$this->_numberOfRowsAskedFor["{$recordset}"]}-{$this->_limitRows["{$recordset}"]}<hr" . XHTML . ">";
          return @mssql_fetch_array($recordset);//, $result_type);  
          }

Index: mysql.class.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/databases/mysql.class.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mysql.class.php	3 Oct 2006 19:44:40 -0000	1.26
--- mysql.class.php	25 Nov 2007 06:59:56 -0000	1.27
***************
*** 220,225 ****
      {
          if ($this->_verbose && (empty($this->_errorlog_fn) || !function_exists($this->_errorlog_fn))) {
!             print "\n<br><b>Can't run mysql.class.php verbosely because the errorlog "
!                 . "function wasn't set or doesn't exist</b><br>\n";
              return false;
          }
--- 220,225 ----
      {
          if ($this->_verbose && (empty($this->_errorlog_fn) || !function_exists($this->_errorlog_fn))) {
!             print "\n<br" . XHTML . "><b>Can't run mysql.class.php verbosely because the errorlog "
!                 . "function wasn't set or doesn't exist</b><br" . XHTML . ">\n";
              return false;
          }




More information about the geeklog-cvs mailing list