webschool-commit Mailing List for WebSchool (Page 7)

Status: Alpha

Brought to you by: jsvoyager, programmer_matt

webschool-commit — Mailing list that describe new commits to the webschool project

You can subscribe to this list here.

2004	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov (183)	_Dec (82)
2005	_Jan (16)	_Feb (3)	_Mar	_Apr (8)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 12 > >> (Page 7 of 12)

[Webschool-commit] webschool/install step3.php,1.24,1.25

From: Matt M. <pro...@us...> - 2004-11-23 02:29:26

Update of /cvsroot/webschool/webschool/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31410/install

Modified Files:
	step3.php 
Log Message:
Tried to take a stab at XHTML Transitional Compat. HAHAHAHAHAHAHAHA

Index: step3.php
===================================================================
RCS file: /cvsroot/webschool/webschool/install/step3.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** step3.php	23 Nov 2004 01:24:01 -0000	1.24
--- step3.php	23 Nov 2004 02:29:06 -0000	1.25
***************
*** 248,251 ****
--- 248,252 ----
  	$query = eregi_replace("table_user_academia", $_REQUEST['dbprefix']."user_academia", $query);
  	$query = eregi_replace("table_calender", $_REQUEST['dbprefix']."calender", $query);
+ 	$query = eregi_replace("table_files", $_REQUEST['dbprefix']."files", $query);
  	return $query;
  }

[Webschool-commit] webschool/lib db.php,1.6,1.7

From: Matt M. <pro...@us...> - 2004-11-23 02:29:26

Update of /cvsroot/webschool/webschool/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31410/lib

Modified Files:
	db.php 
Log Message:
Tried to take a stab at XHTML Transitional Compat. HAHAHAHAHAHAHAHA

Index: db.php
===================================================================
RCS file: /cvsroot/webschool/webschool/lib/db.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** db.php	1 Nov 2004 23:06:38 -0000	1.6
--- db.php	23 Nov 2004 02:29:06 -0000	1.7
***************
*** 37,41 ****
  DEFINE("_USER_ACADEMIA_", _db_prefix_."user_academia");
  DEFINE("_ASSIGNMENTS_", _db_prefix_."assignments");
! 
  
  
--- 37,42 ----
  DEFINE("_USER_ACADEMIA_", _db_prefix_."user_academia");
  DEFINE("_ASSIGNMENTS_", _db_prefix_."assignments");
! DEFINE("_CALENDER_", _db_prefix_."calender");
! DEFINE("_FILES_", _db_prefix_."files");

[Webschool-commit] webschool/files - New directory

From: Matt M. <pro...@us...> - 2004-11-23 02:27:20

Update of /cvsroot/webschool/webschool/files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30836/files

Log Message:
Directory /cvsroot/webschool/webschool/files added to the repository

[Webschool-commit] webschool/lib/adodb adodb-perf.inc.php.#.LENS-03-09-05,NONE,1.1

From: Matt M. <pro...@us...> - 2004-11-23 01:41:16

Update of /cvsroot/webschool/webschool/lib/adodb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21876/lib/adodb

Added Files:
	adodb-perf.inc.php.#.LENS-03-09-05 
Log Message:


--- NEW FILE: adodb-perf.inc.php.#.LENS-03-09-05 ---
<?php
/* 
V4.23 16 June 2004  (c) 2000-2004 John Lim (jl...@na...). All rights reserved.
  Released under both BSD license and Lesser GPL library license. 
  Whenever there is any discrepancy between the two licenses, 
  the BSD license will take precedence. See License.txt. 
  Set tabs to 4 for best viewing.
  
  Latest version is available at http://adodb.sourceforge.net
  
  Library for basic performance monitoring and tuning.
  
  My apologies if you see code mixed with presentation. The presentation suits
  my needs. If you want to separate code from presentation, be my guest. Patches
  are welcome.
  
*/

if (!defined(ADODB_DIR)) include_once(dirname(__FILE__).'/adodb.inc.php');
include_once(ADODB_DIR.'/tohtml.inc.php');


// avoids localization problems where , is used instead of .
function adodb_round($n,$prec)
{
	return number_format($n, $prec, '.', '');
}

/* return microtime value as a float */
function adodb_microtime()
{
	$t = microtime();
	$t = explode(' ',$t);
	return (float)$t[1]+ (float)$t[0];
}

