mt-admin Commit - 03778752b7d9

Finish (I think) refactoring to use DBAL.

darkmorford -

03778752b7d9

Not Reviewed

Context file:

Add another comment

Collapse all files

0 unresolved 0 Resolved

0 General 0 Inline

delete-comic.php ¶ +1 -1

             if(!deletestrip( $_REQUEST['strip_id'] ))
             {
-            	adminlog("Error deleting strip $_REQUEST[strip_id]:".mysqli_error(), MTS_STRIP, MTA_DELETE, E_ERROR);
+            	adminlog("Error deleting strip $_REQUEST[strip_id]:".$dbConnection->errorCode(), MTS_STRIP, MTA_DELETE, E_ERROR);
             	mtdie('Error deleting the specified strip.','SQL Error');
             }

delete-page.php ¶ +1 -1

             if(!deletepage( $_REQUEST['page_name'] ))
             {
-            	adminlog("Error deleting page $_REQUEST[page_name]: ".mysqli_error(), MTS_PAGE, MTA_DELETE, E_ERROR);
+            	adminlog("Error deleting page $_REQUEST[page_name]: ".$dbConnection->errorCode(), MTS_PAGE, MTA_DELETE, E_ERROR);
             	mtdie('Error deleting the specified page.','SQL Error');
             }

delete-rant.php ¶ +1 -1

             if(!deleterant( $_REQUEST['rant_id'] ))
             {
-            	adminlog("Error deleting rant $_REQUEST[rant_id]: ".mysqli_error(), MTS_RANT, MTA_DELETE, E_ERROR);
+            	adminlog("Error deleting rant $_REQUEST[rant_id]: ".$dbConnection->errorCode(), MTS_RANT, MTA_DELETE, E_ERROR);
             	mtdie('Error deleting the specified rant.','SQL Error');
             }

