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

more deprecate server_role

Browse Source
This commit is contained in:
zotlabs 2017-05-29 16:25:27 -07:00
parent 4fcfcc8117
commit fd91513832
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Module/Editpost.php
View File

@ -39,6 +39,11 @@ class Editpost extends \Zotlabs\Web\Controller {
return;
}
if($itm[0]['resource_type'] === 'photo' && $itm[0]['resource_id']) {
notice( t('Item is not editable') . EOL);
return;
}
if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
}

8
install/htconfig.sample.php
View File

@ -44,14 +44,6 @@ App::$config['system']['sitename'] = "Hubzilla";
App::$config['system']['location_hash'] = 'if the auto install failed, put a unique random string here';
// Choices are 'basic', 'standard', and 'pro'.
// basic sets up the sevrer for basic social networking and removes "complicated" features
// standard provides most desired features except e-commerce
// pro gives you access to everything, but removes cross-platform federation/emulation
App::$config['system']['server_role'] = 'standard';
// These lines set additional security headers to be sent with all responses
// You may wish to set transport_security_header to 0 if your server already sends
// this header. content_security_policy may need to be disabled if you wish to

5
view/tpl/admin_account_edit.tpl
View File

@ -8,12 +8,7 @@
{{include file="field_password.tpl" field=$pass1}}
{{include file="field_password.tpl" field=$pass2}}
{{if $z_server_role == 'pro'}}
{{include file="field_select.tpl" field=$account_level}}
{{else}}
<input type="hidden" name="account_level" value="{{$account_level.2}}" />
{{/if}}
{{include file="field_select.tpl" field=$account_language}}
{{include file="field_input.tpl" field=$service_class}}

2
view/tpl/settings_account.tpl
View File

@ -12,7 +12,7 @@
{{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}}
{{if $z_server_role == 'pro' && ! $techlock}}
{{if ! $techlock}}
{{include file="field_select.tpl" field=$techlevel}}
{{else}}
<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />