Added delete

diff --git a/.htaccess b/.htaccess
index d5fd0d3b0d5f6ad265835e3df44f18a044e15376..c8fdc6b4577fd67b5f32c1f0ddd42c30c207b4ec 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,5 @@ Options +FollowSymLinks
 RewriteEngine On
 
 # redirect every other request to the index
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule . index.php [L]
\ No newline at end of file
+RewriteRule     /*\.(css|php|js|gif|png|jpe?g)$ - [NC,L]
+RewriteRule     ^(.*)$   index.php?_url=$1 [QSA,L]

diff --git a/get.php b/get.php
index 01578d7de9b1ad7f06cbf9cbd374b0868ee2c152..ca8434b99433f7ab55ca4b15a9bea9225dab5668 100644 (file)
--- a/get.php
+++ b/get.php
@@ -13,7 +13,7 @@
         if ($params['user']) {
             $user = get_users($dbh, array('user' => $params['user'] ));
             if ($user) {
-                $q = $dbh->prepare(" SELECT * FROM clumps JOIN users ON users.id = clumps.user_id WHERE user_id = ? ORDER BY date DESC ");
+                $q = $dbh->prepare(" SELECT *, clumps.id as clump_id FROM clumps JOIN users ON users.id = clumps.user_id WHERE user_id = ? ORDER BY date DESC ");
                 $q->execute( array( $user['id'] ));
             }
             else {
@@ -22,7 +22,7 @@
         }
         else
         {
-            $q = $dbh->prepare("SELECT * FROM clumps JOIN users ON users.id = clumps.user_id ORDER BY date DESC");
+            $q = $dbh->prepare("SELECT *, clumps.id as clump_id FROM clumps JOIN users ON users.id = clumps.user_id ORDER BY date DESC");
             $q->execute();
         }
     }
@@ -34,17 +34,33 @@
 
     include 'head.html';
 
-    echo '<ul>';
-    for($i = 0; $row = $q->fetch(); $i++ ) {
-        echo '<li>';
-        echo sprintf(
-            '%s - <a href="/get.php?user=%s">%s</a> : <a href="%s">%s</a>'
-            ,   $row['date']
-            ,   $row['user']
-            ,   $row['user']
-            ,   $row['location']
-            ,   $row['title']);
-        echo $row['tags'] ? '<span class="">' . $row['tags'] . '</span>' : '';
-        echo '</li>';
+?>
+
+<script>
+
+    function deleteClump( id, elem ) {
+        if (confirm("delete clump?")) {
+            $.post('delete.php', { clump_id : id }, function(result) {
+                $(elem).hide(150);
+            }, 'json');
+            return false;
+        }
     }
-    echo '</ul>';
\ No newline at end of file
+
+</script>
+
+<ul>
+<?php for($i = 0; $row = $q->fetch(); $i++ ): ?>
+    <li>
+    <?php echo date("Y-m-d", strtotime($row['date'])) ?>
+    <a class="uname" href="/get.php?user=<?php echo $row['user'] ?>"><?php echo $row['user'] ?></a>
+    <a href="<?php echo $row['location'] ?>"><?php echo $row['title'] ?></a>
+    <span class="tags"><?php echo $row['tags'] ?></span>
+    <?php if ($user = get_user()): ?>
+    <?php if ($user['user'] == $row['user']): ?>
+    <a href="#" onClick="return deleteClump(<?php echo $row['clump_id']; ?>, this.parentNode);" class="delete">x</a>
+    <?php endif; ?>
+    <?php endif; ?>
+    </li>
+<?php endfor; ?>
+</ul>

diff --git a/head.html b/head.html
index 174073a50d93268376c7a4f8b4504e7e6c69b7e1..1e208983104d67e90e3554c84f2758bc6a3cd648 100644 (file)
--- a/head.html
+++ b/head.html
@@ -1,3 +1,4 @@
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
 
-<LINK REL=StyleSheet HREF="/style.css" TYPE="text/css" MEDIA=screen>
\ No newline at end of file
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+<link href='http://fonts.googleapis.com/css?family=Cousine:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css' />
+<link href="/style.css" rel="styleSheet" type="text/css" media="screen" />

diff --git a/index.php b/index.php
index e4c0d05511fea983a88b498126212f5b166eee7f..73af79589f70019e248f83c1646220c51356e9c4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,23 +2,23 @@
 
     require_once 'init.php';
 
-    $dbh = get_db_connection();
-    $dbh->beginTransaction();
+    $url = trim($_GET['_url'], '/');
+
+    list($endpoint) = explode('/', $url);
 
-    $switch = explode("/", $_SERVER['SCRIPT_URL']);
 
-    switch($section = $switch[1])
+    $dbh = get_db_connection();
+    $dbh->beginTransaction();
+    switch($endpoint)
     {
         case 'get' :
             include 'get.php';
             exit;
-
         case 'put' :
             exit;
-
         default :
-            if ($section != '') {
-                $user = get_users($dbh, array( 'user' => $section ));
+            if ($endpoint != '') {
+                $user = get_users($dbh, array( 'user' => $endpoint ));
                 if ( isset($user['user']) ) {
                     $get = function( $user ) {
                         $_GET['user'] = $user;
@@ -34,10 +34,8 @@
                 }
             }
     }
-
     $dbh = null;
 
-
 ?><!DOCTYPE html>
 
 <head>
@@ -55,7 +53,7 @@
 
 <p>
 bookmarklet:
-<?php 
+<?php
 $js = file_get_contents('bookmarklet.js');
 ?>
 <br />

diff --git a/put.php b/put.php
index cb7753d6b6216e1d62635e5d26421d56b8f5ee19..3db4372d3f434257333adac6598af91a28443098 100644 (file)
--- a/put.php
+++ b/put.php
@@ -13,8 +13,6 @@
 
         if ($user = get_user()) {
 
-            $user['user'];
-
             $sql = "INSERT INTO `clmpr`.`clumps` ( `user_id`, `title` , `location` , `date` )
                     VALUES ( ?, ?, ?, NOW() ) ";
             $q = $dbh->prepare($sql);

diff --git a/style.css b/style.css
index 51baa876dc28c868c438bfa8d1eebf99e35670cd..5e3796c995bab91b811619c739c24cfe83d86766 100644 (file)
--- a/style.css
+++ b/style.css
@@ -1,5 +1,34 @@
 body {
-    font-family: times; 
-    font-size:14px;
-    line-height:1.3em;
-}
\ No newline at end of file
+     color: #444444;
+     font-family: Cousine,monospace;
+     font-size: 12px;
+     line-height: 1.3em;
+}
+
+a {
+     text-decoration: none;
+}
+
+a:hover {
+     color: #000099;
+     text-decoration: underline;
+}
+
+ul {
+     padding: 0pt;
+}
+
+li {
+     list-style-type: none;
+}
+
+.uname {
+     color: #DDDDDD;
+     text-decoration: none;
+}
+.delete {
+    color:#d00;
+}
+.delete:hover {
+    text-decoration:none;
+}