Changeset 1390

Timestamp:

03/05/07 18:37:28 (2 years ago)

Author:

jm3

Message:

calling it alpha and closing the window

Files:

• feedmelinks/.htaccess-global (modified) (1 diff)
• feedmelinks/FAQ/index.php (modified) (4 diffs)
• feedmelinks/aim/index.php (modified) (3 diffs)
• feedmelinks/folder-as-xml.php (modified) (5 diffs)
• feedmelinks/lib/FeedMeLinks/Bot.pm (modified) (19 diffs)
• feedmelinks/modules/utils.inc.php (modified) (1 diff)
• feedmelinks/script/form-validation.js (modified) (1 diff)
• feedmelinks/search-as-xml.php (modified) (6 diffs)
• feedmelinks/set-up/IM.php (modified) (3 diffs)

feedmelinks/.htaccess-global

@@ -46 +46 @@
-
-# xml API:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-RewriteRule    ^api/rename/(.*)$ /api/core/index.php?op=rename&user=$1 [L]
-RewriteRule    ^api/add_tags/(.*)$ /api/core/index.php?op=add_tags&user=$1 [L]
+RewriteRule    ^api/search(.*)$ /search-as-xml.php$1 [L]
-
-# JSON API

feedmelinks/FAQ/index.php

@@ -42 +42 @@
-                                <li><a href="#q2_1">What the heck is a tag?</a></li>
-                        </ol>
-External Access
+Power-User
-                <ol>
-                        <li><a href="#q6_0">What is the naming convention / url schema for Feed Me Links? </a></li>
@@ -401 +401 @@
-                <big>XML endpoints for the Feed Me Links REST API:</big>
-                <p/>
-
-
+
-                        <span class="subtle">http://feedmelinks.com</span>/xml/authenticate<br />
-                        (pass <code>user</code> and <code>password</code>)
@@ -408 +407 @@
-                        <br />
-
-# <b>get all
+<b>retrieve
-                        <span class="subtle">http://feedmelinks.com</span>/xml/user/<b>USERNAME</b><br />
-                        <br />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                        <!--
@@ -441 +444 @@
-
-                        # <b>get your peeps as XML</b>:<br />
-xml
+api
-                        </code>
-                        <p/>

feedmelinks/aim/index.php

@@ -30 +30 @@
-                </dd>
-
+<!--
-<dt> stalk (spy, on) : follow your friends' activity</dt>
-  <dd>whenever one of your peeps adds a public link, you'll receive the link in an IM with the username of who linked it (the stalkee must also have you as a peep for this to work)</dd>
@@ -38 +39 @@
-<dt>recent (synonyms: links) : see recent activity</dt>
-  <dd>prints your last 10 links</dd>
-
+
+
-<dt>today :  prints your last 10 links</dt>
-<dd></dd>
@@ -47 +49 @@
-<dt>anything but the above commands : aka the default</dt>
-<dd>
-
-
-
+
+
+
+
+
+
-        </dd>
-

feedmelinks/folder-as-xml.php

