From a1861d1128aacc1ab98b33a1d035bfc27c9979f5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 16:29:06 -0800
Subject: [PATCH 1/8] tagging missing from wallwall and a couple of themes,
 star missing from dispy

---
 include/conversation.php                  |  14 ++++++++++++--
 mod/tagger.php                            |   1 +
 view/theme/dispy/premium.png              | Bin 0 -> 2317 bytes
 view/theme/dispy/star.png                 | Bin 0 -> 2129 bytes
 view/theme/dispy/style.css                |  15 +++++++++++++++
 view/theme/dispy/tag.png                  | Bin 0 -> 535 bytes
 view/theme/dispy/wall_item.tpl            |   1 +
 view/theme/dispy/wallwall_item.tpl        |   1 +
 view/theme/duepuntozero/wallwall_item.tpl |   1 +
 view/theme/loozah/wall_item.tpl           |   2 ++
 view/theme/loozah/wallwall_item.tpl       |   1 +
 view/theme/vier/wallwall_item.tpl         |   1 +
 view/wallwall_item.tpl                    |   2 ++
 13 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100755 view/theme/dispy/premium.png
 create mode 100755 view/theme/dispy/star.png
 create mode 100644 view/theme/dispy/tag.png

diff --git a/include/conversation.php b/include/conversation.php
index 53369cf20..2ef37694d 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,6 +6,11 @@
 function localize_item(&$item){
 
 	$Text = $item['body'];
+
+
+	// find private image (w/data url) if present and convert image 
+	// link to a magic-auth redirect.
+
 	$saved_image = '';
 	$img_start = strpos($Text,'[img]data:');
 	$img_end = strpos($Text,'[/img]');
@@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$toplevelprivate = false;
 
 				// Take care of author collapsing and comment collapsing
+				// (author collapsing is currently disabled)
 				// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
 				// If there are more than two comments, squash all but the last 2.
 			
@@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
 					$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-					/*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+					// DISABLED
+					/*
+					if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
 						$blowhard_count ++;
 						if($blowhard_count == 3) {
 							$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
@@ -424,7 +432,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						if($blowhard_count >= 3)
 							$o .= '</div>';
 						$blowhard_count = 0;
-					}*/
+					}
+					// END DISABLED
+					*/
 
 					$comments_seen = 0;
 					$comments_collapsed = false;
diff --git a/mod/tagger.php b/mod/tagger.php
index 76ec3366c..3ff5d57aa 100755
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -134,6 +134,7 @@ EOT;
 	$arr['target'] = $target;
 	$arr['object-type'] = $objtype;
 	$arr['object'] = $obj;
+	$arr['private'] = $item['private'];
 	$arr['allow_cid'] = $item['allow_cid'];
 	$arr['allow_gid'] = $item['allow_gid'];
 	$arr['deny_cid'] = $item['deny_cid'];
diff --git a/view/theme/dispy/premium.png b/view/theme/dispy/premium.png
new file mode 100755
index 0000000000000000000000000000000000000000..1ad601c0f1e3db18b9a8f4add6865bf6ad78611c
GIT binary patch
literal 2317
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

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/star.png b/view/theme/dispy/star.png
new file mode 100755
index 0000000000000000000000000000000000000000..a327ba14e462a494523d9d5be1195989b08b36ad
GIT binary patch
literal 2129
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

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 5bc1450db..62c7b48e0 100755
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1099,6 +1099,21 @@ div[id$="wrapper"] br { clear: left; }
 	border-bottom: 0px;
 }*/
 
+.starred { 
+	background-image: url("star.png"); 
+	repeat: no-repeat;
+}
+.unstarred { 
+	background-image: url("premium.png");
+	repeat: no-repeat;
+}
+
+.tagged {
+	background-image: url("tag.png");
+	repaet: no-repeat;
+}
+
+
 
 .border {
 	border: 1px solid #babdb6;
diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..709525393073de8a654097995ca9105fe825b16f
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzxk*GpRCwBaQ#;DSKoB1D3o2%{vl0YB
z1g{|WHWoIXAP11e!uZ0<N<4t1v9$IGirOe*VI$r^EKIcU`R@#DaN}cOn4OvZzWqpM
ze9z|-ep##4>WN@{X<PnZ;6|fC;99N5KJ`1Dj`5YCTCEaTkg&(&;nus|u7j~sspz-c
z4TzxM?<?T#cI$%g_q)=QIY#t11)I%=z|Cfp?e}{K27~0%%H^_-5nsPvuPVWMy;i`p
z*$e`K0A#aSie5t!O(u)Qq9+&)(=^%PaDeG_3YW_TY}<y(WCG{&nE<bj3W#7npDSRI
zQ&XDbIHcxuI#C^6sI*12{&u@vPkd$iV8`PTmdm9AmKF+yAQp?!x!rEt0%HvZ1MU|x
z4N+hyb+uZNG_OS>5y)gRayD!npy6=HG1sIdP18Wv^*1nM4ASW|;KbJJb&@T?lEA_S
z4ofnbglIJCf{`$lN-5xcKF?nt&_<&X7qVTFL?S_w!{IOyVhwwEr%)(xuR{6@#bS{o
zyO?<*iO1taglDW_5AS>$d3O#<r4kpTNlH+%l#Mm)ecKtIcb#*&-0S*U<MEjP+Sq>q
Z1^_p4FDQ4H6ZZfB002ovPDHLkV1l)X^V$Fa

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 9c3703f5f..882843a09 100755
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -24,6 +24,7 @@
 		<div class="wall-item-tools" id="wall-item-tools-$id">
 			{{ if $star }}
 				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
 			{{ endif }}
 			{{ if $vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 95c68220a..57c6600b7 100755
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -29,6 +29,7 @@
 		<div class="wall-item-tools" id="wall-item-tools-$id">
 			{{ if $star }}
 				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
 			{{ endif }}
 			{{ if $vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index ea9a218b4..4675f1e00 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -59,6 +59,7 @@
 			 
 			{{ if $star }}
 			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
 			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
index 727e3d1c2..56c8a82e2 100755
--- a/view/theme/loozah/wall_item.tpl
+++ b/view/theme/loozah/wall_item.tpl
@@ -49,6 +49,8 @@
 			 
 			{{ if $star }}
 			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+
 			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
index 09de86c7b..0e4c1a6cf 100755
--- a/view/theme/loozah/wallwall_item.tpl
+++ b/view/theme/loozah/wallwall_item.tpl
@@ -53,6 +53,7 @@
 			 
 			{{ if $star }}
 			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
 			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl
index 2301da1d1..8e452f4f6 100644
--- a/view/theme/vier/wallwall_item.tpl
+++ b/view/theme/vier/wallwall_item.tpl
@@ -62,6 +62,7 @@
 			{{ if $star }}
 				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
 				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
+				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
 			{{ endif }}
 			
 			{{ if $vote }}
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 11297647a..61a248135 100755
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -55,6 +55,8 @@
 			{{ if $star }}
 				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
 				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
+				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+
 			{{ endif }}
 			
 			{{ if $vote }}

From e994b990eb1c390759e1673870399c1537686bbb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 16:31:51 -0800
Subject: [PATCH 2/8] typo in css

---
 view/theme/dispy/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 62c7b48e0..7f563293a 100755
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1110,7 +1110,7 @@ div[id$="wrapper"] br { clear: left; }
 
 .tagged {
 	background-image: url("tag.png");
-	repaet: no-repeat;
+	repeat: no-repeat;
 }
 
 

From 6bc48b29ccdab1c9d48f159282f5dbd8eaa5d5ef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 16:40:21 -0800
Subject: [PATCH 3/8] fix tag icon size

---
 view/theme/dispy/tag.png | Bin 535 -> 632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
index 709525393073de8a654097995ca9105fe825b16f..aca10707af2b66ea05498958886162a09cfe45ac 100644
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW1
z04EO~idy~v00H<(L_t(I%iWZ*s^UNthX0L1ED}@g3n(JUzJV44zJ`quY%CNJL?#i@
zR`LWXZ)IaAY@vmST3Y)IqTm>XoJqV@#9Z&)b=hXw0|PVj|9mrNm~()CJ-)qav~Ak~
zV16OH!{M;?@~ND2hjV`NJn#0|;GCZ#Z}NArPN(BYDNW0=^e_zX`=in53;^wRTa!}a
zC1AVVc7h-<Ez8n_Ac$$vItT(hYF`2yjfO)+rfu8$e!oX5l|m|&y6eqmQv(1gC5Y(P
zz<RyzNGb2I^?D6eRZ%P!p{nYW|1o9dqgboe93nEi-L8H(9I#rg;QKy=5LhmkxLhuf
zQpU#P4P(G+wHkwMHk+9Fd_H5nUc>V|5D|z7wrvX{a-UMJR4NV;nY~_5KOT?RZnrU5
z6p2IvK@fn5Fc=I30Qc?ft@Q--ec$Z&`??SU+wC^?E>Wb@X%q?t0Dxs#0)RUnk7FPD
zo^q6eqA1Wb?FpvqI`a8EZnqma=YoiyU>|`l=Ujwgh)gB}!!Yh9P1BIe<zleOWb$dL
zC8Ei0xBHpNWWLYm^B;^c)i4ZPuU90KNo2FxsGda_hVFDaZN1za%H^^Hz#I$)_fk_7
z1-)KR0B~osS?iBm5M#_?jGY#X#ci=z+!$jg#+dV0?W<HOJ+>=%xm>pJU&K2)_B21h
S9c2Ij0000<MNUMnLSTZ>GY~ES

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzxk*GpRCwBaQ#;DSKoB1D3o2%{vl0YB
z1g{|WHWoIXAP11e!uZ0<N<4t1v9$IGirOe*VI$r^EKIcU`R@#DaN}cOn4OvZzWqpM
ze9z|-ep##4>WN@{X<PnZ;6|fC;99N5KJ`1Dj`5YCTCEaTkg&(&;nus|u7j~sspz-c
z4TzxM?<?T#cI$%g_q)=QIY#t11)I%=z|Cfp?e}{K27~0%%H^_-5nsPvuPVWMy;i`p
z*$e`K0A#aSie5t!O(u)Qq9+&)(=^%PaDeG_3YW_TY}<y(WCG{&nE<bj3W#7npDSRI
zQ&XDbIHcxuI#C^6sI*12{&u@vPkd$iV8`PTmdm9AmKF+yAQp?!x!rEt0%HvZ1MU|x
z4N+hyb+uZNG_OS>5y)gRayD!npy6=HG1sIdP18Wv^*1nM4ASW|;KbJJb&@T?lEA_S
z4ofnbglIJCf{`$lN-5xcKF?nt&_<&X7qVTFL?S_w!{IOyVhwwEr%)(xuR{6@#bS{o
zyO?<*iO1taglDW_5AS>$d3O#<r4kpTNlH+%l#Mm)ecKtIcb#*&-0S*U<MEjP+Sq>q
Z1^_p4FDQ4H6ZZfB002ovPDHLkV1l)X^V$Fa


From fc036210fb599cff936b647689362ebacf86a16b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 18:53:48 -0800
Subject: [PATCH 4/8] spam db

---
 boot.php     |  2 +-
 database.sql | 12 ++++++++++++
 update.php   | 17 ++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index ada0f563d..bac7861c0 100755
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1264' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1127      );
+define ( 'DB_UPDATE_VERSION',      1128      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index ced646f59..349dd2a27 100755
--- a/database.sql
+++ b/database.sql
@@ -838,4 +838,16 @@ INDEX ( `master-parent-item` ),
 INDEX ( `receiver-uid` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `spam` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`uid` INT NOT NULL,
+`spam` INT NOT NULL DEFAULT '0',
+`ham` INT NOT NULL DEFAULT '0',
+`term` CHAR(255) NOT NULL,
+INDEX ( `uid` ),
+INDEX ( `spam` ),
+INDEX ( `ham` ),
+INDEX ( `term` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
 
diff --git a/update.php b/update.php
index 8a2d891ca..865c6175e 100755
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1127 );
+define( 'UPDATE_VERSION' , 1128 );
 
 /**
  *
@@ -1094,3 +1094,18 @@ function update_1126() {
 	q("ALTER TABLE `mailacct` ADD `action` INT NOT NULL AFTER `pass`,
 		ADD `movetofolder` CHAR(255) NOT NULL AFTER `action`");
 }
+
+function update_1127() {
+	q("CREATE TABLE IF NOT EXISTS `spam` (
+  `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+  `uid` INT NOT NULL,
+  `spam` INT NOT NULL DEFAULT '0',
+  `ham` INT NOT NULL DEFAULT '0',
+  `term` CHAR(255) NOT NULL,
+  INDEX ( `uid` ),
+  INDEX ( `spam` ),
+  INDEX ( `ham` ),
+  INDEX ( `term` )
+  ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
+}
+

