Changeset 1278

Timestamp:

12/30/06 11:24:00 (2 years ago)

Author:

jm3

Message:

* implemented comment deletion
* implemented beginnings of undo (just caching of the queue of actions)
* cleaned up css files a bit
* added optional message to view-link page

Files:

• feedmelinks/.htaccess-global (modified) (1 diff)
• feedmelinks/FAQ/index.php (modified) (1 diff)
• feedmelinks/action.php (modified) (1 diff)
• feedmelinks/comments.php (modified) (7 diffs)
• feedmelinks/contacts/add.php (modified) (1 diff)
• feedmelinks/contacts/remove.php (modified) (1 diff)
• feedmelinks/contacts/testing.php (modified) (1 diff)
• feedmelinks/diespammersdie/index.php (modified) (1 diff)
• feedmelinks/diespammersdie/report.php (modified) (1 diff)
• feedmelinks/modules/header.inc.php (modified) (2 diffs)
• feedmelinks/modules/utils.inc.php (modified) (17 diffs)
• feedmelinks/modules/view-link.inc.php (modified) (1 diff)
• feedmelinks/portal-uncached.php (modified) (2 diffs)
• feedmelinks/script/mootools.js (added)
• feedmelinks/style/main.css (moved) (moved from feedmelinks/style/new-portal.css)
• feedmelinks/testing/contacts.php (modified) (1 diff)

feedmelinks/.htaccess-global

@@ -26 +26 @@
-RewriteRule    ^([0-9]+)$ /?l=$1 [L]
-RewriteRule    ^([0-9]+)/d$ /?l=$1&debug=1 [L]
+RewriteRule    ^([0-9]+)/m/(.*)$ /?l=$1&mesg=$2 [L]
-
-# grab links

feedmelinks/FAQ/index.php

@@ -151 +151 @@
-                <div class="q">Can I have the source code to Feed Me Links?</div>
-                <div class="a">
-
+
+
+
+
+
+
+
+
+
-                </div>
-                <a href="#top">back to top</a>

feedmelinks/action.php

@@ -250 +250 @@
-<% } else { %>
-
-new-portal
+style/main
-<div class='welcome'>
-        no links selected;<br/>

feedmelinks/comments.php

@@ -1 @@
-%
+?php
-        # $Id$
-        include_once( "modules/utils.inc.php" );
@@ -11 +11 @@
-                $authenticated = 1;
-                $user = $who ? $who : $sessionUserId;
-%
+?
-
-<title> Feed me comments </title>
-
-
-
-
+
+
+
+
+
+
+
-
-<h3>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-</h3>
+<?php
+                if( $op == "delete" && getOwnerForLink( $link ) == $u ) {
+
+                        $comments = get_file_safe( get_comments_file( $link, $u ));
+                        if( ! array_key_exists( $comment, $comments ))
+                                bounceBack();
+
+                        # cache it for displaying in any error messages
+                        $c = parse_comment( $comments[ $comment ]);
+                        echo '"' . $c["comment"] . '"' . " by " . getUserLink( $c["user"] ) . " from " . formatAsSimpleDate( $c["date"]) . " on " . getLink( $link ) . "</p>";
+
+                        if( $debug )
+                                echo "<p>comment #$comment</p>";
+
+                        # back up the comment file so the deletion can be un-done if necessary
+                        $undo_file = get_undo_file( $u, "comment", "delete" );
+                        file_append_contents( $undo_file, $link . ":" . $comments[ $comment ]);
+
+                        # remove the comment line from the array
+                        $new_comments = $comments;
+                        unset( $new_comments[ $comment ]);
+                        if( $debug ) {
+                                echo "<pre>post deletion";
+                                print_r( $new_comments );
+                        }
+                        
+                        # write the modified array back into the comment file
+                        file_put_contents( get_comments_file($link, $u), implode( "", $new_comments ));
+
+                        # send the user back to the link page with a note that the comment was deleted
+                        echo bounceTo( "/$link/m/Comment+deleted.", 1 );
+
+                }
+                if( $show_comments ) {
+?>
-
-<div style="width: 630px; height: 400px;">
-
-<div class="column" style="float: left;">
-%= $who ? $who . "'s" : "YOUR" %
+?= $who ? $who . "'s" : "YOUR" ?
-        <div class="onepxlline">&nbsp;</div>
-        <br />
-
-%
+?php
-        chdir( get_webserver_root() );
-        $cmd = "find _comments/$user -type f | xargs -n1 grep -H -v $user | sort -rk 2";
@@ -50 +91 @@
-                if( $debug )
-                        echo "got here<br />";
-%
-%= $n %> <%= $n == 1 ? "comment" : "comments" %></
-%
+?
+?= $n ?> <?= $n == 1 ? "comment" : "comments" ?>
+?php
-                
-                foreach ($oba as $line) {
@@ -76 +117 @@
-                }
-        } else {
-%
+?
-<!-- DEBUG:
-%= $o %
-%= $cmd %> failed with code <%= $r %>!
+?= $o ?
+?= $cmd ?> failed with code <?= $r ?>
--->
-
-%= $who ? "$user's" : "your" %
-
-%
+?= $who ? "$user's" : "your" ?
+
+?php
-        }
-%
+?
-
-        <br />
-        <span style="font-weight: bold; text-transform: uppercase">
-%= $who ? ($who . "'s comments on his own links") : "Your comments on your own links" %>:</
+?= $who ? ($who . "'s comments on his own links") : "Your comments on your own links" ?>
-        <div class="onepxlline">&nbsp;</div>
-        <br />
-
-%
+?php
-        $c = 1; #counter
-        $the_dir = get_webserver_root() . '/_comments/' . $user;
@@ -127 +168 @@
-                }
-        } else {
-%
+?
-<!--
-DEBUG: 
-%= $cmd %> failed with code <%= $r%
+?= $cmd ?> failed with code <?= $r?
--->
-<center>
-%= $who ? "$who hasn't" : "you haven't" %
+?= $who ? "$who hasn't" : "you haven't" ?
-</center>
-<br />
-%
+?php
-        } # end if dir exists:
-%
+?
-
-</div>
-
-<div class="column" style="float: right;">
-%= $who ? $who . "'s" : "" %
+?= $who ? $who . "'s" : "" ?
-        <div class="onepxlline">&nbsp;</div>
-        <br />
-
-%
+?php
-        chdir( get_webserver_root() );
-        $cmd = "find _comments/ -type f | sort -r | xargs -n1 grep -H $user, | grep -v comments/$user | sort -r -k 2";
@@ -179 +220 @@
-                }
-        } else {
-%
-%= $who ? "$user has" : "you've" %
+?
+?= $who ? "$user has" : "you've" ?
-<br />
-<!-- DEBUG:
-%= $o %
-%= $cmd %> failed with code <%= $r %>!
+?= $o ?
+?= $cmd ?> failed with code <?= $r ?>
--->
-%
+?php
-        }
-%
+?
-
-</div>
@@ -197 +238 @@
-<br />
-<div width="650">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

feedmelinks/contacts/add.php

@@ -6 +6 @@
-        $u = $_COOKIE["c_uid"];
-%>
-new-portal
+style/main
-<%
-

feedmelinks/contacts/remove.php

@@ -6 +6 @@
-        $u = $_COOKIE["c_uid"];
-%>
-new-portal
+style/main
-<%
-

feedmelinks/contacts/testing.php

@@ -6 +6 @@
-        $u = $_COOKIE["c_uid"];
-%>
-new-portal
+style/main
-<%
-

feedmelinks/diespammersdie/index.php

@@ -9 +9 @@
-        </title>
-
-new-portal
+main
-        <link href="/style/one-page.css" rel="stylesheet" type="text/css">  
-

