Changeset 1286

Timestamp:

12/30/06 15:44:39 (2 years ago)

Author:

jm3

Message:

comment deletion implemented with auto-return to the last page you were on, and a status message

Files:

• feedmelinks/comments/delete.php (modified) (3 diffs)
• feedmelinks/comments/index.php (modified) (6 diffs)
• feedmelinks/modules/menu.inc.php (modified) (1 diff)
• feedmelinks/modules/utils.inc.php (modified) (7 diffs)
• feedmelinks/modules/view-link.inc.php (modified) (1 diff)
• feedmelinks/style/main.css (modified) (1 diff)
• feedmelinks/testing/get_users_comments_on_others_links.php (added)

feedmelinks/comments/delete.php

@@ -21 +21 @@
-<h1> Delete comment: </h1>
-<?php
-if( getOwnerForLink( $link ) != $u )
-               bounceBack(
-
-$comments = get_file_safe( get_comments_file( $link, $u ));
+$owner = getOwnerForLink( $link );
+$comments = get_file_safe( get_comments_file( $link, $owner )
+
+# verify that the comment being deleted exists:
-                if( ! array_key_exists( $comment, $comments ))
-                        bounceBack();
+                
+                # extract the fields:
+                $c = parse_comment( $comments[ $comment ]);
+                $commenter = $c["user"];
+
+                if( $owner != $u && $commenter != $u )
+                                echo bounceBack();
-
-                # cache it for displaying in any error messages
-
-
+
-
-                if( $debug )
@@ -36 +42 @@
-
-                # back up the comment file so the deletion can be un-done if necessary
-
+ # note that the COMMENTER owns the undo - not the link-owner
-                file_append_contents( $undo_file, $link . ":" . $comments[ $comment ]);
-
@@ -48 +54 @@
-                
-                # write the modified array back into the comment file
-u
+owner
-
-                # send the user back to the link page with a note that the comment was deleted
-"/$link/m/Comment
+$from ? "$from?mesg=Comment+from+$commenter+deleted." : "/$link/m/Comment+from+$commenter
-?>
-

feedmelinks/comments/index.php

@@ -16 +16 @@
-
-<style type="text/css">
-
-
-
-
-
-
+
+
-</style>
-
@@ -27 +23 @@
-                include( "$modules/header.inc.php" ); 
-                $show_comments = true;
+
+                if( $mesg ) {
-?>
+<br><div class="warning"><?= $mesg ?></div>
+<?php } ?>
-
-<h1>
@@ -37 +37 @@
-?>
-</h1>
-<?php
-                if( $show_comments ) {
-?>
-
-<div style="width: 630px; height: 400px;">
@@ -49 +46 @@
-
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-?>
-                <b><?= $n ?> <?= $n == 1 ? "comment" : "comments" ?></b>:<br />
-<?php
-                
-                foreach ($oba as $line) {
-        
-                        preg_match("/comments\/$user\/(\d+).*:([^,]+), ([^,]+), (.*)$/", $line, $matches );
-                        $linkId = $matches[1];
-                        $commentor = $matches[2];
-                        $date = $matches[3];
-                        $comment = format_comment( $matches[4] );
-        
-                        echo "$c)  by ";
-                        echo makeUserLink( $commentor ) . " on ";
-                        echo formatTS( $date ) . " :\n";
-                        echo "<br />\n";
-                        echo "&nbsp; &nbsp; ";
-                        echo makeLinkOut( $linkId ) . " ";
-                        echo makePermaLink( $linkId );
-                        echo "<br />\n";
-                        echo "&nbsp; &nbsp; <em>$comment</em>\n";
-                        echo " &nbsp; [" .  get_comment_delete_link( $linkId, $line_num ) . "]";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<?php
-        }
-?>
-
-        <br />
-        <h3><?= $who ? ($who . "'s comments on his own links") : "Your comments on your own links" ?></h3>
-        <div class="onepxlline">&nbsp;</div>
-        <br />
-
-<?php
-        $c = 1; #counter
-        $the_dir = get_webserver_root() . '/_comments/' . $user;
-        if( is_dir( $the_dir )) {
-        chdir( $the_dir );
-        $cmd = "grep -l '^$user' * | sort -rn";
-        $n = exec( "$cmd | wc -l" );
-        exec( $cmd, $oa, $r );
-        
-        echo "<b>$n comments</b><br />\n";
-        foreach ($oa as $commentFile) {
-                $id = substr( $commentFile, 0, -4 ); # trim the ".txt" extension
-                
-                $cmd = "cat $commentFile | grep '^$user' | wc -l";
-                $yrComments = exec( $cmd );
-
-                if( $yrComments != 0 ) {
-        
-                        $cmd = "wc -l $commentFile | awk '{print $1}'";
-                        $totalComments = exec( $cmd );
-                        
-                        echo "$c : <a href=\"/$id\">$yrComments comment" . ($yrComments == 1 ? "" : "s" ) . "</a> on ";
-
-                        echo makeLinkOut( $id ) . " ";
-                        echo makePermaLink( $id );
-                        if( $yrComments != $totalComments ) {
-                                echo " ($totalComments total)\n";
-                        }
-                        echo "<br />\n";
-                                $c++;
-                        }
-                }
-        } else {
-?>
-<!--
-DEBUG: 
-<?= $cmd ?> failed with code <?= $r?> !
--->
-<center>
-(<?= $who ? "$who hasn't" : "you haven't" ?> any comments to your links)
-</center>
-<br />
-<?php
-        } # end if dir exists:
-?>
-
-</div>
-
@@ -162 +64 @@
-
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-               $c++;
-}
+if( count( $commented_links ) != 0 ) {
+echo "<b>$num comments</b><br />\n";
-        } else {
-?>
@@ -217 +94 @@
-
-<?php 
-                }
-        } else {  ?>
-<?= bounceTo( $site . "/login?bounceToPage=" . urlencode( "comments" )) ?>

feedmelinks/modules/menu.inc.php

@@ -11 +11 @@
-You are logged in as:<a class="tn" href="/"><%= $u %></a>
-<% } %>
-
-
-
-
+/
+/
+/
+/
-
-<br />
-
-
-
-
-
+/
+/
+/
+/
-<a class="tn" href="javascript:;" onClick="openContactUs()">Send Feedback!</a>
-
-
+/
-        <!-- <a class="tn" href="search"><img src="/img/mag-glass-tn.png" alt="search" align="top" border="0" /></a>  -->
-        <form name="search_form" action="search">

feedmelinks/modules/utils.inc.php

@@ -6 +6 @@
-include_once( "env.inc.php" );
-include( get_root() . "/modules/prep-cache.inc.php" );
+
+function dump( $var ) {
+        echo "<pre>";
+        print_r( $var );
+        echo "</pre>";
+}
-
-function re_enable_user( $u ) {
@@ -2445 +2451 @@
-                return ;
-        $pieces = explode(", ", $c);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-function getCommentCSS() {
@@ -2554 +2596 @@
-            $comments = true;
-            list($user,$date,$comment) = explode(", ",$line, 3);
+                                                $commenter = $user == $argUser ? true : false;
-                                                $comment = format_comment( $comment );
-            if( $line_num )
@@ -2575 +2618 @@
-            echo "<div class=\"$class\" id=\"comment_" . $argId . "_" . $line_num . "\" style=\"width: 40em;\">$comment";
-                                                echo "<p/>";
-
-"[<a href='/comments?op=delete&link=$argId&comment=$line_num'>delete</a>]"
+|| $commenter 
+get_comment_delete_link( $argId, $line_num )
-                                                echo "</div><br />";
-          }
@@ -2806 +2849 @@
-}
-
+# returns an array of link comment files
+function get_others_comments_on_my_links( $argUser ) {
+        if( ! $argUser )
+                return;
+        $safe = escapeshellcmd( $argUser );
+        $cmd = "find " . get_root() . "/_comments/$argUser -type f -name \*.txt | sort -r";
+        exec( $cmd, $out );
+        return $out;
+}
+
+# returns an array of link comment files
+function get_users_comments_on_others_links( $argUser ) {
+        if( ! $argUser )
+                return;
+        $safe = escapeshellcmd( $argUser );
+        $cmd = "find " . get_root() . "/_comments/ -type f -print -o -name $safe -prune  | sort -r | xargs -n1 grep -H '^$safe' | sort -r -k 2 | sed 's/:.*$//'";
+        exec( $cmd, $out );
+        return $out;
+}
+
-function addCommentToLink( $argId, $argComment, $commenter, $debug ) {
+  log_mesg_to( "attempted comment: $argId, $argComment, $commenter, debug: $debug" , "global" );
+
-  $link = $argId;
-  $comment = $argComment;
@@ -2817 +2882 @@
-    if( ! isValidUser( $commenter )) {
-      $e = "$commenter is not a valid user";
+                        log_mesg_to( $e, "global" );
-      return $e;
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-          $headers = get_mail_headers();
-          $mailSuccess = mail( $to, $subject, $body, $headers);
+                                        log_mesg_to( "sent comment notifation email from $commenter to $to", "mail" );
-          if( $debug )
-            echo "(DEBUG: &#160;  mailSuccess to \"$to\" was: $mailSuccess)<br />\n";
@@ -3574 +3642 @@
-}
-
+function make_comment_delete_link( $linkId, $number, $from ) {
+        echo get_comment_delete_link( $linkId, $number, $from );
+}
+
+function get_comment_delete_link( $linkId, $number, $from ) {
+        return "[<a href='/comments/delete?link=$linkId&comment=$number&from=$from'>delete</a>]";
+}
+
-function makeDeleteLink( $id ) {
-  %><a title="Delete this link?" href="javascript:openDelete('<%= $id %>');"><img src="img/delete_entry_16.png" valign="middle" height="16" width="16" alt="delete" border="0" /></a><%

feedmelinks/modules/view-link.inc.php

@@ -28 +28 @@
-                        if( $mesg ) {
-%>
-
-<div class="warning">
-        <?= $mesg ?>
-</div>
-<%
-
-                        }
-                        if( $owned ) {

feedmelinks/style/main.css

@@ -360 +360 @@
-        border-top: 1px solid #637459;
-}
+
+.onepxlline { background-color: #666666; height: 1px; font-size:1px; line-height:1px; }
+
+.column {
+        border: 1px solid #708979;
+        width: 300px;
+        padding: 4px;
+        background-color: #EEEEEE;
+}
+