From 36d173ca98f8f95bb14e58562004cdcf07c47183 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 00:56:41 -0500
Subject: [PATCH 5/8] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master: (29 commits)
  spam db
  fix tag icon size
  typo in css
  tagging missing from wallwall and a couple of themes, star missing from dispy
  Mail: New options for actions after importing mails.
  relative link redirects
  Avoid some notices
  Bugfix
  is not always defined; but if defined, then always of type integer
  1 Bugfix (missing $ character) and avoid some notices
  necessare fields not loaded from DB
  should probably be a->user['hidewall'] instead of profile['hidewall']
  "Vier-Theme" Some more design stuff.
  some revision to the German strings
  German strings
  Wrong variable name
  show experimental and unsupported theme status on theme admin page
  jumping divs with no scrolling
  imrpove contrast on darkzero blockquotes
  darkzero-NS theme
  ...

* master:

From 72e78046afbd1977ff7b5458005cd62471faba0e Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 01:04:41 -0500
Subject: [PATCH 6/8] minor typographical fixes. need to do something about the
 http on https sites for html5shiv. changed to https on mine

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/head.tpl       | 2 +-
 view/jot-header.tpl | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/view/head.tpl b/view/head.tpl
index 2a1837088..da6ec1159 100755
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -11,7 +11,7 @@
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
-         title="Search in Friendika" />
+         title="Search in Friendica" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 007f639b6..d6b172b6a 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -15,7 +15,7 @@ function initEditor(cb){
 			$("a#jot-perms-icon").fancybox({
 				'transitionIn' : 'elastic',
 				'transitionOut' : 'elastic'
-			}); 
+			});
 			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
 			return;
