Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Removed most of ERRORS in inspection profile #172

Closed
wants to merge 1 commit into from
Closed

Removed most of ERRORS in inspection profile #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions classes/Conf/Workflows/class.xoctWorkflowTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ protected function getColumnValue(string $column, /*array*/ $row, int $format =
)->withLabel(self::dic()->language()->txt('actions'));
return self::output()->getHTML($actions);
}

return '';
}

/**
Expand Down
9 changes: 4 additions & 5 deletions classes/Event/class.xoctEventGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ public function __construct(
PaellaConfigStorageService $paellaConfigStorageService,
PaellaConfigServiceFactory $paellaConfigServiceFactory,
Container $dic
)
{
) {
$this->objectSettings = $objectSettings;
$this->parent_gui = $parent_gui;
$this->event_repository = $event_repository;
Expand Down Expand Up @@ -1269,10 +1268,10 @@ protected function getIntroTextHTML()
return $intro_text;
}

protected function createHyperlinks(string $intro_text) : string
protected function createHyperlinks(string $intro_text): string
{
preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/))#', $intro_text, $urls);
preg_match_all('#\bwww[.][^,\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/))#', $intro_text, $urls_www);
preg_match_all('#\bhttps?://[^,\s()<>]+(?:\([\w]+\)|([^[:punct:]\s]|/))#', $intro_text, $urls);
preg_match_all('#\bwww[.][^,\s()<>]+(?:\([\w]+\)|([^[:punct:]\s]|/))#', $intro_text, $urls_www);
foreach ($urls[0] as $url) {
$replacement = "<a href='" . $url . "'>" . $url . "</a>";
$intro_text = str_replace($url, $replacement, $intro_text);
Expand Down
7 changes: 3 additions & 4 deletions classes/Event/class.xoctEventTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ public function __construct(
array $md_fields,
array $data,
string $lang_key
)
{
) {
$this->parent_obj = $a_parent_obj;
$this->md_fields = $md_fields;
$this->lang_key = $lang_key;
Expand Down Expand Up @@ -452,8 +451,8 @@ public static function setOwnerFieldVisibility($visible, int $obj_id)
$table_id = self::getGeneratedPrefix($obj_id);
$query = self::dic()->database()->query("SELECT * FROM table_properties WHERE table_id = " . self::dic()->database()->quote($table_id, "text") . " AND property = 'selfields'");
while ($rec = self::dic()->database()->fetchAssoc($query)) {
$selfields = unserialize($rec['value']);
if ($selfields['event_owner'] == $visible) {
$selfields = unserialize($rec['value'], ['allowed_classes' => false]);
if (isset($selfields['event_owner']) && $selfields['event_owner'] == $visible) {
continue;
}
$selfields['event_owner'] = (bool)$visible;
Expand Down
1 change: 1 addition & 0 deletions classes/Event/class.xoctReportingModalGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class xoctReportingModalGUI extends ilModalGUI
protected $parent_gui;
/**
* xoctReportingFormGUI constructor.
* @noinspection MagicMethodsValidityInspection
*/
public function __construct($parent_gui, $type)
{
Expand Down
24 changes: 18 additions & 6 deletions classes/Request/class.xoctBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,26 @@ class xoctBase
public function __construct()
{
$version = xoctRequest::root()->base()->version()->get();
$this->setApiVersion($version->default);
$this->setApiVersions($version->versions);
if (isset($version->default)) {
$this->setApiVersion($version->default);
}
if (isset($version->versions)) {
$this->setApiVersions($version->versions);
}

$org = xoctRequest::root()->organization()->get();
$this->setOrganizationId($org->id);
$this->setOrganizationAnonymousRole($org->anonymousRole);
$this->setOrganizationAdminRole($org->adminRole);
$this->setOrganizationName($org->name);
if (isset($org->id)) {
$this->setOrganizationId($org->id);
}
if (isset($org->anonymousRole)) {
$this->setOrganizationAnonymousRole($org->anonymousRole);
}
if (isset($org->adminRole)) {
$this->setOrganizationAdminRole($org->adminRole);
}
if (isset($org->name)) {
$this->setOrganizationName($org->name);
}
}


Expand Down
53 changes: 0 additions & 53 deletions classes/Request/class.xoctCurl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ class xoctCurl
public static function init(xoctCurlSettings $xoctCurlSettings)
{
self::$ip_v4 = $xoctCurlSettings->isIpV4();
self::$verify_host = $xoctCurlSettings->isVerifyHost();
self::$verify_peer = $xoctCurlSettings->isVerifyHost();
self::$username = $xoctCurlSettings->getUsername();
self::$password = $xoctCurlSettings->getPassword();
}
Expand Down Expand Up @@ -65,13 +63,6 @@ protected function execute()
if ($this->getUsername() and $this->getPassword()) {
curl_setopt($ch, CURLOPT_USERPWD, $this->getUsername() . ':' . $this->getPassword());
}

if (!$this->isVerifyHost()) {
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
}
if (!$this->isVerifyPeer()) {
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
}
}

curl_setopt($ch, CURLOPT_URL, $this->getUrl());
Expand Down Expand Up @@ -189,14 +180,6 @@ protected function execute()
* @var string
*/
protected static $password = '';
/**
* @var bool
*/
protected static $verify_peer = true;
/**
* @var bool
*/
protected static $verify_host = true;
/**
* @var string
*/
Expand Down Expand Up @@ -256,42 +239,6 @@ public function setUrl($url)
}


/**
* @return boolean
*/
public function isVerifyHost()
{
return self::$verify_host;
}


/**
* @param boolean $verify_host
*/
public function setVerifyHost($verify_host)
{
self::$verify_host = $verify_host;
}


/**
* @return boolean
*/
public function isVerifyPeer()
{
return self::$verify_peer;
}


/**
* @param boolean $verify_peer
*/
public function setVerifyPeer($verify_peer)
{
self::$verify_peer = $verify_peer;
}


/**
* @return string
*/
Expand Down
35 changes: 0 additions & 35 deletions classes/Request/class.xoctCurlSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,41 +46,6 @@ public function setIpV4($ip_v4)
}


/**
* @return boolean
*/
public function isVerifyHost()
{
return $this->verify_host;
}


/**
* @param boolean $verify_host
*/
public function setVerifyHost($verify_host)
{
$this->verify_host = $verify_host;
}


/**
* @return boolean
*/
public function isVerifyPeer()
{
return $this->verify_peer;
}


/**
* @param boolean $verify_peer
*/
public function setVerifyPeer($verify_peer)
{
$this->verify_peer = $verify_peer;
}


/**
* @return string
Expand Down
19 changes: 10 additions & 9 deletions classes/class.ilObjOpenCastAccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,25 +399,26 @@ public static function activateMemberUpload($ref_id)
}


/**
* @return int
*/
public static function getParentId($get_ref_id = false, $ref_id = false)
public static function getParentId($get_ref_id = false, int $ref_id = null): ?int
{
foreach (self::dic()->repositoryTree()->getNodePath($ref_id ? $ref_id : $_GET['ref_id']) as $node) {
if ($node['type'] == 'crs' || $node['type'] == 'grp') {
$id = $node[$get_ref_id ? 'child' : 'obj_id'];
global $DIC;
$parent_id = null;
$for_ref_id = $ref_id ?? $_GET['ref_id'] ?? 1;
foreach ($DIC->repositoryTree()->getNodePath($for_ref_id) as $node) {
if ($node['type'] ?? '' === 'crs' || $node['type']??'' === 'grp') {
$parent_id = $node[$get_ref_id ? 'child' : 'obj_id'];
break;
}
}

return $id;
return $parent_id;
}


/**
* @return array
*/
public static function getAllParticipants()
public static function getAllParticipants(): array
{
return array_merge(self::getMembers(), self::getTutors(), self::getAdmins());
}
Expand Down
2 changes: 1 addition & 1 deletion classes/class.ilObjOpenCastGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ public function showDeleteConfirmation($a_ids, $a_supress_message = false)
$cgui->setCancel($this->ilias_dic->language()->txt("cancel"), "cancelDelete");
$cgui->setConfirm($this->ilias_dic->language()->txt("confirm"), "confirmedDelete");

$form_name = "cgui_" . md5(uniqid());
$form_name = "cgui_" . md5(uniqid('', true));
$cgui->setFormName($form_name);

$deps = [];
Expand Down
2 changes: 0 additions & 2 deletions src/Chat/GUI/open_chat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
curl_setopt($ch, CURLOPT_PORT, $port);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
$output = curl_exec($ch);
$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);

Expand Down
4 changes: 2 additions & 2 deletions src/Chat/Model/Token.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ class Token
*/
protected $token;


/**
* Token constructor.
*
* @param string $token
* @throws \Exception
*/
public function __construct($token = '')
{
if ($token === '') {
$token = openssl_random_pseudo_bytes(16);
$token = random_bytes(16);
$token = bin2hex($token);
}
$this->token = $token;
Expand Down
12 changes: 6 additions & 6 deletions src/Model/ACL/ACLUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ public function getOwnerUsernameOfEvent(Event $event)
public function removeOwnerFromACL(ACL $acl): ACL
{
$standard_roles = PluginConfig::getConfig(PluginConfig::F_STD_ROLES);
$ACLEntries = $acl->getEntries();
foreach ($ACLEntries as $i => $acl) {
if ((strpos($acl->getRole(), str_replace('{IDENTIFIER}', '', xoctUser::getOwnerRolePrefix())) !== false)
&& !in_array($acl->getRole(), $standard_roles)) {
unset($ACLEntries[$i]);
$acl_entries = $acl->getEntries();
foreach ($acl_entries as $i => $acl_entry) {
if ((strpos($acl_entry->getRole(), str_replace('{IDENTIFIER}', '', xoctUser::getOwnerRolePrefix())) !== false)
&& !in_array($acl_entry->getRole(), $standard_roles)) {
unset($acl_entries[$i]);
}
}
return new ACL($ACLEntries);
return new ACL($acl_entries);
}

public function getOwnerAclOfEvent(Event $event): ACL
Expand Down
Loading