From 94e6820e85ee098e2eb771a1893f14e3d1e6af92 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 21 May 2012 16:41:44 -0700
Subject: [PATCH 1/4] globaldir submission blocking

---
 testdrive.tgz           | Bin 1882 -> 1937 bytes
 testdrive/testdrive.php |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/testdrive.tgz b/testdrive.tgz
index 3369481c589e4399200e2afd0e3ae89dd24dd4f4..dac0ff780d0b4d5ee77b49796e91529a00f686bb 100755
GIT binary patch
literal 1937
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
XOIzB~mbSE|zX$ynG5&Fw04M+e)I-7|

literal 1882
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
UX-iw$(*F+q3y8fL#{eh*0H~U`u>b%7

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 909f4338..968aa834 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -15,6 +15,7 @@ function testdrive_install() {
 	register_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
 	register_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
 	register_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+	register_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
@@ -24,9 +25,14 @@ function testdrive_uninstall() {
 	unregister_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
 	unregister_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
 	unregister_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+	unregister_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
+function testdrive_globaldir_update($a,&$b) {
+	$b['url'] = '';
+}
+
 function testdrive_register_account($a,$b) {
 
 	$uid = $b;

From 3926f5582d6d1f704201a858ca09c969d4f110a7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 22 May 2012 18:05:39 -0700
Subject: [PATCH 2/4] startpage addon

---
 startpage.tgz           | Bin 0 -> 1314 bytes
 startpage/startpage.css |  16 +++++++
 startpage/startpage.php |  94 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 startpage.tgz
 create mode 100644 startpage/startpage.css
 create mode 100644 startpage/startpage.php

diff --git a/startpage.tgz b/startpage.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..67a4ebd08671d8270343f7780442f438df541f92
GIT binary patch
literal 1314
zcmV+-1>O1|iwFSDH@r^(1MOE^Z`(E$_N)CX&NQR4i`cTAI4<ls#jp+Q!?Fcvu|2ef
zK}(cHL?ShkiW3a|?>nR}wri(GhBU)AeL!M~JUo~0TqG$?q)y3-dX2A!0b(*4H%8;L
z$!K)e7>v(H=VwE^UZ61?PR5hL>FN3Dq%jzdCX-<U#$V5+4Kjrc05lTfub8}L`~kUi
zH9jA{diCl#e0oNxD*x40-&g8MZ5+%0==A)v{Ex>2%>Up?y?6ls^Zd73t#7N$_w2uz
zENKjXwwhrqh@L`BLp^IX*DTP{6h?zVdWW|Okt@b~OQE$$aCvN2KkaGT)3YlQP~{tu
z&$JB(xwe0ro&P=#^?w?rPio^x|BuhkMqB+qGW~xxnbiIN9JqLm*=~6+U$)>S{6Z2s
zg}0^<;2JBzto?u;Dp{(T;J8IK5J)8rsgyJT+u>ROHh2Jn<1cnGgi<6BiG<pHqvSU#
zl~pk856t~{nT~{<!WFxra8)u77m?QK)bpxb^nH<dsT3iLsh6Per8$j%9?q>W<GyhV
zs>)q3j@NPA>6)1$>53^$<suT|rsEoiP=IOo1Y8mXf_o1XzY*Bz+??yq_LQb^h7m6m
z)td2@dZg;=*m2E^RH(;#zI(Q7XYV1_GQPuG#=i=4dupGMyJNbajJ-qjRbh78<OJGF
zOCk$9-(WlVBwl2S%1*c2YGR6YCi$$@YPN0X%wa|KBJ~9i*{ZWGeX?=H-M%)#qH3jO
zOnJv@=~{cuwu*_0P-VyLqR;v6iR-ytn9t`h=)!BzGNUkski?1_U4=5FPL}f6f3Eem
zxe{be?h7kMxLhE;OXK*GD4I!AHGQ<2J7A2sE}F1*`%oSJ)T+WqBJ+V`n)!RIyCv~&
z@~NRC3MKJih=-E!z7cNQCFDyJELkhvUR?kB_8kx@$-R~Nox+;MF(d?Mi^?S4Qumg^
zN|@PoOJWv)AsLA8i;Qb?hVTGb2uc{^ATkMgPBKaIWalnHC?pzX=o${R+^2jP9Vm;P
z`Z1+poj+b2W;YM&{U-4}l`Ru&q>n~YJ+f#{Oor2iCM(s!t7Kn2>g^U4zMC1G@l{@~
zZBLnJK*>eY2RqG!z;Y(me3LxJLt!2b=A><~imNZO)p>zTy=W`L)6p*SHnx?%kEx0%
zrf<ur$>^GbPk3GqR<iUk#z_I3`P6#VG*xZRymup=#1SQd`w{wca4%xUZ$Q#`?rf|$
z0Qx?qb4SxV?co=b0}(zJ=Z<TN{y>Ac-ovv8kDFtz0|^ZnnLEh51Ky=sbUw%r+$o~{
z$%Kco`58Wbxi<W1j4IqJS*&o$$TBXY`ul@sL$ET>@;C3UelEGCcQ`T1A}9>0oUDM|
zf{&9xAzKC0y(L<_aW382Ml3qD(dmx+wzOGRma>Dxz3`08Y*#Z2OcHiJSJslG*p9pE
z^KX~~(ssi!et*8@ln%Wq-(0FU8xrD^rFgl49)8FWoF~heU|E=nP`seP8q-$#Ztd*2
z#CV$N11>pRh2#LoSFkM!#|*5D7G-6fvUTF^sP>SW%WdX;bP*ZJH@?iF`2wp#|M89_
zDOUItUi^^>J>yibg}ljc07EU7g=Qi1?QB$@y2l4^lJAt^7j|t0Aw9P&pg4T<AqL9~
zzw-F;vdP7(1jA*)Va`{+yT@3sTtBRBhfq^}`CRRmv=&@e0o321HEPtTQKLqU8Z~Ov
Ys8ORvjT$v-)cCjJFButytpF$h0PCojWdHyG

literal 0
HcmV?d00001

diff --git a/startpage/startpage.css b/startpage/startpage.css
new file mode 100644
index 00000000..e78be7ec
--- /dev/null
+++ b/startpage/startpage.css
@@ -0,0 +1,16 @@
+
+
+
+#startpage-page-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#startpage-page {
+	float: left;
+}
+
+#startpage-desc {
+	margin-bottom: 10px;
+}
diff --git a/startpage/startpage.php b/startpage/startpage.php
new file mode 100644
index 00000000..85988298
--- /dev/null
+++ b/startpage/startpage.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Name: Start Page
+ * Description: Set a preferred page to load on login from home page
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ */
+
+
+function startpage_install() {
+	register_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+	register_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+	register_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+}
+
+
+function startpage_uninstall() {
+	unregister_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+	unregister_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+	unregister_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+}
+
+
+
+function startpage_home_init($a, $b) {
+	if(! local_user())
+		return;
+
+	$page = get_pconfig(local_user(),'startpage','startpage');
+	if(strlen($page)) {
+		$slash = ((strpos($page,'/') === 0) ? true : false);
+		if(stristr($page,'://'))
+			goaway($page);
+		goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page);
+	}
+	return;
+}
+
+/**
+ *
+ * Callback from the settings post function.
+ * $post contains the $_POST array.
+ * We will make sure we've got a valid user account
+ * and if so set our configuration setting for this person.
+ *
+ */
+
+function startpage_settings_post($a,$post) {
+	if(! local_user())
+		return;
+	if($_POST['startpage-submit'])
+		set_pconfig(local_user(),'startpage','startpage',strip_tags(trim($_POST['startpage'])));
+}
+
+
+/**
+ *
+ * Called from the Plugin Setting form. 
+ * Add our own settings info to the page.
+ *
+ */
+
+
+
+function startpage_settings(&$a,&$s) {
+
+	if(! local_user())
+		return;
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$page = get_pconfig(local_user(),'startpage','startpage');
+
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . t('Startpage Settings') . '</h3>';
+	$s .= '<div id="startpage-page-wrapper">';
+	$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login  - leave blank for profile wall') . '</label>';
+	$s .= '<input id="startpage-page" type="text" name="startpage" value="' . $page . '" />';
+	$s .= '</div><div class="clear"></div>';
+	$s .= '<div id="startpage-desc">' . t('Examples: &quot;network&quot; or &quot;notifications/system&quot;') . '</div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}

From e4b1489b14cf474c98156fbe781070f31083f854 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 22 May 2012 22:33:08 -0700
Subject: [PATCH 3/4] normalise links before comparison (bug #431)

---
 privacy_image_cache/privacy_image_cache.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index c7943954..88958101 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -62,7 +62,8 @@ function privacy_image_cache_init() {
  */
 function privacy_image_cache_is_local_image($url) {
     if ($url[0] == '/') return true;
-    $baseurl = get_app()->get_baseurl();
+    $baseurl = normalise_link(get_app()->get_baseurl());
+	$url = normalise_link($url);
     return (substr($url, 0, strlen($baseurl)) == $baseurl);
 }
 

From d6b3ddcd3de9fb6249514486e335d6a5179841c0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 23 May 2012 15:43:35 -0700
Subject: [PATCH 4/4] bug #431

---
 privacy_image_cache.tgz                     | Bin 0 -> 2392 bytes
 privacy_image_cache/privacy_image_cache.php |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 privacy_image_cache.tgz

diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..38a25ff7be11ede4a0b7727bc06ee74c4ddd6857
GIT binary patch
literal 2392
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
KhtiV(C;$Llillo0

literal 0
HcmV?d00001

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 88958101..4e836219 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -62,6 +62,7 @@ function privacy_image_cache_init() {
  */
 function privacy_image_cache_is_local_image($url) {
     if ($url[0] == '/') return true;
+	// links normalised - bug #431
     $baseurl = normalise_link(get_app()->get_baseurl());
 	$url = normalise_link($url);
     return (substr($url, 0, strlen($baseurl)) == $baseurl);
@@ -72,7 +73,8 @@ function privacy_image_cache_is_local_image($url) {
  * @return string
  */
 function privacy_image_cache_img_cb($matches) {
-    if (privacy_image_cache_is_local_image($matches[2])) return $matches[2];
+	// following line changed per bug #431
+    if (privacy_image_cache_is_local_image($matches[2])) return $matches[1] . $matches[2] . $matches[3];
     return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
 }