summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-09-07 13:09:29 +0200
committerAleksander Machniak <machniak@kolabsys.com>2012-09-07 13:09:29 +0200
commitf2a2fd1a19f9ebdbab2cb402d37a1f77c34c27ef (patch)
treeb0e4dc6e3eda41aea3639ed4cc9ac7373df1e13f
parent8d2de93f536edf239cfa42e7a1250fd1c69a3fbb (diff)
parentee7ed1f5b7790afefbf577894e61755f84d805a9 (diff)
downloadwebadmin-f2a2fd1a19f9ebdbab2cb402d37a1f77c34c27ef.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap
-rw-r--r--doc/kolab_hosting-3.0.0.sql145
-rw-r--r--doc/kolab_hosting-3.0.1.sql8
-rw-r--r--lib/client/kolab_client_task_resource.php4
-rw-r--r--lib/client/kolab_client_task_role.php8
-rw-r--r--lib/hosted/kolab_client_task_signup.php10
-rw-r--r--lib/kolab_client_task.php53
6 files changed, 52 insertions, 176 deletions
diff --git a/doc/kolab_hosting-3.0.0.sql b/doc/kolab_hosting-3.0.0.sql
deleted file mode 100644
index 3ca5120..0000000
--- a/doc/kolab_hosting-3.0.0.sql
+++ /dev/null
@@ -1,145 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 3.5.1
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Jun 21, 2012 at 12:14 PM
--- Server version: 5.5.13
--- PHP Version: 5.3.10
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: `kolab`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `group_types`
---
-
-CREATE TABLE IF NOT EXISTS `group_types` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `key` text NOT NULL,
- `name` varchar(256) NOT NULL,
- `description` text NOT NULL,
- `attributes` longtext NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
-
---
--- Dumping data for table `group_types`
---
-
-INSERT INTO `group_types` (`id`, `key`, `name`, `description`, `attributes`) VALUES
-(1, 'kolab', 'Kolab Distribution Group', 'A Kolab Distribution Group (with mail address)', '{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}'),
-(2, 'posix', '(Pure) POSIX Group', 'A pure UNIX POSIX Group', '{"auto_form_fields":{"gidnumber":[]},"fields":{"objectclass":["top","groupofuniquenames","posixgroup"]},"form_fields":{"cn":[],"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}'),
-(3, 'posix_mail', 'Mail-enabled POSIX Group', 'A Kolab and also UNIX POSIX Group', '{"auto_form_fields":{"gidnumber":[],"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames","posixgroup"]},"form_fields":{"cn":[],"mail":{"optional":true},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `options`
---
-
-CREATE TABLE IF NOT EXISTS `options` (
- `attribute` varchar(128) NOT NULL,
- `option_values` text NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `options`
---
-
-INSERT INTO `options` (`attribute`, `option_values`) VALUES
-('preferredlanguage', '["aa_DJ","aa_ER","aa_ET","af_ZA","am_ET","an_ES","ar_AE","ar_BH","ar_DZ","ar_EG","ar_IN","ar_IQ","ar_JO","ar_KW","ar_LB","ar_LY","ar_MA","ar_OM","ar_QA","ar_SA","ar_SD","ar_SY","ar_TN","ar_YE","as_IN","az_AZ","be_BY","bg_BG","bn_BD","bn_IN","bokmal","br_FR","bs_BA","byn_ER","C","ca_AD","ca_ES","ca_FR","ca_IT","catalan","croatian","csb_PL","cs_CZ","cy_GB","czech","da_DK","danish","dansk","de_AT","de_BE","de_CH","de_DE","de_LU","deutsch","dutch","dz_BT","eesti","el_CY","el_GR","en_AU","en_BW","en_CA","en_DK","en_GB","en_HK","en_IE","en_IN","en_NZ","en_PH","en_SG","en_US","en_ZA","en_ZW","es_AR","es_BO","es_CL","es_CO","es_CR","es_DO","es_EC","es_ES","es_GT","es_HN","es_MX","es_NI","es_PA","es_PE","es_PR","es_PY","es_SV","estonian","es_US","es_UY","es_VE","et_EE","eu_ES","fa_IR","fi_FI","finnish","fo_FO","fr_BE","fr_CA","fr_CH","french","fr_FR","fr_LU","fy_NL","ga_IE","galego","galician","gd_GB","german","gez_ER","gez_ET","gl_ES","greek","gu_IN","gv_GB","hebrew","he_IL","hi_IN","hr_HR","hrvatski","hsb_DE","hu_HU","hungarian","hy_AM","icelandic","id_ID","is_IS","italian","it_CH","it_IT","iw_IL","ja_JP","japanese","ka_GE","kk_KZ","kl_GL","km_KH","kn_IN","ko_KR","korean","ku_TR","kw_GB","ky_KG","lg_UG","lithuanian","lo_LA","lt_LT","lv_LV","mai_IN","mg_MG","mi_NZ","mk_MK","ml_IN","mn_MN","mr_IN","ms_MY","mt_MT","nb_NO","ne_NP","nl_BE","nl_NL","nn_NO","no_NO","norwegian","nr_ZA","nso_ZA","nynorsk","oc_FR","om_ET","om_KE","or_IN","pa_IN","pa_PK","pl_PL","polish","portuguese","POSIX","pt_BR","pt_PT","romanian","ro_RO","ru_RU","russian","ru_UA","rw_RW","se_NO","sid_ET","si_LK","sk_SK","slovak","slovene","slovenian","sl_SI","so_DJ","so_ET","so_KE","so_SO","spanish","sq_AL","sr_CS","sr_ME","sr_RS","ss_ZA","st_ZA","sv_FI","sv_SE","swedish","ta_IN","te_IN","tg_TJ","thai","th_TH","ti_ER","ti_ET","tig_ER","tl_PH","tn_ZA","tr_CY","tr_TR","ts_ZA","tt_RU","turkish","uk_UA","ur_PK","uz_UZ","ve_ZA","vi_VN","wa_BE","xh_ZA","yi_US","zh_CN","zh_HK","zh_SG","zh_TW","zu_ZA"]'),
-('c', '["AD","AE","AF","AG","AI","AL","AM","AO","AQ","AR","AS","AT","AU","AW","AX","AZ","BA","BB","BD","BE","BF","BG","BH","BI","BJ","BL","BM","BN","BO","BQ","BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD","CF","CG","CH","CI","CK","CL","CM","CN","CO","CR","CU","CV","CW","CX","CY","CZ","DE","DJ","DK","DM","DO","DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ","FK","FM","FO","FR","GA","GB","GD","GE","GF","GG","GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT","GU","GW","GY","HK","HM","HN","HR","HT","HU","ID","IE","IL","IM","IN","IO","IQ","IR","IS","IT","JE","JM","JO","JP","KE","KG","KH","KI","KM","KN","KP","KR","KW","KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT","LU","LV","LY","MA","MC","MD","ME","MG","MH","MK","ML","MM","MN","MO","MP","MQ","MR","MS","MT","MT","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF","PG","PH","PK","PL","PM","PN","PR","PS","PT","PW","PY","QA","RE","RO","RS","RU","RW","SA","SB","SC","SD","SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO","SR","SS","ST","SV","SX","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TR","TT","TV","TW","TZ","UA","UG","UM","US","UY","UZ","VA","VA","VC","VE","VG","VI","VN","VU","WF","WS","YE","YT","YU","ZA","ZM","ZW"]');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `resource_types`
---
-
-CREATE TABLE IF NOT EXISTS `resource_types` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `key` text NOT NULL,
- `name` varchar(256) NOT NULL,
- `description` text NOT NULL,
- `attributes` longtext NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
-
---
--- Dumping data for table `resource_types`
---
-
-INSERT INTO `resource_types` (`id`, `key`, `name`, `description`, `attributes`) VALUES
-(1, 'collection', 'Resource Collection', 'A collection or pool of resources', '{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}'),
-(2, 'car', 'Car', 'A car', '{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"cn":[]}}'),
-(3, 'confroom', 'Conference Room', 'A conference room', '{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"cn":[]}}'),
-(4, 'beamer', 'Beamer', 'A portable beamer', '{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"cn":[]}}'),
-(5, 'footballtickets', 'Football Season Tickets', 'Season tickets to the game (pretty good seats too!)', '{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"cn":[]}}');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `role_types`
---
-
-CREATE TABLE IF NOT EXISTS `role_types` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `key` text NOT NULL,
- `name` varchar(256) NOT NULL,
- `description` text NOT NULL,
- `attributes` longtext NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `role_types`
---
-
-INSERT INTO `role_types` (`id`, `key`, `name`, `description`, `attributes`) VALUES
-(1, 'simple_managed', 'Standard Role', 'A standard role definition', '{"auto_form_fields":[],"fields":{"objectclass":["top","ldapsubentry","nsroledefinition","nssimpleroledefinition","nsmanagedroledefinition"]},"form_fields":{"cn":[],"description":[]}}');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `user_types`
---
-
-CREATE TABLE IF NOT EXISTS `user_types` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `key` text NOT NULL,
- `name` varchar(256) NOT NULL,
- `description` text NOT NULL,
- `attributes` longtext NOT NULL,
- `used_for` varchar(16),
- PRIMARY KEY (`id`),
- UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
-
---
--- Dumping data for table `user_types`
---
-
-INSERT INTO `user_types` (`id`, `key`, `name`, `description`, `attributes`, `used_for`) VALUES
-(1, 'personal', 'Personal', 'A user with a personal hosted plan', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"mail":{"data":["uid"]}},"form_fields":{"givenname":[],"mailalternateaddress":{"optional":true},"sn":[],"uid":[],"userpassword":{"type":"password"}},"fields":{"mailquota":"131072","nsroledn":"cn=personal-user,dc=notifytest,dc=tld","objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', 'hosted'),
-(2, 'professional', 'Professional', 'A user with a professional hosted plan', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"mail":{"data":["uid"]}},"form_fields":{"alias":{"type":"list","optional":true,"maxcount":2},"givenname":[],"mailalternateaddress":{"optional":true},"sn":[],"uid":[],"userpassword":{"type":"password"}},"fields":{"mailquota":"1048576","nsroledn":"cn=professional-user,dc=notifytest,dc=tld","objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', 'hosted'),
-(3, 'test', 'Test User', 'A user with no hosted plan', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"mail":{"data":["uid"]}},"form_fields":{"alias":{"type":"list","optional":true,"maxcount":2},"givenname":[],"mailalternateaddress":{"optional":true},"sn":[],"uid":[],"userpassword":{"type":"password"}},"fields":{"mailquota":"1048576","nsroledn":"cn=professional-user,dc=notifytest,dc=tld","objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', NULL);
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/doc/kolab_hosting-3.0.1.sql b/doc/kolab_hosting-3.0.1.sql
new file mode 100644
index 0000000..cc64e88
--- /dev/null
+++ b/doc/kolab_hosting-3.0.1.sql
@@ -0,0 +1,8 @@
+--
+-- Dumping data for table `user_types`
+--
+
+INSERT INTO `user_types` (`key`, `name`, `description`, `attributes`, `used_for`) VALUES
+('personal', 'Hosted Personal', 'A user with a personal hosted plan', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"mail":{"data":["uid"]}},"form_fields":{"givenname":[],"mailalternateaddress":{"optional":true},"sn":[],"uid":[],"userpassword":{"type":"password"}},"fields":{"mailquota":"131072","nsroledn":"cn=personal-user,%(base_dn)s","objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', 'hosted'),
+('professional', 'Hosted Professional', 'A user with a professional hosted plan', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"mail":{"data":["uid"]}},"form_fields":{"alias":{"type":"list","optional":true,"maxcount":2},"givenname":[],"mailalternateaddress":{"optional":true},"sn":[],"uid":[],"userpassword":{"type":"password"}},"fields":{"mailquota":"1048576","nsroledn":"cn=professional-user,%(base_dn)s","objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', 'hosted');
+
diff --git a/lib/client/kolab_client_task_resource.php b/lib/client/kolab_client_task_resource.php
index 2d8f099..ace2929 100644
--- a/lib/client/kolab_client_task_resource.php
+++ b/lib/client/kolab_client_task_resource.php
@@ -337,14 +337,14 @@ class kolab_client_task_resource extends kolab_client_task
*/
public function resource_types()
{
- if (isset($_SESSION['resource_types'])) {
+ if (isset($_SESSION['resource_types']) && !$this->devel_mode) {
return $_SESSION['resource_types'];
}
$result = $this->api->post('resource_types.list');
$list = $result->get('list');
- if (is_array($list) && !$this->config_get('devel_mode')) {
+ if (is_array($list) && !$this->devel_mode) {
$_SESSION['resource_types'] = $list;
}
diff --git a/lib/client/kolab_client_task_role.php b/lib/client/kolab_client_task_role.php
index e460a95..b625f73 100644
--- a/lib/client/kolab_client_task_role.php
+++ b/lib/client/kolab_client_task_role.php
@@ -294,16 +294,14 @@ class kolab_client_task_role extends kolab_client_task
*/
public function role_types()
{
- if (!$this->config_get('devel_mode', false)) {
- if (isset($_SESSION['role_types'])) {
- return $_SESSION['role_types'];
- }
+ if (isset($_SESSION['role_types']) && !$this->devel_mode) {
+ return $_SESSION['role_types'];
}
$result = $this->api->post('role_types.list');
$list = $result->get('list');
- if (is_array($list)) {
+ if (is_array($list) && !$this->devel_mode) {
$_SESSION['role_types'] = $list;
}
diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index fdb644c..316943b 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -264,7 +264,7 @@ class kolab_client_task_signup extends kolab_client_task
return $form->output();
}
- private function get_domains() {
+ protected function get_domains() {
// Get a list of domains ($domains again is a kolab_client_api_result instance)
$domains_list = $this->api->get('domains.list')->get('list');
@@ -310,12 +310,16 @@ class kolab_client_task_signup extends kolab_client_task
*
* @param string $name Option name
* @param mixed $fallback Default value
+ * @param int $type Value type (one of Conf class constants)
*
* @return mixed Option value
*/
- public function config_get($name, $fallback = null)
+ public function config_get($name, $fallback = null, $type = null)
{
- $value = $this->config->get('kolab_hosting', $name);
+ $value = $this->config->get('kolab_hosting', $name, $type);
+ if($value === null) {
+ $value = parent::config_get($name, $fallback, $type);
+ }
return $value !== null ? $value : $fallback;
}
}
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 8807589..910de6c 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -45,6 +45,7 @@ class kolab_client_task
protected $page_title = 'Kolab Admin Panel';
protected $menu = array();
protected $cache = array();
+ protected $devel_mode = false;
protected static $translation = array();
@@ -54,6 +55,9 @@ class kolab_client_task
public function __construct()
{
$this->config_init();
+
+ $this->devel_mode = $this->config_get('devel_mode', false, Conf::BOOL);
+
$this->output_init();
$this->api_init();
@@ -401,12 +405,13 @@ class kolab_client_task
*
* @param string $name Option name
* @param mixed $fallback Default value
+ * @param int $type Value type (one of Conf class constants)
*
* @return mixed Option value
*/
- public function config_get($name, $fallback = null)
+ public function config_get($name, $fallback = null, $type = null)
{
- $value = $this->config->get('kolab_wap', $name);
+ $value = $this->config->get('kolab_wap', $name, $type);
return $value !== null ? $value : $fallback;
}
@@ -525,14 +530,13 @@ class kolab_client_task
*/
protected function user_types($used_for = NULL)
{
- if (isset($_SESSION['user_types']) && !empty($_SESSION['user_types']) && !$this->config_get('devel_mode')) {
+ if (isset($_SESSION['user_types']) && !empty($_SESSION['user_types']) && !$this->devel_mode) {
return $_SESSION['user_types'];
}
- $list = Array();
-
+ $list = array();
$result = $this->api->post('user_types.list');
- $_list = $result->get('list');
+ $_list = $result->get('list');
if (!empty($used_for)) {
foreach ($_list as $user_type_id => $user_type_attrs) {
@@ -544,7 +548,7 @@ class kolab_client_task
$list = $_list;
}
- if (is_array($list) && !$this->config_get('devel_mode')) {
+ if (is_array($list) && !$this->devel_mode) {
$_SESSION['user_types'] = $list;
}
@@ -562,7 +566,7 @@ class kolab_client_task
*/
protected function user_name($dn)
{
- if (!$this->config_get('devel_mode', false)) {
+ if (!$this->devel_mode) {
if (!empty($this->cache['user_names']) && isset($this->cache['user_names'][$dn])) {
return $this->cache['user_names'][$dn];
}
@@ -580,7 +584,7 @@ class kolab_client_task
}
}
- if (!$this->config_get('devel_mode', false)) {
+ if (!$this->devel_mode) {
return $this->cache['user_names'][$dn] = $username;
} else {
return $username;
@@ -590,18 +594,13 @@ class kolab_client_task
/**
* Returns list of system capabilities.
*
+ * @param bool $all If enabled capabilities for all domains will be returned
+ *
* @return array List of system capabilities
*/
- protected function capabilities()
+ protected function capabilities($all = false)
{
- $conf = Conf::get_instance();
- $devel_mode = $conf->get('kolab_wap', 'devel_mode');
-
- if (empty($devel_mode)) {
- $devel_mode = FALSE;
- }
-
- if (!isset($_SESSION['capabilities']) || $devel_mode) {
+ if (!isset($_SESSION['capabilities']) || $this->devel_mode) {
$result = $this->api->post('system.capabilities');
$list = $result->get('list');
@@ -614,7 +613,7 @@ class kolab_client_task
$domain = $_SESSION['user']['domain'];
- return $_SESSION['capabilities'][$domain];
+ return !$all ? $_SESSION['capabilities'][$domain] : $_SESSION['capabilities'];
}
/**
@@ -632,6 +631,18 @@ class kolab_client_task
}
/**
+ * Returns domains list (based on capabilities response)
+ *
+ * @return array List of domains
+ */
+ protected function get_domains()
+ {
+ $caps = $this->capabilities(true);
+
+ return is_array($caps) ? array_keys($caps) : array();
+ }
+
+ /**
* Returns execution time in seconds
*
* @param string Execution time
@@ -911,7 +922,7 @@ class kolab_client_task
// See if "administrators" (those who can delete and add back on the entry
// level) may override the automatically generated contents of auto_form_fields.
- $admin_auto_fields_rw = $this->config_get('admin_auto_fields_rw', false);
+ $admin_auto_fields_rw = $this->config_get('admin_auto_fields_rw', false, Conf::BOOL);
foreach ($fields as $idx => $field) {
if (!array_key_exists($idx, $attribute_rights)) {
@@ -975,7 +986,7 @@ class kolab_client_task
}
// Add debug information
- if ($this->config_get('devel_mode')) {
+ if ($this->devel_mode) {
ksort($data);
$debug = kolab_html::escape(print_r($data, true));
$debug = preg_replace('/(^Array\n\(|\n*\)$|\t)/', '', $debug);