diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-29 16:25:27 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-29 16:25:27 -0700 |
| commit | fd915138322b920036a2a21c56fdfb6a56749303 (patch) | |
| tree | 4a2db27ad854ed0751e2db9e9afd56310537361a | |
| parent | 4fcfcc81172ebdfa4a27d3bca94bffe97356f600 (diff) | |
| download | volse-hubzilla-fd915138322b920036a2a21c56fdfb6a56749303.tar.gz volse-hubzilla-fd915138322b920036a2a21c56fdfb6a56749303.tar.bz2 volse-hubzilla-fd915138322b920036a2a21c56fdfb6a56749303.zip | |
more deprecate server_role
| -rw-r--r-- | Zotlabs/Module/Editpost.php | 5 | ||||
| -rwxr-xr-x | install/htconfig.sample.php | 8 | ||||
| -rw-r--r-- | view/tpl/admin_account_edit.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/settings_account.tpl | 2 |
4 files changed, 6 insertions, 14 deletions
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 629bdd3fd..a54c42e7f 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -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'); } diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index f37b3dc79..07725e3f4 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -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 diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl index 82d137de4..239d9084a 100644 --- a/view/tpl/admin_account_edit.tpl +++ b/view/tpl/admin_account_edit.tpl @@ -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}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index b7fdfb9a9..dd1d0d0c9 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -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}}" /> |