Merge branch 'master' into tres

Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css

1 files changed, 37 insertions, 29 deletions

diff --git a/mod/prate.php b/mod/prate.php
index 28703d414..b89d16f42 100644
--- a/mod/prate.php
+++ b/mod/prate.php
@@ -1,13 +1,35 @@
 <?php
 
+function prate_init(&$a) {
+	if($_SERVER['REQUEST_METHOD'] === 'post')
+		return;
+
+	if(! local_channel())
+		return;
+
+	$channel = $a->get_channel();
+
+	$target = argv(1);
+	if(! $target)
+		return;
+
+	$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
+		dbesc($channel['channel_hash']),
+		dbesc($target)
+	);
+	if($r)
+		json_return_and_die(array('rating' => $r[0]['xlink_rating'],'rating_text' => $r[0]['xlink_rating_text']));
+	killme();
+}
 
 function prate_post(&$a) {
+
 	if(! local_channel())
 		return;
 
 	$channel = $a->get_channel();
 
-	$target = $_REQUEST['target'];
+	$target = trim($_REQUEST['target']);
 	if(! $target)
 		return;
 
@@ -20,28 +42,35 @@ function prate_post(&$a) {
 	if($rating > 10)
 		$rating = 10;
 
-	$rating_text = escape_tags($_REQUEST['rating_text']);
+	$rating_text = trim(escape_tags($_REQUEST['rating_text']));
+
+	$signed = $target . '.' . $rating . '.' . $rating_text;
+
+	$sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey']));
+
 
-	$z = q("select * from xlink where xlink_xchan = '%s' and xlink_xlink = '%s' and xlink_static = 1 limit 1",
+	$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
 		dbesc($channel['channel_hash']),
 		dbesc($target)
 	);
 	if($z) {
 		$record = $z[0]['xlink_id'];
-		$w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_updated = '%s'
+		$w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s'
 			where xlink_id = %d",
 			intval($rating),
 			dbesc($rating_text),
+			dbesc($sig),
 			dbesc(datetime_convert()),
 			intval($record)
 		);
 	}
 	else {
-		$w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', 1 ) ",
+		$w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
 			dbesc($channel['channel_hash']),
 			dbesc($target),
 			intval($rating),
 			dbesc($rating_text),
+			dbesc($sig),
 			dbesc(datetime_convert())
 		);
 		$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
@@ -52,32 +81,10 @@ function prate_post(&$a) {
 			$record = $z[0]['xlink_id'];
 	}
 	if($record) {
-		proc_run('php','include/notifier.php','rating',$record);
+		proc_run('php','include/ratenotif.php','rating',$record);
 	}
 
-	$x = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-		dbesc($target),
-		intval($local_channel())
-	);
-	if($x) {
-		$w = q("update abook set abook_rating = %d, abook_rating_text = '%s' where abook_xchan = '%s' and abook_channel = %d",
-			intval($rating),
-			dbesc($rating_text),
-			dbesc($target),
-			intval(local_channel())
-		);
-		$x = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-			dbesc($target),
-			intval($local_channel())
-		);
-		if($x) {
-			unset($x[0]['abook_id']);
-			unset($x[0]['abook_account']);
-			unset($x[0]['abook_channel']);
-			build_sync_packet(0, array('abook' => array($x[0])));
-		}
-	}
-	return;
+	json_return_and_die(array('result' => true));;
 }
 			
 
@@ -89,3 +96,4 @@ function prate_post(&$a) {
 
 
 
+