Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Taiga 463 #12

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
$version = '1.7.7';
$ilias_min_version = '5.4.0';
$ilias_max_version = '6.999';


$responsible = 'studer + raimann ag - Team Custom 1';
$responsible_mail = 'support-custom1@studer-raimann.ch';
32 changes: 15 additions & 17 deletions src/UserSetting/UserSetting.php
Original file line number Diff line number Diff line change
Expand Up @@ -473,17 +473,15 @@ protected function assignGroupFromQueue()
/**
* @return bool
*/
protected function isValid() {
$do_assignements = true;

foreach ($this->getUdfCheckObjects() as $udf) {
if (!$udf->isValid($this->getUsrObject())) {
$do_assignements = false;
}
}

return $do_assignements;
}
protected function isValid() {
$do_assignements = false;
foreach ($this->getUdfCheckObjects() as $udf) {
if ($udf->isValid($this->getUsrObject())) {
$do_assignements = true;
}
}
return $do_assignements;
}


/**
Expand Down Expand Up @@ -1203,7 +1201,7 @@ public function setUnsubscrfromcrsAndcategoriesDesktop($unsubscr_from_crs_and_ca
}

/**
* @param bool $unsubscr_from_crs_and_cat
* @param bool $unsubscr_from_grp
*/
public function setUnsubscrfromgrpDesktop($unsubscr_from_grp) {
$this->unsubscr_from_grp = $unsubscr_from_grp;
Expand Down Expand Up @@ -1416,14 +1414,14 @@ public function setAssignedOrgus($assigned_orgus) {
* @return bool
*/
public function isUnsubscrFromOrgus() {
return $this->unsubscr_from_grp;
return $this->unsubscribe_from_orgus;
}

/**
* @param bool $state
*/
public function setUnsubscrFromOrgus($state) {
$this->unsubscr_from_crs_and_cat = $state;
$this->unsubscribe_from_orgus = $state;
}


Expand All @@ -1450,10 +1448,10 @@ public function isUnsubscrFromStudyprograms() {
}

/**
* @param bool $unsubscr_from_grp
* @param bool $state
*/
public function setUnsubscrFromstudyprograms($unsubscr_from_grp) {
$this->unsubscr_from_grp = $unsubscr_from_grp;
public function setUnsubscrFromstudyprograms($state) {
$this->unsubscr_from_studyprograms = $state;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}

/**
Expand Down Expand Up @@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
Expand Down
69 changes: 17 additions & 52 deletions vendor/composer/LICENSE
Original file line number Diff line number Diff line change
@@ -1,56 +1,21 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Composer
Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
Source: https://github.com/composer/composer

Files: *
Copyright: 2016, Nils Adermann <naderman@naderman.de>
2016, Jordi Boggiano <j.boggiano@seld.be>
License: Expat
Copyright (c) Nils Adermann, Jordi Boggiano

Files: src/Composer/Util/TlsHelper.php
Copyright: 2016, Nils Adermann <naderman@naderman.de>
2016, Jordi Boggiano <j.boggiano@seld.be>
2013, Evan Coury <me@evancoury.com>
License: Expat and BSD-2-Clause
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
.
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
10 changes: 5 additions & 5 deletions vendor/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
$baseDir = dirname($vendorDir);

return array(
'srag\\RemovePluginDataConfirm\\' => array($vendorDir . '/srag/removeplugindataconfirm/src'),
'srag\\RemovePluginDataConfirm\\UserDefaults\\' => array($vendorDir . '/srag/removeplugindataconfirm/src'),
'srag\\Plugins\\UserDefaults\\' => array($baseDir . '/src'),
'srag\\LibraryLanguageInstaller\\' => array($vendorDir . '/srag/librarylanguageinstaller/src'),
'srag\\LibraryLanguageInstaller\\UserDefaults\\' => array($vendorDir . '/srag/librarylanguageinstaller/src'),
'srag\\LibrariesNamespaceChanger\\' => array($vendorDir . '/srag/librariesnamespacechanger/src'),
'srag\\DIC\\' => array($vendorDir . '/srag/dic/src'),
'srag\\CustomInputGUIs\\' => array($vendorDir . '/srag/custominputguis/src'),
'srag\\ActiveRecordConfig\\' => array($vendorDir . '/srag/activerecordconfig/src'),
'srag\\DIC\\UserDefaults\\' => array($vendorDir . '/srag/dic/src'),
'srag\\CustomInputGUIs\\UserDefaults\\' => array($vendorDir . '/srag/custominputguis/src'),
'srag\\ActiveRecordConfig\\UserDefaults\\' => array($vendorDir . '/srag/activerecordconfig/src'),
);
20 changes: 10 additions & 10 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,42 @@ class ComposerStaticInit51fe849bb6940989fec4e1ae115a1ecb
public static $prefixLengthsPsr4 = array (
's' =>
array (
'srag\\RemovePluginDataConfirm\\' => 29,
'srag\\RemovePluginDataConfirm\\UserDefaults\\' => 42,
'srag\\Plugins\\UserDefaults\\' => 26,
'srag\\LibraryLanguageInstaller\\' => 30,
'srag\\LibraryLanguageInstaller\\UserDefaults\\' => 43,
'srag\\LibrariesNamespaceChanger\\' => 31,
'srag\\DIC\\' => 9,
'srag\\CustomInputGUIs\\' => 21,
'srag\\ActiveRecordConfig\\' => 24,
'srag\\DIC\\UserDefaults\\' => 22,
'srag\\CustomInputGUIs\\UserDefaults\\' => 34,
'srag\\ActiveRecordConfig\\UserDefaults\\' => 37,
),
);

public static $prefixDirsPsr4 = array (
'srag\\RemovePluginDataConfirm\\' =>
'srag\\RemovePluginDataConfirm\\UserDefaults\\' =>
array (
0 => __DIR__ . '/..' . '/srag/removeplugindataconfirm/src',
),
'srag\\Plugins\\UserDefaults\\' =>
array (
0 => __DIR__ . '/../..' . '/src',
),
'srag\\LibraryLanguageInstaller\\' =>
'srag\\LibraryLanguageInstaller\\UserDefaults\\' =>
array (
0 => __DIR__ . '/..' . '/srag/librarylanguageinstaller/src',
),
'srag\\LibrariesNamespaceChanger\\' =>
array (
0 => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src',
),
'srag\\DIC\\' =>
'srag\\DIC\\UserDefaults\\' =>
array (
0 => __DIR__ . '/..' . '/srag/dic/src',
),
'srag\\CustomInputGUIs\\' =>
'srag\\CustomInputGUIs\\UserDefaults\\' =>
array (
0 => __DIR__ . '/..' . '/srag/custominputguis/src',
),
'srag\\ActiveRecordConfig\\' =>
'srag\\ActiveRecordConfig\\UserDefaults\\' =>
array (
0 => __DIR__ . '/..' . '/srag/activerecordconfig/src',
),
Expand Down