diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-05 13:32:15 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-05 13:32:15 -0800 |
| commit | 7868e476435b7d8d4530dea19686fdae04d5eb68 (patch) | |
| tree | a85077184cc679e6048a33d571f22e4cce6a195a | |
| parent | b4e3cd000f9919ce459d32e21e5ca121338a6c24 (diff) | |
| download | volse-hubzilla-7868e476435b7d8d4530dea19686fdae04d5eb68.tar.gz volse-hubzilla-7868e476435b7d8d4530dea19686fdae04d5eb68.tar.bz2 volse-hubzilla-7868e476435b7d8d4530dea19686fdae04d5eb68.zip | |
more uno groundwork
| -rw-r--r-- | include/features.php | 3 | ||||
| -rw-r--r-- | include/widgets.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 6 | ||||
| -rw-r--r-- | mod/register.php | 4 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/include/features.php b/include/features.php index 4d8d162fa..d6a223089 100644 --- a/include/features.php +++ b/include/features.php @@ -38,6 +38,9 @@ function get_feature_default($feature) { function get_features($filtered = true) { + if(UNO) + return array(); + $arr = array( // General diff --git a/include/widgets.php b/include/widgets.php index 011e3a8d7..8073058c6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -527,7 +527,6 @@ function widget_settings_menu($arr) { 'selected' => '' ); - if($role === false || $role === 'custom') { $tabs[] = array( 'label' => t('Connection Default Permissions'), diff --git a/include/zot.php b/include/zot.php index 0210f3f4a..e9335769e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2868,6 +2868,9 @@ function import_site($arr, $pubkey) { */ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { + if(UNO) + return; + $a = get_app(); logger('build_sync_packet'); @@ -2997,6 +3000,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { */ function process_channel_sync_delivery($sender, $arr, $deliveries) { + if(UNO) + return; + require_once('include/import.php'); /** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */ diff --git a/mod/register.php b/mod/register.php index 853728e10..63f09a9b8 100644 --- a/mod/register.php +++ b/mod/register.php @@ -227,8 +227,8 @@ function register_content(&$a) { $nickname = ((x($_REQUEST,'nickname')) ? strip_tags(trim($_REQUEST['nickname'])) : "" ); $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); - $auto_create = get_config('system','auto_channel_create'); - $default_role = get_config('system','default_permissions_role'); + $auto_create = ((UNO) || (get_config('system','auto_channel_create')) ? true : false); + $default_role = ((UNO) ? 'social' : get_config('system','default_permissions_role')); require_once('include/bbcode.php'); diff --git a/mod/settings.php b/mod/settings.php index c1a4b019d..eea3d9995 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -600,7 +600,7 @@ function settings_content(&$a) { local_channel()); if (!count($r)){ - notice(t("You can't edit this application.")); + notice(t('Application not found.')); return; } $app = $r[0]; |