Database abstraction

admin/admin-ajax.php

@@ -53,28 +53,51 @@ public static function init() {
 	 * Callback for feeds.add
 	 */
 	public static function feeds_add($url, $name = '') {
-		$result = Feeds::get_instance()->add( $url, $name );
-		return array('success' => 1, 'msg' => $result['msg'], 'data' => Feeds::get_instance()->get($result['id']));
+		$feed = Lilina_Feed::create($url, $name);
+		$result = Lilina_Feeds::get_instance()->insert($feed);
+		return array(
+			'success' => 1,
+			'msg' => sprintf(_r('Added feed "%1$s"'), $feed->name),
+			'data' => $feed
+		);
 	}
 	/**
 	 * Callback for feeds.change
 	 */
 	public static function feeds_change($feed_id, $url = '', $name = '') {
-		$data = array();
-		if(!empty($url))
-			$data['feed'] = $url;
-		if(!empty($name))
-			$data['name'] = $name;
-		$result = Feeds::get_instance()->update($feed_id, $data);
+		$feed = Lilina_Feeds::get_instance()->get($feed_id);
 
-		return array('success' => 1, 'msg' => $result, 'data' => Feeds::get_instance()->get($feed_id));
+		if (!empty($url)) {
+			$feed->feed = $url;
+		}
+
+		if (!empty($name)) {
+			$feed->name = $name;
+		}
+
+		Lilina_Feeds::get_instance()->update($feed);
+
+		return array(
+			'success' => 1,
+			'msg' => sprintf(_r('Changed "%s"'), $feed->name),
+			'data' => $feed
+		);
 	}
 	/**
 	 * Callback for feeds.remove
 	 */
 	public static function feeds_remove($feed_id) {
-		$success = Feeds::get_instance()->delete($feed_id);
-		return array('success' => 1, 'msg' => $success);
+		$feed = Lilina_Feeds::get_instance()->get($feed_id);
+		Lilina_Feeds::get_instance()->delete($feed);
+
+		return array(
+			'success' => 1,
+			'msg' => sprintf(
+				_r('Removed "%1$s" &mdash; <a href="%2$s">Undo</a>?'),
+				$feed->name,
+				'feeds.php?action=add&amp;add_name=' . urlencode($feed->name) . '&amp;add_url=' . urlencode($feed->feed)
+			)
+		);
 	}
 	/**
 	 * Callback for feeds.list
@@ -85,8 +108,20 @@ public static function feeds_list() {
 	/**
 	 * Callback for feeds.get
 	 */
-	public static function feeds_get() {
-		return Feeds::get_instance()->getAll();
+	public static function feeds_get($start = 0, $limit = 0) {
+		$args = array();
+		$start = (int) $start;
+		$limit = (int) $limit;
+		if ($start !== 0) {
+			$args['offset'] = $start;
+		}
+		if ($limit !== 0) {
+			$args['limit'] = $limit;
+		}
+
+		Lilina_Feeds::get_instance()->query($args);
+
+		return Lilina_Feeds::get_instance()->get_items();
 	}
 }
 

admin/admin.php

@@ -19,15 +19,13 @@
 define('LILINA_ADMIN', 1) ;
 define('LILINA_PAGE', 'admin');
 
-global $settings;
+
 require_once(LILINA_INCPATH . '/core/Lilina.php');
-Lilina::check_installed();
+Lilina::bootstrap();
+
 
-Lilina_Plugins::init();
-Localise::load_default_textdomain();
 require_once(LILINA_INCPATH . '/core/update-functions.php');
 require_once(LILINA_INCPATH . '/core/file-functions.php');
-require_once(LILINA_INCPATH . '/core/version.php');
 require_once(LILINA_INCPATH . '/core/feed-functions.php');
 require_once(LILINA_INCPATH . '/contrib/parseopml.php');
 require_once(LILINA_INCPATH . '/core/auth-functions.php');
@@ -43,9 +41,6 @@
 	lilina_login_form('', '');
 }
 
-/** This sanitises all input variables, so we don't have to worry about them later */
-Lilina::level_playing_field();
-
 require_once(LILINA_PATH . '/admin/includes/common.php');
 
 if ( !empty($_REQUEST['page']) ) {

admin/includes/feeds.php

@@ -15,16 +15,17 @@
  */
 function feed_list_table() {
 	//Defined in admin panel
-	$feeds			= Feeds::get_instance()->getAll();
+	Lilina_Feeds::get_instance()->query();
+	$feeds			= Lilina_Feeds::get_instance()->get_items();
 	$j	= 0;
 	$table = '';
 	if(is_array($feeds) && !empty($feeds)) {
 		foreach($feeds as $this_feed) {
 			$table .= '
 		<tr id="feed-' . $j . '" class="' . (($j % 2) ? 'alt' : '') . '">
-			<td class="name-col"><span>' .  stripslashes($this_feed['name']) . '</span></td>
-			<td class="url-col"><span>' .  $this_feed['feed'] . '</span></td>
-			<!--<td class="cat-col"><span>' . $this_feed['cat'] . '</span></td>-->
+			<td class="name-col"><span>' .  stripslashes($this_feed->name) . '</span></td>
+			<td class="url-col"><span>' .  $this_feed->feed . '</span></td>
+			<!--<td class="cat-col"><span>' . $this_feed->cat . '</span></td>-->
 			' . apply_filters('admin-feeds-infocol', '', $this_feed, $j) . '
 			<!--<td class="change-col"><a href="feeds.php?change=' . $j . '&amp;action=change" class="change_link">' . _r('Change') . '</a></td>-->
 			<td class="remove-col"><a href="feeds.php?remove=' . $j . '&amp;action=remove">' . _r('Remove') . '</a></td>

admin/includes/import/import-gregarius.php

@@ -41,9 +41,10 @@ public function dispatch() {
 	protected function import_feeds($feeds) {
 		foreach ($feeds as $feed) {
 			try {
-				$result = Feeds::get_instance()->add($feed->url, $feed->title);
-				echo '<li>' . $result['msg'] . '</li>';
-				$this->old[$feed->id] = $result['id'];
+				$real = Lilina_Feed::create($feed->url, $feed->title);
+				Lilina_Feeds::get_instance()->insert($real);
+				echo '<li>' . sprintf(_r('Added feed "%1$s"'), $real->name) . '</li>';
+				$this->old[$feed->id] = $real->id;
 			}
 			catch (Exception $e) {
 				$id = sha1($feed->url);
@@ -54,27 +55,25 @@ protected function import_feeds($feeds) {
 	}
 	protected function import_item($old) {
 		$new = $this->convert_item($old);
-		return Items::get_instance()->check_item($new);
+		return Lilina_Items::get_instance()->check($new);
 	}
 	protected function convert_item($old) {
-		$new = (object) array(
-			'hash' => sha1($old->guid),
-			'timestamp' => strtotime($old->pubdate),
-			'title' => $old->title,
-			'content' => $old->description,
-			'summary' => $old->description,
-			'permalink' => $old->url,
-			'metadata' => (object) array(
-				'enclosure' => $old->enclosure,
-				'enclosure_data' => false
-			),
-			'author' => array(
-				'name' => $old->author,
-				'url' => false
-			),
-			'feed' => false,
-			'feed_id' => $this->lookup_cid($old->cid)
-		);
+		$new = new Lilina_Item();
+		$new->hash = sha1($old->guid);
+		$new->timestamp = strtotime($old->pubdate);
+		$new->title = $old->title;
+		$new->content = $old->description;
+		$new->summary = $old->description;
+		$new->permalink = $old->url;
+		$new->feed_id = $this->lookup_cid($old->cid);
+
+		$enclosure = new Lilina_Enclosure();
+		$enclosure->url = $old->enclosure;
+		$new->enclosure = $enclosure;
+
+		$author = new Lilina_Author();
+		$author->name = $old->author;
+		$new->author = $author;
 		return $new;
 	}
 	protected function lookup_cid($cid) {
@@ -150,7 +149,6 @@ protected function import_items() {
 					$count++;
 				}
 			}
-			Items::get_instance()->save_cache();
 			printf('<p>' . _r('Done! Imported %d items.') . '</p>', $count);
 		}
 		catch (Exception $e) {

admin/includes/settings.php

@@ -187,7 +187,7 @@ class AdminOptions {
 	public $sections = array();
 
 	public function __construct() {
-		$this->whitelisted = array('sitename', 'template', 'locale', 'timezone', 'updateon');
+		$this->whitelisted = array('sitename', 'baseurl', 'template', 'locale', 'timezone', 'updateon');
 	}
 
 	public static function &instance() {
@@ -270,4 +270,10 @@ public function do_fields($section) {
 			echo '</div>';
 		}
 	}
+
+	public static function checked($a, $b) {
+		if ($a === $b) {
+			echo ' checked="checked"';
+		}
+	}
 }

admin/index.php

@@ -87,18 +87,18 @@ function relative_time($posted_date) {
 ?>
 <h1><?php _e('Welcome!') ?></h1>
 <?php
-if (count(Feeds::get_instance()->getAll()) === 0) {
+if (Lilina_Feeds::get_instance()->total_count() === 0) {
 ?>
 <p><?php _e("Firstly, thanks for using Lilina! To help you settle in, we've included a few nifty tools in Lilina, just to help you get started.") ?></p>
 <?php
 }
 else {
 	$updated = get_option('last_updated');
 	if (!$updated) {
-		$message = sprintf(_r('You currently have %d items in %d feeds. Never updated.'), count(Items::get_instance()->get_items()), count(Feeds::get_instance()->getAll()));
+		$message = sprintf(_r('You currently have %d items in %d feeds. Never updated.'), Lilina_Items::get_instance()->total_count(), Lilina_Feeds::get_instance()->total_count());
 	}
 	else {
-		$message = sprintf(_r('You currently have %d items in %d feeds. Last updated %s.'), count(Items::get_instance()->get_items()), count(Feeds::get_instance()->getAll()), relative_time($updated));
+		$message = sprintf(_r('You currently have %d items in %d feeds. Last updated %s.'), Lilina_Items::get_instance()->total_count(), Lilina_Feeds::get_instance()->total_count(), relative_time($updated));
 	}
 ?>
 <p><?php echo $message ?></p>

admin/resources/core.css

@@ -123,6 +123,18 @@ legend {
 	padding: 2px 2em 2px 0;
 	font-size: 1.2em;
 }
+.row label.checkbox {
+	float: none;
+	display: inline;
+	text-align: left;
+	width: auto;
+	margin: 0 10px 0 0;
+	padding: 0;
+}
+	.row label.checkbox input {
+		width: auto;
+		padding: 0 2px;
+	}
 .row input, .row select, .row .input {
 	width: 56%;
 	padding: 3px;

admin/settings.php

@@ -68,8 +68,7 @@
 		</div>
 		<div class="row">
 			<label for="baseurl"><?php _e('Site address (URL)'); ?>:</label>
-			<input type="text" name="baseurl" id="baseurl" value="<?php echo get_option('baseurl'); ?>" disabled="disabled" />
-			<p class="sidenote"><?php _e('This option must be changed in content/system/config/settings.php manually.'); ?></p>
+			<input type="text" name="baseurl" id="baseurl" value="<?php echo get_option('baseurl'); ?>" />
 		</div>
 	</fieldset>
 	<fieldset id="views">
@@ -112,7 +111,7 @@
 						echo '<optgroup label="' . $continent . '">';
 						foreach($cities as $city => $tz) {
 							echo '<option';
-							if($tz === get_option('timezone')) {
+							if($tz === get_option('timezone', 'UTC')) {
 								echo ' selected="selected"';
 							}
 							echo ' value="' . $tz . '">' . $city . '</option>';
@@ -141,7 +140,7 @@
 <?php
 			foreach ($available as $key => $template) {
 				$class = 'template';
-				if ($template->slug === get_option('template')) {
+				if ($template->slug === get_option('template', 'razor')) {
 					$class .= ' current';
 				}
 ?>
@@ -161,14 +160,14 @@
 					}
 
 					$title = sprintf(_r('%1$s %2$s by %3$s'), $template->name, $template->version, $author);
-					if ($template->slug === get_option('template')) {
+					if ($template->slug === get_option('template', 'razor')) {
 						$title .= ' (Current)';
 					}
 ?>
 					<h2><?php echo $title ?></h2>
 					<p><?php echo $template->description ?></p>
 <?php
-					if ($template->slug !== get_option('template')) {
+					if ($template->slug !== get_option('template', 'razor')) {
 ?>
 					<button type="submit" name="activate_template" value="<?php echo $template->slug ?>">Activate</button>
 <?php

admin/subscribe.php

@@ -27,15 +27,17 @@ public static function run() {
 
 			if (!empty($discovered))
 				$feed = $discovered[0];
-			$result = Feeds::get_instance()->add( $_POST['url'], $_POST['name'] );
+
+			$real = Lilina_Feed::create($feed, $_POST['name']);
+			Lilina_Feeds::get_instance()->insert($real);
 		}
 		catch( Exception $e ) {
 			return self::sub_page($e->getMessage());
 		}
-		return self::success_page($result);
+		return self::success_page();
 	}
 
-	public static function success_page($result) {
+	public static function success_page() {
 		self::head();
 ?>
 	<div id="message">

content/plugins/instapaper.php

@@ -65,7 +65,7 @@ public static function page() {
 
 	protected static function submit() {
 		$id = $_GET['item'];
-		$item = Items::get_instance()->get_item($id);
+		$item = Lilina_Items::get_instance()->get($id);
 
 		if ( false === $item ) {
 			throw new Exception(_r('Invalid item ID specified', 'instapaper'));

inc/core/Errors.php

@@ -37,6 +37,23 @@ protected static function init() {
 		// 110-119 = api.items.
 		self::$codes['api.items.no_method'] = 110;
 
+		// 200-299 = db.
+		// 200-219 = db.general
+		self::$codes['db.general.missingtable'] = 200;
+		self::$codes['db.general.datatypewrong'] = 201;
+		self::$codes['db.general.invalidwhere'] = 202;
+		self::$codes['db.general.adapternotfound'] = 203;
+
+		// 220-239 = db.insert
+		self::$codes['db.insert.duplicate'] = 220;
+		self::$codes['db.insert.missingprimary'] = 221;
+
+		// 240-259 = db.update
+		self::$codes['db.update.missingwhere'] = 240;
+
+		// 260-279 = db.delete
+		self::$codes['db.delete.missingwhere'] = 260;
+
 		// 800-899 = auth.
 		self::$codes['auth.none']                = 800;
 		// 900-999 = update.