/* sql code timing */
function& adodb_log_sql(&$conn,$sql,$inputarr)
{
global $HTTP_SERVER_VARS;
	
    $perf_table = adodb_perf::table();
	$conn->fnExecute = false;
	$t0 = microtime();
	$rs =& $conn->Execute($sql,$inputarr);
	$t1 = microtime();

	if (!empty($conn->_logsql)) {
		$conn->_logsql = false; // disable logsql error simulation
		$dbT = $conn->databaseType;
		
		$a0 = split(' ',$t0);
		$a0 = (float)$a0[1]+(float)$a0[0];
		
		$a1 = split(' ',$t1);
		$a1 = (float)$a1[1]+(float)$a1[0];
		
		$time = $a1 - $a0;
	
		if (!$rs) {
			$errM = $conn->ErrorMsg();
			$errN = $conn->ErrorNo();
			$conn->lastInsID = 0;
			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
		} else {
			$tracer = '';
			$errM = '';
			$errN = 0;
			$dbg = $conn->debug;
			$conn->debug = false;
			if (!is_object($rs) || $rs->dataProvider == 'empty') 
				$conn->_affected = $conn->affected_rows(true);
			$conn->lastInsID = @$conn->Insert_ID();
			$conn->debug = $dbg;
		}
		if (isset($HTTP_SERVER_VARS['HTTP_HOST'])) {
			$tracer .= '<br>'.$HTTP_SERVER_VARS['HTTP_HOST'];
			if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= $HTTP_SERVER_VARS['PHP_SELF'];
		} else 
			if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= '<br>'.$HTTP_SERVER_VARS['PHP_SELF'];
		//$tracer .= (string) adodb_backtrace(false);
		
		$tracer = substr($tracer,0,500);
		
		if (is_array($inputarr)) {
			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
			else {
				$params = '';
				$params = implode(', ',$inputarr);
				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
			}
		} else {
			$params = '';
		}
		
		if (is_array($sql)) $sql = $sql[0];
		$arr = array('b'=>trim(substr($sql,0,230)),
					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
		//var_dump($arr);
		$saved = $conn->debug;
		$conn->debug = 0;
		
		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
			$isql = "insert into $perf_table values($conn->sysTimeStamp,:b,:c,:d,:e,:f)";
		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {
			$timer = $arr['f'];
			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);

			$sql1 = $conn->qstr($arr['b']);
			$sql2 = $conn->qstr($arr['c']);
			$params = $conn->qstr($arr['d']);
			$tracer = $conn->qstr($arr['e']);
			
			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($conn->sysTimeStamp,$sql1,$sql2,$params,$tracer,$timer)";
			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
			$arr = false;
		} else {
			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $conn->sysTimeStamp,?,?,?,?,?)";
		}
		$ok = $conn->Execute($isql,$arr);
		$conn->debug = $saved;
		
		if ($ok) {
			$conn->_logsql = true; 
		} else {
			$err2 = $conn->ErrorMsg();
			$conn->_logsql = true; // enable logsql error simulation
			$perf =& NewPerfMonitor($conn);
			if ($perf) {
				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
			} else {
				$ok = $conn->Execute("create table $perf_table (
				created varchar(50),
				sql0 varchar(250), 
				sql1 varchar(4000),
				params varchar(3000),
				tracer varchar(500),
				timer decimal(16,6))");
			}
			if (!$ok) {
				ADOConnection::outp( "<b>LOGSQL Insert Failed</b>: $isql<br>$err2</br>");
				$conn->_logsql = false;
			}
		}
		$conn->_errorMsg = $errM;
		$conn->_errorCode = $errN;
	} 
	$conn->fnExecute = 'adodb_log_sql';
	return $rs;
}

	
/*
The settings data structure is an associative array that database parameter per element.

Each database parameter element in the array is itself an array consisting of:

0: category code, used to group related db parameters
1: either
	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 
	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
	c. a string prefixed by =, then a PHP method of the class is invoked, 
		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
2: description of the database parameter
*/

class adodb_perf {
	var $conn;
	var $color = '#F0F0F0';
	var $table = '<table border=1 bgcolor=white>';
	var $titles = '<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';
	var $warnRatio = 90;
	var $tablesSQL = false;
	var $cliFormat = "%32s => %s \r\n";
	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
	var $explain = true;
	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
	var $createTableSQL = false;
	var $maxLength = 2000;
	
    // Sets the tablename to be used            
    function table($newtable = false)
    {
        static $_table;

        if (!empty($newtable))  $_table = $newtable;
		if (empty($_table)) $_table = 'adodb_logsql';
        return $_table;
    }

	// returns array with info to calculate CPU Load
	function _CPULoad()
	{
/*

cpu  524152 2662 2515228 336057010
cpu0 264339 1408 1257951 168025827
cpu1 259813 1254 1257277 168031181
page 622307 25475680
swap 24 1891
intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320)
ctxt 66155838
btime 1062315585
processes 69293

*/
		// Algorithm is taken from
		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
		if (strncmp(PHP_OS,'WIN',3)==0) {
			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
			if (!$c) return false;
			
			$info[0] = $c->PercentProcessorTime;
			$info[1] = 0;
			$info[2] = 0;
			$info[3] = $c->TimeStamp_Sys100NS;
			//print_r($info);
			return $info;
		}
		
		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
		$statfile = '/proc/stat';
		if (!file_exists($statfile)) return false;
		
		$fd = fopen($statfile,"r");
		if (!$fd) return false;
		
		$statinfo = explode("\n",fgets($fd, 1024));
		fclose($fd);
		foreach($statinfo as $line) {
			$info = explode(" ",$line);
			if($info[0]=="cpu") {
				array_shift($info);  // pop off "cpu"
				if(!$info[0]) array_shift($info); // pop off blank space (if any)
				return $info;
			}
		}
		
		return false;
		
	}
	
	/* NOT IMPLEMENTED */
	function MemInfo()
	{
		/*

        total:    used:    free:  shared: buffers:  cached:
Mem:  1055289344 917299200 137990144        0 165437440 599773184
Swap: 2146775040 11055104 2135719936
MemTotal:      1030556 kB
MemFree:        134756 kB
MemShared:           0 kB
Buffers:        161560 kB
Cached:         581384 kB
SwapCached:       4332 kB
Active:         494468 kB
Inact_dirty:    322856 kB
Inact_clean:     24256 kB
Inact_target:   168316 kB
HighTotal:      131064 kB
HighFree:         1024 kB
LowTotal:       899492 kB
LowFree:        133732 kB
SwapTotal:     2096460 kB
SwapFree:      2085664 kB
Committed_AS:   348732 kB
		*/
	}
	
	
	/*
		Remember that this is client load, not db server load!
	*/
	var $_lastLoad;
	function CPULoad()
	{
		$info = $this->_CPULoad();
		if (!$info) return false;
			
		if (empty($this->_lastLoad)) {
			sleep(1);
			$this->_lastLoad = $info;
			$info = $this->_CPULoad();
		}
		
		$last = $this->_lastLoad;
		$this->_lastLoad = $info;
		
		$d_user = $info[0] - $last[0];
		$d_nice = $info[1] - $last[1];
		$d_system = $info[2] - $last[2];
		$d_idle = $info[3] - $last[3];
		
		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);

