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

Merge remote-tracking branch 'upstream/master' into toc

Browse Source
This commit is contained in:
Einer von Vielen 2015-01-14 22:49:16 +01:00
commit dfab241692
22 changed files with 129 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -221,7 +221,7 @@ define ( 'PAGE_NORMAL', 0x0000 );
define ( 'PAGE_HIDDEN', 0x0001 );
define ( 'PAGE_AUTOCONNECT', 0x0002 );
define ( 'PAGE_APPLICATION', 0x0004 );
define ( 'PAGE_ALLOWCODE', 0x0008 );
define ( 'PAGE_PREMIUM', 0x0010 );
define ( 'PAGE_ADULT', 0x0020 );
define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds

9
include/RedDAV/RedBrowser.php
View File

@ -267,6 +267,15 @@ class RedBrowser extends DAV\Browser\Plugin {
get_app()->page['content'] = $html;
load_pdl(get_app());
$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
$func = str_replace('-', '_', current_theme()) . '_init';
$func(get_app());
}
}
construct_page(get_app());
}

14
include/identity.php
View File

@ -1205,21 +1205,9 @@ function advanced_profile(&$a) {
if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
// Support tags in the other channels field (probably want to restrict it to channels only?)
$txt = $a->profile['channels'];
$matches = get_tags($txt);
$access_tag = '';
$str_tags = '';
foreach($matches as $m) {
$success = handle_tag($a, $txt, $access_tag, $str_tags, $a->profile_uid, $m); // Use uid of the profile maker
}
if($txt = prepare_text($txt)) {
$profile['channels'] = array( t('My other channels:'), $txt);
}
if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);

57
include/items.php
View File

@ -2673,7 +2673,7 @@ function tag_deliver($uid,$item_id) {
* Fetch stuff we need - a channel and an item
*/
$u = q("select * from channel where channel_id = %d limit 1",
$u = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
intval($uid)
);
if(! $u)
@ -2811,7 +2811,7 @@ function tag_deliver($uid,$item_id) {
if($terms)
logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA);
$link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']);
$link = normalise_link($u[0]['xchan_url']);
if($terms) {
foreach($terms as $term) {
@ -2952,7 +2952,7 @@ function tgroup_check($uid,$item) {
if(! perm_is_allowed($uid,$item['author_xchan'],'tag_deliver'))
return false;
$u = q("select * from channel where channel_id = %d limit 1",
$u = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
intval($uid)
);
@ -2964,7 +2964,7 @@ function tgroup_check($uid,$item) {
if($terms)
logger('tgroup_check: post mentions: ' . print_r($terms,true), LOGGER_DATA);
$link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']);
$link = normalise_link($u[0]['xchan_url']);
if($terms) {
foreach($terms as $term) {
@ -3939,7 +3939,7 @@ function drop_items($items) {
// $stage = 1 => set deleted flag on the item and perform intial notifications
// $stage = 2 => perform low level delete at a later stage
function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = false) {
$a = get_app();
@ -3959,6 +3959,8 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
$item = $r[0];
$linked_item = (($item['resource_id']) ? true : false);
$ok_to_delete = false;
// system deletion
@ -3980,10 +3982,11 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
// hook calls a remote process which loops. We'll delete it properly in a second.
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ) WHERE id = %d",
intval(ITEM_DELETED),
intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
intval($item['id'])
);
$arr = array('item' => $item, 'interactive' => $interactive, 'stage' => $stage);
call_hooks('drop_item', $arr );
@ -3995,10 +3998,10 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
);
if($items) {
foreach($items as $i)
delete_item_lowlevel($i,$stage);
delete_item_lowlevel($i,$stage,$force);
}
else
delete_item_lowlevel($item,$stage);
delete_item_lowlevel($item,$stage,$force);
if(! $interactive)
return 1;
@ -4030,8 +4033,9 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
// It merely destroys all resources associated with an item.
// Please do not use without a suitable wrapper.
function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL,$force = false) {
$linked_item = (($item['resource_id']) ? true : false);
switch($stage) {
case DROPITEM_PHASE2:
@ -4047,7 +4051,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
case DROPITEM_PHASE1:
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
changed = '%s', edited = '%s' WHERE id = %d",
intval(ITEM_DELETED),
intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
@ -4056,6 +4060,16 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
case DROPITEM_NORMAL:
default:
if($linked_item && ! $force) {
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
changed = '%s', edited = '%s' WHERE id = %d",
intval(ITEM_HIDDEN),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
}
else {
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ), body = '', title = '',
changed = '%s', edited = '%s' WHERE id = %d",
intval(ITEM_DELETED),
@ -4063,6 +4077,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
dbesc(datetime_convert()),
intval($item['id'])
);
}
break;
}
@ -4074,25 +4089,6 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
intval($item['uid'])
);
// If item is a link to a photo/event resource, nuke all the associated photos/events
// This only applies to photos uploaded from the photos page. Photos inserted into a post do not
// generate a resource_id and therefore aren't intimately linked to the item.
if(strlen($item['resource_id'])) {
if($item['resource_type'] === 'event') {
q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['resource_id']),
intval($item['uid'])
);
}
elseif($item['resource_type'] === 'photo') {
q("DELETE FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d ",
dbesc($item['resource_id']),
intval($item['uid'])
);
}
}
// network deletion request. Keep the message structure so that we can deliver delete notifications.
// Come back after several days (or perhaps a month) to do the lowlevel delete (DROPITEM_PHASE2).
@ -4115,8 +4111,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
intval(TERM_OBJ_POST)
);
// FIXME remove notifications for this item
// FIXME remove notifications for this item
return true;
}

