Skip to content

Commit fb0b7eb

Browse files
chfsxchfsx
committed
Merge pull request #3 from studer-raimann/develop
Develop
2 parents 183255e + 7497b9f commit fb0b7eb

5 files changed

Lines changed: 41 additions & 31 deletions

File tree

‎classes/UDFCheck/class.ilUDFCheck.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
2-
require_once('./Customizing/global/plugins/Libraries/ActiveRecord/class.ActiveRecord.php');
2+
if (is_file('./Services/ActiveRecord/class.ActiveRecord.php')) {
3+
require_once('./Services/ActiveRecord/class.ActiveRecord.php');
4+
} else {
5+
require_once('./Customizing/global/plugins/Libraries/ActiveRecord/class.ActiveRecord.php');
6+
}
37
require_once('./Services/User/classes/class.ilUserDefinedFields.php');
48

59
/**
@@ -294,6 +298,7 @@ public function sleep($field_name) {
294298
return date(DATE_ISO8601, $this->{$field_name});
295299
break;
296300
}
301+
297302
return NULL;
298303
}
299304

@@ -311,6 +316,7 @@ public function wakeUp($field_name, $field_value) {
311316
return strtotime($field_value);
312317
break;
313318
}
319+
314320
return NULL;
315321
}
316322

‎classes/UserSetting/class.ilUserSetting.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
2-
require_once('./Customizing/global/plugins/Libraries/ActiveRecord/class.ActiveRecord.php');
2+
if (is_file('./Services/ActiveRecord/class.ActiveRecord.php')) {
3+
require_once('./Services/ActiveRecord/class.ActiveRecord.php');
4+
} else {
5+
require_once('./Customizing/global/plugins/Libraries/ActiveRecord/class.ActiveRecord.php');
6+
}
37
require_once('./Customizing/global/plugins/Services/EventHandling/EventHook/UserDefaults/classes/UDFCheck/class.ilUDFCheck.php');
48
require_once('./Modules/Portfolio/classes/class.ilObjPortfolio.php');
59
require_once('./Modules/Portfolio/classes/class.ilObjPortfolioTemplate.php');

‎classes/UserSetting/class.ilUserSettingsTableGUI.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,14 @@ protected function parseData() {
7777
$xdglRequestList->limit($this->getOffset(), $this->getOffset() + $this->getLimit());
7878
$xdglRequestList->orderBy('title');
7979
$a_data = $xdglRequestList->getArray();
80-
$img_on = ilUtil::img(ilUtil::getImagePath('icon_led_on_s.png'));
81-
$img_off = ilUtil::img(ilUtil::getImagePath('icon_led_off_s.png'));
80+
if(ilUserDefaultsPlugin::is55()) {
81+
$img_on = ilUtil::img(ilUtil::getImagePath('icon_ok.svg'));
82+
$img_off = ilUtil::img(ilUtil::getImagePath('icon_not_ok.svg'));
83+
}else {
84+
$img_on = ilUtil::img(ilUtil::getImagePath('icon_led_on_s.png'));
85+
$img_off = ilUtil::img(ilUtil::getImagePath('icon_led_off_s.png'));
86+
}
87+
8288
foreach ($a_data as $k => $d) {
8389
$a_data[$k]['status_image'] = ($d['status'] == ilUserSetting::STATUS_ACTIVE ? $img_on : $img_off);
8490
}

‎classes/class.ilUserDefaultsPlugin.php‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,17 @@ public static function getInstance() {
3939
* @param array array of event specific parameters
4040
*/
4141
public function handleEvent($a_component, $a_event, $a_parameter) {
42-
if ($a_component == 'Modules/Course' AND $a_event == 'update') {
43-
44-
45-
// $ilUser = new ilObjUser();
46-
// $ilUser->setEmail('info@fschmid.ch');
47-
// $ilUser->setPasswd('homer');
48-
// $ilUser->setActive(1);
49-
// $ilUser->setTimeLimitUnlimited(true);
50-
// $ilUser->setFirstname('Fabian');
51-
// $ilUser->setLastname('Schmid');
52-
// $a_str = 'fschmid' . rand(100, 99999);
53-
// $ilUser->create();
54-
// $ilUser->setLogin($a_str);
55-
// $ilUser->saveAsNew(false);
56-
// ilUtil::sendInfo($a_str, true);
57-
// /**
58-
// * @var $ilUserSetting ilUserSetting
59-
// */
60-
// global $ilUser;
61-
// foreach (ilUserSetting::where(array( 'status' => ilUserSetting::STATUS_ACTIVE ))->get() as $ilUserSetting) {
62-
// $ilUserSetting->doAssignements($ilUser);
63-
// }
64-
}
65-
66-
if ($a_component == 'Services/User' AND $a_event == 'saveAsNew') {
42+
// if ($a_component == 'Modules/Course' AND $a_event == 'update') {
43+
// global $ilUser;
44+
// /**
45+
// * @var $ilUserSetting ilUserSetting
46+
// */
47+
// foreach (ilUserSetting::where(array( 'status' => ilUserSetting::STATUS_ACTIVE ))->get() as $ilUserSetting) {
48+
//// $ilUserSetting->doAssignements($ilUser);
49+
// }
50+
// }
51+
52+
if ($a_component == 'Services/User' AND ($a_event == 'saveAsNew' OR $a_event == 'afterCreate')) {
6753
/**
6854
* @var $ilUser ilObjUser
6955
*/
@@ -91,6 +77,14 @@ public function getPluginName() {
9177
}
9278

9379

80+
/**
81+
* @return bool
82+
*/
83+
public static function is55() {
84+
return ((int)str_ireplace('.', '', ILIAS_VERSION_NUMERIC)) >= 500;
85+
}
86+
87+
9488
public function updateLanguageFiles() {
9589
ini_set('auto_detect_line_endings', true);
9690
$path = substr(__FILE__, 0, strpos(__FILE__, 'classes')) . 'lang/';

‎plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
$id = 'usrdef';
3-
$version = '1.0.4';
3+
$version = '1.0.5';
44
$ilias_min_version = '4.4';
5-
$ilias_max_version = '4.4.99';
5+
$ilias_max_version = '5.0.999';
66
$responsible = 'Fabian Schmid';
77
$responsible_mail = 'fs@studer-raimann.ch';
88
?>

0 commit comments

Comments
 (0)