Commit 2fdb0aee authored by Lukas Haemmerle's avatar Lukas Haemmerle

Increase version number

Updated year of copyright info
parent ef76f79d
Copyright (c) 2015 Copyright (c) 2016
See LICENSE file for details. See LICENSE file for details.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -31,7 +31,13 @@ necessary for such releases. ...@@ -31,7 +31,13 @@ necessary for such releases.
SWITCHwayf Version History SWITCHwayf Version History
-------------------------- --------------------------
* Version 1.20.1 - Release date: 22. 12. 2015 * Version 1.20.2 - Release date: 22. 12 2015
- Upgraded JQuery library to 3.1
- Fixed bug #3736 that causes SProvider.metadata.php not to
be written/updated if metadata file only contains IdPs.
- Updated in copyright information
* Version 1.20.1 - Release date: 22. 12 2015
- Added code to prevent WAYF loading invalid metadata files - Added code to prevent WAYF loading invalid metadata files
Reported with a patch by Olivier Salaün Reported with a patch by Olivier Salaün
- Fixed an HTML issue that caused the interface elements - Fixed an HTML issue that caused the interface elements
......
Copyright (c) 2015, SWITCH Copyright (c) 2016, SWITCH
See LICENSE file for details. See LICENSE file for details.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
// WAYF Identity Provider Configuration file // WAYF Identity Provider Configuration file
......
License note for the SWITCHwayf code License note for the SWITCHwayf code
----------------------------------- -----------------------------------
Copyright 2015, SWITCH Copyright 2016, SWITCH
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are modification, are permitted provided that the following conditions are
......
Copyright (c) 2015, SWITCH Copyright (c) 2016, SWITCH
See LICENSE file for details. See LICENSE file for details.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
/* /*
****************************************************************************** ******************************************************************************
SWITCHwayf SWITCHwayf
Version: 1.20.1 Version: 1.20.2
Contact: aai@switch.ch Contact: aai@switch.ch
Web site: https://www.switch.ch/aai/support/tools/wayf/ Web site: https://www.switch.ch/aai/support/tools/wayf/
****************************************************************************** ******************************************************************************
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
//****************************************************************************** //******************************************************************************
// This file contains the configuration of SWITCHwayf, a light-weight // This file contains the configuration of SWITCHwayf, a light-weight
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('header'); ?></h1> <h1><?php echo getLocalString('header'); ?></h1>
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- EMBEDDED-WAYF-START --> <!-- EMBEDDED-WAYF-START -->
<script type="text/javascript"><!-- <script type="text/javascript"><!--
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- Error Message: Start--> <!-- Error Message: Start-->
<h1><?php echo getLocalString('invalid_query') ?></h1> <h1><?php echo getLocalString('invalid_query') ?></h1>
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- Body: End --> <!-- Body: End -->
</div> </div>
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('settings'); ?></h1> <h1><?php echo getLocalString('settings'); ?></h1>
......
<?php // Copyright (c) 2015, SWITCH ?> <?php // Copyright (c) 2016, SWITCH ?>
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('permanent_select_header'); ?></h1> <h1><?php echo getLocalString('permanent_select_header'); ?></h1>
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
/* /*
****************************************************************************** ******************************************************************************
......
...@@ -289,7 +289,7 @@ function loadDiscoFeedIdPs(){ ...@@ -289,7 +289,7 @@ function loadDiscoFeedIdPs(){
// returned string or '' in case of a problem // returned string or '' in case of a problem
function queryGetURL(url){ function queryGetURL(url){
var xmlhttp; var xmlhttp;
console.error("The request for " + url + " timed out.");
if (window.XMLHttpRequest){ if (window.XMLHttpRequest){
xmlhttp = new XMLHttpRequest(); xmlhttp = new XMLHttpRequest();
} else { } else {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
// Localized language strings for SWITCHwayf // Localized language strings for SWITCHwayf
// Make sure to use HTML entities instead of plain UTF-8 characters for // Make sure to use HTML entities instead of plain UTF-8 characters for
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
// This file is used to dynamically create the list of IdPs and SP to be // This file is used to dynamically create the list of IdPs and SP to be
// displayed for the WAYF/DS service based on the federation metadata. // displayed for the WAYF/DS service based on the federation metadata.
...@@ -224,8 +224,10 @@ function parseMetadata($metadataFile, $defaultLanguage){ ...@@ -224,8 +224,10 @@ function parseMetadata($metadataFile, $defaultLanguage){
return Array(false, false); return Array(false, false);
} }
// Ignored IdPs // Init variables
$hiddenIdPs = 0; $hiddenIdPs = 0;
$metadataIDProviders = array();
$metadataSProviders = array();
// Process individual EntityDescriptors // Process individual EntityDescriptors
while( $CurrentXMLReaderNode->read() ) { while( $CurrentXMLReaderNode->read() ) {
......
<?php // Copyright (c) 2015, SWITCH <?php // Copyright (c) 2016, SWITCH
/* /*
****************************************************************************** ******************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment