Thread: [Rcts-checkins] SF.net SVN: rcts: [1857] trunk/version1.0 (Page 2)
Brought to you by:
bastimmer,
paulsohier
Menu
▾
▴
rcts-checkins
|
From: <pau...@us...> - 2006-05-17 09:45:55
|
Revision: 1857 Author: paulsohier Date: 2006-05-17 02:45:40 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1857&view=rev Log Message: ----------- More bugfixes for config, and its working again :D Also configtor added, for converting config ;) Modified Paths: -------------- trunk/version1.0/cache/sql.php trunk/version1.0/includes/classes/class.cache.php trunk/version1.0/includes/classes/class.core.php trunk/version1.0/includes/classes/class.template.php trunk/version1.0/includes/functions.php trunk/version1.0/stats.php trunk/version1.0/templates/rcts/footer.html Added Paths: ----------- trunk/version1.0/developer/configtor.php Modified: trunk/version1.0/cache/sql.php =================================================================== --- trunk/version1.0/cache/sql.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/cache/sql.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -0,0 +1 @@ +<?php $this->cache = array();?> \ No newline at end of file Added: trunk/version1.0/developer/configtor.php =================================================================== --- trunk/version1.0/developer/configtor.php (rev 0) +++ trunk/version1.0/developer/configtor.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -0,0 +1,59 @@ +<?php +/* + * $Id$ + * Use this file to convert the old config table to the new config method. + * Only for developers!!! + */ +define('IN_STATS', true); +define('RCTS_ROOT_PATH', dirname(dirname(__FILE__))); +require(RCTS_ROOT_PATH . '/includes/classes/class.cache.php'); +require(RCTS_ROOT_PATH . '/includes/db/db.php'); +require(RCTS_ROOT_PATH . '/includes/config.php'); +error_reporting(E_ALL); +//Connecting :D +$class = array( + "db" => array("db",$host,$username,$password,$database), + "cache" => "cache" +); +while(list($var,$clas) = each($class)){ + global $$var; + if(is_array($clas)){ + $ev = "$$var = new "; + $ar = array(); + for($i = 0; $i < count($clas);$i++){ + if($i == 0){ + $ev .= $clas[$i] . "("; + }else{ + $ar[] = "'" . $clas[$i] . "'"; + } + } + $ev .= implode(", ",$ar); + $ev .= ");"; + eval($ev); + }else{ + $$var = new $clas; + } +} +//Unset DB pass +unset($password); +$cache->load(); +//First, delete all old config options from new config ;) +print "Verwijdere oude config opties.<br />"; +foreach($cache->config as $el => $wa){ + $cache->delete_config($el); + print "$el verwijderd.<br />"; +} +print "File schrijven<br />"; +$cache->save_config(); +print "Config ophalen<br />"; +//Lets select something :D +$sql = "SELECT * FROM $mysql_prefix"."config ORDER BY naam"; +$r = $db->sql_query($sql); +print "Config adden."; +while($row = $db->sql_fetchrow($r)){ + print $row['naam'] . " toegevoegd<br />"; + $cache->upd_config($row['naam'],$row['waarde']); +} +$cache->save_config(); +print "Done"; +?> Modified: trunk/version1.0/includes/classes/class.cache.php =================================================================== --- trunk/version1.0/includes/classes/class.cache.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/includes/classes/class.cache.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -90,16 +90,6 @@ */ function load(){ global $core; - if(@filesize(RCTS_ROOT_PATH . "/cache/sql.php") > MAX_SIZE){ - $o = fopen(RCTS_ROOT_PATH . "/cache/sql.php","w"); - fwrite($o,""); - fclose($o); - } - $this->uf = false; - if(is_object($core) && $core->config_get('use_ftp') && $core->config_get('ftp_server') != 'ftp.localhost'){ - $this->uf = true; - $this->ftp_parameter = array(); - } if(file_exists(RCTS_ROOT_PATH . "/cache/sql.php")){ include(RCTS_ROOT_PATH . "/cache/sql.php"); } @@ -110,7 +100,17 @@ if(file_exists(RCTS_ROOT_PATH . "/cache/config.php")){ include(RCTS_ROOT_PATH . "/cache/config.php"); - } + } + if(@filesize(RCTS_ROOT_PATH . "/cache/sql.php") > MAX_SIZE){ + $o = fopen(RCTS_ROOT_PATH . "/cache/sql.php","w"); + fwrite($o,""); + fclose($o); + } + $this->uf = false; + if(is_object($core) && $core->config_get('use_ftp') && $core->config_get('ftp_server') != 'ftp.localhost'){ + $this->uf = true; + $this->ftp_parameter = array(); + } } /** * cal() @@ -296,23 +296,17 @@ $write = explode("\n",$this->row); break; case 3: - if(!$row){ - trigger_error("File information empty",E_USER_ERROR); - } $write = $row; break; case 4: - if(!$row || count($row) === 0 || count($row) === false){ - trigger_error("File information empty",E_USER_ERROR); - } $write = explode("\n",$row); break; default:{ trigger_error("No correct file information mode",E_USER_ERROR); } } - if(!is_array($write) || count($write) === 0 || count($write) === false){ - trigger_error("File information empty",E_USER_ERROR); + if(!is_array($write)){ + trigger_error("File information error",E_USER_ERROR); } if(empty($file)){ trigger_error("File empty",E_USER_ERROR); Modified: trunk/version1.0/includes/classes/class.core.php =================================================================== --- trunk/version1.0/includes/classes/class.core.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/includes/classes/class.core.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -1021,6 +1021,7 @@ } $output .= '</div>'; // print $output; + //var_Dump($cache); if(isset($cache->config[$el])){ return $cache->config[$el]; }else{ Modified: trunk/version1.0/includes/classes/class.template.php =================================================================== --- trunk/version1.0/includes/classes/class.template.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/includes/classes/class.template.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -243,7 +243,7 @@ if($length > 0) { $blok = substr($row,$start,$length); - if($config->is()) + if($core->is_login()) { $navRowTemp = $navRow; Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/includes/functions.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -54,7 +54,7 @@ "header" => "header.html", "footer" => "footer.html", )); - $template->assign_if("admin",'$config->is_login()'); + $template->assign_if("admin",'$core->is_login()'); //Kalender Start if(get_var('time') !== false){ $time = get_var('time'); @@ -90,7 +90,7 @@ // First, version. :) $version = ''; include(RCTS_ROOT_PATH . '/cache/version.txt'); - if ($config->config['version'] != $version) { + if ($core->config_get('version') != $version) { // Target? :-P $notices .= '<a href="#" onclick="window.open(\'notice.php?notice=version&version='.$version.'\', \'_rctsnotice\', \'HEIGHT=225,resizable=yes,WIDTH=400\'); return false;"><img src="images/icons/update.png" title="'.$core->lang['Updates_available'].'" alt="'.$core->lang['Updates_available'].'" border="0" /></a>'; $noticeShown = true; Modified: trunk/version1.0/stats.php =================================================================== --- trunk/version1.0/stats.php 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/stats.php 2006-05-17 09:45:40 UTC (rev 1857) @@ -31,7 +31,7 @@ $mode = $layout->getMode(); $title = ''; //If you set at config that the stats are closed for guest, you must login! -if($core->config['stats_open'] == 0) +if($core->config_get('stats_open') == 0) { if(!$core->is_login()) { @@ -41,7 +41,7 @@ // // What shall we view? // -if($config->config['use_multisite']) +if($core->config_get('use_multisite')) { $idid = get_var('Usite'); @@ -62,7 +62,7 @@ } $_SESSION["idid"] = $idid; -if($config->config['use_multisite']) +if($core->config_get('use_multisite')) { $text = "<form method='POST' action='stats.php?mode=".$mode."' name='select'> <select size='1' name='Usite' onchange='select.submit()'>"; Modified: trunk/version1.0/templates/rcts/footer.html =================================================================== --- trunk/version1.0/templates/rcts/footer.html 2006-05-17 09:34:32 UTC (rev 1856) +++ trunk/version1.0/templates/rcts/footer.html 2006-05-17 09:45:40 UTC (rev 1857) @@ -95,7 +95,7 @@ </div> <br clear="all" /> <div id="page_footer"> - <!-- GLOBAL config --> + <!-- GLOBAL core --> <!-- Don't delete this copyright. If you delete it, it is possible that you get no support. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-05-17 10:07:58
|
Revision: 1858 Author: paulsohier Date: 2006-05-17 03:07:15 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1858&view=rev Log Message: ----------- Small commit :D - Header changes - Keywords - Config (Yes, now its finished :D) - Bugfixes - class.config.php and xml.php removed. Modified Paths: -------------- trunk/version1.0/cache/config.php trunk/version1.0/includes/classes/class.calendar.php trunk/version1.0/includes/classes/class.core.php trunk/version1.0/includes/classes/class.cron.php trunk/version1.0/includes/classes/class.layout.php trunk/version1.0/includes/classes/class.multisite.php trunk/version1.0/includes/classes/class.phplot.php trunk/version1.0/includes/classes/class.plugin.php trunk/version1.0/includes/classes/class.stats.php trunk/version1.0/includes/classes/class.template.php trunk/version1.0/includes/classes/class.wizard.php trunk/version1.0/includes/constants.php trunk/version1.0/includes/db/msaccess.php trunk/version1.0/includes/db/mssql.php trunk/version1.0/includes/db/postsql.php trunk/version1.0/includes/functions.php trunk/version1.0/includes/modules/acp/acp_config_general.php trunk/version1.0/includes/modules/acp/acp_config_user.php trunk/version1.0/includes/modules/acp/acp_ftp.php trunk/version1.0/includes/modules/acp/acp_header.php trunk/version1.0/includes/modules/acp/acp_layout.php trunk/version1.0/includes/modules/acp/acp_multisite.php trunk/version1.0/includes/modules/acp/acp_smtp.php trunk/version1.0/includes/start.php trunk/version1.0/rss.php trunk/version1.0/versie.php Removed Paths: ------------- trunk/version1.0/includes/classes/class.config.php trunk/version1.0/xml.php Property Changed: ---------------- trunk/version1.0/includes/db/db.php trunk/version1.0/includes/db/msaccess.php trunk/version1.0/includes/db/mssql.php trunk/version1.0/includes/db/mysql.php trunk/version1.0/includes/db/postsql.php trunk/version1.0/includes/modules/acp/acp_config_general.php trunk/version1.0/includes/modules/acp/acp_config_user.php trunk/version1.0/includes/modules/acp/acp_ftp.php trunk/version1.0/includes/modules/acp/acp_header.php trunk/version1.0/includes/modules/acp/acp_info.php trunk/version1.0/includes/modules/acp/acp_layout.php trunk/version1.0/includes/modules/acp/acp_multisite.php trunk/version1.0/includes/modules/acp/acp_plugin.php trunk/version1.0/includes/modules/acp/acp_smtp.php trunk/version1.0/includes/modules/acp/acp_update.php Modified: trunk/version1.0/cache/config.php =================================================================== --- trunk/version1.0/cache/config.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/cache/config.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -1 +1 @@ -<?php $this->config = array('installid'=>'404F6372-41B5-92FB-B4B4-E5C4989F5CD5');?> \ No newline at end of file +<?php $this->config = array('add1'=>'','add2'=>'','cache'=>'0','default_tpl'=>'rcts','email'=>'','enable_ads'=>'0','ftp_gb'=>'','ftp_root'=>'/','ftp_server'=>'ftp.localhost','ftp_ww'=>'','gzip'=>'0','image_catch'=>'60','installid'=>'B0C1BFF7-B74D-A08D-C564-078F7BBA5253','menu_on'=>'0','mod_rewrite'=>'0','password'=>'a6f61377a9afffcfcf43756da6e6fd10','plugin_menu'=>'','smtp_gb'=>'','smtp_host'=>'','smtp_port'=>'25','smtp_ww'=>'','startdate'=>'1144085512','stats_open'=>'1','username'=>'6c63212ab48e8401eaf6b59b95d816a9','use_dw'=>'0','use_ftp'=>'0','use_multisite'=>'0','use_smtp'=>'0','version'=>'2.0.0-dev');?> \ No newline at end of file Modified: trunk/version1.0/includes/classes/class.calendar.php =================================================================== --- trunk/version1.0/includes/classes/class.calendar.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.calendar.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -508,7 +508,7 @@ function assign_calendar_template($idid, $timestamp = 0) { - global $template, $core, $config, $db; + global $template, $core, $db; if(!$timestamp) { Deleted: trunk/version1.0/includes/classes/class.config.php =================================================================== --- trunk/version1.0/includes/classes/class.config.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.config.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -1,216 +0,0 @@ -<?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* class.config.php -* **************** -* $Id$ -******************************************************************/ -/******************************************************************* -* -* 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. -* -*******************************************************************/ -if(!defined('IN_STATS')) -{ - die('Hacking Attempt'); -} - -/** -* Config class -* -* Handles all configuration. -* @author Really Coding Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -*/ - -class config{ - var $load = false; - - /** - * load() - * - * This function loads the configuration in from the database. - * Example: - * <code> - * <?php - * $config->load(); - * ?> - * </code> - */ - function config(){ - global $db; - unset($this->config); - $this->config = array(); - $sql = "SELECT * FROM ".RCTS_CONFIG_TABLE.""; - if(($result = $db->sql_query($sql))){ - while ( $row = $db->sql_fetchrow($result) ) - { - $this->config[$row['naam']] = $row['waarde']; - } - } - $this->ww = $this->config['password']; - $this->name = $this->config['username']; - $this->crypt = md5($this->name); - $this->load = true; - } - /** - * update() - * - * This function updates a given configuration option. - * Example: - * <code> - * <?php - * $config->update('default_tpl', 'rcts'); - * ?> - * </code> - * @param string $naam Name of option - * @param string $waarde Option value - */ - function update($naam,$waarde){ - global $db; - $naam = str_replace("\'", "''", $naam); - $waarde = str_replace("\'", "''", $waarde); - if(preg_match("#DROP|UNION|DATABASE#si",$naam) || preg_match("#DROP|UNION|DATABASE#si",$waarde)){ - st_die(RCTS_CRITICAL_ERROR,"I don't like hackers."); - } - if($this->config[$naam] != $waarde){ - $sql = "UPDATE ".RCTS_CONFIG_TABLE." SET waarde = '$waarde' WHERE naam = '$naam'"; - $db->sql_query($sql); - if(!$db->sql_affectedrows()){ - $sql = "INSERT INTO ".RCTS_CONFIG_TABLE." - (naam,waarde) VALUES - ('$naam','$waarde')"; - $db->sql_query($sql); - } - if($naam == 'mod_rewrite'){ - $waarde = (int)$waarde; - $this->write_htacces($waarde); - } - } - } - /** - * login() - * - * This function logs you in, according to what is given in GET/POST vars. - */ - function login($goto = "conf.php"){ - global $core; - if(!$this->load){ - $this->load(); - } - if($this->is_login()){ - return false; - }else{ - if(isset($_POST['uname'])){ - if(md5(get_var("ww")) == $this->ww && md5(get_var("uname")) == $this->name){ - if (isset($_REQUEST['autologin']) && get_var("autologin") == "yes") { - setcookie($this->crypt,true,(time() + 60 * 60 * 24 * 30));// 1 month - } else { - setcookie($this->crypt,true); // Just a session cookie - } - loc($goto); - die; - }else{ - trigger_error($core->lang['pass_error'],E_USER_NOTICE); - } - } - } - return false; - } - /** - * is_login() - * - * This function will check if the viewer is logged in. - * @return boolean Is the user logged in? - */ - function is_login(){ - return get_var($this->crypt,false,true); - } - /** - * is() - * - * Just an alias for is_login() - * @deprecated - */ - function is(){ - return $this->is_login(); - } - /** - * geef() - * - * Checks if the user is logged in, and does all stuff for the configuration page. - */ - - /** - * form() - * - * This function builds the login form, and outputs it. - * - */ - function form($res="conf.php"){ - global $template,$core; - pageHeader("Login"); - if(isset($_POST['uname'])){ - $this->login(); - } - $template->add_file(array("body"=>"login.html")); - $template->assign(array( - "action" => $res, - "L_LOGIN" => $core->lang['Stats_Login'], - "L_UNAME" => $core->lang['Stats_Uname'], - "L_PASS" => $core->lang['Stats_Pass'], - "L_AUTOLOGIN" => $core->lang['Stats_Autologin'], - )); - $template->parse("body"); - pageFooter(); - } - /** - * write_htacces() - * - * Writes the .htaccess file, and adds the RewriteRules. - * Example: - * <code> - * <?php - * $config->write_htacces(true); // Enable - * $config->write_htacces(false); // Disable - * ?> - * </code> - * @param boolean $en Enable or disable? - */ - function write_htacces($en){ - global $cache; - $array = array( - "RewriteEngine On", - // "RewriteBase /", - "RewriteRule ^mode/([a-zA-Z0-9]*).html stats.php?%{QUERY_STRING}&mode=$1", - "RewriteRule ^img/uniek/([a-zA-Z0-9]*)/ graph.php?%{QUERY_STRING}&graph=uniek&soort=$1", - "RewriteRule ^img/([a-zA-Z0-9]*)/ graph.php?%{QUERY_STRING}&graph=$1" - ); - $array2 = array('','',''); - if(file_exists(RCTS_ROOT_PATH . '/.htaccess')){ - $file = file_get_contents(RCTS_ROOT_PATH . '/.htaccess'); - }else{ - $file = ""; - if(!$en){ - return true; - } - } - $file = str_replace($array,$array2,$file); - - if($en){ - $file .= "\r\n"; - for($i = 0; $i < count($array);$i++){ - $file .= $array[$i] . "\r\n"; - } - } - $cache->write(RCTS_ROOT_PATH . '/.htaccess',"w",4,array(),$file); - return true; - } -} -?> Modified: trunk/version1.0/includes/classes/class.core.php =================================================================== --- trunk/version1.0/includes/classes/class.core.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.core.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -159,7 +159,7 @@ @return Nothing */ function checkversion(){ - global $config,$browser,$cache; + global $browser,$cache; $offline = false; $f = RCTS_ROOT_PATH . '/cache/version.txt'; if(!is_writable($f)){ @@ -203,7 +203,7 @@ return; } $data = $this->parse($data); - $v = (isset($config->config['version'])) ? $config->config['version'] : "0.0.5"; + $v = $this->config_get('version'); if(!isset($data['version'])){ //No version found. }else{ @@ -222,7 +222,7 @@ $o = false; } if(!$o){ - if($config->is()){ + if($this->is_login()){ if(version_compare($v, $v2, "<")){ //Don't set $data['offline'] to true! $o = true; @@ -307,7 +307,7 @@ st_die(GENERAL_ERROR,'Block not found. Block: ' . $search); } function check_conf($mode,$plugin = null){ - global $config,$browser,$pluginsClass; + global $browser,$pluginsClass; if($mode == 'RCTS'){ $file = 'http://2.reallycoding.nl/version/version.txt'; $block = 'rcts'; @@ -348,7 +348,7 @@ return; } $data = $this->parse($data,$block); - $v = (isset($config->config['version'])) ? $config->config['version'] : "0.0.5"; + $v = $this->config_get('version'); if(!isset($data['version'])){ //No version found. return false; @@ -431,7 +431,7 @@ } } function adminheader(){ - global $template,$config; + global $template; if(defined('ah')) return; define('ah',true); if(!defined('small')){ @@ -561,8 +561,8 @@ if(!$this->config_get('use_dw')){ return; } - $array['version'] = $config->config['version']; - $array['config'] = $config->config; + $array['version'] = $this->config_get('version'); + $array['config'] = $cache->config; //Unset some vars. for($i = 0; $i < count($this->unset);$i++){ unset($array['config'][$this->unset[$i]]); Modified: trunk/version1.0/includes/classes/class.cron.php =================================================================== --- trunk/version1.0/includes/classes/class.cron.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.cron.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -51,7 +51,7 @@ * @param mixed $kalDay Calendar day. */ function cache($graph,$soort,$idid,$kalDay="ALL"){ - global $db,$stats,$display,$config,$template ; + global $db,$stats,$display,$core,$template ; $this->tpl = $template->used_tpl; $func = get_var("func"); @@ -73,7 +73,7 @@ $file = RCTS_ROOT_PATH . '/cache/'.$this->tpl.'/S_'.$idid.'/' . $graphName . ".png"; - if($config->config['image_catch'] == 0 || $kalDay != "ALL"){ + if($core->config_get('image_catch') == 0 || $kalDay != "ALL"){ $this->write($graph,$soort,$idid,$func,$kalDay); }elseif(file_exists($file)){ @@ -81,7 +81,7 @@ $r = $db->sql_query($sql); $g = $db->sql_fetchrow($r); - $secAdd = 60*$config->config['image_catch']; + $secAdd = 60*$core->config_get('image_catch'); if($db->sql_numrows($r) == 0 || $g['tijd'] <= (time()-$secAdd)){ @@ -131,7 +131,7 @@ * @param mixed $kalDay Calendar day. */ function write($graph,$soort,$idid,$func,$kalDay = "ALL"){ - global $config,$db,$pluginsClass,$plugin,$cache; + global $core,$db,$pluginsClass,$plugin,$cache; if($func){ $graphName = $graph . '_' . $func; @@ -170,7 +170,7 @@ error_reporting($old); - if($config->config['image_catch'] != 0 && strtolower($kalDay) == "all"){ + if($core->config_get('image_catch')o != 0 && strtolower($kalDay) == "all"){ $p = array( "mkdir" => true, "dir" => RCTS_ROOT_PATH . '/cache/'.$this->tpl.'/S_'.$idid, Modified: trunk/version1.0/includes/classes/class.layout.php =================================================================== --- trunk/version1.0/includes/classes/class.layout.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.layout.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -1,4 +1,4 @@ -<?PHP +<?php /****************************************************************** * Really Coding Traffic Statistics 2 * Begin: October, 3rd 2005 Modified: trunk/version1.0/includes/classes/class.multisite.php =================================================================== --- trunk/version1.0/includes/classes/class.multisite.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.multisite.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -27,10 +27,10 @@ */ function getIdId() { - global $db,$config; + global $db,$core; $indentfer = get_var('indentifer'); $location = get_var('loc'); - if($config->config['use_multisite']){ + if($core->config_get('use_multisite')){ if($indentfer=="" || !isset($indentfer)){ $indentfer=$location; } Modified: trunk/version1.0/includes/classes/class.phplot.php =================================================================== --- trunk/version1.0/includes/classes/class.phplot.php 2006-05-17 09:45:40 UTC (rev 1857) +++ trunk/version1.0/includes/classes/class.phplot.php 2006-05-17 10:07:15 UTC (rev 1858) @@ -1,4457 +1,4476 @@ -<?php - -/* $Id: phplot.php,v 1.95 2004/10/24 16:40:58 migueldb Exp $ */ - -/* - * PHPLOT Version 5.0.rc1 - * Copyright (C) 1998, 1999, 2000, 2001 Afan Ottenheimer. Released under - * the GPL and PHP licenses as stated in the the README file which should - * have been included with this document. - * - * Recent (2003-2004) work by Miguel de Benito Delgado <nonick AT vodafone DOT es> - * - * Requires PHP 4.2.0 or later (CHECK THIS) - */ - -if (! defined(__FUNCTION__)) - define(__FUNCTION__, '__FUNCTION__ Requires at least PHP 4.3.0.'); - -define ('MINY', -1); // Indexes in $data (for DrawXDataLine()) -define ('MAXY', -2); -define ('TOTY', -3); - -error_reporting(E_ALL); - -class PHPlot { - - /* I have removed internal variable declarations, some isset() checking was required, - * but now the variables left are those which can be tweaked by the user. This is intended to - * be the first step towards moving most of the Set...() methods into a subclass which will be - * used only when strictly necessary. Many users will be able to put default values here in the - * class and thus avoid memory overhead and reduce parsing times. - */ - //////////////// CONFIG PARAMETERS ////////////////////// - - var $is_inline = FALSE; // FALSE = Sends headers, TRUE = sends just raw image data - var $browser_cache = FALSE; // FALSE = Sends headers for browser to not cache the image, - // (only if is_inline = FALSE also) - - var $safe_margin = 5; // Extra margin used in several places. In pixels - - var $x_axis_position = ''; // Where to draw both axis (world coordinates), - var $y_axis_position = ''; // leave blank for X axis at 0 and Y axis at left of plot. - - var $xscale_type = 'linear'; // linear, log - var $yscale_type = 'linear'; - -//Fonts - var $use_ttf = FALSE; // Use True Type Fonts? - var $ttf_path = '.'; // Default path to look in for TT Fonts. - var $default_ttfont = 'benjamingothic.ttf'; - var $line_spacing = 4; // Pixels between lines. - - // Font angles: 0 or 90 degrees for fixed fonts, any for TTF - var $x_label_angle = 0; // For labels on X axis (tick and data) - var $y_label_angle = 0; // For labels on Y axis (tick and data) - var $x_title_angle = 0; // Don't change this if you don't want to screw things up! - var $y_title_angle = 90; // Nor this. - var $title_angle = 0; // Or this. - -//Formats - var $file_format = 'png'; - var $output_file = ''; // For output to a file instead of stdout - -//Data - var $data_type = 'text-data'; // text-data, data-data-error, data-data, text-data-single - var $plot_type= 'linepoints'; // bars, lines, linepoints, area, points, pie, thinbarline, squared - - var $label_scale_position = 0.5; // Shifts data labes in pie charts. 1 = top, 0 = bottom - var $group_frac_width = 0.7; // value from 0 to 1 = width of bar groups - var $bar_width_adjust = 1; // 1 = bars of normal width, must be > 0 - - var $y_precision = 1; - var $x_precision = 1; - - var $data_units_text = ''; // Units text for 'data' labels (i.e: '\xA4', '$', etc.) - -// Titles - var $title_txt = ''; - - var $x_title_txt = ''; - var $x_title_pos = 'plotdown'; // plotdown, plotup, both, none - - var $y_title_txt = ''; - var $y_title_pos = 'plotleft'; // plotleft, plotright, both, none - - -//Labels - // There are two types of labels in PHPlot: - // Tick labels: they follow the grid, next to ticks in axis. (DONE) - // they are drawn at grid drawing time, by DrawXTicks() and DrawYTicks() - // Data labels: they follow the data points, and can be placed on the axis or the plot (x/y) (TODO) - // they are drawn at graph plotting time, by Draw*DataLabel(), called by DrawLines(), etc. - // Draw*DataLabel() also draws H/V lines to datapoints depending on draw_*_data_label_lines - - // Tick Labels - var $x_tick_label_pos = 'plotdown'; // plotdown, plotup, both, xaxis, none - var $y_tick_label_pos = 'plotleft'; // plotleft, plotright, both, yaxis, none - - // Data Labels: - var $x_data_label_pos = 'plotdown'; // plotdown, plotup, both, plot, all, none - var $y_data_label_pos = 'plotleft'; // plotleft, plotright, both, plot, all, none - - var $draw_x_data_label_lines = FALSE; // Draw a line from the data point to the axis? - var $draw_y_data_label_lines = FALSE; // TODO - - // Label types: (for tick, data and plot labels) - var $x_label_type = ''; // data, time. Leave blank for no formatting. - var $y_label_type = ''; // data, time. Leave blank for no formatting. - var $x_time_format = '%H:%m:%s'; // See http://www.php.net/manual/html/function.strftime.html - var $y_time_format = '%H:%m:%s'; // SetYTimeFormat() too... - - // Skipping labels - var $x_label_inc = 1; // Draw a label every this many (1 = all) (TODO) - var $y_label_inc = 1; - var $_x_label_cnt = 0; // internal count FIXME: work in progress - - // Legend - var $legend = ''; // An array with legend titles - var $legend_x_pos = ''; - var $legend_y_pos = ''; - - -//Ticks - var $x_tick_length = 5; // tick length in pixels for upper/lower axis - var $y_tick_length = 5; // tick length in pixels for left/right axis - - var $x_tick_cross = 3; // ticks cross x axis this many pixels - var $y_tick_cross = 3; // ticks cross y axis this many pixels - - var $x_tick_pos = 'plotdown'; // plotdown, plotup, both, xaxis, none - var $y_tick_pos = 'plotleft'; // plotright, plotleft, both, yaxis, none - - var $num_x_ticks = ''; - var $num_y_ticks = ''; - - var $x_tick_inc = ''; // Set num_x_ticks or x_tick_inc, not both. - var $y_tick_inc = ''; // Set num_y_ticks or y_tick_inc, not both. - - var $skip_top_tick = FALSE; - var $skip_bottom_tick = FALSE; - var $skip_left_tick = FALSE; - var $skip_right_tick = FALSE; - -//Grid Formatting - var $draw_x_grid = FALSE; - var $draw_y_grid = TRUE; - - var $dashed_grid = TRUE; - var $grid_at_foreground = FALSE; // Chooses whether to draw the grid below or above the graph - -//Colors and styles (all colors can be array (R,G,B) or named color) - var $color_array = 'small'; // 'small', 'large' or array (define your own colors) - // See rgb.inc.php and SetRGBArray() - var $i_border = array(194, 194, 194); - var $plot_bg_color = 'white'; - var $bg_color = 'white'; - var $label_color = 'black'; - var $text_color = 'black'; - var $grid_color = 'black'; - var $light_grid_color = 'gray'; - var $tick_color = 'black'; - var $title_color = 'black'; - var $data_colors = array('SkyBlue', 'green', 'orange', 'blue', 'orange', 'red', 'violet', 'azure1'); - var $error_bar_colors = array('SkyBlue', 'green', 'orange', 'blue', 'orange', 'red', 'violet', 'azure1'); - var $data_border_colors = array('black'); - - var $line_widths = 1; // single value or array - var $line_styles = array('solid', 'solid', 'dashed'); // single value or array - var $dashed_style = '2-4'; // colored dots-transparent dots - - var $point_sizes = array(5,5,3); // single value or array - var $point_shapes = array('diamond'); // rect, circle, diamond, triangle, dot, line, halfline, cross - - var $error_bar_size = 5; // right and left size of tee - var $error_bar_shape = 'tee'; // 'tee' or 'line' - var $error_bar_line_width = 1; // single value (or array TODO) - - var $plot_border_type = 'sides'; // left, sides, none, full - var $image_border_type = 'none'; // 'raised', 'plain', 'none' - - var $shading = 5; // 0 for no shading, > 0 is size of shadows in pixels - - var $draw_plot_area_background = FALSE; - var $draw_broken_lines = FALSE; // Tells not to draw lines for missing Y data. - - -////////////////////////////////////////////////////// -//BEGIN CODE -////////////////////////////////////////////////////// - - /*! - * Constructor: Setup img resource, colors and size of the image, and font sizes. - * - * \param which_width int Image width in pixels. - * \param which_height int Image height in pixels. - * \param which_output_file string Filename for output. - * \param which_input_fule string Path to a file to be used as background. - */ - function PHPlot($which_width=600, $which_height=400, $which_output_file=NULL, $which_input_file=NULL) - { - /* - * Please see http://www.php.net/register_shutdown_function - * PLEASE NOTE: register_shutdown_function() will take a copy of the object rather than a reference - * so we put an ampersand. However, the function registered will work on the object as it - * was upon registration. To solve this, one of two methods can be used: - * $obj = new object(); - * register_shutdown_function(array(&$obj,'shutdown')); - * OR - * $obj = &new object(); - * HOWEVER, as the second statement assigns $obj a reference to the current object, it might be that - * several instances mess things up... (CHECK THIS) - * - * AND - * as $this->img is set upon construction of the object, problems will not arise for us (for the - * moment maybe, so I put all this here just in case) - */ - register_shutdown_function(array(&$this, '_PHPlot')); - - $this->SetRGBArray($this->color_array); - - $this->background_done = FALSE; // Set to TRUE after background image is drawn once - - if ($which_output_file) - $this->SetOutputFile($which_output_file); - - if ($which_input_file) - $this->SetInputFile($which_input_file); - else { - $this->image_width = $which_width; - $this->image_height = $which_height; - - $this->img = ImageCreate($this->image_width, $this->image_height); - if (! $this->img) - $this->PrintError('PHPlot(): Could not create image resource.'); - - } - - $this->SetDefaultStyles(); - $this->use_ttf = TRUE; - $this->default_ttfont = 'FreeSans.ttf'; - $this->SetDefaultFonts(); - - $this->SetTitle(''); - $this->SetXTitle(''); - $this->SetYTitle(''); - - $this->print_image = TRUE; // Use for multiple plots per image (TODO: automatic) -/* $this->use_ttf = TRUE; - $this->ttf_path = RCTS_ROOT_PATH.'/includes'; - $this->default_ttfont = 'FreeSans.ttf';*/ - - } - - /*! - * Destructor. Image resources not deallocated can be memory hogs, I think - * it is safer to automatically call imagedestroy upon script termination than - * do it ourselves. - * See notes in the constructor code. - */ - function _PHPlot () - { - ImageDestroy($this->img); - return; - } - - -///////////////////////////////////////////// -////////////// COLORS -///////////////////////////////////////////// - - /*! - * Returns an index to a color passed in as anything (string, hex, rgb) - * - * \param which_color * Color (can be '#AABBCC', 'Colorname', or array(r,g,b)) - */ - function SetIndexColor($which_color) - { - list ($r, $g, $b) = $this->SetRGBColor($which_color); //Translate to RGB - $index = ImageColorExact($this->img, $r, $g, $b); - if ($index == -1) { - return ImageColorResolve($this->img, $r, $g, $b); - } else { - return $index; - } - } - - - /*! - * Returns an index to a slightly darker color than the one requested. - */ - function SetIndexDarkColor($which_color) - { - list ($r, $g, $b) = $this->SetRGBColor($which_color); - - $r -= 0x30; $r = ($r < 0) ? 0 : $r; - $g -= 0x30; $g = ($g < 0) ? 0 : $g; - $b -= 0x30; $b = ($b < 0) ? 0 : $b; - - $index = ImageColorExact($this->img, $r, $g, $b); - if ($index == -1) { - return ImageColorResolve($this->img, $r, $g, $b); - } else { - return $index; - } - } - - /*! - * Sets/reverts all colors and styles to their defaults. If session is set, then only updates indices, - * as they are lost with every script execution, else, sets the default colors by name or value and - * then updates indices too. - * - * FIXME Isn't this too slow? - * - */ - function SetDefaultStyles() - { - /* Some of the Set*() functions use default values when they get no parameters. */ - - if (! isset($this->session_set)) { - // If sessions are enabled, this variable will be preserved, so upon future executions, we - // will have it set, as well as color names (though not color indices, that's why we - // need to rebuild them) - $this->session_set = TRUE; - - // These only need to be set once - $this->SetLineWidths(); - $this->SetLineStyles(); - $this->SetDefaultDashedStyle($this->dashed_style); - $this->SetPointSizes($this->point_sizes); - } - - $this->SetImageBorderColor($this->i_border); - $this->SetPlotBgColor($this->plot_bg_color); - $this->SetBackgroundColor($this->bg_color); - $this->SetLabelColor($this->label_color); - $this->SetTextColor($this->text_color); - $this->SetGridColor($this->grid_color); - $this->SetLightGridColor($this->light_grid_color); - $this->SetTickColor($this->tick_color); - $this->SetTitleColor($this->title_color); - $this->SetDataColors(); - $this->SetErrorBarColors(); - $this->SetDataBorderColors(); - } - - - /* - * - */ - function SetBackgroundColor($which_color) - { - $this->bg_color= $which_color; - $this->ndx_bg_color= $this->SetIndexColor($this->bg_color); - return TRUE; - } - - /* - * - */ - function SetPlotBgColor($which_color) - { - $this->plot_bg_color= $which_color; - $this->ndx_plot_bg_color= $this->SetIndexColor($this->plot_bg_color); - return TRUE; - } - - /* - * - */ - function SetTitleColor($which_color) - { - $this->title_color= $which_color; - $this->ndx_title_color= $this->SetIndexColor($this->title_color); - return TRUE; - } - - /* - * - */ - function SetTickColor ($which_color) - { - $this->tick_color= $which_color; - $this->ndx_tick_color= $this->SetIndexColor($this->tick_color); - return TRUE; - } - - - /* - * - */ - function SetLabelColor ($which_color) - { - $this->label_color = $which_color; - $this->ndx_title_color= $this->SetIndexColor($this->label_color); - return TRUE; - } - - - /* - * - */ - function SetTextColor ($which_color) - { - $this->text_color= $which_color; - $this->ndx_text_color= $this->SetIndexColor($this->text_color); - return TRUE; - } - - - /* - * - */ - function SetLightGridColor ($which_color) - { - $this->light_grid_color= $which_color; - $this->ndx_light_grid_color= $this->SetIndexColor($this->light_grid_color); - return TRUE; - } - - - /* - * - */ - function SetGridColor ($which_color) - { - $this->grid_color = $which_color; - $this->ndx_grid_color= $this->SetIndexColor($this->grid_color); - return TRUE; - } - - - /* - * - */ - function SetImageBorderColor($which_color) - { - $this->i_border = $which_color; - $this->ndx_i_border = $this->SetIndexColor($this->i_border); - $this->ndx_i_border_dark = $this->SetIndexDarkColor($this->i_border); - return TRUE; - } - - - /* - * - */ - function SetTransparentColor($which_color) - { - ImageColorTransparent($this->img, $this->SetIndexColor($which_color)); - return TRUE; - } - - - /*! - * Sets the array of colors to be used. It can be user defined, a small predefined one - * or a large one included from 'rgb.inc.php'. - * - * \param which_color_array If an array, the used as color array. If a string can - * be one of 'small' or 'large'. - */ - function SetRGBArray ($which_color_array) - { - if ( is_array($which_color_array) ) { // User defined array - $this->rgb_array = $which_color_array; - return TRUE; - } elseif ($which_color_array == 'small') { // Small predefined color array - $this->rgb_array = array( - 'white' => array(255, 255, 255), - 'snow' => array(255, 250, 250), - 'PeachPuff' => array(255, 218, 185), - 'ivory' => array(255, 255, 240), - 'lavender' => array(230, 230, 250), - 'black' => array( 0, 0, 0), - 'DimGrey' => array(105, 105, 105), - 'gray' => array(190, 190, 190), - 'grey' => array(190, 190, 190), - 'navy' => array( 0, 0, 128), - 'SlateBlue' => array(106, 90, 205), - 'blue' => array( 0, 0, 255), - 'SkyBlue' => array(135, 206, 235), - 'cyan' => array( 0, 255, 255), - 'DarkGreen' => array( 0, 100, 0), - 'green' => array( 0, 255, 0), - 'YellowGreen' => array(154, 205, 50), - 'yellow' => array(255, 255, 0), - 'orange' => array(255, 165, 0), - 'gold' => array(255, 215, 0), - 'peru' => array(205, 133, 63), - 'beige' => array(245, 245, 220), - 'wheat' => array(245, 222, 179), - 'tan' => array(210, 180, 140), - 'brown' => array(165, 42, 42), - 'salmon' => array(250, 128, 114), - 'red' => array(255, 0, 0), - 'pink' => array(255, 192, 203), - 'maroon' => array(176, 48, 96), - 'magenta' => array(255, 0, 255), - 'violet' => array(238, 130, 238), - 'plum' => array(221, 160, 221), - 'orchid' => array(218, 112, 214), - 'purple' => array(160, 32, 240), - 'azure1' => array(240, 255, 255), - 'aquamarine1' => array(127, 255, 212) - ); - return TRUE; - } else { // Default to black and white only. - $this->rgb_array = array('white' => array(255, 255, 255), 'black' => array(0, 0, 0)); - } - - return TRUE; - } - - /*! - * Returns an array in R, G, B format 0-255 - * - * \param color_asked array(R,G,B) or string (named color or '#AABBCC') - */ - function SetRGBColor($color_asked) - { - if ($color_asked == '') { $color_asked = array(0, 0, 0); }; - - if ( count($color_asked) == 3 ) { // already array of 3 rgb - $ret_val = $color_asked; - } else { // asking for a color by string - if(substr($color_asked, 0, 1) == '#') { // asking in #FFFFFF format. - $ret_val = array(hexdec(substr($color_asked, 1, 2)), hexdec(substr($color_asked, 3, 2)), - hexdec(substr($color_asked, 5, 2))); - } else { // asking by color name - $ret_val = $this->rgb_array[$color_asked]; - } - } - return $ret_val; - } - - - /*! - * Sets the colors for the data. - */ - function SetDataColors($which_data = NULL, $which_border = NULL) - { - if (is_null($which_data) && is_array($this->data_colors)) { - // use already set data_colors - } else if (! is_array($which_data)) { - $this->data_colors = ($which_data) ? array($which_data) : array('blue', 'red', 'green', 'orange'); - } else { - $this->data_colors = $which_data; - } - - $i = 0; - foreach ($this->data_colors as $col) { - $this->ndx_data_colors[$i] = $this->SetIndexColor($col); - $this->ndx_data_dark_colors[$i] = $this->SetIndexDarkColor($col); - $i++; - } - - // For past compatibility: - $this->SetDataBorderColors($which_border); - } // function SetDataColors() - - - /*! - * - */ - function SetDataBorderColors($which_br = NULL) - { - if (is_null($which_br) && is_array($this->data_border_colors)) { - // use already set data_border_colors - } else if (! is_array($which_br)) { - // Create new array with specified color - $this->data_border_colors = ($which_br) ? array($which_br) : array('black'); - } else { - $this->data_border_colors = $which_br; - } - - $i = 0; - foreach($this->data_border_colors as $col) { - $this->ndx_data_border_colors[$i] = $this->SetIndexColor($col); - $i++; - } - } // function SetDataBorderColors() - - - /*! - * Sets the colors for the data error bars. - */ - function SetErrorBarColors($which_err = NULL) - { - if (is_null($which_err) && is_array($this->error_bar_colors)) { - // use already set error_bar_colors - } else if (! is_array($which_err)) { - $this->error_bar_colors = ($which_err) ? array($which_err) : array('black'); - } else { - $this->error_bar_colors = $which_err; - } - - $i = 0; - foreach($this->error_bar_colors as $col) { - $this->ndx_error_bar_colors[$i] = $this->SetIndexColor($col); - $i++; - } - return TRUE; - - } // function SetErrorBarColors() - - - /*! - * Sets the default dashed style. - * \param which_style A string specifying order of colored and transparent dots, - * i.e: '4-3' means 4 colored, 3 transparent; - * '2-3-1-2' means 2 colored, 3 transparent, 1 colored, 2 transparent. - */ - function SetDefaultDashedStyle($which_style) - { - // String: "numcol-numtrans-numcol-numtrans..." - $asked = explode('-', $which_style); - - if (count($asked) < 2) { - $this->DrawError("SetDefaultDashedStyle(): Wrong parameter '$which_style'."); - return FALSE; - } - - // Build the string to be eval()uated later by SetDashedStyle() - $this->default_dashed_style = 'array( '; - - $t = 0; - foreach($asked as $s) { - if ($t % 2 == 0) { - $this->default_dashed_style .= str_repeat('$which_ndxcol,', $s); - } else { - $this->default_dashed_style .= str_repeat('IMG_COLOR_TRANSPARENT,', $s); - } - $t++; - } - // Remove trailing comma and add closing parenthesis - $this->default_dashed_style = substr($this->default_dashed_style, 0, -1); - $this->default_dashed_style .= ')'; - - return TRUE; - } - - - /*! - * Sets the style before drawing a dashed line. Defaults to $this->default_dashed_style - * \param which_ndxcol Color index to be used. - */ - function SetDashedStyle($which_ndxcol) - { - // See SetDefaultDashedStyle() to understand this. - $style = ''; - eval ("\$style = $this->default_dashed_style;"); - return imagesetstyle($this->img, $style); - } - - - /*! - * Sets line widths on a per-line basis. - */ - function SetLineWidths($which_lw=NULL) - { - if (is_null($which_lw)) { - // Do nothing, use default value. - } else if (is_array($which_lw)) { - // Did we get an array with line widths? - $this->line_widths = $which_lw; - } else { - $this->line_widths = array($which_lw); - } - return TRUE; - } - - /*! - * - */ - function SetLineStyles($which_ls=NULL) - { - if (is_null($which_ls)) { - // Do nothing, use default value. - } else if (! is_array($which_ls)) { - // Did we get an array with line styles? - $this->line_styles = $which_ls; - } else { - $this->line_styles = ($which_ls) ? array($which_ls) : array('solid'); - } - return TRUE; - } - - -///////////////////////////////////////////// -////////////// FONTS -///////////////////////////////////////////// - - - /*! - * Sets number of pixels between lines of the same text. - */ - function SetLineSpacing($which_spc) - { - $this->line_spacing = $which_spc; - } - - - /*! - * Enables use of TrueType fonts in the graph. Font initialisation methods - * depend on this setting, so when called, SetUseTTF() resets the font - * settings - */ - function SetUseTTF($which_ttf) - { - $this->use_ttf = $which_ttf; - if ($which_ttf) - $this->SetDefaultFonts(); - return TRUE; - } - - /*! - * Sets the directory name to look into for TrueType fonts. - */ - function SetTTFPath($which_path) - { - // Maybe someone needs really dynamic config. He'll need this: - // clearstatcache(); - - if (is_dir($which_path) && is_readable($which_path)) { - $this->ttf_path = $which_path; - return TRUE; - } else { - $this->PrintError("SetTTFPath(): $which_path is not a valid path."); - return FALSE; - } - } - - /*! - * Sets the default TrueType font and updates all fonts to that. - */ - function SetDefaultTTFont($which_font) - { - if (is_file($which_font) && is_readable($which_font)) { - $this->default_ttfont = $which_font; - return $this->SetDefaultFonts(); - } else { - $this->PrintError("SetDefaultTTFont(): $which_font is not a valid font file."); - return FALSE; - } - } - - /*! - * Sets fonts to their defaults - */ - function SetDefaultFonts() - { - // TTF: - if ($this->use_ttf) { - //$this->SetTTFPath(dirname($_SERVER['PHP_SELF'])); - $this->SetTTFPath(RCTS_ROOT_PATH.'/includes/'); - $this->SetFont('generic', $this->default_ttfont, 8); - $this->SetFont('title', $this->default_ttfont, 14); - $this->SetFont('legend', $this->default_ttfont, 8); - $this->SetFont('x_label', $this->default_ttfont, 6); - $this->SetFont('y_label', $this->default_ttfont, 6); - $this->SetFont('x_title', $this->default_ttfont, 10); - $this->SetFont('y_title', $this->default_ttfont, 10); - } - // Fixed: - else { - $this->SetFont('generic', 2); - $this->SetFont('title', 5); - $this->SetFont('legend', 2); - $this->SetFont('x_label', 1); - $this->SetFont('y_label', 1); - $this->SetFont('x_title', 3); - $this->SetFont('y_title', 3); - } - - return TRUE; - } - - /*! - * Sets Fixed/Truetype font parameters. - * \param $which_elem Is the element whose font is to be changed. - * It can be one of 'title', 'legend', 'generic', - * 'x_label', 'y_label', x_title' or 'y_title' - * \param $which_font Can be a number (for fixed font sizes) or - * a string with the filename when using TTFonts. - * \param $which_size Point size (TTF only) - * Calculates and updates internal height and width variables. - */ - function SetFont($which_elem, $which_font, $which_size = 12) - { - // TTF: - if ($this->use_ttf) { - $path = $this->ttf_path.'/'.$which_font; - - if (! is_file($path) || ! is_readable($path) ) { - $this->DrawError("SetFont(): True Type font $path doesn't exist"); - return FALSE; - } - - switch ($which_elem) { - case 'generic': - $this->generic_font['font'] = $path; - $this->generic_font['size'] = $which_size; - break; - case 'title': - $this->title_font['font'] = $path; - $this->title_font['size'] = $which_size; - break; - case 'legend': - $this->legend_font['font'] = $path; - $this->legend_font['size'] = $which_size; - break; - case 'x_label': - $this->x_label_font['font'] = $path; - $this->x_label_font['size'] = $which_size; - break; - case 'y_label': - $this->y_label_font['font'] = $path; - $this->y_label_font['size'] = $which_size; - break; - case 'x_title': - $this->x_title_font['font'] = $path; - $this->x_title_font['size'] = $which_size; - break; - case 'y_title': - $this->y_title_font['font'] = $path; - $this->y_title_font['size'] = $which_size; - break; - default: - $this->DrawError("SetFont(): Unknown element '$which_elem' specified."); - return FALSE; - } - return TRUE; - - } - - // Fixed fonts: - if ($which_font > 5 || $which_font < 0) { - $this->DrawError('SetFont(): Non-TTF font size must be 1, 2, 3, 4 or 5'); - return FALSE; - } - - switch ($which_elem) { - case 'generic': - $this->generic_font['font'] = $which_font; - $this->generic_font['height'] = ImageFontHeight($which_font); - $this->generic_font['width'] = ImageFontWidth($which_font); - break; - case 'title': - $this->title_font['font'] = $which_font; - $this->title_font['height'] = ImageFontHeight($which_font); - $this->title_font['width'] = ImageFontWidth($which_font); - break; - case 'legend': - $this->legend_font['font'] = $which_font; - $this->legend_font['height'] = ImageFontHeight($which_font); - $this->legend_font['width'] = ImageFontWidth($which_font); - break; - case 'x_label': - $this->x_label_font['font'] = $which_font; - $this->x_label_font['height'] = ImageFontHeight($which_font); - $this->x_label_font['width'] = ImageFontWidth($which_font); - break; - case 'y_label': - $this->y_label_font['font'] = $which_font; - $this->y_label_font['height'] = ImageFontHeight($which_font); - $this->y_label_font['width'] = ImageFontWidth($which_font); - break; - case 'x_title': - $this->x_title_font['font'] = $which_font; - $this->x_title_font['height'] = ImageFontHeight($which_font); - $this->x_title_font['width'] = ImageFontWidth($which_font); - break; - case 'y_title': - $this->y_title_font['font'] = $which_font; - $this->y_title_font['height'] = ImageFontHeight($which_font); - $this->y_title_font['width'] = ImageFontWidth($which_font); - break; - default: - $this->DrawError("SetFont(): Unknown element '$which_elem' specified."); - return FALSE; - } - return TRUE; - } - - - /*! - * Returns an array with the size of the bounding box of an - * arbitrarily placed (rotated) TrueType text string. - */ - function TTFBBoxSize($size, $angle, $font, $string) - { - // First, assume angle < 90 - $arr = ImageTTFBBox($size, 0, $font, $string); - $flat_width = $arr[2] - $arr[0]; - $flat_height = abs($arr[3] - $arr[5]); - - // Now the bounding box - $angle = deg2rad($angle); - $width = ceil(abs($flat_width*cos($angle) + $flat_height*sin($angle))); //Must be integer - $height = ceil(abs($flat_width*sin($angle) + $flat_height*cos($angle))); //Must be integer - - return array($width, $height); - } - - - /*! - * Draws a string of text. Horizontal and vertical alignment are relative to - * to the drawing. That is: vertical text (90 deg) gets centered along y-axis - * with v_align = 'center', and adjusted to the left of x-axis with h_align = 'right', - * - * \note Original multiple lines code submitted by Remi Ricard. - * \note Original vertical code submitted by Marlin Viss. - */ - function DrawText($which_font, $which_angle, $which_xpos, $which_ypos, $which_color, $which_text, - $which_halign = 'left', $which_valign = 'bottom') - { - // TTF: - if ($this->use_ttf) { - $size = $this->TTFBBoxSize($which_font['size'], $which_angle, $which_font['font'], $which_text); - $rads = deg2rad($which_angle); - - if ($which_valign == 'center') - $which_ypos += $size[1]/2; - - if ($which_valign == 'bottom') - $which_ypos += $size[1]; - - if ($which_halign == 'center') - $which_xpos -= ($size[0]/2) * cos($rads); - - if ($which_halign == 'left') - $which_xpos += $size[0] * sin($rads); - - if ($which_halign == 'right') - $which_xpos -= $size[0] * cos($rads); - - ImageTTFText($this->img, $which_font['size'], $which_angle, - $which_xpos, $which_ypos, $which_color, $which_font['font'], $which_text); - } - // Fixed fonts: - else { - // Split the text by its lines, and count them - $which_text = ereg_replace("\r", "", $which_text); - $str = split("\n", $which_text); - $nlines = count($str); - $spacing = $this->line_spacing * ($nlines - 1); - - // Vertical text: - // (Remember the alignment convention with vertical text) - if ($which_angle == 90) { - // The text goes around $which_xpos. - if ($which_halign == 'center') - $which_xpos -= ($nlines * ($which_font['height'] + $spacing))/2; - - // Left alignment requires no modification to $xpos... - // Right-align it. $which_xpos designated the rightmost x coordinate. - else if ($which_halign == 'right') - $which_xpos += ($nlines * ($which_font['height'] + $spacing)); - - $ypos = $which_ypos; - for($i = 0; $i < $nlines; $i++) { - // Center the text vertically around $which_ypos (each line) - if ($which_valign == 'center') - $ypos = $which_ypos + (strlen($str[$i]) * $which_font['width']) / 2; - // Make the text finish (vertically) at $which_ypos - if ($which_valign == 'bottom') - $ypos = $which_ypos + strlen($str[$i]) * $which_font['width']; - - ImageStringUp($this->img, $which_font['font'], - $i * ($which_font['height'] + $spacing) + $which_xpos, - $ypos, $str[$i], $which_color); - } - } - // Horizontal text: - else { - // The text goes above $which_ypos - if ($which_valign == 'top') - $which_ypos -= $nlines * ($which_font['height'] + $spacing); - // The text is centered around $which_ypos - if ($which_valign == 'center') - $which_ypos -= ($nlines * ($which_font['height'] + $spacing))/2; - // valign = 'bottom' requires no modification - - $xpos = $which_xpos; - for($i = 0; $i < $nlines; $i++) { - // center the text around $which_xpos - if ($which_halign == 'center') - $xpos = $which_xpos - (strlen($str[$i]) * $which_font['width'])/2; - // make the text finish at $which_xpos - if ($which_halign == 'right') - $xpos = $which_xpos - strlen($str[$i]) * $which_font['width']; - - ImageString($this->img, $which_font['font'], $xpos, - $i * ($which_font['height'] + $spacing) + $which_ypos, - $str[$i], $which_color); - } - } - } - return TRUE; - } // function DrawText() - - -///////////////////////////////////////////// -/////////// INPUT / OUTPUT CONTROL -///////////////////////////////////////////// - - /*! - * Sets output file format. - */ - function SetFileFormat($format) - { - $asked = $this->CheckOption($format, 'jpg, png, gif, wbmp', __FUNCTION__); - - switch ($asked) { - case 'jpg': - if (imagetypes() & IMG_JPG) - $this->file_format = 'jpg'; - return TRUE; - break; - case 'png': - if (imagetypes() & IMG_PNG) - $this->file_format = 'png'; - return TRUE; - break; - case 'gif': - if (imagetypes() & IMG_GIF) - $this->file_format = 'gif'; - return TRUE; - break; - case 'wbmp': - if (imagetypes() & IMG_WBMP) - $this->file_format = 'wbmp'; - return TRUE; - break; - default: - $this->PrintError("SetFileFormat():File format '$format' not supported"); - return FALSE; - } - } - - - /*! - * Selects an input file to be used as graph background and scales or tiles this image - * to fit the sizes. - * \param input_file string Path to the file to be used (jpeg, png and gif accepted) - * \param mode string 'centeredtile', 'tile', 'scale' (the image to the graph's size) - */ - function SetBgImage($input_file, $mode='centeredtile') - { - $this->bgmode = $this->CheckOption($mode, 'tile, centeredtile, scale', __FUNCTION__); - $this->bgimg = $input_file; - } - - /*! - * Selects an input file to be used as plot area background and scales or tiles this image - * to fit the sizes. - * \param input_file string Path to the file to be used (jpeg, png and gif accepted) - * \param mode string 'centeredtile', 'tile', 'scale' (the image to the graph's size) - */ - function SetPlotAreaBgImage($input_file, $mode='tile') - { - $this->plotbgmode = $this->CheckOption($mode, 'tile, centeredtile, scale', __FUNCTION__); - $this->plotbgimg = $input_file; - } - - - /*! - * Sets the name of the file to be used as output file. - */ - function SetOutputFile($which_output_file) - { - $this->output_file = $which_output_file; - return TRUE; - } - - /*! - * Sets the output image as 'inline', that is: no Content-Type headers are sent - * to the browser. Needed if you want to embed the images. - */ - function SetIsInline($which_ii) - { - $this->is_inline = (bool)$which_ii; - return TRUE; - } - - - /*! - * Performs the actual outputting of the generated graph, and - * destroys the image resource. - */ - function PrintImage() - { - // Browser cache stuff submitted by Thiemo Nagel - if ( (! $this->browser_cache) && (! $this->is_inline)) { - header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT'); - header('Cache-Control: no-cache, must-revalidate'); - header('Pragma: no-cache'); - } - - switch($this->file_format) { - case 'png': - if (! $this->is_inline) { - Header('Content-type: image/png'); - } - if ($this->is_inline && $this->output_file != '') { - ImagePng($this->img, $this->output_file); - } else { - ImagePng($this->img); - } - break; - case 'jpg': - if (! $this->is_inline) { - Header('Content-type: image/jpeg'); - } - if ($this->is_inline && $this->output_file != '') { - ImageJPEG($this->img, $this->output_file); - } else { - ImageJPEG($this->img); - } - break; - case 'gif': - if (! $this->is_inline) { - Header('Content-type: image/gif'); - } - if ($this->is_inline && $this->output_file != '') { - ImageGIF($this->img, $this->output_file); - } else { - ImageGIF($this->img); - } - - break; - case 'wbmp': // wireless bitmap, 2 bit. - if (! $this->is_inline) { - Header('Content-type: image/wbmp'); - } - if ($this->is_inline && $this->output_file != '') { - ImageWBMP($this->img, $this->output_file); - } else { - ImageWBMP($this->img); - } - - break; - default: - $this->PrintError('PrintImage(): Please select an image type!'); - break; - } - return TRUE; - } - - /*! - * Prints an error message to stdout and dies - */ - function PrintError($error_message) - { - echo "<p><b>Fatal error</b>: $error_message<p>"; - die; - } - - /*! - * Prints an error message inline into the generated image and draws it centered - * around the given coordinates (defaults to center of the image) - * \param error_message Message to be drawn - * \param where_x X coordinate - * \param where_y Y coordinate - */ - function DrawError($error_message, $where_x = NULL, $where_y = NULL) - { - if (! $this->img) - $this->PrintError('_DrawError(): Warning, no image resource allocated. '. - 'The message to be written was: '.$error_message); - - $ypos = (! $where_y) ? $this->image_height/2 : $where_y; - $xpos = (! $where_x) ? $this->image_width/2 : $where_x; - ImageRectangle($this->img, 0, 0, $this->image_width, $this->image_height, - ImageColorAllocate($this->img, 255, 255, 255)); - - $this->DrawText($this->generic_font, 0, $xpos, $ypos, ImageColorAllocate($this->img, 0, 0, 0), - $error_message, 'center', 'center'); - - $this->PrintImage(); - exit; -// return TRUE; - } - -///////////////////////////////////////////// -/////////// LABELS -///////////////////////////////////////////// - - - /*! - * Sets position for X labels following data points. - */ - function SetXDataLabelPos($which_xdlp) - { - $this->x_data_label_pos = $this->CheckOption($which_xdlp, 'plotdown, plotup, both, xaxis, all, none', - __FUNCTION__); - if ($which_xdlp != 'none') - $this->x_tick_label_pos = 'none'; - - return TRUE; - } - - /*! - * Sets position for Y labels following data points. - */ - function SetYDataLabelPos($which_ydlp) - { - $this->y_data_label_pos = $this->CheckOption($which_ydlp, 'plotleft, plotright, both, yaxis, all, none', - ... [truncated message content] |
|
From: <pau...@us...> - 2006-05-31 11:10:14
|
Revision: 1876 Author: paulsohier Date: 2006-05-31 04:10:03 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1876&view=rev Log Message: ----------- - Header updated. - Used selected style css file - Small change for setting css in pageheader(). Modified Paths: -------------- trunk/version1.0/includes/functions.php trunk/version1.0/notice.php Property Changed: ---------------- trunk/version1.0/notice.php Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-05-31 10:31:01 UTC (rev 1875) +++ trunk/version1.0/includes/functions.php 2006-05-31 11:10:03 UTC (rev 1876) @@ -117,7 +117,7 @@ 'L_CONF' => $core->lang['configu'], 'L_LOGIN' => $core->lang['login'], 'SQL_Q' => $core->lang['sql_q'], - 'TEMPLATE' => ($core->config_isset('default_tpl') && $core->config_get('default_tpl')) ? $core->config_get('default_tpl') : 'standaard', + 'TEMPLATE' => $core->config_isset('default_tpl'), 'L_STATS_MAIN' => $core->lang['stats_main'], 'L_LOAD_STATS' => $core->lang['stats_load'], 'L_TIME_STATS' => $core->lang['stats_time'], Modified: trunk/version1.0/notice.php =================================================================== --- trunk/version1.0/notice.php 2006-05-31 10:31:01 UTC (rev 1875) +++ trunk/version1.0/notice.php 2006-05-31 11:10:03 UTC (rev 1876) @@ -4,9 +4,9 @@ * Begin: October, 3rd 2005 * Copyright: Copyright 2005 by Really coding Group ****************************************************************** -* stats.php +* notice.php * **************** -* $Id: stats.php 1682 2006-04-04 20:03:28Z paulsohier $ +* $Id$ ******************************************************************/ /******************************************************************* @@ -24,7 +24,7 @@ <html> <head> <title>Really Coding Traffic Statistics</title> -<link rel="stylesheet" href="templates/rcts/template.css" /> +<link rel="stylesheet" href="templates/<?php echo $core->config_isset('default_tpl'); ?>/template.css" /> </head> <body> <div class="menu"> @@ -59,4 +59,4 @@ ?> </div> </body> -</html> \ No newline at end of file +</html> Property changes on: trunk/version1.0/notice.php ___________________________________________________________________ Name: svn:keywords + id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-05-31 11:20:51
|
Revision: 1877 Author: paulsohier Date: 2006-05-31 04:20:41 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1877&view=rev Log Message: ----------- Time to go to sleep... used wrong function to get config vars :p Modified Paths: -------------- trunk/version1.0/includes/functions.php trunk/version1.0/notice.php Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-05-31 11:10:03 UTC (rev 1876) +++ trunk/version1.0/includes/functions.php 2006-05-31 11:20:41 UTC (rev 1877) @@ -117,7 +117,7 @@ 'L_CONF' => $core->lang['configu'], 'L_LOGIN' => $core->lang['login'], 'SQL_Q' => $core->lang['sql_q'], - 'TEMPLATE' => $core->config_isset('default_tpl'), + 'TEMPLATE' => $core->config_get('default_tpl'), 'L_STATS_MAIN' => $core->lang['stats_main'], 'L_LOAD_STATS' => $core->lang['stats_load'], 'L_TIME_STATS' => $core->lang['stats_time'], Modified: trunk/version1.0/notice.php =================================================================== --- trunk/version1.0/notice.php 2006-05-31 11:10:03 UTC (rev 1876) +++ trunk/version1.0/notice.php 2006-05-31 11:20:41 UTC (rev 1877) @@ -24,7 +24,7 @@ <html> <head> <title>Really Coding Traffic Statistics</title> -<link rel="stylesheet" href="templates/<?php echo $core->config_isset('default_tpl'); ?>/template.css" /> +<link rel="stylesheet" href="templates/<?php echo $core->config_get('default_tpl'); ?>/template.css" /> </head> <body> <div class="menu"> @@ -39,7 +39,7 @@ </tr> </table> <div class="menu_content"> -<?php echo sprintf($core->lang['Version_stuff'], $config->config['version'], get_var('version'));?> +<?php echo sprintf($core->lang['Version_stuff'], $core->config_get('version'), get_var('version'));?> </div> <?php break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bas...@us...> - 2006-06-07 22:26:22
|
Revision: 1879 Author: bastimmer Date: 2006-06-06 03:56:58 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1879&view=rev Log Message: ----------- Overlay working better (1 query, 1 request, fully PHP, dynamic home detection) and configwiz table prefix fixes. Modified Paths: -------------- trunk/version1.0/includes/wizards/configwiz.php trunk/version1.0/javascript/overlay.js trunk/version1.0/overlay.php Modified: trunk/version1.0/includes/wizards/configwiz.php =================================================================== --- trunk/version1.0/includes/wizards/configwiz.php 2006-06-02 20:33:50 UTC (rev 1878) +++ trunk/version1.0/includes/wizards/configwiz.php 2006-06-06 10:56:58 UTC (rev 1879) @@ -115,7 +115,7 @@ $e = true; $em .= $db->sql_error().'<br />'; } - $sql = "INSERT INTO `rcts_layout` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), + $sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), (2, 'stats_time', '".serialize($page2_array)."', '2.0'), (3, 'uniek', '".serialize($page3_array)."', '3.0')"; $r = $db->sql_query($sql); @@ -136,7 +136,7 @@ $e = true; $em .= $db->sql_error().'<br />'; } - $sql = "INSERT INTO `rcts_layout` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), + $sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), (2, 'stats_time', '".serialize($page2_array)."', '2.0'), (3, 'stats_load', '".serialize($page3_array)."', '3.0'), (4, 'uniek', '".serialize($page4_array)."', '3.0'), @@ -162,7 +162,7 @@ $e = true; $em .= $db->sql_error().'<br />'; } - $sql = "INSERT INTO `rcts_layout` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), + $sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), (2, 'stats_time', '".serialize($page2_array)."', '2.0'), (3, 'stats_load', '".serialize($page3_array)."', '3.0'), (4, 'uniek', '".serialize($page4_array)."', '3.0'), @@ -183,7 +183,7 @@ $e = true; $em .= $db->sql_error().'<br />'; } - $sql = "INSERT INTO `rcts_layout` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), + $sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'), (2, 'stats_time', '".serialize($page2_array)."', '2.0'), (3, 'stats_load', '".serialize($page3_array)."', '3.0'), (4, 'uniek', '".serialize($page4_array)."', '3.0')"; Modified: trunk/version1.0/javascript/overlay.js =================================================================== --- trunk/version1.0/javascript/overlay.js 2006-06-02 20:33:50 UTC (rev 1878) +++ trunk/version1.0/javascript/overlay.js 2006-06-06 10:56:58 UTC (rev 1879) @@ -1,3 +1,7 @@ +function overlayNavigate(url) { + document.getElementById('contframe').src = 'overlay.php?modproxy='+url; +} + function insertAfter(nPrevious,nInsert) { var nParent = nPrevious.parentNode; if (nPrevious.nextSibling) { @@ -7,9 +11,9 @@ } } -onload = function() { +/*onload = function() { loadOverlay(); -} +}*/ function loadOverlay() { IFrameObj = document.getElementById('contframe'); @@ -107,7 +111,7 @@ function overlayNavigate(url) { document.getElementById('contframe').src = 'overlay.php?modproxy='+url; - document.getElementById('contframe').onload = function() { +/* document.getElementById('contframe').onload = function() { loadOverlay(); - } + }*/ } \ No newline at end of file Modified: trunk/version1.0/overlay.php =================================================================== --- trunk/version1.0/overlay.php 2006-06-02 20:33:50 UTC (rev 1878) +++ trunk/version1.0/overlay.php 2006-06-06 10:56:58 UTC (rev 1879) @@ -25,19 +25,53 @@ @session_destroy(); } +function get_pagec($matches) { + global $pages, $fixed_url; + if ((strpos($matches[1], '://')) === false) { + $newurl = $fixed_url.$matches[1]; + } else { + $newurl = $matches[1]; + } + $replacement = str_replace($matches[1], "javascript:parent.overlayNavigate('".$newurl."');", $matches[0]); + $replacement .= '<div style="background-color: white; border: 1px solid black; display: inline;">'; + $replacement .= (isset($pages[$newurl])) ? $pages[$newurl] : '0'; + $replacement .= '</div>'; + return $replacement; +} + if (isset($_GET['modproxy'])) { $url = get_var('modproxy'); $content = file_get_contents($url); - $content = preg_replace('#<head>#i', '<head><base href="'.$url.'" />', $content); + // Copying other code. This could be a function! + $url_ary = parse_url($url); + // Next line includes Windows hack. :) + $fixed_url = $url_ary['scheme'].'://'.$url_ary['host'].str_replace("\\", "/", dirname('/'.$url_ary['path'])); + $content = preg_replace('#<head>#i', '<head><base href="'.$fixed_url.'" />', $content); + $sql = "SELECT stat_count, stat_value FROM ".RCTS_CALENDAR_TABLE." WHERE stat_type='entry_pages'"; + $result = $db->sql_query($sql); + $pages = array(); + while ($row = $db->sql_fetchrow($result)) { + $pages[$row['stat_value']] = $row['stat_count']; + } + $content = preg_replace_callback("@<a[ ]{0,}href=[\"']{0,}([^\"]{0,})[\"']{0,}(.*?)>([^<]{0,})</a>@i", "get_pagec", $content); echo $content; exit; } +$sql = "SELECT stat_value FROM ".RCTS_CALENDAR_TABLE." WHERE stat_type='entry_pages' LIMIT 1"; +$result = $db->sql_query($sql); +$row = $db->sql_fetchrow($result); +$url_ary = parse_url($row['stat_value']); +// Next line includes Windows hack. :) +$home_url = $url_ary['scheme'].'://'.$url_ary['host'].str_replace("\\", "/", dirname('/'.$url_ary['path'])); + $template->assign(array( - 'js' => '<script type="text/javascript" src="javascript/overlay_functions.php"></script><script type="text/javascript" src="javascript/overlay.js">' +// 'js' => '<script type="text/javascript" src="javascript/overlay_functions.php"></script><script type="text/javascript" src="javascript/overlay.js"></script>' +// 'js' => '<script type="text/javascript" src="javascript/overlay.js"></script>' + 'js' => "<script type=\"text/javascript\"><!--\r\nfunction overlayNavigate(url) {\r\n document.getElementById('contframe').src = 'overlay.php?modproxy='+url;\r\n}\r\n//--></script>" )); pageheader(); -print '<input type="text" value="http://www.reallycoding.nl/" id="urlto" /> <button onclick="overlayNavigate(document.getElementById(\'urlto\').value)">»»</button><br />'; -print '<iframe src="overlay.php?modproxy=http://www.reallycoding.nl/" id="contframe" width="740" height="500"></iframe>'; +print '<input type="text" value="'.$home_url.'" id="urlto" /> <button onclick="overlayNavigate(document.getElementById(\'urlto\').value)">»»</button><br />'; +print '<iframe src="overlay.php?modproxy='.$home_url.'" id="contframe" width="740" height="500"></iframe>'; pagefooter(); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-06-19 10:38:35
|
Revision: 1894 Author: paulsohier Date: 2006-06-19 03:38:19 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1894&view=rev Log Message: ----------- Code guidelines. Removed code thats commented (Bas, I am not sure if code from wizz can be deleted?) Don't display rss feed if admin requires login for stats.php Bugfixes. Modified Paths: -------------- trunk/version1.0/admin/index.php trunk/version1.0/graph.php trunk/version1.0/index.php trunk/version1.0/notice.php trunk/version1.0/overlay.php trunk/version1.0/rss.php trunk/version1.0/stats.php trunk/version1.0/statsGetJS.php trunk/version1.0/statsGetJSend.php trunk/version1.0/stats_js.php trunk/version1.0/wizz.php Removed Paths: ------------- trunk/version1.0/versie.php Modified: trunk/version1.0/admin/index.php =================================================================== --- trunk/version1.0/admin/index.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/admin/index.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -23,46 +23,59 @@ include(RCTS_ROOT_PATH . '/includes/start.php'); /** * @todo: Write the login function - * @todo: Check why the tabs are alway set to active. * @todo: Write modules :D + * @todo: Set frameset in tpl?!? **/ $page = get_var('p'); $mode = get_var('mode'); $class = get_var('class'); -if(!$core->is_login()){ +if(!$core->is_login()) +{ $core->login_form(); die; exit; } -if($class){ +if($class) +{ //Lets load a class ;D $core->adminheader(); $dir = RCTS_ROOT_PATH . '/includes/modules/acp/acp_' . $class . '.php'; - if(file_exists($dir)){ + if(file_exists($dir)) + { include_once($dir); $class = 'acp_' . $class; - if(class_exists($class)){ + if(class_exists($class)) + { $c = new $class; $c->main(); - }else{ + } + else + { trigger_error('MOD_NOT_EXISTS2'); } - }else{ + } + else + { trigger_error('MOD_NOT_EXISTS'); } $core->adminfooter(); -}elseif($mode){ +} +elseif($mode) +{ $core->adminheader(); - switch($mode){ + switch($mode) + { case 'left': break; - default:{ - } + default: } $core->adminfooter(); -}elseif($page){ - switch($page){ +} +elseif($page) +{ + switch($page) + { case "left": define('small',true); $core->adminheader(); @@ -78,44 +91,55 @@ $open = opendir($dir); $load = null; $mod = array(); - while (false !== ($file = readdir($open))) { + while (false !== ($file = readdir($open))) + { //Lets load the class ;) - if(is_file($dir . "/" . $file) && preg_match("#acp_([a-z0-9_]+).php#",$file,$match)){ + if(is_file($dir . "/" . $file) && preg_match("#acp_([a-z0-9_]+).php#",$file,$match)) + { $load = $match[1]; include_once($dir . "/" . $file); $load = "acp_" . $load; - if(class_exists($load)){ + if(class_exists($load)) + { $load = new $load; - if(method_exists($load,"menu")){ + if(method_exists($load,"menu")) + { $load->menu(); } } } } + unset($load,$match); //Lets create a nice menu :D asort($mod,SORT_STRING ); - - - foreach($mod as $mode => $array){ + foreach($mod as $mode => $array) + { $template->block('head',array( 'txt' => (isset($core->lang[$mode])) ? $core->lang[$mode] : $mode )); //Lets loop:P asort($array); - while(list($subje,$class) = each($array)){ + while(list($subje,$class) = each($array)) + { $funct = ''; - if(is_array($class)){ - foreach ($class as $el => $wa) { - if($el == 'c'){ + if(is_array($class)) + { + foreach ($class as $el => $wa) + { + if($el == 'c') + { $class = $wa; continue; - }else{ + } + else + { $funct .= '&' . $el . '=' . $wa; } } } + $template->block('head.normal',array( 'link' => 'index.php?class=' . $class . $funct, 'txt' => (isset($core->lang[$subje])) ? $core->lang[$subje] : $subje @@ -129,7 +153,9 @@ trigger_error('Mode error.',E_USER_ERROR); } -}else{ +} +else +{ ?> <html dir=""><head> <title>Rcts Control Panel</title> Modified: trunk/version1.0/graph.php =================================================================== --- trunk/version1.0/graph.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/graph.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -17,6 +17,7 @@ * (at your option) any later version. * *******************************************************************/ + define('IN_STATS', true); define('NO_HEAD',true); define('RCTS_ROOT_PATH', dirname(__FILE__)); @@ -24,24 +25,54 @@ error_reporting(0); $stats = new getStats(); $display = new display(); -$graph = get_var('graph');//isset($_GET['graph']) ? $_GET['graph'] false; +$graph = get_var('graph'); $soort = get_var('soort'); $type = get_var('type'); $idid = get_var('idid',true,true); $kalDay = $calendar_day = get_var('day',true,true); -if(!$idid || trim($idid) == ""){ +if(!$idid || trim($idid) == "") +{ $idid = "1"; } -if(empty($kalDay)){ + +if(empty($kalDay)) +{ $kalDay= $calendar_day = "ALL"; } -$widid = array("referers","pages","browsers","os","colors","resolution","language","load","hour","dayW","dayM","month","bot","botsvshuman","botsvisit","timezones","java","flash","online", "last30days","uniek"); +$widid = array( + "referers", + "pages", + "browsers", + "os", + "colors", + "resolution", + "language", + "load", + "hour", + "dayW", + "dayM", + "month", + "bot", + "botsvshuman", + "botsvisit", + "timezones", + "java", + "flash", + "online", + "last30days", + "uniek" +); $zidid = array(); -if(in_array($graph,$widid)){ +if(in_array($graph,$widid)) +{ $cron->cache($graph,$soort,$idid,$kalDay);//verschillende sites -}elseif(in_array($graph,$zidid)){ +} +elseif(in_array($graph,$zidid)) +{ $cron->cache($graph,$soort,"NOT");//zelfde site (mysql en phpbb) -}elseif($type=='plugin'){ +} +elseif($type == 'plugin') +{ $cron->cache(get_var('name'),'plugin',$idid); } ?> Modified: trunk/version1.0/index.php =================================================================== --- trunk/version1.0/index.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/index.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -17,6 +17,7 @@ * (at your option) any later version. * *******************************************************************/ + define('IN_STATS', true); define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); Modified: trunk/version1.0/notice.php =================================================================== --- trunk/version1.0/notice.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/notice.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -20,6 +20,7 @@ define('IN_STATS', true); define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); + ?> <html> <head> Modified: trunk/version1.0/overlay.php =================================================================== --- trunk/version1.0/overlay.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/overlay.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -25,21 +25,27 @@ @session_destroy(); } -function get_pagec($matches) { +function get_pagec($matches) +{ global $pages, $fixed_url; - if ((strpos($matches[1], '://')) === false) { + if ((strpos($matches[1], '://')) === false) + { $newurl = $fixed_url.$matches[1]; - } else { + } + else + { $newurl = $matches[1]; } $replacement = str_replace($matches[1], "javascript:parent.overlayNavigate('".$newurl."');", $matches[0]); $replacement .= '<div style="background-color: white; border: 1px solid black; display: inline;">'; $replacement .= (isset($pages[$newurl])) ? $pages[$newurl] : '0'; $replacement .= '</div>'; + return $replacement; } -if (isset($_GET['modproxy'])) { +if (isset($_GET['modproxy'])) +{ $url = get_var('modproxy'); $content = file_get_contents($url); // Copying other code. This could be a function! @@ -50,7 +56,8 @@ $sql = "SELECT stat_count, stat_value FROM ".RCTS_CALENDAR_TABLE." WHERE stat_type='entry_pages'"; $result = $db->sql_query($sql); $pages = array(); - while ($row = $db->sql_fetchrow($result)) { + while ($row = $db->sql_fetchrow($result)) + { $pages[$row['stat_value']] = $row['stat_count']; } $content = preg_replace_callback("@<a[ ]{0,}href=[\"']{0,}([^\"]{0,})[\"']{0,}(.*?)>([^<]{0,})</a>@i", "get_pagec", $content); @@ -62,12 +69,11 @@ $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $url_ary = parse_url($row['stat_value']); + // Next line includes Windows hack. :) $home_url = $url_ary['scheme'].'://'.$url_ary['host'].str_replace("\\", "/", dirname('/'.$url_ary['path'])); $template->assign(array( -// 'js' => '<script type="text/javascript" src="javascript/overlay_functions.php"></script><script type="text/javascript" src="javascript/overlay.js"></script>' -// 'js' => '<script type="text/javascript" src="javascript/overlay.js"></script>' 'js' => "<script type=\"text/javascript\"><!--\r\nfunction overlayNavigate(url) {\r\n document.getElementById('contframe').src = 'overlay.php?modproxy='+url;\r\n}\r\n//--></script>" )); pageheader(); Modified: trunk/version1.0/rss.php =================================================================== --- trunk/version1.0/rss.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/rss.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -17,16 +17,29 @@ * (at your option) any later version. * *******************************************************************/ -#Starting up STATS +//Starting up STATS define('IN_STATS', true); define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); + +//If you set at config that the stats are closed for guest, we don't display rss feed. +$dislay = true; +if($core->config_get('stats_open') == 0) +{ + if(!$core->is_login()) + { + $display = false; + } +} + $stats = new getStats(); $display = new display(); -#Started STATS -if($config->config['use_multisite']){ +//Started STATS +if($config->config['use_multisite']) +{ $idid = get_var('Usite'); - if(!$idid || $idid == ""){ + if(!$idid || $idid == "") + { $idid = get_var('idid',false,true); } $idid = trim($idid); @@ -34,53 +47,67 @@ { $idid="1"; } -}else{ +} +else +{ $idid = 1; } -RSS_write($idid); -function start_rss(){ +if($display === true) +{ + RSS_write($idid); +} +else +{ + start_rss(); + stop_rss(); + die; +} +function start_rss() +{ global $id,$db,$core; //Start RSS feed - $link = (string) 'http://reallycoding.nl'; + $link = (string) 'http://www.reallycoding.nl'; $title = (string) $id. $core->lang['site_stats']; $description = (string) $core->lang['stats_from']; $image_link = (string) ''; $category = (string) $core->lang['Stats']; // (only rss 2.0) $cache = (string) 60; // in minutes (only rss 2.0) - $publisher = (string) 'rc.paulscripts'; // person, an organization, or a service - $creator = (string) 'rc.paulscripts'; // person, an organization, or a service + $publisher = (string) 'reallycoding.nl'; // person, an organization, or a service + $creator = (string) 'reallycoding.nl'; // person, an organization, or a service $date = (string) get_iso_8601_date(time()); - if(isset($_COOKIE['lang'])){ - $taal = $_COOKIE['lang']; - }else{ + if(isset($_COOKIE['lang'])) + { + $taal = get_var('lang',false,true); + } + else + { $taal = "en"; } $coreuage = (string) $taal; $rights = (string) 'Copyright \xA9 2005 reallycoding.nl'; $coverage = (string) ''; // spatial location , temporal period or jurisdiction - $contributor = (string) 'rc.paulscripts'; // person, an organization, or a service + $contributor = (string) 'reallycoding.nl'; // person, an organization, or a service header('Cache-control: no-cache, no-store'); header ('content-type: text/xml'); echo '<'.'?xml version="1.0" encoding="UTF-8"?'.'>'; -?> -<rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" version="2.0"> -<channel> -<title><?php echo $title ?></title> -<link><?php echo base() ?></link> -<description><?php echo $description ?></description> -<language><?php echo $taal ?></language> -<ttl><?php echo $cache ?></ttl> -<dc:date><?php echo $date ?></dc:date> -<sy:updatePeriod>hourly</sy:updatePeriod> -<sy:updateFrequency>1</sy:updateFrequency> -<sy:updateBase><?php echo $date ?></sy:updateBase> -<?php + ?> + <rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" version="2.0"> + <channel> + <title><?php echo $title ?></title> + <link><?php echo base() ?></link> + <description><?php echo $description ?></description> + <language><?php echo $taal ?></language> + <ttl><?php echo $cache ?></ttl> + <dc:date><?php echo $date ?></dc:date> + <sy:updatePeriod>hourly</sy:updatePeriod> + <sy:updateFrequency>1</sy:updateFrequency> + <sy:updateBase><?php echo $date ?></sy:updateBase> + <?php } -function stop_rss(){ - global $id,$db; - $file = RCTS_ROOT_PATH . '/cache/' .$id. '.xml'; +function stop_rss() +{ ?> </channel> </rss> @@ -93,9 +120,9 @@ $about = $link; ?> <item> - <title><?php echo $title ?></title> - <link><?php echo $link ?></link> - <description><?php echo $description ?></description> + <title><?php echo $title; ?></title> + <link><?php echo $link; ?></link> + <description><?php echo $description; ?></description> <pubDate><?php echo date('r', time()) ?></pubDate> </item> @@ -106,19 +133,19 @@ global $db, $core, $stats, $display, $calendar; $RSS = start_rss(); //Add all the data: - $link =base()."stats.php?mode=load"; + $link = base()."stats.php?mode=load"; $topLoad = $display->getTopTijd(1,$idid); $data = $core->lang['Most_loads_take']." ".$topLoad[0]['tijd']." ".$core->lang['Sec']."\n".$core->lang['In_total_h']." ".$topLoad[0]['visit']." ".$core->lang['Times']; $titel = $core->lang['Load_time']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=time"; + $link = base()."stats.php?mode=time"; $hour = $stats->getHours_max($idid); $data = $core->lang['B_Hour_is']." ".$hour[0]['hour']." uur.\n".$core->lang['Total_Hour']." ".$hour[0]['count'] ." ".$core->lang['Visitors']; $titel = $core->lang['B_Hour']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=time"; + $link = base()."stats.php?mode=time"; $week = $stats->getDaysW_max($idid); $day = $week[0]['week']; $namesW = $core->lang['Days_Of_Week']; @@ -127,49 +154,49 @@ $titel = $core->lang['B_Day_W']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=time"; + $link = base()."stats.php?mode=time"; $zones= $calendar->get_stats('gmt_offset', $idid, "all", 1); $data = $core->lang['Most_From_zone']." ".$zones[0]['stat_value'].".\n ".$core->lang['In_total']." ".$zones[0]['stat_count'] ." ".$core->lang['Visitors']; $titel = $core->lang['Timezone_t']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; + $link = base()."stats.php?mode=15"; $visit = $calendar->get_stats('visitors', $idid, time(), 1); $data = $core->lang['Most_On_Site_IP']." ".$visit[0]['stat_value'].".\n".$core->lang['He_In_total1']." ".$visit[0]['stat_count'] ." ".$core->lang['Pages_Viewed']; $titel = $core->lang['Best_Visitor']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; + $link = base()."stats.php?mode=15"; $refer = $calendar->get_stats('referers', $idid, 'all', 1); $data = $core->lang['Most_From_Site']." ".$refer[0]['stat_value'].".\n ".$core->lang['In_total']." ".$refer[0]['stat_count'] ." ".$core->lang['Visitors']; $titel = $core->lang['Top_referers']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; - $browsers = $calendar->get_stats('browsers', $idid, 'all', 1); + $link = base()."stats.php?mode=15"; + $browsers = $calendar->get_stats('browsers', $idid, 'all', 1); $data = $core->lang['Most_Visitors']." ".$browsers[0]['stat_value']." ".$core->lang['As_Browser']."\n ".$core->lang['In_total']." ".$browsers[0]['stat_count']." ".$core->lang['Visitors']; $titel = $core->lang['Top_browsers']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; - $os = $calendar->get_stats('os', $idid, 'all', 1); + $link = base()."stats.php?mode=15"; + $os = $calendar->get_stats('os', $idid, 'all', 1); $data = $core->lang['Most_Visitors']." ".$os[0]['stat_value']." ".$core->lang['As_Os']."\n ".$core->lang['In_total']." ".$os[0]['stat_count'] ." ".$core->lang['Visitors']; $titel = $core->lang['Top_os']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; - $color = $calendar->get_stats('color_depths', $idid, 'all', 1); + $link = base()."stats.php?mode=15"; + $color = $calendar->get_stats('color_depths', $idid, 'all', 1); $data = $core->lang['Most_Visitors']." ".$color[0]['stat_value']." ".$core->lang['As_Color']."\n ".$core->lang['In_total']." ".$color[0]['stat_count'] ." ".$core->lang['Visitors']; $titel = $core->lang['Top_color_depths']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; + $link = base()."stats.php?mode=15"; $res = $calendar->get_stats('resolutions', $idid, 'all', 1); $data = $core->lang['Most_Visitors']." ".$res[0]['stat_value']." ".$core->lang['As_Reso']."\n ".$core->lang['In_total']." ".$res[0]['stat_count']." ".$core->lang['Visitors']; $titel = $core->lang['Top_resolutions']; add_rss_item($data,$titel,$link); - $link =base()."stats.php?mode=15"; + $link = base()."stats.php?mode=15"; $coreu = $calendar->get_stats('languages', $idid, 'all', 1); $data = $core->lang['Most_Visitors']." ".$coreu[0]['stat_value']." ".$core->lang['As_language']."\n ".$core->lang['In_total']." ".$coreu[0]['stat_count']." ".$core->lang['Visitors']; $titel = $core->lang['Top_lang']; @@ -177,12 +204,13 @@ stop_rss($RSS); } // For valid RSS. :) -function get_iso_8601_date($int_date) { - //$int_date: current date in UNIX timestamp - $date_mod = date('Y-m-d\TH:i:s', $int_date); - $pre_timezone = date('O', $int_date); - $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2); - $date_mod .= $time_zone; - return $date_mod; +function get_iso_8601_date($int_date) +{ + //$int_date: current date in UNIX timestamp + $date_mod = date('Y-m-d\TH:i:s', $int_date); + $pre_timezone = date('O', $int_date); + $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2); + $date_mod .= $time_zone; + return $date_mod; } ?> Modified: trunk/version1.0/stats.php =================================================================== --- trunk/version1.0/stats.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/stats.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -53,7 +53,7 @@ if(!$idid || $idid == "") { - $idid="1"; + $idid = "1"; } } else @@ -123,9 +123,9 @@ $plugins = array(); $sql = "SELECT * - FROM - ".RCTS_PLUGINS_TABLE." - WHERE plugin_dhooks LIKE '%MultiTable%' || plugin_dhooks LIKE '%StatsTable%'"; + FROM + ".RCTS_PLUGINS_TABLE." + WHERE plugin_dhooks LIKE '%MultiTable%' || plugin_dhooks LIKE '%StatsTable%'"; $res = $db->sql_query($sql); @@ -171,11 +171,9 @@ $icon = (file_exists(RCTS_ROOT_PATH.'/plugins/plugin_'.$plugin_row[$i]['pluginn'].'/icon.png')) ? '../../plugins/plugin_'.$plugin_row[$i]['pluginn'].'/icon' : 'linneighborhood'; pageHeader($title, $icon); - //statsHeader(); $template->parse('body'); - //statsFooter(); pageFooter(); } @@ -212,23 +210,21 @@ foreach($content as $name) { - if(empty($name)){ + if(empty($name)) + { continue; } if(method_exists($displayStats,$name)) { $displayStats->$name($idid,$calendar_day); } -// elseif(!$pluginsClass->loadPlugin($name)) else if (!in_array($name, $plugins)) { trigger_error("Method not exists (\$displayStats->".$name."())",E_USER_WARNING); } $i++; } - if($i == 0){ - //st_die(RCTS_GENERAL_ERROR,$core->lang['no_blocks']); - } + $predicted = $stats->predictTomorrowHits($idid); $views = $stats->getViews($mode); @@ -283,16 +279,14 @@ 'L_VISITS_LAST_30_DAYS' => $core->lang['visits_past_30_days'], 'ADDLINK' => "stats.php?mode=".$mode."&day=".$calendar_day."&do=add", 'expected_hits' => $predicted, - //'total_visit' => $total_visit, 'num_views' => $core->lang['Times_showed_1'] . $views . $core->lang['Times_showed_2'] )); pageHeader($title, 'linneighborhood'); - //statsHeader(); $template->parse('statsheader'); $template->parse('body'); $template->parse('statsfooter'); - //statsFooter(); + pageFooter(); }//no plugin with template Modified: trunk/version1.0/statsGetJS.php =================================================================== --- trunk/version1.0/statsGetJS.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/statsGetJS.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -26,10 +26,5 @@ $update = new update(); $update->begin(); -/*header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past -header("Content-type: image/gif"); -header("Location: images/spacer.gif"); */ -print " ";//Print something for JS ajax request. print $db->sql_numqueries(); ?> Modified: trunk/version1.0/statsGetJSend.php =================================================================== --- trunk/version1.0/statsGetJSend.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/statsGetJSend.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -26,9 +26,12 @@ $upd = $update->end(); header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past -if($upd){ +if($upd) +{ header("Location: images/small.gif"); -}else{ +} +else +{ header("Location: images/spacer.gif"); } ?> Modified: trunk/version1.0/stats_js.php =================================================================== --- trunk/version1.0/stats_js.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/stats_js.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -25,7 +25,8 @@ @session_destroy(); } $js = "var menu = new Array();\n"; -for($i = 0; $i < count($modes);$i++){ +for($i = 0; $i < count($modes);$i++) +{ $js .= "menu[menu.length] = '".$modes[$i]."';\n"; } $js = "\n".'<script type="text/javascript" language="javascript">mode = '.$layout->getMode().';'.$js.'</script>'; Deleted: trunk/version1.0/versie.php =================================================================== --- trunk/version1.0/versie.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/versie.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -1,28 +0,0 @@ -<?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* versie.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ -error_reporting(0); -include("includes/config.php"); -$db = mysql_connect($host,$username,$password) or die(mysql_error()); -$db2 = mysql_select_db($database,$db) or die(mysql_error()); -$sql = "SELECT waarde FROM $mysql_prefix"."config WHERE naam = 'version'"; -$r = mysql_query($sql) or die(mysql_error()); -$g = mysql_fetch_array($r); -echo "Version: ".$g['waarde']; -?> Modified: trunk/version1.0/wizz.php =================================================================== --- trunk/version1.0/wizz.php 2006-06-19 10:28:54 UTC (rev 1893) +++ trunk/version1.0/wizz.php 2006-06-19 10:38:19 UTC (rev 1894) @@ -20,18 +20,18 @@ define('IN_STATS', true); define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); -if(!$core->is_login()){ +if(!$core->is_login()) +{ $core->login_form("wizz.php"); die; -}else{ +} +else +{ include_once(RCTS_ROOT_PATH.'/includes/classes/class.wizard.php'); include_once(RCTS_ROOT_PATH.'/includes/wizards/configwiz.php'); $wizard = new Wizard(); -/* $wizard->cancelCaption = $core->lang['Wiz_cancel']; - $wizard->nextCaption = $core->lang['Install_Next']; - $wizard->prevCaption = $core->lang['Install_Back']; - $wizard->submitCaption = $core->lang['Wiz_OK'];*/ + $wizard->setDimensions(640, 480); $layoutSel = new LayoutSel('layoutsel'); $wizard->addPage('layoutsel', $layoutSel); @@ -41,42 +41,5 @@ $wizard->addPage('configfinished', $configFinished); $wizard->display(); -/* //Ingelogd dus je mag dingen aanmaken - $template -> add_file(array( - 'body' => 'wizz.html' - )); - if(isset($_POST['PageName'])){ - $PageName = get_var("PageName"); - }else{ - $PageName = ""; - } - if($PageName == ""){ - $template->block("form"); - $bodyCode =""; - $headCode =""; - }else{ - $template->block("output"); - $loc = base(); - $headCode= htmlspecialchars('<script type="text/javascript" src="'.$loc.'javascript/stats.php"></script> -<script language="Javascript">uploadstats("'.$PageName.'");</script>'); - $bodyCode = htmlspecialchars('<img src="'.$loc.'statsGetJSend.php" style="float:right; visibility:hidden" />'); - } - $template->assign(array( - "L_WIZZARD" => $core->lang['Wizz'], - "L_STATS_WIZZARD" => $core->lang['Stats_Wizz'], - "L_PAGE_NAME" => $core->lang['Page_Name'], - "L_GEN" => $core->lang['Gen'], - "L_RESET" => $core->lang['Reset'], - "L_BETWEEN_HEAD" => $core->lang['Between_Head'], - "L_BEFORE_BODY" => $core->lang['Before_Body'], - "L_ANOTHER" => $core->lang['Another'], - "body_code" => $bodyCode, - "head_code" => $headCode - )); - pageHeader($title); - //statsHeader(); - $template->parse('body'); - //statsFooter(); - pageFooter();*/ } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-07-03 18:59:39
|
Revision: 1902 Author: paulsohier Date: 2006-07-03 11:59:11 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1902&view=rev Log Message: ----------- Changed files for phpdoc. Please note that there is to do still a lot of work. We has still many errors in it, and not documented classes/functions. Root files and admin/*.* are done, first files in includes/ also. Modified Paths: -------------- trunk/version1.0/admin/index.php trunk/version1.0/graph.php trunk/version1.0/includes/classes/class.3dbargraph.php trunk/version1.0/includes/constants.php trunk/version1.0/includes/detection.php trunk/version1.0/includes/functions.php trunk/version1.0/includes/functions_color.php trunk/version1.0/includes/functions_sql.php trunk/version1.0/includes/functions_vars.php trunk/version1.0/includes/pngreplacer.php trunk/version1.0/includes/start.php trunk/version1.0/index.php trunk/version1.0/notice.php trunk/version1.0/overlay.php trunk/version1.0/rss.php trunk/version1.0/stats.php trunk/version1.0/statsGetJS.php trunk/version1.0/statsGetJSend.php trunk/version1.0/statsGetTimeOnline.php trunk/version1.0/stats_js.php trunk/version1.0/wizz.php Modified: trunk/version1.0/admin/index.php =================================================================== --- trunk/version1.0/admin/index.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/admin/index.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,22 +1,12 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* index.php.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Graphs will be proceed here + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ define('IN_STATS', true); define('IN_ADMIN',true); define('RCTS_ROOT_PATH',dirname(dirname(__FILE__))); Modified: trunk/version1.0/graph.php =================================================================== --- trunk/version1.0/graph.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/graph.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,26 +1,22 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin October, 3rd 2005 -* Copyright Copyright 2005 by Really coding Group -****************************************************************** -* graph.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ - +/** + * Graphs will be proceed here + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); define('NO_HEAD',true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); + include(RCTS_ROOT_PATH.'/includes/start.php'); error_reporting(0); $stats = new getStats(); Modified: trunk/version1.0/includes/classes/class.3dbargraph.php =================================================================== --- trunk/version1.0/includes/classes/class.3dbargraph.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/classes/class.3dbargraph.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,35 +1,75 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* class.3dbargraph.php -* **************** -* $Id$ -******************************************************************/ -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Graphs will be proceed here + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } +/** + * bargraphs + * @package graphs + */ class BarGraph extends CGraph { + /** + * Bar width + * + * @var int + */ var $bar_width = 32; + /** + * bar height + * + * @var int + */ var $bar_height = 8; + /** + * Bar padding + * + * @var int + */ var $bar_padding = 5; + /** + * Bar borderf color + * + * @var array + */ var $bar_bordercolor = array(0, 0, 0); + /** + * Bar background color + * + * @var array + */ var $bar_bgcolor = array(69, 129, 194); + /** + * Font for bars + * + * @var mixed + */ var $bar_textfont = 8; + /** + * Bar scale + * + * @var int + */ var $bar_autoscale = 1; + /** + * Bar angle + * + * @var int + */ var $bar_angle = 0; + /** + * Saves some basic things + * + * @return BarGraph + */ function BarGraph() { $tmp = microtime(); $this->time_start = $tmp; @@ -40,6 +80,9 @@ /** * Graph::SetBarBorderColor() * Sets border color for bars + * @param int $red red color value + * @param int $green green color value + * @param int $blue blue color value **/ function SetBarBorderColor($red, $green, $blue) { $this->bar_bordercolor = array($red, $green, $blue); @@ -48,6 +91,9 @@ /** * Graph::SetBarBackgroundColor() * Sets background color for bars + * @param int $red red color value + * @param int $green green color value + * @param int $blue blue color value **/ function SetBarBackgroundColor($red, $green, $blue) { $this->bar_bgcolor = array($red, $green, $blue); @@ -56,6 +102,8 @@ /** * Graph::SetBarDimensions() * Sets with and height of each bar + * @param int $width width of graph + * @param int $height height of graph **/ function SetBarDimensions($width, $height) { if ($width > 0) $this->bar_width = $width; @@ -68,6 +116,7 @@ /** * Graph::SetBarPadding() * Sets padding (border) around each bar + * @param int $padding padding of graph **/ function SetBarPadding($padding) { if ($padding > 0) $this->bar_padding = $padding; @@ -75,6 +124,7 @@ /** * Graph::SetBarFont() * Sets font for all text + * @param int $font font to use **/ function SetBarFont($font) { $this->bar_textfont = 4; @@ -91,6 +141,7 @@ /** * Graph::DrawGraph() * Makes the graph + * @param string $file file to save **/ function DrawGraph($file = "") { if(imageloadfont(RCTS_FONT_PATH)===false){ @@ -149,6 +200,8 @@ /** * Graph::__DrawBarText() * Determines top and left to draw text to a choosen bar + * @param string $bar text to write at bar + * @param string $text text **/ function __DrawBarText($bar, $text) { imageloadfont(RCTS_FONT_PATH); @@ -182,6 +235,8 @@ /** * Graph::__DrawBar() * Draws a choosen bar with it's value + * @param string $bar + * @param string $value **/ function __DrawBar($bar, $value) { $x = $this->graph_padding['left'] + @@ -204,6 +259,11 @@ /** * Graph::____DrawBar() * Draws the actual rectangles that form a bar + * @param int + * @param int + * @param int + * @param int + * @param int **/ function ____DrawBar($x1, $y1, $x2, $y2, $bar) { $this->__AllocateColor("im_bar_bordercolor", @@ -292,6 +352,7 @@ /** * Graph::__Load3dbarValues() * Loads definitions to 3d bar settings + * @param string $data **/ function __Load3dbarValues($data) { foreach ($data as $name => $value) { Modified: trunk/version1.0/includes/constants.php =================================================================== --- trunk/version1.0/includes/constants.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/constants.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,13 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* constants.php -* **************** -* $Id$ -******************************************************************/ +/** + * Constants + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ -/******************************************************************* -* -* 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. -* -*******************************************************************/ - if(!defined('IN_STATS')) { die('Hacking Attempt'); Modified: trunk/version1.0/includes/detection.php =================================================================== --- trunk/version1.0/includes/detection.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/detection.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,26 +1,22 @@ <?PHP -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* detection.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * detection functions + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } +/** + * Browser detection + * + * @param string $which_test wich test + * @return string + */ function browser_detection( $which_test ) { /* uncomment the global variable declaration if you want the variables to be available on a global level @@ -403,7 +399,14 @@ } } -// gets which os from the browser string +/** + * Select OS + * + * @param string $browser_string + * @param string $browser_name + * @param string $version_number + * @return string + */ function which_os ( $browser_string, $browser_name, $version_number ) { // initialize variables @@ -556,6 +559,13 @@ // function returns browser number, gecko rv number, or gecko release date //function browser_version( $browser_user_agent, $search_string, $substring_length ) +/** + * Return browser version + * + * @param string $browser_user_agent + * @param string $search_string + * @return string + */ function browser_version( $browser_user_agent, $search_string ) { // 12 is the longest that will be required, handles release dates: 20020323; 0.8.0+ Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/functions.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,50 +1,41 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* functions.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * global functions + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } -/* -This functions shows an error message, and exits the script -Please notice this function is deprecated. use trigger_error for this. -@deprecated -@param Type of error -@param Error description -@param Titel of the error -@param Line numeber -@param File name -@param Sql query -@return nothing -*/ +/** + * This functions shows an error message, and exits the script + * Please notice this function is deprecated. use trigger_error for this. + * @deprecated + * @param Type of error + * @param Error description + * @param Titel of the error + * @param Line numeber + * @param File name + * @param Sql query + + */ function st_die($type = 0, $error2 = '', $caption = '', $line = 0, $file = '', $sql = '') { trigger_error($error2,$type); } -/* -This functions sets the page header -@param title of the page -@return nothing -*/ +/** + * This functions sets the page header + * @param title of the page + * @param image to display + * @return nothing + */ function pageHeader($title = '', $image = ''){ global $template,$core,$calendar; if(defined("header")) return; @@ -144,10 +135,10 @@ )); $template->parse("header"); } -/* -This functions sets the page footer -@return nothing -*/ +/** + * This functions sets the page footer + * @return nothing + */ function pageFooter(){ global $template,$db,$core,$do_gzip_compress,$cache; if(defined("NO_HEAD")) return; @@ -200,15 +191,10 @@ } die; } -/* - * These function are deprecated. - * Is now used als INCLUDE tag at tpl file. - */ -function statsHeader(){} -function statsFooter(){} -/* -This functions makes base location from current location -@return base location +/** + * This functions makes base location from current location + * @param add filename to string + * @return base location */ function base($add_file = false){ // get the correct base_url: protocoll,url,path to make sure to rewrite only internal links @@ -266,6 +252,10 @@ $base_url = "$proto$server$path/$file"; return $base_url; } +/** + * returns the path on the server. + * @return string basepath + */ function basepath(){ // Get the name of this URI @@ -302,10 +292,9 @@ $base_url = "$path/"; return $base_url; } -/* -This functions sets a new window location -@param url of new page -@return nothing +/** + * This functions sets a new window location + * @param url of new page */ function loc($link){ $loc = /*base()."/".*/$link; @@ -319,40 +308,12 @@ print sprintf($core->lang['redirect'],"<a href='". $link."'>","</a>"); die; } -/* -This function will make the config file. -@param hostnuname of mysql db -@param username of mysql db -@param password of mysql db -@param name of mysql db -@param prefix of tabels -@return nothing -function install_write($host,$name,$ww,$db,$prefix){ - $file = "<" . "?php -//Auto written config file, don't change anything here! -\$host = '$host'; -\$username = '$name'; -\$password = '$ww'; -\$database = '$db'; -\$mysql_prefix = '$prefix'; - -define('STATS_INSTALLED', true); -?" . ">"; - //chmod(RCTS_ROOT_PATH . "/config.php",0777); - $o = fopen(RCTS_ROOT_PATH . "/includes/config.php","w"); - if(!$o){ - trigger_error("Could not open config.php for writing!",E_USER_ERROR); - } - fwrite($o,$file); - fclose($o); -} */ - -/* -This function will get the ipadress. -@return ipadress -*/ +/** + * This function will get the ipadress. + * @return ipadress + */ function getIP() { $ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); @@ -393,15 +354,23 @@ } } if(!function_exists('ini_get')){ + /** + * + * + * @param mixed var to use + * @return boolean + */ function ini_get($par){ return false; } } -/* -@desc this functions adds a space before every uppercase character -@param: the string -*/ +/** + * this functions adds a space before every uppercase character + * + * @param unknown_type $string + * @return string + */ function space_before_uppercase($string) { $string = trim(preg_replace('/([A-Z]{1}[a-z]+)/', ' $1', $string)); Modified: trunk/version1.0/includes/functions_color.php =================================================================== --- trunk/version1.0/includes/functions_color.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/functions_color.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,30 +1,21 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* functions_color.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Graphs will be proceed here + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } -/* -This function will random decimal color in array (255,255,255). -@return array with number for each color -*/ +/** + * This function will random decimal color in array (255,255,255). + * + * @return int color + */ function randomDecColor(){ $color = array(); for ($c = 0; $c < 3; $c++) { @@ -34,9 +25,14 @@ return $color; } /* -Generates an random Hex code + @return the hex-code */ +/** + * Generates an random Hex code + * + * @return string hex code + */ function randomHex() { $color = ''; for ($c = 0; $c < 6; $c++) { @@ -47,9 +43,15 @@ return $color; } /* -convertes a Hex color to a Dec Color + @return Decimal color */ +/** + * convertes a Hex color to a Dec Color + * + * @param string $hex + * @return int color + */ function hex2rgb($hex) { $color = ereg_replace('^#','',$hex); Modified: trunk/version1.0/includes/functions_sql.php =================================================================== --- trunk/version1.0/includes/functions_sql.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/functions_sql.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,32 +1,26 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* functions_sql.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * functions for SQL proceeding + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } -/* -This function will strip the sql comment lines out of an uploaded sql file -specifically for mssql and postgres type files in the install.... -@param sql lines -@return sql lines -*/ +/** + * @todo check if this file is stil needed? + */ +/** + * This function will strip the sql comment lines out of an uploaded sql file + * specifically for mssql and postgres type files in the install.... + * + * @param string $output + * @return string + */ function remove_comments(&$output) { $lines = explode("\n", $output); @@ -58,11 +52,12 @@ return $output; } -/* -This function will strip the sql comment lines out of an uploaded sql file -@param sql lines -@return sql lines -*/ +/** + * This function will strip the sql comment lines out of an uploaded sql file + * + * @param string $sql + * @return string + */ function remove_remarks($sql) { $lines = explode("\n", $sql); @@ -93,14 +88,14 @@ return $output; } - -/* -This function will split an uploaded sql file into single sql statements. -Note: expects trim() to have already been run on $sql. -@param sql lines -@param ware to split sign -@return array of sql lines -*/ +/** + * This function will split an uploaded sql file into single sql statements. + * Note: expects trim() to have already been run on $sql. + * + * @param string $sql + * @param string $delimiter + * @return string + */ function split_sql_file($sql, $delimiter) { // Split up our string into "possible" SQL statements. Modified: trunk/version1.0/includes/functions_vars.php =================================================================== --- trunk/version1.0/includes/functions_vars.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/functions_vars.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,71 +1,62 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* functions_vars.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Functions for vars + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ if(!defined('IN_STATS')) { die('Hacking Attempt'); } -if(!function_exists('get_var')){ - /* - This functions gets a var form POST GET COOKIE - @param Name of the var - @param Look in session of not - @param Look in cookie or not - @return value - */ - function get_var($name,$session = false,$cookie = false){ - if(isset($_COOKIE[$name]) && $cookie){ - return set_var($_COOKIE[$name]); - }elseif(isset($_SESSION[$name]) && $session){ - return set_var($_SESSION[$name]); - }elseif(isset($_POST[$name])){ - return set_var($_POST[$name]); - }elseif(isset($_GET[$name])){ - return set_var($_GET[$name]); - }else{ - return false; - } +/** + * This functions gets a var form POST GET COOKIE + * + * @param string $name + * @param boolean $session + * @param boolean $cookie + * @return mixed + */ +function get_var($name,$session = false,$cookie = false){ + if(isset($_COOKIE[$name]) && $cookie){ + return set_var($_COOKIE[$name]); + }elseif(isset($_SESSION[$name]) && $session){ + return set_var($_SESSION[$name]); + }elseif(isset($_POST[$name])){ + return set_var($_POST[$name]); + }elseif(isset($_GET[$name])){ + return set_var($_GET[$name]); + }else{ + return false; } - /* - This functions prepears var for store - @param value - @return value - */ - function set_var($result){ - //met arrays gaat het ophalen helemaal fout - if(!is_array($result)){ - $result = trim(htmlspecialchars(str_replace(array("\r\n", "\r", '\xFF'), array("\n", "\n", ' '), $result))); - $result = (STRIP) ? stripslashes($result) : $result; - }else{ - for($i = 0; $i < count($result);$i++){ - $result[$i] = trim(htmlspecialchars(str_replace(array("\r\n", "\r", '\xFF'), array("\n", "\n", ' '), $result[$i]))); - $result[$i] = (STRIP) ? stripslashes($result[$i]) : $result[$i]; - } +} +/** + * Set a var for using + * + * @param mixed $result + * @return mixed + */ +function set_var($result){ + //met arrays gaat het ophalen helemaal fout + if(!is_array($result)){ + $result = trim(htmlspecialchars(str_replace(array("\r\n", "\r", '\xFF'), array("\n", "\n", ' '), $result))); + $result = (STRIP) ? stripslashes($result) : $result; + }else{ + for($i = 0; $i < count($result);$i++){ + $result[$i] = trim(htmlspecialchars(str_replace(array("\r\n", "\r", '\xFF'), array("\n", "\n", ' '), $result[$i]))); + $result[$i] = (STRIP) ? stripslashes($result[$i]) : $result[$i]; } - return $result; } + return $result; } -/* -This function adds slashes to EVERY value in the array -@param the array -@return the new array -*/ +/** + * This function adds slashes to EVERY value in the array + * + * @param array $array + * @return array + */ function array_add_slashes($array) { $new_array = array(); @@ -87,12 +78,12 @@ return addslashes($array); } } - -/* -Simple function to add slashes if m_q_gpc is off -@param Text -@return addslashed text -*/ +/** + * Simple function to add slashes if m_q_gpc is off + * + * @param string $text + * @return unknown + */ function add_slashes($text) { if(!STRIP) @@ -101,11 +92,11 @@ } return $text; } -/* -This function unsets an array of globals -@param the array -@return nothing -*/ +/** + * This function unsets an array of globals + * + * @param array $array + */ function unset_global($array){ if(is_array($array)){ while(list($el,$wa) = each($array)){ @@ -114,6 +105,12 @@ } } } +/** + * Remove double spaces in a string + * + * @param string $string + * @return string + */ function remove_double_spaces($string) { $string = preg_replace('/(\s*)/',"%20",$string); @@ -121,13 +118,13 @@ $string = str_replace('%20',"",$string); return $string; } - -/* -This function makes a date of a string -@param string -@param offset -@returnndate -*/ +/** + * This function makes a date of a string + * + * @param string $string + * @param int $offset + * @return string + */ function gmdate_divisable($string,$offset = NULL){ if ($offset && $offset != NULL){ $date = gmdate($string, $offset); @@ -137,12 +134,14 @@ if ($date <= 0) { $date = 1; } return $date; } -/* -This function will make a size that is readable. -@param size in bytes -@param number of decimals after -@return size -*/ + +/** + * This function will make a size that is readable. + * + * @param int $size + * @param int $decimals + * @return string + */ function human_size($size, $decimals = 1) { $suffix = array('Bytes','KB','MB','GB','TB','PB','EB','ZB','YB','NB','DB'); $i = 0; @@ -153,11 +152,13 @@ } return round($size, $decimals).' '.$suffix[$i]; } -/* -This function will make a time that is readable. -@param sec in seconds -@return array with (days hours minuts seconds) -*/ + +/** + * This function will make a time that is readable. + * + * @param int $sec + * @return array + */ function human_duration($sec){ $min = $sec / 60; $sec = $sec % 60; @@ -171,7 +172,11 @@ return $array = array("days" => (int)$dag, "hours" => $uur, "minutes" => $minPretty, "seconds" => $secPretty); } - +/** + * same as array_merge, but this one holds the key's + * + * @return string + */ function ArrayMergeKeepKeys() { $arg_list = func_get_args(); $Zoo = array(); @@ -187,6 +192,12 @@ } return $Zoo; } +/** + * Urldecode array + * + * @param array $array + * @return array + */ function urldecode_array($array){ $new_array = array(); if(is_array($array)){ @@ -207,6 +218,12 @@ return urldecode($array); } } +/** + * Parse a file for reading + * + * @param string $tmp + * @param array $MD + */ function md(&$tmp,&$MD){ $tmp = preg_replace("#(.*?)".preg_quote('<!--BEGIN-->') . "(.*?)" . preg_quote('<!--END-->') . "(.*?)#si","\\2",$tmp); $row = explode("<!-- FILE -->",$tmp); Modified: trunk/version1.0/includes/pngreplacer.php =================================================================== --- trunk/version1.0/includes/pngreplacer.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/pngreplacer.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,22 +1,13 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* pngreplacer.php -* **************** -* $Id$ -******************************************************************/ +/** + * PNG replacer + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ -/******************************************************************* -* -* 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. -* -*******************************************************************/ /** * KOIVI PNG Alpha IMG Tag Replacer for PHP (C) 2004 Justin Koivisto * Version 2.0.12 Modified: trunk/version1.0/includes/start.php =================================================================== --- trunk/version1.0/includes/start.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/includes/start.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,22 +1,16 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* start.php -* **************** -* $Id$ -******************************************************************/ -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Load all files and more + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ session_start(); +/** + * @ignore + */ define('START_TIME',microtime()); if(!defined('IN_STATS')) { Modified: trunk/version1.0/index.php =================================================================== --- trunk/version1.0/index.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/index.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,24 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* index.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ - +/** + * index file + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); loc("stats.php"); Modified: trunk/version1.0/notice.php =================================================================== --- trunk/version1.0/notice.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/notice.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* notice.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Display notices for rcts if needed + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); Modified: trunk/version1.0/overlay.php =================================================================== --- trunk/version1.0/overlay.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/overlay.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* stats.php -* **************** -* $Id: stats.php 1682 2006-04-04 20:03:28Z paulsohier $ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * Graphs will be proceed here + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); if(count($_SESSION)) Modified: trunk/version1.0/rss.php =================================================================== --- trunk/version1.0/rss.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/rss.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,24 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* rss.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ -//Starting up STATS +/** + * generated rss + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); Modified: trunk/version1.0/stats.php =================================================================== --- trunk/version1.0/stats.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/stats.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* stats.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * display stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); if(count($_SESSION)) Modified: trunk/version1.0/statsGetJS.php =================================================================== --- trunk/version1.0/statsGetJS.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/statsGetJS.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,24 +1,23 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* statsGetJS.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * save stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); +/** + * @ignore + */ define('IN_JS',true); include(RCTS_ROOT_PATH.'/includes/start.php'); $multisite = new multisite; Modified: trunk/version1.0/statsGetJSend.php =================================================================== --- trunk/version1.0/statsGetJSend.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/statsGetJSend.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,24 +1,23 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* statsGetJSend.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * save stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); +/** + * @ignore + */ define('IN_JS',true); include(RCTS_ROOT_PATH.'/includes/start.php'); error_reporting(E_ALL); Modified: trunk/version1.0/statsGetTimeOnline.php =================================================================== --- trunk/version1.0/statsGetTimeOnline.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/statsGetTimeOnline.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,24 +1,23 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* statsGetTimeOnline.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * save stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); +/** + * @ignore + */ define('IN_JS',true); include(RCTS_ROOT_PATH.'/includes/start.php'); error_reporting(0); Modified: trunk/version1.0/stats_js.php =================================================================== --- trunk/version1.0/stats_js.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/stats_js.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* stats.php -* **************** -* $Id: stats.php 1682 2006-04-04 20:03:28Z paulsohier $ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * save stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); if(count($_SESSION)) Modified: trunk/version1.0/wizz.php =================================================================== --- trunk/version1.0/wizz.php 2006-07-03 18:54:21 UTC (rev 1901) +++ trunk/version1.0/wizz.php 2006-07-03 18:59:11 UTC (rev 1902) @@ -1,23 +1,19 @@ <?php -/****************************************************************** -* Really Coding Traffic Statistics 2 -* Begin: October, 3rd 2005 -* Copyright: Copyright 2005 by Really coding Group -****************************************************************** -* wizz.php -* **************** -* $Id$ -******************************************************************/ - -/******************************************************************* -* -* 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. -* -*******************************************************************/ +/** + * save stats + * @package RCTS2 + * @version $Id$ + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @copyright Really Coding Group, 2005-2006 + * @author Really Coding Group + */ +/** + * @ignore + */ define('IN_STATS', true); +/** + * @ignore + */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); if(!$core->is_login()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-07-03 19:56:49
|
Revision: 1903 Author: paulsohier Date: 2006-07-03 12:51:50 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1903&view=rev Log Message: ----------- More phpdoc :D Modified Paths: -------------- trunk/version1.0/docs/phpdoc/RCTS/CGraph.html trunk/version1.0/docs/phpdoc/RCTS/CodeGet.html trunk/version1.0/docs/phpdoc/RCTS/CodeGot.html trunk/version1.0/docs/phpdoc/RCTS/ConfigFinished.html trunk/version1.0/docs/phpdoc/RCTS/LayoutSel.html trunk/version1.0/docs/phpdoc/RCTS/LineGraph.html trunk/version1.0/docs/phpdoc/RCTS/PHPlot.html trunk/version1.0/docs/phpdoc/RCTS/PieGraph.html trunk/version1.0/docs/phpdoc/RCTS/RCPluginBase.html trunk/version1.0/docs/phpdoc/RCTS/RCPlugins.html trunk/version1.0/docs/phpdoc/RCTS/RP_ComeFrom.html trunk/version1.0/docs/phpdoc/RCTS/RP_Follow.html trunk/version1.0/docs/phpdoc/RCTS/RP_Mysql.html trunk/version1.0/docs/phpdoc/RCTS/RP_SearchTerms.html trunk/version1.0/docs/phpdoc/RCTS/RP_UserOptions.html trunk/version1.0/docs/phpdoc/RCTS/RP_phpbb.html trunk/version1.0/docs/phpdoc/RCTS/RP_postnuke.html trunk/version1.0/docs/phpdoc/RCTS/Splash.html trunk/version1.0/docs/phpdoc/RCTS/WebSiteMap.html trunk/version1.0/docs/phpdoc/RCTS/Wizard.html trunk/version1.0/docs/phpdoc/RCTS/_XML_main_php.html trunk/version1.0/docs/phpdoc/RCTS/_XML_overlay_php.html trunk/version1.0/docs/phpdoc/RCTS/_XML_stats_php.html trunk/version1.0/docs/phpdoc/RCTS/_cache_config_php.html trunk/version1.0/docs/phpdoc/RCTS/_cache_sql_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_check_lang_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_configtor_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_conv_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_debugger_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_kalenderTest_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_svnsnap_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_test2_php.html trunk/version1.0/docs/phpdoc/RCTS/_developer_test_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_cron_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_getstats_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_graph_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_layout_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_linegraph_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_load_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_mailer_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_multisite_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_phplot_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_piegraph_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_session_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_stats_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_template_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_time_online_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_viewer_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_wizard_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_classes_class_zip_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_config_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_db_db_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_db_msaccess_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_db_mssql_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_db_mysql_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_db_postsql_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_javascript_functions_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_javascript_overlay_functions_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_javascript_stats_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_config_general_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_config_user_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_ftp_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_header_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_info_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_layout_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_multisite_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_smtp_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_modules_acp_acp_update_php.html trunk/version1.0/docs/phpdoc/RCTS/_includes_wizards_configwiz_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_admin_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_config_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_install_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_main_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_rss_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_stats_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_en_wizz_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_admin_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_config_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_install_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_main_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_rss_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_stats_php.html trunk/version1.0/docs/phpdoc/RCTS/_lang_nl_wizz_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_ComeFrom_data_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_ComeFrom_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_ComeFrom_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Follow_class_siteMap_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Follow_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Follow_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Mysql_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Mysql_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Postnuke_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Postnuke_postnukeGatherStats_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_Postnuke_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_SearchTerms_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_SearchTerms_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_UserOptions_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_UserOptions_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_phpbb_plugin_php.html trunk/version1.0/docs/phpdoc/RCTS/_plugins_plugin_phpbb_version_php.html trunk/version1.0/docs/phpdoc/RCTS/_staticData_languages_php.html trunk/version1.0/docs/phpdoc/RCTS/_templates_rcts_rcts_php.html trunk/version1.0/docs/phpdoc/RCTS/acp_config_general.html trunk/version1.0/docs/phpdoc/RCTS/acp_config_user.html trunk/version1.0/docs/phpdoc/RCTS/acp_ftp.html trunk/version1.0/docs/phpdoc/RCTS/acp_header.html trunk/version1.0/docs/phpdoc/RCTS/acp_info.html trunk/version1.0/docs/phpdoc/RCTS/acp_layout.html trunk/version1.0/docs/phpdoc/RCTS/acp_multisite.html trunk/version1.0/docs/phpdoc/RCTS/acp_plugin.html trunk/version1.0/docs/phpdoc/RCTS/acp_smtp.html trunk/version1.0/docs/phpdoc/RCTS/acp_update.html trunk/version1.0/docs/phpdoc/RCTS/bsd_common.html trunk/version1.0/docs/phpdoc/RCTS/cron.html trunk/version1.0/docs/phpdoc/RCTS/db.html trunk/version1.0/docs/phpdoc/RCTS/display.html trunk/version1.0/docs/phpdoc/RCTS/displayStats.html trunk/version1.0/docs/phpdoc/RCTS/gatherViewerStats.html trunk/version1.0/docs/phpdoc/RCTS/getStats.html trunk/version1.0/docs/phpdoc/RCTS/layout.html trunk/version1.0/docs/phpdoc/RCTS/load.html trunk/version1.0/docs/phpdoc/RCTS/msaccess.html trunk/version1.0/docs/phpdoc/RCTS/mssql.html trunk/version1.0/docs/phpdoc/RCTS/multisite.html trunk/version1.0/docs/phpdoc/RCTS/mysql.html trunk/version1.0/docs/phpdoc/RCTS/postsql.html trunk/version1.0/docs/phpdoc/RCTS/session.html trunk/version1.0/docs/phpdoc/RCTS/smtp.html trunk/version1.0/docs/phpdoc/RCTS/time_online.html trunk/version1.0/docs/phpdoc/RCTS/tpl.html trunk/version1.0/docs/phpdoc/RCTS/update.html trunk/version1.0/docs/phpdoc/RCTS/zip.html trunk/version1.0/docs/phpdoc/RCTS2/_admin_index_php.html trunk/version1.0/docs/phpdoc/RCTS2/_graph_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_classes_class_3dbargraph_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_constants_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_detection_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_functions_color_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_functions_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_functions_sql_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_functions_vars_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_pngreplacer_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_start_php.html trunk/version1.0/docs/phpdoc/RCTS2/_index_php.html trunk/version1.0/docs/phpdoc/RCTS2/_notice_php.html trunk/version1.0/docs/phpdoc/RCTS2/_overlay_php.html trunk/version1.0/docs/phpdoc/RCTS2/_rss_php.html trunk/version1.0/docs/phpdoc/RCTS2/_statsGetJS_php.html trunk/version1.0/docs/phpdoc/RCTS2/_statsGetJSend_php.html trunk/version1.0/docs/phpdoc/RCTS2/_statsGetTimeOnline_php.html trunk/version1.0/docs/phpdoc/RCTS2/_stats_js_php.html trunk/version1.0/docs/phpdoc/RCTS2/_stats_php.html trunk/version1.0/docs/phpdoc/RCTS2/_wizz_php.html trunk/version1.0/docs/phpdoc/RSSBuilder/RSSBase.html trunk/version1.0/docs/phpdoc/RSSBuilder/RSSBuilder.html trunk/version1.0/docs/phpdoc/RSSBuilder/RSSItem.html trunk/version1.0/docs/phpdoc/RSSBuilder/_includes_classes_class_RSS_php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__adminindex.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__graph.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesclassesclass.3dbargraph.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesconstants.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesdetection.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesfunctions.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesfunctions_color.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesfunctions_sql.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesfunctions_vars.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includespngreplacer.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesstart.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__index.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__notice.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__overlay.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__rss.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__stats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__statsGetJS.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__statsGetJSend.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__statsGetTimeOnline.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__stats_js.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__wizz.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__XMLmain.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__XMLoverlay.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__XMLstats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__cacheconfig.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__cachesql.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developercheck_lang.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developerconfigtor.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developerconv.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developerdebugger.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developerkalenderTest.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developersvnsnap.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developertest.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__developertest2.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.cron.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.getstats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.graph.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.layout.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.linegraph.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.load.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.mailer.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.multisite.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.phplot.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.piegraph.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.plugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.session.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.stats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.template.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.time_online.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.viewer.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.wizard.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesclassesclass.zip.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesconfig.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesdbdb.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesdbmsaccess.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesdbmssql.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesdbmysql.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesdbpostsql.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesjavascriptfunctions.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesjavascriptoverlay_functions.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesjavascriptstats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_config_general.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_config_user.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_ftp.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_header.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_info.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_layout.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_multisite.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_plugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_smtp.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includesmodulesacpacp_update.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__includeswizardsconfigwiz.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenadmin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenconfig.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langeninstall.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenmain.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenrss.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenstats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langenwizz.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnladmin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlconfig.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlinstall.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlmain.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlrss.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlstats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__langnlwizz.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_ComeFromdata.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_ComeFromplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_ComeFromversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Followclass.siteMap.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Followplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Followversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Mysqlplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Mysqlversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Postnukeplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_PostnukepostnukeGatherStats.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_Postnukeversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_SearchTermsplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_SearchTermsversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_UserOptionsplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_UserOptionsversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_phpbbplugin.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__pluginsplugin_phpbbversion.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__staticDatalanguages.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS__templatesrctsrcts.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RSSBuilder__includesclassesclass.RSS.php.html trunk/version1.0/docs/phpdoc/classtrees_RCTS.html trunk/version1.0/docs/phpdoc/classtrees_RCTS2.html trunk/version1.0/docs/phpdoc/classtrees_RSSBuilder.html trunk/version1.0/docs/phpdoc/classtrees_graphs.html trunk/version1.0/docs/phpdoc/elementindex.html trunk/version1.0/docs/phpdoc/elementindex_RCTS.html trunk/version1.0/docs/phpdoc/elementindex_RCTS2.html trunk/version1.0/docs/phpdoc/elementindex_RSSBuilder.html trunk/version1.0/docs/phpdoc/elementindex_graphs.html trunk/version1.0/docs/phpdoc/errors.html trunk/version1.0/docs/phpdoc/graphs/BarGraph.html trunk/version1.0/docs/phpdoc/index.html trunk/version1.0/docs/phpdoc/li_RCTS.html trunk/version1.0/docs/phpdoc/li_RCTS2.html trunk/version1.0/docs/phpdoc/packages.html trunk/version1.0/includes/classes/class.browser.php trunk/version1.0/includes/classes/class.cache.php trunk/version1.0/includes/classes/class.calendar.php trunk/version1.0/includes/classes/class.core.php Added Paths: ----------- trunk/version1.0/docs/phpdoc/RCTS2/_includes_classes_class_browser_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_classes_class_cache_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_classes_class_calendar_php.html trunk/version1.0/docs/phpdoc/RCTS2/_includes_classes_class_core_php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesclassesclass.browser.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesclassesclass.cache.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesclassesclass.calendar.php.html trunk/version1.0/docs/phpdoc/__filesource/fsource_RCTS2__includesclassesclass.core.php.html trunk/version1.0/docs/phpdoc/browser/ trunk/version1.0/docs/phpdoc/browser/browser.html trunk/version1.0/docs/phpdoc/classtrees_browser.html trunk/version1.0/docs/phpdoc/classtrees_core.html trunk/version1.0/docs/phpdoc/classtrees_stats.html trunk/version1.0/docs/phpdoc/core/ trunk/version1.0/docs/phpdoc/core/cache.html trunk/version1.0/docs/phpdoc/core/core.html trunk/version1.0/docs/phpdoc/elementindex_browser.html trunk/version1.0/docs/phpdoc/elementindex_core.html trunk/version1.0/docs/phpdoc/elementindex_stats.html trunk/version1.0/docs/phpdoc/li_browser.html trunk/version1.0/docs/phpdoc/li_core.html trunk/version1.0/docs/phpdoc/li_stats.html trunk/version1.0/docs/phpdoc/stats/ trunk/version1.0/docs/phpdoc/stats/calendar.html trunk/version1.0/error.txt trunk/version1.0/includes/RCTS2/ trunk/version1.0/includes/RCTS2/_functions_vars_php.html trunk/version1.0/includes/blank.html trunk/version1.0/includes/classtrees_RCTS2.html trunk/version1.0/includes/classtrees_default.html trunk/version1.0/includes/config.php5 trunk/version1.0/includes/elementindex.html trunk/version1.0/includes/elementindex_RCTS2.html trunk/version1.0/includes/elementindex_default.html trunk/version1.0/includes/errors.html trunk/version1.0/includes/index.html trunk/version1.0/includes/li_RCTS2.html trunk/version1.0/includes/li_default.html trunk/version1.0/includes/media/ trunk/version1.0/includes/media/banner.css trunk/version1.0/includes/media/stylesheet.css trunk/version1.0/includes/packages.html trunk/version1.0/templates/rcts/images/Thumbs.db Modified: trunk/version1.0/docs/phpdoc/RCTS/CGraph.html =================================================================== --- trunk/version1.0/docs/phpdoc/RCTS/CGraph.html 2006-07-03 18:59:11 UTC (rev 1902) +++ trunk/version1.0/docs/phpdoc/RCTS/CGraph.html 2006-07-03 19:51:50 UTC (rev 1903) @@ -805,7 +805,7 @@ </div> <div class="info-box-body"> <a name="var$axis_bgcolor" id="$axis_bgcolor"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -823,7 +823,7 @@ </div> <a name="var$axis_bordercolor" id="$axis_bordercolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -841,7 +841,7 @@ </div> <a name="var$axis_deepness" id="$axis_deepness"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -859,7 +859,7 @@ </div> <a name="var$axis_frontgridlines" id="$axis_frontgridlines"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -877,7 +877,7 @@ </div> <a name="var$axis_gridlines" id="$axis_gridlines"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -895,7 +895,7 @@ </div> <a name="var$axis_maxX" id="$axis_maxX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -913,7 +913,7 @@ </div> <a name="var$axis_maxY" id="$axis_maxY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -931,7 +931,7 @@ </div> <a name="var$axis_minX" id="$axis_minX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -949,7 +949,7 @@ </div> <a name="var$axis_minY" id="$axis_minY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -967,7 +967,7 @@ </div> <a name="var$axis_modeX" id="$axis_modeX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -985,7 +985,7 @@ </div> <a name="var$axis_modeY" id="$axis_modeY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1003,7 +1003,7 @@ </div> <a name="var$axis_positions" id="$axis_positions"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1021,7 +1021,7 @@ </div> <a name="var$axis_scalecolor" id="$axis_scalecolor"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1039,7 +1039,7 @@ </div> <a name="var$axis_scalefont" id="$axis_scalefont"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1057,7 +1057,7 @@ </div> <a name="var$axis_stepSize" id="$axis_stepSize"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1075,7 +1075,7 @@ </div> <a name="var$axis_stepX" id="$axis_stepX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1093,7 +1093,7 @@ </div> <a name="var$axis_stepY" id="$axis_stepY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1111,7 +1111,7 @@ </div> <a name="var$axis_xscalevisible" id="$axis_xscalevisible"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1129,7 +1129,7 @@ </div> <a name="var$axis_yscalevisible" id="$axis_yscalevisible"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1147,7 +1147,7 @@ </div> <a name="var$data" id="$data"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1165,7 +1165,7 @@ </div> <a name="var$font_Patch" id="$font_Patch"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1183,7 +1183,7 @@ </div> <a name="var$graph_areaheight" id="$graph_areaheight"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1201,7 +1201,7 @@ </div> <a name="var$graph_areawidth" id="$graph_areawidth"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1219,7 +1219,7 @@ </div> <a name="var$graph_bgcolor" id="$graph_bgcolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1237,7 +1237,7 @@ </div> <a name="var$graph_bgtransparent" id="$graph_bgtransparent"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1255,7 +1255,7 @@ </div> <a name="var$graph_bordercolor" id="$graph_bordercolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1273,7 +1273,7 @@ </div> <a name="var$graph_borderwidth" id="$graph_borderwidth"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1291,7 +1291,7 @@ </div> <a name="var$graph_padding" id="$graph_padding"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1309,7 +1309,7 @@ </div> <a name="var$graph_title" id="$graph_title"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1327,7 +1327,7 @@ </div> <a name="var$graph_titlecolor" id="$graph_titlecolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1345,7 +1345,7 @@ </div> <a name="var$graph_titlefont" id="$graph_titlefont"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1363,7 +1363,7 @@ </div> <a name="var$graph_transparencylevel" id="$graph_transparencylevel"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1381,7 +1381,7 @@ </div> <a name="var$legend_bgcolor" id="$legend_bgcolor"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1399,7 +1399,7 @@ </div> <a name="var$legend_bordercolor" id="$legend_bordercolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1417,7 +1417,7 @@ </div> <a name="var$legend_borderwidth" id="$legend_borderwidth"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1435,7 +1435,7 @@ </div> <a name="var$legend_color" id="$legend_color"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1453,7 +1453,7 @@ </div> <a name="var$legend_data" id="$legend_data"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1471,7 +1471,7 @@ </div> <a name="var$legend_floating" id="$legend_floating"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1489,7 +1489,7 @@ </div> <a name="var$legend_font" id="$legend_font"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1507,7 +1507,7 @@ </div> <a name="var$legend_height" id="$legend_height"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1525,7 +1525,7 @@ </div> <a name="var$legend_insidepadding" id="$legend_insidepadding"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1543,7 +1543,7 @@ </div> <a name="var$legend_padding" id="$legend_padding"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1561,7 +1561,7 @@ </div> <a name="var$legend_position" id="$legend_position"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1579,7 +1579,7 @@ </div> <a name="var$legend_visible" id="$legend_visible"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1597,7 +1597,7 @@ </div> <a name="var$legend_width" id="$legend_width"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1615,7 +1615,7 @@ </div> <a name="var$scale_funX" id="$scale_funX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1633,7 +1633,7 @@ </div> <a name="var$scale_funY" id="$scale_funY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1651,7 +1651,7 @@ </div> <a name="var$scale_roundX" id="$scale_roundX"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1669,7 +1669,7 @@ </div> <a name="var$scale_roundY" id="$scale_roundY"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1687,7 +1687,7 @@ </div> <a name="var$time_bgcolor" id="$time_bgcolor"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1705,7 +1705,7 @@ </div> <a name="var$time_bordercolor" id="$time_bordercolor"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1723,7 +1723,7 @@ </div> <a name="var$time_borderwidth" id="$time_borderwidth"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1741,7 +1741,7 @@ </div> <a name="var$time_color" id="$time_color"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1759,7 +1759,7 @@ </div> <a name="var$time_floating" id="$time_floating"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1777,7 +1777,7 @@ </div> <a name="var$time_font" id="$time_font"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1795,7 +1795,7 @@ </div> <a name="var$time_height" id="$time_height"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1813,7 +1813,7 @@ </div> <a name="var$time_insidepadding" id="$time_insidepadding"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1831,7 +1831,7 @@ </div> <a name="var$time_padding" id="$time_padding"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1849,7 +1849,7 @@ </div> <a name="var$time_position" id="$time_position"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1867,7 +1867,7 @@ </div> <a name="var$time_start" id="$time_start"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1885,7 +1885,7 @@ </div> <a name="var$time_visible" id="$time_visible"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1903,7 +1903,7 @@ </div> <a name="var$time_width" id="$time_width"><!-- --></A> -<div class="oddrow"> +<div class="evenrow"> <div class="var-header"> <span class="var-title"> @@ -1921,7 +1921,7 @@ </div> <a name="var$time_width2" id="$time_width2"><!-- --></A> -<div class="evenrow"> +<div class="oddrow"> <div class="var-header"> <span class="var-title"> @@ -1955,7 +1955,7 @@ <div class="info-box-body"> <A NAME='method_detail'></A> <a name="methodCGraph" id="CGraph"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">Constructor CGraph</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a94">94</a></span>) @@ -1975,7 +1975,7 @@ </div> <a name="methodDrawGraph" id="DrawGraph"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">DrawGraph</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a355">355</a></span>) @@ -2007,7 +2007,7 @@ </ul> </div> <a name="methodDrawGraph2" id="DrawGraph2"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">DrawGraph2</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a389">389</a></span>) @@ -2027,7 +2027,7 @@ </div> <a name="methodformat_number" id="format_number"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">format_number</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a1125">1125</a></span>) @@ -2047,7 +2047,7 @@ </div> <a name="methodhex2rgb" id="hex2rgb"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">hex2rgb</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a345">345</a></span>) @@ -2067,7 +2067,7 @@ </div> <a name="methodLoadGraph" id="LoadGraph"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">LoadGraph</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a334">334</a></span>) @@ -2087,7 +2087,7 @@ </div> <a name="methodSetAxisBackgroundColor" id="SetAxisBackgroundColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisBackgroundColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a160">160</a></span>) @@ -2107,7 +2107,7 @@ </div> <a name="methodSetAxisBorderColor" id="SetAxisBorderColor"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisBorderColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a157">157</a></span>) @@ -2129,7 +2129,7 @@ </div> <a name="methodSetAxisDeepness" id="SetAxisDeepness"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisDeepness</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a207">207</a></span>) @@ -2149,7 +2149,7 @@ </div> <a name="methodSetAxisFrontGridlines" id="SetAxisFrontGridlines"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisFrontGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a242">242</a></span>) @@ -2169,7 +2169,7 @@ </div> <a name="methodSetAxisGridlines" id="SetAxisGridlines"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a239">239</a></span>) @@ -2189,7 +2189,7 @@ </div> <a name="methodSetAxisModeX" id="SetAxisModeX"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisModeX</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a181">181</a></span>) @@ -2209,7 +2209,7 @@ </div> <a name="methodSetAxisModeY" id="SetAxisModeY"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisModeY</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a194">194</a></span>) @@ -2229,7 +2229,7 @@ </div> <a name="methodSetAxisPositions" id="SetAxisPositions"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisPositions</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a222">222</a></span>) @@ -2249,7 +2249,7 @@ </div> <a name="methodSetAxisScaleColor" id="SetAxisScaleColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisScaleColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a163">163</a></span>) @@ -2269,7 +2269,7 @@ </div> <a name="methodSetAxisScaleFont" id="SetAxisScaleFont"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisScaleFont</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a210">210</a></span>) @@ -2289,7 +2289,7 @@ </div> <a name="methodSetAxisScaleXVisibility" id="SetAxisScaleXVisibility"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisScaleXVisibility</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a175">175</a></span>) @@ -2309,7 +2309,7 @@ </div> <a name="methodSetAxisScaleYVisibility" id="SetAxisScaleYVisibility"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisScaleYVisibility</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a178">178</a></span>) @@ -2329,7 +2329,7 @@ </div> <a name="methodSetAxisStepSize" id="SetAxisStepSize"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisStepSize</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a172">172</a></span>) @@ -2349,7 +2349,7 @@ </div> <a name="methodSetAxisStepX" id="SetAxisStepX"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetAxisStepX</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a166">166</a></span>) @@ -2369,7 +2369,7 @@ </div> <a name="methodSetAxisStepY" id="SetAxisStepY"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetAxisStepY</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a169">169</a></span>) @@ -2389,7 +2389,7 @@ </div> <a name="methodSetData" id="SetData"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetData</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a328">328</a></span>) @@ -2411,7 +2411,7 @@ </div> <a name="methodSetGraphAreaHeight" id="SetGraphAreaHeight"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphAreaHeight</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a101">101</a></span>) @@ -2433,7 +2433,7 @@ </div> <a name="methodSetGraphAreaWidth" id="SetGraphAreaWidth"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetGraphAreaWidth</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a107">107</a></span>) @@ -2453,7 +2453,7 @@ </div> <a name="methodSetGraphBackgroundColor" id="SetGraphBackgroundColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphBackgroundColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a140">140</a></span>) @@ -2473,7 +2473,7 @@ </div> <a name="methodSetGraphBackgroundTransparent" id="SetGraphBackgroundTransparent"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetGraphBackgroundTransparent</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a143">143</a></span>) @@ -2493,7 +2493,7 @@ </div> <a name="methodSetGraphBorderColor" id="SetGraphBorderColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphBorderColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a134">134</a></span>) @@ -2513,7 +2513,7 @@ </div> <a name="methodSetGraphBorderWidth" id="SetGraphBorderWidth"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetGraphBorderWidth</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a137">137</a></span>) @@ -2533,7 +2533,7 @@ </div> <a name="methodSetGraphPadding" id="SetGraphPadding"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphPadding</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a113">113</a></span>) @@ -2553,7 +2553,7 @@ </div> <a name="methodSetGraphTitle" id="SetGraphTitle"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetGraphTitle</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a116">116</a></span>) @@ -2573,7 +2573,7 @@ </div> <a name="methodSetGraphTitleColor" id="SetGraphTitleColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphTitleColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a131">131</a></span>) @@ -2593,7 +2593,7 @@ </div> <a name="methodSetGraphTitleFont" id="SetGraphTitleFont"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetGraphTitleFont</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a119">119</a></span>) @@ -2613,7 +2613,7 @@ </div> <a name="methodSetGraphTransparency" id="SetGraphTransparency"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetGraphTransparency</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a147">147</a></span>) @@ -2633,7 +2633,7 @@ </div> <a name="methodSetLegendBackgroundColor" id="SetLegendBackgroundColor"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegendBackgroundColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a272">272</a></span>) @@ -2653,7 +2653,7 @@ </div> <a name="methodSetLegendBorderColor" id="SetLegendBorderColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetLegendBorderColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a275">275</a></span>) @@ -2673,7 +2673,7 @@ </div> <a name="methodSetLegendBorderWidth" id="SetLegendBorderWidth"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegendBorderWidth</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a278">278</a></span>) @@ -2693,7 +2693,7 @@ </div> <a name="methodSetLegendColors" id="SetLegendColors"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetLegendColors</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a281">281</a></span>) @@ -2713,7 +2713,7 @@ </div> <a name="methodSetLegendData" id="SetLegendData"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegendData</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a307">307</a></span>) @@ -2733,7 +2733,7 @@ </div> <a name="methodSetLegendFloating" id="SetLegendFloating"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetLegendFloating</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a269">269</a></span>) @@ -2753,7 +2753,7 @@ </div> <a name="methodSetLegendInsidePadding" id="SetLegendInsidePadding"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegendInsidePadding</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a287">287</a></span>) @@ -2773,7 +2773,7 @@ </div> <a name="methodSetLegendPadding" id="SetLegendPadding"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetLegendPadding</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a284">284</a></span>) @@ -2793,7 +2793,7 @@ </div> <a name="methodSetLegendPosition" id="SetLegendPosition"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegendPosition</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a290">290</a></span>) @@ -2813,7 +2813,7 @@ </div> <a name="methodSetLegendVisible" id="SetLegendVisible"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetLegendVisible</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a266">266</a></span>) @@ -2835,7 +2835,7 @@ </div> <a name="methodSetLegentFont" id="SetLegentFont"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetLegentFont</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a312">312</a></span>) @@ -2855,7 +2855,7 @@ </div> <a name="methodSetScaleFunctionX" id="SetScaleFunctionX"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetScaleFunctionX</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a256">256</a></span>) @@ -2875,7 +2875,7 @@ </div> <a name="methodSetScaleFunctionY" id="SetScaleFunctionY"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetScaleFunctionY</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a259">259</a></span>) @@ -2895,7 +2895,7 @@ </div> <a name="methodSetScaleRoundX" id="SetScaleRoundX"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">SetScaleRoundX</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a248">248</a></span>) @@ -2917,7 +2917,7 @@ </div> <a name="methodSetScaleRoundY" id="SetScaleRoundY"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">SetScaleRoundY</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a252">252</a></span>) @@ -2937,7 +2937,7 @@ </div> <a name="method__AllocateColor" id="__AllocateColor"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__AllocateColor</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a1007">1007</a></span>) @@ -2957,7 +2957,7 @@ </div> <a name="method__CorrectMinMax" id="__CorrectMinMax"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__CorrectMinMax</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a537">537</a></span>) @@ -2977,7 +2977,7 @@ </div> <a name="method__DrawAxis" id="__DrawAxis"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawAxis</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a429">429</a></span>) @@ -2997,7 +2997,7 @@ </div> <a name="method__DrawAxisPart" id="__DrawAxisPart"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__DrawAxisPart</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a644">644</a></span>) @@ -3017,7 +3017,7 @@ </div> <a name="method__DrawHorizontalGideGridlines" id="__DrawHorizontalGideGridlines"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawHorizontalGideGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a562">562</a></span>) @@ -3037,7 +3037,7 @@ </div> <a name="method__DrawHorizontalGridlines" id="__DrawHorizontalGridlines"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__DrawHorizontalGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a542">542</a></span>) @@ -3057,7 +3057,7 @@ </div> <a name="method__DrawLegend" id="__DrawLegend"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawLegend</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a1060">1060</a></span>) @@ -3077,7 +3077,7 @@ </div> <a name="method__DrawLegendItem" id="__DrawLegendItem"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__DrawLegendItem</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a1101">1101</a></span>) @@ -3097,7 +3097,7 @@ </div> <a name="method__DrawPolygon" id="__DrawPolygon"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawPolygon</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a785">785</a></span>) @@ -3117,7 +3117,7 @@ </div> <a name="method__DrawText" id="__DrawText"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__DrawText</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a733">733</a></span>) @@ -3137,7 +3137,7 @@ </div> <a name="method__DrawTime" id="__DrawTime"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawTime</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a1030">1030</a></span>) @@ -3157,7 +3157,7 @@ </div> <a name="method__DrawVerticalGideGridlines" id="__DrawVerticalGideGridlines"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__DrawVerticalGideGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a614">614</a></span>) @@ -3177,7 +3177,7 @@ </div> <a name="method__DrawVerticalGridlines" id="__DrawVerticalGridlines"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__DrawVerticalGridlines</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a592">592</a></span>) @@ -3197,7 +3197,7 @@ </div> <a name="method__Draw_LeftBottom_Axis" id="__Draw_LeftBottom_Axis"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__Draw_LeftBottom_Axis</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a505">505</a></span>) @@ -3217,7 +3217,7 @@ </div> <a name="method__Draw_TopRight_Axis" id="__Draw_TopRight_Axis"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__Draw_TopRight_Axis</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a521">521</a></span>) @@ -3237,7 +3237,7 @@ </div> <a name="method__GetMinMaxGraphValue" id="__GetMinMaxGraphValue"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__GetMinMaxGraphValue</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a756">756</a></span>) @@ -3257,7 +3257,7 @@ </div> <a name="method__LoadAxisValues" id="__LoadAxisValues"><!-- --></a> -<div class="oddrow"> +<div class="evenrow"> <div class="method-header"> <span class="method-title">__LoadAxisValues</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a881">881</a></span>) @@ -3277,7 +3277,7 @@ </div> <a name="method__LoadGraphDefinitions" id="__LoadGraphDefinitions"><!-- --></a> -<div class="evenrow"> +<div class="oddrow"> <div class="method-header"> <span class="method-title">__LoadGraphDefinitions</span> (line <span class="line-number"><a href="..//__filesource/fsource_RCTS__includesclassesclass.graph.php.html#a793">793</a></span>) @@ -3297,7 +3297,7 @@ </div> <a name="method__LoadGraphValues" id="__LoadGraphValues"><!--... [truncated message content] |
|
From: <pau...@us...> - 2006-07-03 20:47:40
|
Revision: 1904 Author: paulsohier Date: 2006-07-03 13:46:53 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1904&view=rev Log Message: ----------- Bugfixes and a lot of todo's :D Modified Paths: -------------- trunk/version1.0/admin/index.php trunk/version1.0/developer/debugger.php trunk/version1.0/includes/classes/class.3dbargraph.php trunk/version1.0/includes/classes/class.browser.php trunk/version1.0/includes/classes/class.cache.php trunk/version1.0/includes/classes/class.calendar.php trunk/version1.0/includes/classes/class.cron.php trunk/version1.0/includes/classes/class.getstats.php trunk/version1.0/includes/classes/class.graph.php trunk/version1.0/includes/classes/class.linegraph.php trunk/version1.0/includes/classes/class.load.php trunk/version1.0/includes/classes/class.multisite.php trunk/version1.0/includes/classes/class.phplot.php trunk/version1.0/includes/classes/class.plugin.php trunk/version1.0/includes/classes/class.session.php trunk/version1.0/includes/classes/class.template.php trunk/version1.0/includes/classes/class.viewer.php trunk/version1.0/includes/classes/class.wizard.php trunk/version1.0/includes/db/msaccess.php trunk/version1.0/includes/db/mssql.php trunk/version1.0/includes/db/mysql.php trunk/version1.0/includes/db/postsql.php trunk/version1.0/includes/detection.php trunk/version1.0/includes/modules/acp/acp_plugin.php trunk/version1.0/includes/modules/acp/acp_smtp.php trunk/version1.0/includes/modules/acp/acp_update.php trunk/version1.0/includes/pngreplacer.php trunk/version1.0/lang/en/install.php trunk/version1.0/lang/nl/install.php trunk/version1.0/overlay.php trunk/version1.0/plugins/plugin_ComeFrom/plugin.php trunk/version1.0/plugins/plugin_Follow/plugin.php trunk/version1.0/plugins/plugin_Mysql/plugin.php trunk/version1.0/plugins/plugin_Postnuke/postnukeGatherStats.php trunk/version1.0/plugins/plugin_SearchTerms/plugin.php trunk/version1.0/plugins/plugin_UserOptions/plugin.php trunk/version1.0/plugins/plugin_phpbb/plugin.php Modified: trunk/version1.0/admin/index.php =================================================================== --- trunk/version1.0/admin/index.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/admin/index.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -84,8 +84,9 @@ while (false !== ($file = readdir($open))) { //Lets load the class ;) + $match = ""; if(is_file($dir . "/" . $file) && preg_match("#acp_([a-z0-9_]+).php#",$file,$match)) - { + { $load = $match[1]; include_once($dir . "/" . $file); $load = "acp_" . $load; Modified: trunk/version1.0/developer/debugger.php =================================================================== --- trunk/version1.0/developer/debugger.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/developer/debugger.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -27,12 +27,12 @@ while ($row = mysql_fetch_row($result)) { -$row=$row[0]; + $row=$row[0]; $sql = "SELECT * FROM ".$row; $res = $db->sql_query($sql); - if(!$res){ - st_die(SQL,"Could not query debugger","",__LINE__,__FILE__,$sql); - } + if(!$res){ + st_die(SQL,"Could not query debugger","",__LINE__,__FILE__,$sql); + } echo "<h1>".$row."</h1><table border='1'><tr><td>#</td>"; Modified: trunk/version1.0/includes/classes/class.3dbargraph.php =================================================================== --- trunk/version1.0/includes/classes/class.3dbargraph.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.3dbargraph.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -195,6 +195,7 @@ imagedestroy($this->im); return $ret; } + return ""; } /** Modified: trunk/version1.0/includes/classes/class.browser.php =================================================================== --- trunk/version1.0/includes/classes/class.browser.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.browser.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -119,6 +119,8 @@ if (preg_match('/fsockopen/', @ini_get('disable_functions')) || !function_exists('fsockopen')) { return false; } + $errornr = ""; + $errorstr = ""; $connection = fsockopen($host, $port, $errornr, $errorstr, 10); if(!$connection) { st_die(RCTS_GENERAL_MESSAGE,"Could not connect to ".$host." on port ".$port.":<br />".$errornr.". ".$errorstr,__LINE__,__FILE__); @@ -133,7 +135,10 @@ fwrite($connection, $http_headers); $is = $begin = false; $bytes = 0; - $total = 0; + /** + * @todo check if these var is still needed + */ +// $total = 0; $length = -1; while(!feof($connection)) { $tmp = fread($connection, 1024); Modified: trunk/version1.0/includes/classes/class.cache.php =================================================================== --- trunk/version1.0/includes/classes/class.cache.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.cache.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -145,7 +145,6 @@ */ function cal($query){ - global $db; if(!preg_match("#SELECT#si",$query)){ trigger_error("Only select query is supported.",E_USER_ERROR); } @@ -367,7 +366,7 @@ }else{ $this->_fopen = fopen($file,$mode); if(!$this->_fopen){ - trigger_error("Could not open $file in mode $m",E_USER_ERROR); + trigger_error("Could not open $file in mode $mode",E_USER_ERROR); } return true; } @@ -433,6 +432,7 @@ }else{ return fclose($this->_fopen); } + return ""; } /** * Writes the .htaccess file, and adds the RewriteRules. Modified: trunk/version1.0/includes/classes/class.calendar.php =================================================================== --- trunk/version1.0/includes/classes/class.calendar.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.calendar.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -238,7 +238,10 @@ { $result = array(); $day = $timestamp; - $end = $this->get_day_end_time($timestamp); + /** + * @todo check if this var is still needed + */ +// $end = $this->get_day_end_time($timestamp); if(is_array($stat_type)) { $resultTmp = array(); Modified: trunk/version1.0/includes/classes/class.cron.php =================================================================== --- trunk/version1.0/includes/classes/class.cron.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.cron.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -189,6 +189,7 @@ print $output; die; } + return ""; } } @@ -564,7 +565,7 @@ */ function language(){ - global $calendar,$idid,$template,$calendar_day; + global $calendar,$idid,$template,$calendar_day,$core; if(!$calendar_day) { $calendar_day = "all"; @@ -614,7 +615,7 @@ */ function flash(){ - global $calendar,$idid,$template,$kalDay,$calendar_day; + global $calendar,$idid,$template,$calendar_day; if(!$calendar_day) { $calendar_day = "all"; @@ -761,7 +762,10 @@ header('Content-Type: image/png'); header("Location: "."./images/small.gif"); }else{ - $color = randomDecColor(); + /** + * @todo check if this var is still needed + */ +// $color = randomDecColor(); $daynames = array('Sun','Mon','Tue','Wed','Thu','Fri','Sat'); foreach($days as $dayN=>$count) @@ -805,7 +809,10 @@ header('Content-Type: image/png'); header("Location: "."./images/small.gif"); }else{ - $color = randomDecColor(); + /** + * @todo check if this var still is needed + */ + //$color = randomDecColor(); foreach($days as $dayN=>$count) { Modified: trunk/version1.0/includes/classes/class.getstats.php =================================================================== --- trunk/version1.0/includes/classes/class.getstats.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.getstats.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -24,14 +24,15 @@ // Class to get stats from the database. class getStats { - /* - Function to get the total visits of today - @param site id - @return Visits + /** + * Function to get the total visits of today + * @param site id + * @return Visits + * @todo check where $timestamp is needed */ function getTotalVisit($timestamp, $idid) { - global $db, $calendar; + global $calendar; $visitsToday = array(); $visitsToday = $calendar->get_stats('visitors', $idid, time(), 0); @@ -82,10 +83,9 @@ } /* Function to get visit by hour of the day - @param site id @return Array with hours and visits */ - function getHours($idid) + function getHours() { global $db; @@ -103,9 +103,9 @@ @param site id @return Array with days and visits */ - function getDaysW($idid) + function getDaysW() { - global $db,$lang; + global $db; $sql = "SELECT * FROM ".RCTS_CALENDAR_TABLE." @@ -136,7 +136,7 @@ * @desc selects the visist per day of the month * @param multisite id */ - function getDaysM($idid) + function getDaysM() { global $db; @@ -167,7 +167,7 @@ * @desc selects the visist per day of the month * @param multisite id */ - function getMonth($idid) + function getMonth() { global $db; @@ -201,7 +201,7 @@ @param site id @return Array with hour and visits */ - function getHours_max($idid) + function getHours_max() { global $db; @@ -233,7 +233,7 @@ @param site id @return Array with day and visits */ - function getDaysW_max($idid) + function getDaysW_max() { global $db; @@ -263,7 +263,7 @@ @param site id @return Array with day and visits */ - function getDaysM_max($idid) + function getDaysM_max() { global $db; @@ -293,7 +293,7 @@ @param site id @return Array with month and visits */ - function getMonth_max($idid) + function getMonth_max() { global $db; @@ -420,7 +420,11 @@ $domains['todaydate'] = date('d/m/Y', $calendar->get_day_start_time($day)); $domains['yest'] = array(); $timestamp = time(); - $time = mktime(0, 0, 0, date("m", $timestamp), date("d", $timestamp)-1, date("Y", $timestamp)); + /** + * @todo check if this var is still needed + */ +// $time = mktime(0, 0, 0, date("m", $timestamp), date("d", $timestamp)-1, date("Y", $timestamp)); + // $set = $calendar->get_stats('referers', $idid, $time, $limit); // $set = $calendar->get_stats('referers', $idid, $calendar->get_day_start_time(time() - 86300), $limit); $set = $calendar->get_stats('referers', $idid, $calendar->get_day_start_time($day - 86300), $limit); Modified: trunk/version1.0/includes/classes/class.graph.php =================================================================== --- trunk/version1.0/includes/classes/class.graph.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.graph.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -472,8 +472,10 @@ } elseif ($this->axis_modeY == 2) { if($this->axis_maxY != $this->axis_minY){ $this->axis_stepY = $this->axis_stepY * ($this->axis_maxY - $this->axis_minY) / $this->graph_areaheight; - - $rest = abs($this->axis_maxY) % $this->axis_stepY; + /** + * @todo check if this var is still needed + */ +// $rest = abs($this->axis_maxY) % $this->axis_stepY; // need to center a step on coord 0 } } @@ -533,7 +535,9 @@ "up", "right"); } } - + /** + * @todo check why $step is passd by reference + */ function __CorrectMinMax(&$min, &$max, &$step) { if (($max % $step) != 0) $max += ($step - abs($max % $step)); if (($min % $step) != 0) $min -= abs($min % $step); @@ -795,7 +799,11 @@ $data = array(); $section = ''; $index = 0; + /** + * @todo Check this regular expressions! + */ for ($i = 0; $i < count($text); $i++) { + $r = ""; if (preg_match("/^\s*#/", $text[$i])) { //ignore.. it's just a comment } elseif (preg_match("/^\s*\}\s*/", $text[$i])) { Modified: trunk/version1.0/includes/classes/class.linegraph.php =================================================================== --- trunk/version1.0/includes/classes/class.linegraph.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.linegraph.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -147,6 +147,7 @@ imagedestroy($this->im); return $ret; } + return ""; } /** Modified: trunk/version1.0/includes/classes/class.load.php =================================================================== --- trunk/version1.0/includes/classes/class.load.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.load.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -41,7 +41,7 @@ return strpos($program, '.exe'); }; - return; + return ""; } function execute_program ($program, $args = '') { $buffer = ''; @@ -67,6 +67,7 @@ } return trim($buffer); } + return ""; } class bsd_common { var $dmesg; @@ -294,7 +295,7 @@ @return array with time or with average times */ function getTopTijd($count = 5,$idid=1,$soort = 'DESC',$graph = false){ - global $db,$calendar; + global $calendar; if(!$graph){ $tmp = $calendar -> get_stats('render_time', $idid, "all", $count, false, 120, array('stat_value', ($soort == 'ASC' ? 'ASC' : 'DESC'))); $this->order($tmp); @@ -348,6 +349,7 @@ if(class_exists('load')){ return $load->uptime(); } + return ""; }/* This functions gets the CPU load of the server @return load @@ -357,6 +359,7 @@ if(class_exists('load')){ return $load->loadavg(); } + return ""; } } class update{ @@ -386,9 +389,13 @@ $timing_start = get_var('RCTS_start_time',false,true); $timing_start = unserialize(base64_decode($timing_start)); } + /** + * @todo check why this code is here :D + */ + /* if(!isset($timing_idid) || empty($timing_idid)){ $timing_idid = get_var('RCTS_idid_load',false,true); - } + }*/ if(!$timing_start){ return false; } Modified: trunk/version1.0/includes/classes/class.multisite.php =================================================================== --- trunk/version1.0/includes/classes/class.multisite.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.multisite.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -69,6 +69,7 @@ }else{//multisite return "NONE"; }//multisite + return ""; } /* This functions merges to ids into one on the server the secent wil be gone Modified: trunk/version1.0/includes/classes/class.phplot.php =================================================================== --- trunk/version1.0/includes/classes/class.phplot.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.phplot.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -967,13 +967,14 @@ // (Remember the alignment convention with vertical text) if ($which_angle == 90) { // The text goes around $which_xpos. - if ($which_halign == 'center') + if ($which_halign == 'center'){ $which_xpos -= ($nlines * ($which_font['height'] + $spacing))/2; // Left alignment requires no modification to $xpos... // Right-align it. $which_xpos designated the rightmost x coordinate. - else if ($which_halign == 'right') + }else if ($which_halign == 'right'){ $which_xpos += ($nlines * ($which_font['height'] + $spacing)); + } $ypos = $which_ypos; for($i = 0; $i < $nlines; $i++) { @@ -1761,6 +1762,9 @@ * use for (or while) loops, which sometimes are faster. Performance improvements * vary from 28% in DrawLines() to 49% in DrawArea() for plot drawing functions. */ + /** + * @todo check why this is passed by reference. + */ function SetDataValues(&$which_dv) { unset ($this->data_limits_done); // Reset this for every new data_set @@ -2576,7 +2580,7 @@ } else if ($mode == 'centeredtile') { $x0 = - floor($size[0]/2); // Make the tile look better $y0 = - floor($size[1]/2); - } else if ($mode = 'tile') { + } else if ($mode == 'tile') { $x0 = 0; $y0 = 0; } @@ -3173,7 +3177,10 @@ $xpos = $this->plot_area[0] + $this->plot_area_width/2; $ypos = $this->plot_area[1] + $this->plot_area_height/2; $diameter = min($this->plot_area_width, $this->plot_area_height); - $radius = $diameter/2; + /** + * @todo check if this var is still needed + */ + //$radius = $diameter/2; // Get sum of each column? One pie slice per column if ($this->data_type === 'text-data') { @@ -3263,6 +3270,7 @@ $color_index = $color_index % $max_data_colors; } // end for } // end for + return ""; } @@ -3508,6 +3516,7 @@ // Proceed with Y values // Create array of points for imagefilledpolygon() + $num_points = array(); for($idx = 0; $rec < $this->num_recs[$row]; $rec++, $idx++) { if (is_numeric($this->data[$row][$rec])) { // Allow for missing Y data $y_now_pixels = $this->ytr($this->data[$row][$rec]); @@ -3676,6 +3685,8 @@ } // end for ImageSetThickness($this->img, 1); // Revert to original state for lines to be drawn later. + + return ""; } // function DrawLinesError() @@ -3795,6 +3806,7 @@ } } // end for } // end for + return ""; } //function DrawBars @@ -3847,6 +3859,7 @@ } } // end for } // end for + return ""; } //function DrawStackedBars @@ -3982,6 +3995,7 @@ if ($this->print_image) $this->PrintImage(); + return ""; } //function DrawGraph() Modified: trunk/version1.0/includes/classes/class.plugin.php =================================================================== --- trunk/version1.0/includes/classes/class.plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -55,7 +55,7 @@ // Install event function installPlugin() { - global $db, $mysql_prefix; + // Perform queries here! } @@ -118,7 +118,7 @@ // Set option function setOption($oname, $value) { global $db; - $sql = "UPDATE ".RCTS_PLUGIN_OPTION_TABLE." SET waarde = '$waarde' WHERE naam = '$naam'"; + $sql = "UPDATE ".RCTS_PLUGIN_OPTION_TABLE." SET waarde = '$value' WHERE naam = '$oname'"; $db->sql_query($sql); if(!$db->sql_affectedrows()){ $sql = "INSERT INTO ".RCTS_PLUGIN_OPTION_TABLE." @@ -193,6 +193,8 @@ $this->status = array(); $dir = opendir(RCTS_ROOT_PATH.'/plugins/'); + $status = array(); + while(false !== ($file = readdir($dir))) { @@ -201,6 +203,7 @@ $plug_name = trim(str_replace("plugin_", "", $file)); $filename = RCTS_ROOT_PATH.'/plugins/'.$file.'/version.php'; if (file_exists($filename)) { + $modversion = array(); include_once $filename; $versionPlug = $modversion['version']; } else { @@ -276,6 +279,7 @@ function getPluginInfo($name) { $filename = RCTS_ROOT_PATH.'/plugins/plugin_'.$name.'/version.php'; + $modversion = array(); if (file_exists($filename)) { include_once $filename; } Modified: trunk/version1.0/includes/classes/class.session.php =================================================================== --- trunk/version1.0/includes/classes/class.session.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.session.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -31,13 +31,13 @@ $sid = md5(time() * rand(0,time())); $counted = intval($counted); $sql = "DELETE FROM ".RCTS_SESSIONS_TABLE." WHERE tijd <= ".time().""; - $res = $db->sql_query($sql); + $db->sql_query($sql); $sql = "INSERT INTO ".RCTS_SESSIONS_TABLE." (sid,tijd,counted) VALUES ('$sid','".(time() + 3600 * 24)."',$counted); "; - $res = $db->sql_query($sql); + $db->sql_query($sql); return $sid; } @@ -54,7 +54,7 @@ counted = ".intval($counted)." WHERE sid = '$sid' "; - $res = $db->sql_query($sql); + $db->sql_query($sql); } /* This function deletes the session @@ -64,7 +64,7 @@ function delete($sid){ global $db; $sql = "DELETE FROM ".RCTS_SESSIONS_TABLE." WHERE sid = '$sid'"; - $res = $db->sql_query($sql); + $db->sql_query($sql); } } ?> Modified: trunk/version1.0/includes/classes/class.template.php =================================================================== --- trunk/version1.0/includes/classes/class.template.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.template.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -208,6 +208,9 @@ if($core->is_login()) { $array = array(); + /** + * @todo check this regex + */ preg_match_all("#\[\[ START NAVROW \]\](.*?)\[\[ STOP NAVROW \]\]#si",$row,$array); $navRow = $array[1][0]; } @@ -278,6 +281,7 @@ $block_IF_TPL = ''; $include_i = 0; $include_t = time(); + $m = ""; for ($i = 0; $i < count($code_lines); $i++) { $code_lines[$i] = chop($code_lines[$i]); Modified: trunk/version1.0/includes/classes/class.viewer.php =================================================================== --- trunk/version1.0/includes/classes/class.viewer.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.viewer.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -36,6 +36,9 @@ $browserdata = array_add_slashes(urldecode_array(browser_detection('full'))); $referer = array_add_slashes(urldecode_array($this->getReferer())); $entryPage = array_add_slashes(urldecode_array($this->getUri())); + /** + * @todo check why this is needed ;) + */ $ip = array_add_slashes(urldecode_array($this->getIp())); $agent = array_add_slashes(urldecode_array($this->getAgent())); $browser = array_add_slashes(urldecode_array($this->getBrowser($browserdata))); @@ -44,7 +47,10 @@ $color = array_add_slashes(urldecode_array($this->getColorDepth())); $resolution = array_add_slashes(urldecode_array($this->getResolution())); $gmtOff = array_add_slashes(urldecode_array($this->gmtOff())); - $java = array_add_slashes(urldecode_array(get_var("java"))); + /** + * @todo check why this is needed ;) + */ + $java = array_add_slashes(urldecode_array(get_var("java"))); $flash = array_add_slashes(urldecode_array(get_var("flash"))); $ididthis = $multisite->getIdId(); setcookie("time_online_IDID",$ididthis,time()+60*60); @@ -52,7 +58,10 @@ // Gather from data */ $ip = getIP(); - $host = "Intern"; + /** + * @todo check why this is needed ;)(All vars below ;)) + */ + $host = "Intern"; $orgId = ""; $address = ""; $city = ""; @@ -159,8 +168,12 @@ @return: the IP */ function getIp() { + $ip2 = $ip = $ip3 = ""; if (getenv('HTTP_X_FORWARDED_FOR')) { $ip = $_SERVER['REMOTE_ADDR']; + /** + *@todo check regex + */ if (preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip3)) { $ip2 = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/'); $ip = preg_replace($ip2, $ip, $ip3[1]); @@ -281,7 +294,10 @@ // get the languages $index = ''; $complete = ''; - $found = false; + /** + * @todo check if still needed + */ + //$found = false; $user_languages = array(); $a_languages = array(); include(RCTS_ROOT_PATH.'/staticData/languages.php'); Modified: trunk/version1.0/includes/classes/class.wizard.php =================================================================== --- trunk/version1.0/includes/classes/class.wizard.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/classes/class.wizard.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -203,9 +203,13 @@ { $pName = $_REQUEST['autosubmit']; } + /** + * @todo check if this is still needed + */ + /* else if(isset($_REQUEST['oksubmit'])) { - } + }*/ // Is there any kind of post-processing we should care about? if(isset($_REQUEST['pagename'])) { @@ -515,6 +519,9 @@ function init() { $splash = new Splash('splash'); + /** + * @todo check why this is called pass by reference. + */ $this->addPage('splash', &$splash); } @@ -659,6 +666,7 @@ $hf = '<input type="hidden" name="pagename" value="'.$this->pagename.'">'; // Get POST vars $vars = &$this->getVars(); + $usedstruct =array(); preg_match_all('[\*(wiz_.+?)\*]', $this->out, $usedstruct); $used = &$usedstruct[1]; // 2-check for all variables @@ -828,6 +836,7 @@ return @mkdir($dirname); } } + return ""; } /** Modified: trunk/version1.0/includes/db/msaccess.php =================================================================== --- trunk/version1.0/includes/db/msaccess.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/db/msaccess.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -55,6 +55,7 @@ if($this->db){ return @odbc_close($this->db); } + return ""; } /* This function frees sql result @@ -153,7 +154,9 @@ $this->query = $query; $this->num++; $this->num_queries++; - + /** + * @todo check where $transaction is comefrome + */ if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { if( !odbc_autocommit($this->db, false) ) @@ -164,6 +167,7 @@ } $query = str_replace("LOWER(", "LCASE(", $query); + $limits = ""; if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) ) { Modified: trunk/version1.0/includes/db/mssql.php =================================================================== --- trunk/version1.0/includes/db/mssql.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/db/mssql.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -67,6 +67,7 @@ } return @mssql_close($this->db); } + return ""; } /* This function frees sql result Modified: trunk/version1.0/includes/db/mysql.php =================================================================== --- trunk/version1.0/includes/db/mysql.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/db/mysql.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -67,6 +67,7 @@ } return @mysql_close($this->db); } + return ""; } /* This function frees sql result Modified: trunk/version1.0/includes/db/postsql.php =================================================================== --- trunk/version1.0/includes/db/postsql.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/db/postsql.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -57,6 +57,7 @@ } return pg_close($this->db); } + return ""; } /* This function frees sql result Modified: trunk/version1.0/includes/detection.php =================================================================== --- trunk/version1.0/includes/detection.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/detection.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -323,6 +323,7 @@ // delete this part if you want an unknown browser returned $s_browser = substr( $browser_user_agent, 0, strcspn( $browser_user_agent , '();') ); // this extracts just the browser name from the string + $r = array(); ereg('[^0-9][a-z]*-*\ *[a-z]*\ *[a-z]*', $s_browser, $r ); $s_browser = $r[0]; $version_number = browser_version( $browser_user_agent, $s_browser ); @@ -397,6 +398,7 @@ default: break; } + return ""; } /** @@ -417,6 +419,9 @@ use this order since some navigator user agents will put 'macintosh' in the navigator user agent string which would make the nt test register true */ + /** + * @todo, this vars are never used?!? + */ $a_mac = array( 'mac68k', 'macppc' );// this is not used currently // same logic, check in order to catch the os's in order, last is always default item $a_unix = array( 'unixware', 'solaris', 'sunos', 'sun4', 'sun5', 'suni86', 'sun', Modified: trunk/version1.0/includes/modules/acp/acp_plugin.php =================================================================== --- trunk/version1.0/includes/modules/acp/acp_plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/modules/acp/acp_plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -19,7 +19,7 @@ *******************************************************************/ class acp_plugin{ function main(){ - global $db,$pluginsClass; + global $db,$pluginsClass,$core; $mode = get_var('mode'); switch($mode){ case 'install': Modified: trunk/version1.0/includes/modules/acp/acp_smtp.php =================================================================== --- trunk/version1.0/includes/modules/acp/acp_smtp.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/modules/acp/acp_smtp.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -19,7 +19,7 @@ *******************************************************************/ class acp_smtp{ function main(){ - global $template, $core; + global $template, $core,$cache; if(isset($_GET['update']) && $_GET['update'] == 1){ while(list($el,$wa) = each($_POST)){ $cache->upd_config($el,get_var($el)); Modified: trunk/version1.0/includes/modules/acp/acp_update.php =================================================================== --- trunk/version1.0/includes/modules/acp/acp_update.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/modules/acp/acp_update.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -75,7 +75,7 @@ $template->parse('body'); } function run(){ - global $template,$db,$core,$browser; + global $template,$db,$core,$browser,$MD; $s = intval(get_var('s')); if(!$s){ Modified: trunk/version1.0/includes/pngreplacer.php =================================================================== --- trunk/version1.0/includes/pngreplacer.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/includes/pngreplacer.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -77,6 +77,7 @@ // first, I want to remove all scripts from the page... $saved_scripts=array(); $placeholders=array(); + $scripts = array(); preg_match_all('`<script[^>]*>(.*)</script>`isU',$x,$scripts); for($i=0;$i<count($scripts[0]);$i++){ $x=str_replace($scripts[0][$i],'replacePngTags_ScriptTag-'.$i,$x); @@ -86,6 +87,7 @@ } // find all the png images in backgrounds + $background = array(); preg_match_all('/background-image:\s*url\(([\\"\\\']?)([^\)]+\.png)\1\);/Uis',$x,$background); for($i=0;$i<count($background[0]);$i++){ // simply replace: @@ -100,6 +102,7 @@ } // find all the IMG tags with ".png" in them + $images = array(); $pattern='/<(input|img)[^>]*src=([\\"\\\']?)([^>]*\.png)\2[^>]*>/i'; preg_match_all($pattern,$x,$images); for($num_images=0;$num_images<count($images[0]);$num_images++){ Modified: trunk/version1.0/lang/en/install.php =================================================================== --- trunk/version1.0/lang/en/install.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/lang/en/install.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -77,7 +77,7 @@ $lang['no_mysql'] = "The PHP MySQL extension is not installed, or not enabled. RCTS needs MySQL to work. Install or enable MySQL, and try again."; $lang['no_gd'] = "The PHP GD extension is not installed, or not enabled. RCTS needs GD to work. Install or enable GD, and try again."; $lang['mysql_err'] = "MySQL error"; -$lang['DB_NAME_ERROR'] = "There can't be a dot, / or \ in the databasename."; +$lang['DB_NAME_ERROR'] = "There can't be a dot, / or \\ in the databasename."; $lang['Install_Not_Exists'] = 'File does not exist'; $lang['php_to_old'] = 'Your PHP version (%s) is too old to run Really Coding Traffic Statistics. The minimum needed version is 4.3.0.'; ?> Modified: trunk/version1.0/lang/nl/install.php =================================================================== --- trunk/version1.0/lang/nl/install.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/lang/nl/install.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -78,7 +78,7 @@ $lang['no_mysql'] = "Mysql is niet geinstalleerd, of niet ingeschakeld. RCTS heeft mysql nodig om te werken. Installeer, of activeer mysql, en probeer het opnieuw. Neem eventueel contact op met je hosting."; $lang['no_gd'] = "De GD extensie is niet ingeschakeld. RCTS heeft GD (Het beste met freetype) nodig om de grafieken te maken. Installeer, of activeer GD, en probeer het opnieuw. Neem eventueel contact op met je hosting."; $lang['mysql_err'] = "Mysql Error"; -$lang['DB_NAME_ERROR'] = "De database naam mag geen punt, / of \ bevatten."; +$lang['DB_NAME_ERROR'] = "De database naam mag geen punt, / of \\ bevatten."; $lang['Install_Not_Exists'] = 'Bestand bestaat niet!'; $lang['php_to_old'] = 'De PHP-versie(%s) is te oud. De minimum versie om RCTS te draaien is 4.3.0.'; ?> Modified: trunk/version1.0/overlay.php =================================================================== --- trunk/version1.0/overlay.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/overlay.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -1,6 +1,6 @@ <?php /** - * Graphs will be proceed here + * Overlay * @package RCTS2 * @version $Id$ * @license http://opensource.org/licenses/gpl-license.php GNU Public License Modified: trunk/version1.0/plugins/plugin_ComeFrom/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_ComeFrom/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_ComeFrom/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -92,8 +92,12 @@ { if($this->controlIP()){ $ex_prov = explode('.', gethostbyaddr($this->ip)); + if($ex_prov[0] == $this->ip || $ex_prov[0] == gethostbyaddr($this->ip)){ $provider = 'Unknow'; + /** + * @todo must this be lang var?:D + */ $from = $land['Unknow']; } else Modified: trunk/version1.0/plugins/plugin_Follow/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_Follow/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_Follow/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -136,7 +136,7 @@ st_die(SQL,"Could not select graph cache.","",__LINE__,__FILE__,$sql); } $g = $db->sql_fetchrow($r); - $secAdd = 60*$config->config['image_catch']; + $secAdd = 60*$core->config_get('image_catch'); if($secAdd==0){$secAdd=60;} if($db->sql_numrows($r) == 0 || $g['tijd'] <= (time()-$secAdd)){ $array = $this->write($imagename,$idid,$file); @@ -150,7 +150,10 @@ $template -> add_file(array( 'body' => '../../plugins/plugin_Follow/templates/main.html' )); - $views = $stats->getViews('Follow'); // Don't know if this is correct. + /** + * @todo check if this is still needed + */ +// $views = $stats->getViews('Follow'); // Don't know if this is correct. if(is_array($array)){ $map = "<map name='Test' style='border:0'>"; foreach($array as $row) Modified: trunk/version1.0/plugins/plugin_Mysql/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_Mysql/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_Mysql/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -375,11 +375,11 @@ $template->block("bsr", array( 'what' => $core->lang['Bytes_send_time'], - 'count' => human_size($topBytesSend['0']['TotalBitesSent'],$decimals = 3) + 'count' => human_size($topBytesSend['0']['TotalBitesSent'],$decimals) )); $template->block("bsr", array( 'what' => $core->lang['Bytes_received_time'], - 'count' => human_size($topBytesRecev['0']['TotalBitesReceived'],$decimals = 3) + 'count' => human_size($topBytesRecev['0']['TotalBitesReceived'],$decimals) )); //Top bytes send + received $topBS = $this->getTopBS(); @@ -489,6 +489,9 @@ $uptimeValues = array_values($uptime); $uptimeKeys = array_keys($uptime); $uptimeCount = count($uptime); + /** + * @todo check where $limit is come frome + */ if(!isset($limit) || !is_numeric($limit) || $limit == ""){ $limit="5"; } Modified: trunk/version1.0/plugins/plugin_Postnuke/postnukeGatherStats.php =================================================================== --- trunk/version1.0/plugins/plugin_Postnuke/postnukeGatherStats.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_Postnuke/postnukeGatherStats.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -33,7 +33,7 @@ if(!$db->sql_query($sqlUP) || !$db->sql_affectedrows()){ if(!$db->sql_query($sqlIn)) { - st_die(SQL, "Could not update Postnuke", '', __LINE__, __FILE__, $sql); + st_die(SQL, "Could not update Postnuke", '', __LINE__, __FILE__, $sqlIn); } } Modified: trunk/version1.0/plugins/plugin_SearchTerms/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_SearchTerms/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_SearchTerms/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -116,6 +116,7 @@ if (substr($string, -1) == "=") continue; foreach ($query as $key) { + $matches = array(); preg_match("%$key%", $string, $matches); if (empty($matches)) continue; @@ -160,7 +161,7 @@ if ($raw_search === false) return false; // Conversion of keywords, if applicable - $from = false; + // $raw_search = (($from !== false) || defined("_BBC_RECODE")) ? bbc_convert_lang($raw_search, $from, $char) : // $raw_search; $raw_search = $this->get_sep($raw_search, $word_sep); Modified: trunk/version1.0/plugins/plugin_UserOptions/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_UserOptions/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_UserOptions/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -210,7 +210,7 @@ } function eventStatsGraph($idid) { - global $stats,$template; + global $template; $visit = $java = $WMP = $Shockwave = $Realplayer = $QuickTime = $AcrobatReader = $SVGV = 0; $data = $this->getData($idid); foreach($data as $name => $value){$$name=$value;} Modified: trunk/version1.0/plugins/plugin_phpbb/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_phpbb/plugin.php 2006-07-03 19:51:50 UTC (rev 1903) +++ trunk/version1.0/plugins/plugin_phpbb/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) @@ -72,7 +72,7 @@ $this->prefix = $config->config['phpbb_pre']; } function plugin_menu(){ - global $mode,$template,$core,$config; + global $template,$core,$config; $this->initConstants(); pageHeader($core->lang['phpbb_stats']); statsHeader(); @@ -109,7 +109,7 @@ @return nothing */ function phpbb_graph(){ - global $phpbb,$template; + global $template; $this->initConstants(); $data = $this->table(get_var('table')); $ret = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-07-03 20:50:38
|
Revision: 1905 Author: paulsohier Date: 2006-07-03 13:50:20 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1905&view=rev Log Message: ----------- Maybe I must save it first... Modified Paths: -------------- trunk/version1.0/includes/classes/class.time_online.php trunk/version1.0/includes/db/db.php trunk/version1.0/includes/functions.php trunk/version1.0/includes/modules/acp/acp_update.php trunk/version1.0/includes/pngreplacer.php trunk/version1.0/plugins/plugin_Follow/plugin.php trunk/version1.0/plugins/plugin_Postnuke/plugin.php trunk/version1.0/rss.php Modified: trunk/version1.0/includes/classes/class.time_online.php =================================================================== --- trunk/version1.0/includes/classes/class.time_online.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/includes/classes/class.time_online.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -49,7 +49,7 @@ $ad = ""; } $sql = "UPDATE ".RCTS_TIME_ONLINE_TABLE." SET userTO = '".$this -> userTO."'".$ad.", userTT = '".$this -> userTT."' WHERE userID = '".$this -> userID."'"; - $res = $db->sql_query($sql); + $db->sql_query($sql); } if ($this -> userID == "") { @@ -62,7 +62,7 @@ $this -> userID = md5(rand()); $ip = getIP(); $sql = "INSERT INTO ".RCTS_TIME_ONLINE_TABLE." (userID, userIP, userST, idid)VALUES('".$this -> userID."','".$ip."','".time()."','".$this -> idid."')"; - $res = $db->sql_query($sql); + $db->sql_query($sql); setcookie("time_online_ID_".$this -> idid, $this -> userID, time()+(60*60*24*365*10)); setcookie("time_online_ST_".$this -> idid, time()); Modified: trunk/version1.0/includes/db/db.php =================================================================== --- trunk/version1.0/includes/db/db.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/includes/db/db.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -52,7 +52,7 @@ return $this->db->sql_close(); } function sql_freeresult($id = 0){ - return $this->db->sql_freeresult($id = 0); + return $this->db->sql_freeresult($id); } function sql_nextid(){ return $this->db->sql_nextid(); Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/includes/functions.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -13,24 +13,6 @@ } /** - * This functions shows an error message, and exits the script - * Please notice this function is deprecated. use trigger_error for this. - * @deprecated - * @param Type of error - * @param Error description - * @param Titel of the error - * @param Line numeber - * @param File name - * @param Sql query - - */ -function st_die($type = 0, $error2 = '', $caption = '', $line = 0, $file = '', $sql = '') -{ - trigger_error($error2,$type); -} - - -/** * This functions sets the page header * @param title of the page * @param image to display Modified: trunk/version1.0/includes/modules/acp/acp_update.php =================================================================== --- trunk/version1.0/includes/modules/acp/acp_update.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/includes/modules/acp/acp_update.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -75,7 +75,7 @@ $template->parse('body'); } function run(){ - global $template,$db,$core,$browser,$MD; + global $template,$core,$browser,$MD; $s = intval(get_var('s')); if(!$s){ Modified: trunk/version1.0/includes/pngreplacer.php =================================================================== --- trunk/version1.0/includes/pngreplacer.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/includes/pngreplacer.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -109,7 +109,7 @@ // for each found image pattern $original=$images[0][$num_images]; $quote=$images[2][$num_images]; - $atts=''; $width=0; $height=0; $modified=$original; + $width=0; $height=0; $modified=$original; // We do this so that we can put our spacer.png image in the same // directory as the image - if a path wasn't passed to the function Modified: trunk/version1.0/plugins/plugin_Follow/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_Follow/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/plugins/plugin_Follow/plugin.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -169,7 +169,7 @@ 'page' => $_GET['page'] )); } - function graph($idid) + function graph() { global $core; $page = $this->getPage(); Modified: trunk/version1.0/plugins/plugin_Postnuke/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_Postnuke/plugin.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/plugins/plugin_Postnuke/plugin.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -34,7 +34,7 @@ function getPluginDataHooks() { return array('StatsTable'); } // Hooks that return data, such as in getStats // Install event function installPlugin() { - global $db,$mysql_prefix,$config ; + global $db,$mysql_prefix; $this->createOption('menu_POSTNUKE_normal', 'menu', 'PostNuke stats', 'postnuke', 'postnuke'); $sql = array(); @@ -70,7 +70,7 @@ // Initialize the constants here! define('RCTS_P_POSTNUKE_TABLE', $mysql_prefix.'postnuke'); } - function getData($idid) + function getData() { global $db; $this->initConstants(); @@ -110,7 +110,7 @@ } function eventStatsGraph($idid) { - global $stats,$template; + global $template; $dataPostNuke = $this->getData($idid); $data = array(); $legends = array(); Modified: trunk/version1.0/rss.php =================================================================== --- trunk/version1.0/rss.php 2006-07-03 20:46:53 UTC (rev 1904) +++ trunk/version1.0/rss.php 2006-07-03 20:50:20 UTC (rev 1905) @@ -59,7 +59,7 @@ } function start_rss() { - global $id,$db,$core; + global $id,$core; //Start RSS feed $link = (string) 'http://www.reallycoding.nl'; $title = (string) $id. $core->lang['site_stats']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pau...@us...> - 2006-07-06 12:01:40
|
Revision: 1921 Author: paulsohier Date: 2006-07-06 05:01:24 -0700 (Thu, 06 Jul 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1921&view=rev Log Message: ----------- Mailclass... Modified Paths: -------------- trunk/version1.0/developer/mail.php trunk/version1.0/error.txt trunk/version1.0/includes/classes/class.core.php trunk/version1.0/includes/classes/class.mailer.php Modified: trunk/version1.0/developer/mail.php =================================================================== --- trunk/version1.0/developer/mail.php 2006-07-06 11:32:44 UTC (rev 1920) +++ trunk/version1.0/developer/mail.php 2006-07-06 12:01:24 UTC (rev 1921) @@ -16,7 +16,28 @@ */ define('RCTS_ROOT_PATH', str_replace("developer","",dirname(__FILE__))); include(RCTS_ROOT_PATH.'/includes/start.php'); -pageHeader('Kalender testpage'); +pageHeader('Mail testpage :)'); +print "HEAD"; +flush(); +$mail->setFrom("pa...@pa...","paul"); +print "FROM"; +flush(); +$mail->setTo(array(array("pa...@pa...","paul"))); +print "to"; +flush(); + +$mail->setMessage("Dit is een test!"); +print "MSG"; +flush(); +//die; +if($mail->send()) +{ + + trigger_error("mail verstuurd"); +}else { + + trigger_error("mail NIET verstuurd"); +} pageFooter(); ?> \ No newline at end of file Modified: trunk/version1.0/error.txt =================================================================== --- trunk/version1.0/error.txt 2006-07-06 11:32:44 UTC (rev 1920) +++ trunk/version1.0/error.txt 2006-07-06 12:01:24 UTC (rev 1921) @@ -22,3 +22,8 @@ [19-Jun-2006 13:06:30] PHP Warning: Call-time pass-by-reference has been deprecated - argument passed by value; If you would like to pass it by reference, modify the declaration of [runtime function name](). If you would like to enable call-time pass-by-reference, you can set allow_call_time_pass_reference to true in your INI file. However, future versions may not support this any longer. in E:\version1.0\includes\classes\class.wizard.php on line 518 [19-Jun-2006 13:06:32] PHP Warning: Call-time pass-by-reference has been deprecated - argument passed by value; If you would like to pass it by reference, modify the declaration of [runtime function name](). If you would like to enable call-time pass-by-reference, you can set allow_call_time_pass_reference to true in your INI file. However, future versions may not support this any longer. in E:\version1.0\includes\classes\class.wizard.php on line 165 [19-Jun-2006 13:06:32] PHP Warning: Call-time pass-by-reference has been deprecated - argument passed by value; If you would like to pass it by reference, modify the declaration of [runtime function name](). If you would like to enable call-time pass-by-reference, you can set allow_call_time_pass_reference to true in your INI file. However, future versions may not support this any longer. in E:\version1.0\includes\classes\class.wizard.php on line 518 +[06-Jul-2006 13:36:20] PHP Fatal error: Class 'smtp' not found in E:\version1.0\includes\classes\class.core.php on line 153 +[06-Jul-2006 13:36:29] PHP Fatal error: Maximum execution time of 60 seconds exceeded in E:\version1.0\includes\start.php on line 14 +[06-Jul-2006 13:36:29] PHP Fatal error: Maximum execution time of 60 seconds exceeded in E:\version1.0\includes\start.php on line 14 +[06-Jul-2006 13:36:29] PHP Fatal error: Class 'smtp' not found in E:\version1.0\includes\classes\class.core.php on line 153 +[06-Jul-2006 13:36:29] PHP Fatal error: Class 'smtp' not found in E:\version1.0\includes\classes\class.core.php on line 153 Modified: trunk/version1.0/includes/classes/class.core.php =================================================================== --- trunk/version1.0/includes/classes/class.core.php 2006-07-06 11:32:44 UTC (rev 1920) +++ trunk/version1.0/includes/classes/class.core.php 2006-07-06 12:01:24 UTC (rev 1921) @@ -118,7 +118,7 @@ "cron" => "cron", //"session" => "session", "pluginsClass" => "RCPlugins", - "smtp" => "smtp", + //"smtp" => "smtp", "mail" => "mail", "browser" => "browser", "calendar" => "calendar", Modified: trunk/version1.0/includes/classes/class.mailer.php =================================================================== --- trunk/version1.0/includes/classes/class.mailer.php 2006-07-06 11:32:44 UTC (rev 1920) +++ trunk/version1.0/includes/classes/class.mailer.php 2006-07-06 12:01:24 UTC (rev 1921) @@ -361,6 +361,18 @@ */ var $header = array(); /** + * Line end + * + * @var string + */ + var $lnd = "\r\n"; + /** + * Array with attachments + * + * @var array + */ + var $attachment =array(); + /** * Set basic info for mail class * * @return mail @@ -439,7 +451,7 @@ * @param string $bcc bcc address */ function setBcc($bcc){ - $this->checksetting($from,$this->error,'bcc'); + $this->checksetting($bcc,$this->error,'bcc'); } /** * CC address @@ -447,7 +459,7 @@ * @param string $cc cc address */ function setCc($cc){ - $this->checksetting($from,$this->error,'cc'); + $this->checksetting($cc,$this->error,'cc'); } /** * Add a header for the email @@ -491,19 +503,19 @@ * @param string $mode mode to check * @access private */ - function checksetting(&$email,&$error,$mode = 'to'){ + function checksetting($email,&$error,$mode = 'to'){ global $core; if(!is_array($email)){ - $error[] = $core->lang['no_valid_' . strtolower($mode)]; + trigger_error('Usage wrong',E_USER_ERROR); return; } for($i = 0; $i < count($email);$i++){ if((!is_array($email[$i]) || count($email[$i]) != 2)){ - $error[] = $this->lang['no_valid_' . strtolower($mode)]; + $error[] = $core->lang['no_valid_' . strtolower($mode)]; continue; } if(!$this->check_email($email[$i][0])){ - $error[] = sprintf($this->lang['email_not_valid'],htmlspecialchars($email[$i][0])); + $error[] = sprintf($core->lang['email_not_valid'],htmlspecialchars($email[$i][0])); continue; } @@ -556,28 +568,43 @@ if(count($this->bcc)){ $ar = array_merge($ar,$this->bcc); } + print "JA"; + + if(count($ar) == 0) + { + trigger_error("no receiptments",E_USER_ERROR); + } + if(empty($this->message)) + { + trigger_error("Message empty",E_USER_ERROR); + } +print "ja2"; $result = false; if($this->use_smtp !== true){ + print "2"; + $header = $this->CreateHeader(); //$header = str_replace(); $this->message = $this->createBody(); - + $old_from = @ini_get("sendmail_from"); @ini_set("sendmail_from", $this->from); $params = sprintf("-oi -f %s", $this->from); - $to = ""; $ar = $this->to; if(count($this->cc)){ $ar = array_merge($ar,$this->cc); } + for($i = 0; $i < count($ar); $i++){ if($i != 0) { $to .= ", "; } $to .= $ar[$i][0]; } + print nl2br($this->message); +// die; if(@mail($to,$this->subject,$this->message,$header,$params)){// $result = true; }else{ @@ -739,16 +766,16 @@ $result = ""; $tmp = $this->message; - $tmp = preg_replace("<(.*?)br(.*)>","\n",$tmp); - $tmp = preg_replace("<(.*?)>","",$tmp); + if(!count($this->attachment)){ + //There are no attachments :) $result .= $this->GetBoundary($this->boundary[1], "", "text/plain", ""); - $result .= $this->EncodeString($tmp, $this->config['Encoding']); + $result .= $this->EncodeString($tmp,"8bit"); $result .= $this->lnd.$this->lnd; $result .= $this->GetBoundary($this->boundary[1], "", "text/html", ""); - $result .= $this->EncodeString($this->message, $this->config['Encoding']); + $result .= $this->EncodeString($tmp,"8bit"); $result .= $this->lnd.$this->lnd; $result .= $this->EndBoundary($this->boundary[1]); @@ -759,13 +786,13 @@ // Create text body $result .= $this->GetBoundary($this->boundary[2], "", "text/plain", "") . $this->lnd; - $result .= $this->EncodeString($tmp, $this->config['Encoding']); + $result .= $this->EncodeString($tmp, "8bit"); $result .= $this->lnd.$this->lnd; // Create the HTML body $result .= $this->GetBoundary($this->boundary[2], "", "text/html", "") . $this->lnd; - $result .= $this->EncodeString($this->message, $this->config['Encoding']); + $result .= $this->EncodeString($this->message, "8bit"); $result .= $this->lnd.$this->lnd; $result .= $this->EndBoundary($this->boundary[2]); @@ -915,6 +942,7 @@ return ("\"$encoded\""); } } + $matches = ""; $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); break; case 'comment': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ero...@us...> - 2006-08-13 15:46:06
|
Revision: 1927 Author: eroeling Date: 2006-08-13 08:45:44 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/rcts/?rev=1927&view=rev Log Message: ----------- Multi user upgrade, changed the whole login script, now it's possible to add more users. Maybe we add an other feature to the script, so only users may view the script and one ore more may change things in the administration. But fist I'm going to update the useradmin module. Modified Paths: -------------- trunk/version1.0/admin/index.php trunk/version1.0/graph.php trunk/version1.0/includes/classes/class.core.php trunk/version1.0/includes/classes/class.cron.php trunk/version1.0/includes/classes/class.phplot.php trunk/version1.0/includes/classes/class.stats.php trunk/version1.0/includes/classes/class.template.php trunk/version1.0/includes/constants.php trunk/version1.0/includes/db/mysql.php trunk/version1.0/includes/functions.php trunk/version1.0/includes/start.php trunk/version1.0/plugins/plugin_phpbb/plugin.php trunk/version1.0/rss.php trunk/version1.0/stats.php trunk/version1.0/statsGetTimeOnline.php trunk/version1.0/wizz.php Modified: trunk/version1.0/admin/index.php =================================================================== --- trunk/version1.0/admin/index.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/admin/index.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -7,6 +7,7 @@ * @copyright Really Coding Group, 2005-2006 * @author Really Coding Group */ + define('IN_STATS', true); define('IN_ADMIN',true); define('RCTS_ROOT_PATH',dirname(dirname(__FILE__))); @@ -16,10 +17,11 @@ * @todo Write modules :D * @todo Set frameset in tpl?!? **/ + $page = get_var('p'); $mode = get_var('mode'); $class = get_var('class'); -if(!$core->is_login()) +if(!$core->UserLoggedIn()) { $core->login_form(); die; Modified: trunk/version1.0/graph.php =================================================================== --- trunk/version1.0/graph.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/graph.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -18,7 +18,7 @@ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); -error_reporting(0); +error_reporting(E_ALL); $stats = new getStats(); $display = new display(); $graph = get_var('graph'); Modified: trunk/version1.0/includes/classes/class.core.php =================================================================== --- trunk/version1.0/includes/classes/class.core.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/classes/class.core.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -88,6 +88,7 @@ ); for($i = 0; $i < count($include);$i++) { + if(!file_exists(RCTS_ROOT_PATH . "/" . $include[$i]) || !is_readable((RCTS_ROOT_PATH . "/" . $include[$i]))) { //Message die here not loaded?!? @@ -193,10 +194,10 @@ $this->checkguid(); //Send usage $usage->gostats(); - // Get config login - $this->ww = $this->config_get('password'); - $this->name = $this->config_get('username'); - $this->crypt = md5($this->name); + + //if we have come this far we will het an sessions running. + $this->session_init(); + } /** * Check the RCTS version. @@ -205,7 +206,7 @@ */ function checkversion() { - global $browser,$cache; + global $browser,$cache,$user; $offline = false; $f = RCTS_ROOT_PATH . '/cache/version.txt'; if(!is_writable($f)) @@ -294,7 +295,7 @@ } if(!$o) { - if($this->is_login()) + if($core->UserLoggedIn()) { if(version_compare($v, $v2, "<")) { @@ -603,54 +604,214 @@ $template->parse("af"); } - + function Session_init() + { + global $db; + $sessid = session_id(); + + // Get (actual) client IP addr + $ipaddr = $_SERVER['REMOTE_ADDR']; + if (empty($ipaddr)) { + $ipaddr = $_SERVER['HTTP_CLIENT_IP']; + } + + $tmpipaddr = $_SERVER['HTTP_CLIENT_IP']; + if (!empty($tmpipaddr)) { + $ipaddr = $tmpipaddr; + } + + $fwdipaddr = $_SERVER['HTTP_X_FORWARDED_FOR']; + + // itevo + if (!empty($fwdipaddr) AND strpos($fwdipaddr, ',') !== false) { + $fwdipaddr = substr($fwdipaddr,0, strpos($fwdipaddr, ',')); + } + + $tmpipaddr = $fwdipaddr; + // itevo + if (!empty($tmpipaddr) AND strpos($tmpipaddr, ',') !== false) { + $ipaddr = substr($tmpipaddr,0, strpos($tmpipaddr, ',')); + } + + + $query = "SELECT ip + FROM ".RCTS_SESSIONS_TABLE." + WHERE sessionid = '" . $sessid . "'"; + + $result = $db->sql_query($query); + + + if ($db->sql_numrows($result)!=1) { + $this->SessionNew($sessid, $ipaddr); + // Generate a random number, used for + // some authentication + srand((double)microtime() * 1000000); + $_SESSION['rand'] = rand(); + } + + return true; + } + function SessionNew($sessid='', $ipaddr='') + { + global $db; + + $query = "INSERT INTO ".RCTS_SESSIONS_TABLE." + (sessionid, + uid, + ip, + starttime, + lastaction) + VALUES + ('" . $sessid . "', + 0, + '" . $ipaddr . "', + '" . time() . "', + '" . time() . "')"; + + $result = $db->sql_query($query); + return true; + } + function UserLogIn($uname, $pass, $rememberme=false) + { + if(empty($uname)||empty($pass)){return false;} + global $db; + + $query = "SELECT id, + pass + FROM ".RCTS_USERS_TABLE." + WHERE uname = '" . $uname ."'"; + $result = $db->sql_query($query); + + if ($db->sql_numrows($result)!=1) { + return false; + } + $row = $db->sql_fetchrow($result); + $uid = $row['id']; + + $realpass = $row['pass']; + + // check if we need to create a session + if (!session_id()) { + // Start session + if (!SessionInit()) { + die('Session initialisation failed'); + } + }else{ + //echo session_id(); + } + + // Confirm that passwords match + if(empty($pass) || empty($realpass)) + return false; + + if(md5($pass)!=$realpass) + return false; + $remember =''; + if (!empty($rememberme)) { + $_SESSION['rememberme'] = 1; + $remember = ', rememberme = 1'; + } + + // Set user session information (new table) + $query = "UPDATE ".RCTS_SESSIONS_TABLE." + SET uid = " . $uid . $remember ." + + WHERE sessionid = '" . session_id() . "'"; + $db->sql_query($query); + + // Set session variables + $_SESSION['uid'] = $uid; + + //ook nog even alle vreemde oude waardes eruit halen die hebben we toch niet meer nodig. + $where = "WHERE ((rememberme != '1' + AND lastaction < " . (time() - (60 * 60)) . ") OR + (rememberme = '1' + AND lastaction < " . (time() - (30 * 24 *60 * 60)) . ")) + AND starttime < " . (time() - (30 * 24 *60 * 60)); + + $query = "DELETE FROM ".RCTS_SESSIONS_TABLE." $where"; + $db->sql_query($query); + + + // now we've logged in the permissions previously calculated are invalid + $GLOBALS['authinfogathered'] = 0; + + + + return true; + + } + + /** + * Log the user out + * + * @public + * @return bool true if the user successfully logged out, false otherwise + */ + function UserLogOut() + { + if (UserLoggedIn()) { + global $db; + + // Reset user session information (new table) + $query = "UPDATE ".RCTS_SESSIONS_TABLE." + SET id = 0 + WHERE sessionid = '" . session_id() . "'"; + $db->mysql_query($query); + + unset($_SESSION['rememberme']); + unset($_SESSION['uid']); + session_destroy(); + } + } + + /** + * is the user logged in? + * + * @public + * @returns bool true if the user is logged in, false if they are not + */ + function UserLoggedIn() + { + if(isset($_POST['uname'])) + { + $uname = get_var('uname'); + $pass = get_var('ww'); + $auto = get_var("autologin"); + return $this->UserLogIn($uname,$pass,$auto); + }elseif ($_SESSION['uid']) { + return true; + } else { + return false; + } + } + /** * This function logs you in, according to what is given in GET/POST vars. * @param string $goto redirect url */ function login($goto = "index.php") { - if($this->is_login()) - { - return false; - } - else - { + if(isset($_POST['uname'])) { + $uname = $_POST['uname']; + $pass = $_POST['ww']; + $auto = get_var("autologin"); - if(md5(get_var("ww")) == $this->ww && md5(get_var("uname")) == $this->name) + if($this->UserLogIn($uname,$pass,$auto)) { - $path = basepath(); - if (isset($_REQUEST['autologin']) && get_var("autologin") == "yes") - { - setcookie($this->crypt,true,(time() + 60 * 60 * 24 * 30), $path, false);// 1 month - } - else - { - setcookie($this->crypt,true, (time() + 60 * 60 * 6), $path, false); // Just a session cookie - } loc($goto); - die; - } - else - { - trigger_error($this->lang['pass_error'],E_USER_ERROR); - } + die(); + }else{ + return false; + } } - } + return false; } /** - * This function will check if the viewer is logged in. - * @return boolean Is the user logged in? - */ - function is_login() - { - return get_var($this->crypt,false,true); - } - /** * This function builds the login form, and outputs it. * @param string $res redirect url * @@ -746,6 +907,7 @@ */ function trigger($errno, $errmsg, $filename, $linenum, $vars) { + global $user; if(!defined("E_STRICT")) { define("E_STRICT",1234); @@ -925,7 +1087,7 @@ } $txt .= $errmsg . "<hr />"; } - if($errno != E_USER_WARNING && $errno != E_USER_NOTICE && (defined('CRITICAL') || $this->is_login() || (defined('DEBUG') && DEBUG))) + if($errno != E_USER_WARNING && $errno != E_USER_NOTICE && (defined('CRITICAL') || $this->UserLoggedIn() || (defined('DEBUG') && DEBUG))) { $txt .= sprintf('<br />%s: %s',((defined('CRITICAL')) ? 'file' : $this->lang['file']),$filename); $txt .= sprintf('<br />%s: %s',((defined('CRITICAL')) ? 'line' : $this->lang['line']),$linenum); @@ -937,7 +1099,7 @@ //Maybe we must here make a nice look to it. print sprintf('<html><head><title>Critical error</title></head><body>%s</body></html>',$txt); //By a critical we allways die. - die; + // die; } else { Modified: trunk/version1.0/includes/classes/class.cron.php =================================================================== --- trunk/version1.0/includes/classes/class.cron.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/classes/class.cron.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -156,7 +156,7 @@ $graph = strtolower($graph); } - $old = error_reporting(0); + $old = error_reporting(E_ALL); ob_start(); if($soort == "plugin"){ Modified: trunk/version1.0/includes/classes/class.phplot.php =================================================================== --- trunk/version1.0/includes/classes/class.phplot.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/classes/class.phplot.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -1173,7 +1173,7 @@ function PrintError($error_message) { echo "<p><b>Fatal error</b>: $error_message<p>"; - die; + // die; } /*! Modified: trunk/version1.0/includes/classes/class.stats.php =================================================================== --- trunk/version1.0/includes/classes/class.stats.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/classes/class.stats.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -542,7 +542,7 @@ { foreach($GLOBALS as $key => $val){global $$key;} - global $template,$calendar; + global $template,$calendar,$user; $template->block("visitsToday"); $visitsToday = array(); @@ -552,7 +552,7 @@ foreach ($visitsToday as $visit) { //IP alleen voor ingelogde mensen. - if(!$core->is_login()) + if(!$core->UserLoggedIn()) { $visit['stat_value'] = $core->lang['verborgen']; } @@ -574,7 +574,7 @@ { foreach($GLOBALS as $key => $val){global $$key;} - global $template,$calendar,$core; + global $template,$calendar,$core,$user; $visitsToday = array(); @@ -586,7 +586,7 @@ print "<stats>"; print "<r1>"; //IP alleen voor ingelogde mensen. - if(!$core->is_login()) + if(!$core->UserLoggedIn()) { $visit['stat_value'] = $core->lang['verborgen']; } @@ -752,6 +752,7 @@ function uniekDisp($idid,$calendar_day) { foreach($GLOBALS as $key => $val){global $$key;} + global $user; $template->block("uniekDisp"); $template->add_file(array( // 'body' => 'statsuniek.html' @@ -782,7 +783,7 @@ continue; } $total++; - if(!$core->is_login()){ + if(!$core->UserLoggedIn()){ $row['stat_value'] = $core->lang['verborgen']; } $array = array($count,$row['stat_value']); Modified: trunk/version1.0/includes/classes/class.template.php =================================================================== --- trunk/version1.0/includes/classes/class.template.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/classes/class.template.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -171,7 +171,7 @@ } function parse($mode,$no_eval = false){ //var_dump($this);die; - global $core; + global $core, $user; if(!isset($this->files[$mode])){ trigger_error("$mode doesn't exists.",E_USER_WARNING); } @@ -205,7 +205,7 @@ $modes = get_var('mode'); $day = get_var('day'); - if($core->is_login()) + if($core->UserLoggedIn()) { $array = array(); /** @@ -221,7 +221,7 @@ { $block = str_replace('\\', '\\\\', $this->BlockContent[$blockName]); $block = str_replace('\'', '\\\'', $block); - if($core->is_login()) + if($core->UserLoggedIn()) { $navRowTemp = $navRow; @@ -246,7 +246,7 @@ if($length > 0) { $blok = substr($row,$start,$length); - if($core->is_login()) + if($core->UserLoggedIn()) { $navRowTemp = $navRow; Modified: trunk/version1.0/includes/constants.php =================================================================== --- trunk/version1.0/includes/constants.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/constants.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -34,6 +34,7 @@ define('RCTS_MODULES_TABLE', $mysql_prefix . "module"); define('RCTS_MILESTONES_TABLE', $mysql_prefix . "milestones"); define('RCTS_USERS_TABLE', $mysql_prefix . "users"); +define('RCTS_SESSIONS_TABLE', $mysql_prefix . "sessions"); // // Magic Quotes // Modified: trunk/version1.0/includes/db/mysql.php =================================================================== --- trunk/version1.0/includes/db/mysql.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/db/mysql.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -192,6 +192,7 @@ */ function sql_query($sql){ if($sql){ + //echo $sql . "<br><br>"; $this->query = $sql; $this->num++; $this->result = mysql_query($sql); Modified: trunk/version1.0/includes/functions.php =================================================================== --- trunk/version1.0/includes/functions.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/functions.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -19,7 +19,7 @@ * @return nothing */ function pageHeader($title = '', $image = ''){ - global $template,$core,$calendar; + global $template,$core,$calendar,$user; if(defined("header")) return; if(defined("NO_HEAD")) return; define("header",true); @@ -27,7 +27,7 @@ "header" => "header.html", "footer" => "footer.html", )); - $template->assign_if("admin",'$core->is_login()'); + $template->assign_if("admin",'$core->UserLoggedIn()'); //Kalender Start if(get_var('time') !== false){ $time = get_var('time'); @@ -59,7 +59,7 @@ // Icons... :) $notices = ''; $noticeShown = false; - if ($core->is_login()) { + if ($core->UserLoggedIn()) { // First, version. :) $version = ''; include(RCTS_ROOT_PATH . '/cache/version.txt'); Modified: trunk/version1.0/includes/start.php =================================================================== --- trunk/version1.0/includes/start.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/includes/start.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -7,7 +7,7 @@ * @copyright Really Coding Group, 2005-2006 * @author Really Coding Group */ -session_start(); + /** * @ignore */ @@ -16,15 +16,16 @@ { die('Hacking Attempt'); } -error_reporting(E_ALL );//Don't show errors. +error_reporting(E_ALL);//Don't show errors. +session_start(); //First, we will unset every var that in $_COOKIE,$_SESSION,$_POST,$_GET is, //So we don't have problems with register globals //(Do only unset $_SESSIONS if it is isset.) //First, we do a array check. -if(isset($_POST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_GET['GLOBALS']) || isset($_COOKIE['GLOBALS']) || isset($_SESSION['GLOBALS']) || (isset($_SESSION) && !is_array($_SESSION))){ +/*if(isset($_POST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_GET['GLOBALS']) || isset($_COOKIE['GLOBALS']) || isset($_SESSION['GLOBALS']) || (isset($_SESSION) && !is_array($_SESSION))){ die("We don't like hackers ;)"); -} +}*/ if(!isset($_SESSION)){ $_SESSION = array(); } @@ -47,6 +48,7 @@ //Included core class require(RCTS_ROOT_PATH . "/includes/classes/class.core.php"); $core = new core; + //The next thing requires php 4.3.0 :) $old = set_error_handler(array($core, 'trigger')); $core->run(); @@ -98,6 +100,7 @@ } } } + if(!$gzip || !$load){ ob_start(); } Modified: trunk/version1.0/plugins/plugin_phpbb/plugin.php =================================================================== --- trunk/version1.0/plugins/plugin_phpbb/plugin.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/plugins/plugin_phpbb/plugin.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -72,7 +72,7 @@ $this->prefix = $config->config['phpbb_pre']; } function plugin_menu(){ - global $template,$core,$config; + global $template,$core,$config,$user; $this->initConstants(); pageHeader($core->lang['phpbb_stats']); statsHeader(); @@ -86,7 +86,7 @@ $this->display(); }else{ global $config; - if(!$config->is_login()){ + if(!$core->UserLoggedIn()){ $config->form("stats.php?mode=phpbb&conf=1"); die; } Modified: trunk/version1.0/rss.php =================================================================== --- trunk/version1.0/rss.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/rss.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -21,7 +21,7 @@ $dislay = true; if($core->config_get('stats_open') == 0) { - if(!$core->is_login()) + if(!$core->UserLoggedIn()) { $display = false; } Modified: trunk/version1.0/stats.php =================================================================== --- trunk/version1.0/stats.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/stats.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -29,7 +29,7 @@ //If you set at config that the stats are closed for guest, you must login! if($core->config_get('stats_open') == 0) { - if(!$core->is_login()) + if(!$core->UserLoggedIn()) { $core->login_form("stats.php"); } Modified: trunk/version1.0/statsGetTimeOnline.php =================================================================== --- trunk/version1.0/statsGetTimeOnline.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/statsGetTimeOnline.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -20,7 +20,7 @@ */ define('IN_JS',true); include(RCTS_ROOT_PATH.'/includes/start.php'); -error_reporting(0); +error_reporting(E_ALL); $multisite = new multisite; $timeOnline = new time_online(); header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 Modified: trunk/version1.0/wizz.php =================================================================== --- trunk/version1.0/wizz.php 2006-08-12 18:49:12 UTC (rev 1926) +++ trunk/version1.0/wizz.php 2006-08-13 15:45:44 UTC (rev 1927) @@ -16,7 +16,7 @@ */ define('RCTS_ROOT_PATH', dirname(__FILE__)); include(RCTS_ROOT_PATH.'/includes/start.php'); -if(!$core->is_login()) +if(!$core->UserLoggedIn()) { $core->login_form("wizz.php"); die; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bas...@us...> - 2006-09-08 12:25:51
|
Revision: 1940
http://svn.sourceforge.net/rcts/?rev=1940&view=rev
Author: bastimmer
Date: 2006-09-08 05:25:35 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Some updates. :)
Modified Paths:
--------------
trunk/version1.0/admin/index.php
trunk/version1.0/admin/tpl/frame.html
trunk/version1.0/includes/classes/class.viewer.php
trunk/version1.0/lang/en/main.php
trunk/version1.0/lang/nl/main.php
Modified: trunk/version1.0/admin/index.php
===================================================================
--- trunk/version1.0/admin/index.php 2006-09-08 11:39:27 UTC (rev 1939)
+++ trunk/version1.0/admin/index.php 2006-09-08 12:25:35 UTC (rev 1940)
@@ -86,7 +86,8 @@
));
$template->assign(array(
'L_BACK' => $core->lang['back_to_stats'],
- 'L_MAIN' => $core->lang['main']
+ 'L_MAIN' => $core->lang['main'],
+ 'L_LOGOUT' => $core->lang['logout']
));
//lets loop :D
$dir = RCTS_ROOT_PATH . '/includes/modules/acp/';
Modified: trunk/version1.0/admin/tpl/frame.html
===================================================================
--- trunk/version1.0/admin/tpl/frame.html 2006-09-08 11:39:27 UTC (rev 1939)
+++ trunk/version1.0/admin/tpl/frame.html 2006-09-08 12:25:35 UTC (rev 1940)
@@ -11,5 +11,5 @@
<tr><td class="do_hover" onClick="parent.main.location.href='{head.normal.link}'"><a href="{head.normal.link}" target='main'>{head.normal.txt}</td></tr>
<!-- STOP normal -->
<!-- STOP head -->
-<tr><td class="do_hover"><a href="index.php?op=loguit" target='_top'>Loguit</td></tr>
+<tr><td class="do_hover"><a href="index.php?op=loguit" target='_top'>{L_LOGOUT}</td></tr>
</table >
Modified: trunk/version1.0/includes/classes/class.viewer.php
===================================================================
--- trunk/version1.0/includes/classes/class.viewer.php 2006-09-08 11:39:27 UTC (rev 1939)
+++ trunk/version1.0/includes/classes/class.viewer.php 2006-09-08 12:25:35 UTC (rev 1940)
@@ -406,6 +406,7 @@
if ($row2['aantal'] >= $goal) {
$sql = "UPDATE ".RCTS_MILESTONES_TABLE." SET reached='".time()."' WHERE id='$id'";
$db->sql_query($sql);
+ $this->send_milestone_mail($row, time());
}
} else if ($type == 'hit') {
$sql = "SELECT *
@@ -421,9 +422,15 @@
if ($totaal >= $goal) {
$sql = "UPDATE ".RCTS_MILESTONES_TABLE." SET reached='".time()."' WHERE id='$id'";
$db->sql_query($sql);
+ $this->send_milestone_mail($row, time());
}
}
} // while
}
+
+ function send_milestone_mail($row, $time) {
+ // TODO: Create this function. :)
+ return true;
+ }
}
?>
Modified: trunk/version1.0/lang/en/main.php
===================================================================
--- trunk/version1.0/lang/en/main.php 2006-09-08 11:39:27 UTC (rev 1939)
+++ trunk/version1.0/lang/en/main.php 2006-09-08 12:25:35 UTC (rev 1940)
@@ -33,6 +33,9 @@
$lang['file'] = 'File:';
$lang['query'] = 'SQL query:';
$lang['serror'] = 'SQL error:';
+$lang['serrornr'] = 'SQL error code:';
+$lang['backtrace'] = 'Backtrace';
+$lang['db_layer'] = 'LAYER';
//Added for error.php
$lang['file'] = 'File';
@@ -76,4 +79,6 @@
$lang['No_statistics_n'] = 'There are no statistics in the database. Click here for help.'; // Notice title
$lang['No_statistics_p'] = 'There are no statistics in the RCTS database. Possible reasons for this are that you have not yet put the code on your website, or there have been no visits. <br />» %sOpen the configuration wizard%s'; // Notice popup
$lang['Everything_OK'] = 'There are no notices available for showing.';
-?>
+$lang['c_option_no'] = 'Configuration option %s does not exist.';
+$lang['logout'] = 'Log out';
+?>
\ No newline at end of file
Modified: trunk/version1.0/lang/nl/main.php
===================================================================
--- trunk/version1.0/lang/nl/main.php 2006-09-08 11:39:27 UTC (rev 1939)
+++ trunk/version1.0/lang/nl/main.php 2006-09-08 12:25:35 UTC (rev 1940)
@@ -28,6 +28,7 @@
$lang['sql'] = 'Database fout';
$lang['crit'] = 'Fatale fout';
$lang['alg'] = 'Algemene fout';
+$lang['fout_ontstaan'] = "Er is een fout ontstaan:";
$lang['line'] = 'Regel';
$lang['file'] = 'Bestand';
$lang['query'] = 'SQL-query:';
@@ -35,8 +36,8 @@
$lang['serrornr'] = 'SQL-foutnummer:';
$lang['backtrace'] = 'Backtrace';
$lang['db_layer'] = 'LAYER';
+$lang['error'] = 'Fout';
-
//Added for error.php
$lang['no_result'] = 'Geen resultaat';
$lang['old_version'] = 'Je gebruikt een te oude versie van RCTS. Daarom is deze automatisch uitgeschakeld.<br /> Bezoek <a href="http://www.reallycoding.nl/">www.reallycoding.nl</a> voor informatie over hoe je moet updaten.';
@@ -73,5 +74,6 @@
$lang['No_statistics_p'] = 'Er zijn geen statistieken in de RCTS-database. Het kan zijn dat je de code nog niet op je website hebt gezet, of er nog geen bezoeken zijn geweest. <br />» %sOpen de configuratiewizard%s'; // Notice popup
// Who wants to eat Lucas? :)
$lang['Everything_OK'] = 'Er zijn geen meldingen om weer te geven.';
-$lang['c_option_no'] = 'Config optie %s bestaat niet';
-?>
+$lang['c_option_no'] = 'Configuratieoptie %s bestaat niet';
+$lang['logout'] = 'Uitloggen';
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-08 15:00:32
|
Revision: 1941
http://svn.sourceforge.net/rcts/?rev=1941&view=rev
Author: bastimmer
Date: 2006-09-08 08:00:19 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Modified Paths:
--------------
trunk/version1.0/includes/wizards/configwiz.php
trunk/version1.0/lang/en/stats.php
trunk/version1.0/lang/nl/stats.php
trunk/version1.0/stats.php
trunk/version1.0/templates/rcts/stats.html
Modified: trunk/version1.0/includes/wizards/configwiz.php
===================================================================
--- trunk/version1.0/includes/wizards/configwiz.php 2006-09-08 12:25:35 UTC (rev 1940)
+++ trunk/version1.0/includes/wizards/configwiz.php 2006-09-08 15:00:19 UTC (rev 1941)
@@ -106,7 +106,7 @@
$e = false;
$em = '';
if ($lay == 'lttime') {
- $page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions') ;
+ $page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions', 'referTrends') ;
$page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime', 'LoadTime', 'Average', 'AvarageOnline');
$page3_array = array('uniekDisp');
$sql = 'TRUNCATE '.RCTS_LAYOUT_TABLE;
@@ -125,7 +125,7 @@
}
} else if ($lay == 'computer') {
// topBrowsers, topOs, topFlash, topResolutions, topColors
- $page1_array = array('visitsToday', 'last30daysDisp', 'topEntryPages', 'topLanguages', 'topReferers',) ;
+ $page1_array = array('visitsToday', 'last30daysDisp', 'topEntryPages', 'topLanguages', 'topReferers','referTrends') ;
$page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime');
$page3_array = array('LoadTime', 'Average', 'AvarageOnline');
$page4_array = array('uniekDisp');
@@ -151,7 +151,7 @@
$pluginsClass->installPlugin('ComeFrom');
$pluginsClass->installPlugin('UserOptions');
// topBrowsers, topOs, topFlash, topResolutions, topColors
- $page1_array = array('visitsToday', 'last30daysDisp', 'topEntryPages', 'topLanguages', 'topReferers',) ;
+ $page1_array = array('visitsToday', 'last30daysDisp', 'topEntryPages', 'topLanguages', 'topReferers', 'referTrends') ;
$page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime');
$page3_array = array('LoadTime', 'Average', 'AvarageOnline');
$page4_array = array('uniekDisp');
@@ -173,7 +173,7 @@
$em .= $db->sql_error().'<br />';
}
} else { // Default
- $page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions');
+ $page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions', 'referTrends');
$page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime');
$page3_array = array('LoadTime', 'Average', 'AvarageOnline');
$page4_array = array('uniekDisp');
Modified: trunk/version1.0/lang/en/stats.php
===================================================================
--- trunk/version1.0/lang/en/stats.php 2006-09-08 12:25:35 UTC (rev 1940)
+++ trunk/version1.0/lang/en/stats.php 2006-09-08 15:00:19 UTC (rev 1941)
@@ -28,6 +28,7 @@
$lang['Entrypage'] = 'Entry page';
$lang['Number_sign'] = '#';
$lang['Referer'] = 'Referer';
+$lang['Referer_trends'] = 'Referer trends';
$lang['Os'] = 'Operating system';
$lang['Color_depth'] = 'Color depth';
$lang['Resolution'] = 'Screen resolution';
Modified: trunk/version1.0/lang/nl/stats.php
===================================================================
--- trunk/version1.0/lang/nl/stats.php 2006-09-08 12:25:35 UTC (rev 1940)
+++ trunk/version1.0/lang/nl/stats.php 2006-09-08 15:00:19 UTC (rev 1941)
@@ -29,6 +29,7 @@
$lang['Entrypage'] = 'Binnenkomstpagina';
$lang['Number_sign'] = 'Nr.';
$lang['Referer'] = 'Verwijzer';
+$lang['Referer_trends'] = 'Verwijzertrends';
$lang['Os'] = 'Besturingssysteem';
$lang['Color_depth'] = 'Kleurdiepte';
$lang['Resolution'] = 'Schermresolutie';
Modified: trunk/version1.0/stats.php
===================================================================
--- trunk/version1.0/stats.php 2006-09-08 12:25:35 UTC (rev 1940)
+++ trunk/version1.0/stats.php 2006-09-08 15:00:19 UTC (rev 1941)
@@ -258,6 +258,7 @@
'L_OS' => $core->lang['Os'],
'L_PAGES' => $core->lang['pages'],
'L_REFERER' => $core->lang['Referer'],
+ 'L_REFERTRENDS' => $core->lang['Referer_trends'],
'L_RESOLUTION' => $core->lang['Resolution'],
'L_TIME'=>$core->lang['time'],
'L_TIMEZONE' => $core->lang['Timezone'],
Modified: trunk/version1.0/templates/rcts/stats.html
===================================================================
--- trunk/version1.0/templates/rcts/stats.html 2006-09-08 12:25:35 UTC (rev 1940)
+++ trunk/version1.0/templates/rcts/stats.html 2006-09-08 15:00:19 UTC (rev 1941)
@@ -613,7 +613,7 @@
<div class="menu">
<table width="100%" cellpadding="0" cellspacing="0">
<tr class="tr_kop">
- <td class="td_kop">aa</td>
+ <td class="td_kop">{L_REFERTRENDS}</td>
[[NAVROW]]
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pau...@us...> - 2006-09-09 18:28:29
|
Revision: 1958
http://svn.sourceforge.net/rcts/?rev=1958&view=rev
Author: paulsohier
Date: 2006-09-09 11:28:15 -0700 (Sat, 09 Sep 2006)
Log Message:
-----------
Feature: #11
Bugs: #5 and #9
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.calendar.php
trunk/version1.0/includes/classes/class.viewer.php
trunk/version1.0/javascript/stats.php
Modified: trunk/version1.0/includes/classes/class.calendar.php
===================================================================
--- trunk/version1.0/includes/classes/class.calendar.php 2006-09-09 17:12:36 UTC (rev 1957)
+++ trunk/version1.0/includes/classes/class.calendar.php 2006-09-09 18:28:15 UTC (rev 1958)
@@ -20,14 +20,17 @@
{
/**
* function to insert stats
- * @param string $stat_type stat type
- * @param string $stat_value value
+ * @param array $data Array with data
* @param integer $idid Multi site ID
* @return integer Is this a new visitor?
*/
- function insert_stats($stat_type, $stat_value, $idid)
+ function insert_stats($data, $idid)
{
global $db;
+ if(!is_array)
+ {
+ trigger_error('Old style used',E_USER_WARNING);
+ }
$idid_array = array();
if(!is_array($idid))
{
@@ -37,7 +40,6 @@
{
$idid_array = $idid;
}
- $idids = array();
$idid_array = array_unique($idid_array);
$stat_value = trim($stat_value);
if(empty($stat_value)){
@@ -49,58 +51,71 @@
VALUES ";
$insert2 = "";
$d_i = false;
- foreach($idid_array as $idid)
+ foreach ($data as $stat_type => $stat_value)
{
- if(in_array($idid,$idids)){
- continue;
- }else{
- $newUser = 0;
- $idids[] = $idid;
- //first get the stat_time_array
- $startTime=$this->get_day_start_time();
- //If rendertime, we don't get it, it (nearly ;)) impossible to got the same time.
- if($stat_type == 'rendertime'){
-
- }else{
- $sql = "SELECT stat_time_array,stat_id,stat_count FROM ".RCTS_CALENDAR_TABLE."
- WHERE stat_type='".trim($stat_type)."'
- AND stat_value='".trim($stat_value)."'
- AND idid = '".trim($idid)."' LIMIT 1";
- $res = $db->sql_query($sql);
+ $idids = array();
+ foreach($idid_array as $idid)
+ {
+ if(in_array($idid,$idids))
+ {
+ continue;
}
- if($db->sql_numrows($res) && $stat_type != 'rendertime'){
- $row = $db->sql_fetchrow($res);
- $stat_time_array = $row['stat_time_array'];
- $stat_time_array = unserialize($stat_time_array);
- $db->sql_freeresult($res);
-
- if (!isset($stat_time_array[$startTime])) {
- $newUser = 1;
+ else
+ {
+ $newUser = 0;
+ $idids[] = $idid;
+ //first get the stat_time_array
+ $startTime=$this->get_day_start_time();
+ //If rendertime, we don't get it, it (nearly ;)) impossible to got the same time.
+ if($stat_type == 'rendertime')
+ {
+
}
+ else
+ {
+ $sql = "SELECT stat_time_array,stat_id,stat_count FROM ".RCTS_CALENDAR_TABLE."
+ WHERE stat_type='".trim($stat_type)."'
+ AND stat_value='".trim($stat_value)."'
+ AND idid = '".trim($idid)."' LIMIT 1";
+ $res = $db->sql_query($sql);
+ }
+ if($db->sql_numrows($res) && $stat_type != 'rendertime')
+ {
+ $row = $db->sql_fetchrow($res);
+ $stat_time_array = $row['stat_time_array'];
+ $stat_time_array = unserialize($stat_time_array);
+ $db->sql_freeresult($res);
+
+ if (!isset($stat_time_array[$startTime])) {
+ $newUser = 1;
+ }
+
+ $stat_time_array[$startTime]++;
+
+ $stat_time_array = serialize($stat_time_array);
+
+ $sql = "UPDATE ".RCTS_CALENDAR_TABLE."
+ SET stat_time_array = '".$stat_time_array."',
+ stat_count = stat_count + 1
+ WHERE stat_id = ".$row['stat_id'];
+ $db->sql_query($sql);
+ }
+ else
+ {
+ $stat_time_array = array();
+ $stat_time_array[$startTime] = 1;
+ $stat_time_array = serialize($stat_time_array);
+ if($insert2 != ""){
+ $insert2 .= ", ";
+ }
+ $insert2 .= "('".$stat_type."', '".$stat_value."', ".time().", 1, '".$idid."','".$stat_time_array."')";
+ $d_i = true;
- $stat_time_array[$startTime]++;
-
- $stat_time_array = serialize($stat_time_array);
-
- $sql = "UPDATE ".RCTS_CALENDAR_TABLE."
- SET stat_time_array = '".$stat_time_array."',
- stat_count = stat_count + 1
- WHERE stat_id = ".$row['stat_id'];
- $db->sql_query($sql);
- }else{
- $stat_time_array = array();
- $stat_time_array[$startTime] = 1;
- $stat_time_array = serialize($stat_time_array);
- if($insert2 != ""){
- $insert2 .= ", ";
+ $newUser = 1;
}
- $insert2 .= "('".$stat_type."', '".$stat_value."', ".time().", 1, '".$idid."','".$stat_time_array."')";
- $d_i = true;
-
- $newUser = 1;
}
+ unset($stat_time_array,$sql,$row);
}
- unset($stat_time_array,$sql,$row);
}
if($d_i){
$insert = $insert . $insert2;
Modified: trunk/version1.0/includes/classes/class.viewer.php
===================================================================
--- trunk/version1.0/includes/classes/class.viewer.php 2006-09-09 17:12:36 UTC (rev 1957)
+++ trunk/version1.0/includes/classes/class.viewer.php 2006-09-09 18:28:15 UTC (rev 1958)
@@ -1,33 +1,37 @@
<?php
-/******************************************************************
-* Really Coding Traffic Statistics 2
-* Begin: October, 3rd 2005
-* Copyright: Copyright 2005 by Really coding Group
-******************************************************************
-* class.viewer.php
-* ****************
-* $Id$
-******************************************************************/
-
-/*******************************************************************
-*
-* 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.
-*
-*******************************************************************/
+/**
+ * Class that save all stats.
+ * @package RCTS2
+ * @version $Id$
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @copyright Really Coding Group, 2005-2006
+ * @author Really Coding Group
+ */
+/**
+ * @ignore
+ */
if(!defined('IN_STATS'))
{
die('Hacking Attempt');
}
-// Class to get the stats of viewer.
+/**
+ * Class that save all stats
+ *
+ * @package stats
+ */
class gatherViewerStats{
+ /**
+ * Constructor, that call the function to add stats.
+ *
+ * @return gatherViewerStats
+ */
function gatherViewerStats() {
- //if($this->doCheck()){
- $this->gatherStats();
- //}
+ $this->gatherStats();
}
+ /**
+ * Save all stats.
+ *
+ */
function gatherStats(){
global $db, $multisite, $pluginsClass, $calendar;
//
@@ -52,6 +56,8 @@
*/
$java = array_add_slashes(urldecode_array(get_var("java")));
$flash = array_add_slashes(urldecode_array(get_var("flash")));
+ $title = array_add_slashes(urldecode_array(get_var("title")));
+
$ididthis = $multisite->getIdId();
setcookie("time_online_IDID",$ididthis,time()+60*60);
/*
@@ -70,10 +76,13 @@
$county = "";
- if($ididthis=="NONE"){
+ if($ididthis=="NONE")
+ {
$idid = array('1');
$idid2 = 1;
- }else{
+ }
+ else
+ {
$idid = array('1',$ididthis);
$idid2 = $ididthis;
}
@@ -87,73 +96,51 @@
".RCTS_PLUGINS_TABLE."
WHERE plugin_hooks LIKE '%StatsGather%'";
$res = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($res)) {
+ while ($row = $db->sql_fetchrow($res))
+ {
$plugin = $pluginsClass->loadPlugin($row['plugin_name']);
$plugin->eventStatsGather($plug_ary);
}
-
- /*
- // Add to browsers
- */
- $calendar -> insert_stats('browsers', $browser, $idid);
-
- /*
- // Add to entry pages
- */
- $calendar -> insert_stats('entry_pages', $entryPage, $idid);
-
- /*
- // Add to OS Table
- */
- $calendar -> insert_stats('os', $os, $idid);
-
- /*
- // Add to colors table
- */
- $calendar -> insert_stats('color_depths', $color, $idid);
-
- /*
- // Add to resolution table
- */
- $calendar -> insert_stats('resolutions', $resolution, $idid);
-
- /*
- // Add to offset table
- */
- $calendar -> insert_stats('gmt_offset', $gmtOff, $idid);
-
- /*
- // Add to referers table
- */
- $calendar -> insert_stats('referers', $referer, $idid);
-
- /*
+ $hour = date("H");
+ $data = array(
+ // Add to browsers
+ 'browsers'=> $browser,
+ // Add to entry pages
+ 'entry_pages' => $entryPage,
+ // Add to OS Table
+ 'os' => $os,
+ // Add to colors table
+ 'color_depths' => $color,
+ // Add to resolution table
+ 'resolutions' => $resolution,
+ // Add to offset table
+ 'gmt_offset' => $gmtOff,
+ // Add to referers table
+ 'referers' => $referer,
+ // Add to flash table
+ 'flash_plugins' => $flash,
+ // Add to hour table
+ 'hour' => $hour,
+ // Add to title table
+ 'title' => $title
+ );
+ $calendar->insert_stats($data, $idid);
// Add to language table
- */
+ //This cannot be done in big array, because it don't support
+ //not unique key's.
for($i = 0; $i < count($talen);$i++){
- $calendar -> insert_stats('languages', $talen[$i][2], $idid);
+ $calendar -> insert_stats(array('languages' => $talen[$i][2]), $idid);
}
-
- /*
- // Add to flash table
- */
- $calendar -> insert_stats('flash_plugins', $flash, $idid);
-
- /*
- // Add to hour table
- */
- $hour = date("H");
- $calendar -> insert_stats('hour', $hour, $idid);
-
// Check milestones
$this -> check_milestones();
}//end function
- /*
- Function to return the referer
- @return: the referer
- */
+ /**
+ * Get referer
+ *
+ * @return string referer
+ */
function getReferer()
{
$re = get_var('ref');
@@ -166,10 +153,11 @@
return "No referer";
}
- /*
- Function to get the IP
- @return: the IP
- */
+ /**
+ * Get IP
+ *
+ * @return string IP
+ */
function getIp() {
$ip2 = $ip = $ip3 = "";
if (getenv('HTTP_X_FORWARDED_FOR')) {
@@ -192,10 +180,11 @@
return $ip;
}
- /*
- Function to get the REQUEST_URI
- @return: REQUEST_URI
- */
+ /**
+ * Get REQUEST URI
+ *
+ * @return string request_uri
+ */
function getUri() {
$loc = get_var('loc');
$loc = str_replace("#quest;","?",$loc);
@@ -203,19 +192,20 @@
return $loc;
}
- /*
- Function to get the User Agent
- @return: HTTP_USER_AGENT
- */
+ /**
+ * Get agent
+ *
+ * @return string agent
+ */
function getAgent(){
return $_SERVER["HTTP_USER_AGENT"];
}
- /*
- Function te get the resulotion,
- The resulotion will be sent through $_GET or $_POST, and we can get the resolution with Javascript
- @return: The resolution
- */
+ /**
+ * Get resulution
+ *
+ * @return string reselution
+ */
function getResolution()
{
$re = get_var('resolution');//$_GET['resolution'];
@@ -230,11 +220,11 @@
}
}
- /*
- Function te get the color depth,
- The color depth will be sent through $_GET or $_POST, and we can get the color depth with Javascript
- @return: The color depth
- */
+ /**
+ * Get color depth
+ *
+ * @return string color depth
+ */
function getColorDepth()
{
$co = get_var('color');//$_GET['color'];
@@ -248,11 +238,11 @@
return $core->lang['onbekend'];
}
}
- /*
- Function te get the timezone offset (example: GMT +1),
- The color depth will be sent through $_GET or $_POST, and we can get the color depth with Javascript
- @return: The color depth
- */
+ /**
+ * Get offset
+ *
+ * @return string offset
+ */
function gmtOff()
{
$offSet = get_var('gmtOff');//$_GET['gmtOff'];
@@ -260,11 +250,13 @@
return $offSet;
}
- /*
- Function to get the browser from the HTTP_USER_AGENT var
- @param: data string
- @return: the browser
- */
+
+ /**
+ * Get browser
+ *
+ * @param string $data browserstring
+ * @return string browser
+ */
function getBrowser($data) {
if($data[0] == "ie"){
$data[0]="Internet Explorer";
@@ -278,11 +270,12 @@
}
}
- /*
- Function to get the os from the HTTP_USER_AGENT var
- @param: data string
- @return: the os
- */
+ /**
+ * Get OS
+ *
+ * @param string $data OS string
+ * @return string OS
+ */
function getOs($data) {
$os = $data[5] ." ".$data[6];
if($os==""){
@@ -292,10 +285,12 @@
return $os;
}
}
- /*
- Function to get the os from the HTTP_USER_AGENT var
- @return: the os
- */
+
+ /**
+ * Get language
+ *
+ * @return string language
+ */
function getTaal() {
// get the languages
$index = '';
@@ -347,11 +342,12 @@
}
return $user_languages;
}
- /*
- Function to check the header for intruders
- @param: None
- @return: true or false
- */
+
+ /**
+ * Check for valid header.
+ *
+ * @return bool result
+ */
function doCheck()
{
global $db;
@@ -387,6 +383,10 @@
}
}
+ /**
+ * Check for milestones
+ *
+ */
function check_milestones() {
global $db;
$sql = "SELECT * FROM " . RCTS_MILESTONES_TABLE . " WHERE reached=0";
@@ -427,10 +427,17 @@
}
} // while
}
-
+
+ /**
+ * Send email if milestone is reached
+ *
+ * @param string $row unkown
+ * @param int $time unkown
+ * @return result
+ */
function send_milestone_mail($row, $time) {
// TODO: Create this function. :)
return true;
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/version1.0/javascript/stats.php
===================================================================
--- trunk/version1.0/javascript/stats.php 2006-09-09 17:12:36 UTC (rev 1957)
+++ trunk/version1.0/javascript/stats.php 2006-09-09 18:28:15 UTC (rev 1958)
@@ -1,22 +1,16 @@
<?php
-/******************************************************************
-* Really Coding Traffic Statistics 2
-* Begin: October, 3rd 2005
-* Copyright: Copyright 2005 by Really coding Group
-******************************************************************
-* stats.php
-* ****************
-* $Id$
-******************************************************************/
-
-/*******************************************************************
-*
-* 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.
-*
-*******************************************************************/
+/**
+ * File to create JS
+ * @package RCTS2
+ * @version $Id$
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @copyright Really Coding Group, 2005-2006
+ * @author Really Coding Group
+ */
+/**
+ * @ignore
+ *
+ */
define('IN_STATS', true);
define('RCTS_ROOT_PATH', str_replace("javascript","",dirname(__FILE__)));
include(RCTS_ROOT_PATH.'/includes/start.php');
@@ -97,6 +91,7 @@
var java = n.javaEnabled()?1:0;
var color = window.screen.colorDepth;
var resolution = window.screen.width + "x" + window.screen.height;
+ var title = document.title;
var ref = document.referrer;
var loc = location.href;
var locn = loc.replace(/&/g,"#amp;");
@@ -104,11 +99,14 @@
<?php
echo $varinit;
- $varSting = "var string = 'indentifer=' + indentifer + '&loc=' + locne + '&gmtOff=' + gmtoff + '&color=' + color + '&ref=' + ref + '&resolution=' + resolution + '&java=' + java + '&flash=' + flash";
+ $varSting = "var string = 'indentifer=' + indentifer + '&loc=' + locne + '&gmtOff=' + gmtoff + '&color=' + color + '&ref=' + ref + '&resolution=' + resolution + '&java=' + java + '&flash=' + flash + '&title=' + title";
- if (!empty($get)) {
+ if (!empty($get))
+ {
echo $varSting.' + '.$get;
- }else{
+ }
+ else
+ {
echo $varSting;
}
?>;
@@ -214,4 +212,4 @@
http_request.send(null);
}
return true;
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pau...@us...> - 2006-09-09 19:41:44
|
Revision: 1961
http://svn.sourceforge.net/rcts/?rev=1961&view=rev
Author: paulsohier
Date: 2006-09-09 12:41:33 -0700 (Sat, 09 Sep 2006)
Log Message:
-----------
Bugfixes.
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.calendar.php
trunk/version1.0/includes/classes/class.viewer.php
trunk/version1.0/includes/start.php
trunk/version1.0/includes/wizards/configwiz.php
trunk/version1.0/wizz.php
Removed Paths:
-------------
trunk/version1.0/190.zip
Deleted: trunk/version1.0/190.zip
===================================================================
(Binary files differ)
Modified: trunk/version1.0/includes/classes/class.calendar.php
===================================================================
--- trunk/version1.0/includes/classes/class.calendar.php 2006-09-09 18:44:29 UTC (rev 1960)
+++ trunk/version1.0/includes/classes/class.calendar.php 2006-09-09 19:41:33 UTC (rev 1961)
@@ -27,9 +27,9 @@
function insert_stats($data, $idid)
{
global $db;
- if(!is_array)
+ if(!is_array($data))
{
- trigger_error('Old style used',E_USER_WARNING);
+ die('Old style used');
}
$idid_array = array();
if(!is_array($idid))
Modified: trunk/version1.0/includes/classes/class.viewer.php
===================================================================
--- trunk/version1.0/includes/classes/class.viewer.php 2006-09-09 18:44:29 UTC (rev 1960)
+++ trunk/version1.0/includes/classes/class.viewer.php 2006-09-09 19:41:33 UTC (rev 1961)
@@ -86,7 +86,6 @@
$idid = array('1',$ididthis);
$idid2 = $ididthis;
}
- $newUser = $calendar -> insert_stats('visitors', $ip, $idid);
//
// Load plugins
//
@@ -103,6 +102,7 @@
}
$hour = date("H");
$data = array(
+ 'visitors' => $ip,
// Add to browsers
'browsers'=> $browser,
// Add to entry pages
Modified: trunk/version1.0/includes/start.php
===================================================================
--- trunk/version1.0/includes/start.php 2006-09-09 18:44:29 UTC (rev 1960)
+++ trunk/version1.0/includes/start.php 2006-09-09 19:41:33 UTC (rev 1961)
@@ -155,4 +155,25 @@
));
$modes[] = $info['mode'];
}
-?>
+if(!$core->config_isset('begin_conf'))
+{
+ include_once(RCTS_ROOT_PATH.'/includes/classes/class.wizard.php');
+ include_once(RCTS_ROOT_PATH.'/includes/wizards/configwiz.php');
+
+ $wizard = new Wizard();
+
+ $wizard->setDimensions(640, 480);
+
+ $layoutSel = new LayoutSel('layoutsel');
+ $wizard->addPage('layoutsel', $layoutSel);
+ $codeGet = new CodeGet('codeget');
+ $wizard->addPage('codeget', $codeGet);
+ $codeGot = new CodeGot('codegot');
+ $wizard->addPage('codegot', $codeGot);
+ $configFinished = new ConfigFinished('configfinished');
+ $wizard->addPage('configfinished', $configFinished);
+
+ $wizard->display();
+ die;
+}
+?>
\ No newline at end of file
Modified: trunk/version1.0/includes/wizards/configwiz.php
===================================================================
--- trunk/version1.0/includes/wizards/configwiz.php 2006-09-09 18:44:29 UTC (rev 1960)
+++ trunk/version1.0/includes/wizards/configwiz.php 2006-09-09 19:41:33 UTC (rev 1961)
@@ -92,17 +92,7 @@
{
global $core, $db;
$lay = $this->getVar('wiz_layout');
- /*
- INSERT INTO `rcts_layout` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '--', '1.0'),
-(2, 'stats_time', '--', '2.0'),
-(3, 'stats_load', '--', '3.0'),(4, 'uniek', '--', '3.0');
- */
- /* Default:
- $page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions') ;
- $page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime');
- $page3_array = array('LoadTime', 'Average', 'AvarageOnline');
- $page4_array = array('uniekDisp');
- */
+
$e = false;
$em = '';
if ($lay == 'lttime') {
@@ -111,18 +101,12 @@
$page3_array = array('uniekDisp');
$sql = 'TRUNCATE '.RCTS_LAYOUT_TABLE;
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
$sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'),
(2, 'stats_time', '".serialize($page2_array)."', '2.0'),
(3, 'uniek', '".serialize($page3_array)."', '3.0')";
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
} else if ($lay == 'computer') {
// topBrowsers, topOs, topFlash, topResolutions, topColors
$page1_array = array('visitsToday', 'last30daysDisp', 'topEntryPages', 'topLanguages', 'topReferers','referTrends') ;
@@ -132,20 +116,14 @@
$page5_array = array('topBrowsers', 'topOs', 'topFlash', 'topResolutions', 'topColors');
$sql = 'TRUNCATE '.RCTS_LAYOUT_TABLE;
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
$sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'),
(2, 'stats_time', '".serialize($page2_array)."', '2.0'),
(3, 'stats_load', '".serialize($page3_array)."', '3.0'),
(4, 'uniek', '".serialize($page4_array)."', '3.0'),
(5, 'Computer', '".serialize($page5_array)."', '4.0')";
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
} else if ($lay == 'computerplus') {
global $pluginsClass;
$pluginsClass->installPlugin('ComeFrom');
@@ -158,20 +136,14 @@
$page5_array = array('topBrowsers', 'topOs', 'topFlash', 'topResolutions', 'topColors', 'ComeFrom', 'UserOptions');
$sql = 'TRUNCATE '.RCTS_LAYOUT_TABLE;
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
$sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'),
(2, 'stats_time', '".serialize($page2_array)."', '2.0'),
(3, 'stats_load', '".serialize($page3_array)."', '3.0'),
(4, 'uniek', '".serialize($page4_array)."', '3.0'),
(5, 'Computer', '".serialize($page5_array)."', '4.0')";
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
} else { // Default
$page1_array = array('visitsToday', 'last30daysDisp', 'topBrowsers', 'topColors', 'topEntryPages', 'topFlash', 'topLanguages', 'topOs', 'topReferers', 'topResolutions', 'referTrends');
$page2_array = array('Hours', 'DaysW', 'DaysM', 'MonthDisp', 'TimezonesDisp', 'OnlineTime');
@@ -179,25 +151,15 @@
$page4_array = array('uniekDisp');
$sql = 'TRUNCATE '.RCTS_LAYOUT_TABLE;
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
$sql = "INSERT INTO `".RCTS_LAYOUT_TABLE."` (`id`, `name`, `content`, `order`) VALUES (1, 'stats_main', '".serialize($page1_array)."', '1.0'),
(2, 'stats_time', '".serialize($page2_array)."', '2.0'),
(3, 'stats_load', '".serialize($page3_array)."', '3.0'),
(4, 'uniek', '".serialize($page4_array)."', '3.0')";
$r = $db->sql_query($sql);
- if ($r === false) {
- $e = true;
- $em .= $db->sql_error().'<br />';
- }
+
}
$blockBody = $core->lang['Wiz_fs_code_desc'];
- if ($e) {
- $blockBody .= $em;
- $this->setNext(null);
- }
+
$expl = $this->getBlockCode($blockBody);
$l_wiz_fs = $core->lang['Wiz_name_fs'];
$formBody = <<<EOB
@@ -254,10 +216,11 @@
function setPage()
{
- global $core;
+ global $core, $cache;
$password = $this->getUserVariable('password');
$blockBody = "<div align='center'>".$core->lang['Wiz_cc_desc'];
$this->page = $this->getBlockCode($blockBody);
+ $cache->upd_config('begin_conf','1');
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/version1.0/wizz.php
===================================================================
--- trunk/version1.0/wizz.php 2006-09-09 18:44:29 UTC (rev 1960)
+++ trunk/version1.0/wizz.php 2006-09-09 19:41:33 UTC (rev 1961)
@@ -30,9 +30,12 @@
$wizard->setDimensions(640, 480);
- $layoutSel = new LayoutSel('layoutsel'); $wizard->addPage('layoutsel', $layoutSel);
- $codeGet = new CodeGet('codeget'); $wizard->addPage('codeget', $codeGet);
- $codeGot = new CodeGot('codegot'); $wizard->addPage('codegot', $codeGot);
+ $layoutSel = new LayoutSel('layoutsel');
+ $wizard->addPage('layoutsel', $layoutSel);
+ $codeGet = new CodeGet('codeget');
+ $wizard->addPage('codeget', $codeGet);
+ $codeGot = new CodeGot('codegot');
+ $wizard->addPage('codegot', $codeGot);
$configFinished = new ConfigFinished('configfinished');
$wizard->addPage('configfinished', $configFinished);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-10 08:26:48
|
Revision: 1963
http://svn.sourceforge.net/rcts/?rev=1963&view=rev
Author: bastimmer
Date: 2006-09-10 01:26:38 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
Fix issue 17 and 14.
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.cron.php
trunk/version1.0/includes/classes/class.stats.php
trunk/version1.0/templates/rcts/stats.html
Modified: trunk/version1.0/includes/classes/class.cron.php
===================================================================
--- trunk/version1.0/includes/classes/class.cron.php 2006-09-09 19:46:51 UTC (rev 1962)
+++ trunk/version1.0/includes/classes/class.cron.php 2006-09-10 08:26:38 UTC (rev 1963)
@@ -964,21 +964,29 @@
{
$colors=array();
$monthnames = array('','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+ $data = array();
foreach($months as $monthN=>$count)
{
+ //$namesW = $core->lang['Days_Of_Week'];
$monthN = $monthnames[$monthN];
- $data[$monthN] =$count;
- $colors[]=randomDecColor();
+// $data[$monthN] = $count;
+ $data[] = array($monthN, $count);
}
- $bar = new BarGraph();
- $bar->bar_bgcolor = $colors;
- $bar->data=$data;
- $bar->graph_bgcolor = $template->themeColor['imBG'];
- $bar->graph_bordercolor = $template->themeColor['imBGBorder'];
- $bar->time_color = $template->themeColor['imText'];
- $bar->axis_scalecolor = $template->themeColor['imAxText'];
- $bar->scale_roundY=-1;
- $bar->DrawGraph();
+ $graph = new PHPlot(400, 200);
+ $graph->SetDataType("text-data");
+
+ $graph->SetDataValues($data);
+
+ $graph->SetXTitle("");
+ $graph->SetYTitle("");
+ $graph->SetNumYTicks(10);
+ $graph->SetNumXTicks(1);
+ $graph->SetPlotType("bars");
+ $graph->SetXLabelAngle(45);
+// $graph->SetDataColors($color);
+ $graph->SetBackgroundColor($template->themeColor['imBG']);
+
+ $graph->DrawGraph();
}
}
/**
@@ -1018,18 +1026,24 @@
{
$tmp="GMT";
}
- $data[$tmp] =$info['stat_count'];
- $colors[]=randomDecColor();
+
+ $data[] = array($tmp, $info['stat_count']);
}
- $bar = new BarGraph();
- $bar->bar_bgcolor = $colors;
- $bar->data=$data;
- $bar->graph_bgcolor = $template->themeColor['imBG'];
- $bar->graph_bordercolor = $template->themeColor['imBGBorder'];
- $bar->time_color = $template->themeColor['imText'];
- $bar->axis_scalecolor = $template->themeColor['imAxText'];
- $bar->scale_roundY=-1;
- $bar->DrawGraph();
+ $graph = new PHPlot(400, 200);
+ $graph->SetDataType("text-data");
+
+ $graph->SetDataValues($data);
+
+ $graph->SetXTitle("");
+ $graph->SetYTitle("");
+ $graph->SetNumYTicks(10);
+ $graph->SetNumXTicks(1);
+ $graph->SetPlotType("bars");
+ $graph->SetXLabelAngle(45);
+// $graph->SetDataColors($color);
+ $graph->SetBackgroundColor($template->themeColor['imBG']);
+
+ $graph->DrawGraph();
}
}
/**
@@ -1274,7 +1288,8 @@
while(list($el,$wa) = each($data))
{
$colors[]=randomDecColor();
- $row[$el] = $wa;
+// $row[$el] = $wa;
+ $row[] = array($el, $wa);
}
unset($data);
$data = $row;
@@ -1287,16 +1302,21 @@
}
else
{
+ $graph = new PHPlot(400, 200);
+ $graph->SetDataType("text-data");
- $bar = new BarGraph();
- $bar->bar_bgcolor = $colors;
- $bar->graph_bgcolor = $template->themeColor['imBG'];
- $bar->graph_bordercolor = $template->themeColor['imBGBorder'];
- $bar->time_color = $template->themeColor['imText'];
- $bar->axis_scalecolor = $template->themeColor['imAxText'];
- $bar->data=$data;
- $bar->scale_roundY=-1;
- $bar->DrawGraph();
+ $graph->SetDataValues($data);
+
+ $graph->SetXTitle("");
+ $graph->SetYTitle("");
+ $graph->SetNumYTicks(10);
+ $graph->SetNumXTicks(1);
+ $graph->SetPlotType("bars");
+ $graph->SetXLabelAngle(45);
+// $graph->SetDataColors($color);
+ $graph->SetBackgroundColor($template->themeColor['imBG']);
+
+ $graph->DrawGraph();
}
}
?>
\ No newline at end of file
Modified: trunk/version1.0/includes/classes/class.stats.php
===================================================================
--- trunk/version1.0/includes/classes/class.stats.php 2006-09-09 19:46:51 UTC (rev 1962)
+++ trunk/version1.0/includes/classes/class.stats.php 2006-09-10 08:26:38 UTC (rev 1963)
@@ -338,7 +338,7 @@
function MonthDisp($idid,$calendar_day)
{
foreach($GLOBALS as $key => $val){global $$key;}
- $template->block("Month");
+ $template->block("MonthDisp");
$months = array();
$months = $stats->getMonth($idid);
$i = 0;
@@ -359,7 +359,7 @@
function TimezonesDisp($idid,$calendar_day)
{
foreach($GLOBALS as $key => $val){global $$key;}
- $template->block("TimeZones");
+ $template->block("TimezonesDisp");
$zones= array();
$zones= $calendar->get_stats('gmt_offset', $idid, "all", 0);
$i = 0;
Modified: trunk/version1.0/templates/rcts/stats.html
===================================================================
--- trunk/version1.0/templates/rcts/stats.html 2006-09-09 19:46:51 UTC (rev 1962)
+++ trunk/version1.0/templates/rcts/stats.html 2006-09-10 08:26:38 UTC (rev 1963)
@@ -436,7 +436,7 @@
</div>
<!-- STOP DaysM -->
- <!-- START Month -->
+ <!-- START MonthDisp -->
<div class="menu">
<table width="100%" cellpadding="0" cellspacing="0">
<tr class="tr_kop">
@@ -462,9 +462,9 @@
<img src="graph.php?graph=month" alt="Month Graph" />
</div>
</div>
- <!-- STOP Month -->
+ <!-- STOP MonthDisp -->
- <!-- START TimeZones -->
+ <!-- START TimezonesDisp -->
<div class="menu">
<table width="100%" cellpadding="0" cellspacing="0">
<tr class="tr_kop">
@@ -490,7 +490,7 @@
<img src="graph.php?graph=timezones" alt="Timezones Graph" />
</div>
</div>
- <!-- STOP TimeZones -->
+ <!-- STOP TimezonesDisp -->
<!-- START OnlineTime -->
<div class="menu">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-10 14:03:53
|
Revision: 1964
http://svn.sourceforge.net/rcts/?rev=1964&view=rev
Author: bastimmer
Date: 2006-09-10 07:03:31 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
Add e-mail for milestones. Note this adds 2 config variables!
Modified Paths:
--------------
trunk/version1.0/admin/tpl/acp_config_general.html
trunk/version1.0/includes/classes/class.viewer.php
trunk/version1.0/includes/modules/acp/acp_config_general.php
trunk/version1.0/lang/en/admin.php
trunk/version1.0/lang/en/main.php
trunk/version1.0/lang/nl/admin.php
trunk/version1.0/lang/nl/main.php
Modified: trunk/version1.0/admin/tpl/acp_config_general.html
===================================================================
--- trunk/version1.0/admin/tpl/acp_config_general.html 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/admin/tpl/acp_config_general.html 2006-09-10 14:03:31 UTC (rev 1964)
@@ -33,6 +33,19 @@
</td>
</tr>
<tr>
+ <td>{L_EMAIL}</td>
+ <td>
+ <input type="text" name="main_email" value="{main_email}" />
+ </td>
+ </tr>
+ <tr>
+ <td>{L_EMAIL_MS}</td>
+ <td>
+ <input type="radio" name="mail_ms" value="1" {mail_ms1} />{L_STATS_YES}
+ <input type="radio" name="mail_ms" value="0" {mail_ms2} />{L_STATS_NO}
+ </td>
+ </tr>
+ <tr>
<td>{L_STATS_THEME}</td>
<td>
{default_tpl}
Modified: trunk/version1.0/includes/classes/class.viewer.php
===================================================================
--- trunk/version1.0/includes/classes/class.viewer.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/includes/classes/class.viewer.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -401,12 +401,12 @@
WHERE stat_type='visitors'
";
- $result = $db->sql_query($sql);
- $row2 = $db->sql_fetchrow($result);
+ $result2 = $db->sql_query($sql);
+ $row2 = $db->sql_fetchrow($result2);
if ($row2['aantal'] >= $goal) {
$sql = "UPDATE ".RCTS_MILESTONES_TABLE." SET reached='".time()."' WHERE id='$id'";
$db->sql_query($sql);
- $this->send_milestone_mail($row, time());
+ $this->send_milestone_mail($row, $row2['aantal'], time());
}
} else if ($type == 'hit') {
$sql = "SELECT *
@@ -414,15 +414,15 @@
WHERE stat_type='visitors'
";
- $result = $db->sql_query($sql);
+ $result2 = $db->sql_query($sql);
$totaal = 0;
- while($row2 = $db->sql_fetchrow($result)){
+ while($row2 = $db->sql_fetchrow($result2)){
$totaal = $totaal + $row2['stat_count'];
} // while
if ($totaal >= $goal) {
$sql = "UPDATE ".RCTS_MILESTONES_TABLE." SET reached='".time()."' WHERE id='$id'";
$db->sql_query($sql);
- $this->send_milestone_mail($row, time());
+ $this->send_milestone_mail($row, $totaal, time());
}
}
} // while
@@ -435,8 +435,21 @@
* @param int $time unkown
* @return result
*/
- function send_milestone_mail($row, $time) {
- // TODO: Create this function. :)
+ function send_milestone_mail($row, $totaal, $time) {
+ global $core, $mail;
+ if (!$core->config_get('mail_ms')) {
+ return;
+ }
+ $main_email = $core->config_get('main_email');
+ $mail->setFrom($main_email,'Really Coding Traffic Statistics');
+ $mail->setTo(array(array($main_email,"RCTS User")));
+ $type = str_replace('...', '', $core->lang['mile_type_'.$row['soort']]);
+ $mail->setMessage(sprintf($core->lang['Milestone_mail_body'], $totaal, $type, date('Y-m-d H:i', $time), base()));
+ // 1: Count of 2
+ // 2: Type of milestone: unique or hits
+ // 3: Current date
+ // 4: URL to RCTS installation
+ $mail->send();
return true;
}
}
Modified: trunk/version1.0/includes/modules/acp/acp_config_general.php
===================================================================
--- trunk/version1.0/includes/modules/acp/acp_config_general.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/includes/modules/acp/acp_config_general.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -59,7 +59,10 @@
"dw_dis" => (DISABLED) ? "disabled='disabled'" : '',
"rewrite1" => ($core->config_get('mod_rewrite')) ? 'checked="true"' : '',
"rewrite2" => (!$core->config_get('mod_rewrite')) ? 'checked="true"' : '',
+ "mail_ms1" => ($core->config_get('mail_ms')) ? 'checked="true"' : '',
+ "mail_ms2" => (!$core->config_get('mail_ms')) ? 'checked="true"' : '',
"default_tpl" => $selectTheme,
+ "main_email" => $core->config_get('main_email'),
//Taal
"L_STATS_MAIN_CONFIG" =>$core->lang['Stats_Main_config'],
"L_STATS_OPEN" => $core->lang['Stats_Open'],
@@ -72,6 +75,8 @@
"L_USE_DW" => $core->lang['use_dw'],
"L_MOD_REWRITE" => $core->lang['use_re'],
"L_GZIP" => $core->lang['gzip'],
+ "L_EMAIL" => $core->lang['email'],
+ "L_EMAIL_MS" => $core->lang['Send_email_ms'],
'S_ACTION' => $this->u_action . '&update=1'
));
$template->parse("body");
Modified: trunk/version1.0/lang/en/admin.php
===================================================================
--- trunk/version1.0/lang/en/admin.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/lang/en/admin.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -70,7 +70,7 @@
$lang['mile_add'] = 'Submit a new milestone';
//Users
-$lang['email'] = 'E-mail';
+$lang['email'] = 'E-mail address';
$lang['name'] = 'Name';
$lang['isadmin'] = 'Admin';
$lang['edit'] = 'Edit';
@@ -85,5 +85,6 @@
$lang['yes'] = "yes";
$lang['no'] = "No";
$lang['no_admin_rights'] = 'You have no rights to go to the config pannel';
-
+$lang['Send_email_ms'] = 'Send an e-mail for milestones?';
+$lang['First_configure_email'] = 'You first need to configure an e-mail address!';
?>
\ No newline at end of file
Modified: trunk/version1.0/lang/en/main.php
===================================================================
--- trunk/version1.0/lang/en/main.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/lang/en/main.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -81,4 +81,11 @@
$lang['Everything_OK'] = 'There are no notices available for showing.';
$lang['c_option_no'] = 'Configuration option %s does not exist.';
$lang['logout'] = 'Log out';
+
+// E-mails
+$lang['Milestone_mail_body'] = "Hello,\r\n\r\nA milestone has just been reached on your web site! You now have %s %s on your web site. This milestone has been reached on %s. You can always view the most recent statistics at %s .\r\n\r\n--\r\nReally Coding Traffic Statistics on your web site";
+// 1: Count of 2
+// 2: Type of milestone: unique or hits
+// 3: Current date
+// 4: URL to RCTS installation
?>
\ No newline at end of file
Modified: trunk/version1.0/lang/nl/admin.php
===================================================================
--- trunk/version1.0/lang/nl/admin.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/lang/nl/admin.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -72,7 +72,7 @@
//Users
-$lang['email'] = 'E-mail';
+$lang['email'] = 'E-mail address';
$lang['name'] = 'Naam';
$lang['isadmin'] = 'Admin';
$lang['edit'] = 'Bewerk';
@@ -87,5 +87,6 @@
$lang['yes'] = "Ja";
$lang['no'] = "Nee";
$lang['no_admin_rights'] = 'U heeft onvoldoende rechten om bij de administratie binnen te komen probeer een andere gebruiker.';
-
+$lang['Send_email_ms'] = 'Stuur een e-mail voor mijlpalen?';
+$lang['First_configure_email'] = 'Je moet eerst een e-mailadres configureren!';
?>
\ No newline at end of file
Modified: trunk/version1.0/lang/nl/main.php
===================================================================
--- trunk/version1.0/lang/nl/main.php 2006-09-10 08:26:38 UTC (rev 1963)
+++ trunk/version1.0/lang/nl/main.php 2006-09-10 14:03:31 UTC (rev 1964)
@@ -76,4 +76,11 @@
$lang['Everything_OK'] = 'Er zijn geen meldingen om weer te geven.';
$lang['c_option_no'] = 'Configuratieoptie %s bestaat niet';
$lang['logout'] = 'Uitloggen';
+
+// E-mails
+$lang['Milestone_mail_body'] = "Hallo,\r\n\r\nEr is zojuist een mijlpaal doorbroken op je website. Je hebt nu %s %s op je website! Deze mijlpaal is bereikt op %s. De laatste statistieken vallen altijd te bekijken op %s .\r\n\r\n--\r\nReally Coding Traffic Statistics op jouw website";
+// 1: Count of 2
+// 2: Type of milestone: unique or hits
+// 3: Current date
+// 4: URL to RCTS installation
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-14 10:05:25
|
Revision: 1968
http://svn.sourceforge.net/rcts/?rev=1968&view=rev
Author: bastimmer
Date: 2006-09-14 03:05:09 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
A begin of Overview. Paul, could you check if the method I'm using to check visitor counts is correct? It suddenly jumped, and I don't know how to fix it... :P And some other idids got 0 unique visitors...
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.layout.php
trunk/version1.0/index.php
trunk/version1.0/lang/en/main.php
trunk/version1.0/lang/en/stats.php
trunk/version1.0/lang/nl/main.php
trunk/version1.0/lang/nl/stats.php
Modified: trunk/version1.0/includes/classes/class.layout.php
===================================================================
--- trunk/version1.0/includes/classes/class.layout.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/includes/classes/class.layout.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -242,9 +242,14 @@
}
function menu()
{
- global $db;
+ global $db, $core;
$main_menu_arr = array();
$i = 0;
+ $main_menu_arr[$i]['link'] = 'index.php?mode=overview';
+ $main_menu_arr[$i]['desc'] = $core->lang['Overview'];
+ $main_menu_arr[$i]['name'] = $core->lang['Overview'];//This must be also a string!
+ $main_menu_arr[$i]['mode'] = 'overview';
+ $i++;
$sql = "Select * FROM ".RCTS_LAYOUT_TABLE . " ORDER BY `orderd` ASC";
$res = $db->sql_query($sql);
Modified: trunk/version1.0/index.php
===================================================================
--- trunk/version1.0/index.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/index.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -1,20 +1,130 @@
<?php
/**
- * index file
+ * Overview file
* @package RCTS2
* @version $Id$
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @copyright Really Coding Group, 2005-2006
* @author Really Coding Group
*/
-/**
- * @ignore
- */
define('IN_STATS', true);
-/**
- * @ignore
- */
define('RCTS_ROOT_PATH', dirname(__FILE__));
include(RCTS_ROOT_PATH.'/includes/start.php');
-loc("stats.php");
+$stats = new getStats();
+$multi_site = new multisite;
+if($core->config_get('stats_open') == 0)
+{
+ if(!$core->UserLoggedIn())
+ {
+ $core->login_form("stats.php");
+ }
+}
+// Preparation for multisite...
+session_start();
+if($core->config_get('use_multisite'))
+{
+ $idid = get_var('Usite');
+
+ if(!$idid || $idid == "")
+ {
+ $idid = get_var('idid',false,true);
+ }
+ $idid = trim($idid);
+
+ if(!$idid || $idid == "")
+ {
+ $idid = "1";
+ }
+}
+else
+{
+ $idid = 1;
+}
+$_SESSION["idid"] = $idid;
+
+if($core->config_get('use_multisite'))
+{
+ $text = "<form method='POST' action='index.php?mode=".$mode."' name='select'>
+ <select size='1' name='Usite' onchange='select.submit()'>";
+ $sites = $multi_site->getIndentifers();
+ foreach ($sites as $site)
+ {
+ $selected = ($site['0']==$idid)? " SELECTED":"";
+ $text .= "<option value='".$site['0']."'".$selected.">".$site['2']."</option>";
+ }
+ $text .= "</select></form>";
+
+ $template->assign(array(
+ "L_SELECT_SITE" => $core->lang['Select_site'],
+ "MULTI_SITE" => $text
+ ));
+}
+else
+{
+ $template->assign(array(
+ "L_SELECT_SITE" => "",
+ "MULTI_SITE" => ""
+ ));
+}
+if(get_var('day') != '' && is_numeric(get_var('day')))
+{
+ $calendar_day = get_var('day');
+ $_SESSION['day'] = $calendar_day;
+}
+else
+{
+ $calendar_day = "all";
+}
+pageHeader($lang['Overview']);
+$template->add_file(array(
+ 'statsheader' => 'statsheader.html',
+ 'statsfooter' => 'statsfooter.html',
+ 'body' => 'overview.html'
+));
+// (unique) visitors
+$visits = $calendar->get_stats('visitors', $idid, 'all', false, false, -1, false,true,'stat_timestamp');
+$array = array($core->lang['Pages'],$core->lang['Ip_add']);
+$day = $calendar->get_day_start_time(time());
+$total = 0;
+$stat_data = $visits;
+$todayvcount = 0;
+$totalvcount = 0;
+foreach($stat_data as $i => $row){
+ $stat_time_array = $row['stat_time_array'];
+ $stat_time_array = unserialize($stat_time_array);
+ if(is_array($stat_time_array)){
+ while(list($da,$wa) = each($stat_time_array)){
+ if($da >= $day){
+ $todayvcount += 1;
+ $totalvcount += 1;
+ }else{
+ //Not today :)
+ $totalvcount += 1;
+ continue;
+ }
+ }
+ }
+ if(!$todayvcount){
+ continue;
+ }
+ $total++;
+}
+// total: total unique visitors, todayvcount = unique visits today, totalvcount = total visits
+//echo $total.'.'.$totalvcount.'.'.$todayvcount;
+$template->assign(array(
+ 'L_QUICK_STATS' => $core->lang['Quick_stats'],
+ 'L_UNIVIS' => $core->lang['uniek'],
+ 'L_UNITOD' => $core->lang['uniek_vandaag'],
+ 'L_VISITS' => $core->lang['visits'],
+// 'L_VISTOD' => $core->lang['visit_today'],
+ // Data
+ 'D_UNIVIS' => $total,
+ 'D_UNITOD' => $todayvcount,
+ 'D_VISITS' => $totalvcount
+));
+$template->parse('statsheader');
+$template->parse('body');
+$template->parse('statsfooter');
+//loc("stats.php");
+pageFooter();
?>
Modified: trunk/version1.0/lang/en/main.php
===================================================================
--- trunk/version1.0/lang/en/main.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/lang/en/main.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -49,7 +49,8 @@
$lang['redirect'] = 'When you are not redirected, click %shere%s.';
$lang['Stats'] = 'Statistics';
-$lang['stats_main'] = "Overview";
+$lang['Overview'] = 'Overview';
+$lang['stats_main'] = "Main statistics";
$lang['stats_main_exp'] = "All sorts of statistics";
$lang['stats_load'] = "Loadtime statistics";
$lang['stats_load_exp'] = "How long does it take to load your site?";
Modified: trunk/version1.0/lang/en/stats.php
===================================================================
--- trunk/version1.0/lang/en/stats.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/lang/en/stats.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -183,4 +183,6 @@
$lang['only_when_closed'] = 'Je kan ze alleen verplaatsen wanneer alles gesloten is.';
$lang['Overlay'] = 'Site Overlay';
+// Overview stuff...
+$lang['Quick_stats'] = 'Quick statistics';
?>
Modified: trunk/version1.0/lang/nl/main.php
===================================================================
--- trunk/version1.0/lang/nl/main.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/lang/nl/main.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -45,7 +45,8 @@
$lang['redirect'] = 'Wanneer je niet wordt doorgestuurd klik je %shier%s.';
$lang['Stats'] = 'Statistieken';
-$lang['stats_main'] = "Overzicht";
+$lang['Overview'] = 'Overzicht';
+$lang['stats_main'] = "Hoofdstatistieken";
$lang['stats_main_exp'] = "Hier vind je verschillende soorten statistieken";
$lang['stats_load'] = "Laadtijd-statistieken";
$lang['stats_load_exp'] = "Hoelang laadt de pagina bij de bezoekers?";
Modified: trunk/version1.0/lang/nl/stats.php
===================================================================
--- trunk/version1.0/lang/nl/stats.php 2006-09-10 19:54:36 UTC (rev 1967)
+++ trunk/version1.0/lang/nl/stats.php 2006-09-14 10:05:09 UTC (rev 1968)
@@ -182,4 +182,7 @@
$lang['only_when_closed'] = 'Je kan ze alleen verplaatsen wanneer alles gesloten is.';
$lang['Overlay'] = 'Site-overlay';
+
+// Overview stuff...
+$lang['Quick_stats'] = 'Quick statistics';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-15 07:52:03
|
Revision: 1972
http://svn.sourceforge.net/rcts/?rev=1972&view=rev
Author: bastimmer
Date: 2006-09-15 00:51:51 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
And the beginning of Attributes, with some UI stuff (the comeback of webbrowsers in Today's visitors... :P )
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.calendar.php
trunk/version1.0/includes/classes/class.stats.php
trunk/version1.0/includes/classes/class.viewer.php
trunk/version1.0/templates/rcts/stats.html
Modified: trunk/version1.0/includes/classes/class.calendar.php
===================================================================
--- trunk/version1.0/includes/classes/class.calendar.php 2006-09-15 07:41:51 UTC (rev 1971)
+++ trunk/version1.0/includes/classes/class.calendar.php 2006-09-15 07:51:51 UTC (rev 1972)
@@ -18,19 +18,16 @@
*/
class calendar
{
+ var $visitor_att = array();
/**
* function to insert stats
* @param array $data Array with data
* @param integer $idid Multi site ID
* @return integer Is this a new visitor?
*/
- function insert_stats($data, $idid)
+ function insert_stats($stat_type, $stat_value, $idid)
{
global $db;
- if(!is_array($data))
- {
- die('Old style used');
- }
$idid_array = array();
if(!is_array($idid))
{
@@ -51,76 +48,80 @@
VALUES ";
$insert2 = "";
$d_i = false;
- foreach ($data as $stat_type => $stat_value)
+ $idids = array();
+ foreach($idid_array as $idid)
{
- $idids = array();
- foreach($idid_array as $idid)
+ if(in_array($idid,$idids))
{
- if(in_array($idid,$idids))
+ continue;
+ }
+ else
+ {
+ $newUser = 0;
+ $idids[] = $idid;
+ //first get the stat_time_array
+ $startTime=$this->get_day_start_time();
+ //If rendertime, we don't get it, it (nearly ;)) impossible to got the same time.
+ if($stat_type == 'rendertime')
{
- continue;
+
}
else
{
- $newUser = 0;
- $idids[] = $idid;
- //first get the stat_time_array
- $startTime=$this->get_day_start_time();
- //If rendertime, we don't get it, it (nearly ;)) impossible to got the same time.
- if($stat_type == 'rendertime')
- {
-
+ $sql = "SELECT stat_time_array,stat_id,stat_count FROM ".RCTS_CALENDAR_TABLE."
+ WHERE stat_type='".trim($stat_type)."'
+ AND stat_value='".trim($stat_value)."'
+ AND idid = '".trim($idid)."' LIMIT 1";
+ $res = $db->sql_query($sql);
+ }
+ if($db->sql_numrows($res) && $stat_type != 'rendertime')
+ {
+ $row = $db->sql_fetchrow($res);
+ $stat_time_array = $row['stat_time_array'];
+ $stat_time_array = unserialize($stat_time_array);
+ $db->sql_freeresult($res);
+
+ if (!isset($stat_time_array[$startTime])) {
+ $newUser = 1;
}
- else
- {
- $sql = "SELECT stat_time_array,stat_id,stat_count FROM ".RCTS_CALENDAR_TABLE."
- WHERE stat_type='".trim($stat_type)."'
- AND stat_value='".trim($stat_value)."'
- AND idid = '".trim($idid)."' LIMIT 1";
- $res = $db->sql_query($sql);
- }
- if($db->sql_numrows($res) && $stat_type != 'rendertime')
- {
- $row = $db->sql_fetchrow($res);
- $stat_time_array = $row['stat_time_array'];
- $stat_time_array = unserialize($stat_time_array);
- $db->sql_freeresult($res);
-
- if (!isset($stat_time_array[$startTime])) {
- $newUser = 1;
- }
-
- $stat_time_array[$startTime]++;
-
- $stat_time_array = serialize($stat_time_array);
-
- $sql = "UPDATE ".RCTS_CALENDAR_TABLE."
- SET stat_time_array = '".$stat_time_array."',
- stat_count = stat_count + 1
- WHERE stat_id = ".$row['stat_id'];
- $db->sql_query($sql);
- }
- else
- {
- $stat_time_array = array();
- $stat_time_array[$startTime] = 1;
- $stat_time_array = serialize($stat_time_array);
- if($insert2 != ""){
- $insert2 .= ", ";
- }
- $insert2 .= "('".$stat_type."', '".$stat_value."', ".time().", 1, '".$idid."','".$stat_time_array."')";
- $d_i = true;
- $newUser = 1;
+ $stat_time_array[$startTime]++;
+
+ $stat_time_array = serialize($stat_time_array);
+
+ $sql = "UPDATE ".RCTS_CALENDAR_TABLE."
+ SET stat_time_array = '".$stat_time_array."',
+ stat_count = stat_count + 1
+ WHERE stat_id = ".$row['stat_id'];
+ $db->sql_query($sql);
+ }
+ else
+ {
+ $stat_time_array = array();
+ $stat_time_array[$startTime] = 1;
+ $stat_time_array = serialize($stat_time_array);
+ if($insert2 != ""){
+ $insert2 .= ", ";
}
+ $insert2 .= "('".$stat_type."', '".$stat_value."', ".time().", 1, '".$idid."','".$stat_time_array."')";
+ $d_i = true;
+
+ $newUser = 1;
}
- unset($stat_time_array,$sql,$row);
}
+ unset($stat_time_array,$sql,$row);
}
if($d_i){
$insert = $insert . $insert2;
$db->sql_query($insert);
}
+ if (/*$newUser && */!isset($this->visitor_att['visitors']))
+ {
+ $this->visitor_att = array('visitors' => $stat_value);
+ }
+ if (!isset($this->visitor_att[$stat_type]) && $stat_type != 'attributes') {
+ $this->visitor_att[$stat_type] = $stat_value;
+ }
return $newUser;
}
@@ -143,7 +144,7 @@
* ?>
* </code>*
*/
- function get_stats($stat_type, $idid, $timestamp = 0, $limit = 10, $cached = false, $cache_time = 3600, $order_by = false,$add_array = false,$fields = false)
+ function get_stats($stat_type, $idid, $timestamp = 0, $limit = 10, $cached = false, $cache_time = 3600, $order_by = false,$add_array = false,$fields = false,$custom_where = '')
{
global $db, $cache;
@@ -204,7 +205,11 @@
$i++;
}
}
- $sql .= ") ORDER BY ".$order_by[0]." ".$order_by[1]."
+ $sql .= ") ";
+ if (!empty($custom_where)) {
+ $sql .= 'AND '.$custom_where;
+ }
+ $sql .= " ORDER BY ".$order_by[0]." ".$order_by[1]."
".$sql_limit;
}
else
@@ -600,5 +605,16 @@
$template -> assign($assign);
}
+
+ function save_attributes($idid)
+ {
+ if (!isset($this->visitor_att['visitors']))
+ {
+ return;
+ }
+ $serial = serialize($this->visitor_att);
+ $serial = $this->visitor_att['visitors'].'|-|-|'.$serial;
+ $this->insert_stats('attributes', $serial, $idid);
+ }
}
?>
Modified: trunk/version1.0/includes/classes/class.stats.php
===================================================================
--- trunk/version1.0/includes/classes/class.stats.php 2006-09-15 07:41:51 UTC (rev 1971)
+++ trunk/version1.0/includes/classes/class.stats.php 2006-09-15 07:51:51 UTC (rev 1972)
@@ -551,6 +551,9 @@
$total_visit = 0;
foreach ($visitsToday as $visit)
{
+ $stuff = $calendar->get_stats('attributes', $idid, (ctype_digit($calendar_day) ? $calendar_day : time()), 1, true, 7200, false, false, false, "stat_value LIKE '%".$visit['stat_value']."%'");
+ $stuff = explode('|-|-|', $stuff[0]['stat_value']);
+ $stuff = unserialize($stuff[1]);
//IP alleen voor ingelogde mensen.
if(!$core->UserLoggedIn())
{
@@ -562,8 +565,10 @@
'ip' => $visit['stat_value'],
// Bot disabled
//'bgcolor' => ($visit['isrobot']) ? $template->themeColor['isRobot'] : $template->themeColor['isnotRobot']
- 'bgcolor' => $template->themeColor['isnotRobot']
+ 'bgcolor' => $template->themeColor['isnotRobot'],
// End bot disabled
+ 'browser' => $stuff['browsers'],
+ 'os' => $stuff['os']
));
}
$template->assign(array(
Modified: trunk/version1.0/includes/classes/class.viewer.php
===================================================================
--- trunk/version1.0/includes/classes/class.viewer.php 2006-09-15 07:41:51 UTC (rev 1971)
+++ trunk/version1.0/includes/classes/class.viewer.php 2006-09-15 07:51:51 UTC (rev 1972)
@@ -86,6 +86,7 @@
$idid = array('1',$ididthis);
$idid2 = $ididthis;
}
+ $newUser = $calendar -> insert_stats('visitors', $ip, $idid);
//
// Load plugins
//
@@ -100,7 +101,7 @@
$plugin = $pluginsClass->loadPlugin($row['plugin_name']);
$plugin->eventStatsGather($plug_ary);
}
- $hour = date("H");
+/* $hour = date("H");
$data = array(
'visitors' => $ip,
// Add to browsers
@@ -130,7 +131,61 @@
//not unique key's.
for($i = 0; $i < count($talen);$i++){
$calendar -> insert_stats(array('languages' => $talen[$i][2]), $idid);
+ }*/
+ /*
+ // Add to browsers
+ */
+ $calendar -> insert_stats('browsers', $browser, $idid);
+
+ /*
+ // Add to entry pages
+ */
+ $calendar -> insert_stats('entry_pages', $entryPage, $idid);
+
+ /*
+ // Add to OS Table
+ */
+ $calendar -> insert_stats('os', $os, $idid);
+
+ /*
+ // Add to colors table
+ */
+ $calendar -> insert_stats('color_depths', $color, $idid);
+
+ /*
+ // Add to resolution table
+ */
+ $calendar -> insert_stats('resolutions', $resolution, $idid);
+
+ /*
+ // Add to offset table
+ */
+ $calendar -> insert_stats('gmt_offset', $gmtOff, $idid);
+
+ /*
+ // Add to referers table
+ */
+ $calendar -> insert_stats('referers', $referer, $idid);
+
+ /*
+ // Add to language table
+ */
+ for($i = 0; $i < count($talen);$i++){
+ $calendar -> insert_stats('languages', $talen[$i][2], $idid);
}
+
+ /*
+ // Add to flash table
+ */
+ $calendar -> insert_stats('flash_plugins', $flash, $idid);
+
+ /*
+ // Add to hour table
+ */
+ $hour = date("H");
+ $calendar -> insert_stats('hour', $hour, $idid);
+ // Add attributes
+ $calendar -> save_attributes($idid);
// Check milestones
$this -> check_milestones();
Modified: trunk/version1.0/templates/rcts/stats.html
===================================================================
--- trunk/version1.0/templates/rcts/stats.html 2006-09-15 07:41:51 UTC (rev 1971)
+++ trunk/version1.0/templates/rcts/stats.html 2006-09-15 07:51:51 UTC (rev 1972)
@@ -17,13 +17,15 @@
<tr>
<td width="10%"><strong>{L_COUNT}</strong></td>
<td width="15%"><strong>{L_IP}</strong></td>
-
+ <td width="15%"><strong>{L_BROWSER}</strong></td>
+ <td width="15%"><strong>{L_OS}</strong></td>
</tr>
<!-- START visitrow -->
<tr style="background-color: {visitrow.bgcolor};">
<td>{visitrow.visit}</td>
<td>{visitrow.ip}</td>
-
+ <td>{visitrow.browser}</td>
+ <td>{visitrow.os}</td>
</tr>
<!-- STOP visitrow -->
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bas...@us...> - 2006-09-15 10:41:27
|
Revision: 1975
http://svn.sourceforge.net/rcts/?rev=1975&view=rev
Author: bastimmer
Date: 2006-09-15 03:41:12 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Page tracking per visitor.
Modified Paths:
--------------
trunk/version1.0/includes/classes/class.calendar.php
trunk/version1.0/includes/classes/class.stats.php
trunk/version1.0/includes/constants.php
trunk/version1.0/stats.php
trunk/version1.0/templates/rcts/stats.html
Added Paths:
-----------
trunk/version1.0/templates/rcts/statstrack.html
Modified: trunk/version1.0/includes/classes/class.calendar.php
===================================================================
--- trunk/version1.0/includes/classes/class.calendar.php 2006-09-15 10:40:10 UTC (rev 1974)
+++ trunk/version1.0/includes/classes/class.calendar.php 2006-09-15 10:41:12 UTC (rev 1975)
@@ -19,6 +19,7 @@
class calendar
{
var $visitor_att = array();
+ var $visitor_pages = array();
/**
* function to insert stats
* @param array $data Array with data
@@ -115,6 +116,12 @@
$insert = $insert . $insert2;
$db->sql_query($insert);
}
+ if ($stat_type == 'visitors') {
+ $this->get_visitor_pages($idid, $newUser, $stat_value);
+ }
+ if ($stat_type == 'entry_pages') {
+ $this->add_visitor_page($idid, $stat_value);
+ }
if ($newUser && !isset($this->visitor_att['visitors']))
{
$this->visitor_att = array('visitors' => $stat_value);
@@ -616,5 +623,43 @@
$serial = $this->visitor_att['visitors'].'|-|-|'.$serial;
$this->insert_stats('attributes', $serial, $idid);
}
+
+ function get_visitor_pages($idid, $newUser, $ip) {
+ global $db;
+ $this->visitor_pages_ip = $ip;
+ if ($newUser) {
+
+ } else {
+ $datum = $this->get_day_start_time(time());
+/* $stuff = $calendar->get_stats('visitor_pages', $idid, (ctype_digit($calendar_day) ? $calendar_day : time()), 1, true, 7200, false, false, false, "stat_value LIKE '%".$ip.'--'.$datum."%'");
+ $stuff = explode('|-|-|', $stuff[0]['stat_value']);
+ $stuff = unserialize($stuff[1]);
+ if (is_array($stuff)) {
+ array_merge($this->visitor_pages, $stuff);
+ }*/
+ $sql = 'SELECT page_urls FROM '.RCTS_VISPAGES_TABLE." WHERE page_ip='".addslashes($ip)."' AND page_date='".addslashes($datum)."' AND idid='".intval($idid)."'";
+ echo $sql.'get';
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $this->visitor_pages = unserialize($row['page_urls']);
+ }
+ }
+
+ function add_visitor_page($idid, $page) {
+ global $db;
+ $this->visitor_pages[] = $page;
+ $serial = serialize($this->visitor_pages);
+ $datum = $this->get_day_start_time(time());
+ $ip = $this->visitor_pages_ip;
+ $sql = 'UPDATE '.RCTS_VISPAGES_TABLE." SET page_urls='".addslashes($serial)."' WHERE page_ip='".addslashes($ip)."' AND page_date='".addslashes($datum)."' AND idid='".intval($idid)."'";
+ echo $sql.'upd'.$serial.$datum.$ip;
+ if(!$db->sql_query($sql) || !$db->sql_affectedrows())
+ {
+ $sql = 'INSERT INTO '.RCTS_VISPAGES_TABLE." SET page_urls='".addslashes($serial)."', page_ip='".addslashes($ip)."', page_date='".addslashes($datum)."', idid='".intval($idid)."'";
+ echo $sql.'add';
+ $db->sql_query($sql);
+ }
+ // $this->insert_stats('visitor_pages', $serial, $idid);
+ }
}
?>
Modified: trunk/version1.0/includes/classes/class.stats.php
===================================================================
--- trunk/version1.0/includes/classes/class.stats.php 2006-09-15 10:40:10 UTC (rev 1974)
+++ trunk/version1.0/includes/classes/class.stats.php 2006-09-15 10:41:12 UTC (rev 1975)
@@ -560,6 +560,12 @@
$visit['stat_value'] = $core->lang['verborgen'];
}
$total_visit += $visit['stat_count'];
+ if ($visit['stat_value'] != $core->lang['verborgen']) {
+ $s_track_start = '<a href="stats.php?mode=pagestrack&ip='.$visit['stat_value'].'">';
+ $s_track_end = '</a>';
+ } else {
+ $s_track_start = $s_track_end = '';
+ }
$template->block("visitrow", array(
'visit' => $visit['stat_count'],
'ip' => $visit['stat_value'],
@@ -568,7 +574,9 @@
'bgcolor' => $template->themeColor['isnotRobot'],
// End bot disabled
'browser' => $stuff['browsers'],
- 'os' => $stuff['os']
+ 'os' => $stuff['os'],
+ 'S_TRACK_START' => $s_track_start,
+ 'S_TRACK_END' => $s_track_ends
));
}
$template->assign(array(
Modified: trunk/version1.0/includes/constants.php
===================================================================
--- trunk/version1.0/includes/constants.php 2006-09-15 10:40:10 UTC (rev 1974)
+++ trunk/version1.0/includes/constants.php 2006-09-15 10:41:12 UTC (rev 1975)
@@ -35,6 +35,7 @@
define('RCTS_MILESTONES_TABLE', $mysql_prefix . "milestones");
define('RCTS_USERS_TABLE', $mysql_prefix . "users");
define('RCTS_SESSIONS_TABLE', $mysql_prefix . "sessions");
+define('RCTS_VISPAGES_TABLE', $mysql_prefix . "visitor_pages");
//
// Magic Quotes
//
Modified: trunk/version1.0/stats.php
===================================================================
--- trunk/version1.0/stats.php 2006-09-15 10:40:10 UTC (rev 1974)
+++ trunk/version1.0/stats.php 2006-09-15 10:41:12 UTC (rev 1975)
@@ -134,7 +134,7 @@
//Maybe its a plugin whith a template
-if(!is_numeric($mode) && !empty($mode))
+if(!is_numeric($mode) && !empty($mode) && $mode != 'pagestrack')
{
$loaded = false;
for($i = 0;$i < count($plugin_row);$i++)
@@ -173,6 +173,37 @@
pageFooter();
}
+else if ($mode == 'pagestrack')
+{
+ $template -> add_file(array(
+ 'statsheader' => 'statsheader.html',
+ 'statsfooter' => 'statsfooter.html',
+ 'body' => 'statstrack.html'
+ ));
+ $ip = addslashes($_GET['ip']);
+ $datum = ($calendar_day != 'all') ? $calendar_day : $calendar->get_day_start_time(time());
+ $sql = 'SELECT page_urls, page_ip FROM '.RCTS_VISPAGES_TABLE." WHERE page_ip='".$ip."' AND page_date='".$datum."'";
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result)) {
+ $stuff = unserialize($row['page_urls']);
+ foreach ($stuff as $url) {
+ $template->block('pagerow', array(
+ 'ip' => $row['page_ip'],
+ 'url' => $url
+ ));
+ }
+ }
+ $template->assign(array(
+ 'L_IP' => $core->lang['Ip_add'],
+ 'L_PAGE' => $core->lang['Page']
+ ));
+ pageHeader();
+ $template->parse('statsheader');
+ $template->parse('body');
+ $template->parse('statsfooter');
+
+ pageFooter();
+}
else
{
sort($posibleBlocks);
Modified: trunk/version1.0/templates/rcts/stats.html
===================================================================
--- trunk/version1.0/templates/rcts/stats.html 2006-09-15 10:40:10 UTC (rev 1974)
+++ trunk/version1.0/templates/rcts/stats.html 2006-09-15 10:41:12 UTC (rev 1975)
@@ -23,7 +23,7 @@
<!-- START visitrow -->
<tr style="background-color: {visitrow.bgcolor};">
<td>{visitrow.visit}</td>
- <td>{visitrow.ip}</td>
+ <td>{S_TRACK_START}{visitrow.ip}{S_TRACK_END}</td>
<td>{visitrow.browser}</td>
<td>{visitrow.os}</td>
</tr>
Added: trunk/version1.0/templates/rcts/statstrack.html
===================================================================
--- trunk/version1.0/templates/rcts/statstrack.html (rev 0)
+++ trunk/version1.0/templates/rcts/statstrack.html 2006-09-15 10:41:12 UTC (rev 1975)
@@ -0,0 +1,14 @@
+<div class="menu">
+ <h3>{L_PAGE}</h3>
+ <div class="menu_content">
+ <table class="stats_table" cellpadding="1" cellspacing="0">
+ <!-- START pagerow -->
+ <tr style="background-color: #efefef;">
+ <td>{pagerow.ip}</td>
+ <td>{pagerow.url}</td>
+ </tr>
+ <!-- STOP pagerow -->
+ </table>
+
+ </div>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X