Navigation

← Previous Changeset
Next Changeset →

Changeset 1447

Timestamp:

04/18/07 13:20:43 (2 years ago)

Author:

jm3

Message:

fixables and feedables

Files:

feedmelinks/modules/footer.inc.php (modified) (2 diffs)
feedmelinks/modules/main-interface.inc.php (modified) (2 diffs)
feedmelinks/modules/my-recent.inc.php (modified) (1 diff)
feedmelinks/modules/news.inc.php (modified) (1 diff)
feedmelinks/modules/utils.inc.php (modified) (14 diffs)

Legend:

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

feedmelinks/modules/footer.inc.php

r1441	r1447
2	2	<br>
3	3	<div id="footer">
4		<div ~~style="width: 800px;"~~>
	4	<div>
5	5	<div class="left">
6	6	Something not working?
…	…
18	18	<div class="right">
19	19	<a href="http://feeds.feedburner.com/FeedMeLinks"><img src="/img/xml" border="0" vspace="3" alt="rss" /></a>
	20
20	21	</div>
21	22	<%

feedmelinks/modules/main-interface.inc.php

r1387	r1447
31	31	?>
32	32
33		<div class="box" ~~style="width: 330px;"~~>
	33	<div class="box">
34	34	<div class="subhead">
35	35	<?php
…	…
118	118	?>
119	119
	120	<?php include( "$modules/for-me.inc.php" ); ?>
	121
120	122	<?php include( "$modules/my-recent.inc.php" ); ?>
121	123

feedmelinks/modules/my-recent.inc.php

r1423	r1447
8	8	$con_myRecent = mysql_connect();
9	9	mysql_selectdb( getDBName() );
10		$MAX_LINKS = 15;
	10	$MAX_LINKS = 10;
11	11
12	12	if( $u \|\| $who ) {

feedmelinks/modules/news.inc.php

r1381 r1447

10 10
11 11 ?>
12 <div id="newsfeed" class="box" ~~style="width: <?= $width ?>px;"~~>
12 <div id="newsfeed" class="box">
13 13
14 14 <?php

feedmelinks/modules/utils.inc.php

r1445	r1447
12	12	define( "SPAMMING", 2 );
13	13
14		function get_links_tagged_for_me( $user ) {
	14	function is_whitelisted( $user ) {
	15	if( $user == get_admin_user() \|\| has_me_as_a_peep( $user, get_admin_user()))
	16	return true;
	17	else
	18	return false;
	19	}
	20
	21	function get_links_tagged_for_me( $user, $num ) {
15	22	$links = array();
16	23	$qs = getQuery( "links_tagged_for_me", "$user" );
17	24	$q = run_query( $qs );
18	25	$c = mysql_num_rows($q);
19		echo "<p>$user has " . ($c ? $c : 0 ) . " links tagged!</p>";
20		while( $row = mysql_fetch_assoc( $q )) {
21		$ID = urldecode( $row["ID"] );
22		$name = urldecode( $row["name"] );
23		$links[$ID] = $name;
	26	$who = get_user() == $user ? "You have" : "$user has";
	27	$count = 0;
	28	while( $row = mysql_fetch_assoc( $q ) ) {
	29	if( $count < $num ) {
	30	$ID = urldecode( $row["ID"] );
	31	$name = urldecode( $row["name"] );
	32	$links[$ID] = $name;
	33	}
	34	$count++;
24	35	}
25	36	return $links;
…	…
163	174	}
164	175
	176	function export_as_html_OLD( $u, $select ) {
	177	return "<ul>\n" . export( $u, "html", $select ) . "</ul>";
	178	}
	179
165	180	function export_as_html( $u, $select ) {
166		return "<ul>\n" . export( $u, "html", $select ) . "</ul>";
	181	return "<!DOCTYPE NETSCAPE-Bookmark-file-1>
	182	<HTML>
	183	<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'>
	184	<Title>Bookmarks</Title>
	185	<H1>$u's links</H1>
	186	<DT><H3 FOLDED>Feed Me Links Export - $u</H3>
	187	<DL><p>\n" . export( $u, "html", $select ) . "</DL><p></HTML>";
167	188	}
168	189
…	…
174	195	$tags = preg_replace( "/ /", "_", implode( ",", get_tag_names( $id, $u )));
175	196	$url = encode_url_for_xml( $url );
176		return " <~~li><a href='$url' tags='$tags' date='$createDate'>$name</a></li~~>\n";
	197	return " <DT><A HREF='$url' TAGS='$tags' DATE='$createDate'>$name</A>\n";
177	198	}
178	199
…	…
1678	1699	$r = $argFlop ? 1 : 0;
1679	1700	# this is so fucking sketchy....
1680		return "<div class=\"r$r\">" . $argContent;
1681		#return "<div class=\"r$r\">" . $argContent . "</div>";
	1701	return "\n<div class=\"r$r\">" . $argContent;
1682	1702	}
1683	1703
…	…
1685	1705	$l = $argLinkHash;
1686	1706	if( $l ) {
1687
1688		$s .= "<a title='" . $l["u"] . "'href='/u/" . $l["u"] ."'><img src='/" . get_tiny_image( $l["u"] ) . "' width='16' height='16' border='0' /></a> ";
1689
1690		#if( $user_linkstyle == "basic" ) {
1691		#$s .= getBareUserLink( $l["u"] );
1692		#$s .= "'s ";
1693		#} else if( $user_linkstyle == "icons" ) {
1694		#$s .= getUserLink( $l["u"] );
1695		#$s .= "'s ";
1696		#} # else none...
1697
	1707	$u = $l["u"];
	1708	if( $user_linkstyle == "whitelist" && ! is_whitelisted( $u ))
	1709	return ""; # row_wrap( "<div style='display:none'><!-- whitelist doesn't allow links from " . $u . "-->", $argFlop );
	1710
	1711	$s .= "\n <a title='" . $l["u"] . "'href='/u/" . $l["u"] ."'><img src='/" . get_tiny_image( $l["u"] ) . "' width='16' height='16' border='0'/></a>\n";
	1712
1698	1713	# link
1699		if( $l["name"] ) {
1700		# these were historically different for some reason:...
1701		#$s .= getLink( $l["ID"], urldecode( $l["url"] ), urldecode( $l["name"] ), "", "", "" );
1702		$s .= getLinkOut( $l["ID"] );
1703		} else {
1704		$s .= getLinkOut( $l["ID"] );
1705		}
	1714	$s .= " ". getLinkOut( $l["ID"] ) . "\n";
1706	1715
1707	1716	# grab it link
1708		$s .= " ~~" . getStealItLink( $l["ID"] )~~;
	1717	$s .= " " . getStealItLink( $l["ID"] ) . "\n";
1709	1718	# link ID
1710		$s .= " ~~" . getPermaLink( $l["ID"] )~~;
	1719	$s .= " " . getPermaLink( $l["ID"] ) . "\n";
1711	1720
1712	1721	# tags
…	…
1715	1724	# we write the open here and close it in the calling func.
1716	1725	# god help us.
1717		$s .= ~~'<div style="text-align: right;">'~~;
1718		$s .= " in " . getTagLink( $l["tagID"], $l["tag"] );
	1726	$s .= " <div style='text-align: right;'>\n";
	1727	$s .= " in " . getTagLink( $l["tagID"], $l["tag"] );
1719	1728
1720	1729	return row_wrap( $s, $argFlop );
…	…
1726	1735	array( "get_their_links_header_cb", $u), array( "get_their_links_footer_cb", NULL ), "basic" );
1727	1736	}
	1737
	1738	# convenience wrapper:
	1739	function get_whitelisted_recents( $title ) {
	1740	return get_linklist( getMasterQuery() . " ORDER BY links.ID DESC LIMIT 75",
	1741	array( "get_their_links_header_cb", $u), array( "get_their_links_footer_cb", NULL ), "whitelist" );
	1742	}
	1743
1728	1744	function get_their_links_header_cb() { return "THEIR RECENT LINKS"; }
1729	1745	function get_their_links_footer_cb() { return "<div class=\"center\"><a href=\"/link-cruiser\">VIEW MORE LINKS!</a> (<a href=\"/mile-long\">MORE! MORE!</a>)"; }
…	…
1767	1783	# STRICT NUM_USERS MOST RECENT
1768	1784	$c = 0;
1769		$qs = "SELECT ID, name, userid, url, ~~lastMod~~ FROM links WHERE (";
	1785	$qs = "SELECT ID, name, userid, url, createDate FROM links WHERE (";
1770	1786	foreach( $users as $user => $junk ) {
1771	1787	$qs .= "userid = '" . urlencode( $user ) . "'";
…	…
1787	1803	$name = preg_replace( '/&/', '&', $name );
1788	1804	ob_start();
	1805	$date = formatAsDCDate( $row["createDate"] );
	1806	$date = format_mysql_date_as_DC_date( $row["createDate"] );
1789	1807	?>
1790
1791	1808	<item>
1792	1809	<title><?= $user ?>: <?= $name ?></title>
…	…
1794	1811	<description>added by <?= $user ?></description>
1795	1812	<guid isPermaLink="true">http://feedmelinks.com/<?= $row["ID"] ?></guid>
1796		<content:encoded><?= $user . ": " . urldecode( $name ) ?></content:encoded>
	1813	<content:encoded><![CDATA[<?= $user . ": " . urldecode( $name ) ?><br>
	1814	<?= getStealItLinkWithText( $row["ID"], "Add this to your links?", $hide_image = true, $absolute = true ) ?>]]></content:encoded>
1797	1815	<dc:subject>http://feedmelinks.com/t/<?= $row["ID"] ?></dc:subject>
1798		<dc:date><?= ~~formatTS( $row["lastMod"] )~~ ?></dc:date>
	1816	<dc:date><?= $date ?></dc:date>
1799	1817	</item>
1800	1818	<?php
…	…
1813	1831	ob_start();
1814	1832	?><?= $x ?>
1815		<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
1816		"http://my.netscape.com/publish/formats/rss-0.91.dtd">
	1833	<!-- http://diveintomark.org/archives/2004/02/04/incompatible-rss -->
1817	1834	<rss version="2.0"
1818	1835	xmlns:dc="http://purl.org/dc/elements/1.1/"
…	…
1878	1895
1879	1896	$lastID = "";
	1897	$first_printed = false;
1880	1898	while( $row = mysql_fetch_assoc( $q )) {
1881	1899	if( $row["ID"] == $last_id ) {
1882		$out .= ", " . getFolderLink( $row["tagID"], makePrettyFolderName( urldecode( $row["tag"] )));
	1900	echo "<!-- printlink sees " . $row["u"] . " -->\n";
	1901	if( $user_linkstyle != "whitelist" \|\| ($user_linkstyle == "whitelist" && is_whitelisted( $row["u"] ))) {
	1902	# FIXME: remove extra 4 spaces before comma when done
	1903	$out .= " , " . getFolderLink( $row["tagID"], makePrettyFolderName( urldecode( $row["tag"] ))) . "\n";
	1904	$first_printed = true;
	1905	}
1883	1906	} else {
1884		if( $c != 0 ) {
1885		$out .= "</div>";
1886		$out .= "</div>";
	1907	if( $first_printed ) {
	1908	if( $user_linkstyle != "whitelist" \|\| ($user_linkstyle == "whitelist" && is_whitelisted( $row["u"] ))) {
	1909	$out .= "</div>\n";
	1910	$out .= "</div>\n";
	1911	}
1887	1912	}
1888		$out .= print_link( $row, $c % 2 == 0 ? 1 : 0, $user_linkstyle );
	1913	if( $user_linkstyle != "whitelist" \|\| ($user_linkstyle == "whitelist" && is_whitelisted( $row["u"] ))) {
	1914	$out .= print_link( $row, $c % 2 == 0 ? 1 : 0, $user_linkstyle ). "\n";
	1915	$first_printed = true;
	1916	}
1889	1917	$c++;
1890	1918	}
…	…
1899	1927
1900	1928	$out .= "</div>";
1901		~~#$out .= "</div>"; # didnt think we needed this, but i guess we do...?~~
1902	1929	mysql_free_result($q);
1903	1930	return $out;
…	…
4407	4434	}
4408	4435
4409		function getStealItLinkWithText( $id ) {
	4436	function getStealItLinkWithText( $id, $mesg, $hide_image, $absolute ) {
	4437
	4438	$mesg = $mesg ? $mesg : " Add to your Links?";
	4439	$img = ( ! $hide_image ) ? "<img src='" . getSiteURL() . "/img/plus.gif' border='0' alt='+' />" : "";
	4440	$link = ($absolute ? getSiteURL() : "") . "/g/$id";
	4441
4410	4442	ob_start();
4411		%><a href="~~/g/<%= $id %>"><img src="<%= getSiteURL() %>/img/plus.gif" border="0" alt="+" /> Add to your Links?~~</a><%
	4443	%><a href="<%= $link %>"><?= $img ?><?= $mesg ?></a><%
4412	4444	return ob_get_clean();
4413	4445	}

r1381	r1447
10	10
11	11	?>
12		<div id="newsfeed" class="box" ~~style="width: <?= $width ?>px;"~~>
	12	<div id="newsfeed" class="box">
13	13
14	14	<?php

Navigation

Changeset 1447

Legend:

feedmelinks/modules/footer.inc.php

feedmelinks/modules/main-interface.inc.php

feedmelinks/modules/my-recent.inc.php

feedmelinks/modules/news.inc.php

feedmelinks/modules/utils.inc.php

Download in other formats: