Merge branch 'cleanup' into 'master'

cleanup of code See merge request !55

Merge branch 'cleanup' into 'master'
cleanup of code See merge request !55
9274cb19 · Wolfgang Knopki · 714598f9 · e52258ab · 714598f9 · 714598f9
Commit 9274cb19 authored 4 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 263 deletions
+0 -263
--- a/mymodule/templates/.gitkeep
+++ b/mymodule/templates/.gitkeep
--- a/mymodule/templates/selectsource.tpl.php
+++ b/mymodule/templates/selectsource.tpl.php
-<?php
-$this->data['header'] = $this->t('{multiauth:multiauth:select_source_header}');
-$this->includeAtTemplateBase('includes/header.php');
-?>
-
-<h2><?php echo 'Benutzerkonto auswählen' ?></h2>
-
-<p><?php echo 'Bitte wählen Sie ein Benutzerkonto aus, mit dem Sie sich authentifizieren wollen:' ?></p>
-
-<form action="/idp/module.php/multiauth/selectsource.php" method="get">
-    <input type="hidden" name="AuthState" value="<?php echo htmlspecialchars($this->data['authstate']); ?>" />
-<?php
-echo '<div>';
-foreach ($this->data['sources'] as $source) {
-    if ($source['source'] === $this->data['preferred']) {
-        $autofocus = ' autofocus="autofocus"';
-    } else {
-        $autofocus = '';
-    }
-    $name = 'src-'.base64_encode($source['source']);
-    echo '<input type="submit" class="'.htmlspecialchars($source['css_class']).'"  name="'.htmlspecialchars($name).'"'.$autofocus.' '.
-        'id="button-'.htmlspecialchars($source['source']).'" '.
-        'value="'.htmlspecialchars($source['text']).'" ></input>';
-}
-echo '</div>';
-?>
-</form>
-<?php $this->includeAtTemplateBase('includes/footer.php');
--- a/mymodule/themes/fancytheme/default/includes/footer.php
+++ b/mymodule/themes/fancytheme/default/includes/footer.php
-<?php
-if (!empty($this->data['htmlinject']['htmlContentPost'])) {
-    foreach ($this->data['htmlinject']['htmlContentPost'] as $c) {
-        echo $c;
-    }
-}
-?>
-
-    <script src="/js/headfoot.js"></script>
-
-
-            </div><!-- #content -->
-            <div id="footer">
-                <hr />
-                <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/ssplogo-fish-small.png" alt="Small fish logo" style="float: right" />		
-                    simplesamlphp Copyright &copy; 2007-2019 <a href="http://uninett.no/">UNINETT AS</a>
-
-                <br style="clear: right" />
-
-            </div><!-- #footer -->
-        </div><!-- #wrap -->
-    </body>
-</html>
--- a/mymodule/themes/fancytheme/default/includes/header.php
+++ b/mymodule/themes/fancytheme/default/includes/header.php
-<?php
-
-/**
- * Support the htmlinject hook, which allows modules to change header, pre and post body on all pages.
- */
-$this->data['htmlinject'] = [
-    'htmlContentPre' => [],
-    'htmlContentPost' => [],
-    'htmlContentHead' => [],
-];
-
-$jquery = [];
-if (array_key_exists('jquery', $this->data)) {
-    $jquery = $this->data['jquery'];
-}
-
-if (array_key_exists('pageid', $this->data)) {
-    $hookinfo = [
-        'pre' => &$this->data['htmlinject']['htmlContentPre'],
-        'post' => &$this->data['htmlinject']['htmlContentPost'],
-        'head' => &$this->data['htmlinject']['htmlContentHead'],
-        'jquery' => &$jquery,
-        'page' => $this->data['pageid']
-    ];
-
-    SimpleSAML\Module::callHooks('htmlinject', $hookinfo);
-}
-// - o - o - o - o - o - o - o - o - o - o - o - o -
-
-/**
- * Do not allow to frame SimpleSAMLphp pages from another location.
- * This prevents clickjacking attacks in modern browsers.
- *
- * If you don't want any framing at all you can even change this to
- * 'DENY', or comment it out if you actually want to allow foreign
- * sites to put SimpleSAMLphp in a frame. The latter is however
- * probably not a good security practice.
- */
-header('X-Frame-Options: SAMEORIGIN');
-
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
-<!-- <link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>resources/default.css" /> -->
-<link rel="icon" type="image/icon" href="/<?php echo $this->data['baseurlpath']; ?>resources/icons/favicon.ico" />
-<title>M4_LAB: User Login</title>
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-<link rel="stylesheet" type="text/css" href="/css/bootstrap.css"/>
-<link rel="stylesheet" type="text/css"  href="/css/Login-Form-Clean.css"/>
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-    
-<?php
-
-if (!empty($jquery)) {
-    $version = '1.8';
-    if (array_key_exists('version', $jquery)) {
-        $version = $jquery['version'];
-    }
-
-    if ($version == '1.8') {
-        if (isset($jquery['core']) && $jquery['core']) {
-            echo '<script type="text/javascript" src="/'.$this->data['baseurlpath'].'resources/jquery-1.8.js"></script>'."\n";
-        }
-
-        if (isset($jquery['ui']) && $jquery['ui']) {
-            echo '<script type="text/javascript" src="/'.$this->data['baseurlpath'].'resources/jquery-ui-1.8.js"></script>'."\n";
-        }
-
-        if (isset($jquery['css']) && $jquery['css']) {
-            echo '<link rel="stylesheet" media="screen" type="text/css" href="/'.$this->data['baseurlpath'].
-                'resources/uitheme1.8/jquery-ui.css" />'."\n";
-        }
-    }
-}
-
-if (isset($this->data['clipboard.js'])) {
-    echo '<script type="text/javascript" src="/'.$this->data['baseurlpath'].'resources/clipboard.min.js"></script>'."\n";
-}
-
-if (!empty($this->data['htmlinject']['htmlContentHead'])) {
-    foreach ($this->data['htmlinject']['htmlContentHead'] as $c) {
-        echo $c;
-    }
-}
-
-if ($this->isLanguageRTL()) {
-    ?>
-    <link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>resources/default-rtl.css" />
-<?php
-}
-?>
-    <meta name="robots" content="noindex, nofollow" />
-
-<?php
-if (array_key_exists('head', $this->data)) {
-    echo '<!-- head -->'.$this->data['head'].'<!-- /head -->';
-}
-?>
-</head>
-<?php
-$onLoad = '';
-if (array_key_exists('autofocus', $this->data)) {
-    $onLoad .= ' onload="SimpleSAML_focus(\''.$this->data['autofocus'].'\');"';
-}
-?>
-<body class="text-center"  <?php echo $onLoad; ?>>
-
-    <div id="content">
-
-<?php
-
-if (!empty($this->data['htmlinject']['htmlContentPre'])) {
-    foreach ($this->data['htmlinject']['htmlContentPre'] as $c) {
-        echo $c;
-    }
-}
-$config = \SimpleSAML\Configuration::getInstance();
-if(! $config->getBoolean('production', true)) {
-    echo '<div class="caution">' . $this->t('{preprodwarning:warning:warning}'). '</div>';
-}
--- a/mymodule/themes/fancytheme/multiauth/selectsource.php
+++ b/mymodule/themes/fancytheme/multiauth/selectsource.php
-<?php
-
-/**
- * This page shows a list of authentication sources. When the user selects
- * one of them if pass this information to the
- * \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth class and call the
- * delegateAuthentication method on it.
- *
- * @author Lorenzo Gil, Yaco Sistemas S.L.
- * @package SimpleSAMLphp
- */
-
-// Retrieve the authentication state
-if (!array_key_exists('AuthState', $_REQUEST)) {
-    throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
-}
-$authStateId = $_REQUEST['AuthState'];
-
-/** @var array $state */
-$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth::STAGEID);
-
-if (array_key_exists("\SimpleSAML\Auth\Source.id", $state)) {
-    $authId = $state["\SimpleSAML\Auth\Source.id"];
-    /** @var \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth $as */
-    $as = \SimpleSAML\Auth\Source::getById($authId);
-} else {
-    $as = null;
-}
-
-$source = null;
-if (array_key_exists('source', $_REQUEST)) {
-    $source = $_REQUEST['source'];
-} else {
-    foreach ($_REQUEST as $k => $v) {
-        $k = explode('-', $k, 2);
-        if (count($k) === 2 && $k[0] === 'src') {
-            $source = base64_decode($k[1]);
-        }
-    }
-}
-if ($source !== null) {
-    if ($as !== null) {
-        $as->setPreviousSource($source);
-    }
-    \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth::delegateAuthentication($source, $state);
-}
-
-if (array_key_exists('multiauth:preselect', $state)) {
-    $source = $state['multiauth:preselect'];
-    \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth::delegateAuthentication($source, $state);
-}
-
-$globalConfig = \SimpleSAML\Configuration::getInstance();
-$t = new \SimpleSAML\XHTML\Template($globalConfig, 'mymodule:selectsource.tpl.php');
-
-$defaultLanguage = $globalConfig->getString('language.default', 'en');
-$language = $t->getTranslator()->getLanguage()->getLanguage();
-
-$sources = $state[\SimpleSAML\Module\multiauth\Auth\Source\MultiAuth::SOURCESID];
-foreach ($sources as $key => $source) {
-    $sources[$key]['source64'] = base64_encode($sources[$key]['source']);
-    if (isset($sources[$key]['text'][$language])) {
-        $sources[$key]['text'] = $sources[$key]['text'][$language];
-    } else {
-        $sources[$key]['text'] = $sources[$key]['text'][$defaultLanguage];
-    }
-
-    if (isset($sources[$key]['help'][$language])) {
-        $sources[$key]['help'] = $sources[$key]['help'][$language];
-    } else {
-        $sources[$key]['help'] = $sources[$key]['help'][$defaultLanguage];
-    }
-}
-
-$t->data['authstate'] = $authStateId;
-$t->data['sources'] = $sources;
-$t->data['selfUrl'] = $_SERVER['PHP_SELF'];
-
-if ($as !== null) {
-    $t->data['preferred'] = $as->getPreviousSource();
-} else {
-    $t->data['preferred'] = null;
-}
-$t->show();
-exit();
--- a/mymodule/www/stylesheet.css
+++ b/mymodule/www/stylesheet.css
-header{
-	background: none;
-}