added sqlite support using PDO, removed twitter redirect, and removed config.php

Author: mhoofman

config.php

@@ -9,20 +9,51 @@ function redirect($url) {
 
 if (isset($_GET['slug'])) {
  $slug = rtrim($_GET['slug'], '!"#$%&\'()*+,-./@:;<=>[\\]^_`{|}~');
- if (is_numeric($slug) && strlen($slug) > 3) {
-  redirect('http://twitter.com/' . TWITTER_USERNAME . '/status' . $_SERVER['REQUEST_URI']);
+
+ switch(DB_FLAVOR) {
+   case "mysql":
+     $dsn = DB_FLAVOR . ":dbname=" . DB_DATABASE . ";host=" . DB_HOST;
+     break;
+   case "sqlite":
+     $dsn = DB_FLAVOR . ":" . DB_DATABASE;
+     break;
+   default:
+     exit("Unsupported database.");
+     break; 
+ }
+ 
+ try {
+   $db = new PDO($dsn, DB_USER, DB_PASSWORD);
+ } catch (PDOException $e) {
+   exit("Database connection error: " . $e->getMessage(). "\n");
  }
- $db = new mysqli(MYSQLI_HOST, MYSQLI_USER, MYSQLI_PASSWORD, MYSQLI_DATABASE);
- $db->query('SET NAMES "utf8"');
- $slug = $db->real_escape_string($slug);
- $result = $db->query('SELECT `url` FROM `redirect` WHERE `slug` = "' . $db->real_escape_string($slug) . '"');
- if ($result && $result->num_rows > 0 && $db->query('UPDATE `redirect` SET `hits` = `hits` + 1 WHERE `slug` = "' . $db->real_escape_string($slug) . '"')) {
-  redirect($result->fetch_object()->url);
+ 
+ if (DB_FLAVOR == "sqlite") {
+   $row = $db->query("select name from sqlite_master where type = 'table' and name = 'redirect'")->fetch();
+   
+   if ( ! $row) {
+     exit("Url not found.");
+   }
+ }
+ 
+ if (DB_FLAVOR == "mysql") $db->query('SET NAMES "utf8"');
+ 
+ $lookup_stmt = $db->prepare('SELECT `url` FROM `redirect` WHERE `slug` = :slug');
+ $lookup_stmt->bindParam(':slug', $slug);
+ $lookup_stmt->execute();
+ $result = $lookup_stmt->fetch();
+ 
+ if ($result) {
+  $update_stmt = $db->prepare('UPDATE `redirect` SET `hits` = `hits` + 1 WHERE `slug` = :slug');
+  $update_stmt->bindParam(':slug', $slug);
+  $update_stmt->execute();
+
+  redirect($result['url']);
  } else {
   redirect(DEFAULT_URL . $_SERVER['REQUEST_URI']);
  }
 } else {
  redirect(DEFAULT_URL . '/');
 }
 
-?>
+?>

index.php

@@ -27,24 +27,76 @@ function getNextShortURL($s) {
  return implode($a);
 }
 
-$db = new mysqli(MYSQLI_HOST, MYSQLI_USER, MYSQLI_PASSWORD, MYSQLI_DATABASE);
-$db->query('SET NAMES "utf8"');
+switch(DB_FLAVOR) {
+  case "mysql":
+    $dsn = DB_FLAVOR . ":dbname=" . DB_DATABASE . ";host=" . DB_HOST;
+    break;
+  case "sqlite":
+    $dsn = DB_FLAVOR . ":" . DB_DATABASE;
+    break;
+  default:
+    exit("Unsupported database.");
+    break; 
+}
 
-$url = $db->real_escape_string($url);
+try {
+  $db = new PDO($dsn, DB_USER, DB_PASSWORD);
+} catch (PDOException $e) {
+  exit("Database connection error: " . $e->getMessage(). "\n");
+}
 
-$result = $db->query('SELECT `slug` FROM `redirect` WHERE `url` = "' . $url . '" LIMIT 1');
-if ($result && $result->num_rows > 0) { // If there’s already a short URL for this URL
- die(SHORT_URL . $result->fetch_object()->slug);
+if (DB_FLAVOR == "sqlite") {
+  $row = $db->query("select name from sqlite_master where type = 'table' and name = 'something'")->fetch();
+   
+  if ( ! $row) {
+    $create_table = "CREATE TABLE 'redirect' ("
+                  . "'slug' varchar(14) NOT NULL, "
+                  . "'url' varchar(620) NOT NULL, "
+                  . "'date' datetime NOT NULL, "
+                  . "'hits' bigint(20) NOT NULL default '0', "
+                  . "PRIMARY KEY ('slug') "
+                  . ");";
+    $first_entry = "INSERT INTO 'redirect' VALUES ('a', 'http://www.example.com', datetime('now', '-1 minute'), 1);"; 
+    $db->query($create_table);
+    $db->query($first_entry);
+  }
+}
+ 
+if (DB_FLAVOR == "mysql") $db->query('SET NAMES "utf8"');
+
+$lookup_stmt = $db->prepare('SELECT `slug` FROM `redirect` WHERE `url` = :url LIMIT 1');
+$lookup_stmt->bindParam(':url', $url);
+$lookup_stmt->execute();
+$result = $lookup_stmt->fetch();
+
+if ($result) { // If there’s already a short URL for this URL
+  exit(SHORT_URL . $result['slug']);
 } else {
- $result = $db->query('SELECT `slug`, `url` FROM `redirect` ORDER BY `date` DESC LIMIT 1');
- if ($result && $result->num_rows > 0) {
-  $slug = getNextShortURL($result->fetch_object()->slug);
-  if ($db->query('INSERT INTO `redirect` (`slug`, `url`, `date`, `hits`) VALUES ("' . $slug . '", "' . $url . '", NOW(), 0)')) {
+ $result = $db->query('SELECT `slug`, `url` FROM `redirect` ORDER BY `date` DESC LIMIT 1')->fetch();
+ if ($result) {
+  $slug = getNextShortURL($result['slug']);
+  
+  switch (DB_FLAVOR) {
+    case "mysql":
+      $insert_stmt = $db->prepare("INSERT INTO redirect(slug, url, date, hits) VALUES (:slug, :url, NOW(), 0)");
+      break;
+    case "sqlite":
+      $insert_stmt = $db->prepare("INSERT INTO redirect(slug, url, date, hits) VALUES (:slug, :url, datetime('now', 'localtime'), 0)");
+      break;
+    default:
+      break;
+  }
+  $insert_stmt->bindParam(':slug', $slug);
+  $insert_stmt->bindParam(':url', $url);
+  $r = $insert_stmt->execute();
+  
+  if ($r) {
    header('HTTP/1.1 201 Created');
    echo SHORT_URL . $slug;
-   $db->query('OPTIMIZE TABLE `redirect`');
+   
+   if (DB_FLAVOR == "mysql") $db->query('OPTIMIZE TABLE `redirect`');
   }
  }
 }
 
-?>
+?>