Skip to content

Commit fca8956

Browse files
wsaleskywsalesky
committed
Revert "Merge branch 'main' into issue251a"
This reverts commit 76c0e95, reversing changes made to 65c881f.
1 parent 9f9a8a5 commit fca8956

File tree

12 files changed

+99
-449
lines changed

12 files changed

+99
-449
lines changed

‎controller.xql‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,26 @@ else if ($exist:resource = "login") then
2929
let $user := request:get-attribute($config:login-domain || ".user")
3030
return
3131
if ($user and sm:list-users() = $user) then
32-
<response status="success" xmlns="http://www.w3.org/1999/xhtml" message="success">
32+
<response>
3333
<user>{$user}</user>
34+
<logged>{$loggedIn}</logged>
3435
</response>
3536
else if($userParam and sm:list-users() = $userParam) then
36-
<response status="success" xmlns="http://www.w3.org/1999/xhtml" message="success">
37+
<response>
3738
<user>{$user}</user>
39+
<logged>{$loggedIn}</logged>
3840
</response>
3941
else if($logout = 'true') then
40-
<response status="success" xmlns="http://www.w3.org/1999/xhtml" message="success">
42+
<response>
4143
<success>You have been logged out.</success>
4244
</response>
4345
else (
44-
<response status="fail" xmlns="http://www.w3.org/1999/xhtml" message="Username already exists">
45-
<fail>Wrong user or password user: {$user}</fail>
46+
<response>
47+
<fail>Wrong user or password user: {$user} userParam: {$userParam}</fail>
4648
</response>
4749
)
4850
} catch * {
49-
<response status="fail" xmlns="http://www.w3.org/1999/xhtml" message="{$err:description}">
51+
<response>
5052
<fail>{$err:description}</fail>
5153
</response>
5254
})
@@ -57,7 +59,7 @@ else if ($exist:resource = "userInfo") then
5759
((:util:declare-option("exist:serialize", "method=json media-type=application/json"),:)
5860
let $currentUser :=
5961
if(request:get-attribute($config:login-domain || ".user")) then request:get-attribute($config:login-domain || ".user")
60-
else sm:id()/sm:id/sm:real/sm:username/string(.)
62+
else(: xmldb:get-current-user():) sm:id()/sm:id/sm:real/sm:username/string(.)
6163
let $group :=
6264
if($currentUser) then
6365
sm:get-user-groups($currentUser)
@@ -73,32 +75,7 @@ else if ($exist:resource = "userInfo") then
7375
</message>
7476
</response>)
7577
)
76-
(: Restrict forms to logged in users :)
77-
else if (ends-with($exist:path, "forms.xq")) then (
78-
login:set-user($config:login-domain, (), true()),
79-
let $user := request:get-attribute($config:login-domain || ".user")
80-
let $userParam := request:get-parameter("user","")
81-
let $logout := request:get-parameter("logout",())
82-
return
83-
if($logout = "true") then (
84-
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
85-
<redirect url="index.html"/>
86-
</dispatch>
87-
)
88-
else if ($user and sm:list-users() = $user) then
89-
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
90-
<cache-control cache="no"/>
91-
</dispatch>
92-
else if(not(string($userParam) eq string($user))) then
93-
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
94-
<redirect url="index.html"/>
95-
</dispatch>
96-
else
97-
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
98-
<forward url="login.html"/>
99-
</dispatch>
100-
)
101-
78+
10279
else if ($exist:path eq "/") then
10380
(: forward root path to index.xql :)
10481
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">

‎forms/formGenerator/generateXForm.xsl‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
- eXist-db
1616
1717
Version: 1.33 Beta
18-
1918
-1.22 marks a major redesign
2019
2120
@@ -625,7 +624,7 @@
625624
<xf:insert ref="instance('i-rec')//*:titleStmt/child::*" at="last()" origin="instance('i-admin')//*:editor" position="after"/>
626625
<xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
627626
<xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
628-
<xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
627+
<xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="last()" origin="instance('i-admin')//*:change[1]" position="before"/>
629628
<xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
630629
<xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>
631630
</xf:action>
@@ -634,15 +633,7 @@
634633

635634
<xf:submission id="s-load-template-search" method="post" ref="instance('i-selected-search')" replace="instance" instance="i-rec" serialization="none" mode="synchronous">
636635
<xf:resource value="concat('services/get-rec.xql?template=true&amp;path=',instance('i-selected-search'))"/>
637-
<xf:action ev:event="xforms-submit-done">
638-
<xf:message level="modeless"> Data Loaded! </xf:message>
639-
<xf:insert ref="instance('i-rec')//*:titleStmt/child::*" at="last()" origin="instance('i-admin')//*:editor" position="after"/>
640-
<xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
641-
<xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
642-
<xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
643-
<xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
644-
<xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>
645-
</xf:action>
636+
<xf:message level="modeless" ev:event="xforms-submit-done"> Data Loaded! </xf:message>
646637
<xf:message level="modeless" ev:event="xforms-submit-error"> Submit error. </xf:message>
647638
</xf:submission>
648639

@@ -2658,7 +2649,7 @@
26582649
<xsl:variable name="lookup" select="current-group()[not(@suppress='true')][parent::*:subform[not(@lookup='no')]]"/>
26592650
<lookup>
26602651
<xsl:copy-of select="$lookup/@*"/>
2661-
<xsl:attribute name="formURL" select="concat('form.xq?form=forms/',$configDoc//formName/text(),'/lookup/',tokenize($lookup[1]/@formURL,'/')[last()])"/>
2652+
<xsl:attribute name="formURL" select="concat('form.xq?form=forms/',$configDoc//formName/text(),'/lookup/',tokenize($lookup/@formURL,'/')[last()])"/>
26622653
</lookup>
26632654
</xsl:if>
26642655
</xsl:when>

‎login.html‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎modules/app.xql‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,11 @@ function app:display-userinfo($node as node(), $model as map(*)) {
3333
else $user
3434
(:let $coursepacks := collection($config:app-root || '/coursepacks')/coursepack[@user = $user]:)
3535
return
36-
if ($user and not(matches($user,'[gG]uest'))) then
37-
<div class="content-grey">
38-
<h1>{$user} : {$userName}</h1>
39-
<h3>Your Records:</h3>
40-
{ 'Work in progress' }
41-
</div>
42-
else
43-
<div class="content-grey">
44-
<h1>User : Guest</h1>
45-
<h3>Please Log in to see you records.</h3>
46-
{ 'Work in progress' }
47-
</div>
36+
<div>
37+
<h1>{$user} : {$userName}</h1>
38+
<h3>Your Records:</h3>
39+
{ 'Work in progress' }
40+
</div>
4841
};
4942

5043
(: Login functions :)

‎modules/config.xqm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,5 @@ declare variable $config:login-domain :=
112112
let $config := doc(concat($config:app-root, "/repo.xml"))
113113
return
114114
if($config//repo:login-domain/text() != '') then $config//repo:login-domain/text()
115-
else 'localHost';
115+
else if($config//repo:login-domain/text() = '/') then 'org.exist.login'
116+
else '';

0 commit comments

Comments
 (0)