Navigation

← Previous Changeset
Next Changeset →

Changeset 1178

Timestamp:

10/23/06 22:49:33 (2 years ago)

Author:

jm3

Message:

major anti-spam commit:

consolidated many of the loose queries spread around in the templates
added some minor spam defenses
disabled search for now

Files:

feedmelinks/_config/servers.xml (modified) (1 diff)
feedmelinks/_logs/db.log (added)
feedmelinks/account.php (modified) (3 diffs)
feedmelinks/action.php (modified) (1 diff)
feedmelinks/categorize.php (modified) (2 diffs)
feedmelinks/delete.php (modified) (2 diffs)
feedmelinks/edit-folder.php (modified) (3 diffs)
feedmelinks/edit.php (modified) (1 diff)
feedmelinks/folder-as-rss.php (modified) (3 diffs)
feedmelinks/folder-by-tag-name.php (modified) (1 diff)
feedmelinks/folder-sidebar.php (modified) (2 diffs)
feedmelinks/folder.php (modified) (3 diffs)
feedmelinks/funnel.php (modified) (1 diff)
feedmelinks/index.php (modified) (2 diffs)
feedmelinks/link-cruiser.php (modified) (1 diff)
feedmelinks/login.php (modified) (2 diffs)
feedmelinks/mile-long.php (modified) (2 diffs)
feedmelinks/modules/utils.inc.php (modified) (6 diffs)
feedmelinks/recent-kompact.php (modified) (1 diff)
feedmelinks/recent.php (modified) (1 diff)
feedmelinks/rss-1.0.php (modified) (1 diff)
feedmelinks/search-as-xml.php (modified) (3 diffs)
feedmelinks/search.php (modified) (1 diff)
feedmelinks/submit-link.php (modified) (1 diff)
feedmelinks/testing/exists.php (added)
feedmelinks/testing/urls-like.php (moved) (moved from feedmelinks/urls-like.php)
feedmelinks/user-as-rss.php (modified) (1 diff)
feedmelinks/users.php (modified) (2 diffs)
feedmelinks/wall-of-ancients-uncached.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

feedmelinks/_config/servers.xml

r1082	r1178
15	15	cookie-domain=".feedmelinks.com"
16	16	webserver-root="/home/fml/public_html"
	17	database-name="fml_fml"
	18	maintainer-email="jm3@codeswami.com"
	19	spamsafe-email="&#106;&#109;&#051;&#064;&#099;&#111;&#100;&#101;&#115;&#119;&#097;&#109;&#105;&#046;&#099;&#111;&#109;"
	20	spamtrap-email="no-spam@feedmelinks.com"
	21	xsl-parser="/usr/bin/xsltproc"
	22	http-downloader="/usr/bin/lynx"
	23	>
	24	<apache-config>
	25	php_value mysql.default_host "localhost"
	26	php_value mysql.default_user "fml_fml"
	27	php_value mysql.default_password "fml"
	28	</apache-config>
	29	</server>
	30
	31	<server name="dev"
	32	domain="dev.feedmelinks.com"
	33	port=""
	34	cookie-domain=".feedmelinks.com"
	35	webserver-root="/home/fml/public_html/dev"
17	36	database-name="fml_fml"
18	37	maintainer-email="jm3@codeswami.com"

feedmelinks/account.php