		if (strncmp(PHP_OS,'WIN',3)==0) {
			if ($d_idle < 1) $d_idle = 1;
			return 100*(1-$d_user/$d_idle);
		}else {
			$total=$d_user+$d_nice+$d_system+$d_idle;
			if ($total<1) $total=1;
			return 100*($d_user+$d_nice+$d_system)/$total; 
		}
	}
	
	function Tracer($sql)
	{
        $perf_table = adodb_perf::table();
		$saveE = $this->conn->fnExecute;
		$this->conn->fnExecute = false;
			
		$sqlq = $this->conn->qstr($sql);
		$arr = $this->conn->GetArray(
"select count(*),tracer 
	from $perf_table where sql1=$sqlq 
	group by tracer
	order by 1 desc");
		$s = '';
		if ($arr) {
			$s .= '<h3>Scripts Affected</h3>';
			foreach($arr as $k) {
				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
			}
		}
		$this->conn->fnExecute = $saveE;
		return $s;
	}

	/* 
		Explain Plan for $sql.
		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
			actual sql.
	*/
	function Explain($sql,$partial=false)
	{	
		return false;
	}
	
	function InvalidSQL($numsql = 10)
	{
	global $HTTP_GET_VARS;
	
		if (isset($HTTP_GET_VARS['sql'])) return;
		$s = '<h3>Invalid SQL</h3>';
		$saveE = $this->conn->fnExecute;
		$this->conn->fnExecute = false;
        $perf_table = adodb_perf::table();
		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
		$this->conn->fnExecute = $saveE;
		if ($rs) {
			$s .= rs2html($rs,false,false,false,false);
		} else
			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
		
		return $s;
	}

	
	/*
		This script identifies the longest running SQL
	*/	
	function _SuspiciousSQL($numsql = 10)
	{
		global $ADODB_FETCH_MODE,$HTTP_GET_VARS;
		
            $perf_table = adodb_perf::table();
			$saveE = $this->conn->fnExecute;
			$this->conn->fnExecute = false;
			
			if (isset($HTTP_GET_VARS['exps']) && isset($HTTP_GET_VARS['sql'])) {
				$partial = !empty($HTTP_GET_VARS['part']);
				echo "<a name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
			}
			
			if (isset($HTTP_GET_VARS['sql'])) return;
			$sql1 = $this->sql1;
			
			$save = $ADODB_FETCH_MODE;
			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
			//$this->conn->debug=1;
			$rs =& $this->conn->SelectLimit(
			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
				from $perf_table
				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
				and (tracer is null or tracer not like 'ERROR:%')
				group by sql1
				order by 1 desc",$numsql);
			$ADODB_FETCH_MODE = $save;
			$this->conn->fnExecute = $saveE;
			
			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
			$s = "<h3>Suspicious SQL</h3>
<font size=1>The following SQL have high average execution times</font><br>
<table border=1 bgcolor=white><tr><td><b>Avg Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
			$max = $this->maxLength;
			while (!$rs->EOF) {
				$sql = $rs->fields[1];
				$raw = urlencode($sql);
				if (strlen($raw)>$max-100) {
					$sql2 = substr($sql,0,$max-500);
					$raw = urlencode($sql2).'&part='.crc32($sql);
				}
				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
				$suffix = "</a>";
				if ($this->explain == false || strlen($prefix)>$max) {
					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';
					$prefix = '';
				}
				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
				$rs->MoveNext();
			}
			return $s."</table>";
		
	}
	
	function CheckMemory()
	{
		return '';
	}
	
	
	function SuspiciousSQL($numsql=10)
	{
		return adodb_perf::_SuspiciousSQL($numsql);
	}

	function ExpensiveSQL($numsql=10)
	{
		return adodb_perf::_ExpensiveSQL($numsql);
	}

	
	/*
		This reports the percentage of load on the instance due to the most 
		expensive few SQL statements. Tuning these statements can often 
		make huge improvements in overall system performance. 
	*/
	function _ExpensiveSQL($numsql = 10)
	{
		global $HTTP_GET_VARS,$ADODB_FETCH_MODE;
		
            $perf_table = adodb_perf::table();
			$saveE = $this->conn->fnExecute;
			$this->conn->fnExecute = false;
			
			if (isset($HTTP_GET_VARS['expe']) && isset($HTTP_GET_VARS['sql'])) {
				$partial = !empty($HTTP_GET_VARS['part']);
				echo "<a name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
			}
			
			if (isset($HTTP_GET_VARS['sql'])) return;
			
			$sql1 = $this->sql1;
			$save = $ADODB_FETCH_MODE;
			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
			$rs =& $this->conn->SelectLimit(
			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
				from $perf_table
				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')
				and (tracer is null or tracer not like 'ERROR:%')
				group by sql1
				order by 1 desc",$numsql);
			
			$this->conn->fnExecute = $saveE;
			$ADODB_FETCH_MODE = $save;
			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
			$s = "<h3>Expensive SQL</h3>
<font size=1>Tuning the following SQL will reduce the server load substantially</font><br>
<table border=1 bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
			$max = $this->maxLength;
			while (!$rs->EOF) {
				$sql = $rs->fields[1];
				$raw = urlencode($sql);
				if (strlen($raw)>$max-100) {
					$sql2 = substr($sql,0,$max-500);
					$raw = urlencode($sql2).'&part='.crc32($sql);
				}
				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
				$suffix = "</a>";
				if($this->explain == false || strlen($prefix>$max)) {
					$prefix = '';
					$suffix = '';
				}
				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
				$rs->MoveNext();
			}
			return $s."</table>";
	}
	
	/*
		Raw function to return parameter value from $settings.
	*/
	function DBParameter($param)
	{
		if (empty($this->settings[$param])) return false;
		$sql = $this->settings[$param][1];
		return $this->_DBParameter($sql);
	}
	
	/*
		Raw function returning array of poll paramters
	*/
	function &PollParameters()
	{
		$arr[0] = (float)$this->DBParameter('data cache hit ratio');
		$arr[1] = (float)$this->DBParameter('data reads');
		$arr[2] = (float)$this->DBParameter('data writes');
		$arr[3] = (integer) $this->DBParameter('current connections');
		return $arr;
	}
	
	/*
		Low-level Get Database Parameter
	*/
	function _DBParameter($sql)
	{
		$savelog = $this->conn->LogSQL(false);
		if (is_array($sql)) {
		global $ADODB_FETCH_MODE;
		
			$sql1 = $sql[0];
			$key = $sql[1];
			if (sizeof($sql)>2) $pos = $sql[2];
			else $pos = 1;
			if (sizeof($sql)>3) $coef = $sql[3];
			else $coef = false;
			$ret = false;
			$save = $ADODB_FETCH_MODE;
			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
			$rs = $this->conn->Execute($sql1);
			$ADODB_FETCH_MODE = $save;
			if ($rs) {
				while (!$rs->EOF) {
					$keyf = reset($rs->fields);
					if (trim($keyf) == $key) {
						$ret = $rs->fields[$pos];
						if ($coef) $ret *= $coef;
						break;
					}
					$rs->MoveNext();
				}
				$rs->Close();
			}
			$this->conn->LogSQL($savelog);
			return $ret;
		} else {
			if (strncmp($sql,'=',1) == 0) {
				$fn = substr($sql,1);
				return $this->$fn();
			}
			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
			$ret = $this->conn->GetOne($sql);
			$this->conn->LogSQL($savelog);
			
			return $ret;
		}
	}
	
	/*
		Warn if cache ratio falls below threshold. Displayed in "Description" column.
	*/
	function WarnCacheRatio($val)
	{
		if ($val < $this->warnRatio) 
			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
		else return '';
	}
	
	/***********************************************************************************************/
	//                                    HIGH LEVEL UI FUNCTIONS
	/***********************************************************************************************/

	
	function UI($pollsecs=5)
	{
	global $HTTP_GET_VARS,$HTTP_SERVER_VARS,$HTTP_POST_VARS;
	
    $perf_table = adodb_perf::table();
	$conn = $this->conn;
	
	$app = $conn->host;
	if ($conn->host && $conn->database) $app .= ', db=';
	$app .= $conn->database;
	
	if ($app) $app .= ', ';
	$savelog = $this->conn->LogSQL(false);	
	$info = $conn->ServerInfo();
	if (isset($HTTP_GET_VARS['clearsql'])) {
		$this->conn->Execute("delete from $perf_table");
	}
	$this->conn->LogSQL($savelog);
	
	// magic quotes
	
	if (isset($HTTP_GET_VARS['sql']) && get_magic_quotes_gpc()) {
		$_GET['sql'] = $HTTP_GET_VARS['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$HTTP_GET_VARS['sql']);
	}
	
	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
	
	$app .= $info['description'];
	
	
	if (isset($HTTP_GET_VARS['do'])) $do = $HTTP_GET_VARS['do'];
	else if (isset($HTTP_POST_VARS['do'])) $do = $HTTP_POST_VARS['do'];
	 else if (isset($HTTP_GET_VARS['sql'])) $do = 'viewsql';
	 else $do = 'stats';
	 
	if (isset($HTTP_GET_VARS['nsql'])) {
		if ($HTTP_GET_VARS['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $HTTP_GET_VARS['nsql'];
	}
	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
	else $form = "<td>&nbsp;</td>";
	
	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
	
	if  (empty($HTTP_GET_VARS['hidem']))
	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
	<b><a href=http://php.weblogs.com/adodb?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
	 "$form",
	 "</tr></table>";

	 
	 	switch ($do) {
		default:
		case 'stats':
			echo $this->HealthCheck();
			//$this->conn->debug=1;
			echo $this->CheckMemory();
			break;
		case 'poll':
			echo "<iframe width=720 height=80% 
				src=\"{$HTTP_SERVER_VARS['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
			break;
		case 'poll2':
			echo "<pre>";
			$this->Poll($pollsecs);
			break;
		
		case 'dosql':
			if (!$allowsql) break;
			
			$this->DoSQLForm();
			break;
		case 'viewsql':
			if (empty($HTTP_GET_VARS['hidem']))
				echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
			echo($this->SuspiciousSQL($nsql));
			echo($this->ExpensiveSQL($nsql));
			echo($this->InvalidSQL($nsql));
			break;
		case 'tables': 
			echo $this->Tables(); break;
		}
		global $ADODB_vers;
		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
	}
	
	/*
		Runs in infinite loop, returning real-time statistics
	*/
	function Poll($secs=5)
	{
		$this->conn->fnExecute = false;
		//$this->conn->debug=1;
		if ($secs <= 1) $secs = 1;
		echo "Accumulating statistics, every $secs seconds...\n";flush();
		$arro =& $this->PollParameters();
		$cnt = 0;
		set_time_limit(0);
		sleep($secs);
		while (1) {
			$arr =& $this->PollParameters();
			
			$hits   = sprintf('%2.2f',$arr[0]);
			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
			$sess = sprintf('%5d',$arr[3]);
			
			$load = $this->CPULoad();
			if ($load !== false) {
				$oslabel = 'WS-CPU%';
				$osval = sprintf(" %2.1f  ",(float) $load);
			}else {
				$oslabel = '';
				$osval = '';
			}
			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
			$cnt += 1;
			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
			flush();
			
			sleep($secs);
			$arro = $arr;
		}
	}
	
	/*
		Returns basic health check in a command line interface
	*/
	function HealthCheckCLI()
	{
		return $this->HealthCheck(true);
	}
	
		
	/*
		Returns basic health check as HTML
	*/
	function HealthCheck($cli=false)
	{
		$saveE = $this->conn->fnExecute;
		$this->conn->fnExecute = false;	
		if ($cli) $html = '';
		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
		
		$oldc = false;
		$bgc = '';
		foreach($this->settings as $name => $arr) {
			if ($arr === false) break;
			
			if (!is_string($name)) {
				if ($cli) $html .= " -- $arr -- \n";
				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";
				continue;
			}
			
			if (!is_array($arr)) break;
			$category = $arr[0];
			$how = $arr[1];
			if (sizeof($arr)>2) $desc = $arr[2];
			else $desc = ' &nbsp; ';
			
			
			if ($category == 'HIDE') continue;
			
			$val = $this->_DBParameter($how);
			
			if ($desc && strncmp($desc,"=",1) === 0) {
				$fn = substr($desc,1);
				$desc = $this->$fn($val);
			}
			
			if ($val === false) {
				$m = $this->conn->ErrorMsg();
				$val = "Error: $m"; 
			} else {
				if (is_numeric($val) && $val >= 256*1024) {
					if ($val % (1024*1024) == 0) {
						$val /= (1024*1024);
						$val .= 'M';
					} else if ($val % 1024 == 0) {
						$val /= 1024;
						$val .= 'K';
					}
					//$val = htmlspecialchars($val);
				}
			}
			if ($category != $oldc) {
				$oldc = $category;
				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
			}
			if (strlen($desc)==0) $desc = '&nbsp;';
			if (strlen($val)==0) $val = '&nbsp;';
			if ($cli) {
				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
				
			}else {
				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
			}
		}
		
		if (!$cli) $html .= "</table>\n";
		$this->conn->fnExecute = $saveE;
			
		return $html;	
	}
	
	function Tables($orderby='1')
	{
		if (!$this->tablesSQL) return false;
		
		$savelog = $this->conn->LogSQL(false);
		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
		$this->conn->LogSQL($savelog);
		$html = rs2html($rs,false,false,false,false);
		return $html;
	}
	

	function CreateLogTable()
	{
		if (!$this->createTableSQL) return false;
		
		$savelog = $this->conn->LogSQL(false);
		$ok = $this->conn->Execute($this->createTableSQL);
		$this->conn->LogSQL($savelog);
		return ($ok) ? true : false;
	}
	
	function DoSQLForm()
	{
	global $HTTP_SERVER_VARS,$HTTP_GET_VARS,$HTTP_POST_VARS,$HTTP_SESSION_VARS;
	
		$HTTP_VARS = array_merge($HTTP_GET_VARS,$HTTP_POST_VARS);
		
		$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
		$sql = isset($HTTP_VARS['sql']) ? $HTTP_VARS['sql'] : '';

		if (isset($HTTP_SESSION_VARS['phplens_sqlrows'])) $rows = $HTTP_SESSION_VARS['phplens_sqlrows'];
		else $rows = 3;
		
		if (isset($HTTP_VARS['SMALLER'])) {
			$rows /= 2;
			if ($rows < 3) $rows = 3;
			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
		}
		if (isset($HTTP_VARS['BIGGER'])) {
			$rows *= 2;
			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
		}
		
?>

<form method="POST" action="<?php echo $PHP_SELF ?>">
<table><tr>
<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input type="submit" value=" &gt; &gt; " name="BIGGER">
</td>
<td align=right>
<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden name=do value=dosql>
</td></tr>
  <tr>
  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" cols="80"><?php print htmlspecialchars($sql) ?></textarea>
  </td>
  </tr>
 </table>
</form>

<?php
		if (!isset($HTTP_VARS['sql'])) return;
		
		$sql = $this->undomq(trim($sql));
		if (substr($sql,strlen($sql)-1) === ';') {
			$print = true;
			$sqla = $this->SplitSQL($sql);
		} else  {
			$print = false;
			$sqla = array($sql);
		}
		foreach($sqla as $sqls) {

			if (!$sqls) continue;
			
			if ($print) {
				print "<p>".htmlspecialchars($sqls)."</p>";
				flush();
			}
			$savelog = $this->conn->LogSQL(false);
			$rs = $this->conn->Execute($sqls);
			$this->conn->LogSQL($savelog);
			if ($rs && is_object($rs) && !$rs->EOF) {
				rs2html($rs);
				while ($rs->NextRecordSet()) {
					print "<table width=98% bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
					rs2html($rs);
				}
			} else {
				$e1 = (integer) $this->conn->ErrorNo();
				$e2 = $this->conn->ErrorMsg();
				if (($e1) || ($e2)) {
					if (empty($e1)) $e1 = '-1'; // postgresql fix
					print ' &nbsp; '.$e1.': '.$e2;
				} else {
					print "<p>No Recordset returned<br></p>";
				}
			}
		} // foreach
	}
	
	function SplitSQL($sql)
	{
		$arr = explode(';',$sql);
		return $arr;
	}
	
	function undomq(&$m) 
	{
	if (get_magic_quotes_gpc()) {
		// undo the damage
		$m = str_replace('\\\\','\\',$m);
		$m = str_replace('\"','"',$m);
		$m = str_replace('\\\'','\'',$m);
	}
	return $m;
}
}



?>

[Webschool-commit] webschool file.php,NONE,1.1

From: Matt M. <pro...@us...> - 2004-11-23 01:41:15

Update of /cvsroot/webschool/webschool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21876

Added Files:
	file.php 
Log Message:


--- NEW FILE: file.php ---
<?PHP
/*
Webschool
Copyright (C) 2004 ProgrammerMatt

Developers & Contributors:
ProgrammerMatt				 Pro...@bl...
jsvoyager					 Gen...@gm...

This program is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software Foundation;
either version 2 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
(license.txt)
*/


?>

[Webschool-commit] webschool/mysql webschool.sql,1.50,1.51

From: Matt M. <pro...@us...> - 2004-11-23 01:41:15

Update of /cvsroot/webschool/webschool/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21876/mysql

Modified Files:
	webschool.sql 
Log Message:


Index: webschool.sql
===================================================================
RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** webschool.sql	23 Nov 2004 01:24:02 -0000	1.50
--- webschool.sql	23 Nov 2004 01:41:04 -0000	1.51
***************
*** 103,107 ****
  ) TYPE=MyISAM AUTO_INCREMENT=2 ;
  
! INSERT INTO `table_pages` VALUES (1, 'WebSchool Installed Successfully!', 2, '<span>Congratulations, WebSchool has been installed successfully!</span><br /><br />Welcome to WebSchool version 0.0.6.   Please note that this version of WebSchool is a <b>alpha</b> and is accordingly not designed for production environments.<br /><br />Limited documentation is available from the <a href="mod.php?mod=Articles&op=view&id=1"><span style="font-style: italic;">Introduction to WebSchool</span> </a>article.   Further documentation is planed for our full release, but until then, fell free to visit our <a href="http://dev.bluemavid.net" title="WebSchool Forums">forums</a> for support.   Please also note the following important information:<br /><ul><li>The username to get into the administration area is <span style="font-weight: bold;">Administrator</span> and the password is what you set it to in the setup.   Please change this as soon as possible.</li><li>Limited documentation is available from the <a href="mod.php?mod=Articles&op=view&id=1"><span style="font-style: italic;">Introduction to WebSchool</span></a> article.   This includes basic features and how to administer them.</li><li>The debug information below can be turned off by changing the &quot;debug&quot; option in the Config area of the Admin Control Panel.<br /></li></ul><br />We hope you enjoy this beta release of WebSchool.<br /><br /><span style="font-family: arial,helvetica,sans-serif;">The WebSchool Development Team</span>', '1099153213', '1099153213', '0', 2, '');
  
  DROP TABLE IF EXISTS `table_permissions`;
--- 103,107 ----
  ) TYPE=MyISAM AUTO_INCREMENT=2 ;
  
! INSERT INTO `table_pages` VALUES (1, 'WebSchool Installed Successfully!', 2, '<span>Congratulations, WebSchool has been installed successfully!</span><br /><br />Welcome to WebSchool version 0.0.6.   Please note that this version of WebSchool is a <b>alpha</b> and is accordingly not designed for production environments.<br /><br />Limited documentation is available from the <a href="mod.php?mod=Articles&op=view&id=1"><span style="font-style: italic;">Introduction to WebSchool</span> </a>article.   Further documentation is planed for our full release, but until then, fell free to visit our <a href="http://dev.bluemavid.net" title="WebSchool Forums">forums</a> for support.   Please also note the following important information:<br /><ul><li>The username to get into the administration area is <span style="font-weight: bold;">Administrator</span> and the password is what you set it to in the setup.   Please change this as soon as possible.</li><li>Limited documentation is available from the <a href="mod.php?mod=Articles&op=view&id=1"><span style="font-style: italic;">Introduction to WebSchool</span></a> article.   This includes basic features and how to administer them.</li><li>The debug information below can be turned off by changing the &quot;debug&quot; option in the <a href="admin.php?amod=Config">Config</a> area of the <a href="admin.php">Admin Control Panel.</a><br /></li></ul><br />We hope you enjoy this beta release of WebSchool.<br /><br /><span style="font-family: arial,helvetica,sans-serif;">The WebSchool Development Team</span>', '1099153213', '1099153213', '0', 2, '');
  
  DROP TABLE IF EXISTS `table_permissions`;

[Webschool-commit] webschool/lib auth.php,1.8,1.9

From: Matt M. <pro...@us...> - 2004-11-23 01:41:13

Update of /cvsroot/webschool/webschool/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21876/lib

Modified Files:
	auth.php 
Log Message:


Index: auth.php
===================================================================
RCS file: /cvsroot/webschool/webschool/lib/auth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** auth.php	20 Nov 2004 01:27:36 -0000	1.8
--- auth.php	23 Nov 2004 01:41:03 -0000	1.9
***************
*** 23,26 ****
--- 23,27 ----
  }
  
+ //definition so that we can check in other files if this authentication library is loaded
  Define("_AUTHLOADED_", true);
  
***************
*** 31,41 ****
  //initialize user*s* var, which is used with the
  //  ResolveUserID function
  $query = "SELECT * FROM "._USERS_;
  db(__FILE__,__LINE__, $query);
  
  while($user = dbr()){
! 	$users[$user['id']]['fname'] = $user['fname'];
! 	$users[$user['id']]['lname'] = $user['lname'];
! 	$users[$user['id']]['username'] = $user['username'];	
  }
  
--- 32,46 ----
  //initialize user*s* var, which is used with the
  //  ResolveUserID function
+ //global encapsilation for all users
+ /*
+ ProgrammerMatt: Reconsidering this. In a production environment with a large sum of users, this
+ could consume a great ammountt of server resources
+ */
  $query = "SELECT * FROM "._USERS_;
  db(__FILE__,__LINE__, $query);
  
  while($user = dbr()){
! 	$users[$user['id']]	= $user;
! 
  }
  
***************
*** 115,123 ****
  	global $user;
  	$user = dbr();
! 
  	db(__FILE__,__LINE__,"SELECT * FROM "._PERMISSIONS_." WHERE userid='".$id."'");
  	global $perm;
  	$perm = dbr();
! 
  	db(__FILE__,__LINE__,"SELECT name, value FROM "._CONFIG_);
  	global $config;
--- 120,128 ----
  	global $user;
  	$user = dbr();
! 	//get their permissions
  	db(__FILE__,__LINE__,"SELECT * FROM "._PERMISSIONS_." WHERE userid='".$id."'");
  	global $perm;
  	$perm = dbr();
! 	//get configuration stuff
  	db(__FILE__,__LINE__,"SELECT name, value FROM "._CONFIG_);
  	global $config;

[Webschool-commit] webschool/lib/adodb/perf perf-db2.inc.php,1.2,1.3 perf-informix.inc.php,1.2,1.3 perf-mssql.inc.php,1.2,1.3 perf-mysql.inc.php,1.2,1.3 perf-oci8.inc.php,1.2,1.3 perf-postgres.inc.php,1.2,1.3