Merge branch 'master' into tres

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

1 files changed, 0 insertions, 75 deletions

diff --git a/mod/prep.php b/mod/prep.php
deleted file mode 100644
index 896717826..000000000
--- a/mod/prep.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-
-function prep_init(&$a) {
-
-	$poco_rating = get_config('system','poco_rating_enable');
-	// if unset default to enabled
-	if($poco_rating === false)
-		$poco_rating = true;
-
-	if(! $poco_rating)
-		return;
-
-	if(argc() > 1)
-		$hash = argv(1);
-
-	if(! $hash) {
-		notice('Must supply a channel identififier.');
-		return;
-	}
-
-	if(strpos($hash,'@')) {
-		$r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
-			dbesc($hash)
-		);
-		if($r)
-			$hash = $r[0]['hubloc_hash'];
-	} 
-
-	$p = q("select * from xchan where xchan_hash like '%s'",
-		dbesc($hash . '%')
-	);
-
-	if($p)
-		$a->poi = $p[0];
-
-}
-
-
-
-
-
-function prep_content(&$a) {
-
-
-	$poco_rating = get_config('system','poco_rating_enable');
-	// if unset default to enabled
-	if($poco_rating === false)
-		$poco_rating = true;
-
-	if(! $poco_rating)
-		return;
-
-	if(! $a->poi)
-		return;
-
-	$r = q("select * from xlink left join xchan on xlink_xchan = xchan_hash where xlink_link like '%s' and xlink_rating != 0",
-		dbesc($a->poi['xchan_hash'])
-	);
-
-	if(! $r)
-		notice( t('No ratings available') . EOL);
-
-
-	$o = replace_macros(get_markup_template('prep.tpl'),array(
-		'$header' => t('Ratings'),
-		'$rating_lbl' => t('Rating: ' ),
-		'$rating_text_lbl' => t('Description: '),
-		'$raters' => $r
-	));
-
-	return $o;
-}
-
-			
\ No newline at end of file