From 5a3a72604bf0e1c7ec04fbdbdee7a08c2a340c5a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 15 Dec 2013 20:59:52 -0800
Subject: some re-work of mod_sources

---
 mod/sources.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'mod/sources.php')

diff --git a/mod/sources.php b/mod/sources.php
index 125184d47..87bab60df 100644
--- a/mod/sources.php
+++ b/mod/sources.php
@@ -9,11 +9,25 @@ function sources_post(&$a) {
 
 	$source = intval($_REQUEST['source']);
 	$xchan = $_REQUEST['xchan'];
+	$abook = intval($_REQUEST['abook']);
 	$words = $_REQUEST['words'];
 	$frequency = $_REQUEST['frequency'];
 
 	$channel = $a->get_channel();
 
+	if($abook) {
+		$r = q("select abook_xchan from abook where abook_id = %d and abook_channel = %d limit 1",
+			intval($abook),
+			intval(local_user())
+		);
+		if($r) 
+			$xchan = $r[0]['abook_xchan'];
+	}
+
+	if(! $xchan) {
+		notice ( t('Failed to create source. No channel selected.') . EOL);
+		return;
+	}
 
 	if(! $source) {
 		$r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt )
@@ -92,6 +106,12 @@ function sources_content(&$a) {
 			intval(argv(1)),
 			intval(local_user())
 		);
+		if($r) {
+			$x = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+				dbesc($r[0]['src_xchan']),
+				intval(local_user())
+			);
+		}
 		if(! $r) {
 			notice( t('Source not found.') . EOL);
 			return '';
@@ -106,6 +126,7 @@ function sources_content(&$a) {
 			'$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
 			'$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')),
 			'$xchan' => $r[0]['src_xchan'],
+			'$abook' => $x[0]['abook_id'],
 			'$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''),
 			'$submit' => t('Submit')
 		));
-- 
cgit v1.2.3


From bd691300a77fbe511641eb5f707980cc1209dac7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 31 Jan 2014 20:02:59 -0800
Subject: provide some interesting new options to channel sources

---
 mod/sources.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'mod/sources.php')

diff --git a/mod/sources.php b/mod/sources.php
index 87bab60df..f4b36508f 100644
--- a/mod/sources.php
+++ b/mod/sources.php
@@ -12,9 +12,13 @@ function sources_post(&$a) {
 	$abook = intval($_REQUEST['abook']);
 	$words = $_REQUEST['words'];
 	$frequency = $_REQUEST['frequency'];
+	$name = $_REQUEST['name'];
 
 	$channel = $a->get_channel();
 
+	if($name == '*')
+		$xchan = '*';
+
 	if($abook) {
 		$r = q("select abook_xchan from abook where abook_id = %d and abook_channel = %d limit 1",
 			intval($abook),
@@ -74,6 +78,9 @@ function sources_content(&$a) {
 		);
 		if($r) {
 			for($x = 0; $x < count($r); $x ++) {
+				if($r[$x]['src_xchan'] == '*') {
+					$r[$x]['xchan_name'] = t('*');
+				}
 				$r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt'], ENT_COMPAT,'UTF-8');
 			}
 		}
-- 
cgit v1.2.3