r1032	r1178
120	120	if( $_FILES['profile_image']['name'] ) {
121	121	warn( "Sorry, your profile image can only be a GIF, JPEG, or PNG file. "
122		. "Did you remember to click <b>Browse</b> and ~~select~~ the image "
	122	. "Did you remember to click <b>Browse</b> and choose the image "
123	123	. "to upload first? Please try again." );
124	124	}
…	…
130	130
131	131	if( $showForm == 1 ) {
132		$qs = ~~"SELECT * FROM linksUsers WHERE userId = '$u'"~~;
	132	$qs = getQuery( "find_user", $u );
133	133	$q = mysql_query( $qs );
134	134	$numRows = mysql_num_rows($q);
…	…
256	256	<tr>
257	257	<td align="right" valign="top">
258		~~Select~~ an image:
	258	Choose an image:
259	259	</td>
260	260	<td>

feedmelinks/action.php

r839	r1178
190	190	}
191	191	} else {
192		$errors = "~~Select~~ a new tag, first";
	192	$errors = "Pick a new tag, first";
193	193	}
194	194	} else if( $op == "untag" ) {

feedmelinks/categorize.php

r1177	r1178
147	147	mysql_selectdb( getDBName() );
148	148
149		$qs = ~~"SELECT * FROM linksGroups WHERE userId = '$u' ORDER BY name ASC;"~~;
	149	$qs = getQuery( "sorted_tags_per_user", $u );
150	150	if( $debug )
151	151	echo "\$qs: $qs<br />";
…	…
186	186
187	187	<br />
	188	<%
	189	# existing links that other users have already linked will be made silently private
	190	if( link_exists( $url )) {
	191	%>
	192	<input type="hidden" name="is_private" value="checked" />
	193	<%
	194	# otherwise the user can choose
	195	} else {
	196	%>
188	197	<br />
189	198	<a href="javascript:setPrivate();">Save as private</a>?
190	199	<input type="checkbox" name="is_private" />
	200	<br />
	201	<%
	202	}
	203	%>
191	204	</h2>
192		~~<br />~~
193	205
194	206	</td>

feedmelinks/delete.php

r889	r1178
29	29
30	30	$shouldDump = 0;
31		$qs = "SELECT * ~~from links where~~ ID=$id AND submitter='$sessionUserId'";
	31	$qs = "SELECT * FROM links WHERE ID=$id AND submitter='$sessionUserId'";
32	32	$q = mysql_query( $qs );
33	33	$numRows = mysql_num_rows($q);
…	…
41	41
42	42	if( $groupid ) {
43		$qs2 = ~~"SELECT * from linksGroups WHERE ID = $groupid"~~;
	43	$qs2 = getQuery( "find_tag", $groupid );
44	44	$q2 = mysql_query( $qs2 );
45	45	$numRows2 = mysql_num_rows($q2);

feedmelinks/edit-folder.php

r889	r1178
118	118	echo "deleting the links<br />";
119	119
120		$qs = "SELECT linkID ~~from~~ linksCategoriesXRef WHERE catID = $id;";
	120	$qs = "SELECT linkID FROM linksCategoriesXRef WHERE catID = $id;";
121	121	$q = mysql_query( $qs );
122	122	if( $q ) {
…	…
143	143	$fail = "ugh. some weird error occurred. i hate being a dumb computer. sorry!";
144	144	$qs = "UPDATE links SET groupid = NULL WHERE submitter = '$u' AND groupid = $id";
145		~~#$qs = "SELECT * from links where submitter = '$u' AND groupid = $id";~~
146	145	}
147	146	if( $debug ) print "DEBUG: $qs<br />\n";
…	…
260	259	$shouldDump = false; # this was confusing and weird!
261	260	if( $shouldDump ) {
262		$qs = ~~"SELECT * from linksGroups WHERE userId = '$u' ORDER BY name"~~;
	261	$qs = getQuery( "sorted_tags_per_user", $u );
263	262	$q = mysql_query( $qs );
264	263	$numRows = mysql_num_rows($q);

feedmelinks/edit.php

r889	r1178
44	44
45	45	if( $groupid ) {
46		$qs2 = ~~"SELECT * from linksGroups WHERE ID = $groupid"~~;
	46	$qs2 = getQuery( "find_tag", $groupid );
47	47	$q2 = mysql_query( $qs2 );
48	48	$numRows2 = mysql_num_rows($q2);

feedmelinks/folder-as-rss.php

r1082	r1178
41	41
42	42	if( !$unfiled ) {
43		$qs = ~~"SELECT * from linksGroups WHERE id=$folder"~~;
	43	$qs = getQuery( "find_tag", $folder );
44	44	$q = mysql_query( $qs );
45	45	$singleGroupName = makeSafeName( mysql_result($q,$i,"name") );
…	…
83	83	} else {
84	84
85		$qs = "SELECT * ~~from~~ linksGroups";
	85	$qs = "SELECT * FROM linksGroups";
86	86	$q = mysql_query( $qs );
87	87
…	…
104	104	}
105	105	}
106		$qs = "SELECT * ~~from links as~~ l $whereClause ORDER BY $sortOrder $direction";
	106	$qs = "SELECT * FROM links AS l $whereClause ORDER BY $sortOrder $direction";
107	107	}
108	108

feedmelinks/folder-by-tag-name.php

r889	r1178
6	6	$u = $sessionUserId = ( $user ? $user : $_COOKIE["c_uid"] );
7	7
8		# TODO: extend this to do delicious/flickr-style "s~~elect~~ this tag for all users" view
	8	# TODO: extend this to do delicious/flickr-style "show this tag for all users" view
9	9	if( ! $user )
10	10	croak( "shit, no username!" );

feedmelinks/folder-sidebar.php

r427	r1178
34	34	}
35	35
36		$qs = "SELECT ~~count~~(*) FROM links WHERE submitter = '$user' AND groupid " . ($f == "unfiled" ? "IS NULL" : " = $f" ) . ";";
	36	$qs = "SELECT COUNT(*) FROM links WHERE submitter = '$user' AND groupid " . ($f == "unfiled" ? "IS NULL" : " = $f" ) . ";";
37	37	#echo $qs;
38	38	$q = mysql_query( $qs );
…	…
68	68
69	69	<%
70		$qs = "SELECT * ~~from~~ links WHERE submitter='$user' AND groupid " .($f == "unfiled" ? "IS NULL" : " = $f" ) . " ORDER BY createDate DESC";
	70	$qs = "SELECT * FROM links WHERE submitter='$user' AND groupid " .($f == "unfiled" ? "IS NULL" : " = $f" ) . " ORDER BY createDate DESC";
71	71	$q = mysql_query( $qs );
72	72	$numRows = mysql_num_rows($q);

feedmelinks/folder.php

r1077	r1178
73	73
74	74	if( !$unfiled ) {
75		$qs = ~~"SELECT * from linksGroups WHERE id = $folder"~~;
	75	$qs = getQuery( "find_tag", $folder );
76	76	if( $debug )
77	77	e( "QS: " . $qs);
…	…
153	153	} else {
154	154
155		$qs = "SELECT * ~~from~~ linksGroups";
	155	$qs = "SELECT * FROM linksGroups";
156	156	$q = mysql_query( $qs );
157	157
…	…
174	174	}
175	175	}
176		$qs = "SELECT * ~~from links as l, linksComments as~~ x $whereClause ORDER BY $sortOrder $direction";
	176	$qs = "SELECT * FROM links AS l, linksComments AS x $whereClause ORDER BY $sortOrder $direction";
