Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
Andrew Manning
commit
f2dda646ec
@ -52,8 +52,8 @@ class Block extends \Zotlabs\Web\Controller {
|
||||
require_once('include/security.php');
|
||||
$sql_options = item_permissions_sql($u[0]['channel_id']);
|
||||
|
||||
$r = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and
|
||||
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and iconfig.k = 'BUILDBLOCK' and
|
||||
item_type = %d $sql_options $revision limit 1",
|
||||
intval($u[0]['channel_id']),
|
||||
dbesc($page_id),
|
||||
@ -64,8 +64,8 @@ class Block extends \Zotlabs\Web\Controller {
|
||||
|
||||
// Check again with no permissions clause to see if it is a permissions issue
|
||||
|
||||
$x = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and
|
||||
$x = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and iconfig.k = 'BUILDBLOCK' and
|
||||
item_type = %d $revision limit 1",
|
||||
intval($u[0]['channel_id']),
|
||||
dbesc($page_id),
|
||||
|
||||
@ -27,7 +27,7 @@ class Blocks extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
|
||||
|
||||
function get() {
|
||||
function get() {
|
||||
|
||||
if(! \App::$profile) {
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
@ -111,8 +111,11 @@ class Blocks extends \Zotlabs\Web\Controller {
|
||||
|
||||
$editor = status_editor($a,$x);
|
||||
|
||||
$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
|
||||
where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
|
||||
|
||||
$r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig
|
||||
left join item on iconfig.iid = item.id
|
||||
where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK'
|
||||
and item_type = %d order by item.created desc",
|
||||
intval($owner),
|
||||
intval(ITEM_TYPE_BLOCK)
|
||||
);
|
||||
@ -129,12 +132,12 @@ class Blocks extends \Zotlabs\Web\Controller {
|
||||
'created' => $rr['created'],
|
||||
'edited' => $rr['edited'],
|
||||
'mimetype' => $rr['mimetype'],
|
||||
'pagetitle' => $rr['sid'],
|
||||
'pagetitle' => $rr['v'],
|
||||
'mid' => $rr['mid']
|
||||
);
|
||||
$pages[$rr['iid']][] = array(
|
||||
'url' => $rr['iid'],
|
||||
'name' => $rr['sid'],
|
||||
'name' => $rr['v'],
|
||||
'title' => $rr['title'],
|
||||
'created' => $rr['created'],
|
||||
'edited' => $rr['edited'],
|
||||
|
||||
@ -16,14 +16,14 @@ require_once('include/zot.php');
|
||||
require_once('include/widgets.php');
|
||||
require_once('include/photos.php');
|
||||
|
||||
/* @brief Initialize the connection-editor
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
class Connedit extends \Zotlabs\Web\Controller {
|
||||
|
||||
/* @brief Initialize the connection-editor
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
function init() {
|
||||
|
||||
if(! local_channel())
|
||||
@ -51,7 +51,7 @@ class Connedit extends \Zotlabs\Web\Controller {
|
||||
*
|
||||
*/
|
||||
|
||||
function post() {
|
||||
function post() {
|
||||
|
||||
if(! local_channel())
|
||||
return;
|
||||
@ -357,7 +357,7 @@ class Connedit extends \Zotlabs\Web\Controller {
|
||||
*
|
||||
*/
|
||||
|
||||
function get() {
|
||||
function get() {
|
||||
|
||||
$sort_type = 0;
|
||||
$o = '';
|
||||
@ -418,7 +418,13 @@ class Connedit extends \Zotlabs\Web\Controller {
|
||||
goaway(z_root() . '/connedit/' . $contact_id);
|
||||
|
||||
}
|
||||
|
||||
if($cmd === 'resetphoto') {
|
||||
q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1",
|
||||
dbesc($orig_record[0]['xchan_hash'])
|
||||
);
|
||||
$cmd = 'refresh';
|
||||
}
|
||||
|
||||
if($cmd === 'refresh') {
|
||||
if($orig_record[0]['xchan_network'] === 'zot') {
|
||||
if(! zot_refresh($orig_record[0],\App::get_channel()))
|
||||
|
||||
@ -106,12 +106,13 @@ class Display extends \Zotlabs\Web\Controller {
|
||||
$x = q("select * from channel where channel_id = %d limit 1",
|
||||
intval($target_item['uid'])
|
||||
);
|
||||
$y = q("select * from item_id where uid = %d and service = 'WEBPAGE' and iid = %d limit 1",
|
||||
$y = q("select * from iconfig left join item on iconfig.iid = item.id
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
|
||||
intval($target_item['uid']),
|
||||
intval($target_item['id'])
|
||||
);
|
||||
if($x && $y) {
|
||||
goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['sid']);
|
||||
goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
|
||||
}
|
||||
else {
|
||||
notice( t('Page not found.') . EOL);
|
||||
|
||||
@ -85,11 +85,11 @@ class Editblock extends \Zotlabs\Web\Controller {
|
||||
intval($owner)
|
||||
);
|
||||
if($itm) {
|
||||
$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1",
|
||||
$item_id = q("select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1",
|
||||
intval($itm[0]['id'])
|
||||
);
|
||||
if($item_id)
|
||||
$block_title = $item_id[0]['sid'];
|
||||
$block_title = $item_id[0]['v'];
|
||||
}
|
||||
else {
|
||||
notice( t('Item not found') . EOL);
|
||||
|
||||
@ -96,11 +96,12 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
intval($owner)
|
||||
);
|
||||
|
||||
$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
|
||||
$item_id = q("select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1",
|
||||
intval($itm[0]['id'])
|
||||
);
|
||||
if($item_id)
|
||||
$layout_title = $item_id[0]['sid'];
|
||||
$layout_title = $item_id[0]['v'];
|
||||
|
||||
|
||||
$rp = 'layouts/' . $which;
|
||||
|
||||
|
||||
@ -114,11 +114,11 @@ class Editwebpage extends \Zotlabs\Web\Controller {
|
||||
$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key);
|
||||
}
|
||||
|
||||
$item_id = q("select * from item_id where service = 'WEBPAGE' and iid = %d limit 1",
|
||||
$item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
|
||||
intval($itm[0]['id'])
|
||||
);
|
||||
if($item_id)
|
||||
$page_title = $item_id[0]['sid'];
|
||||
$page_title = $item_id[0]['v'];
|
||||
|
||||
$mimetype = $itm[0]['mimetype'];
|
||||
|
||||
|
||||
@ -137,9 +137,7 @@ class Impel extends \Zotlabs\Web\Controller {
|
||||
require_once('library/urlify/URLify.php');
|
||||
$pagetitle = strtolower(\URLify::transliterate($j['pagetitle']));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// Verify ability to use html or php!!!
|
||||
|
||||
$execflag = false;
|
||||
@ -154,21 +152,14 @@ class Impel extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
}
|
||||
|
||||
$remote_id = 0;
|
||||
|
||||
$z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1",
|
||||
dbesc($pagetitle),
|
||||
dbesc($namespace),
|
||||
intval(local_channel())
|
||||
);
|
||||
|
||||
$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
|
||||
dbesc($arr['mid']),
|
||||
intval(local_channel())
|
||||
);
|
||||
|
||||
\Zotlabs\Lib\IConfig::Set($arr,'system',$namespace,(($pagetitle) ? $pagetitle : substr($arr['mid'],0,16)),true);
|
||||
|
||||
if($z && $i) {
|
||||
$remote_id = $z[0]['id'];
|
||||
if($i) {
|
||||
$arr['id'] = $i[0]['id'];
|
||||
// don't update if it has the same timestamp as the original
|
||||
if($arr['edited'] > $i[0]['edited'])
|
||||
@ -182,12 +173,12 @@ class Impel extends \Zotlabs\Web\Controller {
|
||||
intval(local_channel())
|
||||
);
|
||||
}
|
||||
$x = item_store($arr,$execflag);
|
||||
else
|
||||
$x = item_store($arr,$execflag);
|
||||
}
|
||||
|
||||
if($x['success']) {
|
||||
if($x && $x['success']) {
|
||||
$item_id = $x['item_id'];
|
||||
update_remote_id($channel,$item_id,$arr['item_type'],$pagetitle,$namespace,$remote_id,$arr['mid']);
|
||||
}
|
||||
}
|
||||
|
||||
@ -199,7 +190,8 @@ class Impel extends \Zotlabs\Web\Controller {
|
||||
notice( sprintf( t('%s element installation failed'), $installed_type));
|
||||
}
|
||||
|
||||
//??? should perhaps return ret?
|
||||
//??? should perhaps return ret?
|
||||
|
||||
json_return_and_die(true);
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
namespace Zotlabs\Module;
|
||||
|
||||
/**
|
||||
@ -229,7 +230,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
|
||||
if($namespace && $remote_id) {
|
||||
// It wasn't an internally generated post - see if we've got an item matching this remote service id
|
||||
$i = q("select iid from item_id where service = '%s' and sid = '%s' limit 1",
|
||||
$i = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
|
||||
dbesc($namespace),
|
||||
dbesc($remote_id)
|
||||
);
|
||||
@ -880,13 +881,21 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
}
|
||||
|
||||
if($webpage) {
|
||||
Zlib\IConfig::Set($datarray,'system', webpage_to_namespace($webpage),
|
||||
(($pagetitle) ? $pagetitle : substr($datarray['mid'],0,16)),true);
|
||||
}
|
||||
elseif($namespace) {
|
||||
Zlib\IConfig::Set($datarray,'system', $namespace,
|
||||
(($remote_id) ? $remote_id : substr($datarray['mid'],0,16)),true);
|
||||
}
|
||||
|
||||
|
||||
if($orig_post) {
|
||||
$datarray['id'] = $post_id;
|
||||
|
||||
item_store_update($datarray,$execflag);
|
||||
|
||||
update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
|
||||
|
||||
if(! $parent) {
|
||||
$r = q("select * from item where id = %d",
|
||||
intval($post_id)
|
||||
@ -894,10 +903,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
if($r) {
|
||||
xchan_query($r);
|
||||
$sync_item = fetch_post_tags($r);
|
||||
$rid = q("select * from item_id where iid = %d",
|
||||
intval($post_id)
|
||||
);
|
||||
build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
|
||||
build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true))));
|
||||
}
|
||||
}
|
||||
if(! $nopush)
|
||||
@ -978,10 +984,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
goaway(z_root() . "/" . $return_path );
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
|
||||
|
||||
|
||||
if(($parent) && ($parent != $post_id)) {
|
||||
// Store the comment signature information in case we need to relay to Diaspora
|
||||
//$ditem = $datarray;
|
||||
@ -995,10 +998,7 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
if($r) {
|
||||
xchan_query($r);
|
||||
$sync_item = fetch_post_tags($r);
|
||||
$rid = q("select * from item_id where iid = %d",
|
||||
intval($post_id)
|
||||
);
|
||||
build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
|
||||
build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true))));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -90,13 +90,14 @@ class Layouts extends \Zotlabs\Web\Controller {
|
||||
return;
|
||||
}
|
||||
|
||||
//This feature is not exposed in redbasic ui since it is not clear why one would want to
|
||||
//download a json encoded pdl file - we dont have a possibility to import it.
|
||||
//Use the buildin share/install feature instead.
|
||||
// This feature is not exposed in redbasic ui since it is not clear why one would want to
|
||||
// download a json encoded pdl file - we dont have a possibility to import it.
|
||||
// Use the buildin share/install feature instead.
|
||||
|
||||
if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
|
||||
$r = q("select sid, service, mimetype, title, body from item_id
|
||||
left join item on item.id = item_id.iid
|
||||
where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc",
|
||||
$r = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig
|
||||
left join item on item.id = iconfig.iid
|
||||
where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc",
|
||||
intval($owner),
|
||||
dbesc(argv(3))
|
||||
);
|
||||
@ -141,8 +142,9 @@ class Layouts extends \Zotlabs\Web\Controller {
|
||||
|
||||
$editor = status_editor($a,$x);
|
||||
|
||||
$r = q("select iid, sid, mid, title, body, mimetype, created, edited, item_type from item_id left join item on item_id.iid = item.id
|
||||
where item_id.uid = %d and service = 'PDL' and item_type = %d order by item.created desc",
|
||||
$r = q("select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig
|
||||
left join item on iconfig.iid = item.id
|
||||
where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc",
|
||||
intval($owner),
|
||||
intval(ITEM_TYPE_PDL)
|
||||
);
|
||||
@ -164,7 +166,7 @@ class Layouts extends \Zotlabs\Web\Controller {
|
||||
);
|
||||
$pages[$rr['iid']][] = array(
|
||||
'url' => $rr['iid'],
|
||||
'title' => $rr['sid'],
|
||||
'title' => $rr['v'],
|
||||
'descr' => $rr['title'],
|
||||
'mid' => $rr['mid'],
|
||||
'created' => $rr['created'],
|
||||
|
||||
@ -65,9 +65,10 @@ class Page extends \Zotlabs\Web\Controller {
|
||||
require_once('include/security.php');
|
||||
$sql_options = item_permissions_sql($u[0]['channel_id']);
|
||||
|
||||
$r = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid = '%s' and item.item_delayed = 0 and (( service = 'WEBPAGE' and item_type = %d )
|
||||
OR ( service = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
|
||||
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0
|
||||
and (( iconfig.k = 'WEBPAGE' and item_type = %d )
|
||||
OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
|
||||
intval($u[0]['channel_id']),
|
||||
dbesc($page_id),
|
||||
intval(ITEM_TYPE_WEBPAGE),
|
||||
@ -77,9 +78,9 @@ class Page extends \Zotlabs\Web\Controller {
|
||||
|
||||
// Check again with no permissions clause to see if it is a permissions issue
|
||||
|
||||
$x = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid = '%s' and item.item_delayed = 0 and service = 'WEBPAGE' and
|
||||
item_type = %d $revision limit 1",
|
||||
$x = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0
|
||||
and iconfig.k = 'WEBPAGE' and item_type = %d $revision limit 1",
|
||||
intval($u[0]['channel_id']),
|
||||
dbesc($page_id),
|
||||
intval(ITEM_TYPE_WEBPAGE)
|
||||
@ -119,11 +120,8 @@ class Page extends \Zotlabs\Web\Controller {
|
||||
\App::$data['webpage'] = $r;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function get() {
|
||||
|
||||
function get() {
|
||||
|
||||
$r = \App::$data['webpage'];
|
||||
if(! $r)
|
||||
|
||||
80
Zotlabs/Module/README.md
Normal file
80
Zotlabs/Module/README.md
Normal file
@ -0,0 +1,80 @@
|
||||
Zotlabs/Module
|
||||
==============
|
||||
|
||||
|
||||
This directory contains controller modules for handling web requests. The
|
||||
lowercase class name indicates the head of the URL path which this module
|
||||
handles. There are other methods of attaching (routing) URL paths to
|
||||
controllers, but this is the primary method used in this project.
|
||||
|
||||
Module controllers MUST reside in this directory and namespace to be
|
||||
autoloaded (unless other specific routing methods are employed). They
|
||||
typically use and extend the class definition in Zotlabs/Web/Controller
|
||||
as a template.
|
||||
|
||||
Template:
|
||||
|
||||
<?php
|
||||
|
||||
namespace Zotlabs\Web;
|
||||
|
||||
|
||||
class Controller {
|
||||
|
||||
function init() {}
|
||||
function post() {}
|
||||
function get() {}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Typical Module declaration for the '/foo' URL route:
|
||||
|
||||
|
||||
<?php
|
||||
namespace Zotlabs\Module;
|
||||
|
||||
class Foo extends \Zotlabs\Web\Controller {
|
||||
|
||||
function init() {
|
||||
// init() handler goes here
|
||||
}
|
||||
|
||||
function post() {
|
||||
// post handler goes here
|
||||
}
|
||||
|
||||
function get() {
|
||||
return 'Hello world.' . EOL;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
This model provides callbacks for public functions named init(), post(),
|
||||
and get(). init() is always called. post() is called if $_POST variables
|
||||
are present, and get() is called if none of the prior functions terminated
|
||||
the handler. The get() method typically retuns a string which represents
|
||||
the contents of the content region of the resulting page. Modules which emit
|
||||
json, xml or other machine-readable formats typically emit their contents
|
||||
inside the init() function and call 'killme()' to terminate the Module.
|
||||
|
||||
Modules are passed the URL path as argc,argv arguments. For a path such as
|
||||
|
||||
https://mysite.something/foo/bar/baz
|
||||
|
||||
The app will typically invoke the Module class 'Foo' and pass it
|
||||
|
||||
$x = argc(); // $x = 3
|
||||
|
||||
$x = argv(0); // $x = 'foo'
|
||||
$x = argv(1); // $x = 'bar'
|
||||
$x = argv(2); // $x = 'baz'
|
||||
|
||||
These are handled in a similar fashion to their counterparts in the Unix shell
|
||||
or C/C++ languages. Do not confuse the argc(),argv() functions with the
|
||||
global variables $argc,$argv which are passed to command line programs. These
|
||||
are handled separately by command line and Zotlabs/Daemon class functions.
|
||||
|
||||
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ class Webpages extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
|
||||
|
||||
function get() {
|
||||
function get() {
|
||||
|
||||
if(! \App::$profile) {
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
@ -138,11 +138,19 @@ class Webpages extends \Zotlabs\Web\Controller {
|
||||
|
||||
$sql_extra = item_permissions_sql($owner);
|
||||
|
||||
$r = q("select * from item_id left join item on item_id.iid = item.id
|
||||
where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
|
||||
|
||||
$r = q("select * from iconfig left join item on iconfig.iid = item.id
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d
|
||||
$sql_extra order by item.created desc",
|
||||
intval($owner),
|
||||
intval(ITEM_TYPE_WEBPAGE)
|
||||
);
|
||||
|
||||
// $r = q("select * from item_id left join item on item_id.iid = item.id
|
||||
// where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
|
||||
// intval($owner),
|
||||
// intval(ITEM_TYPE_WEBPAGE)
|
||||
// );
|
||||
|
||||
$pages = null;
|
||||
|
||||
@ -160,13 +168,13 @@ class Webpages extends \Zotlabs\Web\Controller {
|
||||
'created' => $rr['created'],
|
||||
'edited' => $rr['edited'],
|
||||
'mimetype' => $rr['mimetype'],
|
||||
'pagetitle' => $rr['sid'],
|
||||
'pagetitle' => $rr['v'],
|
||||
'mid' => $rr['mid'],
|
||||
'layout_mid' => $rr['layout_mid']
|
||||
);
|
||||
$pages[$rr['iid']][] = array(
|
||||
'url' => $rr['iid'],
|
||||
'pagetitle' => $rr['sid'],
|
||||
'pagetitle' => $rr['v'],
|
||||
'title' => $rr['title'],
|
||||
'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
|
||||
'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
<?php /** @file */
|
||||
|
||||
namespace Zotlabs\Module;/** @file */
|
||||
namespace Zotlabs\Module;
|
||||
|
||||
class Wiki extends \Zotlabs\Web\Controller {
|
||||
|
||||
|
||||
@ -179,7 +179,8 @@ class Comanche {
|
||||
$channel_id = $this->get_channel_id();
|
||||
|
||||
if($channel_id) {
|
||||
$r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
|
||||
$r = q("select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d
|
||||
and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1",
|
||||
intval($channel_id),
|
||||
dbesc($name)
|
||||
);
|
||||
@ -282,12 +283,12 @@ class Comanche {
|
||||
|
||||
|
||||
/**
|
||||
* Widgets will have to get any operational arguments from the session, the
|
||||
* global app environment, or config storage until we implement argument passing
|
||||
* Render a widget
|
||||
*
|
||||
* @param string $name
|
||||
* @param string $text
|
||||
*/
|
||||
|
||||
function widget($name, $text) {
|
||||
$vars = array();
|
||||
$matches = array();
|
||||
@ -314,7 +315,7 @@ class Comanche {
|
||||
require_once(theme_include($theme_widget));
|
||||
}
|
||||
|
||||
if (function_exists($func))
|
||||
if(function_exists($func))
|
||||
return $func($vars);
|
||||
}
|
||||
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
namespace Zotlabs\Storage;
|
||||
|
||||
use Sabre\DAV;
|
||||
use Sabre\HTTP\RequestInterface;
|
||||
use Sabre\HTTP\ResponseInterface;
|
||||
|
||||
/**
|
||||
* @brief Authentication backend class for DAV.
|
||||
@ -145,6 +147,57 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* When this method is called, the backend must check if authentication was
|
||||
* successful.
|
||||
*
|
||||
* The returned value must be one of the following
|
||||
*
|
||||
* [true, "principals/username"]
|
||||
* [false, "reason for failure"]
|
||||
*
|
||||
* If authentication was successful, it's expected that the authentication
|
||||
* backend returns a so-called principal url.
|
||||
*
|
||||
* Examples of a principal url:
|
||||
*
|
||||
* principals/admin
|
||||
* principals/user1
|
||||
* principals/users/joe
|
||||
* principals/uid/123457
|
||||
*
|
||||
* If you don't use WebDAV ACL (RFC3744) we recommend that you simply
|
||||
* return a string such as:
|
||||
*
|
||||
* principals/users/[username]
|
||||
*
|
||||
* @param RequestInterface $request
|
||||
* @param ResponseInterface $response
|
||||
* @return array
|
||||
*/
|
||||
function check(RequestInterface $request, ResponseInterface $response) {
|
||||
|
||||
if(local_channel()) {
|
||||
return [ true, $this->principalPrefix . $this->channel_name ];
|
||||
}
|
||||
|
||||
$auth = new \Sabre\HTTP\Auth\Basic(
|
||||
$this->realm,
|
||||
$request,
|
||||
$response
|
||||
);
|
||||
|
||||
$userpass = $auth->getCredentials();
|
||||
if (!$userpass) {
|
||||
return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
|
||||
}
|
||||
if (!$this->validateUserPass($userpass[0], $userpass[1])) {
|
||||
return [false, "Username or password was incorrect"];
|
||||
}
|
||||
return [true, $this->principalPrefix . $userpass[0]];
|
||||
|
||||
}
|
||||
|
||||
protected function check_module_access($channel_id) {
|
||||
if($channel_id && \App::$module === 'cdav') {
|
||||
$x = get_pconfig($channel_id,'cdav','enabled');
|
||||
|
||||
@ -9,4 +9,5 @@ class Controller {
|
||||
function post() {}
|
||||
function get() {}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
boot.php
2
boot.php
@ -48,7 +48,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||
define ( 'STD_VERSION', '1.9' );
|
||||
define ( 'ZOT_REVISION', 1.1 );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1176 );
|
||||
define ( 'DB_UPDATE_VERSION', 1177 );
|
||||
|
||||
|
||||
/**
|
||||
|
||||
10
doc/context/de/wiki/help.html
Normal file
10
doc/context/de/wiki/help.html
Normal file
@ -0,0 +1,10 @@
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Allgemein</dt>
|
||||
<dd>Jedes Wiki ist eine Sammlung aus mit Markdown formatierten Seiten.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Click to highlight element...">Wiki Liste</a></dt>
|
||||
<dd>Wikis die dem eigenen Kanal gehören und <i>mit der Berechtigung zum Anschauen</i>, sind in der Seitenleiste gelistet.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element...">Seiten Versionen</a></dt>
|
||||
<dd>Jede Änderung einer Seite wird gespeichert, um eine schnelle Berichtigung zu ermöglichen. Klick auf das <b>Versionsgeschichte</b> Tab um den Verlauf der Seitenbearbeitung zu sehen, einschließlich Datum und Autor. Der Zurück-Knopf lädt die ausgewählte Änderung, aber ohne die Seite automatisch zu spreichern.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Click to highlight element...">Seiten</a></dt>
|
||||
<dd>Die Seiten des Wikis werden in <b>Wiki Seiten</b> gelistet. Vor dem Speichern einer Seite über das <b>Seiten</b> Dropdown Menu, hast Du die Möglichkeit eine <a href="#" onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Click to highlight element...">Zusammenfassung der Änderungen</a> einzutragen. Dieser Text wird anschließend unter <a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element..."><b>Seiten Versionen</b></a> in der Versionsgeschichte angezeigt.</dd>
|
||||
</dl>
|
||||
10
doc/context/es-es/wiki/help.html
Normal file
10
doc/context/es-es/wiki/help.html
Normal file
@ -0,0 +1,10 @@
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd>Cada wiki es una colección de páginas, compuestas como ficheros de texto formateados en Markdown.</dd>
|
||||
<dt><a href='#' onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Pulsar para resaltar el elemento...">Lista de wikis</a></dt>
|
||||
<dd>Las páginas wiki propiedad del canal <i>que esté autorizado a ver</i> aparecen en el panel lateral.</dd>
|
||||
<dt><a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Pulsar para resaltar el elemento...">Historial de la página</a></dt>
|
||||
<dd>Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña <b>Historial</b> para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.</dd>
|
||||
<dt><a href='#' onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Pulsar para resaltar el elemento...">Páginas</a></dt>
|
||||
<dd>La lista de páginas en el wiki aparece en el panel <b>Páginas del wiki</b>. Antes de salvar las páginas editadas usando el control <b>Página</b> en el menú desplegable, puede <a href='#' onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Pulsar para resaltar el elemento...">escribir un mensaje personalizado</a> que se verá en el visor <a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Pulsar para resaltar el elemento..."><b>Historial de la página</b></a> junto con la revisión.</dd>
|
||||
</dl>
|
||||
10
doc/context/it/wiki/help.html
Normal file
10
doc/context/it/wiki/help.html
Normal file
@ -0,0 +1,10 @@
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd>Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Fai click per evidenziare l'elemento...">Elenco dei Wiki</a></dt>
|
||||
<dd>I Wiki del canale <i>che sei abilitato a vedere</i> sono elencati nel pannello laterale.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Fai click per evidenziare l'elemento...">Cronologia della pagina</a></dt>
|
||||
<dd>Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab <b>Cronologia</b> per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.</dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Fai click per evidenziare l'elemento...">Pagine</a></dt>
|
||||
<dd>L'elenco delle pagine del wiki si trova nel pannello <b>Pagine del wiki</b>. Prima di salvare le modifiche con il menu a discela <b>Pagina</b>, puoi <a href="#" onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Fai click per evidenziare l'elemento...">inserire un messaggio</a> che verrà visualizzato nella visualizzazione della <a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Fai click per evidenziare l'elemento..."><b>storia della pagina</b></a> insieme alla revisione.</dd>
|
||||
</dl>
|
||||
@ -839,7 +839,7 @@ require_once('include/api_auth.php');
|
||||
$_REQUEST['parent_mid'] = $parent;
|
||||
|
||||
if($_REQUEST['namespace'] && $parent) {
|
||||
$x = q("select iid from item_id where service = '%s' and sid = '%s' limit 1",
|
||||
$x = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
|
||||
dbesc($_REQUEST['namespace']),
|
||||
dbesc($parent)
|
||||
);
|
||||
@ -967,20 +967,10 @@ require_once('include/api_auth.php');
|
||||
|
||||
$ret = array();
|
||||
$tmp = array();
|
||||
$str = '';
|
||||
foreach($i as $ii) {
|
||||
$tmp[] = encode_item($ii,true);
|
||||
if($str)
|
||||
$str .= ',';
|
||||
$str .= $ii['id'];
|
||||
}
|
||||
$ret['item'] = $tmp;
|
||||
if($str) {
|
||||
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item.id in ( $str ) ");
|
||||
|
||||
if($r)
|
||||
$ret['item_id'] = $r;
|
||||
}
|
||||
|
||||
json_return_and_die($ret);
|
||||
}
|
||||
@ -1462,7 +1452,8 @@ require_once('include/api_auth.php');
|
||||
}
|
||||
else {
|
||||
if($_REQUEST['namespace'] && $_REQUEST['remote_id']) {
|
||||
$r = q("select * from item_id where service = '%s' and sid = '%s' and uid = %d limit 1",
|
||||
$r = q("select * from iconfig left join item on iconfig.iid = item.id
|
||||
where cat = 'system' and k = '%s' and v = '%s' and item.uid = %d limit 1",
|
||||
dbesc($_REQUEST['namespace']),
|
||||
dbesc($_REQUEST['remote_id']),
|
||||
intval($user_info['uid'])
|
||||
@ -1472,7 +1463,7 @@ require_once('include/api_auth.php');
|
||||
$id = $r[0]['iid'];
|
||||
}
|
||||
if($_REQUEST['namespace'] && $_REQUEST['comment_id']) {
|
||||
$r = q("select * from item_id left join item on item.id = item_id.iid where service = '%s' and sid = '%s' and uid = %d and item.id != item.parent limit 1",
|
||||
$r = q("select * from iconfig left join item on item.id = iconfig.iid where cat = 'system' and k = '%s' and v = '%s' and uid = %d and item.id != item.parent limit 1",
|
||||
dbesc($_REQUEST['namespace']),
|
||||
dbesc($_REQUEST['comment_id']),
|
||||
intval($user_info['uid'])
|
||||
|
||||
@ -242,6 +242,13 @@ function bb_ShareAttributes($match) {
|
||||
if ($matches[1] != "")
|
||||
$message_id = $matches[1];
|
||||
|
||||
if(! $message_id) {
|
||||
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
|
||||
if ($matches[1] != "")
|
||||
$message_id = $matches[1];
|
||||
}
|
||||
|
||||
|
||||
$reldate = '<span class="autotime" title="' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'c') . '" >' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . '</span>';
|
||||
|
||||
$headline = '<div class="shared_container"> <div class="shared_header">';
|
||||
|
||||
@ -16,7 +16,7 @@ require_once('include/menu.php');
|
||||
* @param int $account_id
|
||||
* Account_id used for this request
|
||||
*
|
||||
* @returns assoziative array with:
|
||||
* @returns associative array with:
|
||||
* * \e boolean \b success boolean true if creating a new channel is allowed for this account
|
||||
* * \e string \b message (optional) if success is false, optional error text
|
||||
* * \e int \b total_identities
|
||||
@ -676,14 +676,6 @@ function identity_basic_export($channel_id, $items = false) {
|
||||
$ret['mail'] = $m;
|
||||
}
|
||||
|
||||
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
|
||||
intval($channel_id)
|
||||
);
|
||||
|
||||
if($r)
|
||||
$ret['item_id'] = $r;
|
||||
|
||||
//$key = get_config('system','prvkey');
|
||||
|
||||
/** @warning this may run into memory limits on smaller systems */
|
||||
|
||||
@ -746,17 +738,6 @@ function identity_export_year($channel_id,$year,$month = 0) {
|
||||
$ret['item'][] = encode_item($rr,true);
|
||||
}
|
||||
|
||||
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d
|
||||
and item.created >= '%s' and item.created < '%s' order by created ",
|
||||
intval($channel_id),
|
||||
dbesc($mindate),
|
||||
dbesc($maxdate)
|
||||
);
|
||||
|
||||
if($r)
|
||||
$ret['item_id'] = $r;
|
||||
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
@ -283,18 +283,30 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
|
||||
Zotlabs\Daemon\Master::Summon(array('Notifier','purge_all',$channel_id));
|
||||
}
|
||||
|
||||
|
||||
$r = q("select * from iconfig left join item on item.id = iconfig.iid
|
||||
where item.uid = %d",
|
||||
intval($channel_id)
|
||||
);
|
||||
if($r) {
|
||||
foreach($r as $rr) {
|
||||
q("delete from iconfig where iid = %d",
|
||||
intval($rr['iid'])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `group_member` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `event` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `item` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `item_id` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `mail` WHERE `channel_id` = %d", intval($channel_id));
|
||||
q("DELETE FROM `notify` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `photo` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `attach` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `profile` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($channel_id));
|
||||
q("DELETE FROM `spam` WHERE `uid` = %d", intval($channel_id));
|
||||
|
||||
// @FIXME At this stage we need to remove the file resources located under /store/$nickname
|
||||
|
||||
|
||||
@ -403,9 +403,12 @@ function count_descendants($item) {
|
||||
* @return boolean
|
||||
*/
|
||||
function visible_activity($item) {
|
||||
$hidden_activities = array(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 ];
|
||||
|
||||
$post_types = array(ACTIVITY_OBJ_NOTE,ACTIVITY_OBJ_COMMENT,basename(ACTIVITY_OBJ_NOTE),basename(ACTIVITY_OBJ_COMMENT));
|
||||
$post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)];
|
||||
|
||||
if(intval($item['item_notshown']))
|
||||
return false;
|
||||
|
||||
foreach ($hidden_activities as $act) {
|
||||
if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {
|
||||
|
||||
@ -275,7 +275,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
|
||||
|
||||
call_hooks('follow', $arr);
|
||||
|
||||
/** If there is a default group for this channel, add this member to it */
|
||||
/** If there is a default group for this channel, add this connection to it */
|
||||
|
||||
if($default_group) {
|
||||
require_once('include/group.php');
|
||||
|
||||
@ -30,7 +30,8 @@ function search_doc_files($s) {
|
||||
|
||||
$regexop = db_getfunc('REGEXP');
|
||||
|
||||
$r = q("select item_id.sid, item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
|
||||
$r = q("select iconfig.v, item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where iconfig.cat = 'system' and iconfig.k = 'docfile' and
|
||||
body $regexop '%s' and item_type = %d $pager_sql",
|
||||
dbesc($s),
|
||||
intval(ITEM_TYPE_DOC)
|
||||
@ -50,7 +51,7 @@ function search_doc_files($s) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if(stristr($r[$x]['sid'],$s))
|
||||
if(stristr($r[$x]['v'],$s))
|
||||
$r[$x]['rank'] ++;
|
||||
$r[$x]['rank'] += substr_count(strtolower($r[$x]['text']),strtolower($s));
|
||||
// bias the results to the observer's native language
|
||||
@ -123,12 +124,15 @@ function store_doc_file($s) {
|
||||
$item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash'];
|
||||
$item['item_type'] = ITEM_TYPE_DOC;
|
||||
|
||||
$r = q("select item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
|
||||
sid = '%s' and item_type = %d limit 1",
|
||||
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where iconfig.cat = 'system' and iconfig.k = 'docfile' and
|
||||
iconfig.v = '%s' and item_type = %d limit 1",
|
||||
dbesc($s),
|
||||
intval(ITEM_TYPE_DOC)
|
||||
);
|
||||
|
||||
\Zotlabs\Lib\IConfig::Set($item,'system','docfile',$s);
|
||||
|
||||
if($r) {
|
||||
$item['id'] = $r[0]['id'];
|
||||
$item['mid'] = $item['parent_mid'] = $r[0]['mid'];
|
||||
@ -139,10 +143,7 @@ function store_doc_file($s) {
|
||||
$x = item_store($item);
|
||||
}
|
||||
|
||||
if($x['success']) {
|
||||
update_remote_id($sys,$x['item_id'],ITEM_TYPE_DOC,$s,'docfile',0,$item['mid']);
|
||||
}
|
||||
|
||||
return $x;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -624,19 +624,14 @@ function import_item_ids($channel,$itemids) {
|
||||
);
|
||||
if(! $r)
|
||||
continue;
|
||||
$z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1",
|
||||
$z = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = '%s'
|
||||
and iconfig.v = '%s' and iid = %d limit 1",
|
||||
dbesc($i['service']),
|
||||
dbesc($i['sid']),
|
||||
intval($r[0]['id']),
|
||||
intval($channel['channel_id'])
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
if(! $z) {
|
||||
q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')",
|
||||
intval($r[0]['id']),
|
||||
intval($channel['channel_id']),
|
||||
dbesc($i['sid']),
|
||||
dbesc($i['service'])
|
||||
);
|
||||
\Zotlabs\Lib\IConfig::Set($r[0]['id'],'system',$i['service'],$i['sid'],true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -677,13 +677,23 @@ function get_item_elements($x,$allow_code = false) {
|
||||
|
||||
$arr['item_flags'] = 0;
|
||||
|
||||
if(array_key_exists('flags',$x) && in_array('consensus',$x['flags']))
|
||||
$arr['item_consensus'] = 1;
|
||||
if(array_key_exists('flags',$x)) {
|
||||
|
||||
if(array_key_exists('flags',$x) && in_array('deleted',$x['flags']))
|
||||
$arr['item_deleted'] = 1;
|
||||
if(array_key_exists('flags',$x) && in_array('hidden',$x['flags']))
|
||||
$arr['item_hidden'] = 1;
|
||||
if(in_array('consensus',$x['flags']))
|
||||
$arr['item_consensus'] = 1;
|
||||
|
||||
if(in_array('deleted',$x['flags']))
|
||||
$arr['item_deleted'] = 1;
|
||||
|
||||
if(in_array('notshown',$x['flags']))
|
||||
$arr['item_notshown'] = 1;
|
||||
|
||||
// hidden item are no longer propagated - notshown may be a suitable alternative
|
||||
|
||||
if(in_array('hidden',$x['flags']))
|
||||
$arr['item_hidden'] = 1;
|
||||
|
||||
}
|
||||
|
||||
// Here's the deal - the site might be down or whatever but if there's a new person you've never
|
||||
// seen before sending stuff to your stream, we MUST be able to look them up and import their data from their
|
||||
@ -1339,6 +1349,8 @@ function encode_item_flags($item) {
|
||||
$ret[] = 'deleted';
|
||||
if(intval($item['item_hidden']))
|
||||
$ret[] = 'hidden';
|
||||
if(intval($item['item_notshown']))
|
||||
$ret[] = 'notshown';
|
||||
if(intval($item['item_thread_top']))
|
||||
$ret[] = 'thread_parent';
|
||||
if(intval($item['item_nsfw']))
|
||||
@ -3537,9 +3549,8 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
|
||||
intval($item['id'])
|
||||
);
|
||||
|
||||
q("delete from item_id where iid = %d and uid = %d",
|
||||
intval($item['id']),
|
||||
intval($item['uid'])
|
||||
q("delete from iconfig where iid = %d",
|
||||
intval($item['id'])
|
||||
);
|
||||
|
||||
q("delete from term where oid = %d and otype = %d",
|
||||
@ -4105,6 +4116,23 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
|
||||
return $items;
|
||||
}
|
||||
|
||||
function webpage_to_namespace($webpage) {
|
||||
|
||||
if($webpage == ITEM_TYPE_WEBPAGE)
|
||||
$page_type = 'WEBPAGE';
|
||||
elseif($webpage == ITEM_TYPE_BLOCK)
|
||||
$page_type = 'BUILDBLOCK';
|
||||
elseif($webpage == ITEM_TYPE_PDL)
|
||||
$page_type = 'PDL';
|
||||
elseif($webpage == ITEM_TYPE_DOC)
|
||||
$page_type = 'docfile';
|
||||
else
|
||||
$page_type = 'unknown';
|
||||
return $page_type;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid) {
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
<?php
|
||||
|
||||
// A basic toolbar for observers with write_pages permissions
|
||||
function writepages_widget ($who,$which){
|
||||
|
||||
function writepages_widget ($who,$which) {
|
||||
return replace_macros(get_markup_template('write_pages.tpl'), array(
|
||||
'$new' => t('New Page'),
|
||||
'$newurl' => "webpages/$who",
|
||||
@ -13,9 +14,11 @@ function writepages_widget ($who,$which){
|
||||
|
||||
|
||||
// Chan is channel_id, $which is channel_address - we'll need to pass observer later too.
|
||||
function pagelist_widget ($owner,$which){
|
||||
|
||||
$r = q("select * from item_id left join item on item_id.iid = item.id where item_id.uid = %d and service = 'WEBPAGE' order by item.created desc",
|
||||
function pagelist_widget ($owner,$which) {
|
||||
|
||||
$r = q("select * from iconfig left join item on iconfig.iid = item.id where item_id.uid = %d
|
||||
and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' order by item.created desc",
|
||||
intval($owner)
|
||||
);
|
||||
|
||||
@ -24,7 +27,7 @@ function pagelist_widget ($owner,$which){
|
||||
if($r) {
|
||||
$pages = array();
|
||||
foreach($r as $rr) {
|
||||
$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['sid'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
|
||||
$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['v'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1743,7 +1743,8 @@ function unamp($s) {
|
||||
}
|
||||
|
||||
function layout_select($channel_id, $current = '') {
|
||||
$r = q("select mid,sid from item left join item_id on iid = item.id where service = 'PDL' and item.uid = item_id.uid and item_id.uid = %d and item_type = %d ",
|
||||
$r = q("select mid, v from item left join iconfig on iconfig.iid = item.id
|
||||
where iconfig.cat = 'system' and iconfig.k = 'PDL' and item.uid = %d and item_type = %d ",
|
||||
intval($channel_id),
|
||||
intval(ITEM_TYPE_PDL)
|
||||
);
|
||||
@ -1753,7 +1754,7 @@ function layout_select($channel_id, $current = '') {
|
||||
$options .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
|
||||
foreach($r as $rr) {
|
||||
$selected = (($rr['mid'] == $current) ? ' selected="selected" ' : '');
|
||||
$options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
|
||||
$options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['v'] . '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -2821,13 +2822,16 @@ function expand_acl($s) {
|
||||
// If it has a pdl we'll load it as we know the mid and pass the body through comanche_parser() which will generate the
|
||||
// page layout from the given description
|
||||
|
||||
// @FIXME - there is apparently a very similar function called layout_select; this one should probably take precedence
|
||||
// and the other should be checked for compatibility and removed
|
||||
|
||||
function pdl_selector($uid, $current="") {
|
||||
$o = '';
|
||||
|
||||
$sql_extra = item_permissions_sql($uid);
|
||||
|
||||
$r = q("select item_id.*, mid from item_id left join item on iid = item.id where item_id.uid = %d and item_id.uid = item.uid and service = 'PDL' $sql_extra order by sid asc",
|
||||
$r = q("select iconfig.*, mid from item_id left join item on iconfig.iid = item.id
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' $sql_extra order by v asc",
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
@ -2841,7 +2845,7 @@ function pdl_selector($uid, $current="") {
|
||||
$entries[] = array('title' => t('Default'), 'mid' => '');
|
||||
foreach($entries as $selection) {
|
||||
$selected = (($selection == $current) ? ' selected="selected" ' : '');
|
||||
$o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['sid']}</option>";
|
||||
$o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['v']}</option>";
|
||||
}
|
||||
|
||||
$o .= '</select>';
|
||||
|
||||
@ -994,8 +994,9 @@ function widget_item($arr) {
|
||||
$sql_extra = item_permissions_sql($channel_id);
|
||||
|
||||
if($arr['title']) {
|
||||
$r = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
|
||||
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s'
|
||||
and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
|
||||
intval($channel_id),
|
||||
dbesc($arr['title']),
|
||||
intval(ITEM_TYPE_WEBPAGE)
|
||||
@ -1253,8 +1254,8 @@ function widget_random_block($arr) {
|
||||
|
||||
$randfunc = db_getfunc('RAND');
|
||||
|
||||
$r = q("select item.* from item left join item_id on item.id = item_id.iid
|
||||
where item.uid = %d and sid like '%s' and service = 'BUILDBLOCK' and
|
||||
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
|
||||
where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and
|
||||
item_type = %d $sql_options order by $randfunc limit 1",
|
||||
intval($channel_id),
|
||||
dbesc('%' . $contains . '%'),
|
||||
|
||||
@ -538,6 +538,16 @@ function zot_refresh($them, $channel = null, $force = false) {
|
||||
Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
|
||||
}
|
||||
|
||||
|
||||
/** If there is a default group for this channel, add this connection to it */
|
||||
$default_group = $channel['channel_default_group'];
|
||||
if($default_group) {
|
||||
require_once('include/group.php');
|
||||
$g = group_rec_byhash($channel['channel_id'],$default_group);
|
||||
if($g)
|
||||
group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
|
||||
}
|
||||
|
||||
unset($new_connection[0]['abook_id']);
|
||||
unset($new_connection[0]['abook_account']);
|
||||
unset($new_connection[0]['abook_channel']);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1176 );
|
||||
define( 'UPDATE_VERSION' , 1177 );
|
||||
|
||||
/**
|
||||
*
|
||||
@ -2254,3 +2254,16 @@ function update_r1175() {
|
||||
return UPDATE_FAILED;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function update_r1176() {
|
||||
|
||||
$r = q("select * from item_id where true");
|
||||
if($r) {
|
||||
foreach($r as $rr) {
|
||||
\Zotlabs\Lib\IConfig::Set($rr['iid'],'system',$rr['service'],$rr['sid'],true);
|
||||
}
|
||||
}
|
||||
return UPDATE_SUCCESS;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user