Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
Mario Vavti
commit
f52e5d90b0
@ -278,20 +278,31 @@ class Import extends \Zotlabs\Web\Controller {
|
||||
create_table_from_array('xchan',$xchan);
|
||||
|
||||
require_once('include/photo/photo_driver.php');
|
||||
$photos = import_xchan_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']);
|
||||
if($photos[4])
|
||||
$photodate = NULL_DATE;
|
||||
else
|
||||
$photodate = $xchan['xchan_photo_date'];
|
||||
|
||||
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'",
|
||||
dbesc($photos[0]),
|
||||
dbesc($photos[1]),
|
||||
dbesc($photos[2]),
|
||||
dbesc($photos[3]),
|
||||
dbesc($photodate),
|
||||
dbesc($xchan['xchan_hash'])
|
||||
);
|
||||
if($xchan['xchan_hash'] === $channel['channel_hash']) {
|
||||
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'",
|
||||
dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
|
||||
dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
|
||||
dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
|
||||
dbesc($xchan['xchan_hash'])
|
||||
);
|
||||
}
|
||||
else {
|
||||
$photos = import_xchan_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']);
|
||||
if($photos[4])
|
||||
$photodate = NULL_DATE;
|
||||
else
|
||||
$photodate = $xchan['xchan_photo_date'];
|
||||
|
||||
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'",
|
||||
dbesc($photos[0]),
|
||||
dbesc($photos[1]),
|
||||
dbesc($photos[2]),
|
||||
dbesc($photos[3]),
|
||||
dbesc($photodate),
|
||||
dbesc($xchan['xchan_hash'])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
logger('import step 7');
|
||||
|
||||
@ -1105,21 +1105,28 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
|
||||
// if this is a different page type or it's just a local delete
|
||||
// but not by the item author or owner, do a simple deletion
|
||||
|
||||
|
||||
$complex = false;
|
||||
|
||||
if(intval($i[0]['item_type']) || ($local_delete && (! $can_delete))) {
|
||||
drop_item($i[0]['id']);
|
||||
}
|
||||
else {
|
||||
// complex deletion that needs to propagate and be performed in phases
|
||||
drop_item($i[0]['id'],true,DROPITEM_PHASE1);
|
||||
$r = q("select * from item where id = %d",
|
||||
intval($i[0]['id'])
|
||||
);
|
||||
if($r) {
|
||||
xchan_query($r);
|
||||
$sync_item = fetch_post_tags($r);
|
||||
build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
|
||||
}
|
||||
$complex = true;
|
||||
}
|
||||
|
||||
$r = q("select * from item where id = %d",
|
||||
intval($i[0]['id'])
|
||||
);
|
||||
if($r) {
|
||||
xchan_query($r);
|
||||
$sync_item = fetch_post_tags($r);
|
||||
build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
|
||||
}
|
||||
|
||||
if($complex) {
|
||||
tag_deliver($i[0]['uid'],$i[0]['id']);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@ such as XAMPP and WAMP are not officially supported at this time - however
|
||||
we welcome patches if you manage to get it working.
|
||||
|
||||
Be aware that this software is more than a simple web application. It is a
|
||||
complex communications system which more closely resembles an email server
|
||||
than a web server. For reliability and performance, messages are delivered in
|
||||
the background and are queued for later delivery when sites are down. This
|
||||
kind of functionality requires a bit more of the host system than the typical
|
||||
blog. Not every PHP/MySQL hosting provider will be able to support the
|
||||
Hubzilla. Many will - but please review the requirements and confirm these
|
||||
with your hosting provider prior to installation. (And preferably before
|
||||
entering into a long-term contract.)
|
||||
complex communications and content management system which more closely
|
||||
resembles an email server than a web server. For reliability and performance,
|
||||
messages are delivered in the background and are queued for later delivery
|
||||
when sites are down. This kind of functionality requires a bit more of the
|
||||
host system than the typical blog. Not every PHP/MySQL hosting provider will
|
||||
be able to support Hubzilla. Many will - but please review the requirements
|
||||
and confirm these with your hosting provider prior to installation. (And
|
||||
preferably before entering into a long-term contract.)
|
||||
|
||||
If you encounter installation issues, please let us know via the Github issue
|
||||
tracker where you downloaded the software. Please be as clear as
|
||||
@ -75,27 +75,6 @@ location may prevent some of these services from working correctly. This
|
||||
should not be a problem with Apache, but may be an issue with nginx or other
|
||||
web server platforms.
|
||||
|
||||
**Server Roles**
|
||||
|
||||
During installation you will be asked to choose a server role. Your choices are
|
||||
1. Basic
|
||||
2. Standard
|
||||
3. Pro
|
||||
|
||||
Basic is highly simplified, with almost all the advanced functionality and
|
||||
complexity removed or permanently disabled.
|
||||
|
||||
Standard is typically used for federated network use, when you wish to interact
|
||||
with other networks using other protocols. Not all the built in features and
|
||||
functionality work correctly when other networks are involved. All advanced
|
||||
and complex features are available to all members by default.
|
||||
|
||||
Pro is for sites that wish to make full use of the built-in abilities and
|
||||
features, but **not** to interact with other networks. Advanced features are
|
||||
enabled according to a per-account 'techlevel' which reduces complexity
|
||||
initially and allows members to adjust the software complexity to match their
|
||||
technical abilities.
|
||||
|
||||
**Installation**
|
||||
|
||||
1. Requirements
|
||||
@ -173,7 +152,8 @@ technical abilities.
|
||||
cd mywebsite
|
||||
util/update_addon_repo hzaddons
|
||||
|
||||
- Create searchable representations of the online documentation. You may do this any time
|
||||
- Once the software is configured and the database installed, create searchable
|
||||
representations of the online documentation. You may do this any time
|
||||
that the documentation is updated.
|
||||
|
||||
cd mywebsite
|
||||
|
||||
@ -8,7 +8,8 @@
|
||||
aside_padding_top = parseInt($('aside').css('padding-top'));
|
||||
section_padding_top = parseInt($('section').css('padding-top'));
|
||||
|
||||
$(document).on('click', slideUpCover);
|
||||
$('#cover-photo').on('click', slideUpCover);
|
||||
$('#cover-photo').on('keyup', slideUpCover);
|
||||
|
||||
if($('#cover-photo').length && $(window).width() > 755) {
|
||||
if($(window).scrollTop() < $('#cover-photo').height()) {
|
||||
|
||||
Reference in New Issue
Block a user