harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some re-work of mod_sources

Browse Source
This commit is contained in:
friendica 2013-12-15 20:59:52 -08:00
parent 61a7bfb942
commit 5a3a72604b
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mod/sources.php
View File

@ -9,11 +9,25 @@ function sources_post(&$a) {
$source = intval($_REQUEST['source']); $source = intval($_REQUEST['source']);
$xchan = $_REQUEST['xchan']; $xchan = $_REQUEST['xchan'];
$abook = intval($_REQUEST['abook']);
$words = $_REQUEST['words']; $words = $_REQUEST['words'];
$frequency = $_REQUEST['frequency']; $frequency = $_REQUEST['frequency'];
$channel = $a->get_channel(); $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) { if(! $source) {
$r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt ) $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(argv(1)),
intval(local_user()) 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) { if(! $r) {
notice( t('Source not found.') . EOL); notice( t('Source not found.') . EOL);
return ''; 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.'), '$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')), '$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'], '$xchan' => $r[0]['src_xchan'],
'$abook' => $x[0]['abook_id'],
'$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''),
'$submit' => t('Submit') '$submit' => t('Submit')
)); ));

4
view/js/mod_sources.js
View File

@ -6,10 +6,10 @@ $(document).ready(function() {
width: 250, width: 250,
id: 'id-name-ac', id: 'id-name-ac',
onSelect: function(value,data) { onSelect: function(value,data) {
$("#id_xchan").val(data); $("#id_abook").val(data);
} }
}); });
a.setOptions({ autoSubmit: true, params: { type: 'a' }}); a.setOptions({ params: { type: 'a' }});
}); });

2
view/tpl/sources_edit.tpl
View File

@ -4,7 +4,7 @@
<form action="sources" method="post"> <form action="sources" method="post">
<input type="hidden" name="source" value="{{$id}}" /> <input type="hidden" name="source" value="{{$id}}" />
<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" /> <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
{{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$name}}
{{include file="field_textarea.tpl" field=$words}} {{include file="field_textarea.tpl" field=$words}}

2
view/tpl/sources_new.tpl
View File

@ -3,7 +3,7 @@
<div class="descriptive-text">{{$desc}}</div> <div class="descriptive-text">{{$desc}}</div>
<form action="sources" method="post"> <form action="sources" method="post">
<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" /> <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
{{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$name}}
{{include file="field_textarea.tpl" field=$words}} {{include file="field_textarea.tpl" field=$words}}