177	177	}
178	178	if( $owned \|\| $public )

feedmelinks/funnel.php

r927	r1178
82	82	mysql_selectdb( getDBName() );
83	83
84		$qs = ~~"SELECT * FROM linksGroups WHERE userId = '$u' ORDER BY name ASC;"~~;
	84	$qs = getQuery( "sorted_tags_per_user", $u );
85	85	if( $debug )
86	86	echo "\$qs: $qs<br />";

feedmelinks/index.php

r927	r1178
332	332
333	333	<%
334		$qs = ~~"SELECT * from linksGroups where userid = '$u' ORDER BY name"~~;
	334	$qs = getQuery( "sorted_tags_per_user", $u );
335	335	$q = mysql_query( $qs );
336	336	if( $q )
…	…
342	342	}
343	343	if( $numRows ) {
344		$qs2 = ~~"SELECT count(*) FROM links WHERE submitter='$u'"~~;
	344	$qs2 = getQuery( "links_per_user", $u );
345	345	$q2 = mysql_query( $qs2 );
346	346	if( $q2 ) {

feedmelinks/link-cruiser.php

r454	r1178
15	15	mysql_selectdb( getDBName() );
16	16
17		$qs2 = ~~"SELECT count(*) FROM links;"~~;
	17	$qs2 = getQuery( "num_links" );
18	18	$q2 = mysql_query( $qs2 );
19	19	if( $q2 ) $totalNumLinks = mysql_result($q2,0);
20		$qs2 = ~~"SELECT count(*) FROM linksUsers;"~~;
	20	$qs2 = getQuery( "num_users" );
21	21	$q2 = mysql_query( $qs2 );
22	22	if( $q2 ) $totalNumUsers = mysql_result($q2,0);

feedmelinks/login.php

r1177	r1178
22	22	$con_login = mysql_connect();
23	23	mysql_selectdb( getDBName() );
24		$qs = ~~"SELECT * from linksUsers WHERE userId = '$userId'"~~;
	24	$qs = getQuery( "find_user", $userId );
25	25	$q = mysql_query( $qs );
26	26	if( $q )
…	…
112	112	$mesg = "Shoot! Please pick a new userId, that one is taken.";
113	113	} else {
114		$qs = ~~"SELECT * FROM linksUsers where userid = '$userId';"~~;
	114	$qs = getQuery( "find_user", $userId );
115	115	$q = mysql_query( $qs );
116	116	$numRows = mysql_num_rows($q);

feedmelinks/mile-long.php

r661	r1178
16	16	mysql_selectdb( getDBName() );
17	17
18		$qs2 = ~~"SELECT count(*) FROM links;"~~;
	18	$qs2 = getQuery( "num_links" );
19	19	$q2 = mysql_query( $qs2 );
20	20	if( $q2 ) $totalNumLinks = mysql_result($q2,0);
21		$qs2 = ~~"SELECT count(*) FROM linksUsers;"~~;
	21	$qs2 = getQuery( "num_users" );
22	22	$q2 = mysql_query( $qs2 );
23	23	if( $q2 ) $totalNumUsers = mysql_result($q2,0);
…	…
34	34	<%
35	35
36		$qs = "SELECT DISTINCT( url), submitter, groupid, id, createDate, name ~~from links WHERE isPrivate is~~ NULL GROUP BY url ORDER BY createDate DESC";
	36	$qs = "SELECT DISTINCT( url), submitter, groupid, id, createDate, name FROM links WHERE isPrivate IS NULL GROUP BY url ORDER BY createDate DESC";
37	37
38	38	$q = mysql_query( $qs );

feedmelinks/modules/utils.inc.php

r1177	r1178
215	215
216	216	function get_id_for_existing_link( $url, $u ) {
217		$q = run_query( getQuery( "get_id_for_existing_link", $url, $u ));
	217	$q = run_query( getQuery( "get_id_for_users_existing_link", $url, $u ));
218	218	return mysql_result($q, 0, "id" );
219	219	}
…	…
484	484	%>
485	485	<%
	486	}
	487
	488	# search to see if the URL exists anywhere public
	489	function link_exists( $url ) {
	490	$qs = getQuery( "get_id_for_existing_link", $url );
	491	$q = mysql_query( $qs );
	492	if( $q && mysql_num_rows($q) )
	493	return mysql_result( $q, 0, "id" );
486	494	}
487	495
…	…
1579	1587	return "
1580	1588	SELECT links.* FROM links
1581		LEFT JOIN linksCategoriesXRef ON links.ID = linksCategoriesXRef.linkID
1582		WHERE linksCategoriesXRef.linkID IS NULL ";
1583
	1589	LEFT JOIN linksCategoriesXRef ON links.ID = linksCategoriesXRef.linkID WHERE linksCategoriesXRef.linkID IS NULL ";
	1590
	1591	} else if( $argWhichQuery == "find_user" ) {
	1592	return "
	1593	SELECT * FROM linksUsers WHERE userId = '" . urlencode($args[1]) . "';";
	1594
	1595	} else if( $argWhichQuery == "find_tag" ) {
	1596	return "
	1597	SELECT * FROM linksGroups WHERE ID = " . urlencode($args[1]) . ";";
	1598
1584	1599	} else if( $argWhichQuery == "log_ip" ) {
1585	1600	return "
1586	1601	INSERT INTO spam_IPs VALUES ( '" . urlencode($args[1]) . "', '" . urlencode($args[2]) . "', '" . urlencode($args[3]) . "', NULL, NULL ) ";
	1602
	1603	} else if( $argWhichQuery == "links_per_user" ) {
	1604	return "
	1605	SELECT COUNT(*) FROM links WHERE submitter='" . urlencode($args[1]) . "';";
	1606
	1607	} else if( $argWhichQuery == "tags_per_user" ) {
	1608	return "
	1609	SELECT COUNT(*) FROM linksGroups WHERE userid='" . urlencode($args[1]) . "';";
	1610
	1611	} else if( $argWhichQuery == "sorted_tags_per_user" ) {
	1612	return "
	1613	SELECT * FROM linksGroups WHERE userId = '" . urlencode($args[1]) . "' ORDER BY name ASC;";
1587	1614
1588	1615	} else if( $argWhichQuery == "most_recent_link_for_user" ) {
…	…
1631	1658	return "select createDate from links where submitter = '" . urlencode( $args[1] ) ."' ORDER BY id DESC LIMIT 1;";
1632	1659
	1660	} else if( $argWhichQuery == "get_id_for_users_existing_link" ) {
	1661	return "SELECT id FROM links WHERE url = '" . urlencode( $args[1] ) . "' AND submitter = '" . urlencode( $args[2] ) . "';";
	1662
1633	1663	} else if( $argWhichQuery == "get_id_for_existing_link" ) {
1634		return "SELECT id FROM links WHERE url = '" . urlencode( $args[1] ) . "' AND ~~submitter = '" . urlencode( $args[2] ) . "'~~;";
	1664	return "SELECT id FROM links WHERE url = '" . urlencode( $args[1] ) . "' AND isPrivate IS NULL;";
1635	1665
1636	1666	} else if( $argWhichQuery == "tag" ) {
…	…
1698	1728	LEFT JOIN linksCategoriesXRef ON links.ID = linksCategoriesXRef.linkID
1699	1729	WHERE linksCategoriesXRef.linkID IS NULL ";
	1730
	1731	} else if( $argWhichQuery == "num_users" ) {
	1732	return "
	1733	SELECT COUNT(*) FROM linksUsers;";
	1734
	1735	} else if( $argWhichQuery == "num_links" ) {
	1736	return "
	1737	SELECT COUNT(*) FROM links;";
1700	1738	}
1701	1739	}
…	…
1756	1794	if( $q )
1757	1795	$numLinks = number_format( mysql_result($q,0));
1758
1759		~~#$qs = "SELECT COUNT(*) FROM links WHERE createDate LIKE DATE_FORMAT( now(), '%Y%m%d%%');";~~
1760		~~#$q = mysql_query( $qs );~~
1761		~~#if( $q && mysql_result($q, 0) != 0)~~
1762		~~#$linksToday = mysql_result($q,0);~~
1763
1764	1796	conClose( $con_getStatsLine );
1765	1797