10
include/text.php
View File

@ -92,10 +92,10 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
return escape_tags($s);
if($type == 'text/plain')
return escape_tags($s);
$r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
$r = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
intval($channel_id)
);
if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) {
if($r && (($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
if(local_user() && (get_account_id() == $r[0]['account_id'])) {
return $s;
}
@ -1584,13 +1584,13 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
'text/plain'
);
$r = q("select account_id, account_roles from account left join channel on account_id = channel_account_id where
$r = q("select account_id, account_roles, channel_pageflags from account left join channel on account_id = channel_account_id where
channel_id = %d limit 1",
intval($channel_id)
);
if($r) {
if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) {
if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
if(local_user() && get_account_id() == $r[0]['account_id'])
$x[] = 'application/x-php';
}
@ -2351,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
}
function linkify_tags($a, &$body, $uid, $profile_uid) {
function linkify_tags($a, &$body, $uid) {
$str_tags = '';
$tagged = array();
$result = array();

2
mod/admin.php
View File

@ -288,6 +288,8 @@ function admin_page_site_post(&$a){
del_config('system','admininfo');
}
else {
require_once('include/text.php');
linkify_tags($a, $admininfo, local_user());
set_config('system','admininfo', $admininfo);
}
set_config('system','language', $language);

1
mod/channel.php
View File

@ -286,6 +286,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'$cats' => (($category) ? $category : ''),
'$tags' => (($hashtags) ? $hashtags : ''),
'$mid' => $mid,
'$verb' => '',
'$dend' => $datequery,
'$dbegin' => $datequery2
));

32
mod/cloud.php
View File

@ -3,7 +3,7 @@
* @file mod/cloud.php
* @brief Initialize RedMatrix's cloud (SabreDAV).
*
* Module for accessing the DAV storage area from a web client.
* Module for accessing the DAV storage area.
*/
use Sabre\DAV;
@ -12,45 +12,31 @@ use RedMatrix\RedDAV;
// composer autoloader for SabreDAV
require_once('vendor/autoload.php');
if(! defined('TRINIDAD')) {
// workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
// workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
if(strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
}
}
if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
if(strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
}
}
/**
* @brief Fires up the SabreDAV server.
*
* @param App &$a
*/
function cloud_init(&$a) {
// call ($currenttheme)_init since we're operating outside of index.php
$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
$func = str_replace('-', '_', current_theme()) . '_init';
$func($a);
}
}
require_once('include/reddav.php');
if (! is_dir('store'))
@ -130,20 +116,14 @@ function cloud_init(&$a) {
}
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
if(defined('TRINIDAD')) {
logger('mod_cloud: auth exception' . $e->getMessage());
http_status_exit($e->getHTTPCode(), $e->getMessage());
}
else {
try {
$auth->Authenticate($server, t('RedMatrix channel'));
$auth->Authenticate($server, t('RedMatrix - Guests: Username: {your email address}, Password: +++'));
}
catch (Exception $e) {
logger('mod_cloud: auth exception' . $e->getMessage());
http_status_exit($e->getHTTPCode(), $e->getMessage());
}
}
}
require_once('include/RedDAV/RedBrowser.php');
// provide a directory view for the cloud in Red Matrix