feedmelinks/diespammersdie/report.php

@@ -9 +9 @@
-        </title>
-
-new-portal
+main
-        <link href="/style/one-page.css" rel="stylesheet" type="text/css">  
-

feedmelinks/modules/header.inc.php

@@ -21 +21 @@
-        <link rel="shortcut icon" href="/img/favicon.png" type="image/png">
-        <% if( $css ) { %><link rel="stylesheet" type="text/css" href="<%= $css %>"><% } %>
-
-
+
-        <link rel="alternate" type="application/rss+xml" title="Feed Me Links" href="<?= $site ?>/rss">
-
@@ -56 +55 @@
-  if( ! $noBody )
-    echo "<body>";
+?>
+
+<script type='text/javascript' src='http://track3.mybloglog.com/js/jsserv.php?mblID=2006121201422511'></script>
+
+<?php
-        if( ! $noMenu )
-                include( "$modules/menu.inc.php" ); 

feedmelinks/modules/utils.inc.php

@@ -169 +169 @@
-    fclose( $f );
-  }
+}
+
+# convenience function, now part of php5
+function file_put_contents( $filename, $data ) {
+        return file_put_contents_driver( $filename, $data, "w+" );
+}
+
+function file_append_contents( $filename, $data ) {
+        return file_put_contents_driver( $filename, $data, "a+" );
+}
+
+function file_put_contents_driver( $filename, $data, $mode ) {
+        if( !$f = fopen($filename, $mode)) {
+                echo "Cannot open file ($filename)";
+                exit;
+        }
+        if( fwrite($f, $data) === FALSE) {
+                echo "Cannot write to file ($filename)";
+                exit;
+        }
+        fclose($f);
+        return "Success, wrote ($data) to file ($filename)";
-}
-
@@ -562 +584 @@
-    $pi["samanthers"] = true;
-    $pi["r34l"] = true;
+    $pi["chrishaney"] = true;
+    $pi["troubledyouth"] = true;
-
-    #$pi["rrhobbs"] = true;
@@ -582 +606 @@
-  $config = new Config;
-
+        function mk_folder( $f ) {
+                if( !$f || is_dir( $f ))
+                        return;
+                $old_umask = umask(0);
+                mkdir( $f );
+                umask($old_umask);
+        }
+
-  function make_user_dir( $u ) {
-    chdir( get_root() );
-    $u_dir = get_user_folder( $u ? $u : get_user() );
-    if( ! is_dir( $u_dir )) {
-
-
-
+
-    }
-    if( !is_dir( $u_dir )) 
@@ -663 +693 @@
-  }
-
-
-  function startTell( $t = "", $wide = false ) {
-%>
+<link rel="stylesheet" type="text/css" href="/style/notebox.css">
-<div class="notebox" <%= $wide ? 'style="width: 600px; margin-left: auto; margin-right: auto;"' : ""%>>
-  <div class="noteboxHead" <%= $wide ? 'style="font-size: 140%;"' : ""%>><h2><%= $t %></h2></div>
@@ -716 +746 @@
-    $linkfolder = $COMMENT_DIR . $folder;
-    return( get_root() ."/" . $COMMENT_DIR . $folder . escapeshellcmd( $l ) . $COMMENT_EXT );
+  }
+
+  function get_undo_file( $u, $noun, $verb ) {
+    if( ! $u )
+      return; 
+    $u = escapeshellcmd( $u );
+    $f = get_root() ."/" . get_user_folder( $u ) . "/undo";
+    if( ! is_dir( $f ))
+      mk_folder( $f );
+                if( $noun )
+      mk_folder( "$f/$noun" );
+    $noun = $noun ? $noun : "last"; 
+    return "$f/$noun" . ($verb ? "/$verb" : "");
-  }
-
@@ -1475 +1518 @@
-      if( $debug )
-        echo "<br><b>making usr dir..</b><br>";
-
-
-
+
-    }
-    if( is_writable( $argCacheFile )) {
@@ -2400 +2441 @@
-}
-
+function parse_comment( $c ) {
+        if( ! $c )
+                return ;
+        $pieces = explode(", ", $c);
+        return array( "user" => $pieces[0], "date" => $pieces[1], "comment" => $pieces[2]);
+}
+
-function getCommentCSS() {
-      return '
@@ -2452 +2500 @@
-  }
-
+# flock a file and read into an array
+function get_file_safe( $fname ) {
+        if( !$fname )
+                return;
+        ignore_user_abort(true);
+        $f = fopen( $fname, 'r' );
+        flock( $f, LOCK_SH );
+        $lines = file( $fname );
+        flock( $f, LOCK_UN );
+        fclose( $f );
+        return $lines;
+}
+
-function getCommentsForLink() {
-    $args = func_get_args();
@@ -2457 +2518 @@
-    $argUser = $args[1];
-    $debug = 0;
-    #$debug = $args[2]
+               $u = get_user()
-
-    $link = $argId;
@@ -2464 +2525 @@
-
-      $owner = getOwnerForLink( $link );
+                        $yours = ($u == $owner) ? true : false;
-      $linkfile = get_comments_file( $link, $owner );
-      
@@ -2469 +2531 @@
-          if( $debug )
-            echo "(COMMENTS FILE $link$COMMENT_EXT  EXISTS AND IS READABLE)<br /><br />"; 
-
-
-
-
-
-
-
-
+
+
+
-
-  %>
@@ -2509 +2566 @@
-            }
-
-
+
+
+
+
+
-          }
-      } else {
@@ -2521 +2582 @@
-      echo "NO LINK or INVALID LINK ID ($argID)<br />";
-    }
-    #if( ! $comments )
-      #echo "&#160;NO COMMENTS FOR THIS LINK EXIST (YET)<br />";
-    if( $argUser && $argUser != "nobody")
-      echo getAddCommentForm( $argId, $comments, $debug );
@@ -2761 +2820 @@
-
-      if( !is_dir( $linkfolder ) || !is_writable( $linkfolder )) {
-
-
-
+
-      } else
-        if( $debug )
@@ -3361 +3418 @@
-
-function getLink( $id, $url, $text, $title, $class, $target ) {
+        ob_start();
-  if( $url && $text) {
-    ob_start();
-    $url = encodeAmps( $url );
-    $title = $title ? "title=\"" . encodeAmps( $title ) . "\"" : "";
@@ -3368 +3425 @@
-    $target = $target ? "target=\"$target\"" : "";
-%><a <%= $title ? $title : "" %> href="<%= $url %>" <%= $class %> <%= $target %>><%= $text %></a><%= isPrivate( $id ) ? "&#160;" . getLinkLock( $id ) : "" %><%
-
-
-
+
+
+
+
+
-}
-
@@ -3610 +3669 @@
-    return $txt;
-  }
+
+function formatAsSimpleDate( $ts ) {
+  return preg_replace( "/T.*$/", "", formatAsDCDate( $ts ));
+}
-
-function formatAsDCDate( $ts ) {

feedmelinks/modules/view-link.inc.php

@@ -26 +26 @@
-                        $owned = ( $user == $u ) ? 1 : 0;
-
+                        if( $mesg ) {
-%>
-
-
+
+
-</div>
-<%
+
+                        }
-                        if( $owned ) {
-%>

feedmelinks/portal-uncached.php

@@ -26 +26 @@
-                <meta name="ICBM" content="42.544396, -83.213255">
-                <meta name="DC.title" content="Feed Me Links!">
-new-portal
+main
-        </head>
-
@@ -64 +64 @@
-                </div>
-                
-new-portal
+main
-<style type="text/css">
-        .peepBox {

feedmelinks/testing/contacts.php

@@ -11 +11 @@
-
-%>
-new-portal
+style/main
-
-<pre>