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

permission issues editing wall-to-wall posts

Browse Source
This commit is contained in:
redmatrix 2015-11-15 19:36:17 -08:00
parent 6ad35e3d84
commit fff30b1c3d
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/hooklist.bb
View File

@ -263,6 +263,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/logged_in]logged_in[/zrl] [zrl=[baseurl]/help/hook/logged_in]logged_in[/zrl]
Called when authentication by any means has succeeeded Called when authentication by any means has succeeeded
[zrl=[baseurl]/help/hook/logger]logger[/zrl]
Called when making an entry to the application logfile
[zrl=[baseurl]/help/hook/logging_out]logging_out[/zrl] [zrl=[baseurl]/help/hook/logging_out]logging_out[/zrl]
Called when logging out Called when logging out

11
include/text.php
View File

@ -531,11 +531,12 @@ function attribute_contains($attr, $s) {
* LOGGER_DATA and LOGGER_ALL. * LOGGER_DATA and LOGGER_ALL.
* *
* Since PHP5.4 we get the file, function and line automatically where the logger * Since PHP5.4 we get the file, function and line automatically where the logger
* was caleld, so no need to add it to the message anymore. * was called, so no need to add it to the message anymore.
* *
* @param string $msg Message to log * @param string $msg Message to log
* @param int $level A log level. * @param int $level A log level.
*/ */
function logger($msg, $level = 0) { function logger($msg, $level = 0) {
// turn off logger in install mode // turn off logger in install mode
global $a; global $a;
@ -557,7 +558,13 @@ function logger($msg, $level = 0) {
$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
} }
@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND); $s = datetime_convert() . ':' . session_id() . ' ' . $where . $msg . PHP_EOL;
$pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'logged' => false);
call_hooks('logger',$pluginfo);
if(! $pluginfo['logged'])
@file_put_contents($logfile, $s, FILE_APPEND);
} }
/** /**

14
mod/editpost.php
View File

@ -21,9 +21,9 @@ function editpost_content(&$a) {
return; return;
} }
$itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d and author_xchan = '%s' LIMIT 1", $itm = q("SELECT * FROM `item` WHERE `id` = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1",
intval($post_id), intval($post_id),
intval(local_channel()), dbesc(get_observer_hash()),
dbesc(get_observer_hash()) dbesc(get_observer_hash())
); );
@ -37,6 +37,8 @@ function editpost_content(&$a) {
} }
$owner_uid = $itm[0]['uid'];
$plaintext = true; $plaintext = true;
// if(feature_enabled(local_channel(),'richtext')) // if(feature_enabled(local_channel(),'richtext'))
@ -71,14 +73,12 @@ function editpost_content(&$a) {
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets); call_hooks('jot_networks', $jotnets);
$channel = $a->get_channel();
//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$voting = feature_enabled(local_channel(),'consensus_tools'); $voting = feature_enabled($owner_uid,'consensus_tools');
$category = ''; $category = '';
$catsenabled = ((feature_enabled(local_channel(),'categories')) ? 'categories' : ''); $catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : '');
if ($catsenabled){ if ($catsenabled){
$itm = fetch_post_tags($itm); $itm = fetch_post_tags($itm);
@ -145,7 +145,7 @@ function editpost_content(&$a) {
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => local_channel(), '$profile_uid' => $owner_uid,
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),