9
mod/connedit.php
View File

@ -55,6 +55,15 @@ function connedit_post(&$a) {
if(! $contact_id)
return;
// TODO if configured for hassle-free permissions, we'll post the form with ajax as soon as the
// connection enable is toggled to a special autopost url and set permissions immediately, leaving
// the other form elements alone pending a manual submit of the form. The downside is that there
// will be a window of opportunity when the permissions have been set but before you've had a chance
// to review and possibly restrict them. The upside is we won't have to warn you that your connection
// can't do anything until you save the bloody form.
$autopost = (((argc() > 2) && (argv(2) === 'auto')) ? true : false);
$orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
intval($contact_id),
intval(local_user())

9
mod/dav.php
View File

@ -37,15 +37,6 @@ if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
* @param App &$a
*/
function dav_init(&$a) {
// call ($currenttheme)_init since we're operating outside of index.php
$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
$func = str_replace('-', '_', current_theme()) . '_init';
$func($a);
}
}
require_once('include/reddav.php');

1
mod/display.php
View File

@ -136,6 +136,7 @@ function display_content(&$a, $update = 0, $load = false) {
'$tags' => '',
'$dend' => '',
'$dbegin' => '',
'$verb' => '',
'$mid' => $item_hash
));

4
mod/events.php
View File

@ -75,6 +75,10 @@ function events_post(&$a) {
$location = escape_tags(trim($_POST['location']));
$type = 'event';
require_once('include/text.php');
linkify_tags($a, $desc, local_user());
linkify_tags($a, $location, local_user());
$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if(strcmp($finish,$start) < 0 && !$nofinish) {

1
mod/home.php
View File

@ -144,6 +144,7 @@ function home_content(&$a, $update = 0, $load = false) {
'$tags' => '',
'$dend' => '',
'$mid' => '',
'$verb' => '',
'$dbegin' => ''
));
}

4
mod/impel.php
View File

@ -75,11 +75,11 @@ function impel_init(&$a) {
$execflag = false;
if($arr['mimetype'] === 'application/x-php') {
$z = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
intval(local_user())
);
if($z && ($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) {
if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
$execflag = true;
}
}

6
mod/item.php
View File

@ -449,10 +449,10 @@ function item_post(&$a) {
$execflag = false;
if($mimetype === 'application/x-php') {
$z = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
intval($profile_uid)
);
if($z && ($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) {
if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
if($uid && (get_account_id() == $z[0]['account_id'])) {
$execflag = true;
}
@ -576,7 +576,7 @@ function item_post(&$a) {
// Look for tags and linkify them
$results = linkify_tags($a, $body, $uid, $profile_uid);
$results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid);
// Set permissions based on tag replacements
set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item);

3
mod/mail.php
View File

@ -83,6 +83,9 @@ function mail_post(&$a) {
// $body = fix_mce_lf($body);
// }
require_once('include/text.php');
linkify_tags($a, $body, local_user());
if(! $recipient) {
notice('No recipient found.');
$a->argc = 2;

9
mod/network.php
View File

@ -47,7 +47,7 @@ function network_content(&$a, $update = 0, $load = false) {
$gid = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0);
$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
$verb = ((x($_REQUEST,'verb')) ? $_REQUEST['verb'] : '');
$search = (($_GET['search']) ? $_GET['search'] : '');
if($search) {
@ -251,6 +251,7 @@ function network_content(&$a, $update = 0, $load = false) {
'$tags' => $hashtags,
'$dend' => $datequery,
'$mid' => '',
'$verb' => $verb,
'$dbegin' => $datequery2
));
}
@ -279,6 +280,12 @@ function network_content(&$a, $update = 0, $load = false) {
}
}
if($verb) {
$sql_extra .= sprintf(" AND item.verb like '%s' ",
dbesc(protect_sprintf('%' . $verb . '%'))
);
}
if(strlen($file)) {
$sql_extra .= term_query('item',$file,TERM_FILE);
}

4
mod/photos.php
View File

@ -140,7 +140,7 @@ function photos_post(&$a) {
);
if($r) {
foreach($r as $i) {
drop_item($i['id'],false);
drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */);
if(! $item_restrict)
proc_run('php','include/notifier.php','drop',$i['id']);
}
@ -354,7 +354,7 @@ function photos_post(&$a) {
require_once('include/text.php');
$profile_uid = $a->profile['profile_uid'];
$results = linkify_tags($a, $rawtags, local_user(), $profile_uid);
$results = linkify_tags($a, $rawtags, (local_user()) ? local_user() : $profile_uid);
$success = $results['success'];
$post_tags = array();

21
mod/profiles.php
View File

@ -296,7 +296,24 @@ function profiles_post(&$a) {
$work = fix_mce_lf(escape_tags(trim($_POST['work'])));
$education = fix_mce_lf(escape_tags(trim($_POST['education'])));
$hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0);
$hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
require_once('include/text.php');
linkify_tags($a, $likes, local_user());
linkify_tags($a, $dislikes, local_user());
linkify_tags($a, $about, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $contact, local_user());
linkify_tags($a, $channels, local_user());
linkify_tags($a, $music, local_user());
linkify_tags($a, $book, local_user());
linkify_tags($a, $tv, local_user());
linkify_tags($a, $film, local_user());
linkify_tags($a, $romance, local_user());
linkify_tags($a, $work, local_user());
linkify_tags($a, $education, local_user());
$with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
@ -605,7 +622,7 @@ function profiles_content(&$a) {
$opt_tpl = get_markup_template("profile_hide_friends.tpl");
$hide_friends = replace_macros($opt_tpl,array('$field' => array(
'hide-friends',
'hide_friends',
t('Hide your contact/friend list from viewers of this profile?'),
$r[0]['hide_friends'],
'',

1
mod/search.php
View File

@ -109,6 +109,7 @@ function search_content(&$a,$update = 0, $load = false) {
'$cats' => '',
'$tags' => '',
'$mid' => '',
'$verb' => '',
'$dend' => '',
'$dbegin' => ''
));

3
mod/siteinfo.php
View File

@ -126,7 +126,8 @@ function siteinfo_content(&$a) {
else
$plugins_text = t('No installed plugins/addons/apps');
$admininfo = bbcode(get_config('system','admininfo'));
$txt = get_config('system','admininfo');
$admininfo = bbcode($txt);
if(file_exists('doc/site_donate.html'))
$donate .= file_get_contents('doc/site_donate.html');

2
view/tpl/build_query.tpl
View File

@ -26,6 +26,7 @@
var bParam_dend = "{{$dend}}";
var bParam_dbegin = "{{$dbegin}}";
var bParam_mid = "{{$mid}}";
var bParam_verb = "{{$verb}}";
function buildCmd() {
var udargs = ((page_load) ? "/load" : "");
@ -51,6 +52,7 @@
if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
return(bCmd);
}