From 438ce44af9e66153af2ab1719c2372165143aff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sat, 9 Jun 2018 13:41:13 +0200 Subject: Update symbolic link doc/es --- doc/es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/es b/doc/es index c8ba7666b..a170c77bc 120000 --- a/doc/es +++ b/doc/es @@ -1 +1 @@ -es-es \ No newline at end of file +doc/es-es \ No newline at end of file -- cgit v1.2.3 From d0f7b1d9b79a5a96314d5c6caa011f7050cec2f9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 10 Jun 2018 17:04:34 +0200 Subject: fix issue #1221 --- Zotlabs/Lib/Share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php index e9e4d23c4..d3ecbf7fa 100644 --- a/Zotlabs/Lib/Share.php +++ b/Zotlabs/Lib/Share.php @@ -107,7 +107,7 @@ class Share { } public function bbcode() { - $bb = NULL_STR; + $bb = EMPTY_STR; if(! $this->item) return $bb; @@ -140,4 +140,4 @@ class Share { } -} \ No newline at end of file +} -- cgit v1.2.3 From 6959c9e42350b7d19402bef24bb4fd366af22ed4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 10 Jun 2018 15:27:55 -0700 Subject: fixes for immediate expire, channel_active not initialised in DB --- include/channel.php | 1 + include/items.php | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/channel.php b/include/channel.php index 1a62dcd3c..d26056171 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2359,6 +2359,7 @@ function channel_store_lowlevel($arr) { 'channel_dirdate' => ((array_key_exists('channel_dirdate',$arr)) ? $arr['channel_dirdate'] : NULL_DATE), 'channel_lastpost' => ((array_key_exists('channel_lastpost',$arr)) ? $arr['channel_lastpost'] : NULL_DATE), 'channel_deleted' => ((array_key_exists('channel_deleted',$arr)) ? $arr['channel_deleted'] : NULL_DATE), + 'channel_active' => ((array_key_exists('channel_active',$arr)) ? $arr['channel_active'] : NULL_DATE), 'channel_max_anon_mail' => ((array_key_exists('channel_max_anon_mail',$arr)) ? $arr['channel_max_anon_mail'] : '10'), 'channel_max_friend_req' => ((array_key_exists('channel_max_friend_req',$arr)) ? $arr['channel_max_friend_req'] : '10'), 'channel_expire_days' => ((array_key_exists('channel_expire_days',$arr)) ? $arr['channel_expire_days'] : '0'), diff --git a/include/items.php b/include/items.php index e75a9659d..54df5d322 100755 --- a/include/items.php +++ b/include/items.php @@ -3697,10 +3697,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { ); } else { - $r = q("UPDATE item SET item_deleted = 1, body = '', title = '', - changed = '%s', edited = '%s' WHERE id = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), + $r = q("DELETE FROM item WHERE id = %d", intval($item['id']) ); } -- cgit v1.2.3 From 912ccb31a133c09b28890f0bab5be5ce1f7f95d4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 10 Jun 2018 19:26:35 -0700 Subject: hubzilla core issue #1218 --- include/menu.php | 5 +++++ view/tpl/usermenu.tpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/menu.php b/include/menu.php index 4add78c39..1a2059451 100644 --- a/include/menu.php +++ b/include/menu.php @@ -81,6 +81,10 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { if ((! $channel_id) && (local_channel())) $channel_id = local_channel(); + $chan = channelx_by_n($channel_id); + if(! $chan) + return ''; + $menu_list = menu_list($channel_id); $menu_names = array(); @@ -110,6 +114,7 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { $ret = replace_macros(get_markup_template('usermenu.tpl'),array( '$menu' => $menu['menu'], '$class' => $class, + '$nick' => $chan['channel_address'], '$edit' => (($edit) ? t("Edit") : ''), '$id' => $menu['menu']['menu_id'], '$items' => $menu['items'], diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index c51728c34..8bbfedd07 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -2,7 +2,7 @@
{{/if}} {{if $menu.menu_desc}} -

{{$menu.menu_desc}}{{if $edit}} {{/if}}

+

{{$menu.menu_desc}}{{if $edit}} {{/if}}