@@ -129,7 +129,6 @@ function enableOnUser(){
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
-	
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',

From 153e7beb195afa19843f1c114b569c08ad4307a4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 23:54:04 -0800
Subject: [PATCH 7/8] add plugin hooks to enotify

---
 include/enotify.php        | 122 ++++++++++++++++++++++++-------------
 view/email_notify_html.tpl |   2 +-
 view/email_notify_text.tpl |   2 +-
 view/head.tpl              |   2 +-
 4 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/include/enotify.php b/include/enotify.php
index 33e083b5e..67e0011b8 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -135,20 +135,34 @@ function notification($params) {
 	} while($dups == true);
 
 
+	$datarray = array();
+	$datarray['hash']  = $hash;
+	$datarray['name']  = $params['source_name'];
+	$datarray['url']   = $params['source_link'];
+	$datarray['photo'] = $params['source_photo'];
+	$datarray['date']  = datetime_convert();
+	$datarray['uid']   = $params['uid'];
+	$datarray['link']  = $itemlink;
+	$datarray['type']  = $params['type'];
+	$datarray['verb']  = $params['verb'];
+	$datarray['otype'] = $params['otype'];
+ 
+	call_hooks('enotify_store', $datarray);
+
 	// create notification entry in DB
 
 	$r = q("insert into notify (hash,name,url,photo,date,uid,link,type,verb,otype)
 		values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')",
-		dbesc($hash),
-		dbesc($params['source_name']),
-		dbesc($params['source_link']),
-		dbesc($params['source_photo']),
-		dbesc(datetime_convert()),
-		intval($params['uid']),
-		dbesc($itemlink),
-		intval($params['type']),
-		dbesc($params['verb']),
-		dbesc($params['otype'])
+		dbesc($datarray['hash']),
+		dbesc($datarray['name']),
+		dbesc($datarray['url']),
+		dbesc($datarray['photo']),
+		dbesc($datarray['date']),
+		intval($datarray['uid']),
+		dbesc($datarray['link']),
+		intval($datarray['type']),
+		dbesc($datarray['verb']),
+		dbesc($datarray['otype'])
 	);
 
 	$r = q("select id from notify where hash = '%s' and uid = %d limit 1",
@@ -217,44 +231,68 @@ intval($params['uid']), LOGGER_DEBUG);
 		$htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), 
 			"<br />\n",$body))));
 
