Merge branch 'master' of https://github.com/chriswinstead/red
This commit is contained in:
root
commit
80796c78f5
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -142,7 +142,7 @@ Functions</h2></td></tr>
|
||||
</table>
|
||||
</div><div class="memdoc">
|
||||
|
||||
<p>Referenced by <a class="el" href="view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0">apw_form()</a>, <a class="el" href="contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353">categories_widget()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81">conversation()</a>, <a class="el" href="editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6">editblock_content()</a>, <a class="el" href="editlayout_8php.html#aa877e4157a26b099de904164181dd386">editlayout_content()</a>, <a class="el" href="editpost_8php.html#a34011690864d122680c802e9e748ccfb">editpost_content()</a>, <a class="el" href="editwebpage_8php.html#a375e945255fad79a71036528f7480650">editwebpage_content()</a>, <a class="el" href="classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf">Item\get_comment_box()</a>, <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="mail_8php.html#a3c7c485fc69f92371e8b20936040eca1">mail_content()</a>, <a class="el" href="mail_8php.html#acfc2cc0bf4e0b178207758384977f25a">mail_post()</a>, <a class="el" href="nav_8php.html#a43be0df73b90647ea70947ce004e231e">nav()</a>, <a class="el" href="identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc">profile_sidebar()</a>, <a class="el" href="profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00">profiles_content()</a>, <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793">redbasic_form()</a>, <a class="el" href="rpost_8php.html#a8190354d789000806d9879aea276728f">rpost_content()</a>, <a class="el" href="text_8php.html#a876e94892867019935b348b573299352">search()</a>, <a class="el" href="text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447">searchbox()</a>, <a class="el" href="sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7">sources_content()</a>, <a class="el" href="sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e">sources_post()</a>, <a class="el" href="thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b">thing_content()</a>, <a class="el" href="widgets_8php.html#add9b24d3304e529a7975e96122315554">widget_affinity()</a>, <a class="el" href="widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65">widget_archive()</a>, <a class="el" href="widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256">widget_notes()</a>, <a class="el" href="widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8">widget_savedsearch()</a>, <a class="el" href="widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01">widget_settings_menu()</a>, <a class="el" href="widgets_8php.html#a0d404276fedc59f5038cf5c085028326">widget_suggestions()</a>, and <a class="el" href="widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653">widget_tagcloud_wall()</a>.</p>
|
||||
<p>Referenced by <a class="el" href="view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0">apw_form()</a>, <a class="el" href="contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353">categories_widget()</a>, <a class="el" href="connedit_8php.html#a795acb3d9d841f55c255d7611681ab67">connedit_content()</a>, <a class="el" href="conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81">conversation()</a>, <a class="el" href="editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6">editblock_content()</a>, <a class="el" href="editlayout_8php.html#aa877e4157a26b099de904164181dd386">editlayout_content()</a>, <a class="el" href="editpost_8php.html#a34011690864d122680c802e9e748ccfb">editpost_content()</a>, <a class="el" href="editwebpage_8php.html#a375e945255fad79a71036528f7480650">editwebpage_content()</a>, <a class="el" href="events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec">events_content()</a>, <a class="el" href="classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf">Item\get_comment_box()</a>, <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="mail_8php.html#a3c7c485fc69f92371e8b20936040eca1">mail_content()</a>, <a class="el" href="mail_8php.html#acfc2cc0bf4e0b178207758384977f25a">mail_post()</a>, <a class="el" href="nav_8php.html#a43be0df73b90647ea70947ce004e231e">nav()</a>, <a class="el" href="identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc">profile_sidebar()</a>, <a class="el" href="profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00">profiles_content()</a>, <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793">redbasic_form()</a>, <a class="el" href="rpost_8php.html#a8190354d789000806d9879aea276728f">rpost_content()</a>, <a class="el" href="text_8php.html#a876e94892867019935b348b573299352">search()</a>, <a class="el" href="text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447">searchbox()</a>, <a class="el" href="sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7">sources_content()</a>, <a class="el" href="sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e">sources_post()</a>, <a class="el" href="thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b">thing_content()</a>, <a class="el" href="widgets_8php.html#add9b24d3304e529a7975e96122315554">widget_affinity()</a>, <a class="el" href="widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65">widget_archive()</a>, <a class="el" href="widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256">widget_notes()</a>, <a class="el" href="widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8">widget_savedsearch()</a>, <a class="el" href="widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01">widget_settings_menu()</a>, <a class="el" href="widgets_8php.html#a0d404276fedc59f5038cf5c085028326">widget_suggestions()</a>, and <a class="el" href="widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653">widget_tagcloud_wall()</a>.</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -59,6 +59,8 @@ server {
|
||||
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
|
||||
ssl_prefer_server_ciphers on;
|
||||
|
||||
fastcgi_param HTTPS on;
|
||||
|
||||
index index.php;
|
||||
charset utf-8;
|
||||
root /var/www/red;
|
||||
|
||||
@ -123,6 +123,14 @@ class Item extends BaseObject {
|
||||
|
||||
$location = format_location($item);
|
||||
|
||||
$like_count = ((x($alike,$item['mid'])) ? $alike[$item['mid']] : '');
|
||||
$like_list = ((x($alike,$item['mid'])) ? $alike[$item['mid'] . '-l'] : '');
|
||||
$like_button_label = ((x($alike,$item['mid'])) && ($alike[$item['mid']] < 2 ) ? t('like') : t('likes'));
|
||||
if (feature_enabled($conv->get_profile_owner(),'dislike')) {
|
||||
$dislike_count = ((x($dlike,$item['mid'])) ? $dlike[$item['mid']] : '');
|
||||
$dislike_list = ((x($dlike,$item['mid'])) ? $dlike[$item['mid'] . '-l'] : '');
|
||||
$dislike_button_label = ((x($dlike,$item['mid'])) && ($dlike[$item['mid']] < 2) ? t('dislike') : t('dislikes'));
|
||||
}
|
||||
|
||||
$showlike = ((x($alike,$item['mid'])) ? format_like($alike[$item['mid']],$alike[$item['mid'] . '-l'],'like',$item['mid']) : '');
|
||||
$showdislike = ((x($dlike,$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))
|
||||
@ -251,7 +259,12 @@ class Item extends BaseObject {
|
||||
'drop' => $drop,
|
||||
'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
|
||||
// end toolbar buttons
|
||||
|
||||
'like_count' => $like_count,
|
||||
'like_list' => $like_list,
|
||||
'like_button_label' => $like_button_label,
|
||||
'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
|
||||
'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
|
||||
'dislike_button_label' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
|
||||
'showlike' => $showlike,
|
||||
'showdislike' => $showdislike,
|
||||
'comment' => $this->get_comment_box($indent),
|
||||
|
||||
@ -507,6 +507,30 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||
$Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px;\">$2</span>",$Text);
|
||||
$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1;\">$2</span>",$Text);
|
||||
}
|
||||
// Check for h1
|
||||
if (strpos($Text,'[h1]') !== false) {
|
||||
$Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text);
|
||||
}
|
||||
// Check for h2
|
||||
if (strpos($Text,'[h2]') !== false) {
|
||||
$Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text);
|
||||
}
|
||||
// Check for h3
|
||||
if (strpos($Text,'[h3]') !== false) {
|
||||
$Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text);
|
||||
}
|
||||
// Check for h4
|
||||
if (strpos($Text,'[h4]') !== false) {
|
||||
$Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text);
|
||||
}
|
||||
// Check for h5
|
||||
if (strpos($Text,'[h5]') !== false) {
|
||||
$Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
|
||||
}
|
||||
// Check for h6
|
||||
if (strpos($Text,'[h6]') !== false) {
|
||||
$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
|
||||
}
|
||||
// Check for centered text
|
||||
if (strpos($Text,'[/center]') !== false) {
|
||||
$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);
|
||||
|
||||
@ -705,12 +705,22 @@ function contact_block() {
|
||||
if($shown == 0)
|
||||
return;
|
||||
|
||||
|
||||
$is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false);
|
||||
|
||||
$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
|
||||
$xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
|
||||
if(! $is_owner) {
|
||||
$abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN;
|
||||
$xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
|
||||
}
|
||||
|
||||
if((! is_array($a->profile)) || ($a->profile['hide_friends']))
|
||||
return $o;
|
||||
$r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and not ( abook_flags & %d ) and not (xchan_flags & %d)",
|
||||
intval($a->profile['uid']),
|
||||
intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
|
||||
intval($abook_flags),
|
||||
intval($xchan_flags)
|
||||
);
|
||||
if(count($r)) {
|
||||
$total = intval($r[0]['total']);
|
||||
@ -723,8 +733,8 @@ function contact_block() {
|
||||
|
||||
$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d",
|
||||
intval($a->profile['uid']),
|
||||
intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
|
||||
intval($abook_flags),
|
||||
intval($xchan_flags),
|
||||
intval($shown)
|
||||
);
|
||||
|
||||
|
||||
@ -171,6 +171,10 @@ function zot_finger($webbie,$channel,$autofallback = true) {
|
||||
return array('success' => false);
|
||||
}
|
||||
|
||||
// potential issue here; the xchan_addr points to the primary hub.
|
||||
// The webbie we were called with may not, so it might not be found
|
||||
// unless we query for hubloc_addr instead of xchan_addr
|
||||
|
||||
$r = q("select xchan.*, hubloc.* from xchan
|
||||
left join hubloc on xchan_hash = hubloc_hash
|
||||
where xchan_addr = '%s' and (hubloc_flags & %d) limit 1",
|
||||
@ -1453,7 +1457,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
|
||||
if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) {
|
||||
require_once('include/event.php');
|
||||
$ev = bbtoevent($arr['body']);
|
||||
if(x($ev,'desc') && x($ev,'start')) {
|
||||
if(x($ev,'description') && x($ev,'start')) {
|
||||
$ev['event_xchan'] = $arr['author_xchan'];
|
||||
$ev['uid'] = $channel['channel_id'];
|
||||
$ev['account'] = $channel['channel_account_id'];
|
||||
|
||||
20
index.php
20
index.php
@ -55,6 +55,17 @@ if(! $a->install) {
|
||||
call_hooks('init_1');
|
||||
|
||||
load_translation_table($a->language);
|
||||
// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
|
||||
|
||||
if(intval($a->config['system']['ssl_cookie_protection'])) {
|
||||
$arr = session_get_cookie_params();
|
||||
session_set_cookie_params(
|
||||
((isset($arr['lifetime'])) ? $arr['lifetime'] : 60*5),
|
||||
((isset($arr['path'])) ? $arr['path'] : '/'),
|
||||
((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()),
|
||||
((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
|
||||
((isset($arr['httponly'])) ? $arr['httponly'] : true));
|
||||
}
|
||||
}
|
||||
else {
|
||||
// load translations but do not check plugins as we have no database
|
||||
@ -73,15 +84,6 @@ else {
|
||||
*
|
||||
*/
|
||||
|
||||
// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
|
||||
|
||||
$arr = session_get_cookie_params();
|
||||
session_set_cookie_params(
|
||||
$arr['lifetime'],
|
||||
$arr['path'],
|
||||
$arr['domain'],
|
||||
(($_SERVER['HTTPS']) ? true : false),
|
||||
$arr['httponly']);
|
||||
session_start();
|
||||
|
||||
/**
|
||||
|
||||
@ -158,8 +158,17 @@ function events_content(&$a) {
|
||||
}
|
||||
|
||||
|
||||
$plaintext = true;
|
||||
|
||||
if(feature_enabled(local_user(),'richtext'))
|
||||
$plaintext = false;
|
||||
|
||||
|
||||
$htpl = get_markup_template('event_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
|
||||
$a->page['htmlhead'] .= replace_macros($htpl,array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : 'textareas')
|
||||
));
|
||||
|
||||
$o ="";
|
||||
// tabs
|
||||
@ -400,7 +409,6 @@ function events_content(&$a) {
|
||||
if($orig_event['event_xchan'])
|
||||
$sh_checked .= ' disabled="disabled" ';
|
||||
|
||||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
|
||||
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
|
||||
@ -439,6 +447,7 @@ function events_content(&$a) {
|
||||
'deny_gid' => $channel['channel_deny_gid']
|
||||
);
|
||||
|
||||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
|
||||
@ -28,11 +28,19 @@ function viewconnections_content(&$a) {
|
||||
return;
|
||||
}
|
||||
|
||||
$is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false);
|
||||
|
||||
$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
|
||||
$xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
|
||||
if(! $is_owner) {
|
||||
$abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN;
|
||||
$xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
|
||||
}
|
||||
|
||||
$r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d ) and not ( xchan_flags & %d ) ",
|
||||
intval($a->profile['uid']),
|
||||
intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
|
||||
intval($abook_flags),
|
||||
intval($xchan_flags)
|
||||
);
|
||||
if($r) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
@ -40,8 +48,8 @@ function viewconnections_content(&$a) {
|
||||
|
||||
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not ( abook_flags & %d ) and not ( xchan_flags & %d ) order by xchan_name LIMIT %d , %d ",
|
||||
intval($a->profile['uid']),
|
||||
intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
|
||||
intval($abook_flags),
|
||||
intval($xchan_flags),
|
||||
intval($a->pager['start']),
|
||||
intval($a->pager['itemspage'])
|
||||
);
|
||||
|
||||
833
util/messages.po
833
util/messages.po
File diff suppressed because it is too large
Load Diff
@ -162,7 +162,7 @@ FO_statuses_home_timeline () {
|
||||
$(OAuth_param 'screen_name' $screen_name)
|
||||
$(OAuth_param 'count' $count)
|
||||
)
|
||||
g
|
||||
|
||||
local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
|
||||
|
||||
convscreen=$(OAuth_PE "$screen_name");
|
||||
@ -171,3 +171,21 @@ g
|
||||
|
||||
return $FO_rval
|
||||
}
|
||||
|
||||
FO_command () {
|
||||
local command="$1"
|
||||
|
||||
local params=(
|
||||
$(OAuth_param 'screen_name' $screen_name)
|
||||
$(OAuth_param 'count' $count)
|
||||
)
|
||||
|
||||
|
||||
local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]})
|
||||
|
||||
convscreen=$(OAuth_PE "$screen_name");
|
||||
FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}")
|
||||
FO_rval=$?
|
||||
|
||||
return $FO_rval
|
||||
}
|
||||
|
||||
@ -22,18 +22,6 @@
|
||||
|
||||
FCLI_RC="$HOME/.shred.rc"
|
||||
|
||||
# Source Config
|
||||
[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
|
||||
|
||||
# Source FriendicaOAuth.sh
|
||||
OAuth_sh=$(which FriendicaOAuth.sh)
|
||||
(( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1
|
||||
source "$OAuth_sh"
|
||||
|
||||
# Source JSON.sh
|
||||
JSON_sh=$(which JSON.sh)
|
||||
(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1
|
||||
source "$JSON_sh"
|
||||
|
||||
|
||||
usage () {
|
||||
@ -121,6 +109,21 @@ js () {
|
||||
|
||||
load_config () {
|
||||
|
||||
# Source Config
|
||||
[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
|
||||
|
||||
|
||||
# Source FriendicaOAuth.sh
|
||||
OAuth_sh=$(which FriendicaOAuth.sh)
|
||||
(( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1
|
||||
source "$OAuth_sh"
|
||||
|
||||
# Source JSON.sh
|
||||
JSON_sh=$(which JSON.sh)
|
||||
(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1
|
||||
source "$JSON_sh"
|
||||
|
||||
|
||||
[[ "$oauth_consumer_key" == "" ]] && show_config_help 1
|
||||
[[ "$oauth_consumer_secret" == "" ]] && show_config_help 1
|
||||
|
||||
@ -149,7 +152,7 @@ main () {
|
||||
fcli_in_reply_to_status_id=
|
||||
fcli_file=
|
||||
fcli_help_flag=
|
||||
while getopts "c:s:r:f:h" name
|
||||
while getopts "C:c:s:r:f:h" name
|
||||
do
|
||||
case $name in
|
||||
c) fcli_command="$OPTARG";;
|
||||
@ -205,7 +208,11 @@ main () {
|
||||
return $FO_rval
|
||||
;;
|
||||
*)
|
||||
usage 1
|
||||
FO_command $fcli_command
|
||||
JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
|
||||
echo "$JS_Parsed"
|
||||
return $FO_rval
|
||||
|
||||
;;
|
||||
esac
|
||||
return 0
|
||||
|
||||
@ -1 +1 @@
|
||||
2014-05-06.667
|
||||
2014-05-09.670
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
/* conversation */
|
||||
|
||||
.thread-wrapper.toplevel_item {
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
/* conv_item */
|
||||
|
||||
3
view/css/mod_events.css
Normal file
3
view/css/mod_events.css
Normal file
@ -0,0 +1,3 @@
|
||||
#event-desc-textarea, #event-location-textarea {
|
||||
width: 400px;
|
||||
}
|
||||
9516
view/it/messages.po
9516
view/it/messages.po
File diff suppressed because it is too large
Load Diff
2317
view/it/strings.php
2317
view/it/strings.php
File diff suppressed because it is too large
Load Diff
@ -1370,10 +1370,6 @@ brain is weird like that */
|
||||
.tagged { background-position: -48px -48px; }
|
||||
.yellow { background-position: -64px -48px; }
|
||||
|
||||
.starred {
|
||||
color: gold;
|
||||
}
|
||||
|
||||
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
|
||||
|
||||
|
||||
@ -1915,18 +1911,24 @@ img.mail-list-sender-photo {
|
||||
.wall-item-content-wrapper:hover {
|
||||
z-index:99;
|
||||
}
|
||||
|
||||
/*
|
||||
.comment .wall-item-body {
|
||||
padding-left: 42px;
|
||||
}
|
||||
*/
|
||||
.hide-comments-outer,
|
||||
.wall-item-content-wrapper.comment {
|
||||
background-color: $comment_item_colour;
|
||||
border-left: 3px solid $comment_border_colour;
|
||||
border-left: 1px solid $comment_border_colour;
|
||||
border-right: 1px solid $comment_border_colour;
|
||||
border-bottom: 1px solid $comment_border_colour;
|
||||
border-radius: 0px;
|
||||
padding: 7px 10px 7px 7px;
|
||||
}
|
||||
|
||||
.wall-item-comment-wrapper {
|
||||
background-color: $comment_item_colour;
|
||||
border-left: 3px solid $item_colour;
|
||||
border: 1px solid $item_colour;
|
||||
border-radius: 0px;
|
||||
border-bottom-right-radius: $radiuspx;
|
||||
border-bottom-left-radius: $radiuspx;
|
||||
@ -1934,9 +1936,7 @@ img.mail-list-sender-photo {
|
||||
|
||||
.wall-item-like,
|
||||
.wall-item-dislike {
|
||||
font-size: $body_font_size;
|
||||
text-align: left;
|
||||
white-space: normal;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.wall-item-photo {
|
||||
@ -2335,6 +2335,7 @@ blockquote {
|
||||
|
||||
.thread-wrapper.toplevel_item {
|
||||
width: 100%;
|
||||
border:1px;
|
||||
}
|
||||
|
||||
.wall-item-photo {
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools">
|
||||
<div class="wall-item-tools">
|
||||
<div class="wall-item-tools-right btn-group pull-right">
|
||||
{{if $item.like}}
|
||||
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false">
|
||||
@ -63,30 +63,30 @@
|
||||
<i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
|
||||
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
|
||||
<i class="icon-caret-down"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
|
||||
{{if $item.share}}
|
||||
<li><a href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.plink}}
|
||||
<li><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.edpost}}
|
||||
<li><a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.tagger}}
|
||||
<li><a href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.filer}}
|
||||
<li><a href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.bookmark}}
|
||||
<li><a href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.star}}
|
||||
<li><a href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
|
||||
{{/if}}
|
||||
{{if $item.item_photo_menu}}
|
||||
<li role="presentation" class="divider"></li>
|
||||
@ -94,17 +94,23 @@
|
||||
{{/if}}
|
||||
{{if $item.drop.dropping}}
|
||||
<li role="presentation" class="divider"></li>
|
||||
<li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
|
||||
<li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
|
||||
<div class="wall-item-tools-left btn-group pull-left">
|
||||
{{if $item.showlike}}
|
||||
<div class="btn btn-default btn-sm wall-item-like pull-left" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
|
||||
<div class="wall-item-tools-left{{if $item.like_count && $item.dislike_count}} btn-group{{/if}}">
|
||||
{{if $item.like_count}}
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{if $item.showdislike}}
|
||||
<div class="btn btn-default btn-sm wall-item-dislike pull-left" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
|
||||
{{if $item.dislike_count}}
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -13,14 +13,18 @@
|
||||
<div id="event-start-text">{{$s_text}}</div>
|
||||
{{$s_dsel}} {{$s_tsel}}
|
||||
|
||||
<div class="clear"></div><br />
|
||||
|
||||
<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
|
||||
|
||||
<div id="event-nofinish-break"></div>
|
||||
|
||||
|
||||
<div id="event-finish-text">{{$f_text}}</div>
|
||||
{{$f_dsel}} {{$f_tsel}}
|
||||
|
||||
<div id="event-datetime-break"></div>
|
||||
|
||||
<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
|
||||
|
||||
<div id="event-nofinish-break"></div>
|
||||
|
||||
<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
|
||||
|
||||
@ -36,6 +40,7 @@
|
||||
|
||||
<div id="event-location-text">{{$l_text}}</div>
|
||||
<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
|
||||
<br />
|
||||
|
||||
<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
|
||||
<div id="event-share-break"></div>
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
{{if $editselect != 'none'}}
|
||||
<script language="javascript" type="text/javascript"
|
||||
src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
@ -81,7 +81,7 @@
|
||||
|
||||
tinyMCE.init({
|
||||
theme : "advanced",
|
||||
mode : "textareas",
|
||||
mode : "{{$editselect}}",
|
||||
plugins : "bbcode,paste",
|
||||
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
|
||||
theme_advanced_buttons2 : "",
|
||||
@ -107,6 +107,7 @@
|
||||
|
||||
});
|
||||
|
||||
{{/if}}
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
{{if $app.my}}
|
||||
<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
|
||||
<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove"></i></a>
|
||||
<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a>
|
||||
<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove btn btn-default"></i></a>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/foreach}}
|
||||
|
||||
Reference in New Issue
Block a user