edit-comic.php ¶ +3 -3

             			// Insert new strip into the database, get a real $strip->id
             			if(!insertstrip( $strip ))
             			{
-            				adminlog("Error on insertion of new strip: ".mysqli_error(), MTS_STRIP, MTA_ADD, E_ERROR);
+            				adminlog("Error on insertion of new strip: ".$dbConnection->errorCode(), MTS_STRIP, MTA_ADD, E_ERROR);
-            				mtdie('Error on insertion of new strip: '.mysqli_error(), 'SQL Error');
+            				mtdie('Error on insertion of new strip: '.$dbConnection->errorCode(), 'SQL Error');
             			}
             			// Store the uploaded file to xxxx-0.ext
             			if(!updatestrip( $strip ) )
             			{
             				adminlog("Failed to update strip ".$strip->id.".", MTS_STRIP, MTA_UPDATE);
-            				mtdie('Error updating strip: ' . mysqli_error(), 'SQL Error');
+            				mtdie('Error updating strip: ' . $dbConnection->errorCode(), 'SQL Error');
             			}
             			if( is_valid_upload('comicFile') ) {	// If uploading, store the uploaded file to xxxx-n.ext

edit-rant.php ¶ +1 -1

             			$rant->id = insertrant($rant);
             			if( $rant->id === false )
             			{
-            				adminlog("Error on rant insertion: ".mysqli_error(), MTS_RANT, MTA_INSERT, E_ERROR);
+            				adminlog("Error on rant insertion: ".$dbConnection->errorCode(), MTS_RANT, MTA_INSERT, E_ERROR);
             				mtdie('There was an error inserting the rant into the database.', 'SQL Error');
             			}

fredart_parse.php ¶ +1 -5

             	for ($count = 0; $count < 5; $count++) {
             		$entry = $feed->getEntryByOffset($count);
-            		$link = mysqli_real_escape_string($mtdb->link, $entry->link);
-            		$title = mysqli_real_escape_string($mtdb->link, $entry->title);
-            		$date = $entry->pubdate;
-            		$mtdb->query("INSERT INTO fredart (pubdate, title, link)
+            		$dbConnection->executeUpdate('INSERT INTO fredart (pubdate, title, link) VALUES (FROM_UNIXTIME(?), ?, ?)', array($entry->pubdate, $entry->title, $entry->link));
-            			VALUES (FROM_UNIXTIME($date), '$title', '$link')", false);
             	}
             	header('Content-Type: text/xml');

include/admin.inc.php ¶ 0 -4

             // Core lib
             require_once('html.php');
-            require_once('mysql.php');
             require_once('cookies.php');
             require_once('functions.php');
             require_once('error.php');
             $dbConnection = \Doctrine\DBAL\DriverManager::getConnection($dbParams, $dbConfig);
             $dbConnection->setFetchMode(PDO::FETCH_OBJ);
-            $mtdb = new MysqlStore();
-            $mtdb->connect( DB_SERVER, DB_WRITE_USER, DB_WRITE_PASS, DB_NAME );
             /* TODO: Move these definitions to LocalSettings.php */
             if ( !defined('RANTIMG') )
             	define('RANTIMG', '../rantimgs/');

include/twitter.php ¶ +1 -1

             function setOAuthTokens($userid,$oauth_token,$oauth_token_secret, $username) {
-            	global $mtdb;
+            	global $dbConnection;
             	$id = (int)$userid;
             	if ($dbConnection->executeUpdate('UPDATE twitter_user SET oauth_token = ?, oauth_token_secret = ?, username = ? WHERE id = ?', array($oauth_token, $oauth_token_secret, $username, $id)))
             		return true;

index.php ¶ +5 -5

             <?php nonce_field('new-scratchpad'); ?>
             	<ul class="historic">
             	<?php
-            		$strips = array_reverse( $mtdb->getAll('SELECT UNIX_TIMESTAMP(s.published) AS pubdate, c.name, s.message FROM scratchpad s JOIN contributor c ON s.contributor = c.id ORDER BY published DESC LIMIT 5') );
+            		$strips = array_reverse( $dbConnection->fetchAll('SELECT UNIX_TIMESTAMP(s.published) AS pubdate, c.name, s.message FROM scratchpad s JOIN contributor c ON s.contributor = c.id ORDER BY published DESC LIMIT 5') );
             		foreach($strips as $k=>$v)
             		{
             <h2>Recent Strips</h2>
             <ul class="historic">
             <?php
-            $strips = $mtdb->getAll("SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published <= NOW() order by id DESC LIMIT 5");
+            $strips = $dbConnection->fetchAll('SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published <= NOW() order by id DESC LIMIT 5');
             foreach($strips as $k=>$v) {
             	printf( '<li>%d: <a href="%s/index.php?strip_id=%d">%s</a>, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
             <h2>Upcoming Strips</h2>
             <ul class="historic">
             <?php
-            $strips = $mtdb->getAll("SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published > NOW() order by id ASC LIMIT 5");
+            $strips = $dbConnection->fetchAll('SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published > NOW() order by id ASC LIMIT 5');
             foreach($strips as $k=>$v) {
             	printf( '<li>%d: <a href="%s/edit-comic.php?strip_id=%d">%s</a>, in %s</li>', $v->id, SITE_HOST . SITE_PATH . '/' . SITE_ADMIN, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
             <h2>Recent Published Rants</h2>
             <ul class="historic">
             <?php
-            $rants = $mtdb->getAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'published\' ORDER BY rant.published DESC limit 5');
+            $rants = $dbConnection->fetchAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'published\' ORDER BY rant.published DESC limit 5');
             foreach($rants as $k=>$v) {
             	printf( '<li>%d: <a href="%s/index.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );
             <h2>Recent Draft Rants</h2>
             <ul class="historic">
             <?php
-            $rants = $mtdb->getAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'draft\' ORDER BY rant.published DESC limit 5');
+            $rants = $dbConnection->fetchAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'draft\' ORDER BY rant.published DESC limit 5');
             foreach($rants as $k=>$v) {
             	printf( '<li>%d: <a href="%s/edit-rant.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . ADMIN_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );

manage-twitter-users.php ¶ +7 -7

             if( isset($_POST['action']) && $_POST['action'] == 'new' ) {
             	check_nonce('new-twitter-user');
-            	if(! $mtdb->query( sprintf('INSERT INTO twitter_user(username) VALUES("%s")', mysqli_real_escape_string( $mtdb->link, md5( microtime() )) ) ) ) {
+            	if(! $dbConnection->executeUpdate('INSERT INTO twitter_user (username) VALUES (?)', array(md5( microtime() ) )) {
             		adminlog("Error on insertion of new twitter user.", MTS_TWITTER, MTA_INSERT, E_WARNING);
-            		mtdie("Error on insertion of new twitter user: ". htmlentities(mysqli_error()), 'SQL Error');
+            		mtdie("Error on insertion of new twitter user: ". $dbConnection->errorCode(), 'SQL Error');
             	} else {
             		//$name = sanitize_username($_POST['name']);
-            		$id = mysqli_insert_id();
+            		$id = $dbConnection->lastInsertId();
             		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
             		$request_token = $connection->getRequestToken(OAUTH_CALLBACK . "&id=$id");
             if( isset($_REQUEST['action']) && $_REQUEST['action'] == 'twittercallback' && isset($_REQUEST['id'])) {
             	# twitter userID = ID
             	$id = (int)$_REQUEST['id'];
-            	$row = $mtdb->getRow( sprintf('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user WHERE id=%d LIMIT 1', $id));
+            	$row = $dbConnection->executeQuery('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user WHERE id = ? LIMIT 1', array($id))->fetch();
             	# Compare token in database with token from twitter. If they differ, bail.
             	if( $row->oauth_token != $_REQUEST['oauth_token'] ) {
             		# token is old, drop from database
-            		if(!$mtdb->query("DELETE FROM twitter_user WHERE id = '$id'") ) {
+            		if(!$dbConnection->executeUpdate('DELETE FROM twitter_user WHERE id = ?', array($id))) {
             			adminlog('Error deleting temporary twitter user ' . $id, MTS_TWITTER, MTA_DELETE, E_ERROR);
             			mtdie('Error deleting temporary twitter user.', 'SQL Error');
             		}
             		} else {
             			# fail
-            			if( !$mtdb->query("DELETE FROM twitter_user WHERE id = '$id'") ) {
+            			if( !$dbConnection->executeUpdate('DELETE FROM twitter_user WHERE id = ?', array($id))) {
             				adminlog('Error deleting specified twitter user ' . $id, MTS_TWITTER, MTA_DELETE, E_ERROR);
             				mtdie('Error deleting the specified twitter user.', 'SQL Error');
             			}
             	}
             }
-            $twitter_users = $mtdb->getAll('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user ORDER BY username');
+            $twitter_users = $dbConnection->fetchAll('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user ORDER BY username');
             adminhead('Manage Twitter Users');
             adminmenu();

manage-types.php ¶ +16 -16

             if( isset($_GET['delete'])  && (int)$_GET['delete'] ) {
             	check_nonce('delete-type-' . (int)$_GET['delete']);
-            	if(! $mtdb->query( 'DELETE FROM strip_t WHERE id=' . (int)$_GET['delete'] ) )
+            	if(! $dbConnection->executeUpdate('DELETE FROM strip_t WHERE id = ?', array($_GET['delete'])))
             	{
             		adminlog("Error deleting type ".(int)$_GET['delete'], MTS_TYPE, MTA_DELETE, E_WARNING);
-            		mtdie("Error on deletion of existing type: " . htmlentities(mysqli_error()), 'SQL Error');
+            		mtdie("Error on deletion of existing type: " . $dbConnection->errorCode(), 'SQL Error');
             	}
-            	if(! $mtdb->query( 'DELETE FROM meta WHERE type=' . (int)$_GET['delete'] ) )
+            	if(! $dbConnection->executeUpdate('DELETE FROM meta WHERE type = ?', array($_GET['delete'])))
             	{
             		adminlog("Error on deletion of type ".(int)$_GET['delete']."'s metadata.", MTS_TYPE, MTA_DELETE, E_WARNING);
-            		mtdie("Error on deletion of existing type's metadata: " . htmlentities(mysqli_error()), 'SQL Error');
+            		mtdie("Error on deletion of existing type's metadata: " . $dbConnection->errorCode(), 'SQL Error');
             	}
             	$info.='<p>Deleted type successfully.<p>';
             	adminlog("Deleted type ".(int)$_GET['delete'], MTS_TYPE, MTA_DELETE);
             	$desc = trim($_POST['description']);
             	if( check_type_name($name) ) {
-            		if(! $mtdb->query( sprintf( 'INSERT INTO strip_t(name, description) VALUES("%s", "%s")', mysqli_real_escape_string($mtdb->link, $name), mysqli_real_escape_string($mtdb->link, $desc)) ) )
+            		if(! $dbConnection->executeUpdate('INSERT INTO strip_t (name, description) VALUES (?, ?)', array($name, $desc)))
             		{
             			adminlog("Error on insertion of new type.", MTS_TYPE, MTA_INSERT, E_WARNING);
-            			mtdie("Error on insertion of new type: ". htmlentities(mysqli_error()), 'SQL Error');
+            			mtdie("Error on insertion of new type: ". $dbConnection->errorCode(), 'SQL Error');
             		}
             	}
             	$info.='<p>New type created successfully.<p>';
             	$meta = $_POST['meta'];
-            	$m_delete = $mtdb->getAll("SELECT meta FROM meta WHERE type = $id");
+            	$m_delete = $dbConnection->fetchAll('SELECT meta FROM meta WHERE type = ?', array($id));
             	$m_insert = array();
             	}
             	if( check_type_name( $name ) ) {
-            		if( !$mtdb->query( sprintf( 'UPDATE strip_t SET name = "%s", description = "%s" WHERE id = %s', mysqli_real_escape_string($mtdb->link, $name), mysqli_real_escape_string($mtdb->link, $desc), $id)) )
+            		if( !$dbConnection->executeUpdate('UPDATE strip_t SET name = ?, description = ? WHERE id = ?', array($name, $desc, $id)))
             		{
             			adminlog("Error on updating type ".$id, MTS_TYPE, MTA_UPDATE, E_WARNING);
-            			mtdie("Error on update of existing type: ". htmlentities(mysqli_error()), 'SQL Error');
+            			mtdie("Error on update of existing type: ". $dbConnection->errorCode(), 'SQL Error');
             		}
             		$sql_insert = "INSERT INTO meta (type,meta) VALUES " . implode(',',$m_insert);
             		$sql_delete = "DELETE FROM meta WHERE type=$id AND ( " . implode(' OR ',$m_delete) . ' )';
-            		$mtdb->query('START TRANSACTION');
+            		$dbConnection->beginTransaction();
             		if( count($m_insert) )
-            			if(! $mtdb->query( $sql_insert ) )
+            			if(! $dbConnection->executeUpdate( $sql_insert ) )
             			{
             				adminlog("Error inserting new metatype association data for type ".$id, MTS_TYPE, MTA_INSERT, E_WARNING);
             				mtdie("There was an error inserting new metatype association data. Transaction aborted. $sql_insert");
             			}
             		if( count($m_delete) )
-            			if(! $mtdb->query( $sql_delete ) )
+            			if(! $dbConnection->executeUpdate( $sql_delete ) )
             			{
             				adminlog("Error deleting old metatype association data for type ".$id, MTS_TYPE, MTA_REMOVE, E_WARNING);
             				mtdie("There was an error deleting old metatype data. Transaction aborted. $sql_delete");
             			}
-            		$mtdb->query('COMMIT');
+            		$dbConnection->commit();
             	} else {
             		$error.='<p>Invalid type name!</p>';
             }
             //display all types
-            $types = $mtdb->getAll("SELECT strip_t.id AS id, strip_t.name AS name, strip_t.description AS description, COUNT(strip.id) AS strips FROM strip_t LEFT JOIN strip ON strip.type = strip_t.id GROUP BY strip_t.id");
+            $types = $dbConnection->fetchAll('SELECT strip_t.id AS id, strip_t.name AS name, strip_t.description AS description, COUNT(strip.id) AS strips FROM strip_t JOIN strip ON strip.type = strip_t.id GROUP BY strip_t.id');
             adminhead('Types');
             adminmenu();
             	foreach( $types as $s ) {
             		$alternate=!$alternate;
-            		$metas = $mtdb->getAll("SELECT meta_t.name AS name FROM strip_t
+            		$metas = $dbConnection->fetchAll('SELECT meta_t.name AS name FROM strip_t
             			JOIN meta ON meta.type = strip_t.id JOIN meta_t ON meta.meta = meta_t.id
-            			WHERE strip_t.id = $s->id");
+            			WHERE strip_t.id = ?', array($s->id));
             		$meta = implode(', ',  array_map('_getMetaNameFromObject', $metas) );

Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings