diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/classes/ForumEntry.php | 4 | ||||
| -rw-r--r-- | lib/classes/exportdocument/ExportPDF.class.php | 5 | ||||
| -rw-r--r-- | lib/classes/librarysearch/LibraryDocument.class.php | 4 | ||||
| -rw-r--r-- | lib/phplib/Seminar_Auth.class.php | 2 | ||||
| -rw-r--r-- | lib/visual.inc.php | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/lib/classes/ForumEntry.php b/lib/classes/ForumEntry.php index f98e59c..7ac5306 100644 --- a/lib/classes/ForumEntry.php +++ b/lib/classes/ForumEntry.php @@ -218,7 +218,7 @@ class ForumEntry implements PrivacyObject array_pop($path); $data = array_pop($path); - return $data['id'] ?: false; + return $data['id'] ?? false; } @@ -1029,7 +1029,7 @@ class ForumEntry implements PrivacyObject $stmt = DBManager::get()->prepare("SELECT chdate FROM forum_entries WHERE lft > ? AND rgt < ? AND seminar_id = ? ORDER BY chdate DESC LIMIT 1"); - $stmt->execute([$parent['lft'], $parent['rgt'], $parent['seminar_id']]); + $stmt->execute([$parent['lft'] ?? null, $parent['rgt'] ?? null, $parent['seminar_id'] ?? null]); $chdate = $stmt->fetchColumn(); $stmt_insert = DBManager::get()->prepare("UPDATE forum_entries diff --git a/lib/classes/exportdocument/ExportPDF.class.php b/lib/classes/exportdocument/ExportPDF.class.php index 8645f5b..915cfde 100644 --- a/lib/classes/exportdocument/ExportPDF.class.php +++ b/lib/classes/exportdocument/ExportPDF.class.php @@ -115,12 +115,15 @@ class ExportPDF extends TCPDF implements ExportDocument // Fetch headers from url, handle possible redirects do { $headers = get_headers($url, true, get_default_http_stream_context($url)); + if (!$headers) { + break; + } list(, $status) = explode(' ', $headers[0]); $url = $headers['Location'] ?? $headers['location'] ?? $url; } while (in_array($status, [300, 301, 302, 303, 305, 307])); - $status = $status ?: 404; + $status = $status ?? 404; // Replace image with link on error (and not internal), otherwise return sainitized // url diff --git a/lib/classes/librarysearch/LibraryDocument.class.php b/lib/classes/librarysearch/LibraryDocument.class.php index 46e11b2..c1d297e 100644 --- a/lib/classes/librarysearch/LibraryDocument.class.php +++ b/lib/classes/librarysearch/LibraryDocument.class.php @@ -321,8 +321,8 @@ class LibraryDocument $doc->csl_data = $data['csl_data']; $doc->datafields = $data['datafields']; $doc->search_params = $data['search_params']; - $doc->catalog = $data['catalog']; - $doc->opac_link = $data['opac_link']; + $doc->catalog = $data['catalog'] ?? null; + $doc->opac_link = $data['opac_link'] ?? null; return $doc; } diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.class.php index 0a566d1..4849ece 100644 --- a/lib/phplib/Seminar_Auth.class.php +++ b/lib/phplib/Seminar_Auth.class.php @@ -326,7 +326,7 @@ class Seminar_Auth // load the default set of plugins PluginEngine::loadPlugins(); - if (Request::get('loginname') && !$_COOKIE[get_class($GLOBALS['sess'])]) { + if (Request::get('loginname') && empty($_COOKIE[get_class($GLOBALS['sess'])])) { $login_template = $GLOBALS['template_factory']->open('nocookies'); } else if (isset($this->need_email_activation)) { $this->unauth(); diff --git a/lib/visual.inc.php b/lib/visual.inc.php index 9dca1d1..66f8e65 100644 --- a/lib/visual.inc.php +++ b/lib/visual.inc.php @@ -648,7 +648,7 @@ function TransformInternalLinks($str){ $domain_data['domains'] = preg_replace("'\|[^/|]*'", '$0[^/]*?', $domain_data['domains']); $domain_data['domains'] = mb_substr($domain_data['domains'], 1); $domain_data['user_domain'] = preg_replace("'^({$domain_data['domains']})(.*)$'i", "\\1", $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); - $domain_data['user_domain_scheme'] = 'http' . (($_SERVER['HTTPS'] || $_SERVER['SERVER_PORT'] == 443) ? 's' : '') . '://'; + $domain_data['user_domain_scheme'] = 'http' . ((!empty($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443) ? 's' : '') . '://'; $GLOBALS['TransformInternalLinks_domainData'] = $domain_data; } $domain_data = $GLOBALS['TransformInternalLinks_domainData']; |