Changeset 1423

Timestamp:

03/16/07 10:16:26 (2 years ago)

Author:

jm3

Message:

ibehind in committing

Files:

• feedmelinks/modules/header.inc.php (modified) (1 diff)
• feedmelinks/modules/main-controller.inc.php (modified) (6 diffs)
• feedmelinks/modules/my-recent.inc.php (modified) (1 diff)
• feedmelinks/modules/utils.inc.php (modified) (28 diffs)
• feedmelinks/modules/view-link.inc.php (modified) (1 diff)

feedmelinks/modules/header.inc.php

@@ -44 +44 @@
-  if( ! $noFAJAX ) {
-?>
-
+/
-        <script language="javascript">
-                        fml.user = "<%= $u %>";

feedmelinks/modules/main-controller.inc.php

@@ -23 +23 @@
-        } else if( $op == "makeNewFolderAndSubmit" ) {
-                if( $debug )
-
+ 
-                if( $url && $linkName ) {
-                        if( $newFolderName ) {
@@ -30 +30 @@
-                                $name = urlencode( $linkName );
-                                $userid = urlencode( $u );
-$isPrivate ? 1 : "NULL"
+($isPrivate && $isPrivate != "NULL" && $isPrivate!= "0" && isPrivate != "no" ) ? 1 : 0
-
-                                # first we create the new category
@@ -41 +41 @@
-
-                                # then we add the link:
-
+, ($from = $from ? $from : "makeNewFolderAndSubmit")
-                                if( $q ) {
-                                        echo "link added!<br />\n"; 
@@ -78 +78 @@
-                        }
-                        $userid = urlencode( $u );
-$isPrivate ? 1 : "NULL"
+($isPrivate && $isPrivate != "NULL" && $isPrivate!= "0" && isPrivate != "no" ) ? 1 : 0
-                        $options = ""; # not yet implemented
-
@@ -86 +86 @@
--->
-<?php
-
+, ($from = $from ? $from : "main-controller-submit") 
-                        if( $q ) {
-                                echo "link added!<br />\n"; 
@@ -153 +153 @@
-                        $createDate = urlencode( $createDate );
-                        $userid = urlencode( $u );
-$isPrivate ? 1 : "NULL"
+($isPrivate && $isPrivate != "NULL") ? 1 : 0
-
-    $qs = "REPLACE INTO links VALUES($id, '$url', '$name', '$createDate', NULL, '$userid', $groupid, $isPrivate);";

feedmelinks/modules/my-recent.inc.php

@@ -61 +61 @@
-                        <?= makeLink( $id, "/t/$id", urldecode( mysql_result($q,$i,"name")), $url, "", "" ) ?>
-                        <?= makePermaLink( $id ) ?>
+                        <?= makeDeleteLink( $id ) ?>
-<?php echo "\n"; ?>             <div style="text-align: right;">
-<?php $cats = getShortCategoriesForLinkAsHTML( $id, $u, 0, 0 ); ?> <?= $cats ? "in: $cats" : "(<a href='/f/unfiled'>" . getUnCattedName() . "</a>)" ?> 

feedmelinks/modules/utils.inc.php

@@ -11 +11 @@
-define( "IDLENESS", 1 );
-define( "SPAMMING", 2 );
+
+function get_links_tagged_for_me( $user ) {
+        $links = array();
+        $qs = getQuery( "links_tagged_for_me", "$user" );
+        $q = run_query( $qs );
+        $c = mysql_num_rows($q);
+        echo "<p>$user has " . ($c ? $c : 0 ) . " links tagged!</p>";
+        while( $row = mysql_fetch_assoc( $q )) {
+                $ID = urldecode( $row["ID"] );
+                $name = urldecode( $row["name"] );
+                $links[$ID] = $name;
+        }
+        return $links;
+}
-
-function has_me_as_a_peep( $them, $me ) {
@@ -100 +114 @@
-}
-
+function encode_for_xml( $s ) {
+        if( ! $s )
+                return;
+        return preg_replace( "/_FML_AMP_/", "&amp;", preg_replace( "/_FML_EQUALS_/", "=", urlencode( preg_replace( "/&/", "_FML_AMP_", preg_replace( "/=/", "_FML_EQUALS_", $s )))));
+}
+
-function encode_url_for_xml( $url ) {
-        $pieces = explode("?", $url);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -416 +453 @@
-}
-
-
-
-
+
+
+
+
+
-}
-
@@ -472 +511 @@
-function report_spammer( $alleged_spammer, $reporter ) {
-        $reporter = $reporter ? $reporter : "anonymous";
-get_ip() . ": $reporter reported $alleged_spammer as a spammer"
+"[spammer reported] $alleged_spammer reported by $reporter, " . get_ip()
-  $body = "$alleged_spammer was reported as a spammer (gasp!).
-http://feedmelinks.com/u/$alleged_spammer
@@ -554 +593 @@
-  $q = run_query( getQuery( "snuff_user", $user ));
-
-get_ip() . ": " . get_user() . " snuffed out user $user"
+"[snuffed] $user by " . get_user()
-  echo get_snuffed_mesg();
-?>
@@ -741 +780 @@
-}
-
-
+, $manual = false
-        $site = get_site();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-You can start using Feed Me Links immediately; your current account password is: " . getPasswdForUser( $u ) ."
@@ -753 +810 @@
-
-The Feed Me Links Robot";
+}
-  $headers = get_mail_headers();
-  $to = getEmailAddressForUser( $u );
-  $success = mail( $to, "Welcome back to Feed Me Links!", $body, $headers);
-  if( $success )
-
+" . ($manual ? "[MANUAL] " : "" ) . "
-  return $success;
-}
@@ -1093 +1151 @@
-
-    $qs = getQuery( "add_new_category_xref", $newLinkID, $catNum );
-    if( $debug )
-      echo "DEBUG: $qs";
-    $q = mysql_query( $qs );
-    if( ! $q ) {
-      $e = mysql_error($con);
-      $tok = get_mysql_dupe_error();
-! strstr( $e, $tok
+$e && (!strstr( $e, $tok)
-%>
-<div class="attention warning">
@@ -1105 +1161 @@
-Error was: <%= $e %>
-</div>
-%
+?php
-        break;
-      } else {
@@ -1122 +1178 @@
-
-  function dumpParams() {
-%
-%
+?
+?php
-    foreach( $_GET as $pname => $pval ) { e( $pname . " = " . $pval ); }
-    e( "" );
-    foreach( $_POST as $pname => $pval ) { e( $pname . " = " . $pval ); }
-
-
-
+
+
+
+
+
+
+
-
-  # search to see if the URL exists anywhere public
-  function link_exists( $url ) {
-
-
+
-    if( $q && mysql_num_rows($q) )
-      return mysql_result( $q, 0, "id" );
@@ -1279 +1338 @@
-
-  function fatal( $m ) {
-( "FATAL ERROR.", $m
+og_mesg_to( "[FATAL ERROR] $m", "global"
-    return tell( "Darn! ", $m );
-  }
@@ -1683 +1742 @@
-
-function get_peeps_feed( $user, $user_key ) {
-        #echo "<br>";
-        #echo "user is: $user<br>";
-        #echo "user_key is: $user_key<br>";
-        #echo "get_feed_key($user)  is: " . get_feed_key( $user ) . "<br>";
-        #echo "<br>";
-        $users = get_someone_elses_contacts( $user );
-        #print_r( $users );
-        #echo "<br>";
-        if( ! $user || $user_key != get_feed_key( $user )) {
-                echo "no user or invalid key.";
@@ -1697 +1749 @@
-        }
-
-        #echo "no done yet!!!<br>";
-        $users = get_someone_elses_contacts( $user );
-        Header( "Content-type: Text/XML" );
@@ -2396 +2447 @@
-                        SELECT * FROM tags WHERE name = 'private' AND userid = '" . urlencode( $args[1] ) . "';";
-
+        } else if( $argWhichQuery  == "links_tagged_for_me" ) {
+                $me = urlencode( $args[1] );
+    return "
+                SELECT * FROM tags, links, links_tags_xref WHERE tags.name = 'for:$me' AND links_tags_xref.tagID = tags.ID AND links_tags_xref.linkID = links.ID AND (links.isPrivate is NULL OR links.isPrivate = 0) LIMIT 15;";
+
-        } else if( $argWhichQuery  == "rude_solo_im_name" ) {
-    return "
@@ -2451 +2507 @@
-    return "
-    INSERT INTO spam_IPs VALUES ( '" . urlencode($args[1]) . "', '" . urlencode($args[2]) . "', '" . urlencode($args[3]) . "', NULL, NULL ) ";
+
+  } else if( $argWhichQuery  == "add_spammer_domain" ) {
+    return "
+    INSERT INTO spam_domains VALUES ( NULL, '" . urlencode($args[1]) . "');";
-
-  } else if( $argWhichQuery  == "links_per_user" ) {
@@ -2464 +2524 @@
-    SELECT * FROM tags WHERE userId = '" . urlencode($args[1]) . "' ORDER BY name ASC;";
-
+  } else if( $argWhichQuery  == "recent_public" ) {
+    return "
+    SELECT ID, name, url, createDate, userid FROM links WHERE IsPrivate IS NULL ORDER BY ID DESC LIMIT " . mysql_real_escape_string($args[1]) . ";";
+  
+        } else if( $argWhichQuery  == "simple_recent_for_user" ) {
+    return "
+    SELECT ID, name, url, createDate FROM links WHERE IsPrivate IS NULL AND userid = '" . urlencode($args[2]) . "' ORDER BY ID DESC LIMIT " . mysql_real_escape_string($args[1]) . ";";
+  
-  } else if( $argWhichQuery  == "most_recent_link_for_user" ) {
-    return "
@@ -2513 +2581 @@
-  
-  } else if( $argWhichQuery  == "get_id_for_existing_link" ) {
-
+
+
+
-
-  } else if( $argWhichQuery  == "tag" ) {
@@ -2569 +2639 @@
-  
-  } else if( $argWhichQuery  == "add_link" ) {
-
-
-
-
+
+
+
+
+
+
+
-
-  } else if( $argWhichQuery  == "add_tag" ) {
@@ -2640 +2713 @@
-function encodeAmps( $argS ) {
-  # replace any unescaped ampersands
-(&)([^(amp;)])/", "&amp;$2", $argS 
+</", "&lt;", preg_replace( "/>/", "&gt;", preg_replace( "/(&)([^(amp;)])/", "&amp;$2", $argS ))
-}
-
@@ -3015 +3088 @@
-# judge, jury, and executioner
-function isJJE( $u ) {
-
+puppetmaster_
-    return true;
-  else
@@ -3022 +3095 @@
-
-function isSuperUser( $u ) {
-
+puppetmaster_
-    return 1;
-  else
@@ -3381 +3454 @@
-  if( $num_rows > 1 ) {
-    #disabled because it got too noisy:
-$ip: potential spammer $argUserId ($argEmail) creating multiple accounts from the same IP
+[account creation attempt] $argUserId, $argEmail, $ip
-    $q = run_query( getQuery( "log_ip", $argUserId, $argEmail, $ip ));
-    return;
@@ -3511 +3584 @@
-}
-
- = "NULL"
+, $from
-  if( !( $argUrl &&  $argName && $argSubmitter )) 
-    return 0;
@@ -3522 +3595 @@
-  if( get_tag_to_link_ratio( $argSubmitter ) > get_max_ttl_ratio() ) { # this could be contraversial
-    $isPrivate = 1;
-get_ip() . ": privatizing new link from $argSubmitter
+"[privatize new link from spammer] $argSubmitter, " . get_ip() . ", via:$from
-        }
-
-
+, $from
-  if( $debug ) 
-    echo "qs: $qs<br>";
-  $q = mysql_query( $qs );
-  $id = $q ? mysql_insert_id() : 0;
+        log_mesg_to( "[$from] (" . ($isPrivate ? "private" : "public") . ")  $argUrl, $argName, $argSubmitter", "links" );
-  conClose();
-  return $id;
@@ -3535 +3609 @@
-
-# deprecated; call addLinkSimple() instead
-
+from, $
-  if(  !( $argUrl &&  $argName && $argSubmitter ))
-    return 0;
@@ -3542 +3616 @@
-    return 0; # FIXME: signal this error back to the user!!!!
-  
-
+
+
-  return $q;
-}
@@ -4052 +4127 @@
-
-function get_tag_IDs_as_string( $argId, $argUserId ) {
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -4068 +4148 @@
-  $cats = preg_replace( "/a> /", "a>&#160;", $cats );
-  return $cats;
+}
+
+# deprecated, call get_tags() instead
+function getCategoriesForLink( $link_ID, $user ) {
+        return get_tags( $link_ID, $user );
+}
+
+function get_tags( $link_ID, $user ) {
+        return get_tag_names( $link_ID, $user );
-}
-

feedmelinks/modules/view-link.inc.php

@@ -71 +71 @@
-        <div ftype="name" fid="<%= $l %>">
-                <a 
-Click to view
+<?= $name ?>
-                        onMouseOver="window.status='<?= $link ?>'; return true;"
-                        onMouseOut="window.status=''; return true;"