setup on local dev

diff --git a/.htaccess b/.htaccess
index c8fdc6b4577fd67b5f32c1f0ddd42c30c207b4ec..b0f633f2d9100fb4b6856cae8a6e863bb9b1ff6a 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -4,3 +4,4 @@ RewriteEngine On
 # redirect every other request to the index
 RewriteRule     /*\.(css|php|js|gif|png|jpe?g)$ - [NC,L]
 RewriteRule     ^(.*)$   index.php?_url=$1 [QSA,L]
+

diff --git a/data.php b/data.php
index ee63c0d76b54b28e3cd105e71a4d78c608521be1..f071328d176d569d2d8db2d3098eac28193964a4 100644 (file)
--- a/data.php
+++ b/data.php
@@ -1,40 +1,40 @@
 <?php
 
 
-    function get_db_connection()
-    {
-        try {
-                return $dbh = new PDO(DB_DSN, DB_UNAME, DB_PW);
-        }
-        catch(PDOException $e) {
-                return $e->getMessage();
-        }
+function get_db_connection()
+{
+    try {
+        return $dbh = new PDO(DB_DSN, DB_UNAME, DB_PW);
     }
+    catch(PDOException $e) {
+            return $e->getMessage();
+    }
+}
 
 
-    function get_user()
-    {
-        return isset($_SESSION['user']) ? $_SESSION['user'] : false;
-    }
+function get_user()
+{
+    return isset($_SESSION['user']) ? $_SESSION['user'] : false;
+}
 
 
-    function get_users(&$dbh, $args)
-    {
-        $user = isset($args['user']) ? $args['user'] : false;
+function get_users(&$dbh, $args)
+{
+    $user = isset($args['user']) ? $args['user'] : false;
 
-        try {
-            if ($user) {
-                $sql = "SELECT * FROM users WHERE user = ?";
-                $q = $dbh->prepare($sql);
-                $q->execute( array( $user ));
-                if ($q->rowCount() == 1) {
-                    return $q->fetch();
-                }
+    try {
+        if ($user) {
+            $sql = "SELECT * FROM users WHERE user = ?";
+            $q = $dbh->prepare($sql);
+            $q->execute( array( $user ));
+            if ($q->rowCount() == 1) {
+                return $q->fetch();
             }
         }
-        catch (PDOException $e) {
-            echo $e->getMessage();
-        }
+    }
+    catch (PDOException $e) {
+        echo $e->getMessage();
+    }
 
-        return false;
-    }
\ No newline at end of file
+    return false;
+}
\ No newline at end of file

diff --git a/get.php b/get.php
index 4de5fce1853d69500ccfe2168644c57894a7fd6b..269b7db2ecf79ac320ee1b649bfdba2d47daa2c4 100644 (file)
--- a/get.php
+++ b/get.php
@@ -6,6 +6,7 @@
     $params['user'] = isset($_GET['user']) ? $_GET['user'] : null;
 
     $dbh = get_db_connection();
+
     $dbh->beginTransaction();
 
     try {

diff --git a/index.php b/index.php
index c48a293e30ea4099217607a8ab625807ab9e258a..dd3428f96eb8f7b0b5ca3ad2d2e0acaa4028b27b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,47 +1,47 @@
 <?php
 
-    require_once 'init.php';
-
-    $url = trim($_GET['_url'], '/');
-
-    list($endpoint) = explode('/', $url);
-
-    $pathinfo = pathinfo($_SERVER['SCRIPT_URL']);
-    $format = isset($pathinfo['extension']) ? $pathinfo['extension'] : null;
-
-    $endpoint = str_replace('.'.$format, '', $endpoint);
-
-    switch($endpoint)
-    {
-        case 'about' :
-            include 'head.html';
-            echo "clmpr is a place to save hyperlinks";
-            echo '<br /><a href="https://github.com/quilime/clmpr">source on github</a>';
-            echo '<br />&copy; 2011 <a href="http://quilime.com">quilime</a>';
-            exit;
-
-        default :
-            if ($endpoint != '') {
-
-                $dbh = get_db_connection();
-                $dbh->beginTransaction();
-                $user = get_users($dbh, array( 'user' => $endpoint ));
-                $dbh = null;
-                if ( isset($user['user']) ) {
-                    $get = function( $user ) {
-                        $_GET['user'] = $user;
-                    };
-                    $get( $user['user'] );
-                }
+require_once 'init.php';
+
+$url = isset($_GET['_url']) ? trim($_GET['_url'], '/') : '/';
+
+list($endpoint) = explode('/', $url);
+
+$pathinfo = pathinfo($_SERVER['REQUEST_URI']);
+$format = isset($pathinfo['extension']) ? $pathinfo['extension'] : null;
+
+$endpoint = str_replace('.'.$format, '', $endpoint);
+
+switch($endpoint)
+{
+    case 'about' :
+        include 'head.html';
+        echo "clmpr is a place to save hyperlinks";
+        echo '<br /><a href="https://github.com/quilime/clmpr">source on github</a>';
+        echo '<br />&copy; 2011 <a href="http://quilime.com">quilime</a>';
+        exit;
+
+    default :
+        if ($endpoint != '') {
+
+            $dbh = get_db_connection();
+            $dbh->beginTransaction();
+            $user = get_users($dbh, array( 'user' => $endpoint ));
+            $dbh = null;
+            if ( isset($user['user']) ) {
+                $get = function( $user ) {
+                    $_GET['user'] = $user;
+                };
+                $get( $user['user'] );
             }
-    }
+        }
+}
 
-    switch ($format) {
-        case 'rss' :
-        case 'xml' :
-            include 'get.php';
-            exit;
-    }
+switch ($format) {
+    case 'rss' :
+    case 'xml' :
+        include 'get.php';
+        exit;
+}
 
 ?><!DOCTYPE html>
 
@@ -61,7 +61,7 @@
 <p>
 bookmarklet:
 <?php
-$js = file_get_contents('bookmarklet.js');
+    $js = file_get_contents('bookmarklet.js');
 ?>
 <a href="javascript:<?=$js?>">+</a>
 </p>