From b0a637c649f09887c9ccb5344a14c652f46c5d7c Mon Sep 17 00:00:00 2001
From: Martin Haase <martin.haase@daasi.de>
Date: Mon, 4 Apr 2011 11:06:55 +0000
Subject: [PATCH] minor things
git-svn-id: https://textgridlab.org/svn/textgrid/trunk/middleware/tgauth@9445 7c539038-3410-0410-b1ec-0f2a7bf1c452
---
.../WebAuthN/WebAuthN2.php | 1 +
.../WebAuthN/authenticate.php | 2 +-
.../WebAuthN/main.css | 137 ++++++++++++++++++
.../secure/iso3166_en_code_lists.txt | 1 +
.../tglib/RBAC.class.php | 5 +-
5 files changed, 144 insertions(+), 2 deletions(-)
create mode 100644 info.textgrid.middleware.tgauth.webauth/WebAuthN/main.css
create mode 120000 info.textgrid.middleware.tgauth.webauth/secure/iso3166_en_code_lists.txt
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
index 0798597..a4ffdfc 100644
--- a/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/WebAuthN2.php
@@ -20,6 +20,7 @@ if ($authZinstance == null) {
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>TextGrid WebAuth</title>
+<link rel="stylesheet" type="text/css" media="screen,print" href="main.css" />
</head>
<body>
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/authenticate.php b/info.textgrid.middleware.tgauth.webauth/WebAuthN/authenticate.php
index d06162a..49decc7 100644
--- a/info.textgrid.middleware.tgauth.webauth/WebAuthN/authenticate.php
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/authenticate.php
@@ -69,6 +69,6 @@ if (!$bound) {
$_SERVER["Shib-Identity-Provider"] = $LDAPname;
-include("../secure/TextGrid-WebAuth.php"); //assuming the request context remains
+include("TextGrid-WebAuth.php"); //assuming the request context remains
?>
diff --git a/info.textgrid.middleware.tgauth.webauth/WebAuthN/main.css b/info.textgrid.middleware.tgauth.webauth/WebAuthN/main.css
new file mode 100644
index 0000000..9deecd8
--- /dev/null
+++ b/info.textgrid.middleware.tgauth.webauth/WebAuthN/main.css
@@ -0,0 +1,137 @@
+.paragraph_style {
+ color: #002142;
+ font-family: 'ArialMT', 'Arial', sans-serif;
+ font-size: 15px;
+ font-style: normal;
+ font-variant: normal;
+ font-weight: normal;
+ letter-spacing: 0;
+ line-height: 20px;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-top: 0px;
+ opacity: 1.00;
+ padding-bottom: 0px;
+ padding-top: 0px;
+ text-align: left;
+ text-decoration: none;
+ text-indent: 0px;
+ text-transform: none;
+}
+.paragraph_style_grey {
+ color: #808080;
+ font-family: 'ArialMT', 'Arial', sans-serif;
+ font-size: 15px;
+ font-style: normal;
+ font-variant: normal;
+ font-weight: normal;
+ letter-spacing: 0;
+ line-height: 20px;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-top: 0px;
+ opacity: 1.00;
+ padding-bottom: 0px;
+ padding-top: 0px;
+ text-align: left;
+ text-decoration: none;
+ text-indent: 0px;
+ text-transform: none;
+}
+.paragraph_style_small {
+ color: #808080;
+ font-family: 'ArialMT', 'Arial', sans-serif;
+ font-size: 11px;
+ font-style: normal;
+ font-variant: normal;
+ font-weight: normal;
+ letter-spacing: 0;
+ line-height: 20px;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-top: 0px;
+ opacity: 1.00;
+ padding-bottom: 0px;
+ padding-top: 0px;
+ text-align: center;
+ text-decoration: none;
+ text-indent: 0px;
+ text-transform: none;
+}
+.style_SkipStroke {
+ background: transparent;
+ opacity: 1.00;
+}
+.style_SkipStroke_1 {
+ background: transparent;
+ opacity: 1.00;
+}
+.graphic_image_style_default_SkipStroke {
+ background: transparent;
+ opacity: 1.00;
+}
+.graphic_textbox_layout_style_default_External_140_30 {
+ position: relative;
+}
+.graphic_textbox_layout_style_default_External_140_31 {
+ position: relative;
+}
+.graphic_textbox_layout_style_default {
+ padding: 4px;
+}
+.graphic_textbox_style_default_SkipStroke {
+ background: transparent;
+ opacity: 1.00;
+}
+.link
+{
+ color: #000063;
+ text-decoration: underline;
+}
+.link:visited {
+ color: #666666;
+ text-decoration: underline;
+}
+.link:hover {
+ color: #000000;
+ text-decoration: underline;
+}
+.spacer {
+ font-size: 1px;
+ line-height: 1px;
+}
+body {
+ -webkit-text-size-adjust: none;
+}
+div {
+ overflow: visible;
+}
+img {
+ border: none;
+}
+div.paragraph {
+ position: relative;
+}
+li.full-width {
+ width: 100px;
+}
+
+div.apiChangeNotification {
+ border: 1px solid #ff0000;
+ background-color: #ffaaaa;
+ color: #ff0000;
+ margin: 1em;
+ padding: 1em;
+}
+div.confNotification {
+ border: 1px solid #0000ff;
+ background-color: #eeeeff;
+ font-size: 11px;
+ font-family: 'ArialMT' 'Arial' sans-serif;
+ color: black;
+ margin: 1em;
+ padding: 1em;
+}
diff --git a/info.textgrid.middleware.tgauth.webauth/secure/iso3166_en_code_lists.txt b/info.textgrid.middleware.tgauth.webauth/secure/iso3166_en_code_lists.txt
new file mode 120000
index 0000000..adba753
--- /dev/null
+++ b/info.textgrid.middleware.tgauth.webauth/secure/iso3166_en_code_lists.txt
@@ -0,0 +1 @@
+../WebAuthN/iso3166_en_code_lists.txt
\ No newline at end of file
diff --git a/info.textgrid.middleware.tgauth.webauth/tglib/RBAC.class.php b/info.textgrid.middleware.tgauth.webauth/tglib/RBAC.class.php
index f5e0cd0..be2cd34 100644
--- a/info.textgrid.middleware.tgauth.webauth/tglib/RBAC.class.php
+++ b/info.textgrid.middleware.tgauth.webauth/tglib/RBAC.class.php
@@ -26,6 +26,8 @@ class RBAC {
protected $userAttributes;
+ protected $SLCdata;
+
public function __construct( $configfilepath , $authZinstance ) {
require_once( "soapTypes.inc.php" );
@@ -61,6 +63,7 @@ class RBAC {
// -----------------------------------------------------
// You'll need these services
// -----------------------------------------------------
+
$this->soapExtra = new SoapClient( $this->rbacbase . "wsdl/tgextra.wsdl" );
$this->soapPolicy = new SoapClient( $this->rbacbase . "wsdl/tgsystem.wsdl" );
$this->soapReview = new SoapClient( $this->rbacbase . "wsdl/tgreview.wsdl" );
@@ -357,4 +360,4 @@ class RBAC {
}
-?>
\ No newline at end of file
+?>
--
GitLab