Compare commits

...

4 Commits

  1. 96
      .classpath
  2. 6
      src/de/superx/servlet/UserInitializer.java
  3. 1
      superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
  4. BIN
      superx/WEB-INF/lib/openpdf-1.3.43.jar
  5. BIN
      superx/WEB-INF/lib/openpdf-2.0.3.jar
  6. 17
      superx/style/sx_common.css

96
.classpath

@ -846,21 +846,85 @@ @@ -846,21 +846,85 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib_ext/servlet-api.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/net.tascalate.javaflow.api-2.2.1.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/freemarker-2.3.25.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/postgresql-42.2.19.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-10.5.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-xqj-10.5.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-test-10.5.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/ifxjdbc-4.50.4.1.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib/commons-csv-1.8.jar"/>
<classpathentry kind="lib" path="superx/WEB-INF/lib_ext/servlet-api.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/net.tascalate.javaflow.api-2.2.1.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/freemarker-2.3.25.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/postgresql-42.2.19.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-10.5.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-xqj-10.5.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-test-10.5.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/ifxjdbc-4.50.4.1.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="superx/WEB-INF/lib/commons-csv-1.8.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="superx/WEB-INF/classes"/>
</classpath>

6
src/de/superx/servlet/UserInitializer.java

@ -573,7 +573,11 @@ public class UserInitializer { @@ -573,7 +573,11 @@ public class UserInitializer {
passwort = "dummy"; // bei LDAP oder so
boolean isPasswordOK = false;
if (isRemotePasswortCheck) {
//System.out.println("getAuthType: "+ request.getAuthType());
//System.out.println("isRemotePasswortCheck: "+ isRemotePasswortCheck);
if(request.getAuthType() !=null && request.getAuthType().equals("shibboleth")) {
isPasswordOK = true;
} else if (isRemotePasswortCheck) {
isPasswordOK = new LdapPasswordChecker().isLdapPasswordOK(false, mandantenID, user, passwort);
} else {

1
superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf

File diff suppressed because one or more lines are too long

BIN
superx/WEB-INF/lib/openpdf-1.3.43.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/openpdf-2.0.3.jar

Binary file not shown.

17
superx/style/sx_common.css

@ -557,7 +557,7 @@ input.ndSchluesselfeld { @@ -557,7 +557,7 @@ input.ndSchluesselfeld {
.field.has-addons .control .select select, .input,
.field.has-addons .control .button {
height: 2.5em;
border: thin solid hsl(0, 0%, 71%); } /*hellgrau*/
border: thin solid hsl(0, 0%, 71%); /*hellgrau*/
}
.field.has-addons .control:not(:last-child) {
@ -568,6 +568,12 @@ input.ndSchluesselfeld { @@ -568,6 +568,12 @@ input.ndSchluesselfeld {
height: 2.5em; /* entspricht der Höhe des Eingabeldes*/
}
[data-tooltip]:not(.is-disabled).has-tooltip-right::before,
[data-tooltip]:not(.is-loading).has-tooltip-right::before,
[data-tooltip]:not([disabled]).has-tooltip-right::before,
[data-tooltip]:not(.is-disabled).has-tooltip-left::before,
[data-tooltip]:not(.is-loading).has-tooltip-left::before,
[data-tooltip]:not([disabled]).has-tooltip-left::before,
[data-tooltip]:not(.is-disabled).has-tooltip-bottom::before,
[data-tooltip]:not(.is-loading).has-tooltip-bottom::before,
[data-tooltip]:not([disabled]).has-tooltip-bottom::before {
@ -576,17 +582,18 @@ input.ndSchluesselfeld { @@ -576,17 +582,18 @@ input.ndSchluesselfeld {
position: absolute;
z-index: 1000;
padding: 1.0em;
background-color: royalblue /*#333*/;
background-color: #a6a6a6ff; /*UDE: #a6a6a6ff; sx-regulär:royalblue;*/
color: white;
border-radius: 0.3em;
white-space: wrap;
text-align: left;
width: 250px;
width: 25em;
height: fit-content;
white-space: wrap; /* für Zeilenumbrüche nach Standard-Regeln*/
overflow-wrap: break-word; /* aktuell: für Umbrüche nach Standard-Regeln*/
hyphens: auto; }
hyphens: auto;
}
/*Listen*/
ul {
/*margin: 0px;

Loading…
Cancel
Save