@@ -6 +6 @@
-        $u    = $PHP_AUTH_USER ? $PHP_AUTH_USER : ( $user ? $user : $_COOKIE["c_uid"] );
-        $tok =  $authenticated = $_COOKIE["c_pass_token"];
+        Header( "Content-type: text/xml");
-
-        if( $u && ($pass && $pass == getPasswdForUser( $u ) || ($tok && $tok == md5( getPasswdForUser( $u ))))) {
+                if( getOwnerForFolder( $folder ) != $u ) {
+                        $error = "No tag by that ID number or it's owned by someone else";
+                        echo "<rest><response code='failed'>$error</response></rest>";
+                        return;
+                }
-
-                if( $folder ) {
@@ -16 +22 @@
-                        $q = mysql_query( $qs );
-                        if( $q && mysql_num_rows($q) ) {
-                                Header( "Content-type: text/xml");
-                                echo "<?xml version='1.0' standalone='yes'?>\n";
-
@@ -23 +28 @@
-                                $tag_name = makePrettyFolderName( $raw_tag_name );
-
+                                $numRows = mysql_num_rows($q);
-%>
-
+ num_links="<?= $numRows ?>"
-<%
-                                $numRows = mysql_num_rows($q);
-                                if( $q && $numRows ) {
-                                        for( $i = 0; $i < $numRows; $i++ ) {
@@ -34 +39 @@
-                                                if( !strstr( $url, "&amp;" ))
-                                                        $url = str_replace( "&", "&amp;", $url );
-AsDCDate
+TS
-
-%>
@@ -45 +50 @@
-<%
-                        } else
-No tag by that ID, or it's owned by someone else
+0_links
-                        conClose( $con_xmlFolder );
-                } else
-no tag by that ID, or it's owned by someone else
+0_links
-                if( $error ) {
-
-
+
-                }
-        } else {

feedmelinks/lib/FeedMeLinks/Bot.pm

@@ -18 +18 @@
-open(LOG, ">>" . $logfile) or die "can't open log $logfile";
-
-
-
+
-        my $ofh = select LOG;
-        $| = 1;
-        select $ofh;
-}
-
-log_mesg( \*LOG, "starting run" );
-
+my $num_recent = 5;
-my $www = get_proxy( FeedMeLinks::Environment::get_bot_user(), FeedMeLinks::Environment::get_bot_password());
-my $site = "http://www." . FeedMeLinks::Environment::get_domain();
@@ -35 +34 @@
-
-        my $user;
-often wraps seemingly plaintext messages with
+can wrap messages w/
-        $message = strip_html( $message );
-        log_mesg( \*LOG, "debug", "command: $message" );
-
-        print "handle_resopnse can see site = $site\n";
-
-        # init user
@@ -45 +42 @@
-        $fml_username .= ""; # type coerce
-        if( ! $fml_username ) {
-       $sessions_ref->{"$sender"} = build_empty_session( $sender );
- if( $sessions_ref->{ $sender }{ "seen_welcome" } != 1 ) {
-aim->send_im($sender, h("<b>Hi! I am the Feed Me Links bot!</b>\nTo get started, you can type <b>links</b>, <b>help</b>, or click <b><a href='$site/set-up/IM?aim=$sender'>activate</a></b> to set up your account.")
- 
+ if( $sessions_ref->{ $sender }{ "seen_welcome" } == 0 && !( $message =~ m/validate/ )) {
+               $aim->send_im($sender, h("<b>Hi! I am the Feed Me Links bot!</b>\nType '<b>help</b>' for more info or click <b><a href='$site/set-up/IM?aim=$sender'>activate</a></b> to start adding links.") );
+sessions_ref->{"$sender"} = build_empty_session( $sender
+       
-                }
-        } else {
@@ -59 +56 @@
-        }
-
-handle commands
+COMMAND: ADD LINK ###############################################################
-        if( 
-                $message =~ m/(ftp|gopher|https?):\/\// 
@@ -96 +93 @@
-
-                                $aim->send_im($sender, h("<b>Added</b>:\n<a href='$info'>$name</a>" ));
-"To add tags, just type them, separated by tags\nTo rename it, type it: <em>new name...</em>" 
+get_message( "add_tags") . "\n" . get_message( "rename" )
-                        } else {
-                                if( $info =~ m/Duplicate/ ) {
@@ -109 +106 @@
-                        # FIXME: should search and say "NN people have added this link -- click activate to add it"
-                        log_mesg( \*LOG, "error:add link", "un-authenticated add request from $sender for $message" );
-hat looks like a link! To add links via IM, just <b><a href='$site/set-up/IM?aim=$sender'>activate your account</a></b> by clicking
+o start adding links, please click <b><a href='$site/set-up/IM?aim=$sender'>activate my account</a></b>
-                }
-                
+        # COMMAND: VALIDATE ###############################################################
-        } elsif( $message =~ m/validate:/ ) {
-
@@ -143 +141 @@
-                        #$aim->send_im($sender, "<b>Rebuilt an authenticated session for you</b>:\n" . Dumper( $sessions_ref ));
-
-
+\n\n
-                } else {
-                        $aim->send_im($sender, h("Darn, that doesn't match our records. Please try again, or <a href='$site/contact-us?subject=AIM+issues:+'>contact us</a>.") );
-                }
-
+        # COMMAND: WHO ###############################################################
-        } elsif( $message =~ m/who/ || $message =~ m/lusers/ ) {
-                my $users = "";
@@ -161 +160 @@
-                $aim->send_im($sender, h($users));
-
-
-
+
+
+
-                my $u = $sessions_ref->{ $sender } -> { "fml_username" };
-        
@@ -170 +170 @@
-                # FIXME: peeps list here for sharing
-                
+        # COMMAND: VERSION ###############################################################
-        } elsif( $message =~ m/version/ ) {
-                log_mesg( \*LOG, "version", " $sender" );
-                $aim->send_im($sender, get_version());
-        
+        # COMMAND: RECENT ###############################################################
-        } elsif( $message =~ m/(links|recent)/ ) {
-                log_mesg( \*LOG, "recent", " $sender" );
-                $aim->send_im($sender, "recent links here, soon! (not finished yet, sorry");
-        
+        # COMMAND: LOG ###############################################################
-        } elsif( $message =~ m/(^log)/ ) {
-                log_mesg( \*LOG, "log test", " $message from $sender" );
-        
+        # COMMAND: HELP ###############################################################
-        } elsif( $message =~ m/help/ || $message =~ m/commands/ || $message =~ m/\?/ ) {
-                log_mesg( \*LOG, "help", " $sender" );
-
-
-
-
+
+
+
+
+
-        } elsif( $message =~ m/status/ ) {
-                log_mesg( \*LOG, "status", " $sender" );
@@ -193 +199 @@
-                print Dumper( $sessions_ref ) . "\n";
-        
+        # COMMAND: CREDITS ###############################################################
-        } elsif( $message =~ m/credits/ ) {
-                log_mesg( \*LOG, "credits", " $sender" );
-                        $aim->send_im($sender, h("by <b><a href='http://jm3.net'>John Manoogian III / jm3</a></b>"));
-
-
+
+
-                        $sessions_ref->{$sender}->{"last_action"} = "rename";
-                        $sessions_ref->{$sender}->{"renamed"}  = 1;
@@ -216 +224 @@
-                        if( $response_code == "success" ) {
-                                $aim->send_im($sender, h("Thanks! We renamed <a href='$site/$link'><b>$pretty_name</b></a>."));
+                                if( $sessions_ref->{$sender}->{"added_tags"} == 0 ) {
+                                        $aim->send_im($sender, h(get_message( "add_tags")));
+                                }
-                        } else {
-                                $aim->send_im($sender, h("<b>Oops, the server screwed something up!</b>\n$response_code" ));
@@ -221 +232 @@
-                        log_mesg( \*LOG, "debug", "response: $response_code renaming $link to $message" );
-
-
+
+
-                        $sessions_ref->{$sender}->{"last_action"} = "added_tags";
-                        $sessions_ref->{$sender}->{"added_tags"}  = 1;
@@ -242 +254 @@
-                                $tag_noun .= " <b>$message</b>";
-                                $aim->send_im($sender, h("Thanks! We added the tags <b>$message</b> to <a href='$site/" . $sessions_ref->{$sender}->{"last_link"} . "'>your link</a>"));
+                                if( $sessions_ref->{$sender}->{"renamed"} == 0 ) {
+                                        $aim->send_im($sender, h(get_message( "rename")));
+                                }
-                        }
+                
+        # COMMAND: SHOW TAG ###############################################################
+        } elsif( $fml_username && $sessions_ref->{$sender}{"tags"}{$message} ) {
+
+                my $url = "$site/api/tag/" . encode( $sessions_ref->{$sender}{"tags"}{$message} ) 
+                        . "&user=" . encode( $sessions_ref->{$sender}{"fml_username"} ) 
+                        . "&password=" . encode($sessions_ref->{$sender}{"fml_password"});
+                log_mesg( \*LOG, "debug", "found a tag, will get it with url: $url");
+                my $response = $sessions_ref->{$sender}->{"proxy"}->get( $url , []);
+
+                my $num_links = "" . XML::XPath->new(xml => $response->content)->findnodes('/posts/@num_links');
+                log_mesg( \*LOG, "debug", "got num links $num_links");
+                if( $num_links != 0 )  {
+                        my $link_nodes = XML::XPath->new(xml => $response->content)->findnodes('/posts/post');
+                        my $summary = "";
+                        my $max = $num_recent;
+                        my $c = 0;
+                        foreach my $link_node ($link_nodes->get_nodelist) {
+                                if( $c < $max ) {
+                                        $summary .= 
+                                                "<a href='" 
+                                                        . $link_node->findnodes( "./\@href" )
+                                                        . "'>"
+                                                        . $link_node->findnodes( "./\@description" )
+                                                        . "</a>, ";
+                                }
+                                ++ $c;
+                        }
+                        $summary =~ s/, $//;
+
+                        log_mesg( \*LOG, "debug", "summary: $summary" );
+                $aim->send_im($sender, h("You have <a href='$site/u/" . encode( $sessions_ref->{$sender}{"fml_username"}) . "/tags/" . encode($message) . "'>$num_links links</a> tagged with $message, including $summary" ));
+                }
-
-        } else {
+
+                        my $tags_ref = $sessions_ref->{$sender}{"tags"};
-                        log_mesg( \*LOG, "search", "$message by $sender" );
-                        $aim->send_im($sender, "<b>Hm, let me search for that on Feed Me Links</b>:\n(searching)");
-
-                        my $search_term = $message;
-                        $search_term =~ s/^search(:|\s+)(\s*)?//;
-
+
+
+
+
+
+
+
+
-                        log_mesg( \*LOG, "debug", " $url" );
-
-
+
+
+
-                        my $nodes = XML::XPath->new(xml => $response->content)->findnodes("/rest/response/link");
-                        #my $nodes = XML::XPath->new(xml => $response->content)->findnodes("/rest/response/link/name/text()");
-                        my $message = "" . XML::XPath->new(xml => $response->content)->findnodes("/rest/response/message");
-                        my $response_code = "" . XML::XPath->new(xml => $response->content)->findnodes("/rest/response/\@code");
-                        if( $response_code == "success" ) {
-                                my $summary = "";
-3
+$num_recent
-                                my $c = 0;
-                                foreach my $link_node ($nodes->get_nodelist) {
@@ -270 +327 @@
-                                                                . $link_node->findnodes( "name/text()" )
-                                                                . "</a>, ";
-                                                log_mesg( \*LOG, XML::XPath::XMLParser::as_string($link_node));
-                                        };
-                                        ++ $c;
-                                }
-
-
+
-                                log_mesg( \*LOG, "search", "found $message" );
-
-
+
+
+
+
+
+
+
+
-        }
-
@@ -311 +372 @@
-                'last_action'  => '',
-                'added_tags'   => 0,
+                'tags'         => (),
-                'renamed'      => 0,
-    'fml_username' => "", 
-    'fml_password' => "", 
+                'proxy' => get_proxy( "", "" ),
-    'validated' => 0,
-    'seen_welcome' => 0
@@ -328 +391 @@
-        print "> passing user: $u\n";
-        print "> using url: $site/api/backroom/getPasswdForUser&user=$u\n";
+
-        my $response = $www->get( "$site/api/backroom/getPasswdForUser&user=$u", []);
-        my $xp = XML::XPath->new(xml => $response->content);
-        my $p = "" . $xp->getNodeText("/rest/response");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        my $session = { 
@@ -337 +419 @@
-                'last_action'  => '',
-                'added_tags'   => 0,
+                'tags'         => $tags_ref,
-                'renamed'      => 0,
-                'fml_username' => $u,
@@ -351 +434 @@
-        my( $u, $p ) = @_;
-        my $www = LWP::UserAgent->new;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        return $www;
-}
@@ -452 +537 @@
-}
-
+sub get_message {
+        my $m = $_[0];
+        my %messages = (
+                "add_tags" => "To add tags, just type them, separated by commas",
+                "rename" => "To rename it, type it: <em>new name...</em>"
+        );
+        return $messages{ "$m" };
+}
+
-1; # modules must return a true value
-

feedmelinks/modules/utils.inc.php

@@ -2449 +2449 @@
-    return "
-    SELECT * FROM links, tags AS t, links_tags_xref AS x WHERE x.tagID = " . urlencode( $args[1] ) . " AND x.linkID = links.ID AND t.ID = x.tagID AND links.userid = '"
-
+ ORDER BY links.createDate DESC
-
-  } else if( $argWhichQuery  == "recent_for_user" ) {

feedmelinks/script/form-validation.js

@@ -17 +17 @@
-function check_im( f ) {
-        var e = f.im.value;
-
+ 
-        if( e == '' ) {
-                alert( "Please enter your AIM name." );

feedmelinks/search-as-xml.php

@@ -1 @@
-%
+?php
-        ob_start();
-        include_once( "modules/class.gzip_encode.inc.php" );
@@ -13 +13 @@
-
-        $searchTerm = $q ? $q : $searchTerm;
+        if( strlen( $searchTerm ) < 3 ) {
+                echo '<rest><request>Search Feed Me Links for "$searchTerm"</request><response code="failed"><message>search for something at least 3 characters long</message></response></rest>';
+                #echo "hi";
+                return;
+        }
-        $searchTerm = str_replace( " ", "%", $searchTerm );
-        $searchTerm = str_replace( "'", "", $searchTerm );
@@ -23 +28 @@
-        $searchWhat = $search_only;
-
+        function xml_text_node_fix( $s ) {
+                if( ! $s )
+                        return "";
+                return preg_replace( "/</", "&lt;", preg_replace( "/>/", "&gt;", preg_replace( "/&([^a])/", "&amp;\\1", unicode_fix( $s ))));
+        }
+
-        $qs2 = getQuery( "num_links" );
-        $q2 = mysql_query( $qs2 );
-        if( $q2 ) $totalNumLinks = mysql_result($q2,0);
-%
-%= "?" %
+?
+?= "?" ?
-<rest>
-        <request>Search <%= $my ? "My Links" : "Feed Me Links" %> <%= $q ? "for '$q'" : "" %>
@@ -35 +46 @@
-                if( $search_only == "links" ) 
-                        $qs = $my ? 
-FROM
+from
-                                        # this query needs to pull from the master query, but the column names are different...
- WHERE lcase(name) LIKE '%$searchTerm%' AND (isPrivate is NULL OR 
+, users WHERE links.userid = users.userid AND users.snuffed IS NULL AND lcase(links.name) LIKE '%$searchTerm%' AND (links.isPrivate is NULL OR links.
-                else if( $search_only == "users" )
-FROM users WHERE lcase(userid) LIKE '%$searchTerm%'
+from users WHERE lcase(userid) LIKE '%$searchTerm%' and snuffed is NULL
-                else if( $search_only == "tags" )
-                        $qs = "SELECT * FROM tags WHERE name LIKE '%$searchTerm%' AND (isPrivate IS NULL OR userid = '$u') ORDER BY name;";
@@ -63 +74 @@
-                                                $url = urldecode( mysql_result($q,$i,"url"));
-%>
-
+ user="<?= $userid ?>"
-<% 
-        $cats = get_tags_as_HTML( $id, $u, "add-trailing-noun=1", 0 ); 
@@ -69 +80 @@
-        $name = preg_replace( "/&apos;/", "'", $name );
-        $url = preg_replace( "/&/", "&amp;", $url );
+
-%>
-$url %></url> 
-preg_replace( "/&([^a])/", "&amp;\\1", unic
+utf8_encode( xml_text_node_fix( $url )) %></url>
+utf8_encode( xml_text_n
-<% 
-        $cats = $cats ? "$cats" : "by $userid";

feedmelinks/set-up/IM.php

@@ -23 +23 @@
-                                if( !$im )
-                                        return;
-                                $im = urlencode( $im );
-                                $success = run_query( "UPDATE users SET im = '$im' WHERE userId = '$u'" );
-                                $showForm = false;
@@ -33 +32 @@
-        <h1>Success! Your Validation Code is:</h1>
-        <input class="copyable" name="secret" value="validate: <?= $u . ", " . get_im_validation_phrase_for_user( $u ) ?>" size="32" />
-above text into your AIM window to finish the setup process
+<b><big>entire</big></b> string above into your AIM window to finish validating your account.
-        <br /><br /><br /><br />
-        (All done, you can close this window now)
@@ -43 +42 @@
-                
-                if( $showForm ) {
+
+                                # handle the weirdo's with @ signs in their names: # FIXME: test from actual klaus aim session
+                                #$aim = str_replace( " ", "", $aim );
+                                $aim = urlencode( $aim );
+                                $aim = str_replace( "%40", "@", $aim );
+                                $aim = str_replace( "%2540", "@", $aim );
+                                $aim = str_replace( "+", " ", $aim );
-?>
-