tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 06:09:00 +02:00
Code Issues Projects Releases Wiki Activity

GSOC #113 - Coding Conventions

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43827 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-10-25 00:37:09 +00:00
parent 34590580e9
commit 220a321212
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/control/ContentController.php
View File

@ -72,7 +72,7 @@ class ContentController extends Controller {
parent::init();
//Log page views
Statistics::Collect();
Statistics::collect();
// If we've accessed the homepage as /home/, then we should redirect to /.
if($this->dataRecord && RootURLController::should_be_on_root($this->dataRecord) && !$this->urlParams['Action'] && !$_POST && !$_FILES) {

26
core/control/Statistics.php
View File

@ -7,14 +7,10 @@
class Statistics extends Controller {
function __construct()
{
function __construct() {
}
static function TrendChart($table, $filter = "day", $name, $type, $color)
{
static function trend_chart($table, $filter = "day", $name, $type, $color) {
$top = <<<HTML
<div id="trendchart" style="display: none">
<h2>Trends</h2>
@ -140,7 +136,7 @@ HTML;
return $top . $ds . "\n};\n\n" . $opts . "\n\n" . $bot;
}
static function UserRecordTable() {
static function user_record_table() {
$records = DataObject::get('Member');
$baseURL = Director::baseURL();
$top = <<<HTML
@ -170,13 +166,13 @@ HTML;
return $top . $bod . $bot;
}
static function Collect() {
static function collect() {
$hit = new PageView();
$hit->record();
return;
}
static function getRecentViews($limit = 15) {
static function get_recent_views($limit = 15) {
$records = DataObject::get('PageView', null, 'Created DESC', null, $limit);
$top = <<<HTML
<div id="recentviewtable">
@ -206,7 +202,7 @@ HTML;
return $top . $bod . $bot;
}
static function getViews($time = 'all') {
static function get_views($time = 'all') {
switch($time) {
case 'all':
$records = DataObject::get('PageView');
@ -286,7 +282,7 @@ HTML;
return $top . $bod . $bot;
}
static function BrowserChart($type = "Pie", $color = "blue") {
static function browser_chart($type = "Pie", $color = "blue") {
$top = <<<HTML
<div id="browserchart" style="display: none">
<h2>Browsers</h2>
@ -349,7 +345,7 @@ HTML;
return $top . $ds . "\n};\n\n" . $opts . "\n\n" . $bot;
}
static function OSChart($type = "Pie", $color = "blue") {
static function os_chart($type = "Pie", $color = "blue") {
$top = <<<HTML
<div id="oschart" style="display: none">
<h2>Operating Systems</h2>
@ -412,7 +408,7 @@ HTML;
return $top . $ds . "\n};\n\n" . $opts . "\n\n" . $bot;
}
static function ActivityChart($type = "Pie", $color = "blue") {
static function activity_chart($type = "Pie", $color = "blue") {
$top = <<<HTML
<div id="uacchart" style="display: none">
<h2>User Activity</h2>
@ -478,7 +474,7 @@ HTML;
return $top . $ds . "\n};\n\n" . $opts . "\n\n" . $bot;
}
static function getViewCSV($time = 'all') {
static function get_view_csv($time = 'all') {
$data = "ID, ClassName, Created, LastEdited, Browser, FromExternal, Referrer, SearchEngine, Keywords, OS, PageID, UserID, BrowserVersion, IP\n";
switch($time) {
@ -539,7 +535,7 @@ HTML;
return $data;
}
static function getUserCSV() {
static function get_user_csv() {
$data = "ID, ClassName, Created, LastEdited, FirstName, Surname, Email, Password, NumVisit, LastVisited, Bounced, AutoLoginHash, AutoLoginExpired, BlacklistedEmail, RememberLoginToken, IdentityURL, PasswordEncryption, Salt\n";
$records = DataObject::get('Member');