diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/_well_known.php | 15 | ||||
| -rw-r--r-- | mod/import.php | 2 | ||||
| -rw-r--r-- | mod/register.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/mod/_well_known.php b/mod/_well_known.php index 47cfe1512..46714deaa 100644 --- a/mod/_well_known.php +++ b/mod/_well_known.php @@ -49,19 +49,12 @@ function _well_known_init(&$a){ break;
default:
- // look in $WEBROOT/well_known for the requested file in case it is
- // something a site requires and for which we do not have a module
-
- // @fixme - we may need to determine the content-type and stick it in the header
- // for now this can be done with a php script masquerading as the requested file
-
- $wk_file = str_replace('.well-known','well_known',$a->cmd);
- if(file_exists($wk_file)) {
- echo file_get_contents($wk_file);
+ if(file_exists($a->cmd)) {
+ echo file_get_contents($a->cmd);
killme();
}
- elseif(file_exists($wk_file . '.php'))
- require_once($wk_file . '.php');
+ elseif(file_exists($a->cmd . '.php'))
+ require_once($a->cmd . '.php');
break;
}
diff --git a/mod/import.php b/mod/import.php index 1a2c87a63..0bbd38ffe 100644 --- a/mod/import.php +++ b/mod/import.php @@ -120,7 +120,7 @@ function import_account(&$a, $account_id) { notice($t); } if(array_key_exists('server_role',$data['compatibility']) - && $data['compatibility']['server_role'] != UNO) { + && $data['compatibility']['server_role'] != get_server_role()) { notice( t('Server platform is not compatible. Operation not permitted.') . EOL); return; } diff --git a/mod/register.php b/mod/register.php index 63f09a9b8..49b010cc7 100644 --- a/mod/register.php +++ b/mod/register.php @@ -146,7 +146,7 @@ function register_post(&$a) { $new_channel = false; - if(get_config('system','auto_channel_create')) { + if(get_config('system','auto_channel_create') || UNO) { $new_channel = auto_channel_create($result['account']['account_id']); if($new_channel['success']) { $channel_id = $new_channel['channel']['channel_id']; diff --git a/mod/settings.php b/mod/settings.php index eea3d9995..3ca2d1218 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1013,6 +1013,7 @@ function settings_content(&$a) { $permissions_role = 'custom'; $permissions_set = (($permissions_role != 'custom') ? true : false); + $vnotify = get_pconfig(local_channel(),'system','vnotify'); $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); if($vnotify === false) @@ -1037,6 +1038,7 @@ function settings_content(&$a) { '$h_prv' => t('Security and Privacy Settings'), '$permissions_set' => $permissions_set, + '$server_role' => get_server_role(), '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), |