mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 12:15:15 +00:00
Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
7c47b9d75c
9 changed files with 62 additions and 33 deletions
|
@ -5,7 +5,12 @@ namespace Zotlabs\Module;
|
|||
class Logout extends \Zotlabs\Web\Controller {
|
||||
|
||||
function init() {
|
||||
\App::$session->nuke();
|
||||
if($_SESSION['delegate'] && $_SESSION['delegate_push']) {
|
||||
$_SESSION = $_SESSION['delegate_push'];
|
||||
}
|
||||
else {
|
||||
\App::$session->nuke();
|
||||
}
|
||||
goaway(z_root());
|
||||
|
||||
}
|
||||
|
|
|
@ -112,6 +112,8 @@ class Magic extends \Zotlabs\Web\Controller {
|
|||
if($r && intval($r[0]['channel_id'])) {
|
||||
$allowed = perm_is_allowed($r[0]['channel_id'],get_observer_hash(),'delegate');
|
||||
if($allowed) {
|
||||
$tmp = $_SESSION;
|
||||
$_SESSION['delegate_push'] = $tmp;
|
||||
$_SESSION['delegate_channel'] = $r[0]['channel_id'];
|
||||
$_SESSION['delegate'] = get_observer_hash();
|
||||
$_SESSION['account_id'] = intval($r[0]['channel_account_id']);
|
||||
|
|
1
boot.php
1
boot.php
|
@ -481,6 +481,7 @@ define ( 'ACTIVITY_ABSTAIN', NAMESPACE_ZOT . '/activity/abstain' );
|
|||
define ( 'ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes' );
|
||||
define ( 'ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno' );
|
||||
define ( 'ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe' );
|
||||
define ( 'ACTIVITY_POLLRESPONSE', NAMESPACE_ZOT . '/activity/pollresponse' );
|
||||
|
||||
define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_ZOT . '/activity/heart' );
|
||||
|
||||
|
|
|
@ -145,8 +145,17 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
|
|||
// process logout request
|
||||
$args = array('channel_id' => local_channel());
|
||||
call_hooks('logging_out', $args);
|
||||
App::$session->nuke();
|
||||
info( t('Logged out.') . EOL);
|
||||
|
||||
|
||||
if($_SESSION['delegate'] && $_SESSION['delegate_push']) {
|
||||
$_SESSION = $_SESSION['delegate_push'];
|
||||
info( t('Delegation session ended.') . EOL);
|
||||
}
|
||||
else {
|
||||
App::$session->nuke();
|
||||
info( t('Logged out.') . EOL);
|
||||
}
|
||||
|
||||
goaway(z_root());
|
||||
}
|
||||
|
||||
|
|
|
@ -1001,11 +1001,11 @@ function bbcode($Text, $options = []) {
|
|||
}
|
||||
// Check for strike-through text
|
||||
if (strpos($Text,'[s]') !== false) {
|
||||
$Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '<strike>$1</strike>', $Text);
|
||||
$Text = preg_replace("(\[s\](.*?)\[\/s\])ism", '<span style="text-decoration: line-through;">$1</span>', $Text);
|
||||
}
|
||||
// Check for over-line text
|
||||
if (strpos($Text,'[o]') !== false) {
|
||||
$Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '<span class="overline">$1</span>', $Text);
|
||||
$Text = preg_replace("(\[o\](.*?)\[\/o\])ism", '<span style="text-decoration: overline;">$1</span>', $Text);
|
||||
}
|
||||
if (strpos($Text,'[sup]') !== false) {
|
||||
$Text = preg_replace("(\[sup\](.*?)\[\/sup\])ism", '<sup>$1</sup>', $Text);
|
||||
|
|
|
@ -404,7 +404,7 @@ function count_descendants($item) {
|
|||
* @return boolean
|
||||
*/
|
||||
function visible_activity($item) {
|
||||
$hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ];
|
||||
$hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE ];
|
||||
|
||||
if(intval($item['item_notshown']))
|
||||
return false;
|
||||
|
|
|
@ -164,6 +164,7 @@ function html2bbcode($message)
|
|||
node2bbcode($doc, 'b', array(), '[b]', '[/b]');
|
||||
node2bbcode($doc, 'i', array(), '[i]', '[/i]');
|
||||
node2bbcode($doc, 'u', array(), '[u]', '[/u]');
|
||||
node2bbcode($doc, 's', array(), '[s]', '[/s]');
|
||||
|
||||
node2bbcode($doc, 'big', array(), "[size=large]", "[/size]");
|
||||
node2bbcode($doc, 'small', array(), "[size=small]", "[/size]");
|
||||
|
|
64
util/dcp
64
util/dcp
|
@ -28,9 +28,14 @@ if($argc < 3) {
|
|||
if(strpos($dstfile,'store/') === 0)
|
||||
$dstfile = substr($dstfile,6);
|
||||
|
||||
$nick = substr($dstfile,0,strpos($dstfile,'/'));
|
||||
|
||||
$dstfile = substr($dstfile,strlen($nick)+1);
|
||||
if(strpos($dstfile,'/'))
|
||||
$nick = substr($dstfile,0,strpos($dstfile,'/'));
|
||||
$dstfile = substr($dstfile,strlen($nick)+1);
|
||||
}
|
||||
else {
|
||||
$nick = $dstfile;
|
||||
$dstfile = '';
|
||||
}
|
||||
|
||||
$channel = channelx_by_nick($nick);
|
||||
if(! $channel)
|
||||
|
@ -43,38 +48,45 @@ if($argc < 3) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
$rootdir = ((strlen(trim($dstfile,'/'))) ? false : true);
|
||||
|
||||
$isadir = false;
|
||||
|
||||
if(($recursive) || ($argc > 3))
|
||||
$isadir = true;
|
||||
|
||||
|
||||
$r = q("select * from attach where display_path = '%s' and uid = %d limit 1",
|
||||
dbesc($dstfile),
|
||||
intval($channel['channel_id'])
|
||||
);
|
||||
|
||||
if($r && $r[0]['is_dir']) {
|
||||
$isadir = true;
|
||||
$basepath = $dstfile;
|
||||
$folder = $r[0]['hash'];
|
||||
if($rootdir) {
|
||||
$folder = '';
|
||||
}
|
||||
else {
|
||||
$pathname = (($isadir) ? $dstfile : dirname($dstfile));
|
||||
$arr = [
|
||||
'pathname' => $pathname,
|
||||
'allow_cid' => $channel['channel_allow_cid'],
|
||||
'allow_gid' => $channel['channel_allow_gid'],
|
||||
'deny_cid' => $channel['channel_deny_cid'],
|
||||
'deny_gid' => $channel['channel_deny_gid'],
|
||||
];
|
||||
|
||||
$folder = '';
|
||||
if($pathname && $isadir) {
|
||||
$x = attach_mkdirp($channel,$channel['channel_hash'],$arr);
|
||||
if($x['success'])
|
||||
$folder = $x['data']['hash'];
|
||||
$r = q("select * from attach where display_path = '%s' and uid = %d limit 1",
|
||||
dbesc($dstfile),
|
||||
intval($channel['channel_id'])
|
||||
);
|
||||
|
||||
if($r && $r[0]['is_dir']) {
|
||||
$isadir = true;
|
||||
$basepath = $dstfile;
|
||||
$folder = $r[0]['hash'];
|
||||
}
|
||||
else {
|
||||
$pathname = (($isadir) ? $dstfile : dirname($dstfile));
|
||||
$arr = [
|
||||
'pathname' => $pathname,
|
||||
'allow_cid' => $channel['channel_allow_cid'],
|
||||
'allow_gid' => $channel['channel_allow_gid'],
|
||||
'deny_cid' => $channel['channel_deny_cid'],
|
||||
'deny_gid' => $channel['channel_deny_gid'],
|
||||
];
|
||||
|
||||
$folder = '';
|
||||
if($pathname && $isadir) {
|
||||
$x = attach_mkdirp($channel,$channel['channel_hash'],$arr);
|
||||
if($x['success'])
|
||||
$folder = $x['data']['hash'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1466,7 +1466,6 @@ function b2h(s) {
|
|||
rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
|
||||
rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
|
||||
|
||||
// FIXME - add zid()
|
||||
rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$2</a>");
|
||||
rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$1</a>");
|
||||
rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3" + '?f=&zid=' + zid + "\" />");
|
||||
|
|
Loading…
Reference in a new issue