Skip to content
This repository has been archived by the owner on Apr 24, 2019. It is now read-only.

Commit

Permalink
Prefixed MySQL tables with shine_
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Hall committed Jun 21, 2010
1 parent 1dcdb4b commit 6c896c0
Show file tree
Hide file tree
Showing 18 changed files with 66 additions and 66 deletions.
8 changes: 4 additions & 4 deletions appcast-combined.php
View file
Expand Up @@ -13,14 +13,14 @@
// This table format is crap, but it future proofs us against Sparkle format changes
$ip = $_SERVER['REMOTE_ADDR'];
$dt = date("Y-m-d H:i:s");
$db->query("INSERT INTO sparkle_reports (ip, dt) VALUES (:ip, :dt)", array('ip' => $ip, 'dt' => $dt));
$db->query("INSERT INTO shine_sparkle_reports (ip, dt) VALUES (:ip, :dt)", array('ip' => $ip, 'dt' => $dt));
$id = $db->insertId();
foreach($_GET as $k => $v)
$db->query("INSERT INTO sparkle_data (sparkle_id, `key`, data) VALUES (:id, :k, :v)", array('id' => $id, 'k' => $k, 'v' => $v));
$db->query("INSERT INTO shine_sparkle_data (sparkle_id, `key`, data) VALUES (:id, :k, :v)", array('id' => $id, 'k' => $k, 'v' => $v));

$versions = DBObject::glob('Version', "SELECT * FROM versions WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 10");
$versions = DBObject::glob('Version', "SELECT * FROM shine_versions WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 10");

$db->query("UPDATE versions SET updates = updates + 1 WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 1");
$db->query("UPDATE shine_versions SET updates = updates + 1 WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 1");

$previous_version = "<h2>Previous Versions</h2>";
$combined_description = '';
Expand Down
8 changes: 4 additions & 4 deletions appcast.php
View file
Expand Up @@ -11,14 +11,14 @@
// This table format is crap, but it future proofs us against Sparkle format changes
$ip = $_SERVER['REMOTE_ADDR'];
$dt = date("Y-m-d H:i:s");
$db->query("INSERT INTO sparkle_reports (ip, dt) VALUES (:ip, :dt)", array('ip' => $ip, 'dt' => $dt));
$db->query("INSERT INTO shine_sparkle_reports (ip, dt) VALUES (:ip, :dt)", array('ip' => $ip, 'dt' => $dt));
$id = $db->insertId();
foreach($_GET as $k => $v)
$db->query("INSERT INTO sparkle_data (sparkle_id, `key`, data) VALUES (:id, :k, :v)", array('id' => $id, 'k' => $k, 'v' => $v));
$db->query("INSERT INTO shine_sparkle_data (sparkle_id, `key`, data) VALUES (:id, :k, :v)", array('id' => $id, 'k' => $k, 'v' => $v));

$versions = DBObject::glob('Version', "SELECT * FROM versions WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 10");
$versions = DBObject::glob('Version', "SELECT * FROM shine_versions WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 10");

$db->query("UPDATE versions SET updates = updates + 1 WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 1");
$db->query("UPDATE shine_versions SET updates = updates + 1 WHERE app_id = '{$app->id}' ORDER BY dt DESC LIMIT 1");

header("Content-type: application/xml");
?>
Expand Down
2 changes: 1 addition & 1 deletion download.php
View file
Expand Up @@ -16,7 +16,7 @@
$app_id = 1;
}

