Changeset 1352

Timestamp:

03/01/07 18:58:29 (2 years ago)

Author:

jm3

Message:

lots o changes (big ones in bold):

• added export in delicious format xml
  
• account removal
  
• much, much nicer (as in, they actually exist) reminder emails for pending account expiration
  
• added self-service account re-enablement for auto-disabled users
  
• much, much nicer emails for
  
• added two new answers to the FAQ
  
• re-arranged search to move the options to the top (duh)
  
• refactored tag-ame related functions
  
• added AIM as a valid profile field
  
• wrote validation code process to linking your AIM account to FML
  
• whee!!!!
  

Files:

• feedmelinks/.t (modified) (1 diff)
• feedmelinks/FAQ/index.php (modified) (3 diffs)
• feedmelinks/admin/disable-user.php (added)
• feedmelinks/admin/expire-old-users.php (modified) (4 diffs)
• feedmelinks/admin/index.php (modified) (1 diff)
• feedmelinks/admin/re-enable-user.php (deleted)
• feedmelinks/api/add.php (modified) (1 diff)
• feedmelinks/api/comment.php (modified) (1 diff)
• feedmelinks/api/restricted/secure-call.php (modified) (1 diff)
• feedmelinks/categorize.php (modified) (1 diff)
• feedmelinks/export (added)
• feedmelinks/export/index.php (added)
• feedmelinks/export/stevedore.php (added)
• feedmelinks/funnel.php (modified) (1 diff)
• feedmelinks/img/search-just-my-links.png (added)
• feedmelinks/modules/recent-with-times.inc.php (modified) (1 diff)
• feedmelinks/modules/utils.inc.php (modified) (17 diffs)
• feedmelinks/modules/view-link.inc.php (modified) (1 diff)
• feedmelinks/search-as-xml.php (modified) (1 diff)
• feedmelinks/search.php (modified) (3 diffs)
• feedmelinks/set-up/IM.php (modified) (2 diffs)
• feedmelinks/style/main.css (modified) (2 diffs)
• feedmelinks/testing/get_tag_name.php (added)
• feedmelinks/testing/get_tags.php (added)
• feedmelinks/testing/search.php (modified) (1 diff)
• feedmelinks/testing/view-link.php (modified) (1 diff)
• feedmelinks/user (added)
• feedmelinks/user-as-rss.php (modified) (1 diff)
• feedmelinks/user/re-enable.php (added)
• feedmelinks/user/remove-me.php (added)

feedmelinks/.t

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-?>
-
+<?php
+        include( "$modules/footer.inc.php" );
+?>
-
-
-<?php } ?>

feedmelinks/FAQ/index.php

@@ -36 +36 @@
-                        <ol>
-                                <li><a href="#q2"  >How do I add a link?</a></li>
+                                <li><a href="#search_my_links"  >How do I search just my own links?</a></li>
-                                <li><a href="#q5"  >Can I import all my favorites/bookmarks at once?</a></li>
-q6
+export
-                                <li><a href="#usage_email">Can I add links via email?</a></li>
-                                <li><a href="#q2_1">What the heck is a tag?</a></li>
@@ -206 +207 @@
-                <a href="#top">back to top</a>
-        </div>
+
+        <div>
+                <a name="search_my_links"></a>
+                <div class="q">How do I add a link?</div>
+                <div class="a">
+                        Use the search box on the top of the page and then press the "my links only" checkbox on the results page, like so
+                        <p/>
+                        <a href="/search"><img src="/img/search-just-my-links.png" border="0"/></a>
+                </div>
+                <a href="#top">back to top</a>
+        </div>
+
-
-        <div>
@@ -268 +281 @@
-
-        <div>
-q6
+export
-                <div class="q">Can I export my bookmarks from Feed Me Links to something else?</div>
-                <div class="a">
-we support connections via HTTP and
+
-                        can make your links available to you as XML
-                        over HTTP or RSS. <a href="mailto:<%= get_spamsafe_email() %>">Contact us</a> for access and