feedmelinks/recent-kompact.php

r660	r1178
20	20	mysql_selectdb( getDBName() );
21	21
22		$qs2 = ~~"SELECT count(*) FROM links;"~~;
	22	$qs2 = getQuery( "num_links" );
23	23	$q2 = mysql_query( $qs2 );
24	24	if( $q2 ) $totalNumLinks = mysql_result($q2,0);
25		$qs2 = ~~"SELECT count(*) FROM linksUsers;"~~;
	25	$qs2 = getQuery( "num_users" );
26	26	$q2 = mysql_query( $qs2 );
27	27	if( $q2 ) $totalNumUsers = mysql_result($q2,0);

feedmelinks/recent.php

r553	r1178
17	17	mysql_selectdb( getDBName() );
18	18
19		$qs2 = ~~"SELECT count(*) FROM links;"~~;
	19	$qs2 = getQuery( "num_links" );
20	20	$q2 = mysql_query( $qs2 );
21	21	if( $q2 ) $totalNumLinks = mysql_result($q2,0);
22		$qs2 = ~~"SELECT count(*) FROM linksUsers;"~~;
	22	$qs2 = getQuery( "num_users" );
23	23	$q2 = mysql_query( $qs2 );
24	24	if( $q2 ) $totalNumUsers = mysql_result($q2,0);