{{/if}} {{if $items}}
    -- cgit v1.2.3 From b361fb4f89ff60bbe32c7aa41dca5caf895ab54c Mon Sep 17 00:00:00 2001 From: Herbert Thielen Date: Mon, 11 Jun 2018 15:54:22 +0200 Subject: fix links to addons repository --- doc/addons.bb | 2 +- doc/admin/administrator_guide.md | 2 +- doc/ca/general.bb | 2 +- doc/de/general.bb | 2 +- doc/dev_beginner.bb | 6 +++--- doc/general.bb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/addons.bb b/doc/addons.bb index a37ecee99..4bfa7a9fd 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -106,7 +106,7 @@ For these reasons we [b]strongly recommend[/b] that you do NOT install addons fr We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. -[url=https://framagit.org/hubzilla/core/-addons]https://framagit.org/hubzilla/core/-addons[/url] Main project addon repository +[url=https://framagit.org/hubzilla/addons]https://framagit.org/hubzilla/addons[/url] Main project addon repository [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index e966115d0..34dfa8cad 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -396,7 +396,7 @@ To immediately clear out all the extra logging stuff you added. Use the informa ##### Rotating log files -1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/core/-addons) repo +1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/addons) repo 1. Create a directory in your web root called `log` with webserver write permissions 1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files. diff --git a/doc/ca/general.bb b/doc/ca/general.bb index 3e46b6136..fb54f0abc 100644 --- a/doc/ca/general.bb +++ b/doc/ca/general.bb @@ -7,7 +7,7 @@ [url=https://framagit.org/hubzilla/core/]Lloc Web Principal[/url] -[url=https://framagit.org/hubzilla/core/-addons]Complements del Lloc Web[/url] +[url=https://framagit.org/hubzilla/addons]Complements del Lloc Web[/url] [url=[baseurl]/help/credits]Credits en $Projectname[/url] diff --git a/doc/de/general.bb b/doc/de/general.bb index 3168c4d9b..2ce5533f1 100644 --- a/doc/de/general.bb +++ b/doc/de/general.bb @@ -6,7 +6,7 @@ [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl] [url=https://framagit.org/hubzilla/core/]Haupt-Website[/url] -[url=https://framagit.org/hubzilla/core/-addons]Addons-Website[/url] +[url=https://framagit.org/hubzilla/addons]Addons-Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb index d07b20574..3e98c6ec3 100644 --- a/doc/dev_beginner.bb +++ b/doc/dev_beginner.bb @@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co Now you should [list] [*] create an account at github.com -[*] fork https://framagit.org/hubzilla/core/ -[*] fork https://framagit.org/hubzilla/core/-addons +[*] fork https://framagit.org/hubzilla/core +[*] fork https://framagit.org/hubzilla/addons [/list] If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". @@ -416,4 +416,4 @@ surfer@debian:/var/www$ git push [/code] -#include doc/macros/main_footer.bb; \ No newline at end of file +#include doc/macros/main_footer.bb; diff --git a/doc/general.bb b/doc/general.bb index ecdaf1dfd..0b80db756 100644 --- a/doc/general.bb +++ b/doc/general.bb @@ -7,7 +7,7 @@ [h3]External resources[/h3] [zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl] [url=https://framagit.org/hubzilla/core/]Main Website[/url] -[url=https://framagit.org/hubzilla/core/-addons]Addon Website[/url] +[url=https://framagit.org/hubzilla/addons]Addon Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] [h3]About this $Projectname hub[/h3] [zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] -- cgit v1.2.3 From 254a6be277e8536ae101faa429805fcbd6382d61 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 16:25:50 -0700 Subject: null db fields in mod_invite --- Zotlabs/Module/Invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 0bcd1c1fa..4722a7ee5 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -113,7 +113,7 @@ class Invite extends \Zotlabs\Web\Controller { $invite_code = autoname(8) . rand(1000,9999); $nmessage = str_replace('$invite_code',$invite_code,$message); - $r = q("INSERT INTO register (hash,created) VALUES ('%s', '%s') ", + $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s','','','') ", dbesc($invite_code), dbesc(datetime_convert()) ); -- cgit v1.2.3 From 65cbc7c2bba523a2663a89fae29b5cef162fd0a1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 16:37:16 -0700 Subject: uid is integer --- Zotlabs/Module/Invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 4722a7ee5..359f99b3e 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -113,7 +113,7 @@ class Invite extends \Zotlabs\Web\Controller { $invite_code = autoname(8) . rand(1000,9999); $nmessage = str_replace('$invite_code',$invite_code,$message); - $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s','','','') ", + $r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ", dbesc($invite_code), dbesc(datetime_convert()) ); -- cgit v1.2.3 From 10491294d8ed78af565aef690d80c99e9adb4d0b Mon Sep 17 00:00:00 2001 From: gia vec Date: Wed, 13 Jun 2018 03:53:55 +0200 Subject: Update hubzilla-setup.sh (cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5) --- .homeinstall/hubzilla-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index a38e36b73..ff101086c 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -572,7 +572,7 @@ function check_https { function install_hubzilla { print_info "installing hubzilla addons..." cd /var/www/html/ - util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons mkdir -p "store/[data]/smarty3" chmod -R 777 store touch .htconfig.php -- cgit v1.2.3 From 77ba647778bcface5230110fe72f73fc54527bdd Mon Sep 17 00:00:00 2001 From: gia vec Date: Wed, 13 Jun 2018 03:45:48 +0200 Subject: Update README.md (cherry picked from commit 7d73543b84507b74c8058da7dd062d7949c34d61) --- .homeinstall/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.homeinstall/README.md b/.homeinstall/README.md index 7870e65dd..aeecb9184 100644 --- a/.homeinstall/README.md +++ b/.homeinstall/README.md @@ -164,7 +164,7 @@ Make the directory for apache and change diretory to it Clone hubzilla from git ("git pull" will update it later) - git clone https://github.com/redmatrix/hubzilla html + git clone https://framagit.org/hubzilla/core html Change to the install script -- cgit v1.2.3 From b5e4a5f51c478d646248c5a9eb22907cda32dd3e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 20:27:10 -0700 Subject: SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. --- Zotlabs/Module/Admin/Security.php | 5 +++++ Zotlabs/Module/Cloud.php | 9 +++++++++ view/tpl/admin_security.tpl | 1 + 3 files changed, 15 insertions(+) diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 49e1ccf42..249fda469 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -16,6 +16,10 @@ class Security { $block_public = ((x($_POST,'block_public')) ? True : False); set_config('system','block_public',$block_public); + + $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); + set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); + $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); set_config('system','whitelisted_sites',$ws); @@ -87,6 +91,7 @@ class Security { '$page' => t('Security'), '$form_security_token' => get_form_security_token('admin_security'), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 34397d275..1b330ecba 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -35,11 +35,20 @@ class Cloud extends \Zotlabs\Web\Controller { if (argc() > 1) $which = argv(1); + + if (argc() < 2 && intval(get_config('system','cloud_disable_siteroot'))) { + notice( t('Permission denied.') . EOL); + construct_page(); + killme(); + } + $profile = 0; if ($which) profile_load( $which, $profile); + + $auth = new \Zotlabs\Storage\BasicAuth(); $ob_hash = get_observer_hash(); diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 409e9fc7d..121758e63 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -7,6 +7,7 @@ {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$cloud_noroot}} {{include file="field_checkbox.tpl" field=$transport_security}} {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} -- cgit v1.2.3 From 8da0f9d3569e7c19e5581c4d402931a07dcab317 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 13 Jun 2018 21:06:56 -0700 Subject: optionally report total available space when uploading --- Zotlabs/Module/Admin/Security.php | 5 ++++- Zotlabs/Storage/Browser.php | 4 ++++ view/tpl/admin_security.tpl | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 249fda469..80c1d85b7 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -20,7 +20,9 @@ class Security { $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); - + $cloud_disksize = ((x($_POST,'cloud_disksize')) ? 1 : 0); + set_config('system','cloud_report_disksize',$cloud_disksize); + $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); set_config('system','whitelisted_sites',$ws); @@ -92,6 +94,7 @@ class Security { '$form_security_token' => get_form_security_token('admin_security'), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], + '$cloud_disksize' => [ 'cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system','cloud_report_disksize')), '' ], '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 153016da6..67d934783 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -347,6 +347,10 @@ class Browser extends DAV\Browser\Plugin { // Storage and quota for the account (all channels of the owner of this directory)! $limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit')); + if((! $limit) && get_config('system','cloud_report_disksize')) { + $limit = engr_units_to_bytes(disk_free_space('store')); + } + $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d", intval($this->auth->channel_account_id) ); diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 121758e63..493707a7a 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -8,6 +8,7 @@ {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$cloud_noroot}} + {{include file="field_checkbox.tpl" field=$cloud_disksize}} {{include file="field_checkbox.tpl" field=$transport_security}} {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} -- cgit v1.2.3 From 7a144b90fb9174eb50e5d53d2f62d6d8d2671353 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Jun 2018 20:40:25 -0700 Subject: re-implement/refactor getQuotaInfo() on DAV storage --- Zotlabs/Module/Home.php | 2 +- Zotlabs/Storage/Browser.php | 6 ++-- Zotlabs/Storage/Directory.php | 77 ++++++++++++++++++++++++------------------- include/language.php | 2 +- 4 files changed, 50 insertions(+), 37 deletions(-) diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 4b3e596a9..647a6412a 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -9,7 +9,7 @@ require_once('include/conversation.php'); class Home extends \Zotlabs\Web\Controller { function init() { - + $ret = array(); call_hooks('home_init',$ret); diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 67d934783..c2d70b854 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -333,6 +333,7 @@ class Browser extends DAV\Browser\Plugin { $aclselect = null; $lockstate = ''; + $limit = 0; if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); @@ -343,10 +344,11 @@ class Browser extends DAV\Browser\Plugin { $aclselect = ((local_channel() == $this->auth->owner_id) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : ''); } + + // Storage and quota for the account (all channels of the owner of this directory)! + $limit = engr_units_to_bytes(service_class_fetch($this->auth->owner_id, 'attach_upload_limit')); } - // Storage and quota for the account (all channels of the owner of this directory)! - $limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit')); if((! $limit) && get_config('system','cloud_report_disksize')) { $limit = engr_units_to_bytes(disk_free_space('store')); } diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index f46e2e666..73548fda0 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -571,39 +571,6 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo return datetime_convert('UTC', 'UTC', $r[0]['edited'], 'U'); } - /** - * @brief Return quota usage. - * - * @fixme Should guests relly see the used/free values from filesystem of the - * complete store directory? - * - * @return array with used and free values in bytes. - */ - public function getQuotaInfo() { - // values from the filesystem of the complete store/ directory - $limit = disk_total_space('store'); - $free = disk_free_space('store'); - - if ($this->auth->owner_id) { - $c = q("select * from channel where channel_id = %d and channel_removed = 0 limit 1", - intval($this->auth->owner_id) - ); - - $ulimit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit')); - $limit = (($ulimit) ? $ulimit : $limit); - - $x = q("select sum(filesize) as total from attach where aid = %d", - intval($c[0]['channel_account_id']) - ); - $free = (($x) ? $limit - $x[0]['total'] : 0); - } - - return array( - $limit - $free, - $free - ); - } - /** * @brief Array with all Directory and File DAV\\Node items for the given path. @@ -895,4 +862,48 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo return false; } + public function getQuotaInfo() { + + /** + * Returns the quota information + * + * This method MUST return an array with 2 values, the first being the total used space, + * the second the available space (in bytes) + */ + + $used = 0; + $limit = 0; + $free = 0; + + if ($this->auth->owner_id) { + $channel = channelx_by_n($this->auth->owner_id); + if($channel) { + $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d", + intval($channel['channel_account_id']) + ); + $used = (($r) ? (float) $r[0]['total'] : 0); + $limit = (float) service_class_fetch($this->auth->owner_id, 'attach_upload_limit'); + if($limit) { + // Don't let the result go negative + $free = (($limit > $used) ? $limit - $used : 0); + } + } + } + + if(! $limit) { + $free = disk_free_space('store'); + $used = disk_total_space('store') - $free; + } + + // prevent integer overflow on 32-bit systems + + if($used > (float) PHP_INT_MAX) + $used = PHP_INT_MAX; + if($free > (float) PHP_INT_MAX) + $free = PHP_INT_MAX; + + return [ (int) $used, (int) $free ]; + + } + } diff --git a/include/language.php b/include/language.php index d0ecd3a85..69a7e3004 100644 --- a/include/language.php +++ b/include/language.php @@ -242,7 +242,7 @@ function tt($singular, $plural, $count, $ctx = ''){ if (! function_exists($f)) $f = 'string_plural_select_default'; - $k = $f($count); + $k = $f(intval($count)); return is_array($t) ? $t[$k] : $t; } -- cgit v1.2.3 From 967d4da30a4d3d39a2bedddf2ac476a96707bc45 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Jun 2018 22:46:20 -0700 Subject: wiki: word-wrap code on any character --- view/css/mod_wiki.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index 998b932db..7e47dca21 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -55,6 +55,7 @@ pre code { padding: 1em 1.5em; display: block; white-space: pre-wrap; + word-break: break-all; } code { @@ -64,6 +65,7 @@ code { display: inline; padding: 0.2em 0.2em; white-space: pre-wrap; + word-break: break-all; } #wiki-content-container code { -- cgit v1.2.3 From 2f3c3db02062fa867cb9b39ffcf11f646a9b80bb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 15 Jun 2018 02:02:03 -0700 Subject: hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes --- Zotlabs/Module/Network.php | 10 ++++++---- view/tpl/build_query.tpl | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2e9bcd2ce..a01425188 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -123,8 +123,8 @@ class Network extends \Zotlabs\Web\Controller { $def_acl = array('allow_gid' => '<' . $r[0]['hash'] . '>'); } - $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0); - $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99); + $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1)); + $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1)); $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); @@ -140,6 +140,7 @@ class Network extends \Zotlabs\Web\Controller { $deftag = ''; + if(x($_GET,'search') || $file || (!$pf && $cid)) $nouveau = true; @@ -420,8 +421,9 @@ class Network extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } - - if(($cmin != 0) || ($cmax != 99)) { + // cmin and cmax are both -1 when the affinity tool is disabled + + if(($cmin != (-1)) || ($cmax != (-1))) { // Not everybody who shows up in the network stream will be in your address book. // By default those that aren't are assumed to have closeness = 99; but this isn't diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 754d5997c..2c55a8140 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -36,8 +36,8 @@ var udargs = ((page_load) ? "/load" : ""); var bCmd = bParam_cmd + udargs + "?f=" ; if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid; - if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin; - if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax; + if(bParam_cmin != (-1)) bCmd = bCmd + "&cmin=" + bParam_cmin; + if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax; if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; } if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; } -- cgit v1.2.3 From 7e736c5359732647f5203bf2bb7fcd50c448fad9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 15 Jun 2018 15:21:19 -0700 Subject: apply changes to slider defaults across all modules that use buildQuery for updates --- Zotlabs/Module/Channel.php | 4 ++-- Zotlabs/Module/Display.php | 4 ++-- Zotlabs/Module/Network.php | 4 ++-- Zotlabs/Module/Pubstream.php | 4 ++-- Zotlabs/Module/Search.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 80e81580a..b5e6b3aee 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -344,8 +344,8 @@ class Channel extends \Zotlabs\Web\Controller { '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index a127ab196..fe0408c6f 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -213,8 +213,8 @@ class Display extends \Zotlabs\Web\Controller { '$uid' => '0', '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '99', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index a01425188..172157aab 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -335,8 +335,8 @@ class Network extends \Zotlabs\Web\Controller { '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => (($gid) ? $gid : '0'), '$cid' => (($cid) ? $cid : '0'), - '$cmin' => (($cmin) ? $cmin : '0'), - '$cmax' => (($cmax) ? $cmax : '0'), + '$cmin' => (($cmin) ? $cmin : '(-1)'), + '$cmax' => (($cmax) ? $cmax : '(-1)'), '$star' => (($star) ? $star : '0'), '$liked' => (($liked) ? $liked : '0'), '$conv' => (($conv) ? $conv : '0'), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index f0e87f468..7b80a3978 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -118,8 +118,8 @@ class Pubstream extends \Zotlabs\Web\Controller { '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '99', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 3a552bb22..e520c671d 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -121,8 +121,8 @@ class Search extends \Zotlabs\Web\Controller { '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'), '$gid' => '0', '$cid' => '0', - '$cmin' => '0', - '$cmax' => '0', + '$cmin' => '(-1)', + '$cmax' => '(-1)', '$star' => '0', '$liked' => '0', '$conv' => '0', -- cgit v1.2.3