feedmelinks/admin/expire-old-users.php

@@ -12 +12 @@
-        $qs = getQuery( "all_users" );
-        $q = run_query( $qs );
-90
+get_num_days_allowed_idle()
-?>
-
@@ -30 +30 @@
-                return;
-
-deadbeat
+idler
-        while( $row = mysql_fetch_assoc( $q )) {
-                $user = $row["userid"];
@@ -37 +37 @@
-                if( $delta > $ttl ) {
-                        $expired = true;
-deadbeat
-disabl
+idler
+expir
-                } else {
-                        $expired = false;
@@ -56 +56 @@
-
-</table>
-deadbeats ?> deadbeat
+idlers ?> idler
-

feedmelinks/admin/index.php

@@ -34 +34 @@
-                <li><a href="/admin/delete-all-comments-from-spammer">delete all comments from spammer</a></li>
-                <li><a href="/admin/todays-users">today's new users</a></li>
-re-enable-user">re-enabl
+disable-user">disable/enable/expir
-                <li><a href="/admin/expire-old-users">expire old users</a></li>
-                <li><a href="/admin/snuff">snuff a user</a></li>

feedmelinks/api/add.php

@@ -54 +54 @@
-                }
-        } else {
- Me Links XML 
+_Me_Links_XML_
-                header('HTTP/1.0 401 Unauthorized');
-                echo "login first, please.";

feedmelinks/api/comment.php

@@ -19 +19 @@
-                echo "</response>";
-        } else {
- Me Links XML 
+_Me_Links_XML_
-                header('HTTP/1.0 401 Unauthorized');
-                echo "<response>login first, please.

feedmelinks/api/restricted/secure-call.php

@@ -7 +7 @@
-        $u    = $PHP_AUTH_USER ? $PHP_AUTH_USER : ( $user ? $user : $_COOKIE["c_uid"] );
-        $tok =  $authenticated = $_COOKIE["c_pass_token"];
+        header( "Content-type: text/xml");
-
-        if( $pass && $pass == getPasswdForUser( $u ) || ($tok && $tok == md5( getPasswdForUser( $u )))) {
-
-                if( ! isSuperUser( $u )) {
-This is a restricted API call. go away.
+<rest><response>This is a restricted API call. go away.</response></rest>
-                        return;
-                }
-
-
-
+
-                echo "  <request>$call($user)</request>\n";
-                echo "  <response>" . call_user_func( $call, $user ) . "</response>\n";
-call
+rest
-
-                if( $error ) {
-                        Header("HTTP/1.0 404 Not Found");
-                        echo $error;
-                }
-        } else {
- Me Links XML 
-
-login first, please.
+_Me_Links_XML_
+#
+<rest><response>login first, please.</response></rest>
-        }
-?>

feedmelinks/categorize.php

@@ -100 +100 @@
-                        $url = $li['url'];
-
-CategoriesForLink
+_tag_IDs
-                        if( $debug ) {
-                                print "rawCats:<br />";

feedmelinks/funnel.php

@@ -50 +50 @@
-                        $url = $li['url'];
-
-CategoriesForLink
+_tag_IDs
-                        if( $debug ) {
-                                print "rawCats:<br />";

feedmelinks/modules/recent-with-times.inc.php

@@ -148 +148 @@
-                <%= $i == 0 ? getCommentCSS() : "" %>
-                <%= getCommentsForLink( $id, "nobody", $debug ) %>
-CategoriesForLinkAsRs
+_tag_ID
-        ]]></content:encoded>
-        <dc:subject><%= $cats ? "$cats" : "(" . getUnCattedName() . ")" %></dc:subject>

feedmelinks/modules/utils.inc.php

@@ -6 +6 @@
-include_once( "env.inc.php" );
-include( get_root() . "/modules/prep-cache.inc.php" );
+
+# user status constants
+define( "ACTIVE",   0 );
+define( "IDLENESS", 1 );
+define( "SPAMMING", 2 );
+
+function get_mime_type( $format ) {
+        switch( $format ){
+                case "xml_delicious"    :    
+                        return "text/XML";
+                case "html"       :    
+                        return "text/HTML";
+                case "rss"       :    
+                        return "text/mark-pilgrim-is-crazy";
+                default: 
+                        return "text/plain";
+        }    
+}
+
+function get_extension( $format ) {
+        switch( $format ){
+                case "xml_delicious"    :    
+                        return ".xml";
+                case "html"       :    
+                        return ".html";
+                case "rss"       :    
+                        return ".rss";
+                default: 
+                        return ".txt";
+        }    
+}
+
+function force_valid_xml( $s ) {
+        if( ! $s ) return;
+        $raw_xml = tempnam( "/tmp", "$u_export" );
+        $clean_xml = "$raw_xml-clean.xml";
+        $handle = fopen( $raw_xml, "w" );
+        fwrite( $handle, $s );
+        fflush( $handle );
+
+        $output = shell_exec( get_bin() . "/tidy -q -xml -n $raw_xml > $clean_xml" );
+        fclose( $handle ); # unlinks raw_xml
+        $valid_xml = file_get_contents( $clean_xml );
+        unlink( $clean_xml );
+        return $valid_xml;
+}
+
+function encode_url_for_xml( $url ) {
+        $pieces = explode("?", $url);
+        return count( $pieces ) > 1 ? $pieces[0] . "?" . preg_replace( "/_FML_AMP_/", "&", preg_replace( "/_FML_EQUALS_/", "=", urlencode( preg_replace( "/&/", "_FML_AMP_", preg_replace( "/=/", "_FML_EQUALS_", $pieces[1] ))))) : $url;
+}
+
+function export_as_xml_delicious( $u, $select ) {
+        $now = format_mysql_date_as_DC_date( get_now_db());
+        return "<?xml version='1.0' standalone='yes'?>
+<posts update='$now' user='$u'>\n" . export( $u, "xml_delicious", $select ) . "</posts>";
+}
+        
+function render_as_xml_delicious( $u, $id, $url, $name, $createDate ) {
+        $hash = md5( $url );
+        $tags = preg_replace( "/ /", "_", implode( ",", get_tag_names( $id, $u )));
+        $url = encode_url_for_xml( $url );
+        return <<<EOT
+  <post href="$url" description="$name" hash="$hash" tag="$tags"/>
+
+EOT;
+}
+
+function export_as_html( $u, $select ) {
+        return "<ul>\n" .  export( $u, "html", $select ) . "</ul>";
+}
+
+function render_as_html ( $u, $id, $url, $name, $createDate ) {
+        return "  <li>not yet implemented</li>\n";
+}
+
+function export( $u, $format, $select ) {
+        if( ! $u ) return;
+        
+        $qs = "SELECT ID, url, name, createDate, isPrivate FROM links WHERE userid = '" . urlencode( $u ) . "'";
+        if( $select == "private" )
+                $qs .= " AND isPrivate = 1";
+        else if( $select == "public" )
+                $qs .= " AND isPrivate IS NULL";
+
+        # FIXME: remove limiter!!!!
+        $qs .= " ORDER BY createDate DESC LIMIT 500;";
+        
+        ob_start();
+        $q = run_query( $qs );
+
+        if( $q && mysql_num_rows($q) ) {
+                while( $row = mysql_fetch_assoc( $q )) { 
+                        $id        = $row["ID"];
+                        $url       = urldecode( $row["url"] );
+                        $name      = preg_replace( '/"/', "&amp;quot;", o( urldecode( $row["name"] )));
+                        $date      = format_mysql_date_as_DC_date( $row["createDate"] );
+                        $isPrivate = $row["isPrivate"];
+
+                        if( $select == "public" && $isPrivate == 1 )
+                                continue;
+
+                        echo call_user_func( "render_as_$format", $u, $id, $url, $name, $createDate );
+                }
+        }
+
+        $data = force_valid_xml( ob_get_clean());
+        return $data;
+}
+
+function h1( $s ) { echo "<h1>$s</h1>"; }
+function h2( $s ) { echo "<h2>$s</h2>"; }
+function h3( $s ) { echo "<h3>$s</h3>"; }
-
-function is_im_account_known( $im_name ) {
@@ -234 +347 @@
-
-function re_enable_user( $u ) {
+        notify_returning( $u );
-  return( get_simple_rs( getQuery( "re-enable_user", $u )));
-}
@@ -265 +379 @@
-
-function fire( $sub, $mesg ) {
-WHAT THE CHOPSTICKS!?!
+FML:
-}
-
@@ -316 +430 @@
-function enable_user( $user ) {
-  $q = run_query( getQuery( "enable_user", $user ));
-"; # FIXME: replace with a real status
+: re-enabled user $user";
-}
-
-function disable_user( $user ) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -435 +561 @@
-}
-
+function get_num_days_allowed_idle() {
+        return 90; # FIXME: move into server config
+}
+
+function notify_expired( $u ) {
+        $site = "http://" . get_domain();
+  $body = "Hello, $u.
+
+It looks like you've been busy and haven't been using your Feed Me Links account ($site/u/$u) lately. We tried to send you a reminder email last week, but perhaps you didn't receive it or weren't interested in continuing to use Feed Me Links. That's OK. :-)i
+
+Because your account has been unused for " . get_num_days_allowed_idle() . ", in order to protect your account and as a safegaurd against spammers, we have temporarly disabled your login until we hear from you that you would like to keep linking. Do NOT worry -- all your links are just fine are will be kept safely in Feed Me Links. 
+
+To Re-Enable your account, just click this link: $site/user/re-enable?user=$u&code=" . md5( getPasswdForUser( $u )) .  "
+
+(To completely REMOVE your account, please click $site/user/remove-me?user=$u)
+
+--
+
+Sorry for any inconvenience this may have caused you. If you have any questions, please email jm3@feedmelinks.com";
+  $headers = get_mail_headers();
+  $to = getEmailAddressForUser( $u );
+  $success = mail( $to, "Long time, no link : You haven't used Feed Me Links lately", $body, $headers);
+  if( $success )
+    log_mesg_to( "sent expiration notification mail to $to", "mail" );
+  return $success;
+}
+
+# FIXME: add blog.feedmelinks.com to servers.xml config
+function notify_expiring_soon( $u ) {
+        $site = get_site();
+  $body = "Hi $u, and thanks for trying Feed Me Links.
+
+We've noticed you haven't been using your Feed Me Links account very much.
+Maybe you've been busy -- we understand. We hope you'll give Feed Me
+Links another try. We've been working on some cool improvements to the
+site and we'd love to show them to you. You can read about what's new on
+the blog at http://blog.feedmelinks.com, or just log in:
+
+  $site/login
+
+To keep the site fresh, we normally expire unused accounts after 90
+days of inactivity, which for you will be in about a week. Don't worry: if
+you don't respond, your links and tags and peeps will NOT be deleted --
+we simply freeze your password to keep your account safe from potential
+hackers or spammers.
+
+To ensure that your account stays active, simply log in ($site/login)
+and link something, and your account will remain active as it is.
+
+If decide you'd rather leave Feed Me Links behind (sad!), we can help
+you to export your links (to use elsewhere), or, if you like,completely
+remove your account (although we'd obviously love for you to stay :-)
+
+  To export your links, go to: $site/export/
+  
+  To REMOVE your account, go to: $site/user/remove-me?user=$u&code=" . md5( getPasswdForUser( $u )) . "
+
+We hope you'll give Feed Me Links another try. Either way, thanks for signing up!
+
+Sincerely, 
+
+--
+
+John Manoogian III
+Feed Me Links
+www.jm3.net
+";
+
+$headers = get_mail_headers();
+  $to = getEmailAddressForUser( $u );
+  $success = mail( $to, "Feed Me Links: Was it something we said?", $body, $headers);
+  if( $success )
+    log_mesg_to( "sent impending expiration warning mail to $to", "mail" );
+  return $success;
+}
+
+function notify_returning( $u ) {
+        $site = get_site();
+  $body = "Hello $u -- welcome back! We're stoked that you've decided to keep using Feed Me Links.
+        
+You can start using Feed Me Links immediately; your current account password is: " . getPasswdForUser( $u ) ."
+If you would like to re-set your account password, just click here: $site/account
+
+Thanks, 
+
+--
+
+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 )
+    log_mesg_to( "sent welcome back mail to $to", "mail" );
+  return $success;
+}
+
-function notify_added_as_peep( $u, $by ) {
-  $body = "Hi, $u.
@@ -451 +673 @@
-  $headers = get_mail_headers();
-  $to = getEmailAddressForUser( $u );
-
-  $success = mail( $to, "Someone has added you as a contact", $body, $headers);
-  if( $success )
@@ -1369 +1590 @@
-                        $user = $row["userid"];
-      $users[$user] ++;
-      #echo "user: |" . $user . "| ";
-      #echo "(" . $users[$user] . ") ";
-
-      if( $users[$user] < $links_per_user ) {
-
-                        $name = urldecode( $row["name"] );
-                        $name = preg_replace( '/(&quot;|&amp;quot;)/', '"', $name );
-                        $name = preg_replace( '/&/', '&amp;', $name );
-
-
+
-?>
-
@@ -2108 +2324 @@
-  } else if( $argWhichQuery  == "disable_user" ) {
-    return "
-1
+" . $args[2] . "
-  
-  } else if( $argWhichQuery  == "snuff_pass" ) {
@@ -3527 +3743 @@
-}
-
+# deprecated, use get_tag_name
-function getNameForFolder( $argId ) {
-
-
+
+
+
+
+
+
-  else
-argI
+i
-}
-
@@ -3589 +3810 @@
-}
-
-
+
+
+
+
+
+
-  if( $argId ) {
-    if( $debug ) {
-      print "<br />";
-CategoriesForLink
+_tag_IDs
-    }
-    if( getOwnerForLink( $argId ) == $argUserId || ! isPrivate( $argId ) ) {
-CategoriesForLink
+_tag_IDs
-      mysql_selectdb( getDBName() );
-      $qs = "SELECT tagID FROM links_tags_xref WHERE linkID = $argId";
-      $q = mysql_query( $qs );
-      if( $debug )
-CategoriesForLink
+_tag_IDs
-      if( $q )
-        $numRows = mysql_num_rows($q);
-      else if( $debug )
-CategoriesForLink
+_tag_IDs
-        
-      $cats = Array();
-      for( $i = 0; $i < $numRows; $i++ ) {
-        if( $debug )
-CategoriesForLink
+_tag_IDs
-        if( canSeeCategory( mysql_result($q,$i,"tagID"), $argUserId )) {
-          if( $debug )
-            echo "pushing cat into cats";
-
+
+
+
+
+
-        } else {
-          if( $debug )
@@ -3621 +3851 @@
-      }
-      if( $debug ) {
-CategoriesForLink
+_tag_IDs
-        print_r( $cats );
-        print "<br />";
@@ -3627 +3857 @@
-      }
-    } else {
-CategoriesForLink
-
-CategoriesForLink
+_tag_IDs
+
+_tag_IDs
-    if( sizeof( $cats )) {
-      return $cats;
@@ -3638 +3868 @@
-}
-
-CategoriesForLinkAsS
+_tag_IDs_as_s
-  if( $argId && $argUserId ) {
-    return( implode( ", ",  getCategoriesForLink( $argId )));
@@ -3644 +3874 @@
-}
-
-
-
+, $no_prefix
+, $no_prefix
-}
-
-function getCategoriesForLinkAsRss( $argId, $argUserId, $showNoun, $showChange ) {
-CategoriesForLinkAs
+_tags_as_
-  $cats = preg_replace( "/^in /", "", $cats );
-  $cats = preg_replace( "/^$/", "", $cats ); # kill newlines
@@ -3657 +3887 @@
-}
-
-CategoriesForLinkAs
+_tags_as_
-  return getCategoriesForLinkAsHTMLDriver( $argId, $argUserId, $showNoun, $showChange, 1 );
-}
-
-
+, $no_prefix
-  if( $argId ) {
-CategoriesForLink
+_tag_IDs
-    $s = "";
-  
@@ -3683 +3913 @@
-          ? (!$owned 
-            ? ("Tagged with: " . getUserLink( $owner ) . "'s ") 
-"Tagged with: "
+($no_prefix ? "" : "Tagged with: ")
-          : "") . $s . $noun . ($owned 
-            ? ($showChange 
@@ -4087 +4317 @@
-function formatAsSimpleDate( $ts ) {
-  return preg_replace( "/T.*$/", "", formatAsDCDate( $ts ));
+}
+
+function format_mysql_date_as_DC_date( $d ) {
+  return preg_replace( "/ /", "T", $d ) . "Z";
-}
-

feedmelinks/modules/view-link.inc.php

@@ -100 +100 @@
-$createDate != "today" && $createDate != "yesterday" ? " on" : "," %> <%= $createDate %>.
-&nbsp;
-CategoriesForLinkAs
+_tags_as_
-
-<% 

feedmelinks/search-as-xml.php

@@ -65 +65 @@
-<link>
-<% 
-CategoriesForLinkAs
+_tags_as_
-
-        $name = preg_replace( "/&apos;/", "'", $name );

feedmelinks/search.php

@@ -59 +59 @@
-                <td class="header">
-                        <b><%= $numRows %> <%= $numRows == 1 ? "match" : "matches" %></b>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </td>
-        </tr>
@@ -85 +135 @@
-                <td <%= $bg %>>
-<% 
-CategoriesForLinkAs
+_tags_as_
-%>
-                        <big><%= makeLinkOut( $id ) %></big>
@@ -167 +217 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<br />
-<br />

feedmelinks/set-up/IM.php

@@ -26 +26 @@
-<div id="challenge">
-        <h1>Success! Your Validation Code is:</h1>
-<?= get_im_validation_phrase_for_user( $u ) ?>" size="2
-Copy &amp; paste the above phrase into AIM when asked for your challenge code
+validate me: <?= get_im_validation_phrase_for_user( $u ) ?>" size="3
+Paste the above text into your AIM window to finish the setup process
-        <br /><br /><br /><br />
-        <form>
-default button" style="padding: 0.4em; font-size: 14px;
+bigbutton
-        </form>
-</div>
@@ -52 +52 @@
-                                        <input type="hidden" name="op" value="update-im" />
-                                        My AIM name:
-
+<?= $im_name ?>
-                                        &nbsp; <input type="submit" class="default button" style="padding: 0.4em; font-size: 14px;" value="Add AIM Account" />
-                                        <br />
-
+your AIM name 
-                                </form>
-                </div>
+                This will connect your AIM name <b><?= $im_name ?></b> to your Feed Me Links account <b><?= $u ?></b>.
-        </form>
-</div>

feedmelinks/style/main.css

@@ -44 +44 @@
-}
-
-/* for buttons: */
-.big {
-        padding: 0.4em;
-        font-size: 150%;
-}
-
-.folder_row {}
-.fr {
@@ -171 +165 @@
-        margin: 0px;
-        font-size: 9px;
+}
+
+bigbutton, input.bigbutton {
+        background-color: #FF6600;
+        color: white;
+        font-family: inherit;
+        padding: 0.4em;
+        margin: 0px;
+        font-size: 14px;;
-}
-

feedmelinks/testing/search.php

@@ -91 +91 @@
-                <td <%= $bg %>>
-<% 
-CategoriesForLinkAs
+_tags_as_
-%>
-                        <big><%= makeLinkOut( $id ) %></big>