aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Module/Pconfig.php2
-rw-r--r--Zotlabs/Module/Pushcall.php19
-rw-r--r--Zotlabs/Module/Test.php38
-rw-r--r--Zotlabs/Module/Zcard.php107
-rw-r--r--version.inc2
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/js/autocomplete.js8
7 files changed, 11 insertions, 169 deletions
diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php
index 01899ffdb..b6264bddc 100644
--- a/Zotlabs/Module/Pconfig.php
+++ b/Zotlabs/Module/Pconfig.php
@@ -55,7 +55,7 @@ class Pconfig extends \Zotlabs\Web\Controller {
$content .= '<a href="pconfig/' . escape_tags(argv(1)) . '">pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']</a>' . EOL . EOL;
$content .= '<a href="pconfig/' . escape_tags(argv(1)) . '/' . escape_tags(argv(2)) . '" >pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . ']</a> = ' . get_pconfig(local_channel(),escape_tags(argv(1)),escape_tags(argv(2))) . EOL;
- if(in_array(argv(2),disallowed_pconfig())) {
+ if(in_array(argv(2),$this->disallowed_pconfig())) {
notice( t('This setting requires special processing and editing has been blocked.') . EOL);
return $content;
}
diff --git a/Zotlabs/Module/Pushcall.php b/Zotlabs/Module/Pushcall.php
deleted file mode 100644
index c0b95159d..000000000
--- a/Zotlabs/Module/Pushcall.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-class Pushcall extends \Zotlabs\Web\Controller {
-
- function init() {
- logger('pushcall: received');
-
- $xml = file_get_contents('php://input');
-
- logger('received: ' . $xml);
-
-
-
-
- killme();
- }
-}
diff --git a/Zotlabs/Module/Test.php b/Zotlabs/Module/Test.php
deleted file mode 100644
index ff14e4691..000000000
--- a/Zotlabs/Module/Test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-class Test extends \Zotlabs\Web\Controller {
-
- function get() {
-
- $s = '<XML>
- <post><profile>
- <diaspora_handle>macgirvin@diasp.org</diaspora_handle>
- <first_name>Mike</first_name>
- <last_name>Macgirvin</last_name>
- <image_url>https://diasp.org/uploads/images/thumb_large_d5f9b6384c91f532f280.jpg</image_url>
- <image_url_small>https://diasp.org/uploads/images/thumb_small_d5f9b6384c91f532f280.jpg</image_url_small>
- <image_url_medium>https://diasp.org/uploads/images/thumb_medium_d5f9b6384c91f532f280.jpg</image_url_medi\
- um>
- <birthday>1000-05-14</birthday>
- <gender/>
- <bio>Creator of Friendica, Redmatrix, and Hubzilla. </bio>
- <location>Australia</location>
- <searchable>true</searchable>
- <nsfw>false</nsfw>
- <tag_string>#redmatrix #hubzilla </tag_string>
- </profile></post>
- </XML>';
-
- $parsed_xml = xml2array($s,false,0,'tag');
-
- $o = print_r($parsed_xml,true);
- return $o;
-
-
- // fix_system_urls('http://hz.macgirvin.com',z_root());
-
- }
-
-}
diff --git a/Zotlabs/Module/Zcard.php b/Zotlabs/Module/Zcard.php
deleted file mode 100644
index b8967023e..000000000
--- a/Zotlabs/Module/Zcard.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-
-class Zcard extends \Zotlabs\Web\Controller {
-
- function init() {
-
- /*
- if(argc() > 1)
- $which = argv(1);
- if(! $which)
- return;
-
-
- $arr = array();
- $arr['links'] = array();
-
- $r = q("select * from channel left join xchan on xchan_hash = channel_hash where channel_address = '%s' limit 1",
- dbesc($which)
- );
-
- if(! $which) {
- notice( t('Channel not found.' ) . EOL);
- return;
- }
-
- $channel = $r[0];
- $channel['channel_addr'] = $r[0]['channel_address'] . '@' . \App::get_hostname();
- $arr['chan'] = $channel;
-
- if(perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
- $p = q("select * from profile where is_default = 1 and uid = %d limit 1",
- intval($channel['channel_id'])
- );
- }
- $profile = (($p) ? $p[0] : false);
-
- $r = q("select height, width, resource_id, scale, type from photo where uid = %d and scale >= %d and photo_usage = %d",
- intval($channel['channel_id']),
- intval(PHOTO_RES_COVER_1200),
- intval(PHOTO_COVER)
- );
-
- if($r) {
- foreach($r as $rr) {
- $arr['links'][] = array('rel' => 'cover_photo', 'type' => $rr['type'], 'width' => intval($rr['width']) , 'height' => intval($rr['height']), 'href' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale']);
- }
- }
-
- $arr['links'][] = array('rel' => 'profile_photo', 'type' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']);
- $arr['links'][] = array('rel' => 'profile_photo', 'type' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']);
- $arr['links'][] = array('rel' => 'profile_photo', 'type' => $channel['xchan_photo_mimetype'], 'width' => 48 , 'height' => 48, 'href' => $channel['xchan_photo_s']);
-
-
-
- $likers = q("select liker, xchan.* from likes left join xchan on liker = xchan_hash where channel_id = %d and target_type = '%s' and verb = '%s'",
- intval(\App::$profile['profile_uid']),
- dbesc(ACTIVITY_OBJ_PROFILE),
- dbesc(ACTIVITY_LIKE)
- );
- $profile['likers'] = array();
- $profile['like_count'] = count($likers);
- $profile['like_button_label'] = tt('Like','Likes',$profile['like_count'],'noun');
- if($likers) {
- foreach($likers as $l)
- $profile['likers'][] = array('name' => $l['xchan_name'],'url' => $l['xchan_url'], 'photo' => $l['xchan_photo_s']);
- }
-
- $arr['profile'] = $profile;
-
- logger('zcard: ' . print_r($arr,true));
-
- if(argc() > 2)
- \App::$data['zcard'] = $arr;
- else {
- echo json_encode($arr);
- killme();
-
- }
- */
- }
-
-
-
- function get() {
-
- $channel = channelx_by_nick(argv(1));
- if(! $channel)
- return;
-
- $o = get_zcard($channel,get_observer_hash(),array('width' => $_REQUEST['width'], 'height' => $_REQUEST['height']));
-
- // $o .= replace_macros(get_markup_template('zcard.tpl'),array(
- // '$scale' => $scale,
- // '$cover' => $cover,
- // '$pphoto' => $pphoto,
- // '$zcard' => $zcard,
- // '$size' => 'small'
- // ));
-
- return $o;
-
-
- }
-}
diff --git a/version.inc b/version.inc
index 4581ffe56..c414fb0fd 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-04-19.1371H
+2016-04-20.1372H
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5cbd5c896..0ecec039f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -196,8 +196,10 @@ a.wall-item-name-link {
/* comment_item */
-.comment-edit-text-empty, .comment-edit-text-full {
+.comment-edit-text-empty,
+.comment-edit-text-full {
width: 100%;
+ display: inherit;
}
.comment-edit-text-empty {
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 59e3600b3..84cc075dc 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -147,6 +147,9 @@ function listNewLineAutocomplete(id) {
setCaretPosition(text, caretPos + 5);
return true;
}
+ else {
+ return false;
+ }
}
function string2bb(element) {
@@ -315,11 +318,12 @@ function string2bb(element) {
a.on('textComplete:select', function(e, value, strategy) { value; });
a.keypress(function(e){
- e.stopImmediatePropagation();
if (e.keyCode == 13) {
var x = listNewLineAutocomplete(this.id);
- if(x)
+ if(x) {
+ e.stopImmediatePropagation();
e.preventDefault();
+ }
}
});
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 21:07:16 +0000