feedmelinks/rss-1.0.php

r1082	r1178
36	36	$con_rss = mysql_connect();
37	37	mysql_selectdb( getDBName() );
38		$qs = "SELECT * ~~from~~ links WHERE isPrivate IS NULL ORDER BY createDate DESC";
	38	$qs = "SELECT * FROM links WHERE isPrivate IS NULL ORDER BY createDate DESC";
39	39	$q = mysql_query( $qs );
40	40	$numRows = mysql_num_rows($q);

feedmelinks/search-as-xml.php

r889	r1178
23	23	$searchWhat = $search_only;
24	24
25		$qs2 = ~~"SELECT count(*) FROM links;"~~;
	25	$qs2 = getQuery( "num_links" );
26	26	$q2 = mysql_query( $qs2 );
27	27	if( $q2 ) $totalNumLinks = mysql_result($q2,0);
…	…
36	36	if( $search_only == "links" )
37	37	$qs = $my ?
38		"SELECT * ~~from~~ links WHERE lcase(name) LIKE '%$searchTerm%' AND submitter='$sessionUserId' ORDER BY createDate DESC"
	38	"SELECT * FROM links WHERE lcase(name) LIKE '%$searchTerm%' AND submitter='$sessionUserId' ORDER BY createDate DESC"
39	39	# this query needs to pull from the master query, but the column names are different...
40		: "SELECT * ~~from~~ links WHERE lcase(name) LIKE '%$searchTerm%' AND (isPrivate is NULL OR submitter = '$u') ORDER BY createDate DESC";
	40	: "SELECT * FROM links WHERE lcase(name) LIKE '%$searchTerm%' AND (isPrivate is NULL OR submitter = '$u') ORDER BY createDate DESC";