$v = DBObject::glob('Version', "SELECT * FROM versions WHERE app_id = $app_id ORDER BY dt DESC LIMIT 1");
$v = DBObject::glob('Version', "SELECT * FROM shine_versions WHERE app_id = $app_id ORDER BY dt DESC LIMIT 1");
$v = array_pop($v);
$v->downloads++;
$v->update();
Expand Down
4 changes: 2 additions & 2 deletions feedback.php
View file
Expand Up @@ -7,11 +7,11 @@
{
$db = Database::getDatabase();
$type = mysql_real_escape_string($_GET['type'], $db->db);
$feedback = DBObject::glob('Feedback', "SELECT * FROM feedback WHERE type = '$type' ORDER BY dt DESC");
$feedback = DBObject::glob('Feedback', "SELECT * FROM shine_feedback WHERE type = '$type' ORDER BY dt DESC");
}
else
{
$feedback = DBObject::glob('Feedback', "SELECT * FROM feedback ORDER BY dt DESC");
$feedback = DBObject::glob('Feedback', "SELECT * FROM shine_feedback ORDER BY dt DESC");
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
Expand Down
4 changes: 2 additions & 2 deletions inc/header.inc.php
View file
Expand Up @@ -3,8 +3,8 @@
include 'tweet-cron.php';

$db = Database::getDatabase();
$feedback_count = $db->getValue("SELECT COUNT(*) FROM feedback WHERE new = 1");
$tweet_count = $db->getValue("SELECT COUNT(*) FROM tweets WHERE new = 1");
$feedback_count = $db->getValue("SELECT COUNT(*) FROM shine_feedback WHERE new = 1");
$tweet_count = $db->getValue("SELECT COUNT(*) FROM shine_tweets WHERE new = 1");
?>
<h1>Shine</h1>
<div id="navigation">
Expand Down
12 changes: 6 additions & 6 deletions includes/class.auth.php
View file
Expand Up @@ -76,7 +76,7 @@ public function logout()
public function changeUsername($new_username)
{
$db = Database::getDatabase();
$db->query('UPDATE users SET username = :username WHERE id = :id', array('username' => $new_username, 'id' => $this->id));
$db->query('UPDATE shine_users SET username = :username WHERE id = :id', array('username' => $new_username, 'id' => $this->id));
if($db->affectedRows() == 1)
{
$this->impersonate($this->id);
Expand All @@ -94,7 +94,7 @@ public function changePassword($new_password)
if($Config->useHashedPasswords === true)
$new_password = $this->createHashedPassword($new_password);

$db->query('UPDATE users SET password = :password WHERE id = :id', array('password' => $new_password, 'id' => $this->id));
$db->query('UPDATE shine_users SET password = :password WHERE id = :id', array('password' => $new_password, 'id' => $this->id));
if($db->affectedRows() == 1)
{
$this->impersonate($this->id);
Expand Down Expand Up @@ -135,7 +135,7 @@ public function passwordIsCorrect($pw)
if($Config->useHashedPasswords === true)
$pw = $this->createHashedPassword($pw);

$db->query('SELECT COUNT(*) FROM users WHERE username = :username AND password = BINARY :password', array('username' => $this->username, 'password' => $pw));
$db->query('SELECT COUNT(*) FROM shine_users WHERE username = :username AND password = BINARY :password', array('username' => $this->username, 'password' => $pw));
return $db->getValue() == 1;
}

Expand All @@ -149,9 +149,9 @@ public function impersonate($user_to_impersonate)
$Config = Config::getConfig();

if(ctype_digit($user_to_impersonate))
$row = $db->getRow('SELECT * FROM users WHERE id = ' . $db->quote($user_to_impersonate));
$row = $db->getRow('SELECT * FROM shine_users WHERE id = ' . $db->quote($user_to_impersonate));
else
$row = $db->getRow('SELECT * FROM users WHERE username = ' . $db->quote($user_to_impersonate));
$row = $db->getRow('SELECT * FROM shine_users WHERE username = ' . $db->quote($user_to_impersonate));

if(is_array($row))
{
Expand Down Expand Up @@ -213,7 +213,7 @@ private function attemptLogin($un, $pw)
$Config = Config::getConfig();

// We SELECT * so we can load the full user record into the user DBObject later
$row = $db->getRow('SELECT * FROM users WHERE username = ' . $db->quote($un));
$row = $db->getRow('SELECT * FROM shine_users WHERE username = ' . $db->quote($un));
if($row === false) return false;

if($Config->useHashedPasswords === false)
Expand Down
10 changes: 5 additions & 5 deletions includes/class.dbsession.php
View file
Expand Up @@ -21,29 +21,29 @@ public static function close()
public static function read($id)
{
$db = Database::getDatabase(true);
$db->query('SELECT `data` FROM `sessions` WHERE `id` = :id', array('id' => $id));
$db->query('SELECT `data` FROM `shine_sessions` WHERE `id` = :id', array('id' => $id));
return $db->hasRows() ? $db->getValue() : '';
}

public static function write($id, $data)
{
$db = Database::getDatabase(true);
$db->query('DELETE FROM `sessions` WHERE `id` = :id', array('id' => $id));
$db->query('INSERT INTO `sessions` (`id`, `data`, `updated_on`) VALUES (:id, :data, :updated_on)', array('id' => $id, 'data' => $data, 'updated_on' => time()));
$db->query('DELETE FROM `shine_sessions` WHERE `id` = :id', array('id' => $id));
$db->query('INSERT INTO `shine_sessions` (`id`, `data`, `updated_on`) VALUES (:id, :data, :updated_on)', array('id' => $id, 'data' => $data, 'updated_on' => time()));
return ($db->affectedRows() == 1);
}

public static function destroy($id)
{
$db = Database::getDatabase(true);
$db->query('DELETE FROM `sessions` WHERE `id` = :id', array('id' => $id));
$db->query('DELETE FROM `shine_sessions` WHERE `id` = :id', array('id' => $id));
return ($db->affectedRows() == 1);
}

public static function gc($max)
{
$db = Database::getDatabase(true);
$db->query('DELETE FROM `sessions` WHERE `updated_on` < :updated_on', array('updated_on' => time() - $max));
$db->query('DELETE FROM `shine_sessions` WHERE `updated_on` < :updated_on', array('updated_on' => time() - $max));
return true;
}
}
2 changes: 1 addition & 1 deletion includes/class.download.php
View file
Expand Up @@ -32,7 +32,7 @@ public static function track($page_title = '')
$exec_time = defined('START_TIME') ? microtime(true) - START_TIME : 0;
$num_queries = $db->numQueries();

$sql = "INSERT INTO downloads (dt, referer, referer_is_local, url, page_title, search_terms, img_search, browser_family, browser_version, os, os_version, ip, user_agent, exec_time, num_queries)
$sql = "INSERT INTO shine_downloads (dt, referer, referer_is_local, url, page_title, search_terms, img_search, browser_family, browser_version, os, os_version, ip, user_agent, exec_time, num_queries)
VALUES (:dt, :referer, :referer_is_local, :url, :page_title, :search_terms, :img_search, :browser_family, :browser_version, :os, :os_version, :ip, :user_agent, :exec_time, :num_queries)";
$vals = array('dt' => $dt,
'referer_is_local' => $referer_is_local,
Expand Down
36 changes: 18 additions & 18 deletions includes/class.objects.php
View file
Expand Up @@ -5,7 +5,7 @@ class User extends DBObject
{
public function __construct($id = null)
{
parent::__construct('users', array('username', 'password', 'level', 'email'), $id);
parent::__construct('shine_users', array('username', 'password', 'level', 'email'), $id);
}

/**
Expand All @@ -28,55 +28,55 @@ class Application extends DBObject
{
public function __construct($id = null)
{
parent::__construct('applications', array('name', 'link', 'bundle_name', 's3key', 's3pkey', 's3bucket', 's3path', 'sparkle_key', 'sparkle_pkey', 'ap_key', 'ap_pkey', 'from_email', 'email_subject', 'email_body', 'license_filename', 'custom_salt', 'license_type', 'return_url', 'fs_security_key', 'i_use_this_key', 'tweet_terms'), $id);
parent::__construct('shine_applications', array('name', 'link', 'bundle_name', 's3key', 's3pkey', 's3bucket', 's3path', 'sparkle_key', 'sparkle_pkey', 'ap_key', 'ap_pkey', 'from_email', 'email_subject', 'email_body', 'license_filename', 'custom_salt', 'license_type', 'return_url', 'fs_security_key', 'i_use_this_key', 'tweet_terms'), $id);
}

public function versions()
{
return DBObject::glob('Version', "SELECT * FROM versions WHERE app_id = '{$this->id}' ORDER BY dt DESC");
return DBObject::glob('Version', "SELECT * FROM shine_versions WHERE app_id = '{$this->id}' ORDER BY dt DESC");
}

public function strCurrentVersion()
{
$db = Database::getDatabase();
return $db->getValue("SELECT version_number FROM versions WHERE app_id = '{$this->id}' ORDER BY dt DESC LIMIT 1");
return $db->getValue("SELECT version_number FROM shine_versions WHERE app_id = '{$this->id}' ORDER BY dt DESC LIMIT 1");
}

public function strLastReleaseDate()
{
$db = Database::getDatabase();
$dt = $db->getValue("SELECT dt FROM versions WHERE app_id = '{$this->id}' ORDER BY dt DESC LIMIT 1");
$dt = $db->getValue("SELECT dt FROM shine_versions WHERE app_id = '{$this->id}' ORDER BY dt DESC LIMIT 1");
return time2str($dt);
}

public function totalDownloads()
{
$db = Database::getDatabase();
return $db->getValue("SELECT SUM(downloads) FROM versions WHERE app_id = '{$this->id}'");
return $db->getValue("SELECT SUM(downloads) FROM shine_versions WHERE app_id = '{$this->id}'");
}

public function totalUpdates()
{
$db = Database::getDatabase();
return $db->getValue("SELECT SUM(updates) FROM versions WHERE app_id = '{$this->id}'");
return $db->getValue("SELECT SUM(updates) FROM shine_versions WHERE app_id = '{$this->id}'");
}

public function numSupportQuestions()
{
$db = Database::getDatabase();
return $db->getValue("SELECT COUNT(*) FROM feedback WHERE appname = '{$this->name}' AND `type` = 'support' AND new = 1");
return $db->getValue("SELECT COUNT(*) FROM shine_feedback WHERE appname = '{$this->name}' AND `type` = 'support' AND new = 1");
}

public function numBugReports()
{
$db = Database::getDatabase();
return $db->getValue("SELECT COUNT(*) FROM feedback WHERE appname = '{$this->name}' AND `type` = 'bug' AND new = 1");
return $db->getValue("SELECT COUNT(*) FROM shine_feedback WHERE appname = '{$this->name}' AND `type` = 'bug' AND new = 1");
}

public function numFeatureRequests()
{
$db = Database::getDatabase();
return $db->getValue("SELECT COUNT(*) FROM feedback WHERE appname = '{$this->name}' AND `type` = 'feature' AND new = 1");
return $db->getValue("SELECT COUNT(*) FROM shine_feedback WHERE appname = '{$this->name}' AND `type` = 'feature' AND new = 1");
}

function getBody($order)
Expand All @@ -88,14 +88,14 @@ function ordersPerMonth()
{
$db = Database::getDatabase();

$orders = $db->getRows("SELECT DATE_FORMAT(dt, '%Y-%m') as dtstr, COUNT(*) FROM orders WHERE type = 'PayPal' AND app_id = '{$this->id}' GROUP BY CONCAT(YEAR(dt), '-', MONTH(dt)) ORDER BY YEAR(dt) ASC, MONTH(dt) ASC");
$orders = $db->getRows("SELECT DATE_FORMAT(dt, '%Y-%m') as dtstr, COUNT(*) FROM shine_orders WHERE type = 'PayPal' AND app_id = '{$this->id}' GROUP BY CONCAT(YEAR(dt), '-', MONTH(dt)) ORDER BY YEAR(dt) ASC, MONTH(dt) ASC");
$keys = gimme($orders, 'dtstr');
$values = gimme($orders, 'COUNT(*)');
$orders = array();
for($i = 0; $i < count($keys); $i++)
$orders[$keys[$i]] = $values[$i];

$first_order_date = $db->getValue("SELECT dt FROM orders ORDER BY dt ASC LIMIT 1");
$first_order_date = $db->getValue("SELECT dt FROM shine_orders ORDER BY dt ASC LIMIT 1");
list($year, $month) = explode('-', dater($first_order_date, 'Y-n'));

do
Expand Down Expand Up @@ -130,7 +130,7 @@ class Order extends DBObject
{
public function __construct($id = null)
{
parent::__construct('orders', array('app_id', 'dt', 'txn_type', 'first_name', 'last_name', 'residence_country', 'item_name', 'payment_gross', 'mc_currency', 'business', 'payment_type', 'verify_sign', 'payer_status', 'tax', 'payer_email', 'txn_id', 'quantity', 'receiver_email', 'payer_id', 'receiver_id', 'item_number', 'payment_status', 'payment_fee', 'mc_fee', 'shipping', 'mc_gross', 'custom', 'license', 'type', 'deleted', 'hash', 'claimed'), $id);
parent::__construct('shine_orders', array('app_id', 'dt', 'txn_type', 'first_name', 'last_name', 'residence_country', 'item_name', 'payment_gross', 'mc_currency', 'business', 'payment_type', 'verify_sign', 'payer_status', 'tax', 'payer_email', 'txn_id', 'quantity', 'receiver_email', 'payer_id', 'receiver_id', 'item_number', 'payment_status', 'payment_fee', 'mc_fee', 'shipping', 'mc_gross', 'custom', 'license', 'type', 'deleted', 'hash', 'claimed'), $id);
}

public function applicationName()
Expand Down Expand Up @@ -315,32 +315,32 @@ public static function totalOrders($id = null)
{
$db = Database::getDatabase();
if(is_null($id))
return $db->getValue("SELECT COUNT(*) FROM orders WHERE type = 'paypal'");
return $db->getValue("SELECT COUNT(*) FROM shine_orders WHERE type = 'paypal'");
else
return $db->getValue("SELECT COUNT(*) FROM orders WHERE type = 'paypal' AND app_id = " . intval($id));
return $db->getValue("SELECT COUNT(*) FROM shine_orders WHERE type = 'paypal' AND app_id = " . intval($id));
}
}

class Version extends DBObject
{
public function __construct($id = null)
{
parent::__construct('versions', array('app_id', 'human_version', 'version_number', 'dt', 'release_notes', 'filesize', 'url', 'downloads', 'updates', 'signature'), $id);
parent::__construct('shine_versions', array('app_id', 'human_version', 'version_number', 'dt', 'release_notes', 'filesize', 'url', 'downloads', 'updates', 'signature'), $id);
}
}

class Feedback extends DBObject
{
function __construct($id = null)
{
parent::__construct('feedback', array('appname', 'appversion', 'systemversion', 'email', 'reply', 'type', 'message', 'importance', 'critical', 'dt', 'ip', 'new', 'starred', 'reguser', 'regmail'), $id);
parent::__construct('shine_feedback', array('appname', 'appversion', 'systemversion', 'email', 'reply', 'type', 'message', 'importance', 'critical', 'dt', 'ip', 'new', 'starred', 'reguser', 'regmail'), $id);
}
}

class Tweet extends DBObject
{
function __construct($id = null)
{
parent::__construct('tweets', array('tweet_id', 'app_id', 'username', 'dt', 'body', 'profile_img', 'new', 'replied_to', 'reply_date', 'deleted'), $id);
parent::__construct('shine_tweets', array('tweet_id', 'app_id', 'username', 'dt', 'body', 'profile_img', 'new', 'replied_to', 'reply_date', 'deleted'), $id);
}
}
4 changes: 2 additions & 2 deletions includes/functions.inc.php
View file
Expand Up @@ -2,13 +2,13 @@
function set_option($key, $val)
{
$db = Database::getDatabase();
$db->query('REPLACE INTO options (`key`, `value`) VALUES (:key, :value)', array('key' => $key, 'value' => $val));
$db->query('REPLACE INTO shine_options (`key`, `value`) VALUES (:key, :value)', array('key' => $key, 'value' => $val));
}

function get_option($key, $default = null)
{
$db = Database::getDatabase();
$db->query('SELECT `value` FROM options WHERE `key` = :key', array('key' => $key));
$db->query('SELECT `value` FROM shine_options WHERE `key` = :key', array('key' => $key));
if($db->hasRows())
return $db->getValue();
else
Expand Down
8 changes: 4 additions & 4 deletions index.php
View file
Expand Up @@ -14,14 +14,14 @@
}

// Get a list of our apps
$apps = DBObject::glob('Application', 'SELECT * FROM applications ORDER BY name');
$apps = DBObject::glob('Application', 'SELECT * FROM shine_applications ORDER BY name');

// Get our recent orders
$orders = DBObject::glob('Order', 'SELECT * FROM orders ORDER BY dt DESC LIMIT 10');
$orders = DBObject::glob('Order', 'SELECT * FROM shine_orders ORDER BY dt DESC LIMIT 10');

// Downloads in last 24 hours
$sel = "TIME_FORMAT(dt, '%Y%m%d%H')";
$order_totals = $db->getRows("SELECT $sel as dtstr, COUNT(*) FROM downloads WHERE DATE_ADD(dt, INTERVAL 24 HOUR) > NOW() GROUP BY dtstr ORDER BY $sel ASC");
$order_totals = $db->getRows("SELECT $sel as dtstr, COUNT(*) FROM shine_downloads WHERE DATE_ADD(dt, INTERVAL 24 HOUR) > NOW() GROUP BY dtstr ORDER BY $sel ASC");
$opw24 = new googleChart(implode(',', gimme($order_totals, 'COUNT(*)')), 'bary');
$opw24->showGrid = 1;
$opw24->dimensions = '280x100';
Expand All @@ -31,7 +31,7 @@

// Downloads in last 30 days
$sel = "TO_DAYS(dt)";
$order_totals = $db->getRows("SELECT $sel as dtstr, COUNT(*) FROM downloads WHERE DATE_ADD(dt, INTERVAL 30 DAY) > NOW() GROUP BY $sel ORDER BY $sel ASC");
$order_totals = $db->getRows("SELECT $sel as dtstr, COUNT(*) FROM shine_downloads WHERE DATE_ADD(dt, INTERVAL 30 DAY) > NOW() GROUP BY $sel ORDER BY $sel ASC");
$opw30 = new googleChart(implode(',', gimme($order_totals, 'COUNT(*)')), 'bary');
$opw30->showGrid = 1;
$opw30->dimensions = '280x100';
Expand Down
2 changes: 1 addition & 1 deletion of.php
View file
Expand Up @@ -10,7 +10,7 @@

$dt = date('Y-m-d H:i:s');

$query = "INSERT INTO feedback (appname, appversion, systemversion, email, reply, `type`, message, importance, critical, dt, ip, `new`, reguser, regmail) VALUES
$query = "INSERT INTO shine_feedback (appname, appversion, systemversion, email, reply, `type`, message, importance, critical, dt, ip, `new`, reguser, regmail) VALUES
('{$_POST['appname']}',
'{$_POST['appversion']}',
'{$_POST['systemversion']}',
Expand Down

0 comments on commit 6c896c0

Please sign in to comment.