diff options
| -rw-r--r-- | app/controllers/admin/ilias_interface.php | 10 | ||||
| -rw-r--r-- | app/controllers/course/ilias_interface.php | 8 | ||||
| -rw-r--r-- | app/controllers/my_ilias_accounts.php | 2 | ||||
| -rw-r--r-- | app/views/my_ilias_accounts/index.php | 4 | ||||
| -rw-r--r-- | lib/ilias_interface/ConnectedIlias.php | 7 |
5 files changed, 18 insertions, 13 deletions
diff --git a/app/controllers/admin/ilias_interface.php b/app/controllers/admin/ilias_interface.php index 9f1e244..4703cff 100644 --- a/app/controllers/admin/ilias_interface.php +++ b/app/controllers/admin/ilias_interface.php @@ -383,9 +383,13 @@ class Admin_IliasInterfaceController extends AuthenticatedController $this->ilias_configs[$index]['category_to_desktop'] = Request::get('ilias_category_to_desktop'); $this->ilias_configs[$index]['workgroup_category_name'] = Request::get('ilias_workgroup_category_name'); - foreach ($this->modules_available as $module_index => $module_name) { - if (Request::get('ilias_modules_'.$module_index)) { - $this->ilias_configs[$index]['modules'][$module_index] = $module_name; + if (!empty($this->ilias_interface_config['create_objects'])) { + foreach ($this->modules_available as $module_index => $module_name) { + if (Request::get('ilias_modules_'.$module_index)) { + $this->ilias_configs[$index]['modules'][$module_index] = $module_name; + } else { + unset($this->ilias_configs[$index]['modules'][$module_index]); + } } } diff --git a/app/controllers/course/ilias_interface.php b/app/controllers/course/ilias_interface.php index c0c8b02..c631790 100644 --- a/app/controllers/course/ilias_interface.php +++ b/app/controllers/course/ilias_interface.php @@ -89,13 +89,13 @@ class Course_IliasInterfaceController extends AuthenticatedController if (($this->module_count == 0) && (!$this->courses)) { if (Context::isInstitute()) { - if ($this->ilias_interface_config['create_objects']) { + if (!empty($this->ilias_interface_config['create_objects'])) { PageLayout::postInfo(_('Momentan sind dieser Einrichtung keine Lernobjekte zugeordnet.')); } else { PageLayout::postInfo(_('Momentan sind dieser Einrichtung keine ILIAS-Kurse zugeordnet.')); } } else { - if ($this->ilias_interface_config['create_objects']) { + if (!empty($this->ilias_interface_config['create_objects'])) { PageLayout::postInfo(_('Momentan sind dieser Veranstaltung keine Lernobjekte zugeordnet.')); } else { PageLayout::postInfo(_('Momentan ist dieser Veranstaltung kein ILIAS-Kurs zugeordnet.')); @@ -113,7 +113,7 @@ class Course_IliasInterfaceController extends AuthenticatedController Icon::create('add') )->asDialog(); } - if ($this->author_permission && $this->ilias_interface_config['create_objects']) { + if ($this->author_permission && !empty($this->ilias_interface_config['create_objects']) && !empty($this->ilias_interface_config['create_category'])) { $widget->addLink( _('Meine Lernobjekte'), $this->url_for('course/ilias_interface/add_object/my_modules'), @@ -249,7 +249,7 @@ class Course_IliasInterfaceController extends AuthenticatedController */ public function add_object_action($mode = 'search', $index = '') { - if ($this->ilias_interface_config['create_objects']) { + if (!empty($this->ilias_interface_config['create_objects'])) { PageLayout::setTitle(_('Lernobjekt hinzufügen')); } else { PageLayout::setTitle(_('Neuen ILIAS-Kurs anlegen')); diff --git a/app/controllers/my_ilias_accounts.php b/app/controllers/my_ilias_accounts.php index 3b8716b..bbb7ecf 100644 --- a/app/controllers/my_ilias_accounts.php +++ b/app/controllers/my_ilias_accounts.php @@ -567,7 +567,7 @@ class MyIliasAccountsController extends AuthenticatedController $this->ilias = new ConnectedIlias($index); $token = $this->ilias->user->getToken(); $session_id = $this->ilias->soap_client->loginUser($this->ilias->user->getUsername(), $token); - if ($this->ilias->ilias_config['category_create_on_add_module'] && $GLOBALS['perm']->have_perm($this->ilias->ilias_config['author_perm']) && ($target == 'new') && ! $module_id) { + if (!empty($this->ilias->ilias_interface_config['create_category']) && !empty($this->ilias->ilias_config['category_create_on_add_module']) && $GLOBALS['perm']->have_perm($this->ilias->ilias_config['author_perm']) && ($target == 'new') && ! $module_id) { $this->ilias->newUserCategory(); $module_id = $this->ilias->user->category; } diff --git a/app/views/my_ilias_accounts/index.php b/app/views/my_ilias_accounts/index.php index d50271b..1ffdd92 100644 --- a/app/views/my_ilias_accounts/index.php +++ b/app/views/my_ilias_accounts/index.php @@ -4,9 +4,9 @@ <table class="default"> <caption> <?= sprintf(_('Meine Lernobjekte in %s'), $ilias->getName()) ?> - <? if (!empty($ilias_interface_config['create_objects'])) : ?> + <? if (!empty($ilias->ilias_interface_config['create_objects'] && !empty($ilias->ilias_interface_config['create_category']))) : ?> <span class="actions"> - <a href="<?= $controller->url_for('my_ilias_accounts/add_object/'.$ilias_index) ?>" data-dialog="size=auto"> + <a href="<?= $controller->url_for('my_ilias_accounts/add_object/'.$ilias_index) ?>" data-dialog="size=auto" title="<?=_('Neues Lernobjekt anlegen')?>"> <?= Icon::create('add', Icon::ROLE_CLICKABLE, tooltip2(_('Neues Lernobjekt anlegen'))) ?> </a> </span> diff --git a/lib/ilias_interface/ConnectedIlias.php b/lib/ilias_interface/ConnectedIlias.php index 4876289..f0d6e75 100644 --- a/lib/ilias_interface/ConnectedIlias.php +++ b/lib/ilias_interface/ConnectedIlias.php @@ -112,7 +112,7 @@ class ConnectedIlias NotificationCenter::addObserver($this, "updateUser", "UserDidUpdate"); } // create user category if user has ILIAS author permission - if ($GLOBALS['perm']->have_perm($this->ilias_config['author_perm']) && ! $this->ilias_config['category_create_on_add_module'] && ! $this->user->getCategory()) { + if ($GLOBALS['perm']->have_perm($this->ilias_config['author_perm']) && !empty($this->ilias_interface_config['create_category']) && empty($this->ilias_config['category_create_on_add_module']) && ! $this->user->getCategory()) { $this->soap_client->setCachingStatus(false); $this->soap_client->clearCache(); $this->newUserCategory(); @@ -148,6 +148,7 @@ class ConnectedIlias $interface_config_options = [ 'show_course_paths' => true, 'create_objects' => true, + 'create_category' => true, ]; foreach ($interface_config_options as $option_key => $option_value) { @@ -722,7 +723,7 @@ class ConnectedIlias */ public function newUserCategory() { - if (!$this->user->isConnected()) { + if (!$this->user->isConnected() || !$this->ilias_interface_config['create_category']) { return false; } $this->soap_client->setCachingStatus(false); @@ -836,7 +837,7 @@ class ConnectedIlias * returns all active module types for current ILIAS installation * @access public */ - public static function getsupportedModuleTypes() + public static function getSupportedModuleTypes() { return [ // 'cat' => _('Kategorie'), |