+		$datarray = array();
+		$datarray['banner'] = $banner;
+		$datarray['product'] = $product;
+		$datarray['preamble'] = $preamble;
+		$datarray['sitename'] = $sitename;
+		$datarray['siteurl'] = $siteurl;
+		$datarray['source_name'] = $params['source_name'];
+		$datarray['source_link'] = $params['source_link'];
+		$datarray['source_photo'] = $params['source_photo'];
+		$datarray['username'] = $params['to_name'];
+		$datarray['hsitelink'] = $hsitelink;
+		$datarray['tsitelink'] = $tsitelink;
+		$datarray['hitemlink'] = '<a href="' . $itemlink . '">' . $itemlink . '</a>';
+		$datarray['titemlink'] = $itemlink;
+		$datarray['thanks'] = $thanks;
+		$datarray['site_admin'] = $site_admin;
+		$datarray['title'] = stripslashes($title);
+		$datarray['htmlversion'] = $htmlversion;
+		$datarray['textversion'] = $textversion;
+		$datarray['subject'] = $subject;
+		$datarray['headers'] = $additional_mail_header;
+
+		call_hooks('enotify_mail', $datarray);
+
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_html.tpl');
 		$email_html_body = replace_macros($tpl,array(
-			'$banner'       => $banner,
-			'$product'      => $product,
-			'$preamble'     => $preamble,
-			'$sitename'     => $sitename,
-			'$siteurl'      => $siteurl,
-			'$source_name'  => $params['source_name'],
-			'$source_link'  => $params['source_link'],
-			'$source_photo' => $params['source_photo'],
-			'$username'     => $params['to_name'],
-			'$hsitelink'    => $hsitelink,
-			'$itemlink'     => '<a href="' . $itemlink . '">' . $itemlink . '</a>',
-			'$thanks'       => $thanks,
-			'$site_admin'   => $site_admin,
-			'$title'		=> stripslashes($title),
-			'$htmlversion'	=> $htmlversion,	
+			'$banner'       => $datarray['banner'],
+			'$product'      => $datarray['product'],
+			'$preamble'     => $datarray['preamble'],
+			'$sitename'     => $datarray['sitename'],
+			'$siteurl'      => $datarray['siteurl'],
+			'$source_name'  => $datarray['source_name'],
+			'$source_link'  => $datarray['source_link'],
+			'$source_photo' => $datarray['source_photo'],
+			'$username'     => $datarray['to_name'],
+			'$hsitelink'    => $datarray['hsitelink'],
+			'$hitemlink'    => $datarray['hitemlink'],
+			'$thanks'       => $datarray['thanks'],
+			'$site_admin'   => $datarray['site_admin'],
+			'$title'		=> $datarray['title'],
+			'$htmlversion'	=> $datarray['htmlversion'],	
 		));
 		
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_text.tpl');
 		$email_text_body = replace_macros($tpl,array(
-			'$banner'       => $banner,
-			'$product'      => $product,
-			'$preamble'     => $preamble,
-			'$sitename'     => $sitename,
-			'$siteurl'      => $siteurl,
-			'$source_name'  => $params['source_name'],
-			'$source_link'  => $params['source_link'],
-			'$source_photo' => $params['source_photo'],
-			'$username'     => $params['to_name'],
-			'$tsitelink'    => $tsitelink,
-			'$itemlink'     => $itemlink,
-			'$thanks'       => $thanks,
-			'$site_admin'   => $site_admin,
-			'$title'		=> stripslashes($title),
-			'$textversion'	=> $textversion,	
+			'$banner'       => $datarray['banner'],
+			'$product'      => $datarray['product'],
+			'$preamble'     => $datarray['preamble'],
+			'$sitename'     => $datarray['sitename'],
+			'$siteurl'      => $datarray['siteurl'],
+			'$source_name'  => $datarray['source_name'],
+			'$source_link'  => $datarray['source_link'],
+			'$source_photo' => $datarray['source_photo'],
+			'$username'     => $datarray['to_name'],
+			'$tsitelink'    => $datarray['tsitelink'],
+			'$titemlink'    => $datarray['titemlink'],
+			'$thanks'       => $datarray['thanks'],
+			'$site_admin'   => $datarray['site_admin'],
+			'$title'		=> $datarray['title'],
+			'$textversion'	=> $datarray['textversion'],	
 		));
 
 //		logger('text: ' . $email_text_body);
@@ -266,10 +304,10 @@ intval($params['uid']), LOGGER_DEBUG);
 			'fromEmail' => $sender_email,
 			'replyTo' => $sender_email,
 			'toEmail' => $params['to_email'],
-			'messageSubject' => $subject,
+			'messageSubject' => $datarray['subject'],
 			'htmlVersion' => $email_html_body,
 			'textVersion' => $email_text_body,
-			'additionalMailHeader' => $additional_mail_header,
+			'additionalMailHeader' => $datarray['headers'],
 		));
 	}
 
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
index b302c2149..43f72f15c 100755
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
@@ -18,7 +18,7 @@
 	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
 	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
 	<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">$itemlink</td></tr>
+	<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
 	<tr><td></td><td>$thanks</td></tr>
 	<tr><td></td><td>$site_admin</td></tr>
 	</tbody>
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
index f7f5a4c68..018bb6078 100755
--- a/view/email_notify_text.tpl
+++ b/view/email_notify_text.tpl
@@ -6,7 +6,7 @@ $title
 $textversion
 				
 $tsitelink
-$itemlink
+$titemlink
 
 $thanks
 $site_admin
diff --git a/view/head.tpl b/view/head.tpl
index da6ec1159..f606f2f7e 100755
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -14,7 +14,7 @@
          title="Search in Friendica" />
 
 <!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 <script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>

From 9986fc19109bc0d393f8ded89730178ba7f377f4 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <s9alkamp@stud.uni-saarland.de>
Date: Mon, 27 Feb 2012 14:12:44 +0100
Subject: [PATCH 8/8] fixed syntax errors

---
 library/spam/b8/storage/storage_frndc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 2b9374f67..cbc6fe81a 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -256,7 +256,7 @@ class b8_storage_frndc extends b8_storage_base
 		$token = dbesc($token);
 		$count = dbesc($count);
 		$uid = dbesc($uid);
-		array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
+		array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
 	}
 
 	/**
@@ -273,7 +273,7 @@ class b8_storage_frndc extends b8_storage_base
 		$token = dbesc($token);
 		$count = dbesc($count);
 		$uid = dbesc($uid);
-		array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
+		array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
 	}
 
 	/**
@@ -325,7 +325,7 @@ class b8_storage_frndc extends b8_storage_base
 		if(count($this->_updates) > 0) {
 
 			// this still needs work
-			$result = q("select * from " . $this->config['table_name'] . ' where token = ';
+			$result = q("select * from " . $this->config['table_name'] . ' where token = ');
 
 			
 			$result = q('