-".$file."-"; diff --git a/Services/UICore/lib/html-it/IT.php b/Services/UICore/lib/html-it/IT.php index 5877d3f48bc4..78e3edb7b5ab 100644 --- a/Services/UICore/lib/html-it/IT.php +++ b/Services/UICore/lib/html-it/IT.php @@ -931,13 +931,16 @@ function getFile($filename) } + /* performance patch, 6.4.2017 return preg_replace_callback( "##im", function ($hit) { return $this->getFile($hit[1]); }, $content - ); + );*/ + + return $content; } // end func getFile /** diff --git a/Services/UICore/maintenance.json b/Services/UICore/maintenance.json new file mode 100644 index 000000000000..f67344d3cb5e --- /dev/null +++ b/Services/UICore/maintenance.json @@ -0,0 +1,14 @@ +{ + "maintenance_model": "Classic", + "first_maintainer": "", + "second_maintainer": "", + "implicit_maintainers": [ + "fschmid(21087)" + ], + "coordinator": "", + "tester": "", + "testcase_writer": "", + "path": "Services/UICore", + "belong_to_component": "None", + "used_in_components": [] +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilAbstractUsersGalleryCollectionProvider.php b/Services/User/Gallery/classes/class.ilAbstractUsersGalleryCollectionProvider.php new file mode 100644 index 000000000000..df56a8f4c027 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilAbstractUsersGalleryCollectionProvider.php @@ -0,0 +1,35 @@ +getId()], $sortable_names[$user->getId()]); + }, $users)); + } + + /** + * @inheritdoc + */ + public function hasRemovableUsers() + { + return false; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilAbstractUsersGalleryUserCollectionSorter.php b/Services/User/Gallery/classes/class.ilAbstractUsersGalleryUserCollectionSorter.php new file mode 100644 index 000000000000..070bd450084d --- /dev/null +++ b/Services/User/Gallery/classes/class.ilAbstractUsersGalleryUserCollectionSorter.php @@ -0,0 +1,30 @@ +compare($left, $right); + }); + + return $users; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryContacts.php b/Services/User/Gallery/classes/class.ilUsersGalleryContacts.php new file mode 100644 index 000000000000..61ba572c7f48 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryContacts.php @@ -0,0 +1,73 @@ +getRequestRelationsForOwner()->toArray(); + $linked = ilBuddyList::getInstanceByGlobalUser()->getLinkedRelations()->toArray(); + $requested_by_me = ilBuddyList::getInstanceByGlobalUser()->getRequestRelationsByOwner()->toArray(); + $me_ignored = ilBuddyList::getInstanceByGlobalUser()->getIgnoredRelationsByOwner()->toArray(); + $ignored = ilBuddyList::getInstanceByGlobalUser()->getIgnoredRelationsForOwner()->toArray(); + + return [$requested_for_me, $linked, $requested_by_me + $me_ignored, $ignored]; + } + + /** + * @inheritdoc + */ + public function getGroupedCollections($ignore_myself = false) + { + global $DIC; + + $relations = $this->getRelationSequence(); + $groups = []; + + foreach($relations as $sorted_relation) + { + $user_data = []; + + foreach($sorted_relation as $usr_id => $users) + { + /** @var $user ilObjUser */ + if(!($user = ilObjectFactory::getInstanceByObjId($usr_id, false))) + { + continue; + } + + if(!$user->getActive()) + { + continue; + } + + if($ignore_myself && $user->getId() == $DIC->user()->getId()) + { + continue; + } + + $user_data[$user->getId()] = $user; + } + + $groups[] = $this->getPopulatedGroup($user_data); + } + + return $groups; + } + + /** + * @inheritdoc + */ + public function hasRemovableUsers() + { + return true; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryGUI.php b/Services/User/Gallery/classes/class.ilUsersGalleryGUI.php new file mode 100644 index 000000000000..14d9d079ac14 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryGUI.php @@ -0,0 +1,223 @@ +ctrl = $DIC->ctrl(); + $this->tpl = $DIC->ui()->mainTemplate(); + $this->lng = $DIC->language(); + $this->user = $DIC->user(); + $this->rbacsystem = $DIC->rbac()->system(); + $this->factory = $DIC->ui()->factory(); + $this->renderer = $DIC->ui()->renderer(); + + $this->collection_provider = $collection_provider; + } + + /** + * + */ + public function executeCommand() + { + $next_class = $this->ctrl->getNextClass(); + $cmd = $this->ctrl->getCmd('view'); + + switch($next_class) + { + case 'ilpublicuserprofilegui': + require_once 'Services/User/classes/class.ilPublicUserProfileGUI.php'; + $profile_gui = new ilPublicUserProfileGUI(ilUtil::stripSlashes($_GET['user'])); + $profile_gui->setBackUrl($this->ctrl->getLinkTarget($this, 'view')); + $this->ctrl->forwardCommand($profile_gui); + break; + + default: + switch($cmd) + { + default: + $this->$cmd(); + break; + } + break; + } + } + + /** + * Displays the participants gallery + */ + protected function view() + { + $template = $this->populateTemplate($this->collection_provider->getGroupedCollections()); + $this->tpl->setContent($template->get()); + } + + /** + * @param ilObjUser $user + * @param array $sections + */ + protected function addContactWidgetSection(ilObjUser $user, array &$sections) + { + if( + ilBuddySystem::getInstance()->isEnabled() && + $this->user->getId() != $user->getId() && + !$this->user->isAnonymous() && + !$user->isAnonymous() + ) + { + + $contact_btn_html = ilBuddySystemLinkButton::getInstanceByUserId($user->getId())->getHtml(); + if($contact_btn_html) + { + $sections[] = $this->factory->legacy($contact_btn_html); + } + } + } + + /** + * @param ilUsersGalleryGroup[] $gallery_groups + * @return ilTemplate + */ + protected function populateTemplate(array $gallery_groups) + { + $buddylist = ilBuddyList::getInstanceByGlobalUser(); + $tpl = new ilTemplate('tpl.users_gallery.html', true, true, 'Services/User'); + + require_once 'Services/UIComponent/Panel/classes/class.ilPanelGUI.php'; + $panel = ilPanelGUI::getInstance(); + $panel->setBody($this->lng->txt('no_gallery_users_available')); + $tpl->setVariable('NO_ENTRIES_HTML', json_encode($panel->getHTML())); + + $groups_with_users = array_filter($gallery_groups, function(ilUsersGalleryGroup $group) { + return count($group) > 0; + }); + $groups_with_highlight = array_filter($groups_with_users, function(ilUsersGalleryGroup $group) { + return $group->isHighlighted(); + }); + + if(0 == count($groups_with_users)) + { + $tpl->setVariable('NO_GALLERY_USERS', $panel->getHTML()); + return $tpl; + } + + require_once 'Services/UIComponent/Panel/classes/class.ilPanelGUI.php'; + $panel = ilPanelGUI::getInstance(); + $panel->setBody($this->lng->txt('no_gallery_users_available')); + $tpl->setVariable('NO_ENTRIES_HTML', json_encode($panel->getHTML())); + + require_once 'Services/User/Gallery/classes/class.ilUsersGallerySortedUserGroup.php'; + require_once 'Services/User/Gallery/classes/class.ilUsersGalleryUserCollectionPublicNameSorter.php'; + + $cards = []; + + foreach($gallery_groups as $group) + { + $group = new ilUsersGallerySortedUserGroup($group, new ilUsersGalleryUserCollectionPublicNameSorter()); + + foreach($group as $user) + { + $card = $this->factory->card($user->getPublicName()); + $avatar = $this->factory->image()->standard($user->getAggregatedUser()->getPersonalPicturePath('big'), $user->getPublicName()); + + $sections = []; + + if(count($groups_with_highlight) > 0) + { + $card = $card->withHighlight($group->isHighlighted()); + + if($group->isHighlighted()) + { + $sections[] = $this->factory->legacy($group->getLabel()); + } + } + + $this->addContactWidgetSection($user->getAggregatedUser(), $sections); + + if($user->hasPublicProfile()) + { + $this->ctrl->setParameterByClass('ilpublicuserprofilegui', 'user', $user->getAggregatedUser()->getId()); + $public_profile_url = $this->ctrl->getLinkTargetByClass('ilpublicuserprofilegui', 'getHTML'); + + $avatar = $avatar->withAction($public_profile_url); + $card = $card->withTitleAction($public_profile_url); + } + + $card = $card->withImage($avatar)->withSections($sections); + + $cards[] = $card; + } + } + + $tpl->setVariable('GALLERY_HTML', $this->renderer->render($this->factory->deck($cards))); + + if($this->collection_provider->hasRemovableUsers()) + { + $tpl->touchBlock('js_remove_handler'); + } + + return $tpl; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryGroup.php b/Services/User/Gallery/classes/class.ilUsersGalleryGroup.php new file mode 100644 index 000000000000..7be1191e8478 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryGroup.php @@ -0,0 +1,131 @@ +users = $users; + } + + /** + * @inheritdoc + */ + public function setHighlighted($status) + { + $this->highlighted = (bool)$status; + } + + /** + * @inheritdoc + */ + public function isHighlighted() + { + return (bool)$this->highlighted; + } + + /** + * @inheritdoc + */ + public function setLabel($label) + { + $this->label = $label; + } + + /** + * @inheritdoc + */ + public function getLabel() + { + return $this->label; + } + + /** + * @inheritdoc + */ + public function setItems(array $items) + { + $this->users = $items; + } + + /** + * @inheritdoc + */ + public function getItems() + { + return $this->users; + } + + /** + * @inheritdoc + */ + public function count() + { + return count($this->users); + } + + /** + * @inheritdoc + * @return ilUsersGalleryUser + */ + public function current() + { + return current($this->users); + } + + /** + * @inheritdoc + */ + public function next() + { + next($this->users); + } + + /** + * @inheritdoc + */ + public function key() + { + key($this->users); + } + + /** + * @inheritdoc + */ + public function valid() + { + return key($this->users) !== null; + } + + /** + * @inheritdoc + */ + public function rewind() + { + reset($this->users); + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryParticipants.php b/Services/User/Gallery/classes/class.ilUsersGalleryParticipants.php new file mode 100644 index 000000000000..f0bfda8c9679 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryParticipants.php @@ -0,0 +1,90 @@ +participants = $participants; + } + + /** + * @param int[] $usr_ids + * @return ilObjUser[] + */ + protected function getUsers(array $usr_ids) + { + $users = []; + + foreach($usr_ids as $usr_id) + { + if(isset($this->users[$usr_id])) + { + continue; + } + + /** + * @var $user ilObjUser + */ + if(!($user = ilObjectFactory::getInstanceByObjId($usr_id, false))) + { + continue; + } + + if(!$user->getActive()) + { + continue; + } + + $users[$user->getId()] = $user; + $this->users[$user->getId()] = true; + } + + return $users; + } + + /** + * @inheritdoc + */ + public function getGroupedCollections() + { + /** + * @var $DIC ILIAS\DI\Container + */ + global $DIC; + + $groups = []; + + foreach([ + array($this->participants->getContacts(), true, $DIC->language()->txt('crs_mem_contact')), + array($this->participants->getAdmins() , false, ''), + array($this->participants->getTutors() , false, ''), + array($this->participants->getMembers() , false, '') + ] as $users) + { + $group = $this->getPopulatedGroup($this->getUsers($users[0])); + $group->setHighlighted($users[1]); + $group->setLabel($users[2]); + $groups[] = $group; + } + + return $groups; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGallerySortedUserGroup.php b/Services/User/Gallery/classes/class.ilUsersGallerySortedUserGroup.php new file mode 100644 index 000000000000..7d408639405c --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGallerySortedUserGroup.php @@ -0,0 +1,129 @@ +collection = $collection; + $this->sorter = $sorter; + } + + /** + * @inheritdoc + */ + public function setItems(array $items) + { + $this->collection->setItems($items); + } + + /** + * @inheritdoc + */ + public function getItems() + { + return $this->collection->getItems(); + } + + /** + * @inheritdoc + * @return ilUsersGalleryUser + */ + public function current() + { + return $this->collection->current(); + } + + /** + * @inheritdoc + */ + public function next() + { + $this->collection->next(); + } + + /** + * @inheritdoc + */ + public function key() + { + return $this->collection->key(); + } + + /** + * @inheritdoc + */ + public function valid() + { + return $this->collection->valid(); + } + + /** + * @inheritdoc + */ + public function rewind() + { + $this->collection->setItems($this->sorter->sort($this->collection->getItems())); + $this->collection->rewind(); + } + + /** + * @inheritdoc + */ + public function count() + { + return $this->collection->count(); + } + + /** + * @inheritdoc + */ + public function setHighlighted($status) + { + $this->collection->setHighlighted($status); + } + + /** + * @inheritdoc + */ + public function isHighlighted() + { + return $this->collection->isHighlighted(); + } + + /** + * @inheritdoc + */ + public function setLabel($label) + { + $this->collection->setLabel($label); + } + + /** + * @inheritdoc + */ + public function getLabel() + { + return $this->collection->getLabel(); + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryUserCollectionPublicNameSorter.php b/Services/User/Gallery/classes/class.ilUsersGalleryUserCollectionPublicNameSorter.php new file mode 100644 index 000000000000..e82cfce2bd8c --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryUserCollectionPublicNameSorter.php @@ -0,0 +1,18 @@ +getSortablePublicName(), $right->getSortablePublicName()); + } +} \ No newline at end of file diff --git a/Services/User/Gallery/classes/class.ilUsersGalleryUserImpl.php b/Services/User/Gallery/classes/class.ilUsersGalleryUserImpl.php new file mode 100644 index 000000000000..5b1f4c9a7f21 --- /dev/null +++ b/Services/User/Gallery/classes/class.ilUsersGalleryUserImpl.php @@ -0,0 +1,75 @@ +aggregated_user = $aggregated_user; + $this->public_name = $public_name; + $this->sortable_public_name = $sortable_public_name; + } + + /** + * @inheritdoc + */ + public function hasPublicProfile() + { + global $DIC; + + return ( + (!$DIC->user()->isAnonymous() && $this->aggregated_user->getPref('public_profile') == 'y') || + $this->aggregated_user->getPref('public_profile') == 'g' + ); + } + + /** + * @inheritdoc + */ + public function getPublicName() + { + return $this->public_name; + } + + /** + * @inheritdoc + */ + public function getSortablePublicName() + { + return $this->sortable_public_name; + } + + /** + * @inheritdoc + */ + public function getAggregatedUser() + { + return $this->aggregated_user; + } +} \ No newline at end of file diff --git a/Services/User/Gallery/interfaces/interface.ilUsersGalleryCollectionProvider.php b/Services/User/Gallery/interfaces/interface.ilUsersGalleryCollectionProvider.php new file mode 100644 index 000000000000..5eae9d157b5c --- /dev/null +++ b/Services/User/Gallery/interfaces/interface.ilUsersGalleryCollectionProvider.php @@ -0,0 +1,18 @@ + &$data) - { - /** - * @var $user ilObjUser - */ - $user = $data['user']; - - $profile_published = false; - if((!$ilUser->isAnonymous() && $user->getPref('public_profile') == 'y') || $user->getPref('public_profile') == 'g') - { - $profile_published = true; - } - - $data['sort'] = $sortable_names[$user->getId()]; - $data['public_profile'] = $profile_published; - $data['public_name'] = $names[$user->getId()]; - } - - return $user_data; - } -} \ No newline at end of file diff --git a/Services/User/classes/class.ilUsersGalleryGUI.php b/Services/User/classes/class.ilUsersGalleryGUI.php deleted file mode 100644 index 634a837ba3cd..000000000000 --- a/Services/User/classes/class.ilUsersGalleryGUI.php +++ /dev/null @@ -1,190 +0,0 @@ -ctrl = $ilCtrl; - $this->object = $object; - $this->tpl = $tpl; - $this->lng = $lng; - $this->user = $ilUser; - $this->rbacsystem = $rbacsystem; - } - - /** - * - */ - public function executeCommand() - { - $next_class = $this->ctrl->getNextClass(); - $cmd = $this->ctrl->getCmd('view'); - - switch($next_class) - { - case 'ilpublicuserprofilegui': - require_once 'Services/User/classes/class.ilPublicUserProfileGUI.php'; - $profile_gui = new ilPublicUserProfileGUI(ilUtil::stripSlashes($_GET['user'])); - $profile_gui->setBackUrl($this->ctrl->getLinkTarget($this, 'view')); - $this->ctrl->forwardCommand($profile_gui); - break; - - default: - switch($cmd) - { - default: - $this->$cmd(); - break; - } - break; - } - } - - /** - * Displays the participants gallery - */ - protected function view() - { - $template = $this->buildHTML($this->object->getGalleryUsers()); - $this->tpl->setContent($template->get()); - } - - /** - * @param ilTemplate $tpl - * @param ilObjUser $user - */ - protected function renderLinkButton(ilTemplate $tpl, ilObjUser $user) - { - if( - ilBuddySystem::getInstance()->isEnabled() && - $this->user->getId() != $user->getId() && - !$this->user->isAnonymous() && - !$user->isAnonymous() - ) - { - $button = ilBuddySystemLinkButton::getInstanceByUserId($user->getId()); - $tpl->setVariable('BUDDY_HTML', $button->getHtml()); - } - } - - /** - * @param array - * @return ilTemplate - */ - protected function buildHTML($users) - { - $buddylist = ilBuddyList::getInstanceByGlobalUser(); - $tpl = new ilTemplate('tpl.users_gallery.html', true, true, 'Services/User'); - - require_once 'Services/UIComponent/Panel/classes/class.ilPanelGUI.php'; - $panel = ilPanelGUI::getInstance(); - $panel->setBody($this->lng->txt('no_gallery_users_available')); - $tpl->setVariable('NO_ENTRIES_HTML', json_encode($panel->getHTML())); - - if(!count($users)) - { - $tpl->setVariable('NO_GALLERY_USERS', $panel->getHTML()); - return $tpl; - } - - require_once 'Services/UIComponent/Panel/classes/class.ilPanelGUI.php'; - $panel = ilPanelGUI::getInstance(); - $panel->setBody($this->lng->txt('no_gallery_users_available')); - $tpl->setVariable('NO_ENTRIES_HTML', json_encode($panel->getHTML())); - - foreach($users as $user_data) - { - /** - * @var $user ilObjUser - */ - $user = $user_data['user']; - - if($user_data['public_profile']) - { - $tpl->setCurrentBlock('linked_image'); - $this->ctrl->setParameterByClass('ilpublicuserprofilegui', 'user', $user->getId()); - $profile_target = $this->ctrl->getLinkTargetByClass('ilpublicuserprofilegui', 'getHTML'); - $tpl->setVariable('LINK_PROFILE', $profile_target); - $tpl->setVariable('PUBLIC_NAME', $user_data['public_name']); - } - else - { - $tpl->setCurrentBlock('unlinked_image'); - $tpl->setVariable('PUBLIC_NAME', $user->getLogin()); - } - $tpl->setVariable('SRC_USR_IMAGE', $user->getPersonalPicturePath('small')); - $tpl->parseCurrentBlock(); - - $tpl->setCurrentBlock('user'); - - $tpl->setVariable('BUDDYLIST_STATUS', get_class($buddylist->getRelationByUserId($user->getId())->getState())); - $tpl->setVariable('USER_CC_CLASS', $this->object->getUserCssClass()); - $tpl->setVariable('USER_ID', $user->getId()); - $this->renderLinkButton($tpl, $user); - $tpl->parseCurrentBlock(); - } - - return $tpl; - } -} \ No newline at end of file diff --git a/Services/User/classes/class.ilUsersGalleryParticipants.php b/Services/User/classes/class.ilUsersGalleryParticipants.php deleted file mode 100644 index bc114e79676e..000000000000 --- a/Services/User/classes/class.ilUsersGalleryParticipants.php +++ /dev/null @@ -1,84 +0,0 @@ -participants = $participants; - } - - /** - * @param array $users - * @return array - */ - protected function getSortedUsers(array $users) - { - $participants_data = array(); - foreach($users as $users_id) - { - if(isset($this->users[$users_id])) - { - continue; - } - - /** - * @var $user ilObjUser - */ - if(!($user = ilObjectFactory::getInstanceByObjId($users_id, false))) - { - continue; - } - - if(!$user->getActive()) - { - continue; - } - - $participants_data[$user->getId()] = array( - 'id' => $user->getId(), - 'user' => $user - ); - $this->users[$user->getId()] = true; - } - $participants_data = $this->collectUserDetails($participants_data); - $participants_data = ilUtil::sortArray($participants_data, 'sort', 'asc'); - return $participants_data; - } - - /** - * @return array - */ - public function getGalleryUsers() - { - $ordered_user = $this->getSortedUsers($this->participants->getAdmins()); - $ordered_user = array_merge($ordered_user, $this->getSortedUsers($this->participants->getTutors())); - $ordered_user = array_merge($ordered_user, $this->getSortedUsers($this->participants->getMembers())); - return $ordered_user; - } - - /** - * @return string - */ - public function getUserCssClass() - { - return ''; - } -} \ No newline at end of file diff --git a/Services/User/classes/class.ilUsersGalleryUsers.php b/Services/User/classes/class.ilUsersGalleryUsers.php deleted file mode 100644 index bcfad5f64d53..000000000000 --- a/Services/User/classes/class.ilUsersGalleryUsers.php +++ /dev/null @@ -1,76 +0,0 @@ -getRequestRelationsForOwner()->toArray(); - $linked = ilBuddyList::getInstanceByGlobalUser()->getLinkedRelations()->toArray(); - $requested_by_me = ilBuddyList::getInstanceByGlobalUser()->getRequestRelationsByOwner()->toArray(); - $me_ignored = ilBuddyList::getInstanceByGlobalUser()->getIgnoredRelationsByOwner()->toArray(); - $ignored = ilBuddyList::getInstanceByGlobalUser()->getIgnoredRelationsForOwner()->toArray(); - - return array($requested_for_me, $linked, $requested_by_me + $me_ignored, $ignored); - } - - /** - * @param bool $ignore_myself - * @return array - */ - public function getGalleryUsers($ignore_myself = false) - { - /** - * @var $ilUser ilObjUser - */ - global $ilUser; - $relations = $this->getSortedRelations(); - $ordered_data = array(); - foreach($relations as $sorted_relation) - { - $user_data = array(); - foreach($sorted_relation as $key => $users) - { - /** - * @var $user ilObjUser - */ - if(!($user = ilObjectFactory::getInstanceByObjId($key, false))) - { - continue; - } - if(!$user->getActive()) - { - continue; - } - - if($ignore_myself && $user->getId() == $ilUser->getId()) - { - continue; - } - - $user_data[$user->getId()] = array( - 'id' => $user->getId(), - 'user' => $user - ); - } - $user_data = $this->collectUserDetails($user_data); - $ordered_data = array_merge($ordered_data, ilUtil::sortArray($user_data, 'sort', 'asc')); - } - return $ordered_data; - } - - /** - * @return string - */ - public function getUserCssClass() - { - return 'ilBuddySystemRemoveWhenUnlinked'; - } -} \ No newline at end of file diff --git a/Services/User/interfaces/interface.ilGalleryUsers.php b/Services/User/interfaces/interface.ilGalleryUsers.php deleted file mode 100644 index fbb1a2ed6dc4..000000000000 --- a/Services/User/interfaces/interface.ilGalleryUsers.php +++ /dev/null @@ -1,18 +0,0 @@ - - -
-
-
-
-
- {NO_GALLERY_USERS}
-
-
+
+
-
-
-
- {NO_GALLERY_USERS}
+
+{GALLERY_HTML}
\ No newline at end of file
diff --git a/Services/Utilities/classes/class.ilStr.php b/Services/Utilities/classes/class.ilStr.php
index ce9cbcdfecea..1edb0833c5d1 100755
--- a/Services/Utilities/classes/class.ilStr.php
+++ b/Services/Utilities/classes/class.ilStr.php
@@ -155,7 +155,7 @@ static function isUtf8($a_str)
{
if (function_exists("mb_detect_encoding"))
{
- if (mb_detect_encoding($a_str, "UTF-8") == "UTF-8")
+ if (mb_detect_encoding($a_str, "UTF-8", true) == "UTF-8")
{
return true;
}
diff --git a/Services/Utilities/maintenance.json b/Services/Utilities/maintenance.json
new file mode 100644
index 000000000000..82f1da9c3ad1
--- /dev/null
+++ b/Services/Utilities/maintenance.json
@@ -0,0 +1,14 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [
+ "fschmid(21087)"
+ ],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/Utilities",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/Verification/maintenance.json b/Services/Verification/maintenance.json
new file mode 100644
index 000000000000..71004aa3d654
--- /dev/null
+++ b/Services/Verification/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/Verification",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/VirusScanner/maintenance.json b/Services/VirusScanner/maintenance.json
new file mode 100644
index 000000000000..0451c9539ce1
--- /dev/null
+++ b/Services/VirusScanner/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "fschmid(21087)",
+ "second_maintainer": "akill(27631)",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "tloewen(41553)",
+ "testcase_writer": "tloewen(41553)",
+ "path": "Services/VirusScanner",
+ "belong_to_component": "File",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/WebAccessChecker/maintenance.json b/Services/WebAccessChecker/maintenance.json
new file mode 100644
index 000000000000..98b69e5e60b0
--- /dev/null
+++ b/Services/WebAccessChecker/maintenance.json
@@ -0,0 +1,29 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "fschmid(21087)",
+ "second_maintainer": "ukohnle(21855)",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "iLUB Universität Bern",
+ "testcase_writer": "ttruffer(42894)",
+ "path": "Services/WebAccessChecker",
+ "belong_to_component": "None",
+ "used_in_components": [
+ "ObjectDefinition",
+ "Learning Module SCORM",
+ "Blog",
+ "Data Collection",
+ "Learning Module HTML",
+ "MediaCast",
+ "Poll",
+ "Portfolio",
+ "Test & Assessment",
+ "Certificate",
+ "Chat",
+ "Badges",
+ "Booking Manager",
+ "File",
+ "Media Objects",
+ "User Service"
+ ]
+}
\ No newline at end of file
diff --git a/Services/WebDAV/maintenance.json b/Services/WebDAV/maintenance.json
new file mode 100644
index 000000000000..cb04460bfa40
--- /dev/null
+++ b/Services/WebDAV/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "fawinike(44474)",
+ "second_maintainer": "smeyer(191)",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/WebDAV",
+ "belong_to_component": "WebDAV",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/WebServices/ECS/classes/Course/class.ilECSCmsCourseMemberCommandQueueHandler.php b/Services/WebServices/ECS/classes/Course/class.ilECSCmsCourseMemberCommandQueueHandler.php
index bbdac5900be8..652319538740 100644
--- a/Services/WebServices/ECS/classes/Course/class.ilECSCmsCourseMemberCommandQueueHandler.php
+++ b/Services/WebServices/ECS/classes/Course/class.ilECSCmsCourseMemberCommandQueueHandler.php
@@ -195,10 +195,16 @@ protected function doUpdate($a_content_id, $course_member)
// Lookup already imported users and update their status
$assignments = $this->readAssignments($course,$course_member);
+ $this->log->debug('Parallel group assignments');
+ $this->log->dump($assignments, ilLogLevel::DEBUG);
+ $this->log->debug('------------------ End assignemtns');
+
// iterate through all parallel groups
foreach((array) $assignments as $cms_id => $assigned)
{
- $sub_id = ($cms_id == $course_id) ? 0 : $cms_id;
+ $sub_id = ($cms_id == $course_id) ? null : $cms_id;
+
+ $this->log->debug('sub id is ' . $sub_id .' for ' . $cms_id);
include_once './Services/WebServices/ECS/classes/class.ilECSImport.php';
$obj_id = ilECSImport::lookupObjIdByContentId(
@@ -264,7 +270,7 @@ protected function readAssignments($course,$course_member)
{
$pgroup_id = $tmp_pgroup->id;
}
- if($pgroup_id)
+ if(strlen($pgroup_id))
{
$this->log->debug('Found parallel group with id: '. $pgroup_id. ': for sequence number: '.$sequence_number);
@@ -295,6 +301,8 @@ protected function refreshAssignmentStatus($course_member, $obj_id, $sub_id, $as
{
include_once './Services/WebServices/ECS/classes/Course/class.ilECSCourseMemberAssignment.php';
+ $this->log->debug('Currrent sub_id = ' . $sub_id.', obj_id = ' . $obj_id);
+
$type = ilObject::_lookupType($obj_id);
if($type == 'crs')
{
@@ -351,17 +359,14 @@ protected function refreshAssignmentStatus($course_member, $obj_id, $sub_id, $as
$this->log->debug('Handled assignmnent...');
- $this->log->dump($assigned);
// Assign new participants
foreach((array) $assigned as $person_id => $person)
{
- $role = $this->lookupRole($person['role']);
+ $role = $this->lookupRole($person['role'],$type);
$role_info = ilECSMappingUtils::getRoleMappingInfo($role);
$this->log->debug('Using role info...');
- $this->log->dump($role_info);
-
$login = ilObjUser::_checkExternalAuthAccount(
$this->getMappingSettings()->getAuthMode(),
(string) $person_id
@@ -372,7 +377,6 @@ protected function refreshAssignmentStatus($course_member, $obj_id, $sub_id, $as
{
if($il_usr_id = ilObjUser::_lookupId($login))
{
- $this->log->dump($role_info);
$part->updateRoleAssignments($il_usr_id, array($part->getAutoGeneratedRoleId($role)));
}
elseif($role_info['create'])
@@ -400,7 +404,7 @@ protected function refreshAssignmentStatus($course_member, $obj_id, $sub_id, $as
if($role)
{
// Assign user
- $this->log->info('Assigning new user ' . $person_id. ' '. 'to '. ilObject::_lookupTitle($obj_id));
+ $this->log->info('Assigning new user ' . $person_id. ' '. 'to '. ilObject::_lookupTitle($obj_id).' using role: ' . $role);
$part->add($il_usr_id,$role);
}
}
@@ -444,7 +448,7 @@ protected function refreshAssignmentStatus($course_member, $obj_id, $sub_id, $as
* @param string $role_value
* @return int
*/
- protected function lookupRole($role_value)
+ protected function lookupRole($role_value, $a_obj_type)
{
$role_mappings = $this->getMappingSettings()->getRoleMappings();
@@ -455,12 +459,33 @@ protected function lookupRole($role_value)
}
foreach($role_mappings as $name => $map)
{
+ $this->log->debug('Role "name" is ' . $name);
+
// map is a string of ids seperated by ","
$exploded_map = (array) explode(',', $map);
if(in_array($role_value, $exploded_map))
{
- $this->log->debug('Role: ' . $role_value. ' maps: ' . $map);
- return $name;
+ switch($name)
+ {
+ case IL_CRS_ADMIN:
+ case IL_CRS_TUTOR:
+ case IL_CRS_MEMBER:
+ if($a_obj_type == 'crs')
+ {
+ $this->log->debug('Role: ' . $role_value. ' maps: ' . $exploded_map);
+ return $name;
+ }
+ break;
+
+ case IL_GRP_ADMIN:
+ case IL_GRP_MEMBER:
+ if($a_obj_type == 'grp')
+ {
+ $this->log->debug('Role: ' . $role_value. ' maps: ' . $exploded_map);
+ return $name;
+ }
+ break;
+ }
}
}
$this->log->info('No role assignment mapping for role ' . $role_value);
diff --git a/Services/WebServices/ECS/classes/Course/class.ilECSCourseCreationHandler.php b/Services/WebServices/ECS/classes/Course/class.ilECSCourseCreationHandler.php
index 2dc81e53400c..b9bbb6d4aeee 100644
--- a/Services/WebServices/ECS/classes/Course/class.ilECSCourseCreationHandler.php
+++ b/Services/WebServices/ECS/classes/Course/class.ilECSCourseCreationHandler.php
@@ -705,7 +705,7 @@ protected function createCourseReference($crs,$a_parent_obj_id)
* @param int $a_content_id
* @param ilObjCourse $crs
*/
- protected function setImported($a_content_id, $object, $a_ecs_id = 0, $a_sub_id = 0)
+ protected function setImported($a_content_id, $object, $a_ecs_id = 0, $a_sub_id = null)
{
include_once './Services/WebServices/ECS/classes/class.ilECSImport.php';
$import = new ilECSImport(
diff --git a/Services/WebServices/ECS/classes/class.ilAuthProviderECS.php b/Services/WebServices/ECS/classes/class.ilAuthProviderECS.php
new file mode 100644
index 000000000000..f0998f7f2361
--- /dev/null
+++ b/Services/WebServices/ECS/classes/class.ilAuthProviderECS.php
@@ -0,0 +1,397 @@
+
+ *
+ */
+class ilAuthProviderECS extends ilAuthProvider implements ilAuthProviderInterface
+{
+ protected $mid = null;
+ protected $abreviation = null;
+
+ protected $currentServer = null;
+ protected $servers = null;
+
+
+ /**
+ * Constructor
+ * @param \ilAuthCredentials $credentials
+ */
+ public function __construct(\ilAuthCredentials $credentials)
+ {
+ parent::__construct($credentials);
+
+ $this->initECSServices();
+ }
+
+ /**
+ * get abbreviation
+ *
+ * @access public
+ * @param
+ *
+ */
+ public function getAbreviation()
+ {
+ return $this->abreviation;
+ }
+
+ /**
+ * get mid
+ *
+ * @access public
+ */
+ public function getMID()
+ {
+ return $this->mid;
+ }
+
+ public function setMID($a_mid)
+ {
+ $this->mid = $a_mid;
+ }
+
+ /**
+ * Set current server
+ * @param ilECSSetting $server
+ */
+ public function setCurrentServer(ilECSSetting $server = null)
+ {
+ $this->currentServer = $server;
+ }
+
+ /**
+ * Get current server
+ * @return ilECSSetting
+ */
+ public function getCurrentServer()
+ {
+ return $this->currentServer;
+ }
+
+ /**
+ * Get server settings
+ * @return ilECSServerSettings
+ */
+ public function getServerSettings()
+ {
+ return $this->servers;
+ }
+
+
+ /**
+ * Tra ecs authentication
+ * @param \ilAuthStatus $status
+ * @return boolean
+ */
+ public function doAuthentication(\ilAuthStatus $status)
+ {
+ $this->getLogger()->debug('Starting ECS authentication');
+ if(!$this->getServerSettings()->activeServerExists())
+ {
+ $this->getLogger()->warning('No active ecs server found. Aborting');
+ $this->handleAuthenticationFail($status, 'err_wrong_login');
+ return false;
+ }
+
+ // Iterate through all active ecs instances
+ include_once './Services/WebServices/ECS/classes/class.ilECSServerSettings.php';
+ foreach($this->getServerSettings()->getServers() as $server)
+ {
+ $this->setCurrentServer($server);
+ if($this->validateHash())
+ {
+ // handle successful authentication
+ $new_usr_id = $this->handleLogin();
+ $this->getLogger()->info('ECS authentication successful.');
+ $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATED);
+ $status->setAuthenticatedUserId($new_usr_id);
+ return true;
+ }
+ }
+
+ $this->getLogger()->warning('Could not validate ecs hash for any active server.');
+ $this->handleAuthenticationFail($status, 'err_wrong_login');
+ return false;
+ }
+
+
+ /**
+ * Called from base class after successful login
+ *
+ * @param string username
+ */
+ public function handleLogin()
+ {
+ include_once('./Services/WebServices/ECS/classes/class.ilECSUser.php');
+
+ $user = new ilECSUser($_GET);
+
+ if(!$usr_id = ilObject::_lookupObjIdByImportId($user->getImportId()))
+ {
+ $username = $this->createUser($user);
+ }
+ else
+ {
+ $username = $this->updateUser($user,$usr_id);
+ }
+
+ // set user imported
+ include_once './Services/WebServices/ECS/classes/class.ilECSImport.php';
+ $import = new ilECSImport($this->getCurrentServer()->getServerId(), $usr_id);
+ $import->save();
+
+ // Store remote user data
+ include_once './Services/WebServices/ECS/classes/class.ilECSRemoteUser.php';
+ $remote = new ilECSRemoteUser();
+ $remote->setServerId($this->getCurrentServer()->getServerId());
+ $remote->setMid($this->getMID());
+ $remote->setRemoteUserId($user->getImportId());
+ $remote->setUserId(ilObjUser::_lookupId($username));
+
+ $this->getLogger()->info('Current user is: ' . $username);
+
+ if(!$remote->exists())
+ {
+ $remote->create();
+ }
+ return ilObjUser::_lookupId($username);
+ }
+
+
+ /**
+ * Validate ECS hash
+ *
+ * @access public
+ * @param string username
+ * @param string pass
+ *
+ */
+ public function validateHash()
+ {
+ global $ilLog;
+
+ // fetch hash
+ if(isset($_GET['ecs_hash']) and strlen($_GET['ecs_hash']))
+ {
+ $hash = $_GET['ecs_hash'];
+ }
+ if(isset($_GET['ecs_hash_url']))
+ {
+ $hashurl = urldecode($_GET['ecs_hash_url']);
+ $hash = basename(parse_url($hashurl,PHP_URL_PATH));
+ //$hash = urldecode($_GET['ecs_hash_url']);
+ }
+
+ $this->getLogger()->info('Using ecs hash: ' . $hash);
+ // Check if hash is valid ...
+ try
+ {
+ include_once('./Services/WebServices/ECS/classes/class.ilECSConnector.php');
+ $connector = new ilECSConnector($this->getCurrentServer());
+ $res = $connector->getAuth($hash);
+ $auths = $res->getResult();
+
+ $this->getLogger()->dump($auths, ilLogLevel::DEBUG);
+
+ if($auths->pid)
+ {
+ try
+ {
+ include_once './Services/WebServices/ECS/classes/class.ilECSCommunityReader.php';
+ $reader = ilECSCommunityReader::getInstanceByServerId($this->getCurrentServer()->getServerId());
+ $part = $reader->getParticipantByMID($auths->pid);
+
+ if(is_object($part) and is_object($part->getOrganisation()))
+ {
+ $this->abreviation = $part->getOrganisation()->getAbbreviation();
+ }
+ else
+ {
+ $this->abreviation = $auths->abbr;
+ }
+ }
+ catch(Exception $e)
+ {
+ $this->getLogger()->warning('Authentication failed with message: ' . $e->getMessage());
+ return false;
+ }
+ }
+ else
+ {
+ $this->abreviation = $auths->abbr;
+ }
+
+ $this->getLogger()->debug('Got abbreviation: ' . $this->abreviation);
+ }
+ catch(ilECSConnectorException $e)
+ {
+ $this->getLogger()->warning('Authentication failed with message: ' . $e->getMessage());
+ return false;
+ }
+
+ // read current mid
+ try
+ {
+ include_once('./Services/WebServices/ECS/classes/class.ilECSConnector.php');
+ $connector = new ilECSConnector($this->getCurrentServer());
+ $details = $connector->getAuth($hash,TRUE);
+
+ $this->getLogger()->dump($details, ilLogLevel::DEBUG);
+ $this->getLogger()->debug('Token create for mid: ' . $details->getFirstSender());
+
+ $this->setMID($details->getFirstSender());
+ }
+ catch(ilECSConnectorException $e)
+ {
+ $this->getLogger()->warning('Receiving mid failed with message: ' . $e->getMessage());
+ return false;
+ }
+ return true;
+ }
+
+
+ /**
+ * Init ECS Services
+ * @access private
+ * @param
+ *
+ */
+ private function initECSServices()
+ {
+ include_once './Services/WebServices/ECS/classes/class.ilECSServerSettings.php';
+ $this->servers = ilECSServerSettings::getInstance();
+ }
+
+ /**
+ * create new user
+ *
+ * @access protected
+ */
+ protected function createUser(ilECSUser $user)
+ {
+ global $ilClientIniFile, $ilSetting, $rbacadmin, $ilLog;
+
+ $userObj = new ilObjUser();
+
+ include_once('./Services/Authentication/classes/class.ilAuthUtils.php');
+ $local_user = ilAuthUtils::_generateLogin($this->getAbreviation() . '_' . $user->getLogin());
+
+ $newUser["login"] = $local_user;
+ $newUser["firstname"] = $user->getFirstname();
+ $newUser["lastname"] = $user->getLastname();
+ $newUser['email'] = $user->getEmail();
+ $newUser['institution'] = $user->getInstitution();
+
+ // set "plain md5" password (= no valid password)
+ $newUser["passwd"] = "";
+ $newUser["passwd_type"] = IL_PASSWD_CRYPTED;
+
+ $newUser["auth_mode"] = "ecs";
+ $newUser["profile_incomplete"] = 0;
+
+ // system data
+ $userObj->assignData($newUser);
+ $userObj->setTitle($userObj->getFullname());
+ $userObj->setDescription($userObj->getEmail());
+
+ // set user language to system language
+ $userObj->setLanguage($ilSetting->get("language"));
+
+ // Time limit
+ $userObj->setTimeLimitOwner(7);
+ $userObj->setTimeLimitUnlimited(0);
+ $userObj->setTimeLimitFrom(time() - 5);
+ $userObj->setTimeLimitUntil(time() + $ilClientIniFile->readVariable("session", "expire"));
+
+ #$now = new ilDateTime(time(), IL_CAL_UNIX);
+ #$userObj->setAgreeDate($now->get(IL_CAL_DATETIME));
+
+ // Create user in DB
+ $userObj->setOwner(6);
+ $userObj->create();
+ $userObj->setActive(1);
+ $userObj->updateOwner();
+ $userObj->saveAsNew();
+ $userObj->writePrefs();
+
+ if($global_role = $this->getCurrentServer()->getGlobalRole())
+ {
+ $rbacadmin->assignUser($this->getCurrentServer()->getGlobalRole(), $userObj->getId(), true);
+ }
+ ilObject::_writeImportId($userObj->getId(), $user->getImportId());
+
+ $this->getLogger()->info('Created new remote user with usr_id: ' . $user->getImportId());
+
+ // Send Mail
+ #$this->sendNotification($userObj);
+ $this->resetMailOptions($userObj->getId());
+
+ return $userObj->getLogin();
+ }
+
+ /**
+ * update existing user
+ *
+ * @access protected
+ */
+ protected function updateUser(ilECSUser $user,$a_local_user_id)
+ {
+ global $ilClientIniFile,$ilLog,$rbacadmin;
+
+ $user_obj = new ilObjUser($a_local_user_id);
+ $user_obj->setFirstname($user->getFirstname());
+ $user_obj->setLastname($user->getLastname());
+ $user_obj->setEmail($user->getEmail());
+ $user_obj->setInstitution($user->getInstitution());
+ $user_obj->setActive(true);
+
+ $until = $user_obj->getTimeLimitUntil();
+
+ if($until < (time() + $ilClientIniFile->readVariable('session','expire')))
+ {
+ $user_obj->setTimeLimitFrom(time() - 60);
+ $user_obj->setTimeLimitUntil(time() + $ilClientIniFile->readVariable("session","expire"));
+ }
+ $user_obj->update();
+ $user_obj->refreshLogin();
+
+ if($global_role = $this->getCurrentServer()->getGlobalRole())
+ {
+ $rbacadmin->assignUser(
+ $this->getCurrentServer()->getGlobalRole(),
+ $user_obj->getId(),
+ true
+ );
+ }
+
+ $this->resetMailOptions($a_local_user_id);
+
+ $this->getLogger()->debug('Finished update of remote user with usr_id: ' . $user->getImportId());
+ return $user_obj->getLogin();
+ }
+
+ /**
+ * Reset mail options to "local only"
+ *
+ */
+ protected function resetMailOptions($a_usr_id)
+ {
+ include_once './Services/Mail/classes/class.ilMailOptions.php';
+ $options = new ilMailOptions($a_usr_id);
+ $options->updateOptions(
+ $options->getSignature(),
+ $options->getLinebreak(),
+ IL_MAIL_LOCAL,
+ $options->getCronjobNotification()
+ );
+ }
+}
+?>
\ No newline at end of file
diff --git a/Services/WebServices/ECS/classes/class.ilECSImport.php b/Services/WebServices/ECS/classes/class.ilECSImport.php
index 7b63a48c7ed3..847369e6a76f 100644
--- a/Services/WebServices/ECS/classes/class.ilECSImport.php
+++ b/Services/WebServices/ECS/classes/class.ilECSImport.php
@@ -19,7 +19,7 @@ class ilECSImport
protected $obj_id = 0;
protected $econtent_id = 0;
protected $content_id = '';
- protected $sub_id = 0;
+ protected $sub_id = null;
protected $mid = 0;
protected $imported = false;
protected $ecs_id = 0;
@@ -73,7 +73,7 @@ public static function lookupContentId($a_server_id, $a_mid, $a_econtent_id)
* @param type $a_content_id
* @param type $a_sub_id
*/
- public static function lookupObjIdByContentId($a_server_id, $a_mid, $a_content_id, $a_sub_id = '')
+ public static function lookupObjIdByContentId($a_server_id, $a_mid, $a_content_id, $a_sub_id = null)
{
global $ilDB;
@@ -82,7 +82,7 @@ public static function lookupObjIdByContentId($a_server_id, $a_mid, $a_content_i
"AND mid = ".$ilDB->quote($a_mid,'integer')." ".
'AND server_id = '.$ilDB->quote($a_server_id,'integer').' ';
- if($a_sub_id)
+ if(!is_null($a_sub_id))
{
$query .= 'AND sub_id = '.$ilDB->quote($a_sub_id,'text');
}
@@ -260,7 +260,7 @@ public static function _lookupObjIds($a_server_id,$a_econtent_id)
* @param
*
*/
- public static function _lookupObjId($a_server_id,$a_econtent_id,$a_mid, $a_sub_id = NULL)
+ public static function _lookupObjId($a_server_id,$a_econtent_id,$a_mid, $a_sub_id = null)
{
global $ilDB;
@@ -269,7 +269,7 @@ public static function _lookupObjId($a_server_id,$a_econtent_id,$a_mid, $a_sub_i
"AND mid = ".$ilDB->quote($a_mid,'integer')." ".
'AND server_id = '.$ilDB->quote($a_server_id,'integer').' ';
- if($a_sub_id)
+ if(!is_null($a_sub_id))
{
$query .= 'AND sub_id = '.$ilDB->quote($a_sub_id,'text');
}
@@ -391,7 +391,7 @@ public static function deleteRessources($a_server_id, $a_mid, $a_econtent_ids)
* @param int econtent id
* @param int mid
*/
- public static function _isImported($a_server_id,$a_econtent_id,$a_mid, $a_sub_id = 0)
+ public static function _isImported($a_server_id,$a_econtent_id,$a_mid, $a_sub_id = null)
{
return ilECSImport::_lookupObjId($a_server_id,$a_econtent_id,$a_mid, $a_sub_id);
}
@@ -425,7 +425,7 @@ public function setSubId($a_id)
public function getSubId()
{
- return $this->sub_id ? $this->sub_id : NULL;
+ return strlen($this->sub_id) ? $this->sub_id : NULL;
}
/**
diff --git a/Services/WebServices/RPC/lib/ilServer.jar b/Services/WebServices/RPC/lib/ilServer.jar
index 231dcec75e98..4f7b70e60d42 100755
Binary files a/Services/WebServices/RPC/lib/ilServer.jar and b/Services/WebServices/RPC/lib/ilServer.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/LICENSE b/Services/WebServices/RPC/lib/jars/poi/LICENSE
index acc4be50318b..19246db04cbb 100644
--- a/Services/WebServices/RPC/lib/jars/poi/LICENSE
+++ b/Services/WebServices/RPC/lib/jars/poi/LICENSE
@@ -209,7 +209,7 @@ license terms. Your use of these subcomponents is subject to the terms
and conditions of the following licenses:
-Office Open XML schemas (ooxml-schemas-1.1.jar)
+Office Open XML schemas (ooxml-schemas-1.*.jar)
The Office Open XML schema definitions used by Apache POI are
a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
@@ -224,93 +224,65 @@ Office Open XML schemas (ooxml-schemas-1.1.jar)
[1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
[2] http://www.ecma-international.org/memento/Ecmabylaws.htm
- [3] http://www.microsoft.com/interop/osp/
- [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf
- [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf
+ [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
+ [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+ Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf
+ [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+ Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf
-DOM4J library (dom4j-1.6.1.jar)
+Bouncy Castle library (bcprov-*.jar, bcpg-*.jar, bcpkix-*.jar)
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+ 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:
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
+ 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.
- 2. 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.
+JUnit test library (junit-4.*.jar) & JaCoCo (*jacoco*)
- 3. The name "DOM4J" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of MetaStuff, Ltd. For written permission,
- please contact dom4j-info@metastuff.com.
+ Eclipse Public License - v 1.0
- 4. Products derived from this Software may not be called "DOM4J"
- nor may "DOM4J" appear in their names without prior written
- permission of MetaStuff, Ltd. DOM4J is a registered
- trademark of MetaStuff, Ltd.
-
- 5. Due credit should be given to the DOM4J Project -
- http://www.dom4j.org
-
- THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED 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
- METASTUFF, LTD. OR ITS 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.
-
-
-JUnit test library (junit-3.8.1.jar)
-
- Common Public License - v 1.0
-
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
- PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
- OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+ CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
1. DEFINITIONS
"Contribution" means:
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
-
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from
- and are distributed by that particular Contributor. A Contribution
- 'originates' from a Contributor if it was added to the Program by
- such Contributor itself or anyone acting on such Contributor's behalf.
- Contributions do not include additions to the Program which: (i) are
- separate modules of software distributed in conjunction with the
- Program under their own license agreement, and (ii) are not derivative
- works of the Program.
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates' from
+ a Contributor if it was added to the Program by such Contributor itself or
+ anyone acting on such Contributor's behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license agreement,
+ and (ii) are not derivative works of the Program.
"Contributor" means any person or entity that distributes the Program.
- "Licensed Patents " mean patent claims licensable by a Contributor which
- are necessarily infringed by the use or sale of its Contribution alone
- or when combined with the Program.
+ "Licensed Patents" mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
- "Program" means the Contributions distributed in accordance with this
- Agreement.
+ "Program" means the Contributions distributed in accordance with this Agreement.
"Recipient" means anyone who receives the Program under this Agreement,
including all Contributors.
@@ -318,190 +290,224 @@ JUnit test library (junit-3.8.1.jar)
2. GRANT OF RIGHTS
a) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free copyright license
- to reproduce, prepare derivative works of, publicly display, publicly
- perform, distribute and sublicense the Contribution of such
- Contributor, if any, and such derivative works, in source code and
- object code form.
-
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly
+ perform, distribute and sublicense the Contribution of such Contributor,
+ if any, and such derivative works, in source code and object code form.
b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under
- Licensed Patents to make, use, sell, offer to sell, import and
- otherwise transfer the Contribution of such Contributor, if any, in
- source code and object code form. This patent license shall apply to
- the combination of the Contribution and the Program if, at the time
- the Contribution is added by the Contributor, such addition of the
- Contribution causes such combination to be covered by the Licensed
- Patents. The patent license shall not apply to any other combinations
- which include the Contribution. No hardware per se is licensed
- hereunder.
-
- c) Recipient understands that although each Contributor grants the
- licenses to its Contributions set forth herein, no assurances are
- provided by any Contributor that the Program does not infringe the
- patent or other intellectual property rights of any other entity.
- Each Contributor disclaims any liability to Recipient for claims
- brought by any other entity based on infringement of intellectual
- property rights or otherwise. As a condition to exercising the rights
- and licenses granted hereunder, each Recipient hereby assumes sole
- responsibility to secure any other intellectual property rights
- needed, if any. For example, if a third party patent license is
- required to allow Recipient to distribute the Program, it is
- Recipient's responsibility to acquire that license before
- distributing the Program.
-
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code
+ and object code form. This patent license shall apply to the combination
+ of the Contribution and the Program if, at the time the Contribution is
+ added by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license
+ shall not apply to any other combinations which include the Contribution.
+ No hardware per se is licensed hereunder.
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor
+ disclaims any liability to Recipient for claims brought by any other
+ entity based on infringement of intellectual property rights or
+ otherwise. As a condition to exercising the rights and licenses granted
+ hereunder, each Recipient hereby assumes sole responsibility to secure
+ any other intellectual property rights needed, if any. For example, if
+ a third party patent license is required to allow Recipient to distribute
+ the Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright
license set forth in this Agreement.
3. REQUIREMENTS
- A Contributor may choose to distribute the Program in object code form
- under its own license agreement, provided that:
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
a) it complies with the terms and conditions of this Agreement; and
-
b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties
- and conditions, express and implied, including warranties or
- conditions of title and non-infringement, and implied warranties
- or conditions of merchantability and fitness for a particular
- purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability
- for damages, including direct, indirect, special, incidental and
- consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are
- offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a
- reasonable manner on or through a medium customarily used for
- software exchange.
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of
+ title and non-infringement, and implied warranties or conditions of
+ merchantability and fitness for a particular purpose;
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable
+ manner on or through a medium customarily used for software exchange.
When the Program is made available in source code form:
a) it must be made available under this Agreement; and
+ b) a copy of this Agreement must be included with each copy of the Program.
+ Contributors may not remove or alter any copyright notices contained
+ within the Program.
- b) a copy of this Agreement must be included with each copy of
- the Program.
-
- Contributors may not remove or alter any copyright notices contained
- within the Program.
-
- Each Contributor must identify itself as the originator of its
- Contribution, if any, in a manner that reasonably allows subsequent
- Recipients to identify the originator of the Contribution.
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
4. COMMERCIAL DISTRIBUTION
- Commercial distributors of software may accept certain responsibilities
- with respect to end users, business partners and the like. While this
- license is intended to facilitate the commercial use of the Program,
- the Contributor who includes the Program in a commercial product offering
- should do so in a manner which does not create potential liability for
- other Contributors. Therefore, if a Contributor includes the Program
- in a commercial product offering, such Contributor ("Commercial
- Contributor") hereby agrees to defend and indemnify every other
- Contributor ("Indemnified Contributor") against any losses, damages
- and costs (collectively "Losses") arising from claims, lawsuits and
- other legal actions brought by a third party against the Indemnified
- Contributor to the extent caused by the acts or omissions of such
- Commercial Contributor in connection with its distribution of the
- Program in a commercial product offering. The obligations in this
- section do not apply to any claims or Losses relating to any actual
- or alleged intellectual property infringement. In order to qualify,
- an Indemnified Contributor must: a) promptly notify the Commercial
- Contributor in writing of such claim, and b) allow the Commercial
- Contributor to control, and cooperate with the Commercial Contributor
- in, the defense and any related settlement negotiations. The Indemnified
- Contributor may participate in any such claim at its own expense.
-
- For example, a Contributor might include the Program in a commercial
- product offering, Product X. That Contributor is then a Commercial
- Contributor. If that Commercial Contributor then makes performance
- claims, or offers warranties related to Product X, those performance
- claims and warranties are such Commercial Contributor's responsibility
- alone. Under this section, the Commercial Contributor would have to
- defend claims against the other Contributors related to those
- performance claims and warranties, and if a court requires any other
- Contributor to pay any damages as a result, the Commercial Contributor
- must pay those damages.
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor
+ who includes the Program in a commercial product offering should do so in a
+ manner which does not create potential liability for other Contributors.
+ Therefore, if a Contributor includes the Program in a commercial product
+ offering, such Contributor ("Commercial Contributor") hereby agrees to
+ defend and indemnify every other Contributor ("Indemnified Contributor")
+ against any losses, damages and costs (collectively "Losses") arising from
+ claims, lawsuits and other legal actions brought by a third party against
+ the Indemnified Contributor to the extent caused by the acts or omissions
+ of such Commercial Contributor in connection with its distribution of the
+ Program in a commercial product offering. The obligations in this section
+ do not apply to any claims or Losses relating to any actual or alleged
+ intellectual property infringement. In order to qualify, an Indemnified
+ Contributor must: a) promptly notify the Commercial Contributor in writing
+ of such claim, and b) allow the Commercial Contributor to control, and
+ cooperate with the Commercial Contributor in, the defense and any related
+ settlement negotiations. The Indemnified Contributor may participate in any
+ such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
5. NO WARRANTY
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
- ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+ AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
- CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
- A PARTICULAR PURPOSE. Each Recipient is solely responsible for
- determining the appropriateness of using and distributing the Program
- and assumes all risks associated with its exercise of rights under this
- Agreement, including but not limited to the risks and costs of program
- errors, compliance with applicable laws, damage to or loss of data,
- programs or equipment, and unavailability or interruption of operations.
+ CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+ PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all risks
+ associated with its exercise of rights under this Agreement , including but
+ not limited to the risks and costs of program errors, compliance with
+ applicable laws, damage to or loss of data, programs or equipment, and
+ unavailability or interruption of operations.
6. DISCLAIMER OF LIABILITY
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
- ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
- WITHOUT LIMITATION LOST PROFITS), 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 OR
- DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
- HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+ OF SUCH DAMAGES.
7. GENERAL
If any provision of this Agreement is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this Agreement, and without further
- action by the parties hereto, such provision shall be reformed to the
- minimum extent necessary to make such provision valid and enforceable.
-
- If Recipient institutes patent litigation against a Contributor with
- respect to a patent applicable to software (including a cross-claim or
- counterclaim in a lawsuit), then any patent licenses granted by that
- Contributor to such Recipient under this Agreement shall terminate as of
- the date such litigation is filed. In addition, if Recipient institutes
- patent litigation against any entity (including a cross-claim or
- counterclaim in a lawsuit) alleging that the Program itself (excluding
- combinations of the Program with other software or hardware) infringes
- such Recipient's patent(s), then such Recipient's rights granted under
- Section 2(b) shall terminate as of the date such litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it fails
- to comply with any of the material terms or conditions of this Agreement
- and does not cure such failure in a reasonable period of time after
- becoming aware of such noncompliance. If all Recipient's rights under
- this Agreement terminate, Recipient agrees to cease use and distribution
- of the Program as soon as reasonably practicable. However, Recipient's
- obligations under this Agreement and any licenses granted by Recipient
- relating to the Program shall continue and survive.
-
- Everyone is permitted to copy and distribute copies of this Agreement,
- but in order to avoid inconsistency the Agreement is copyrighted and may
- only be modified in the following manner. The Agreement Steward reserves
- the right to publish new versions (including revisions) of this Agreement
- from time to time. No one other than the Agreement Steward has the right
- to modify this Agreement. IBM is the initial Agreement Steward. IBM may
- assign the responsibility to serve as the Agreement Steward to a suitable
- separate entity. Each new version of the Agreement will be given a
- distinguishing version number. The Program (including Contributions) may
- always be distributed subject to the version of the Agreement under which
- it was received. In addition, after a new version of the Agreement is
- published, Contributor may elect to distribute the Program (including
- its Contributions) under the new version. Except as expressly stated in
- Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
- to the intellectual property of any Contributor under this Agreement,
- whether expressly, by implication, estoppel or otherwise. All rights in
- the Program not expressly granted under this Agreement are reserved.
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by the
+ parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipient's obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement, but
+ in order to avoid inconsistency the Agreement is copyrighted and may only
+ be modified in the following manner. The Agreement Steward reserves the
+ right to publish new versions (including revisions) of this Agreement from
+ time to time. No one other than the Agreement Steward has the right to
+ modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to distribute
+ the Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+ rights or licenses to the intellectual property of any Contributor under
+ this Agreement, whether expressly, by implication, estoppel or otherwise.
+ All rights in the Program not expressly granted under this Agreement are
+ reserved.
This Agreement is governed by the laws of the State of New York and the
- intellectual property laws of the United States of America. No party to
- this Agreement will bring a legal action under this Agreement more than
- one year after the cause of action arose. Each party waives its rights
- to a jury trial in any resulting litigation.
+ intellectual property laws of the United States of America. No party to this
+ Agreement will bring a legal action under this Agreement more than one year
+ after the cause of action arose. Each party waives its rights to a jury
+ trial in any resulting litigation.
+
+Hamcrest library (hamcrest-*.jar) & CuvesAPI / Curve API
+
+ BSD License
+
+ Copyright (c) 2000-2006, www.hamcrest.org
+ All rights reserved.
+
+ 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.
+
+ Neither the name of Hamcrest nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+
+ 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.
+
+SLF4J library (slf4j-api-*.jar)
+
+ Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ 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.
\ No newline at end of file
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-3.15.jar
new file mode 100644
index 000000000000..ab368bd61a46
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-3.9-20121203.jar
deleted file mode 100644
index 0f462880ea30..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.15.jar
new file mode 100644
index 000000000000..093946c48058
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.9-20121203.jar
deleted file mode 100644
index a364cc22c6d6..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-examples-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.15.jar
new file mode 100644
index 000000000000..65a5ad022335
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.9-20121203.jar
deleted file mode 100644
index cb403fa6a753..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-excelant-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.15.jar
new file mode 100644
index 000000000000..6de995605459
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.9-20121203.jar
deleted file mode 100644
index 8792d4633ac7..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.15.jar
new file mode 100644
index 000000000000..f3ed2053bdce
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.9-20121203.jar
deleted file mode 100644
index eda4ef4945cd..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-ooxml-schemas-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.15.jar b/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.15.jar
new file mode 100644
index 000000000000..f68ae818d016
Binary files /dev/null and b/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.15.jar differ
diff --git a/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.9-20121203.jar b/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.9-20121203.jar
deleted file mode 100644
index 152085523e2d..000000000000
Binary files a/Services/WebServices/RPC/lib/jars/poi/poi-scratchpad-3.9-20121203.jar and /dev/null differ
diff --git a/Services/WebServices/maintenance.json b/Services/WebServices/maintenance.json
new file mode 100644
index 000000000000..fa80f125eba0
--- /dev/null
+++ b/Services/WebServices/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/WebServices",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/WorkflowEngine/maintenance.json b/Services/WorkflowEngine/maintenance.json
new file mode 100644
index 000000000000..3451a61dc7e7
--- /dev/null
+++ b/Services/WorkflowEngine/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "mbecker(27266)",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "mbecker(27266)",
+ "path": "Services/WorkflowEngine",
+ "belong_to_component": "Workflow Engine",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/XHTMLPage/maintenance.json b/Services/XHTMLPage/maintenance.json
new file mode 100644
index 000000000000..b26795a91349
--- /dev/null
+++ b/Services/XHTMLPage/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/XHTMLPage",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/XHTMLValidator/maintenance.json b/Services/XHTMLValidator/maintenance.json
new file mode 100644
index 000000000000..6ba355b1f995
--- /dev/null
+++ b/Services/XHTMLValidator/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/XHTMLValidator",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/Xml/maintenance.json b/Services/Xml/maintenance.json
new file mode 100644
index 000000000000..ec7f63e1c082
--- /dev/null
+++ b/Services/Xml/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/Xml",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/YUI/maintenance.json b/Services/YUI/maintenance.json
new file mode 100644
index 000000000000..276a8b328e58
--- /dev/null
+++ b/Services/YUI/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/YUI",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/Services/jQuery/maintenance.json b/Services/jQuery/maintenance.json
new file mode 100644
index 000000000000..0e3bfd91d766
--- /dev/null
+++ b/Services/jQuery/maintenance.json
@@ -0,0 +1,12 @@
+{
+ "maintenance_model": "Classic",
+ "first_maintainer": "",
+ "second_maintainer": "",
+ "implicit_maintainers": [],
+ "coordinator": "",
+ "tester": "",
+ "testcase_writer": "",
+ "path": "Services/jQuery",
+ "belong_to_component": "None",
+ "used_in_components": []
+}
\ No newline at end of file
diff --git a/docs/INSTALL b/docs/INSTALL
deleted file mode 100755
index 79d15f9be027..000000000000
--- a/docs/INSTALL
+++ /dev/null
@@ -1,721 +0,0 @@
- ==================================
- ILIAS open source - Installation
- ==================================
-
- Author: Boris H. Schuermann
-
-Table of Contents
-
-1. Introduction
-
-2. First time installation
-
- 2.1 Where to install ILIAS
-
- 2.2 First steps
-
- 2.3 Installing required third-party software
-
- 2.3.1 Libraries & utilities
-
- 2.3.2 MySQL / PHP / Apache
-
- 2.4 Installing ILIAS
-
-3. Updating ILIAS
-
-Appendix A: Note on using Apache 2
-
-
-1. I N T R O D U C T I O N
-
-
-*******************************************************************************
-
-CAUTION: THIS IS A BETA RELEASE. NOT INTENDED FOR PRODOCTIVE ENVIRONMENTS.
- ONLY FOR TEST PURPOSES.
-
-*******************************************************************************
-
-
-ILIAS is a web-based Learning Content Managament System (LCMS) developed with
-the server-side scripting language PHP and distributed as Open Source software
-under the GNU General Public License (GPL). It uses the MySQL database and the
-Apache web server. The main target operating system is Linux, but ILIAS may also
-be run on other Unix systems, Windows and Mac OS.
-
-We highly recommend to use one of the distribution related instructions
-provided at http://www.ilias.de/docu/goto.php?target=st_6487_367&client_id=docu
-
-This documentation describes how to install all the tools needed from scratch.
-Usually you should prefer to use any package manager provided by your
-distribution. Many of these tools are already installed in standard
-configurations of many distributions.
-
-The following third-party tools are necessary for running ILIAS. Release
-numbers refer to the versions tested, usually minimum versions. Newer versions
-should work, see also:
-http://www.ilias.de/docu/goto_docu_pg_6531_367.html (II. General Requirements)
-
- - Apache 1.3.44 http://www.apache.org
- - MySQL 5.1.32 http://www.mysql.com
- - PHP 5.5.x-5.6.x 7.0.x http://www.php.net
- - Zlib (libz) 1.1.4 http://www.gzip.org/zlib/
- - libpng 1.2.5 http://www.libpng.org
- - libjpeg 6b ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
- - ImageMagick 6.3.8-3 http://www.imagemagick.org
- - Info-ZIP (Zip/UnZip) http://www.info-zip.org
- - libxml2 2.6.31 http://www.xmlsoft.org
- - libxslt 1.1.22 http://www.xmlsoft.org
-
-Some functions in ILIAS require outgoing Internet mail. Therefore a sendmail
-daemon should run on your system and outgoing connections should be allowed
-on port 25.
-
-General advices on compiling the software packages:
-
- - For better readability, long command lines are broken down to multiple
- lines. In this case, a backslash at the end of a line indicates that the
- next line is to be considered a continuation.
- - Please follow the installation steps in the given order. Some steps rely
- on previously issued commands.
- - If the configure/make process fails or gets interrupted, it is a good idea
- to remove the complete source directory of the program to be built and
- start a new attempt with a source directory freshly extracted from the
- corresponding tarball. In any case you should at least delete the file
- 'config.cache' if it exists.
- - To facilitate installation you may use the Cut & Paste functions of your
- system to enter the commands in this document into your console. If you
- load this document into an editor capable of selecting colums such as
- 'nedit' this may even work for entire command sequences with multiple
- lines separated by a backslash.
-
-
-
-2 F I R S T T I M E I N S T A L L A T I O N
-
-Please visit http://www.ilias.de/docu/goto.php?target=st_6487_367&client_id=docu
-and try a install procedure that suits your OS distribution. If this fails, you
-may try to install the tools from scratch.
-
-
-2.1 Where to install ILIAS
-
-The instructions herein assume that you do not have any of the software
-packages required for running ILIAS installed on your server. Following them
-all these programs will be built from their source code and then be installed
-under /opt/ilias/. This way the programs will normally not interfere with
-packages already installed on your system and can easily be removed.
-
-Beside the third-party software also ILIAS itself and all data directories
-(including the ILIAS web space, the MySQL databases, places for file uploads,
-logfiles etc.) will be located under /opt/ilias/. For just trying out ILIAS
-this solution is fine but if you intend to use ILIAS in a production environment
-we recommend to seperate the program binaries from the user data, e.g. to
-facilitate backup and administration tasks.
-
-When compiling the components necessary to run ILIAS from source you may easily
-specify their installation location using an appropriate '--prefix' directive.
-
-
-2.2 First steps
-
-Directories where third-party components will be located:
-
- mkdir /opt/ilias
- mkdir /opt/ilias/bin
- mkdir /opt/ilias/config
- mkdir /opt/ilias/include
- mkdir /opt/ilias/lib
- mkdir /opt/ilias/libexec
- mkdir /opt/ilias/man
- mkdir /opt/ilias/man/man1
- mkdir /opt/ilias/man/man5
- mkdir /opt/ilias/src
- mkdir /opt/ilias/src/tarballs
-
-Directories for the ILIAS web space and all ILIAS related data:
-
- mkdir /opt/ilias/data
- mkdir /opt/ilias/log
- mkdir /opt/ilias/log/ilias
- mkdir /opt/ilias/mysqldata
- mkdir /opt/ilias/www
-
-Copy all source tar files to /opt/ilias/src/tarballs. GNU-Tar will extract the
-source files into separate directories in /opt/ilias/src:
-
- cd /opt/ilias/src
- tar -xzf tarballs/zlib-1.1.4.tar.gz
- tar -xzf tarballs/jpegsrc.v6b.tar.gz
- tar -xzf tarballs/libpng-1.2.5.tar.gz
- tar -xzf tarballs/ImageMagick-6.3.8-3.tar.gz
- tar -xzf tarballs/zip23.tar.gz
- tar -xzf tarballs/unzip550.tar.gz
- tar -xzf tarballs/mysql-5.1.32.tar.gz
- tar -xzf tarballs/apache_1.3.44.tar.gz
- tar -xzf tarballs/php-5.3.27.tar.gz
- tar -xzf tarballs/libxml2-2.6.31.tar.gz
- tar -xzf tarballs/libxslt-1.1.22.tar.gz
-
-The ILIAS software, its documentation and the web space directory structure is
-stored in:
-
- ilias-5.2.0.tar.gz
-
-The ILIAS tarball may also reside in /opt/ilias/src/tarballs/. After all third-
-party software has been installed it can directly be extracted into the web
-space.
-
-
-2.3 Installing required third-party software
-
-
-2.3.1 Libraries & utilities
-
-If not already available on your system, the following libraries and utilities
-must be installed:
-
- - ZLib (libz, compression library required by various other programs)
- - GD-Library (libgd, graphics library used by PHP)
- - IJG JPEG-Library (libjpeg, graphics library used by ImageMagick)
- - libpng (PNG graphics library used by libgd and Imagemagick)
- - ImageMagick (graphics tool used by ILIAS for Image format conversion)
- - Info-ZIP (Zip/UnZip tools used for compressing offline courses)
- - libxml (GNOME XML library, required by PHP for XML DOM parsing. At least a
- version >= 2.4.14 is required)
- - libxslt (GNOME XSLT library, required by PHP for using DOM XSLT features)
-
-The programs can be compiled and installed using the command sequences shown
-below. However, you may decide to install them in different locations such
-as /usr/lib or /usr/local/lib for the libaries by changing the configure option
---prefix.
-
-
-(a) Zlib
-
- cd /opt/ilias/src/zlib-1.1.4
- ./configure --prefix=/opt/ilias
- make
- make install
-
-
-(b) IJG JPEG-library
-
- cd /opt/ilias/src/jpeg-6b
- ./configure \
- --prefix=/opt/ilias \
- --enable-shared \
- --enable-static
- make
- make test
- make install
-
-
-(c) libpng
-
- libpng does not come with a configure script. You have to pick a Makefile
- suitable for your system in the ./scripts subdirectory. In the following it
- is assumed that the target system is Linux.
-
- To install libpng under /opt/ilias the 'prefix' (default: /usr/local) in the
- Makefile must be changed. In addition the location of libz should be properly
- specified: 'ZLIBLIB=/opt/ilias/lib' and 'ZLIBINC=/opt/ilias/include'. Both
- settings can be changed manually with a text editor such as 'vi' or by using
- the 'sed' commands shown below.
-
- cd /opt/ilias/src/libpng-1.2.5
-
- Now you can either edit Makefile to adjust the prefix:
-
- cp scripts/makefile.linux Makefile
- vi Makefile
-
- or you can use 'sed' to directly create a modified Makefile:
-
- sed \
- -e 's/\/usr\/local/\/opt\/ilias/g' \
- -e 's/ZLIBLIB=..\/zlib/ZLIBLIB=\/opt\/ilias\/lib/g' \
- -e 's/ZLIBINC=..\/zlib/ZLIBINC=\/opt\/ilias\/include/g' \
- scripts/makefile.linux > Makefile
-
- make
- make install
-
-
-(d) GD-Library
-
- We recommend to use the PHP bundled version of GD. Please visit the
- PHP GD requirements page at http://php.net/manual/en/image.requirements.php
- The page lists libraries for download to support various image formats.
- We recommend to install a version that at least supports gif, jpeg and png.
-
- Configure options for PHP needed for GD:
- --with-gd --with-jpeg-dir=DIR --with-png-dir=DIR (and more, if wanted)
-
-
-(e) ImageMagick
-
- cd /opt/ilias/src/ImageMagick-6.3.8
- ./configure \
- --prefix=/opt/ilias \
- --without-perl \
- --enable-lzw \
- --enable-delegate-build \
- --enable-shared
- make
- make install
-
- If you do not have X installed on your system you must use the configure
- option '--without-x' in addition.
-
- At the end of the configure process a configuration summary is displayed.
- Please check if 'yes' is shown as the configured value for JPEG and PNG. If
- not, ImageMagick could probably not find the previously installed libjpeg
- and libpng and you may experience problems when doing image manipulations
- in ILIAS such as editing a clickable imagemap or when thumbnail pictures
- are being created. This can be solved by setting the variables LDFLAGS and
- CFLAGS to include /opt/ilias/lib and /opt/ilias/include before you execute
- the 'configure' script.
-
- Note on building ImageMagick under SuSE Linux: The build process might
- fail with an error message claiming that the file 'byteorder.h' cannot be
- found in /usr/include/sys/. Under SuSE it is located in /usr/include/asm/.
- Creating a symbolic link will solve the problem:
-
- cd /usr/include/sys
- ln -s ../asm/byteorder.h byteorder.h
-
-
-(f) Info-ZIP
-
- cd /opt/ilias/src/zip-2.3
- make -f unix/Makefile generic
- make -f unix/Makefile install
- cd /opt/ilias/src/unzip-5.50
- make -f unix/Makefile generic
- make -f unix/Makefile install
-
- By default Zip and Unzip will be installed in /usr/local/bin. As the zip and
- unzip tools are generelly helpful, you may put them there. Otherwise you may
- install them under /opt/ilias by modifying the Makefile.
-
-
-(g) libxml
-
- cd /opt/ilias/src/libxml2-2.6.31
- ./configure \
- --prefix=/opt/ilias \
- --without-python
- make
- make install
-
-
-(h) libxslt
-
- cd /opt/ilias/src/libxslt-1.1.22
- ./configure \
- --prefix=/opt/ilias \
- --with-libxml-prefix=/opt/ilias \
- --without-python
- make
- make install
-
-
-2.3.2 MySQL / PHP / Apache
-
-After the libraries and tools are set up you may install the main third-party
-components:
-
-
-(a) MySQL database
-
- Using one of the actual binaries provided at the MySQL web site is always the best idea.
- However, if you decide to build MySQL from scratch, here are the basic steps:
-
- Configure & make:
-
- cd /opt/ilias/src/mysql-5.1.x
- ./configure \
- --prefix=/opt/ilias \
- --localstatedir=/opt/ilias/mysqldata \
- --sysconfdir=/opt/ilias/config
- make
- make install
-
- Now install MySQL's default databases:
-
- scripts/mysql_install_db
-
- Create link to init script:
-
- cd /opt/ilias/share/mysql
- chmod 744 mysql.server
- cp mysql.server /etc/rc.d/init.d/
- cd /etc/rc.d/rc3.d
- ln -s ../init.d/mysql.server S72mysql.server
- ln -s ../init.d/mysql.server K72mysql.server
-
- The directories containing the init script and the links to it may vary.
- Please check the default runlevel for your system in /etc/inittab. On
- Solaris systems the init scripts can usually be found in /etc/init.d, the
- links in the runlevel specific directories like /etc/rc3.d.
-
- It is recommended not to run the mysql daemon as root. The daemon user can
- be set in /etc/rc.d/init.d/mysql.server. On many Linux/Unix system you may
- create a daemon user account and group by entering:
-
- groupadd mysql
- useradd -g mysql mysql
-
- File ownership for /opt/ilias/mysqldata needs to be set accordingly:
-
- chown -R mysql /opt/ilias/mysqldata
- chgrp -R mysql /opt/ilias/mysqldata
-
- Create a MySQL configuration file and link to it:
-
- cd /opt/ilias/share/mysql
- cp my-small|medium|large|huge.cnf /opt/ilias/config/my.cnf
- cd /opt/ilias/mysqldata
- ln -s /opt/ilias/config/my.cnf
-
- MySQL version 5.1.x comes with sample configuration files for different
- memory sizes (small, medium, large, huge). Please select the appropriate
- file and apply further changes to /opt/ilias/config/my.cnf according to your
- specific needs. Since ILIAS currently does not rely on InnoDB support in
- MySQL you may disable it by adding the 'skip-innodb' option to the mysqld
- section of the my.cnf file.
-
- Create link to error log file:
-
- cd /opt/ilias/log
- ln -s /opt/ilias/mysqldata/$HOSTNAME.err
-
- If desired you may also redirect database logging from /opt/ilias/mysqldata
- (default) to /opt/ilias/log by modifying the log-bin (or log-update) option
- in my.cnf.
-
- Check if MySQL daemon can be started/stopped:
-
- /etc/rc.d/init.d/mysql.server start
- /etc/rc.d/init.d/mysql.server stop
-
- Please note that unless a password has been set for the MySQL root account,
- any user can start the MySQL client with all privileges. It is advisable to
- change the password for the root account using the follwing command:
-
- /opt/ilias/bin/mysqladmin -u root password
-
{TITLE}
+{TITLE}
{SECTION}
diff --git a/src/UI/templates/default/Image/tpl.image.html b/src/UI/templates/default/Image/tpl.image.html
index cd1a7722887c..d837201ad58e 100755
--- a/src/UI/templates/default/Image/tpl.image.html
+++ b/src/UI/templates/default/Image/tpl.image.html
@@ -1,7 +1,15 @@
+
+
+
+
".
+ " ".
" ".
"
".
diff --git a/webservice/soap/classes/class.ilSoapTestAdministration.php b/webservice/soap/classes/class.ilSoapTestAdministration.php
index 1ce44d4411ef..85b82b57237b 100644
--- a/webservice/soap/classes/class.ilSoapTestAdministration.php
+++ b/webservice/soap/classes/class.ilSoapTestAdministration.php
@@ -622,10 +622,9 @@ public function removeTestResults($sid,$test_ref_id,$a_user_ids)
$a_user_ids = $a_user_ids['item'];
}
- foreach((array) $a_user_ids as $user_id)
- {
- $tst->removeTestResultsForUser($user_id);
- }
+ include_once './Modules/Test/classes/class.ilObjTest.php';
+ $tst->removeTestResultsByUserIds((array) $a_user_ids);
+
return true;
}
".
"
".
@@ -112,6 +127,7 @@ public function test_render_content_full() {
$expected_html =
"Card Title
". "".
" ![\"alt\"](\"src\")
".
+ " ".
"
';
diff --git a/tests/UI/Component/Image/ImageTest.php b/tests/UI/Component/Image/ImageTest.php
index 0f310cba0339..f7166e7b85d0 100644
--- a/tests/UI/Component/Image/ImageTest.php
+++ b/tests/UI/Component/Image/ImageTest.php
@@ -64,6 +64,13 @@ public function test_set_alt() {
$this->assertEquals("newAlt", $i->getAlt());
}
+ public function test_set_action() {
+ $f = $this->getImageFactory();
+ $i = $f->standard("source","alt");
+ $i = $i->withAction("newAction");
+ $this->assertEquals("newAction", $i->getAction());
+ }
+
public function test_invalid_source(){
$f = $this->getImageFactory();
@@ -117,4 +124,16 @@ public function test_render_alt_escaping() {
$this->assertEquals($expected, $html);
}
+
+ public function test_render_with_action() {
+ $f = $this->getImageFactory();
+ $r = $this->getDefaultRenderer();
+ $i = $f->standard("source", "alt")->withAction("action");
+
+ $html = $this->normalizeHTML($r->render($i));
+
+ $expected = "![\"alt\"](\"source\")
";
+
+ $this->assertEquals($expected, $html);
+ }
}
diff --git a/tests/UI/Component/Panel/PanelTest.php b/tests/UI/Component/Panel/PanelTest.php
index f9e7c3d0ae55..407991ea0ae8 100644
--- a/tests/UI/Component/Panel/PanelTest.php
+++ b/tests/UI/Component/Panel/PanelTest.php
@@ -139,7 +139,7 @@ public function test_render_sub() {
" ".
"
";
@@ -171,7 +171,7 @@ public function test_render_report() {
" ".
"
".
@@ -120,4 +136,26 @@ public function test_render_content_full() {
$this->assertHTMLEquals($expected_html, $html);
}
+
+ public function test_render_content_with_highlight() {
+ $f = $this->getFactory();
+ $r = $this->getDefaultRenderer();
+
+ $image = $f->image()->standard("src","alt");
+
+ $c = $f->card("Card Title",$image)->withHighlight(true);
+
+ $html = $r->render($c);
+
+ $expected_html =
+ "Card Title
". "".
+ " ".
+ " ".
+ "
";
+
+ $this->assertHTMLEquals($expected_html, $html);
+ }
}
diff --git a/tests/UI/Component/ComponentHelperTest.php b/tests/UI/Component/ComponentHelperTest.php
index 07af554d42a7..ecb54cd63168 100644
--- a/tests/UI/Component/ComponentHelperTest.php
+++ b/tests/UI/Component/ComponentHelperTest.php
@@ -16,6 +16,9 @@ public function _checkIntArg($which, $value) {
public function _checkStringArg($which, $value) {
$this->checkStringArg($which, $value);
}
+ public function _checkFloatArg($which, $value) {
+ $this->checkFloatArg($which, $value);
+ }
public function _checkArgInstanceOf($which, $value, $class) {
$this->checkArgInstanceOf($which, $value, $class);
}
@@ -69,7 +72,7 @@ public function test_check_arg_not_ok() {
public function test_check_int_arg_ok() {
try {
- $this->mock->_checkIntArg("some_arg", 1);
+ $this->mock->_checkIntArg("some_arg", 1);
}
catch (\InvalidArgumentException $e) {
$this->assertFalse("This should not happen.");
@@ -88,7 +91,7 @@ public function test_check_int_arg_not_ok() {
public function test_check_string_arg_ok() {
try {
- $this->mock->_checkStringArg("some_arg", "bar");
+ $this->mock->_checkStringArg("some_arg", "bar");
}
catch (\InvalidArgumentException $e) {
$this->assertFalse("This should not happen.");
@@ -107,7 +110,7 @@ public function test_check_string_arg_not_ok() {
public function test_check_arg_instanceof_ok() {
try {
- $this->mock->_checkArgInstanceOf("some_arg", $this->mock, ComponentMock::class);
+ $this->mock->_checkArgInstanceOf("some_arg", $this->mock, ComponentMock::class);
}
catch (\InvalidArgumentException $e) {
$this->assertFalse("This should not happen.");
@@ -128,7 +131,7 @@ public function test_check_arg_instanceof_not_ok() {
public function test_check_arg_is_element_ok() {
try {
- $this->mock->_checkArgIsElement("some_arg", "bar", array("foo", "bar"), "foobar");
+ $this->mock->_checkArgIsElement("some_arg", "bar", array("foo", "bar"), "foobar");
}
catch (\InvalidArgumentException $e) {
$this->assertFalse("This should not happen.");
@@ -137,7 +140,7 @@ public function test_check_arg_is_element_ok() {
public function test_check_string_arg_is_element_not_ok() {
try {
- $this->mock->_checkArgIsElement("some_arg", "baz", array("foo", "bar"), "foobar");
+ $this->mock->_checkArgIsElement("some_arg", "baz", array("foo", "bar"), "foobar");
$this->assertFalse("This should not happen.");
}
catch (\InvalidArgumentException $e) {
@@ -279,4 +282,23 @@ public function test_check_arg_list_not_ok_2() {
$this->assertEquals("Argument 'some_arg': $m", $e->getMessage());
}
}
+
+ public function test_check_float_arg_ok() {
+ try {
+ $this->mock->_checkFloatArg("some_arg", 1.73);
+ }
+ catch (\InvalidArgumentException $e) {
+ $this->assertFalse("This should not happen.");
+ }
+ }
+
+ public function test_check_float_arg_not_ok() {
+ try {
+ $this->mock->_checkFloatArg("some_arg", "foo");
+ $this->assertFalse("This should not happen.");
+ }
+ catch (\InvalidArgumentException $e) {
+ $this->assertEquals("Argument 'some_arg': expected float, got string 'foo'", $e->getMessage());
+ }
+ }
}
diff --git a/tests/UI/Component/Deck/DeckTest.php b/tests/UI/Component/Deck/DeckTest.php
index 42cf2cd30f5f..a6273bb3a529 100644
--- a/tests/UI/Component/Deck/DeckTest.php
+++ b/tests/UI/Component/Deck/DeckTest.php
@@ -78,17 +78,17 @@ public function test_render_content() {
$expected_html =
'".
+ "
".
+ "Card Title
". + "
-
-
-
+
+
+
Card Title
Card Title
Card Title
Card Title
Card Title
Card Title
-
-
-
+
+
+
Card Title
Card Title
Card Title
Card Title
Card Title
Card Title
-
+
Card Title
Card Title
".
" ".
"
".
- " ".
+ " ".
"
".
" Card Title
Card Title
".
" ".
"
".
- " ".
+ " ".
"
".
"