aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
commit420aa4bc44a2fdf707b3964582258809f978ea2d (patch)
treec6def258a9311d513d6e1e89918c2ec0d17114f7 /Zotlabs/Module
parent305e0538d293ff4ad72f30b11998ae3b06efa4ea (diff)
parent1e6a491400eaa01aeb2991d4b38e0255499d8b67 (diff)
downloadvolse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.gz
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.bz2
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.zip
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Acl.php3
-rw-r--r--Zotlabs/Module/Admin.php1
-rw-r--r--Zotlabs/Module/Channel.php3
-rw-r--r--Zotlabs/Module/Display.php3
-rw-r--r--Zotlabs/Module/Network.php5
-rw-r--r--Zotlabs/Module/Rpost.php5
-rw-r--r--Zotlabs/Module/Setup.php2
7 files changed, 15 insertions, 7 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 03dc6c5d3..8c62f4de9 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -72,6 +72,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
$permitted = ids_to_array($x,'xchan');
+
}
@@ -249,7 +250,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
if($z) {
foreach($z as $zz) {
- if(in_array($zz['id'],$permitted)) {
+ if(in_array($zz['hash'],$permitted)) {
$r[] = $zz;
}
}
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 085d13fd7..eede5a045 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1341,6 +1341,7 @@ class Admin extends \Zotlabs\Web\Controller {
'$str_minversion' => t('Minimum project version: '),
'$str_maxversion' => t('Maximum project version: '),
'$str_minphpversion' => t('Minimum PHP version: '),
+ '$str_serverroles' => t('Compatible Server Roles: '),
'$str_requires' => t('Requires: '),
'$disabled' => t('Disabled - version incompatibility'),
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 59cb9f06c..be65354a9 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller {
'profile_uid' => \App::$profile['profile_uid'],
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
- 'bbcode' => true
+ 'bbcode' => true,
+ 'jotnets' => true
);
$o .= status_editor($a,$x);
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 35ed0c894..e9441bbdf 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller {
'expanded' => true,
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
- 'bbcode' => true
+ 'bbcode' => true,
+ 'jotnets' => true
);
$o = '<div id="jot-popup">';
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 0128adc2c..50bb05075 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller {
'allow_gid' => $channel['channel_allow_gid'],
'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid']
- );
+ );
$private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false);
@@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller {
'profile_uid' => local_channel(),
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
- 'bbcode' => true
+ 'bbcode' => true,
+ 'jotnets' => true
);
if($deftag)
$x['pretext'] = $deftag;
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index 525f053de..1349cd1c5 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -126,7 +126,10 @@ class Rpost extends \Zotlabs\Web\Controller {
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),
'return_path' => 'rpost/return',
'bbco_autocomplete' => 'bbcode',
- 'bbcode' => true
+ 'editor_autocomplete'=> true,
+ 'bbcode' => true,
+ 'jotnets' => true
+
);
$editor = status_editor($a,$x);
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 4553b6866..cb43b5c20 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -101,7 +101,7 @@ class Setup extends \Zotlabs\Web\Controller {
$timezone = notags(trim($_POST['timezone']));
$adminmail = notags(trim($_POST['adminmail']));
$siteurl = notags(trim($_POST['siteurl']));
- $advanced = ((intval($_POST['advanced'])) ? 'pro' : 'basic');
+ $advanced = ((intval($_POST['advanced'])) ? 'standard' : 'basic');
if($siteurl != z_root()) {
$test = z_fetch_url($siteurl."/setup/testrewrite");