41	41	else if( $search_only == "users" )
42		$qs = "SELECT * ~~from~~ linksUsers WHERE lcase(userid) LIKE '%$searchTerm%' ORDER BY userid;";
	42	$qs = "SELECT * FROM linksUsers WHERE lcase(userid) LIKE '%$searchTerm%' ORDER BY userid;";
43	43	else if( $search_only == "tags" )
44	44	$qs = "SELECT * FROM linksGroups WHERE name LIKE '%$searchTerm%' AND (isPrivate IS NULL OR userid = '$u') ORDER BY name;";
…	…
88	88	$name = urldecode( mysql_result($q,$i,"name"));
89	89
90		$qs3 = ~~"SELECT COUNT(*) FROM links WHERE submitter = '$userid';"~~;
	90	$qs3 = getQuery( "links_per_user", $userid );
91	91	$q3 = mysql_query( $qs3 );
92	92	$linkCount = mysql_result($q3,0);

feedmelinks/search.php

r947	r1178
1		<%
2		~~ob_start();~~
3		~~include_once( "modules/class.gzip_encode.inc.php" );~~
	1	<html>
	2	<head>
	3	<title> Feed Me Links </title>
4	4
5		# $Id$
6		$page = "recent-kompact";
7		include_once( "modules/utils.inc.php" );
8		$tok = $authenticated = $_COOKIE["c_pass_token"];
9		$u = $sessionUserId = $_COOKIE["c_uid"];
	5	<style type="text/css">
	6	body {
	7	width: 600px;
	8	margin-left: auto;
	9	margin-right: auto;
	10	font-family: trebuchet ms;
	11	margin-top: 3em;
	12	}
	13	</style>
	14	</head>
	15	<body>
10	16
11		$MAX_NAME_LENGTH = 128;
	17	<h1> Feed Me Links Search is down<br /> while we deal with spammers </h1>
12	18
13		$searchTerm = $q ? $q : $searchTerm;
14		~~$searchTerm = str_replace( " ", "%", $searchTerm );~~
15		~~$searchTerm = str_replace( "'", "", $searchTerm );~~
	19	<h3>
	20	Note to anybody link-spamming: We <b>will</bi> prosecute you if we find you are mis-using the site by spamming us with duplicate links.
	21	</h3>
16	22
17		$con = mysql_connect();
18		mysql_selectdb( getDBName() );
19		$showInputForm = true;
	23	Not sure if what you're doing constitutes spamming? If someone is paying you to post links to Feed Me Links, you're probably spamming.
20	24
21		$search_only = $search_only ? $search_only : "links";
22		$searchWhat = $search_only;
	25	<center>
	26	<small>
	27	Mon Oct 23 10:49:14 EDT 2006
	28	</small>
	29	</center>
23	30
24		$qs2 = "SELECT count(*) FROM links;";
25		$q2 = mysql_query( $qs2 );
26		if( $q2 ) $totalNumLinks = mysql_result($q2,0);
27		%>
28		<title> Search <%= $my ? "My Links" : "Feed Me Links" %> <%= $q ? "for '$q'" : "" %> </title>
29		<% include( "$modules/header.inc.php" ); %>
30		<br />
31		<br />
32
33		<%
34		if( $searchTerm ) {
35		if( $search_only == "links" )
36		$qs = $my ?
37		"SELECT * from links WHERE lcase(name) LIKE '%$searchTerm%' AND submitter='$sessionUserId' ORDER BY createDate DESC"
38		# this query needs to pull from the master query, but the column names are different...
39		: "SELECT * from links WHERE lcase(name) LIKE '%$searchTerm%' AND (isPrivate is NULL OR submitter = '$u') ORDER BY createDate DESC";
40		else if( $search_only == "users" )
41		$qs = "SELECT * from linksUsers WHERE lcase(userid) LIKE '%$searchTerm%' ORDER BY userid;";
42		else if( $search_only == "tags" )
43		$qs = "SELECT * FROM linksGroups WHERE name LIKE '%$searchTerm%' AND (isPrivate IS NULL OR userid = '$u') ORDER BY name;";
44
45		$q = mysql_query( $qs );
46		if( $q )
47		$numRows = mysql_num_rows($q);
48		%>
49
50		<style type="text/css">
51		td {
52		padding-bottom: 1.0em;
53		}
54		</style>
55
56
57		<table border="0">
58		<tr>
59		<td class="header">
60		<b><%= $numRows %> <%= $numRows == 1 ? "match" : "matches" %></b>
61		for "<%= str_replace( "%", " ", $searchTerm ) %>" (searched <%= number_format( $totalNumLinks ) %> <%= $searchWhat %>)<br />
62		</td>
63		</tr>
64		<%
65		if( $numRows ) {
66		$i = 0;
67		%>
68
69		<!-- results start -->
70
71		<%
72		if( $search_only == "links" ) {
73		while ($i < $numRows) {
74		$id = mysql_result($q,$i,"ID");
75		$submitter = urldecode( mysql_result($q,$i,"submitter"));
76		$owned = ( $u == $submitter ) ? 1 : 0;
77		if( $owned \|\| isInPublicFolder( $id ) ) {
78		$name = makeSafeName( mysql_result($q,$i,"name"));
79		if( strlen( $name ) > $MAX_NAME_LENGTH )
80		$name = substr( $name, 0, $MAX_NAME_LENGTH ) . "...";
81		$url = urldecode( mysql_result($q,$i,"url"));
82		%>
83
84		<tr>
85		<td <%= $bg %>>
86		<%
87		$cats = getCategoriesForLinkAsHTML( $id, $u, "add-trailing-noun=1", 0 );
88		%>
89		<big><%= makeLinkOut( $id ) %></big>
90		<%= makePermaLink( $id ) %>,
91		<%
92		$cats = $cats ? "$cats" : "by $submitter";
93		echo $cats;
94		%>
95		<% if( ! $owned ) { %>
96		<%= getStealItLinkWithText( $id ) %>
97		<% } else { %>
98
99		<%= makeEditLink( $id ) %>
100		<%= makeDeleteLink( $id ) %>
101
102		<% } %>
103		<%= makeMailLink( $id ) %>
104		</td>
105		</tr>
106
107		<%
108		$i++;
109		}
110		}
111		} else if( $search_only == "users" ) {
112		while ($i < $numRows) {
113		$userid = urldecode( mysql_result($q,$i,"userid"));
114		$email = urldecode( mysql_result($q,$i,"email"));
115		$name = urldecode( mysql_result($q,$i,"name"));
116
117		$qs3 = "SELECT COUNT(*) FROM links WHERE submitter = '$userid';";
118		$q3 = mysql_query( $qs3 );
119		$linkCount = mysql_result($q3,0);
120		%>
121
122		<tr>
123		<td <%= $bg %>>
124		<big><%= makeUserLink( $userid ) %></big> (<%= $linkCount %> links)
125		</td>
126		</tr>
127
128		<%
129		$i++;
130		}
131		} else if( $search_only == "tags" ) {
132		while ($i < $numRows) {
133		$id = urldecode( mysql_result($q,$i,"id"));
134		$name = urldecode( mysql_result($q,$i,"name"));
135		$isPrivate = urldecode( mysql_result($q,$i,"isPrivate"));
136		$userid = urldecode( mysql_result($q,$i,"userid"));
137		$i++;
138		if( !$isPrivate \|\| $u == $userid ) {
139		$qs3 = "SELECT COUNT(*) FROM linksCategoriesXRef WHERE catID = $id;";
140		$q3 = mysql_query( $qs3 );
141		$linkCount = mysql_result($q3,0);
142		%>
143
144		<tr>
145		<td <%= $bg %>>
146		<big><%= makeFolderLink( $id, makePrettyFolderName( $name )) %></big>
147		(<%= $linkCount %> links, owned by <%= makeUserLink( $userid ) %>)
148		</td>
149		</tr>
150
151		<%
152		}
153		}
154		}
155		%>
156
157		<!-- results end -->
158
159
160		<%
161		} # else no matches.
162		%>
163		</table>
164		<%
165		}
166		%>
167
168
169		<% if( $showInputForm ) { %>
170		<br />
171		<form action="search" method="get" name="search_form">
172
173		<div id="bigBox" style="margin: auto; height: inherit; width: 35em;">
174
175		<table border="0" cellpadding="0">
176		<tr>
177		<td>
178		Search <%= $my ? "my links " : "" %><%= $searchTerm ? "again" : "" %>: <input name="q" size="30" style="padding: 3px;" maxlength="40" value="<%= str_replace( "%", " ", $searchTerm ) %>">
179		</td>
180		<td align="center">
181		<input type="image" onMouseOver="btn_370.src='/img/search-on.png';" onMouseOut="btn_370.src='/img/search.png';" src="img/search.png" border="0" />
182		</td>
183		</tr>
184		</table>
185
186		<br />
187		<center>
188		within:
189
190		<% if( $debug ) { %>
191
192		<p>
193		$searchTerm <%= $searchTerm %><br>
194		$my <%= $my %><br>
195		$search_only <%= $search_only %><br>
196
197		</p>
198
199		<% } %>
200
201
202		<label><input type="radio" name="search_only" value="links" <%= $search_only != "users" && $search_only != "folders" ? "checked" : "" %> /> links</label>
203		<label><input type="radio" name="search_only" value="users" <%= $search_only == "users" ? "checked" : "" %> /> users</label>
204		<label><input type="radio" name="search_only" value="tags" <%= $search_only == "tags" ? "checked" : "" %> /> <%= getCatsName() %></label>
205		<% if( $sessionUserId ) { %>
206		<label><input type="checkbox" name="my" <%= $my ? "checked" : "" %> /> my links only  </label>
207		<% } %>
208		</center>
209
210		</div>
211
212		</form>
213
214		<% } %>
215		<br />
216		<br />
217		<center>
218		<a href="install/search"><img src="img/search-promo.gif" alt="install the firefox Feed Me Links search plugin!" border="0" /></a>
219		<br />
220		</center>
221
222		<br />
223		<% include( "$modules/footer.inc.php" ); %>
224		<%
225		new gzip_encode();
226		%>
	31	</body>
	32	</html>

feedmelinks/submit-link.php

r823