Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael K. <ko...@us...> - 2006-09-12 12:54:16
|
Update of /cvsroot/cobricks/drehscheibe-in/web/info In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22164/info Added Files: navigation.html.de Log Message: --- NEW FILE: navigation.html.de --- <TD vAlign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/info/index.html.de"><B>INFORMATION</B></A><BR><A class=sub href="/info/garching.html.de">Campus Garching</A><BR><A class=sub href="/info/verkehr.html.de">Garching Verkehr</A><BR><A class=sub href="/info/anfahrt.html.de">Anfahrt</A><BR><A class=sub href="/info/leo.html.de">LEO</A><BR><A class=sub href="/info/links.html.de">Links</A><BR><A class=sub href="/info/orgs.html.de">Organisationen</A><BR><A class=sub href="/info/stellen.html.de">Stellenangebote </A><BR><BR><A class=sub href="/servlet/Item_Query?cmd=queryitemsdoit&timespan=30"><B>Mitteilungen</B></A><BR> <A class=sub href="/servlet/Item_Query">Suchen</A> <HR> <BR><A class=hnav href="/about.html.de">Impressum</A><BR><A class=hnav href="mailto:dre...@in...">Feedback</A><BR> #if ($!userLogin != "anonymous") <P><A class=hnav href="/admin/index.html.de">Admin</A><BR> #else #end <IMG src="/images/spacer160.gif" width=130><BR></TD> |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:54:15
|
Update of /cvsroot/cobricks/drehscheibe-in/web/dienste In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22164/dienste Added Files: navigation.html.de Log Message: --- NEW FILE: navigation.html.de --- <TD vAlign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/dienste/index.html.de"><B>DIENSTE</B></A> <P><A class=sub href="/dienste/bibliotheken.html.de">Bibliotheken</A><BR><A class=sub href="http://wwwrbg.in.tum.de/" target=rbg>Rechenbetrieb</A><BR><A class=sub href="/dienste/raum.html.de">Raumverwaltung</A> <A class=sub href="/dienste/fww.html.de">Fakultätenwegweiser</A> <P> <DIV class=sub><B>Servicebüro</B> <BR> <A class=sub href="http://wwwpa.in.tum.de/studsekr/informatik/index.html" target=_blank>Studiensekretariat</A><BR> <A class=sub href="/dienste/finanz/index.html.de">Finanzsekretariat</A><BR> <A class=sub href="/dienste/personal/index.html.de">Personalsekretariat</A><BR></DIV><BR><A class=sub href="/servlet/Item_Query?cmd=queryitemsdoit&timespan=30"><B>Mitteilungen</B></A><BR> <A class=sub href="/dienste/search.html.de">Suchen</A><BR> <HR> <BR><A class=hnav href="/about.html.de">Impressum</A><BR><A class=hnav href="mailto:dre...@in...">Feedback</A><BR> #if ($!userLogin != "anonymous") <P><A class=hnav href="/admin/index.html.de">Admin</A><BR> #else #end <IMG src="/images/spacer160.gif" width=130><BR></TD> |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:54:15
|
Update of /cvsroot/cobricks/drehscheibe-in/web/images In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22164/images Added Files: powered_by_google_135x35.gif Log Message: --- NEW FILE: powered_by_google_135x35.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:54:15
|
Update of /cvsroot/cobricks/drehscheibe-in/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22164 Modified Files: logout.html.de navigation.html.de notfound.html.de pagefooter.html pageheader.html.de style.css Added Files: noaccess.html.de suche-intern.html.de suche.html.de Removed Files: index.html.de navigation-alumni.html.de navigation-dienste.html.de navigation-fakultaet.html.de navigation-forschung.html.de navigation-info.html.de navigation-studium.html.de noacccess.html notfound.html Log Message: --- navigation-dienste.html.de DELETED --- Index: pagefooter.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pagefooter.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pagefooter.html 29 May 2006 07:37:16 -0000 1.6 +++ pagefooter.html 12 Sep 2006 12:54:11 -0000 1.7 @@ -1,4 +1,21 @@ +#if ( $print != "true" ) + +<div align="right"> +#if ($pitemid != "") +#set ($acc = $userPresenter.checkPermission("$userId", "page", "update", "itemid=$itemid")) +#if ($acc != "false") +<a href="$contextPath/portal/edit.html?itemid=$!pitemid&plang=$!pageLang">Edit +Page</a> - +#end +#end +<a href="$portalPresenter.getPrintLink($portalRequest)"> +<font color="#808080"><img border="0" src="$contextPath/images/print_icon.gif"> + Print Page</font></a> +</div> + +#end + </td> </tr> </table> --- notfound.html DELETED --- --- navigation-info.html.de DELETED --- Index: logout.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/logout.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- logout.html.de 30 May 2006 14:14:30 -0000 1.5 +++ logout.html.de 12 Sep 2006 12:54:10 -0000 1.6 @@ -5,8 +5,8 @@ <P>Die Login-Information im Browser sollte jetzt gelöscht sein.</P> -<P>Bitte wechseln Sie jetzt zu einer beliebigen Seite oder <A - href="/user/login.html.de">melden Sie sich erneut an</A>. -</P> +<P>Bitte wechseln Sie jetzt zu einer beliebigen öffentlichen Seite der +Website oder <A href="/user/login.html.de">melden Sie sich erneut +an</A>. </P> $portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- navigation-forschung.html.de DELETED --- --- navigation-alumni.html.de DELETED --- --- noacccess.html DELETED --- --- navigation-fakultaet.html.de DELETED --- --- NEW FILE: suche-intern.html.de --- (This appears to be a binary file; contents omitted.) Index: pageheader.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pageheader.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pageheader.html.de 31 May 2006 05:32:42 -0000 1.3 +++ pageheader.html.de 12 Sep 2006 12:54:11 -0000 1.4 @@ -1,7 +1,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> -<title>Cobricks-2</title> +<title>www.in.tum.de</title> <base href="$portalRequest.getBaseUrl()"> <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> @@ -41,29 +41,26 @@ </TD> </TR> <TR> - <TD bgColor=#dddddd> + <TD bgColor=#dddddd valign=top> <TABLE width="100%" border=0> <TBODY> <TR> #if ($!userLogin != "anonymous") - <TD align=left>Login: + <TD align=left valign=top>Login: <A href="/user/user.html.de"><B>$!userLogin</B></A> </TD> - <TD align=right> - <A href="/sitemap.html.de">Suche</A> - - <A href="/servlet/MyDrehscheibe">MyDrehscheibe</A> - - <A href="/communities.html.de">Communities</A> - - <A href="/calender.html.de">Kalender</A> - + <TD align=right valign=top> + <A href="/suche.html.de">Suche</A> - <A href="/doku/index.html.de">Hilfe</A> - <A href="/PORTAL?cmd=logout">Logout</a> <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> #else - <TD align=left> + <TD align=left valign=top> <A href="/user/login.html.de"><B>Login</B></A> <A href="/user/register.html.de"><B>Neuer Benutzer</B></A> </TD> - <TD align=right> + <TD align=right valign=top> <A href="/suche.html.de">Suche</A> - <A href="/doku/index.html.de">Hilfe</A> <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> @@ -75,6 +72,10 @@ </TABLE> </TD> </TR> +<tr> +<td colspan=3>Sie sind hier: <a href="/index.html">Startseite</a> +$portalPresenter.printNavigationPath($portalRequest)</td> +</tr> </TBODY> </TABLE> @@ -90,4 +91,7 @@ <table width ="100%" border=0 cellSpacing=1 cellPadding=15> <tr> -$portalPresenter.parse("navigation.html.de",$portalRequest) +#if ( $print != "true" ) +$portalPresenter.parse("navigation.html.de",$portalRequest,"/navigation.html.de") +#end +<td valign="top"> \ No newline at end of file Index: style.css =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- style.css 31 May 2006 05:32:42 -0000 1.5 +++ style.css 12 Sep 2006 12:54:11 -0000 1.6 @@ -268,7 +268,18 @@ color: red; font-weight: bold; } +.err { + color: red; + font-weight: bold; +} .info { color: green; font-weight: bold; -} \ No newline at end of file +} +.success { + color: green; + font-weight: bold; +} +.small { + font-size: 8pt; +} --- index.html.de DELETED --- --- NEW FILE: noaccess.html.de --- $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) <h1>No access</h1> <p>Sie haben keinen Berechtigung auf die angeforderte Seite oder Funktionalität zuzugreifen. Melden Sie sich entweder mit einer Kennung neu an, welche die entsprechenden Rechte hat, oder wenden Sie sich an die Administration der Drehscheibe.</p> $portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: suche.html.de --- (This appears to be a binary file; contents omitted.) Index: navigation.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/navigation.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- navigation.html.de 29 May 2006 07:37:16 -0000 1.1 +++ navigation.html.de 12 Sep 2006 12:54:11 -0000 1.2 @@ -1,5 +1,5 @@ <TD vAlign=top width=150 bgColor=#e0e0e0 > - <BR><A +<BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <A class=sub @@ -77,8 +77,5 @@ #else #end <IMG - src="/images/spacer160.gif" width=150><BR> - - + src="/images/spacer160.gif" width=150><BR> </TD> -<td valign=top> --- navigation-studium.html.de DELETED --- Index: notfound.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/notfound.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- notfound.html.de 12 Jan 2005 15:52:02 -0000 1.2 +++ notfound.html.de 12 Sep 2006 12:54:11 -0000 1.3 @@ -1,9 +1,12 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> -<h1>404 ... Page not found</h1> -</td> +$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +<h1>Page not found</h1> -#parse ( "pagefooter.html.de" ) +<p>Die angeforderte Webseite konnte leider auf dem Server nicht +gefunden werden.</p> + +<p>Benutzen Sie die <a href="suche.html">Suche</a> um die gewünschte +Information zu finden.</p> + +$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:52:34
|
Update of /cvsroot/cobricks/drehscheibe-in/web/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21718/portal Log Message: Directory /cvsroot/cobricks/drehscheibe-in/web/portal added to the repository |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:48:28
|
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19712 Modified Files: ccreate.html.de ccreatepreselect.html.de cmall.html.de cmcreate.html.de cmcreateres.txt cmupdate.html.de cmupdateres.txt cupdate.html.de index.html.de navigation.html.de Added Files: cmcreate-didaktik.html.de cmcreate-inhalt.html.de cmcreate-lernziele.html.de cmcreate-pruefung.html.de cmcreate-vorkenntnisse.html.de Log Message: Index: ccreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/ccreate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccreate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ ccreate.html.de 12 Sep 2006 12:48:22 -0000 1.2 @@ -34,6 +34,12 @@ <h2><a href="/course/cm.html?cmid=$cmid" target="_blank">$cm.getName()</a></h2> +<p>Hinweis: Manche der folgenden Felder sind von dem zugeordneten +Modul übernommen und können nicht geändert +werden. Sollten die Angaben für Ihre Veranstaltung nicht korrekt +sein, dann wählen Sie ein anderes Modul oder wenden Sie sich an +den Modulverantwortlichen zwecks Anpassung des Moduls.</p> + <table border="0"> <tr> <td>Typ</td> @@ -52,23 +58,49 @@ </tr> <tr> <td>Name</td> - <td><input name="cname" size="50" value="$!cm.getName()"></td> + <td><input name="cname" size="50" value="$!cm.getName()"><br> +Sie können den Modulnamen um einen Untertitel ergänzen, dürfen den Prefix (Modulnamen) aber nicht abändern oder kürzen. +</td> </tr> <tr> <td>Name (englisch)</td> <td><input name="cname_en" size="50" value="$!cm.getName('en')"></td> </tr> <tr> +<td>Studiengänge</td> +<td> +<table border="1"> +<tr> + <td><em>Studiengang</em></td> + <td><em>Wahl/Pflicht</em></td> + <td><em>Kommentar</em></td> +</tr> +#set ( $courseTempProgRel = $cm.getProgramRel() ) +#set ($j = 0) +#foreach ( $cmpr in $courseTempProgRel ) +#set ($j = $j + 1) +<tr><td> +$cmpr.getProgram().getName() +</td><td> +$!cmpr.getType() +</td><td> +$!cmpr.getComment() +</td> +</tr> +#end +</table> +</td> +</tr> +</td> +</tr> +<tr> <td>Kommentar</td> <td><input name="ccomment" size="70"></td> </tr> <tr> <td>Sprache</td> <td> - <select name="clang" size="1"> - <option value="de">Deutsch</option> - <option value="en">Englisch</option> - </select> +$portalPresenter.printSelect("clang","Deutsch,Englisch","de,en","$cm.getLang()") </td> </tr> <tr> @@ -81,7 +113,7 @@ </tr> <tr> <td>ECTS Credits</td> - <td><input name="cectscredits" size="5" value="$!cm.getEctsCredits()"></td> + <td>$!cm.getEctsCredits()<input name="cectscredits" type="hidden" value="$!cm.getEctsCredits()"></td> </tr> <tr> @@ -103,14 +135,6 @@ </td> </tr> <tr> - <td>Inhalt</td> - <td><textarea name="ccontent" rows="3" cols="70" readonly="readonly">$!cm.getContent()</textarea></td> -</tr> -<tr> - <td>Inhalt (englisch)</td> - <td><textarea name="ccontent_en" rows="3" cols="70" readonly="readonly">$!cm.getContent('en')</textarea></td> -</tr> -<tr> <td>Lernziele</td> <td><textarea name="ctarget" rows="3" cols="70" readonly="readonly">$!cm.getTarget()</textarea></td> </tr> @@ -119,22 +143,26 @@ <td><textarea name="ctarget_en" rows="3" cols="70" readonly="readonly">$!cm.getTarget('en')</textarea></td> </tr> <tr> - <td>Voraussetzungen</td> + <td>Inhalt</td> + <td><textarea name="ccontent" rows="3" cols="70" readonly="readonly">$!cm.getContent()</textarea></td> +</tr> +<tr> + <td>Inhalt (englisch)</td> + <td><textarea name="ccontent_en" rows="3" cols="70" readonly="readonly">$!cm.getContent('en')</textarea></td> +</tr> +<tr> + <td>Vorkenntnisse</td> <td><textarea name="cprerequ" rows="3" cols="70" readonly="readonly">$!cm.getPrerequ()</textarea></td> </tr> <tr> - <td>Voraussetzungen (englisch)</td> + <td>Vorkenntnisse (englisch)</td> <td><textarea name="cprerequ_en" rows="3" cols="70" readonly="readonly">$!cm.getPrerequ('en')</textarea></td> </tr> <tr> - <td>Schein(voraussetzungen)</td> + <td>Prüfungsart</td> <td><textarea name="ccert" rows="3" cols="70" readonly="readonly">$!cm.getCert()</textarea></td> </tr> <tr> - <td>Schein(voraussetzungen) (englisch)</td> - <td><textarea name="ccert_en" rows="3" cols="70" readonly="readonly">$!cm.getCert('en')</textarea></td> -</tr> -<tr> <td>Didaktik</td> <td><textarea name="cdidactics" rows="3" cols="70" readonly="readonly">$!cm.getDidactics()</textarea></td> </tr> Index: cmupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmupdate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmupdate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cmupdate.html.de 12 Sep 2006 12:48:23 -0000 1.2 @@ -30,11 +30,13 @@ <div class="error">Sie sind der Verantwortliche für dieses Module und können deshlab einen Teil der Daten aktualisieren.</div> #set ( $acc = "moduleresp" ) #else -<div class="error">Sie habe keine Rechte die Moduldaten direkt zu -ändern (dies kann nur der Prüfungsausschuss und der -Modulverantwortliche). In folgendem Formular können Sie aber -Änderungen vorschlagen, die dann per E-Mail an den -Prüfungsausschuss weitergeleitet werden.</div> + +<p>Sie habe keine Rechte die Moduldaten direkt zu ändern (dies +kann nur der Prüfungsausschuss und der Modulverantwortliche). In +folgendem Formular können Sie aber Änderungen vorschlagen, +die dann per E-Mail an den Prüfungsausschuss weitergeleitet +werden.</p> + #end #end @@ -57,8 +59,10 @@ #if ( "$!acc" == "course" ) <p>Änderungswünsche, die an den Prüfungsausschuss übermittelt werden sollen:<br> -<textarea name="cmupdate" rows="5" cols="70"> +<textarea name="cmupdate" rows="10" cols="70"> </textarea></p> +<input type="submit" class="submit" value="Änderungswünsche absenden"/><br> +<p> #end <table border="0"> @@ -92,7 +96,7 @@ </tr> <tr> <td>ECTS Credits</td> -<td><input name="cmectscredits" size="5" value="$!cm.getEctsCredits()"> <i>z.B. 12<strong>.</strong>5</i></td> +<td><input name="cmectscredits" size="5" value="$!cm.getEctsCredits()"> (ganzzahling!)</td> </tr> <tr> <td>Semesterwochenstunden</td> @@ -108,54 +112,58 @@ <td><input name="cmcapacity" size="5" value="$!cm.getCapacity()"></td> </tr> #else -<tr><td>Name</td><td>$!cmname</td></tr> -<tr><td>Kurzname</td><td>$!cmshortname</td></tr> -<tr><td>Typ</td><td>$!cmtype</td></tr> +<tr><td>Name</td><td>$!cm.getName()</td></tr> +<tr><td>Name (en)</td><td>$!cm.getName('en')</td></tr> +<tr><td>Kurzname</td><td>$!cm.getShortName()</td></tr> +<tr><td>Typ</td><td>$!cm.getType()</td></tr> <tr><td>ECTS Credits</td><td>$!cmectscredits</td></tr> <tr><td>Semesterwochenstunden</td> <td>$coursePresenter.printSWS($cm)</td></tr> -<tr><td valign="top">Modulverantwortlicher<br>(Nachname[, Vorname])</td> -<td>$!cmresponsible</td></tr> #end #if ( "$!acc" == "module" || "$!acc" == "moduleresp" ) <tr> -<td>Inhalt</td> -<td><textarea name="cmcontent" rows="3" cols="70">$!cm.getContent()</textarea></td> -</tr> -<tr> -<td>Inhalt (englisch)</td> -<td><textarea name="cmcontent_en" rows="3" cols="70">$!cm.getContent('en')</textarea></td> -</tr> -<tr> -<td>Lernziele</td> +<td valign="top">Lernziele<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-lernziele.html">Beispiel</a>)</td> <td><textarea name="cmtarget" rows="3" cols="70">$!cm.getTarget()</textarea></td> </tr> <tr> -<td>Lernziele (englisch)</td> +<td valign="top">Lernziele (englisch)</td> <td><textarea name="cmtarget_en" rows="3" cols="70">$!cm.getTarget('en')</textarea></td> </tr> <tr> -<td>Voraussetzungen</td> -<td><textarea name="cmprerequ" rows="3" cols="70">$!cm.getPrerequ()</textarea></td> +<td valign="top">Inhalt<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-inhalt.html.de">Beispiel</a>)</td> +<td><textarea name="cmcontent" rows="3" cols="70">$!cm.getContent()</textarea></td> </tr> <tr> -<td>Voraussetzungen (englisch)</td> -<td><textarea name="cmprerequ_en" rows="3" cols="70">$!cm.getPrerequ('en')</textarea></td> +<td valign="top">Inhalt (englisch)</td> +<td><textarea name="cmcontent_en" rows="3" cols="70">$!cm.getContent('en')</textarea></td> </tr> <tr> -<td>Schein(voraussetzungen)</td> -<td><textarea name="cmcert" rows="3" cols="70">$!cm.getCert()</textarea></td> +<td valign="top">Vorkenntnisse<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-vorkenntnisse.html.de">Beispiel</a>)</td> +<td><textarea name="cmprerequ" rows="3" cols="70">$!cm.getPrerequ()</textarea><br> +</td> </tr> <tr> -<td>Schein(voraussetzungen) (englisch)</td> -<td><textarea name="cmcert_en" rows="3" cols="70">$!cm.getCert('en')</textarea></td> +<td valign="top">Vorkenntnisse (englisch)</td> +<td><textarea name="cmprerequ_en" rows="3" cols="70">$!cm.getPrerequ('en')</textarea><br> +</td> </tr> <tr> -<td>Didaktik</td> +<td valign="top">Prüfung<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-pruefung.html.de">Beispiel</a>)</td> +<td><textarea name="cmcert" rows="3" cols="70">$!cm.getCert()</textarea><br> +Bitte geben Sie hier mindestens ein, ob die Prüfung schriftlich und/oder mündlich stattfindet - und jeweils die Dauer der Prüfungen. Siehe dazu auch <a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-pruefung.html.de">Beispiel</a>. +</td> +</tr> +<tr> +<td valign="top">Didaktik<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-didaktik.html.de">Beispiel</a>)</td> <td><textarea name="cmdidactics" rows="3" cols="70">$!cm.getDidactics()</textarea></td> </tr> <tr> -<td>Didaktik (englisch)</td> +<td valign="top">Didaktik (englisch)</td> <td><textarea name="cmdidactics_en" rows="3" cols="70">$!cm.getDidactics('en')</textarea></td> </tr> <tr> @@ -172,35 +180,39 @@ </tr> #else <tr> -<td>Inhalt</td> +<td valign="top">Lernziele</td> +<td>$!cm.getTarget()</td> +</tr> +<tr> +<td valign="top">Lernziele (englisch)</td> +<td>$!cm.getTarget('en')</td> +</tr> +<tr> +<td valign="top">Inhalt</td> <td>$!cm.getContent()</td> </tr> <tr> -<td>Inhalt (englisch)</td> +<td valign="top">Inhalt (englisch)</td> <td>$!cm.getContent('en')</td> </tr> <tr> -<td>Voraussetzungen</td> +<td valign="top">Vorkenntnisse</td> <td>$!cm.getPrerequ()</td> </tr> <tr> -<td>Voraussetzungen (englisch)</td> +<td valign="top">Vorkenntnisse (englisch)</td> <td>$!cm.getPrerequ('en')</td> </tr> <tr> -<td>Schein(voraussetzungen)</td> -<td>$!cm.getCert()</td> -</tr> -<tr> -<td>Schein(voraussetzungen) (englisch)</td> -<td>$!cm.getCert('en')</td> +<td valign="top">Prüfungsart</td> +<td><textarea name="cmcert" rows="3" cols="70" readonly="readonly">$!cm.getCert()</textarea></td> </tr> <tr> -<td>Didaktik</td> +<td valign="top">Didaktik</td> <td>$!cm.getDidactics()</td> </tr> <tr> -<td>Didaktik (englisch)</td> +<td valign="top">Didaktik (englisch)</td> <td>$!cm.getDidactics('en')</td> </tr> <tr> @@ -245,8 +257,9 @@ <tr> <td>Studiengang</td> <td>Typ</td> - <td>erstes Semester</td> - <td>letztes Semester</td> + <td>von Sem.</td> + <td>bis Sem.</td> + <td>Kommentar</td> </tr> #set ( $courseTempProgRel = $cm.getProgramRel() ) #set ($j = 0) @@ -294,6 +307,13 @@ $!cmpr.getEndSem() #end </td> + <td> +#if ("$!acc"=="module") +<input name="cpcomment$j" type="text" size="15" value="$!cmpr.getComment()"> +#else +$!cmpr.getComment() +#end + </td> </tr> #end #if ("$!acc"=="module") @@ -334,14 +354,24 @@ #end </select> </td> + <td> + <input type="text" size="15" name="cpcomment$i" value="$!cpcomment$i"> + </td> </tr> #end #end </table> + +<br>Im Kommentar-Feld kann/muss angegeben werden, welchem Fachgebiet +innerhalb eines Studiengangs das Modul zugeordnet ist (falls das +für den Studiengang zutrifft). + #end <p> <input type="hidden" name="cmprogcnt" value="$j"/> +#if ( "$!acc" != "course" ) <input type="submit" class="submit" value="Modul aktualisieren"/> +#end </form> --- NEW FILE: cmcreate-inhalt.html.de --- <head> <title>CourseManagement - Inhalt</title> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> </head> <body> <h1>Inhalt</h1> <p>Welche Themen werden in der Lehrveranstaltung behandelt?</p> <p>Die Verwendung einfacher HTML-Tags ist möglich, z.B. Listen.</p> <p> Beispiel:<br> <pre> <ul> <li> Abgrenzung: Architekturen für Informationssysteme vs. Architekturen für Anwendungslandschaften</li> <li> Frameworks für betriebliche Anwendungen</li> <li> Infrastruktur und Middleware-Komponenten (Anwendungsserver, TP-Monitore, Cluster-Lösungen, ...)</li> <li> Enterprise Application Integration (EAI): Technologien und Frameworks</l\ i> <li> Serviceorientierte Architekturen</li> <li> Musterarchitekturen (Konzept und aktuelle Beispiele)</li> <li> Systemmanagement und Service-Level-Management: Werkzeuge und Technologie\ n</li> <li> Modellierung von Softwareanwendungslandschaften: Unternehmensmodelle, Softwarekartographie</li> <li> Gestaltung und Management von Softwareanwendungslandschaften</li> </ul> </pre> </p> <form> <input type="button" value="Fenster schließen" onClick="window.close()"> </form> </body> --- NEW FILE: cmcreate-pruefung.html.de --- <head> <title>CourseManagement - Pruefung</title> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> </head> <body> <h1>Prüfung</h1> <p>Wie wird die Veranstaltung abgeprüft? Dabei sind Angaben zu folgenden Aspekten notwendig: <ul> <li>Prüfungsart <li>Prüfungsdauer <li>Prüfungswiederholung <li>Hausaufgaben </ul></p> <p> Beispiele:<br> <pre> Beispiele für Prüfungsart: - "schriftlich" - "mündlich" - "schriftlich oder mündlich" - "seminarartig" - "praktikumsartig" Beispiele für Prüfungsdauer: - "120 - 135 min" - "Klausur 120 - 135 min, mündliche Prüfung 20 min" Beispiele für Prüfungswiederholung: - "jedes Semester" - "einmal im Jahr" - "nur im Anschluss an die nächste Veranstaltung" Beispiele für Hausaufgaben - "ja, Zulassungsvoraussetzung für die Prüfung" - "ja, eventuell Zulassungsvoraussetzung für die Prüfung" - "ja, Bearbeitung wird dringend empfohlen" - "keine" </pre> </p> <form> <input type="button" value="Fenster schließen" onClick="window.close()"> </form> </body> --- NEW FILE: cmcreate-vorkenntnisse.html.de --- <head> <title>CourseManagement - Vorkenntnisse</title> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> </head> <body> <h1>Vorkenntnisse</h1> <p>Welche Vorkenntnisse (z.B. Besuch anderer Veranstaltungen) sind zum Besuch der Lehrveranstaltung notwendig?</p> <p> Beispiele:<br> <pre> - "Modul IN0001" - "Modul IN2345 wünschenswert" - "Grundkenntnisse der Logik" - "keine" </pre> </p> <form> <input type="button" value="Fenster schließen" onClick="window.close()"> </form> </body> --- NEW FILE: cmcreate-lernziele.html.de --- <head> <title>CourseManagement - Lernziele</title> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> </head> <body> <h1>Lernziele</h1> <p>Was beherschen die Studierenden nach (erfolgreichem) Besuch der Lehrveranstaltung?</p> <p> Beispiel:<br> <pre> Teilnehmer kennen die Herausforderungen von komplexen Softwareanwendungslandschaften und gängige Methoden zur Komplexitätsbeherrschung und -reduktion. Sie kennen praxisrelevante Konzepte und Architekturen zur Modellierung und Gestaltung von Anwendungslandschaften und die wichtigsten Technologien zur Strukturierung von Softwareanwendungslandschaften. </pre> </p> <form> <input type="button" value="Fenster schließen" onClick="window.close()"> </form> </body> Index: cmall.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmall.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmall.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cmall.html.de 12 Sep 2006 12:48:22 -0000 1.2 @@ -12,7 +12,7 @@ #end <h1>Modulkatalog</h1> -(für alle Studiengänge der Fakultät) +(für alle Studiengänge der Fakultät) #set ( $results = $coursePresenter.searchCourseModules("cmhidden=0","cmsid") ) <p> Index: cmcreateres.txt =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreateres.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmcreateres.txt 30 May 2006 14:14:31 -0000 1.2 +++ cmcreateres.txt 12 Sep 2006 12:48:23 -0000 1.3 @@ -19,10 +19,11 @@ - Modulverantwortlicher: $!courseManager.getLecturer($cm.getResponsible()).getName2() $!portal_baseurl/course/cm.html?id=$!cmsid +$!portal_baseurl/course/cm.html?cmid=$!cmid #if ("$!acc"=="course") -Das Modul wurde vorerst mit dem Status "nicht bestätigt/unsichtbar" +Das Modul wurde vorerst mit dem Status "nicht bestaetigt/unsichtbar" angelegt und kann noch nicht verwendet werden. Um das Modul -freizugeben, müssen Sie das Modul editieren und den Status auf -"bestätigt/sichtbar" setzen. +freizugeben, muessen Sie das Modul editieren und den Status auf +"bestaetigt/sichtbar" setzen. #end Index: cmcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmcreate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cmcreate.html.de 12 Sep 2006 12:48:23 -0000 1.2 @@ -26,6 +26,19 @@ #if ( $returnCode > 1999 ) <font color="red">Fehler beim Anlegen eines Moduls.</font><p> +#if ( $returnCode == 2090 ) +<font color="red">Folgende notwendigen Angaben fehlen: $!errors</font>. Hinweis: Pflichtfelder sind mit "*" markiert.<p> +#end +#end + +#if ("$!acc"=="course") + +<p>Sie haben nicht das Recht, neue Module direkt einzugtragen. Die +Daten in nachfolgend aufgeführtem Formular werden deshlab erst an den +Prüfungsausschuss zu Genehmigung geschickt. Erst wenn der Modulantrag +bestätigt worden ist, steht das Modul zum Eintragen von +Veranstaltungen zu Verfügung.</p> + #end <form action="/COURSE" method="post"> @@ -34,23 +47,24 @@ <input type="hidden" name="cmd.error" value="/course/cmcreate.html"> <input type="hidden" name="cmd.noaccess" value="/noaccess.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="_requattrs" value="cmname,cmname_en,cmtarget,cmtarget_en,cmcontent,cmcontent_en,cmcert"> <table border="0"> <tr> <td>SID</td> -<td><input name="cmsid" size="10"></td> +<td><input name="cmsid" size="10"> (Identifikator des Moduls, z.B. IN0001)</td> </tr> <tr> -<td>Name</td> -<td><input name="cmname" size="70"></td> +<td>Name *</td> +<td><input name="cmname" size="70" value="$!cmname"></td> </tr> <tr> -<td>Name (englisch)</td> -<td><input name="cmname_en" size="70"></td> +<td>Name (englisch) *</td> +<td><input name="cmname_en" size="70" value="$!cmname_en"></td> </tr> <tr> <td>Kurzname</td> -<td><input name="cmshortname" size="30"></td> +<td><input name="cmshortname" size="30" value="$!cmshortname"></td> </tr> <tr> <td>Typ</td> @@ -61,74 +75,84 @@ #if ("$!acc"=="module") <tr> <td>Sichtbarkeit</td> -<td><select name="cmhidden" size="1"> -<option value="0">bestätigt/sichtbar</option> -<option value="1">archiviert/nicht sichtbar</option> -<option value="2">nicht bestätigt/nicht sichtbar</option> -</select></td> +<td> +$portalPresenter.printSelect("cmhidden","bestätigt/sichtbar,archiviert/nicht sichtbar,nicht bestätigt/nicht sichtbar","0,1,2","$!cmhidden") +</td> </tr> #else <input type="hidden" name="cmhidden" value="2"/> #end <tr> <td>ECTS Credits</td> -<td><input name="cmectscredits" size="5"></td> +<td><input name="cmectscredits" size="5" value="$!cmectscredits"> (ganzzahlig!)</td> </tr> <tr> <td>Semesterwochenstunden</td> <td> - Vorlesung: <input name="cmhours_lec" size="2"> - Übung: <input name="cmhours_ex" size="2"> - Seminar: <input name="cmhours_sem" size="2"> - Praktikum: <input name="cmhours_lab" size="2"> + Vorlesung: <input name="cmhours_lec" size="2" value="$!cmhours_lec"> + Übung: <input name="cmhours_ex" size="2" value="$!cmhours_ex"> + Seminar: <input name="cmhours_sem" size="2" value="$!cmhours_sem"> + Praktikum: <input name="cmhours_lab" size="2" value="$!cmhours_lab"> </td> </tr> <tr> <td>Teilnehmerzahl</td> -<td><input name="cmcapacity" size="5"></td> +<td><input name="cmcapacity" size="5" value="$!cmcapacity"></td> </tr> <tr> -<td>Inhalt</td> -<td><textarea name="cmcontent" rows="3" cols="70"> +<td>Lernziele *<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-lernziele.html">Beispiel</a>)</td> +<td><textarea name="cmtarget" rows="3" cols="70"> +$!cmtarget </textarea></td> </tr> <tr> -<td>Inhalt (englisch)</td> -<td><textarea name="cmcontent_en" rows="3" cols="70"> +<td>Lernziele (englisch) *</td> +<td><textarea name="cmtarget_en" rows="3" cols="70"> +$!cmtarget_en </textarea></td> </tr> <tr> -<td>Lernziele</td> -<td><textarea name="cmtarget" rows="3" cols="70"> +<td>Inhalt *<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-inhalt.html.de">Beispiel</a>)</td> +<td><textarea name="cmcontent" rows="3" cols="70"> +$!cmcontent </textarea></td> </tr> <tr> -<td>Lernziele (englisch)</td> -<td><textarea name="cmtarget_en" rows="3" cols="70"> +<td>Inhalt (englisch) *</td> +<td><textarea name="cmcontent_en" rows="3" cols="70"> +$!cmcontent_en </textarea></td> </tr> <tr> -<td>Voraussetzungen</td> +<td>Vorkenntnisse<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-vorkenntnisse.html.de">Beispiel</a>)</td> <td><textarea name="cmprerequ" rows="3" cols="70"> -</textarea></td> +$!cmprerequ +</textarea><br> +Bitte geben Sie hier an, welche anderen Module vorher besucht werden müssen bzw. welche anderen Voraussetzungen es für den Besuch der Veranstaltung gibt. +</td> </tr> <tr> -<td>Voraussetzungen (englisch)</td> +<td>Vorkenntnisse (englisch)</td> <td><textarea name="cmprerequ_en" rows="3" cols="70"> -</textarea></td> +$!cmprerequ_en +</textarea> +</td> </tr> <tr> -<td>Schein(voraussetzungen)</td> +<td>Prüfung<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-pruefung.html.de">Beispiel</a>)</td> <td><textarea name="cmcert" rows="3" cols="70"> -</textarea></td> -</tr> -<tr> -<td>Schein(voraussetzungen) (englisch)</td> -<td><textarea name="cmcert_en" rows="3" cols="70"> -</textarea></td> +$!cmcert +</textarea><br> +Bitte geben Sie hier mindestens ein, ob die Prüfung schriftlich und/oder mündlich stattfindet - und jeweils die Dauer der Prüfungen. Siehe dazu auch <a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-pruefung.html.de">Beispiel</a>. +</td> </tr> <tr> -<td>Didaktik</td> +<td>Didaktik<br> +(<a target="popup" onClick="window.open('', 'popup', 'width=500,height=450,scrollbars=yes, toolbar=no,status=no, resizable=no,menubar=no,location=no,directories=no,top=100,left=400')"href="cmcreate-didaktik.html.de">Beispiel</a>)</td> <td><textarea name="cmdidactics" rows="3" cols="70"> $!cmdidactics </textarea></td> @@ -166,8 +190,9 @@ <tr> <td>Studiengang</td> <td>Typ</td> - <td>erstes Semester</td> - <td>letztes Ssemester</td> + <td>von Sem.</td> + <td>bis Sem.</td> + <td>Kommentar</td> </tr> #foreach( $i in [1..6] ) <tr> @@ -203,9 +228,17 @@ #end </select> </td> + <td> + <input type="text" size="15" name="cpcomment$i" value="$!cpcomment$i"> + </td> </tr> #end </table> + +<br>Im Kommentar-Feld kann/muss angegeben werden, welchem Fachgebiet +innerhalb eines Studiengangs das Modul zugeordnet ist (falls das +für den Studiengang zutrifft). + <p> <input type="hidden" name="cmprogcnt" value="6"/> #if ("$!acc"=="module") Index: cmupdateres.txt =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmupdateres.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmupdateres.txt 29 May 2006 07:13:31 -0000 1.1 +++ cmupdateres.txt 12 Sep 2006 12:48:23 -0000 1.2 @@ -6,7 +6,7 @@ #set ( $acc = "module" ) #end #set( $cm = $coursePresenter.getCourseModule($cmid) ) -Auf der Drehscheibe wurde eben durch den Benutzer $auser.getName() +Auf der Drehscheibe wurden eben durch den Benutzer $auser.getName() ($auser.getUserLogin(), $!auser.getEmail()) die Daten zum Modul $cm.getName() ($cm.getSId()) aktualisiert. Index: ccreatepreselect.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/ccreatepreselect.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccreatepreselect.html.de 29 May 2006 07:13:31 -0000 1.1 +++ ccreatepreselect.html.de 12 Sep 2006 12:48:22 -0000 1.2 @@ -23,7 +23,9 @@ #end <p>Um eine neue Veranstaltung anzulegen, müssen Sie zuerst das -zugehörige Modul auswählen.</p> +zugehörige Modul auswählen. Geben Sie dazu bitte in +folgendes Formular einen Substring des gewünschten Modulnamens +ein (case-sensitive).</p> <p> <form action="ccreatepreselect.html" method="post"> @@ -42,6 +44,8 @@ <br /> <input type="submit" class="submit" value="Veranstaltung anlegen"/> </form> +<p> +Hinweis: Beantragte Module erscheinen hier erst wenn sie vom Prüfungsausschuss genehmigt sind.</p> #end </p> --- NEW FILE: cmcreate-didaktik.html.de --- <head> <title>CourseManagement - Didaktik</title> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> </head> <body> <h1>Didaktik</h1> <p>Wie wird in der Veranstaltung vorgegangen (um die Lernziele zu erreichen)?</p> <p> Beispiel:<br> <pre> Kombination von Vorlesung und Fallstudien (teilweise in Gruppenarbeit) </pre> </p> <form> <input type="button" value="Fenster schließen" onClick="window.close()"> </form> </body> Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/index.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.html.de 30 May 2006 14:14:31 -0000 1.2 +++ index.html.de 12 Sep 2006 12:48:23 -0000 1.3 @@ -118,7 +118,7 @@ #if ( "$!acc" == "module" ) <li><a href="cmcreate.html">Modul anlegen</a> #else -<li><a href="cmcreate2.html">Modul beantragen</a> +<li><a href="cmcreate.html">Modul beantragen</a> #end </ul> Index: navigation.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/navigation.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- navigation.html.de 29 May 2006 07:13:31 -0000 1.1 +++ navigation.html.de 12 Sep 2006 12:48:23 -0000 1.2 @@ -28,7 +28,7 @@ <BR> <A class=sub href="cmcreate.html">Modul anlegen</A> <BR> <A class=sub href="cpcreate.html">Studiengang anlegen</a> #else -<BR> <A class=sub href="ccreate.html">Modul benatragen</A> +<BR> <A class=sub href="ccreate.html">Modul beantragen</A> #end <BR> <BR> <a class=sub href="crsearch.html">Räume suchen</a> Index: cupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cupdate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cupdate.html.de 30 May 2006 14:14:31 -0000 1.2 +++ cupdate.html.de 12 Sep 2006 12:48:23 -0000 1.3 @@ -36,10 +36,10 @@ <input type="hidden" name="cid" value="$cid" /> <h2>$!courseModule.getName()</h2> <table border="0"> -<tr> +<!--<tr> <td>Modul-ID</td> <td><input name="ctplid" size="8" value="$!courseModule.getId()"></td> -</tr> +</tr>--> <tr> <td>Typ</td> <td><b> @@ -57,13 +57,42 @@ </tr> <tr> <td>Name</td> - <td><input name="cname" size="70" value="$!course.getName()"></td> + <td><input name="cname" size="70" value="$!course.getName()"><br> +Sie können den Modulnamen um einen Untertitel ergänzen, dürfen den Prefix (Modulnamen) aber nicht abändern oder kürzen. +</td> </tr> <tr> <td>Name (englisch)</td> <td><input name="cname_en" size="70" value="$!course.getName("en")"></td> </tr> <tr> +<td>Studiengänge</td> +<td> +<table border="1"> +<tr> + <td><em>Studiengang</em></td> + <td><em>Wahl/Pflicht</em></td> + <td><em>Kommentar</em></td> +</tr> +#set ( $courseTempProgRel = $cm.getProgramRel() ) +#set ($j = 0) +#foreach ( $cmpr in $courseTempProgRel ) +#set ($j = $j + 1) +<tr><td> +$cmpr.getProgram().getName() +</td><td> +$!cmpr.getType() +</td><td> +$!cmpr.getComment() +</td> +</tr> +#end +</table> +</td> +</tr> +</td> +</tr> +<tr> <td>Kommentar</td> <td><input name="ccomment" size="70" value="$!course.getComment()"></td> </tr> @@ -83,7 +112,7 @@ </tr> <tr> <td>ECTS Credits</td> - <td><input name="cectscredits" size="5" value="$!course.getEctsCredits()"> <i>(z.B. 13<b>.</b>5)</i></td> + <td>$!course.getEctsCredits()<input name="cectscredits" type="hidden" value="$!course.getEctsCredits()"></td> </tr> <tr> <td>Semesterwochenstunden</td> @@ -122,14 +151,6 @@ <br /><br /> </td></tr> <tr> - <td>Inhalt</td> - <td><textarea name="ccontent" rows="3" cols="70">$!course.getContent()</textarea></td> -</tr> -<tr> - <td>Inhalt (englisch)</td> - <td><textarea name="ccontent_en" rows="3" cols="70">$!course.getContent('en')</textarea></td> -</tr> -<tr> <td>Lernziele</td> <td><textarea name="ctarget" rows="3" cols="70">$!course.getTarget()</textarea></td> </tr> @@ -138,22 +159,26 @@ <td><textarea name="ctarget_en" rows="3" cols="70">$!course.getTarget('en')</textarea></td> </tr> <tr> - <td>Voraussetzungen</td> + <td>Inhalt</td> + <td><textarea name="ccontent" rows="3" cols="70">$!course.getContent()</textarea></td> +</tr> +<tr> + <td>Inhalt (englisch)</td> + <td><textarea name="ccontent_en" rows="3" cols="70">$!course.getContent('en')</textarea></td> +</tr> +<tr> + <td>Vorkenntnisse</td> <td><textarea name="cprerequ" rows="3" cols="70">$!course.getPrerequ()</textarea></td> </tr> <tr> - <td>Voraussetzungen (englisch)</td> + <td>Vorkenntnisse (englisch)</td> <td><textarea name="cprerequ_en" rows="3" cols="70">$!course.getPrerequ('en')</textarea></td> </tr> <tr> - <td>Schein(voraussetzungen)</td> + <td>Prüfungsart</td> <td><textarea name="ccert" rows="3" cols="70">$!course.getCert()</textarea></td> </tr> <tr> - <td>Schein(voraussetzungen) (englisch)</td> - <td><textarea name="ccert_en" rows="3" cols="70">$!course.getCert('en')</textarea></td> -</tr> -<tr> <td>Didaktik</td> <td><textarea name="cdidactics" rows="3" cols="70">$!course.getDidactics()</textarea></td> </tr> |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:45:09
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18540 Modified Files: change_password.html.de forgot_password.txt.de login.html.de register-success.html.de register.html.de user-interests.html.de user-roles.html.de user.html.de Added Files: user-allpaths.html.de user-buddylist-search.html.de user-buddylist.html.de Removed Files: forgot_password.html.de user-adress.html.de user-register-success.html.de Log Message: --- NEW FILE: user-buddylist.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) #set ( $auserlogin = $userLogin ) #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) #set ($auser = $userManager.getUser($auserid)) #set ($auserclass = $auser.getUserClass() ) <h1>Benutzerprofil - Freundesliste</h1> #set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) #if ( "$auth" != "true" ) #if ( "$auserlogin" == "$userLogin" ) #set ( $auth = "true" ) #end #end #if ( $auth != "true" ) <div class="error">Sie haben keine ausreichenden Zugriffsrechte um das Benutzerprofil von "$auserlogin" zu lesen.</div> <p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten an oder kontaktieren Sie den Plattformadministrator um die notwendigen Rechte zugewiesen zu bekommen.</p> #else #if ($auserid == 0) <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else #if ($returnCode == 1001) <p><div class="error">User with user login $!newUserLogin does not exist, please check your input!</div></p> <p><div class="info">And try again!</div></p> #end #if ($returnCode == 1002) <p><div class="info">The user you try to add, is already in your buddylist.</div></p> #end #if ($returnCode == 1003) <p><div class="info">It is impossible to add yourself into your buddylist!</div></p> #end #if ($returnCode == 1010) <p><div class="info">Your input is empty!</div></p> #end #if ($returnCode == 2001) <p><div class="info">You have added one new member in your buddylist.</div></p> #end <p>Benutzerlogin: $auserlogin</p> <form action="/USER" method="post"> <input type="hidden" name="cmd" value="deleteListMember" /> <input type="hidden" name="cmd.success" value="/user/user-buddylist.html" /> <input type="hidden" name="cmd.error" value="/user/user-buddylist.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="pim.network.buddylist" /> <input type="hidden" name="uid" value="$auserid" /> <p> <table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> <tr bgcolor="#eeeeee"> <td> <table border="0" cellpadding="5pt"><tr><td> <em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - <a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> </td></tr></table></td> <td align="right"> <table border="0" cellpadding="5pt"><tr><td> <em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> </td></tr></table> </td></tr> <tr><td colspan="2"> <table border="0" cellpadding="8pt"> <tr><td> <b>Freundesliste von Benutzer <i>$userManager.getUser($auserid).getName()</i></b> <br><br> <table width="100%"> <tr bgcolor="dfdfdf"> <td width="7%"> <b>Löschen</b> </td> <td width="12%"> <b>Bild</b> </td> <td width="43%"> <b>Name</b> </td> <td width="38%"> <b>E-Mail</b> </td> </tr> #set ($result = $userPresenter.getUserAttrSet($auserid, "pim.network.buddylist")) #if ($result.size() > 0) #foreach ($i in $result) <tr bgcolor="dfdfdf"> <td align="center"><input type="checkbox" name="id" value="$i.getId()"></td> <td valign=center> #set ($imageuri = "") #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) #if ("$!imageuri"!="") <img src="$imageuri" width="32" height=32> #end </td> <td><a href="/user/card.html?auserlogin=$i.getUserLogin()">$i.getName()</a></td> <td> #if ($i.getAttribute("basic.contact-work.online.email")) $!i.getAttribute("basic.contact-work.online.email") #else $!i.getAttribute("basic.contact-private.online.email") #end</td> </tr> #end #else <tr><td colspan = "3">Your buddylist has no entries yet. You can fill it using text field below.</td></tr> #end </table> <br> <input type="submit" value="Löschen"> </form> <p> <form action="/USER" method="post" name=frm1 id=frm1> <input type="hidden" name="cmd" value="addListMember" /> <input type="hidden" name="cmd.success" value="/user/user-buddylist.html" /> <input type="hidden" name="cmd.error" value="/user/user-buddylist.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="pim.network.buddylist" /> <input type="hidden" name="uid" value="$auserid" /> Um jemanden zur Freundesliste hinzuzufügen geben Sie bitte hier ihre oder seine Benutzerkennung/Benutzerlogin an. </p> <br> <input type="submit" value="Zur Liste hinzufügen"> <input name="newUserLogin" size="20" value="$!newUserLogin"> <script type="text/javascript"> // <!-- document.write("<input type=button value=Search onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">"); // --> </script> <noscript> <a href="/user/user-buddylist-search.html?auserlogin=$auserlogin">Suche</a> </noscript> </td></tr></table> </td></tr></table> </form> #end #end $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: change_password.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/change_password.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- change_password.html.de 30 May 2006 14:14:31 -0000 1.6 +++ change_password.html.de 12 Sep 2006 12:45:01 -0000 1.7 @@ -1,39 +1,35 @@ $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) -<h1>Passwort ändern</h1> +<h1>Passwort ändern</h1> -#if (($returnCode >= 1000) && ($returnCode <=1020)) -#if ($returnCode == 1001) - <div class="error"> - Das alte Passwort ist nicht korrekt! - </div> -#end -#if ($returnCode == 1002) - <div class="error">Die beiden Eingaben des neuen Passworts stimmen nicht überein.</div> -#end -#if ($returnCode == 1006) - <div class="error"> - Es wurde kein altes Passwort angegeben! - </div> -#end -#if ($returnCode == 1007) - <div class="error"> - Es wurde kein neues Passwort angegeben! - </div> -#end -#if ($returnCode == 1008) - <div class="error"> - Das neue Passwort ist zu kurz oder zu lang. - </div> +#if ($returnCode > 1999) +<div class="error"> +#if ($returnCode == 2008) +Das alte Passwort ist nicht korrekt. +#elseif ($returnCode == 2006) +Es wurde kein oder ein illegales Passwort angegeben. +#elseif ($returnCode == 2007) +Das neue Passwort stimmt nicht mit der zweiten Angabe überein. +#else +Fehler beim Ãndern des Passwortes. #end +</div> +</p> +<br> +Bitte versuchen Sie es noch einmal! #else - #if ($returnCode == 2001) - #else - -<p>Zum Ändern Ihres Passworts tragen Sie bitte in dieses Formular das bisherige Passwort und das neue Passwort ein.</p> - - #end +#if ($returnCode == 1040) +<p><div class="success"> +Dass Passwort wurde erfolgreich geändert. +</div></p> +#else +<p> +Wenn Sie Ihr Passwort für diese Plattform ändern wollen, dann tragen Sie bitte in folgendem Formular Ihr bisheriges Passwort und das gewünschte neue Passwort ein (zweimal). +</p> +<p> +Achtung: Das neue Passwort muss mindestens sechs Zeichen lang sein.</p> +#end #end <form action="/USER" method=post> @@ -47,23 +43,27 @@ <input type="hidden" name="cmd.error" value="/user/change_password.html" /> <input type="hidden" name="auLogin"> #if ($returnCode == 2001) - <div class="info">Ihr Passwort wurde erfolgreich geändert.</div> + <div class="info">Your password on this platform has been changed!</div> #else <TABLE BORDER=0> <tr> - <TD>Passwort (alt)*:</TD><TD><input type="password" name="passwordOld" size=20 value="$!passwordOld"></td> + <TD>Passwort (bisheriges)*:</TD><TD><input type="password" name="passwordOld" size=20 value="$!passwordOld"></td> </tr> <tr> <TD>Passwort (neu)*:</TD><TD><input type="password" name="passwordNew" size=20 value="$!passwordNew"></td> </tr> <tr> - <TD>Bestätige Passwort*:</TD><TD><input type="password" name="passwordConfirm" size=20 value="$!passwordConfirm"></td> + <TD>Bestätige Passwort*:</TD><TD><input type="password" name="passwordConfirm" size=20 value="$!passwordConfirm"></td> </tr> + <tr> + <br> +<td colspan = "2" align="left">Notwendige Felder sind mit * markiert.</td> + </tr> </table> </p> #set ($login = "$!auserlogin") - <p><input type=submit value="Passwort ändern"/></p> + <p><input type=submit value="Passwort ändern"/></p> #end </form> Index: forgot_password.txt.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/forgot_password.txt.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- forgot_password.txt.de 30 May 2006 14:14:31 -0000 1.1 +++ forgot_password.txt.de 12 Sep 2006 12:45:01 -0000 1.2 @@ -1,5 +1,5 @@ PASSWORT ZURÜCKSETZEN -Auf Ihre Anfrage hin, wirde das Passwort Ihrer Benutzerkennung +Auf Ihre Anfrage hin, wurde das Passwort Ihrer Benutzerkennung $!auserlogin auf einen neuen Wert gesetzt. Der neue Wert für das Passwort lautet: $!passwd --- forgot_password.html.de DELETED --- Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- login.html.de 30 May 2006 14:14:31 -0000 1.7 +++ login.html.de 12 Sep 2006 12:45:01 -0000 1.8 @@ -3,20 +3,31 @@ <h1>Login</h1> +#if ($returnCode == 1030) + <div class="success"> + Neues Passwort für Benutzerlogin "$!auserlogin" gesetzt und an + E-Mail Adresse "$!email" geschickt. + </div> +#end #if ($returnCode > 2000) <div class="error"> - #if ($returnCode == 2001) + #if ($returnCode == 2201) Der Benutzerlogin "$luserlogin" ist nicht definiert. + #elseif ($returnCode == 2202) + Das angegebene Passwort für den Benutzerlogin "$luserlogin" ist + nicht korrekt. + #elseif ($returnCode == 2001) + Kein oder ein illegaler Benutzerlogin angegeben. + #elseif ($returnCode == 2003) + Keine oder eine illegale E-Mail-Adresse angegeben. + #elseif ($returnCode == 2030) + Fehler beim Zurücksetzen des Passworts. + #elseif ($returnCode == 2031) + Der angebene Benutzerlogin exisitert nicht oder hat nicht die + angegebene E-Mail-Adresse zugeordnet. + #else + Fehler bei der Ausführung des Dienstes. #end - #if ($returnCode == 2002) - Das angegebene Passwort für den Benutzerlogin "$luserlogin" ist nicht korrekt. - #end - #if ($returnCode > 2002) - Fehler beim Anmelden. - #end - #if ($returnCode == 1006) - E-mail ist ein Pflichtfeld! -#end </div> #end @@ -25,8 +36,8 @@ anzumelden. Sie können dabei sowohl lokale Kennungen nutzen als auch Ihre mytum-Kennung. Falls Sie noch keine Kennung auf dieser Plattform oder auf dem mytum-Portal eingerichtet haben, dann -können Sie ersters jetzt in der <a -href="/user/register.html.de">Benutzerregistrierung</a> tun.</p> +können Sie jetzt <a href="/user/register.html.de">eine lokale +Kennung anlegen</a>.</p> <quote> <form name="loginForm" action="/PORTAL" method="post"> @@ -55,24 +66,21 @@ <p> <form action="/USER" method=post> -<INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> +<INPUT TYPE=hidden NAME=cmd VALUE="forgotPassword" /> <input type="hidden" name="cmd.success" value="/user/login.html.de" /> <input type="hidden" name="cmd.error" value="/user/login.html.de" /> +<input type="hidden" name="email_subject" value="Drehscheibe www.in.tum.de Password" /> +<input type="hidden" name="email_textsource" value="/user/forgot_password.txt.de" /> <table border="0"> <tr><td>Loginname*:</td><td><input name="auserlogin" size=20 value="$!auserlogin"></td></tr> <tr><td>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td></tr> <tr><td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td></tr> </table> </p> - #set ($login = "$!auserlogin") <p><input type=submit value="Neues Passwort anfordern"/></p> - <p>Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> - -<input type="hidden" name="email_subject" value="Drehscheibe Password" /> -<input type="hidden" name="email_textsource" value="/user/forgot_password.txt.de" /> </form> </td> --- NEW FILE: user-allpaths.html.de --- #parse ( "pageheader.html" ) #set ( $userida = $userManager.getUserIdForUserLogin($!usera) ) #set ( $useridb = $userManager.getUserIdForUserLogin($!userb) ) #set ( $usera = $userManager.getUser($userida) ) #set ( $userb = $userManager.getUser($useridb) ) #set ( $usernamea = $usera.getUserLogin() ) #set ( $usernameb = $userb.getUserLogin() ) <h1>Social Networks</h1> <p> This page shows the path from user <em>$usernamea</em> to user <em>$usernameb</em>. </p> <p> The paths are calculated using the relationship defined by the attribute "pim.network.buddylist". Since the buddylists are also based on this attribute, these paths are based on the entries of the buddylists. </p> <p> <a href="card.html?auserlogin=$usernameb">Back to the user-card</a> #set ( $paths = $userPresenter.getUserPaths($userida, $useridb) ) #set ( $pathssize = $paths.size() ) #set ( $pathsmaxindex = $pathssize - 1 ) <p> Number of found paths: $pathssize<br> Showing only the first 10 results. </p> #set ( $first = 1 ) #set ( $indexpath = 0 ) <table border=0 style="table-layout:fixed;"> #foreach ($j in $paths) #set ( $indexpath = $indexpath + 1 ) #if ( $indexpath < 10 ) <tr> <td>$indexpath</td> #set ( $maxindex = $j.size() - 1 ) #set ( $index = 0 ) #foreach ($i in $j) #set ( $useri = $userManager.getUser($i) ) <td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;"> #set ($imageuri = "") #set ($imageuri = $useri.getAttribute("basic.personal.imageuri")) #if ($imageuri == "") #set ($imageuri = "/images/nouser.png") #end #set ($userLogin = $useri.getUserLogin()) <a href="card.html?auserlogin=$userLogin"><img src="$imageuri" width=32 height=32></a> <br> <a href="card.html?auserlogin=$userLogin">$userLogin</a> </td> #if($index != $maxindex) <td valign=middle align=center> <img src="/images/arrow.png"> </td> #end #set ($index = $index + 1) #end </tr> #end #end </table> #parse ( "pagefooter.html" ) Index: user.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- user.html.de 30 May 2006 14:14:31 -0000 1.8 +++ user.html.de 12 Sep 2006 12:45:01 -0000 1.9 @@ -28,7 +28,18 @@ #else -#if (($returnCode != 2010) && ($returnCode != 1001)) +#if ($returnCode == 1050) + <div class="info"> + Die Benutzerkennung <b>$auserlogin</b> wurde erfolgreich gelöscht. + </div> + $portalPresenter.doLogout($portalRequest) +#else + +#if ($returnCode == 2050) + <div class="error"> + Fehler beim Löschen der Benutzerkennung <b>$auserlogin</b>. + </div> +#end #if ($auserid == 0) <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else @@ -46,7 +57,7 @@ <input type="hidden" name="cmd.error" value="/user/user.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="auserid" value="$auserid" /> - +<input type="hidden" name="anames" value="basic.personal.lastname,basic.personal.firstname,basic.personal.title,basic.contact-priv.online.email,basic.contact-priv.online.uri,preference.language,basic.personal.languagesspoken,basic.personal.imageuri,basic.university.status,basic.university.subject,basic.university.graduation" /> <p> #if ($returnCode == 1020) <p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p> @@ -83,14 +94,22 @@ <td>$userPresenter.printUserAttrInput($auserid, "basic.personal.firstname")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.personal.lastname", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.personal.lastname")</td></tr> -<tr><td>$userPresenter.printDescription($auserid, "basic.demographics.gender", $lang):</td> -<td>$userPresenter.printUserAttrInput($auserid, "basic.demographics.gender")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.online.email", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.online.email")</td></tr> +<tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.online.uri", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.online.uri")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "preference.language", $lang):</td> -<td>$userPresenter.printUserAttrInput($auserid, "preference.language")</td></tr> +<td>$userPresenter.printUserAttrInput($auserid, "preference.language") z.B. "de"</td></tr> <tr><td valign=top>$userPresenter.printDescription($auserid, "basic.personal.languagesspoken", $lang):</td> -<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.languagesspoken")</td></tr> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.languagesspoken") z.B. "de,en,fr"</td></tr> +<tr><td> </td></tr> +<tr><td valign=top>Status:</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.university.status")</td></tr> +<tr><td valign=top> Studiengang:</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.university.subject")</td></tr> +<tr><td valign=top> (vorauss.) Abschlussjahr:</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.university.graduation")</td></tr> + </table> <table border="0"> @@ -98,32 +117,20 @@ <td>$userPresenter.printUserAttrInput($auserid, "basic.personal.imageuri")</td></tr> </table> -<p>If you do not have a possibility to upload a portrait to a Web server, -you can upload an image file (gif, png or jpg) to our server. Just select a -file from you local file system:<br> -<input type="file" size="40" name="uploadimage"> - -<p> - -You can load your user profile from a FOAF/RDF user profile -representation. Just enter the URL of your FOAF description here and -the content of this file will be loaded intot your local Cobricks user -profile. +<p>Wenn Sie nicht über ein online verfügbares Portraitbild verfügen, +dessen URL Sie hier angeben können, können Sie eine Bilddatei (gif, +png oder jpg) auf diesen Server laden. Wählen Sie dazu einfach eine +Datei aus Ihrem Dateisystem aus:<br> -<table border="0"> -<tr><td>$userPresenter.printDescription($auserid, "basic.personal.foafuri", $lang): -$userPresenter.printUserAttrInput($auserid, "basic.personal.foafuri")</td></tr> -</table> +<input type="file" size="40" name="uploadimage"> <p> -<input type="submit" value="Update"> +<input type="submit" value="Benutzerprofil aktualisieren"> </td></tr></table> </td></tr></table> -#end -#end </form> <form action="/USER" method="post"> @@ -131,33 +138,13 @@ <input type="hidden" name="cmd.success" value="/user/user.html"> <input type="hidden" name="cmd.error" value="/user/user.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> - -#if ($auserid == 0) - -#else - -#set ($userloginToDelete = $auserlogin) -##set ($test="$uLogin") - #if ($returnCode == 1001) - <div class="error"> - Loginname <b>$auserlogin</b> existiert nicht. - </div> - #end - #if ($returnCode == 2010) - <div class="info"> - Die Benutzerkennung <b>$userloginToDelete</b> wurde erfolgreich gelöscht. - </div> - $portalPresenter.doLogout($portalRequest) - #else - <input type="hidden" name="auserlogin" value="$auserlogin" /> - <input type="hidden" name="auserid" value="$auserid" /> - <input type="submit" value="Benutzerkennung löschen" /> - #end - +<input type="hidden" name="auserlogin" value="$auserlogin" /> +<input type="hidden" name="auserid" value="$auserid" /> +<input type="submit" value="Benutzerkennung löschen" /> </form> #end - +#end #end $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: register-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register-success.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- register-success.html.de 30 May 2006 14:14:31 -0000 1.5 +++ register-success.html.de 12 Sep 2006 12:45:01 -0000 1.6 @@ -10,7 +10,7 @@ <p> Das Passwort zum Anmelden wurde per E-Mail an die Adresse <b>$basic_contact-priv_online_email</b> gesandt. Bitte warten Sie auf das Eintreffen der E-Mail mit dem Passwort, melden sich dann mit -diesem Passwort an un ändern Sie es Ihren Wünschen +diesem Passwort an und ändern Sie es Ihren Wünschen entsprechend.</p> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- user-register-success.html.de DELETED --- Index: user-roles.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-roles.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- user-roles.html.de 8 Oct 2004 12:10:48 -0000 1.6 +++ user-roles.html.de 12 Sep 2006 12:45:01 -0000 1.7 @@ -1,101 +1,74 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> -<A - href="/user/user.html.de">Basisinfo</A> - - <A - href="/user/user-adress.html.de">Adressinfo</A> - - <A - href="/user/user-interests.html.de">Interessen</A> - - <A - href="/user/user-roles.html.de"><B>Freundesliste</B></A> - - <A - href="/user/user-bannlist.html.de">Bannliste</A> - - <A - href="/user/user-card.html.de">Visitenkarte</A> - - <A - href="/user/user-veranstaltung.html.de">Veranstaltungsinfo</A> - - <A - href="/user/change_password.html.de">Passwort</A> - - <p> -#if ($returnCode == 2001) - <p><div class="info">Ein neuer Mitglieder/ eine neue Mitgliederin ist Ihrer Freundliste hinzugefügt worden.</div></p> - #end -#if ($returnCode < 2000) -<div class="error"> -#if ($returnCode > 1004) -Fehler $returnCode beim Aktualisieren der Benutzerdaten. -#end -</div> -#end -</p> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) + #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) #set ( $auserlogin = $userLogin ) #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#set ( $auser = $userManager.getUser($auserid)) -$userPresenter.setUserAttrInContext($auser, $velocityContext) +#set ($auser = $userManager.getUser($auserid)) +#set ($auserclass = $auser.getUserClass() ) -<P>Die Freundesliste ermglicht die Abstufung der Zugriffsrechte anderer - Drehscheibenbenutzer auf das eigene Profil. Dazu können die meisten - Angaben im <A href="/user/user.html.de">Profil</A> - mit privat bzw. Ãffentlich gekennzeichnet werden. Nicht gekennzeichnete - Attribute sind für alle Benutzer sichtbar. Alle mit privat markierten - Angaben dürfen auschlieÃich durch Personen innerhalb des Freundeskreises - eingesehen werden. Mittels der <A - href="/user/user-bannlist.html.de">Bannliste</A> - können bestimmte Personen vom Zugriff auf die Ãffentlichen Attributen des - eigenen Profils ausgeschlossen werden.</P> - <P>Einträe in die Freundesliste können mittels der <A - href="/user/user-search.html.de">Suchfunktion</A> - hinzugefgt werden.</P> -<TABLE> - <TBODY> - <TR> - <TD> - <H4>Aktuelle Freundesliste:</H4></TD></TR> - <TR> - <TD> -<form action="/USER" method="post"> -<input type="hidden" name="cmd" value="deleteListMember" /> -<input type="hidden" name="cmd.success" value="/user/user-roles.html.de" /> -<input type="hidden" name="cmd.error" value="/user/user-search.html.de" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> -<input type="hidden" name="aname" value="pim.network.buddylist" /> -<input type="hidden" name="userclass" value="user" /> -<input type="hidden" name="auserid" value="$auserid" /> +<h1>Benutzerprofil - Zugriffsrechte</h1> -#if ($auserid > 0) +#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) +#if ( "$auth" != "true" ) + #if ( "$auserlogin" == "$userLogin" ) + #set ( $auth = "true" ) + #end +#end +#if ( $auth != "true" ) +<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das +Benutzerprofil von "$auserlogin" zu lesen.</div> -<br> -<select multiple size=10 name="id"> - #set ($result = $userPresenter.getUserAttrSet($auserid, "pim.network.buddylist")) - #if ($result.size() > 0) - #foreach ($i in $result) - <option value="$i.getId()"> - #if("$!i.getName()" == "") - $!i.getUserLogin() - #else - $!i.getName() - #end - </option> - - #end - </select> - - - #end +<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten +an oder kontaktieren Sie den Plattformadministrator um die notwendigen +Rechte zugewiesen zu bekommen.</p> -<br> -<input type="submit" value="Löschen"> +#else +#if ($auserid == 0) + <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> +#else -</form> +<p>Loginname: $auserlogin</p> + +<p> +<table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> +<tr bgcolor="#eeeeee"> +<td> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - +<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> +</td></tr></table></td> +<td align="right"> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> +</td></tr></table> +</td></tr> +<tr><td colspan="2"> + +<table border="0" cellpadding="8pt"> +<tr><td> + +<b>Zugriffsrechte/rollen von Benutzer <i>$userManager.getUser($auserid).getName()</i></b> + +<ul> +#foreach( $i in $userManager.getAccessControl().getAccessRolesByUser($auserid) ) +<li>$i.getName() #end +</ul> + +</td></tr></table> + +</td></tr></table> + +#end + +#end + -</td> #parse ( "pagefooter.html" ) Index: user-interests.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-interests.html.de,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- user-interests.html.de 30 May 2006 14:14:31 -0000 1.11 +++ user-interests.html.de 12 Sep 2006 12:45:01 -0000 1.12 @@ -1,6 +1,5 @@ -#parse ( "pageheader.html" ) -<em><a href="index.html">User Component</a> - -<a href="user-interests.html">User Profile Interests</a></em> + +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -10,7 +9,7 @@ #set ($auser = $userManager.getUser($auserid)) #set ($auserclass = $auser.getUserClass() ) -<h1>User Profile - Interests</h1> +<h1>Benutzerprofil - Interessen</h1> #set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) #if ( "$auth" != "true" ) @@ -20,16 +19,17 @@ #end #if ( $auth != "true" ) -<div class="error">You do not have the access permission to read user -information of user "$auserlogin".</div> -<p> -Please log in as user with the specified permission or ask the platform -administrator to assign the permission to your account. +<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das +Benutzerprofil von "$auserlogin" zu lesen.</div> + +<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten +an oder kontaktieren Sie den Plattformadministrator um die notwendigen +Rechte zugewiesen zu bekommen.</p> #else #if ($auserid == 0) - <p><div class="error">User with user login <b>$auserlogin</b> does not exist!</div></p> + <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else #if ($returnCode == 1002) @@ -42,7 +42,7 @@ <p><div class="info">The new entry has been added to your interests list.</div></p> #end -<p>User Login: $auserlogin</p> +<p>Benutzerlogin: $auserlogin</p> <form action="/USER" method="post"> <input type="hidden" name="cmd" value="deleteListMember" /> @@ -57,14 +57,14 @@ <tr bgcolor="#eeeeee"> <td> <table border="0" cellpadding="5pt"><tr><td> -<em><a href="user.html?auserlogin=$auserlogin">basic</a> - -<a href="user-interests.html?auserlogin=$auserlogin">interests</a> - -<a href="user-buddylist.html?auserlogin=$auserlogin">buddylist</a> - -<a href="user-roles.html?auserlogin=$auserlogin">access roles</a><em></td> +<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - +<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> </td></tr></table></td> <td align="right"> <table border="0" cellpadding="5pt"><tr><td> -<em><a href="change_password.html?auserlogin=$auserlogin">change password</a></em> +<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> </td></tr></table> </td></tr> <tr><td colspan="2"> @@ -72,7 +72,7 @@ <table border="0" cellpadding="8pt"> <tr><td> -<b>Interests of user <i>$userManager.getUser($auserid).getName()</i></b> +<b>Interessen des Benutzers <i>$userManager.getUser($auserid).getName()</i></b> <br><br> <table width="100%"> @@ -91,7 +91,7 @@ #end </table> <br> -<input type="submit" value="Delete"> +<input type="submit" value="Löschen"> </form> <p> @@ -103,15 +103,15 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="interests.categories" /> <input type="hidden" name="uid" value="$auserid" /> -Please choose more interests from the list and click the button "Add to the -list": +Bitte wählen Sie zusätzliche Interessensgebiete aus folgender Liste aus und +Klicken Sie den Button "Zur Liste hinzufügen": <select name="cid"> #foreach( $i in $categoryPresenter.getCategories("", "", "") ) <option value="$i.getId()">$!i.getTitle() </option> #end </select> <br><br> -<input type="submit" value="Add to the list"> +<input type="submit" value="Zur Liste hinzufügen"> </td></tr></table> @@ -123,5 +123,4 @@ #end - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: register.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register.html.de,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- register.html.de 30 May 2006 14:14:31 -0000 1.8 +++ register.html.de 12 Sep 2006 12:45:01 -0000 1.9 @@ -3,68 +3,34 @@ <h1>Benutzerregistrierung</h1> -#if (($returnCode >= 1000) && ($returnCode <=1020)) -#if ($returnCode == 1000) - <font color="red"> - Loginname ist ein Pflichtfeld! - </font> -#end -#if ($returnCode == 1001) - <div class="error"> - Länge des Loginnamens muss mindestens 6 und - höchstens 20 Zeichen sein. - </div> -#end -#if ($returnCode == 1009) - <p> - <div class="error"> - Der Loginname darf keine Leerzeichen - oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. - </div> - </p> -#end -#if ($returnCode == 1002) - <div class="error"> - Vorname ist ein Pflichtfeld! - </div> -#end -#if ($returnCode == 1003) - <div class="error"> - Vorname muss mindestens 1 und höchstens 20 Zeichen haben. - </div> -#end -#if ($returnCode == 1004) - <div class="error"> - Nachname ist ein Pflichtfeld! - </div> -#end -#if ($returnCode == 1005) - <div class="error"> - Nachname muss mindestens 1 und höchstens 20 Zeichen haben. - </div> -#end -#if ($returnCode == 1006) - <div class="error"> - E-Mail-Adresse ist ein Pflichtfeld! - </div> -#end -#if ($returnCode == 1007) - <div class="error"> - E-Mail-Adresse ist nicht gültig - </div> - <br> - <div class="error"> - E-Mail-Adresse ist nicht gültig - </div> -#end - #if ($returnCode == 1020) - <p><div class="error"> - Benutzer mit login <i>$auserlogin</i> existiert bereits. - Bitte wählen Sie einen anderen Benutzernamen. - </div> - </p> +<p> +<dev class="success"> +Neuen Benutzer erfolgreich angelegt. +</dev> +</p> +#end +#if ($returnCode > 1999) +<p> +<dev class="error"> +#if ($returnCode == 2020) +Fehler beim Registrieren eines neuen Benutzers. +#elseif ($returnCode == 2021) +Fehler beim Registrieren eines neuen Benutzers. Der gewählte Benutzername +ist bereits vergeben. +#elseif ($returnCode == 2001) +Der angegeben Benutzername ist leer oder nicht gültig. +#elseif ($returnCode == 2003) +Die angegebene E-Mail-Adresse ist leer oder nicht gültig. +#elseif ($returnCode == 2025) +Fehler beim Registrieren eines neuen Benutzers. Es ist kein Vor-/Nachname +angegeben. +#elseif ($returnCode == 2025) +Fehler beim Registrieren eines neuen Benutzers. Einige Pflichtattribute +sind nicht angegeben. #end +</dev> +</p> #else <p> Wenn Sie bereits eine Kennung auf dieser Plattform haben, dann @@ -77,10 +43,9 @@ erfolgreichen Anmeldung wird Ihr Anfangs-Passwort an die angegebene E-Mail-Adresse geschickt. </p> -<p> Die Länge des <b><font color="black">Loginnames</font></b> -muss zwischen 6 und 20 Symbolen sein. Der Loginname darf keine -Leerzeichen oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. -</p> +<p> Die Länge des Loginnamens muss zwischen 6 und 20 Symbolen +sein. Der Loginname darf keine Leerzeichen oder Sonderzeichen +(Ausnahme ".", "-" und "_") enthalten. </p> #end @@ -90,7 +55,7 @@ <INPUT TYPE=hidden NAME=cmd VALUE=register /> <input type="hidden" name="attrrequ" value="basic_personal_firstname,basic_personal_lastname,basic_contact-priv_online_email" /> -<input type="hidden" name="attrnames" value="basic_university_status,basic_personal_title" /> +<input type="hidden" name="attrnames" value="basic_personal_title" /> <input type="hidden" name="userclass" value="universityuser" /> <input type="hidden" name="cmd.success" value="/user/register-success.html" /> @@ -100,6 +65,9 @@ <TD>Gewünschter Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> </tr> <tr> + <TD>Titel:</TD><TD><input name="basic_title" size=20 value="$!basic_title"></td> + </tr> + <tr> <TD>Vorname*:</TD><TD><input name="basic_personal_firstname" size=20 value="$!basic_personal_firstname"></td> </tr> <tr> @@ -109,26 +77,6 @@ <TD>E-Mail*:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact-priv_online_email"></td> </tr> <tr> - <TD>Status:</TD><TD> - #set ( $tmpstatus = "$!basic_university_status" ) - #set ($auserclass = "$!userclass") - <select width ="20" name="basic_university_status"> -#foreach( $i in $userManager.getProfileModel("universityuser").getAttribute("basic.university.status").getValues() ) - #if ( $i == $tmpstatus ) - <option value="$i" selected="true">$i - #else - <option value="$i">$i - #end - #end - </select></td> - - - </tr> - <tr> - <TD>Title:</TD><TD><input name="basic_title" size=20 value="$!basic_title"></td> - </tr> - - <tr> <br> <td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td> </tr> --- NEW FILE: user-buddylist-search.html.de --- #parse ( "pageheader.html" ) <h1>Search user</h1> <form action="user-buddylist-search.html" method=get> <input type=hidden name=auserlogin value=$!auserlogin> <input type=hidden name=print value=$!print> <table border=0> <tr> <td>User login</td> <td> <input type=text name=searchUserLogin> </td> </tr> <tr> <td>First name</td> <td> <input type=text name=searchFirstName> </td> </tr> <tr> <td>Last name</td> <td> <input type=text name=searchLastName> </td> </tr> <tr> <td>Sort by</td> <td> <select width="40" name="sort"> <option value="1">Login name</option> <option value="2">Lastname</option> <option value="3">Firstname</option> </select> </td> </select> <tr> <td> <input type=submit name=cmd value=Search> </td> </tr> </table> </form> <br><br> <script type="text/javascript"> //<!-- function OkSubmit() { selected = ""; for(i=0; i < document.getElementById("frm").elements.length; i++) { if(document.getElementById("frm").elements[i].name == "newUserLogin") { if(document.getElementById("frm").elements[i].checked == true) { selected = document.getElementById("frm").elements[i].value; } } } opener.document.getElementById("frm1").newUserLogin.value = selected; window.close(); } function openerGoTo(s) { opener.location.href = s; window.close(); } document.write("<form name=frm id=frm onSubmit=\"OkSubmit();return false;\">"); // --> </script> <noscript> <form action="user-buddylist.html" method=get> </noscript> <input type=hidden name=auserlogin value=$!auserlogin> <table border=0 width="100%"> <tr bgcolor="#dfdfdf"> <td> </td> <td> <b>Image</b> </td> <td> <b>Login</b> </td> <td> <b>Name</b> </td> <td> <b>e-mail</b> </td> </tr> #set ( $cmd = $!cmd ) #if ($cmd == "Search") #set ( $loginCond = "1" ) #set ( $fnameCond = "1" ) #set ( $lnameCond = "1" ) #set ( $login = $!searchUserLogin ) #set ( $fname = $!searchFirstName ) #set ( $lname = $!searchLastName ) #set ( $listNames = ["auserlogin", "basic.personal.firstname", "basic.personal.lastname"] ) #set ( $listConditions = [$loginCond, $fnameCond, $lnameCond] ) #set ( $listValues = [$login, $fname, $lname] ) #set ( $orFlag = false ) #set ( $sortBy = "$!sort" ) #set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "user")) #if (($result)) #set( $number = 0 ) #foreach ($i in $result) #set ($uId = $i.getUserId()) #set( $number = $number + 1 ) <tr bgcolor = "#dfdfdf"> <td> <input type=radio name=newUserLogin value="$i.getUserLogin()"> </td> <td> #set ($imageuri = "") #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) #if ("$!imageuri"!="") <img src="$imageuri" width="32" height=32> #end </td> <td> <script type="text/javascript"> // <!-- document.write("<a href=\"javascript:openerGoTo('/user/card.html?auserlogin=$i.getUserLogin()');\"> $i.getUserLogin()</a>"); // --> </script> <noscript> <a href="card.html?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a> </noscript> </td> <td> $i.getName() </td> <td> $!i.getAttribute("basic.contact.online.email") </td> </tr> #end #else <tr bgcolor="#dfdfdf"> <td colspan=4> <div class="info">The search for users has no results</div> </td> </tr> #end #else <tr bgcolor="#dfdfdf"> <td colspan=4> No search was performed </td> </tr> #end </table> <input type=submit value=OK> </form> #parse ( "pagefooter.html" ) --- user-adress.html.de DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:42:38
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17661 Modified Files: ItemManagerImpl.java Log Message: Index: ItemManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManagerImpl.java,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- ItemManagerImpl.java 1 Sep 2006 11:32:14 -0000 1.69 +++ ItemManagerImpl.java 12 Sep 2006 12:42:32 -0000 1.70 @@ -926,12 +926,11 @@ String contentName = null; String content = null; - int versionid = -1; + int versionid = 0; - //For checkung if the content is versioned + // for checkung if the content is versioned OntologyClassAttr ontologyAttrContent = null; - ontologyAttrContent = itemclass.getAttribute("content"); - + ontologyAttrContent = itemclass.getAttribute("content"); if (ontologyAttrContent.isVersioned()) { String lang = (String)attrs.get("lang"); if (lang == null || lang.equals("")) @@ -940,12 +939,12 @@ contentName = "content_"+lang; content = (String)attrs.remove(contentName); - //Create new content version + // create new content version versionid = this.createContentVersion(itemid, lang, content, creatoruserid); } - // Insert the other attributes + // insert the other attributes Iterator i = attrs.keySet().iterator(); while (i.hasNext()) { String key = (String)i.next(); @@ -956,7 +955,7 @@ } } - if((ontologyAttrContent.isVersioned())) + if ((ontologyAttrContent.isVersioned())) attrs.put(contentName, content); // create item object and initialize it @@ -1027,8 +1026,9 @@ String contextClass = null; // Lookup all ontology-related stuff + OntologyClassAttr oca = null; if (oc.getAttribute(aname) != null) { - OntologyClassAttr oca = oc.getAttribute(aname); + oca = oc.getAttribute(aname); ontType = oca.getOntologyDataType(); contextClass = oca.getContextClassName(); } @@ -1474,6 +1474,10 @@ } recordset.put(aname.substring(0, pos - 1), avalue); recordset.put("lang", lang); + if (aname.matches("content_..")) { + if (recordset.get("versionid")==null) + recordset.put("versionid", new Integer(1)); + } } else { recordset.put("avalue", avalue); recordset.put("aname", aname); @@ -2473,7 +2477,8 @@ int aid = dbAccess.sqlInsert("item_attachment", attrs); ia.setId(aid); - if (properties.getProperty("item.attachments.storage").equals("file")) { + if (properties.getProperty("item.attachments.storage"). + equals("file")) { String storageDirName = properties.getProperty("item.attachments.storage.filedir"); File storageDir = new File(storageDirName); @@ -2607,7 +2612,8 @@ /** * @see org.cobricks.item.ItemManager#createContentVersion(int, String, String, User) */ - public int createContentVersion(int itemid, String lang, String content, User creator) + public int createContentVersion(int itemid, String lang, String content, + User creator) { //If lang isn't set use defaultLanguage if (lang == null) { @@ -2621,9 +2627,8 @@ //Get the currently date Date date = new Date(); - //Get the versionid - Integer versionid = null; - + // Get the versionid + Integer versionid = null; String sql = "select max(versionid) " + " from item_content " + @@ -2631,20 +2636,20 @@ " and lang = '" + lang + "'"; List result = dbAccess.sqlQuery(sql); - if(result.isEmpty()) { + if (result.isEmpty()) { versionid = new Integer(0); } else { versionid = (Integer)((Map)result.get(0)).get("max(versionid)"); versionid = (versionid == null) ? new Integer(0) : versionid; } - Integer newVersionId = new Integer(versionid.intValue()+1); - + Integer newVersionId = new Integer(versionid.intValue()+1); Map attrs = new java.util.HashMap(); attrs.put("itemid", "" + itemid); attrs.put("creatoruserid", new Integer(creator.getUserId())); attrs.put("creationtime", date); attrs.put("lang", lang); attrs.put("content", content); + if (newVersionId == null) newVersionId = new Integer(0); attrs.put("versionid", newVersionId); int aid = this.dbAccess.sqlInsert("item_content", attrs); |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:42:15
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17613/util Modified Files: IOUtil.java Log Message: Index: IOUtil.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/IOUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IOUtil.java 11 Aug 2004 15:11:45 -0000 1.1 +++ IOUtil.java 12 Sep 2006 12:42:12 -0000 1.2 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:41:12
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17112 Modified Files: UserManagerImpl.java UserPresenter.java UserServlet.java userontology.xml Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- UserPresenter.java 1 Sep 2006 11:32:31 -0000 1.37 +++ UserPresenter.java 12 Sep 2006 12:41:08 -0000 1.38 @@ -530,12 +530,6 @@ } sb.append("\" >"); - if (attrDataType.isSet()) { - sb.append("<br> <div class=\"small\">" - +"(Please enter the data in " - +"comma-separated form)"); - } - } else if (!attribute.getValues().isEmpty()) { List attrValues = attribute.getValues(); sb.append("<select width = \" "); Index: UserServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- UserServlet.java 11 Jul 2006 10:27:04 -0000 1.42 +++ UserServlet.java 12 Sep 2006 12:41:08 -0000 1.43 @@ -162,10 +162,11 @@ public String performRegister(PortalRequest request, PrintWriter out) { try { + request.setReturnCode(1020); return doPerformRegister(request, out, false); } catch (UserExistsException e1) { try { - request.setReturnCode(1020); + request.setReturnCode(2020); return "error"; } catch (Exception e) { logger.error(LogUtil.ex("Failed registering user.", e)); @@ -173,7 +174,8 @@ } catch (Exception e) { logger.error(LogUtil.ex("Failed registering user.", e)); } - return "success"; + request.setReturnCode(2020); + return "error"; } /** @@ -183,11 +185,12 @@ PrintWriter out) { try { + request.setReturnCode(1020); return doPerformRegister(request, out, true); } catch (UserExistsException e1) { logger.info("User to register already exists."); try { - request.setReturnCode(1020); + request.setReturnCode(2021); return "error"; } catch (Exception e) { logger.error(LogUtil.ex("Failed registering user.", e)); @@ -195,7 +198,8 @@ } catch (Exception e) { logger.error(LogUtil.ex("Failed registering user.", e)); } - return "success"; + request.setReturnCode(2020); + return "error"; } /** @@ -222,13 +226,13 @@ String userLogin = prequest.getRequestParameter(FormConstants.USERLOGIN); if ((userLogin == null) || (userLogin.length() < 1)) { - prequest.setReturnCode(1000); + prequest.setReturnCode(2001); return "error"; } // the length of userlogin must be between 5 and 20 characters else if ((userLogin.length() < FormConstants.USER_ID_MIN_LENGTH) || (userLogin.length() > FormConstants.USER_ID_MAX_LENGTH)) { - prequest.setReturnCode(1001); + prequest.setReturnCode(2001); return "error"; } else { // check if the login only consists of legal characters @@ -236,7 +240,7 @@ Matcher m = p.matcher(userLogin); // setting the corresponding returnCode if (!m.find()) { - prequest.setReturnCode(1009); + prequest.setReturnCode(2002); return "error"; } } @@ -263,7 +267,7 @@ // the length must be between 1 and 20 characters if ((avalue.length() < FormConstants.NAME_MIN_LENGTH) || (avalue.length() > FormConstants.NAME_MAX_LENGTH)) { - prequest.setReturnCode(1003); + prequest.setReturnCode(2025); prequest.setContextObject("aname", aname); return "error"; } @@ -272,7 +276,7 @@ // the length of email must be between 6 and 30 characters if ((avalue.length() < FormConstants.EMAIL_MIN_LENGTH) || (avalue.length() > FormConstants.EMAIL_MAX_LENGTH)) { - prequest.setReturnCode(1007); + prequest.setReturnCode(2003); return "error"; } // is the e-mail address correct? @@ -281,14 +285,14 @@ Matcher m = p.matcher(avalue); // making the error string available to jsp: if (!m.find()) { - prequest.setReturnCode(1007); + prequest.setReturnCode(2003); return "error"; } } } } if (missingAttrs.length()>0) { - prequest.setReturnCode(1002); + prequest.setReturnCode(2027); prequest.setContextObject("anames", missingAttrs.toString()); return "error"; } @@ -297,7 +301,7 @@ if (userManager.checkUser(userLogin)) { // user with userlogin exists, try another userlogin! logger.info("User with userlogin "+userLogin+" already exists."); - prequest.setReturnCode(1020); + prequest.setReturnCode(2021); return "error"; } @@ -308,7 +312,7 @@ if (passwd==null || passwd2==null || passwd.length()<1 || !(passwd.equals(passwd2))) { - prequest.setReturnCode(1030); + prequest.setReturnCode(2007); return "error"; } } @@ -343,6 +347,7 @@ if (u == null) { logger.error("Failed creating user object."); + prequest.setReturnCode(2020); return "error"; } u.setUserLogin(userLogin); @@ -352,6 +357,7 @@ // 1. create password 2. send password 3. store passwd // in user object Object passwd = userManager.generateCredentials(); + passwd = "joshua"; // TBD String emailAddr = prequest. getRequestParameter("basic_contact-priv_online_email"); @@ -405,8 +411,7 @@ } } - return "success"; - + return "success"; } @@ -418,26 +423,22 @@ { try { String tmp = prequest.getRequestParameter("auserlogin"); - - //is userlogin entered? + // is userlogin entered? if ((tmp == null) || (tmp.length() < 1)) { - prequest.setReturnCode(1000); - + prequest.setReturnCode(2001); return "error"; } - //the length of userlogin must be between 6 and 20 characters + // the length of userlogin must be between 6 and 20 characters else if ((tmp.length() < FormConstants.USER_ID_MIN_LENGTH) - || (tmp.length() > FormConstants.USER_ID_MAX_LENGTH)) { - prequest.setReturnCode(1001); - logger.debug("code = " + 1001); + || (tmp.length() > FormConstants.USER_ID_MAX_LENGTH)) { + prequest.setReturnCode(2001); return "error"; } else { Pattern p = Pattern.compile(LOGIN_REGEXP); Matcher m = p.matcher(tmp); - // setting the corresponding returnCode: if (!m.find()) { - prequest.setReturnCode(1009); + prequest.setReturnCode(2001); return "error"; } } @@ -446,23 +447,22 @@ // is the e-mail entered? if ((tmp == null) || (tmp.length() < 1)) { - prequest.setReturnCode(1006); + prequest.setReturnCode(2003); return "error"; } - //the length of email must be between 6 and 30 characters + // the length of email must be between 6 and 30 characters else if ((tmp.length() < FormConstants.EMAIL_MIN_LENGTH) || (tmp.length() > FormConstants.EMAIL_MAX_LENGTH)) { - prequest.setReturnCode(1007); + prequest.setReturnCode(2003); return "error"; } // is the e-mail address correct? else { Pattern p = Pattern.compile(EMAIL_REGEXP); Matcher m = p.matcher(tmp); - // making the error string available to jsp: if (!m.find()) { - prequest.setReturnCode(1007); + prequest.setReturnCode(2003); return "error"; } } @@ -473,12 +473,13 @@ // exists the user with this userlogin and email??? User u = userManager.checkUser(userLogin, email); - - //if user with userlogin _and_ email exist: - //1. creating password 2. sending password 3. crypting password + + // if user with userlogin _and_ email exist: + // 1. creating password 2. sending password 3. crypting password // and updating of the entry in user_main for corresponding user if (u != null) { Object passwd = userManager.generateCredentials(); + passwd = "joshua"; // TBD String emailAddr = email; String subjectOfMail = prequest.getRequestParameter("email_subject"); @@ -501,19 +502,22 @@ MailUtil.sendMail(null, emailAddr, null, null, subjectOfMail, w.toString()); } catch (Exception e) { - logger.error("Error by mail sending ", e); + prequest.setReturnCode(2032); + logger.error("Error sending email ", e); + return "error"; } u.setCredentials(userManager, passwd); - prequest.setReturnCode(2001); + prequest.setReturnCode(1030); return "success"; } else { - logger.info("user with userlogin does not exist!"); - prequest.setReturnCode(1020); + logger.info("user with userlogin "+userLogin + +" and email "+email+" does not exist!"); + prequest.setReturnCode(2031); return "error"; } } catch (UserExistsException e1) { try { - prequest.setReturnCode(1020); + prequest.setReturnCode(2030); return "error"; } catch (Exception e) { logger.error(e); @@ -522,6 +526,7 @@ e.printStackTrace(); } + prequest.setReturnCode(1030); return "success"; } @@ -529,12 +534,14 @@ public String performChangePasswordAdmin(PortalRequest prequest, PrintWriter out) { + prequest.setReturnCode(1040); return doPerformChangePassword(prequest, out, true); } public String performChangePassword(PortalRequest prequest, PrintWriter out) { + prequest.setReturnCode(1040); return doPerformChangePassword(prequest, out, false); } @@ -561,28 +568,27 @@ prequest.getRequestParameter(FormConstants.PASSWORD_OLD); // is the old pwd entered? if ((tmp == null) || (tmp.length() < 1)) { - prequest.setReturnCode(1006); + prequest.setReturnCode(2006); return "error"; } } User user = userManager.getUser(portalUser.getUserId()); - if (user != null) { if (!admin && !user.checkCredentials(tmp)) { // password does not match ... - prequest.setReturnCode(1001); + prequest.setReturnCode(2008); return "error"; } } tmp = prequest.getRequestParameter(FormConstants.PASSWORD_NEW); if ((tmp == null) || (tmp.length() < 1)) { - prequest.setReturnCode(1007); + prequest.setReturnCode(2006); return "error"; } else { if ((tmp.length() < 6) || (tmp.length() > 20)) { - prequest.setReturnCode(1008); + prequest.setReturnCode(2006); return "error"; } } @@ -590,24 +596,24 @@ String tmp2 = prequest.getRequestParameter(FormConstants.CONFIRM_PASSWORD); if (!tmp.equalsIgnoreCase(tmp2)) { - prequest.setReturnCode(1002); + prequest.setReturnCode(2007); return "error"; } - //if pwd is right: - //1. creating password 2. crypting password + // if pwd is correct: + // 1. creating password 2. crypting password // and updating of the entry in user_main for corresponding user if (user != null) { user.setCredentials(userManager, tmp2); - prequest.setReturnCode(2001); + prequest.setReturnCode(1040); return "success"; } else { - prequest.setReturnCode(1020); + prequest.setReturnCode(2040); return "error"; } } catch (UserExistsException e1) { try { - prequest.setReturnCode(1020); + prequest.setReturnCode(2040); return "error"; } catch (Exception e) { logger.error(e); @@ -630,29 +636,24 @@ { int useridToDelete = Integer.parseInt(prequest.getRequestParameter("auserid")); - if (useridToDelete < 1) { - prequest.setReturnCode(1001); + prequest.setReturnCode(2040); return "error"; } try { String toDelete = userManager.getUser(useridToDelete) .getUserLogin(); - - //prequest.setContextObject("userloginToDelete" , toDelete); userManager.deleteUser(useridToDelete); - - //prequest.setPortalUser(new PortalUser()); - prequest.setReturnCode(2010); - + prequest.setReturnCode(1050); return "success"; } catch (Exception e) { logger.error("error while deleting user with userid " + useridToDelete + e); } - return "success"; + prequest.setReturnCode(2050); + return "error"; } @@ -670,31 +671,34 @@ if (auseridtmp == null) return "error"; int auserid = Integer.parseInt(auseridtmp); User currentUser = userManager.getUser(auserid); - + logger.info("performUpdate "+currentUser.getUserLogin()); + // if there is a request to change the password, than handle this - String pwold = prequest.getRequestParameter(FormConstants.PASSWORD_OLD); + String pwold = + prequest.getRequestParameter(FormConstants.PASSWORD_OLD); if (pwold != null && pwold.trim().length()>0) { if (currentUser != null) { if (!currentUser.checkCredentials(pwold)) { logger.warn("Password for user did not match ..."); - prequest.setReturnCode(1002); + prequest.setReturnCode(2008); return "error"; } else { - String pwnew = - prequest.getRequestParameter(FormConstants.PASSWORD_NEW); - String pwnew2 = - prequest.getRequestParameter(FormConstants.CONFIRM_PASSWORD); - if (pwnew==null || pwnew.length()<6 || !pwnew.equals(pwnew2)) { - logger.warn("Illegal values for new password: "+pwnew+"," - +pwnew2); - prequest.setReturnCode(1003); + String pwnew = prequest. + getRequestParameter(FormConstants.PASSWORD_NEW); + String pwnew2 = prequest. + getRequestParameter(FormConstants.CONFIRM_PASSWORD); + if (pwnew==null || pwnew.length()<6 || + !pwnew.equals(pwnew2)) { + logger.warn("Illegal values for new password: " + +pwnew+","+pwnew2); + prequest.setReturnCode(2007); return "error"; } else { try { currentUser.setCredentials(userManager, pwnew); } catch (Exception e) { logger.error(LogUtil.ex("Failed setting user credential.", e)); - prequest.setReturnCode(1004); + prequest.setReturnCode(2040); return "error"; } } @@ -706,6 +710,7 @@ List anames = new ArrayList(); Map avalues = new HashMap(); String stringAnames = prequest.getRequestParameter("anames"); + if (stringAnames == null) stringAnames = ""; StringTokenizer commaTokenizer = new StringTokenizer(stringAnames.trim(), ", []"); while (commaTokenizer.hasMoreTokens()) { @@ -786,42 +791,43 @@ if (attribute.getValue() == null) continue; String name = (String)attribute.getKey(); if (!name.equalsIgnoreCase(User.BUDDYLIST) - && !name.equalsIgnoreCase(User.INTERESTS) - && !name.equalsIgnoreCase(User.PASSWORDCRYPT)) { + && !name.equalsIgnoreCase(User.INTERESTS) + && !name.equalsIgnoreCase(User.PASSWORDCRYPT)) { if (newAttrs.containsKey(name)) { - if (!(attribute.getValue().toString()).equalsIgnoreCase( - (String)newAttrs.get(name))) { + if (!(attribute.getValue().toString()). + equalsIgnoreCase((String)newAttrs.get(name))) { toUpdate.put(name, newAttrs.get(name)); } } } } - + for (Iterator j = newAttrs.entrySet().iterator(); j.hasNext();) { Map.Entry newAttr = (Map.Entry)j.next(); String name = (String)newAttr.getKey(); if (!name.equalsIgnoreCase(User.BUDDYLIST) - && !name.equalsIgnoreCase(User.INTERESTS) - && !name.equalsIgnoreCase(User.PASSWORDCRYPT)) { + && !name.equalsIgnoreCase(User.INTERESTS) + && !name.equalsIgnoreCase(User.PASSWORDCRYPT)) { if (!oldAttrs.containsKey(name)) { toUpdate.put(name, newAttrs.get(name)); } } - } - + } + if (toUpdate.isEmpty()) { - prequest.setReturnCode(2002); + logger.debug("nothing to update"); + prequest.setReturnCode(1060); return "success"; } try { userManager.updateUser(auserid, toUpdate); - prequest.setReturnCode(2001); + prequest.setReturnCode(1060); return "success"; } catch (Exception e) { logger.error(LogUtil.ex("Exception in performUpdate for userid " + auserid, e)); - prequest.setReturnCode(1020); + prequest.setReturnCode(2060); return "error"; } } @@ -947,7 +953,9 @@ return uploadUserImage(result, filesuffix, currentUser, coreManager); } - static public String uploadUserImage(byte[] barr, String filesuffix, User currentUser, CoreManager coreManager) + static public String uploadUserImage(byte[] barr, String filesuffix, + User currentUser, + CoreManager coreManager) { if (barr == null) return null; @@ -1047,6 +1055,7 @@ id = prequest.getPortalUser().getUserId(); String ids[] = prequest.getRequestParameterValues("id"); if (ids == null) { + prequest.setReturnCode(1120); return "success"; } @@ -1060,6 +1069,7 @@ } } + prequest.setReturnCode(1120); return "success"; } @@ -1071,7 +1081,8 @@ * * @return **/ - public String performAddListMember(PortalRequest prequest, PrintWriter out) { + public String performAddListMember(PortalRequest prequest, PrintWriter out) + { String attrname = prequest.getRequestParameter("aname"); int newMemberId = 0; @@ -1083,11 +1094,11 @@ String newUserLogin = prequest.getRequestParameter("newUserLogin"); newMemberId = userManager.getUserIdForUserLogin(newUserLogin); if (newMemberId == 0) { - prequest.setReturnCode(1001); + prequest.setReturnCode(2110); return "error"; } if ((newUserLogin == null) || (newUserLogin.length() < 1)) { - prequest.setReturnCode(1010); + prequest.setReturnCode(1110); return "success"; } } @@ -1099,28 +1110,29 @@ if ((attrvalues != null) && (!attrvalues.isEmpty())) { if (attrvalues.contains(new Integer(newMemberId))) { - prequest.setReturnCode(1002); + prequest.setReturnCode(2110); return "error"; } } if (attrname.equalsIgnoreCase(User.BUDDYLIST)) { if (userid == newMemberId) { - prequest.setReturnCode(1003); + prequest.setReturnCode(2110); return "error"; } } userManager.addListMember(userid, newMemberId, attrname); - prequest.setReturnCode(2001); + prequest.setReturnCode(1110); return "success"; } /** * */ - public String performRegisterAdmin(PortalRequest prequest, PrintWriter out) { + public String performRegisterAdmin(PortalRequest prequest, PrintWriter out) + { logger.info("performRegisterAdmin"); String userlogin = prequest.getRequestParameter("userlogin"); @@ -1157,20 +1169,20 @@ } } catch (Exception e) { logger.error(LogUtil.exception("failed createUser", e)); - prequest.setReturnCode(2001); - + prequest.setReturnCode(2000); return "error"; } prequest.setReturnCode(1000); - return "success"; } + /** * */ - public String performCreateRole(PortalRequest prequest, PrintWriter out) { + public String performCreateRole(PortalRequest prequest, PrintWriter out) + { logger.info("performCreateRole"); // check access rights @@ -1572,7 +1584,9 @@ writer.setOutput(ios); writer.write(thumbImage); } - public void setUserManager(UserManager um){ + + public void setUserManager(UserManager um) + { this.userManager=um; } Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- userontology.xml 29 May 2006 15:57:12 -0000 1.12 +++ userontology.xml 12 Sep 2006 12:41:08 -0000 1.13 @@ -77,7 +77,10 @@ <description lang="en">Email (private)</description> </attr> <attr name="basic.contact-priv.online.emailbounced" type="string(50)"/> - <attr name="basic.contact-priv.online.uri" type="string(100)"/> + <attr name="basic.contact-priv.online.uri" type="string(100)"> + <description lang="de">Homepage (privat)</description> + <description lang="en">Homepage (private)</description> + </attr> <attr name="basic.contact-priv.online.messenger.icq" type="string(100)"> <description lang="de">ICQ ID</description> <description lang="en">ICQ ID</description> @@ -109,7 +112,10 @@ <description lang="en">Email (work)</description> </attr> <attr name="basic.contact-work.online.emailbounced" type="string(50)"/> - <attr name="basic.contact-work.online.uri" type="string(100)"/> + <attr name="basic.contact-work.online.uri" type="string(100)"> + <description lang="de">Homepage (geschäftlich)</description> + <description lang="en">Homepage (work)</description> + </attr> <attr name="basic.contact-work.telecom.mobile" type="string(25)"> <description lang="de">Mobiltelefon (geschaeftlich)</description> <description lang="en">Mobile phone (work)</description> Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- UserManagerImpl.java 1 Sep 2006 11:32:31 -0000 1.65 +++ UserManagerImpl.java 12 Sep 2006 12:41:08 -0000 1.66 @@ -1027,12 +1027,14 @@ * @throws Exception * DOCUMENT_ME! */ - public boolean checkUser(int userid) throws Exception { + public boolean checkUser(int userid) + throws Exception + { try { - String sql = "select userid from user_main " + "where userid = '" - + userid + "'"; + String sql = + "select userid from user_main " + "where userid = '" + + userid + "'"; Map user_exist = dbAccess.sqlQuerySingleRow(sql); - return (!user_exist.isEmpty()); } catch (Exception e) { logger.error("Exception in checkUser(int)", e); @@ -1054,9 +1056,12 @@ public User checkUser(String userLogin, String email) { int userid = getUserIdForUserLogin(userLogin); - if (userid > 0) { User user = getUser(userid); + logger.debug("check email for "+userLogin+": "+email + +" vs "+user.getAttributeAsString(User.EMAILP) + +","+user.getAttributeAsString(User.EMAILW) + +","+user.getAttributeAsString(User.EMAIL)); if (user.getAttributeAsString(User.EMAILP). equalsIgnoreCase(email)) { return user; @@ -1110,7 +1115,9 @@ * @throws Exception * DOCUMENT_ME! */ - public User createUser(String userlogin, Map attrs) throws Exception { + public User createUser(String userlogin, Map attrs) + throws Exception + { if (logger.isDebugEnabled()) { logger.debug("checkUser = " + checkUser(userlogin)); } @@ -1148,9 +1155,10 @@ Map.Entry elem = (Map.Entry) i.next(); attrName = (String) elem.getKey(); - AttributeDescriptor attributeDescriptor = getAttributeDescriptorManager( - (String) attrs.get(User.USERCLASS)) - .getAttributeDescriptorFor(attrName); + AttributeDescriptor attributeDescriptor = + getAttributeDescriptorManager((String) attrs. + get(User.USERCLASS)) + .getAttributeDescriptorFor(attrName); tableName = attributeDescriptor.getTableName(); Map rightTable = (Map) tableOfTables.get(tableName); @@ -1176,7 +1184,6 @@ if (tableOfTables.containsKey(TABLE_USER_MAIN)) { userId = dbAccess.sqlInsert(TABLE_USER_MAIN, (Map) tableOfTables.get(TABLE_USER_MAIN)); - logger.info("insert in " + TABLE_USER_MAIN); } @@ -1219,7 +1226,8 @@ /** * @return generated password */ - public Object generateCredentials() { + public Object generateCredentials() + { Random randomGenerator = new Random(); //The length of password must be between 6 and 8 symbols |
|
From: Michael K. <ko...@us...> - 2006-09-12 12:40:55
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16849 Modified Files: PageFolderAccessHandler.java PortalManagerImpl.java PortalPresenter.java PortalServletAdaptor.java Log Message: Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- PortalPresenter.java 30 Aug 2006 10:25:57 -0000 1.42 +++ PortalPresenter.java 12 Sep 2006 12:40:50 -0000 1.43 @@ -12,7 +12,22 @@ package org.cobricks.portal; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TimeZone; import java.io.*; import java.sql.Timestamp; import java.text.DateFormat; @@ -123,7 +138,8 @@ //Set the date and time styles; String dateStyleProp = properties.getProperty("portal.presenter.datestyle"); - // temporary fallback - because we moved this functionality from item to portal + // temporary fallback - + // because we moved this functionality from item to portal // recently (12/2004) - this should be removed soon if (dateStyleProp == null) dateStyleProp = @@ -145,7 +161,8 @@ String timeStyleProp = properties.getProperty("portal.presenter.timestyle"); - // temporary fallback - because we moved this functionality from item to portal + // temporary fallback - + // because we moved this functionality from item to portal // recently (12/2004) - this should be removed soon if (timeStyleProp == null) timeStyleProp = @@ -192,6 +209,28 @@ return ""; } + public String parse(String filename, PortalRequest portalRequest, + String defaultfilename) + { + logger.debug("parse("+filename+")"); + + String pageContent = + portalManager.getPageContent(filename, portalRequest); + if (pageContent == null || pageContent.length()<1) + pageContent = + portalManager.getPageContent(defaultfilename, portalRequest); + try { + + StringWriter sw = new StringWriter(); + Velocity.evaluate(portalRequest.getVelocityContext(), sw, + "", pageContent); + return sw.toString(); + } catch (Exception e) { + logger.error(LogUtil.ex("Failed parsing template.", e)); + } + return ""; + } + /** * Parse the given Velocity template string and return the result. @@ -270,14 +309,22 @@ return s; } - public String replace(String s, String sold, String snew) + + /** + * + */ + public String formatDate(Date d) { - if (s == null) return ""; - s = s.replaceAll(sold, snew); - return s; + if (d == null) return ""; + return DateUtil.date2String(d); } - + public String formatDate() + { + return DateUtil.date2String(new Date()); + } + + /** * Look up the volatile notifications for the given session and return * them formatted in HTML. @@ -302,21 +349,6 @@ /** - * - */ - public String formatDate(Date d) - { - if (d == null) return ""; - return DateUtil.date2String(d); - } - - public String formatDate() - { - return DateUtil.date2String(new Date()); - } - - - /** * Instantiate an object of the given class and put it into the Velocity * context of the given session. */ @@ -480,6 +512,40 @@ /** + * + */ + public String printNavigationPath(PortalRequest portalRequest) + { + StringBuffer result = new StringBuffer(""); + + // TBD: uebersetzung der pfadnamen in aussagekraeftige namen + + HttpServletRequest request = portalRequest.getHttpServletRequest(); + String uri = request.getRequestURI(); + logger.info("navigation: "+uri); + int poslast = uri.lastIndexOf("/"); + int posfirst = uri.indexOf("/"); + if (poslast > posfirst) { + uri = uri.substring(posfirst+1, poslast); + StringTokenizer st = new StringTokenizer(uri, "/"); + String tmpurl = "/"; + while (st.hasMoreTokens()) { + String tmps = st.nextToken(); + result.append(" → "); + result.append("<a href=\""); + tmpurl = tmpurl + tmps + "/"; + result.append(tmpurl); + result.append("\">"); + result.append(tmps); // TBD + result.append("</a>"); + } + } + + return result.toString(); + } + + + /** * Return a list of PortalPage objects for a given folder. * (Only pages are returned, that are stored in the database as * items - the method could be extended to return file webspace @@ -886,6 +952,21 @@ return value.substring(prefix.length()); return value; } + + + /** + * Check if a portal object pname exists - if yes, the pname is returned, + * otherwise the value in default is returned. + */ + public String checkPage(String pname, PortalRequest portalRequest, + String defaultpname) + { + String pageContent = + portalManager.getPageContent(pname, portalRequest); + if (pageContent != null) + return pname; + return defaultpname; + } } Index: PageFolderAccessHandler.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PageFolderAccessHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PageFolderAccessHandler.java 1 Mar 2004 07:09:04 -0000 1.1 +++ PageFolderAccessHandler.java 12 Sep 2006 12:40:50 -0000 1.2 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -14,7 +14,7 @@ import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.cobricks.core.CoreManager; import org.cobricks.core.db.DBAccess; @@ -35,8 +35,10 @@ static Logger logger = Logger.getLogger(PageFolderAccessHandler.class); static final String domain = "pagefolder"; - static final String[] domainactions = { "create", "delete" }; + static final String[] domainactions = { "*", "create", "delete" }; static final String[][] domainactionattrs = { + // * + { "catid" }, // create { "catid" }, // delete Index: PortalServletAdaptor.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServletAdaptor.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- PortalServletAdaptor.java 1 Sep 2006 11:32:50 -0000 1.21 +++ PortalServletAdaptor.java 12 Sep 2006 12:40:50 -0000 1.22 @@ -313,7 +313,10 @@ logger.warn("Failed forwarding JSP return page " +pagepath+"/"+pagename); } - portalManager.printPage(portalRequest, out); + try { + portalManager.sendPortalObject(portalRequest, out); + } catch (Exception e) { + } } portalRequest.setEndTime(); Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- PortalManagerImpl.java 30 Aug 2006 10:25:57 -0000 1.84 +++ PortalManagerImpl.java 12 Sep 2006 12:40:50 -0000 1.85 @@ -457,7 +457,7 @@ // check if it is a text file or a binary one ... String mimetype = page.getMimeType(); - logger.info("mimetype of request = "+mimetype); + logger.debug("mimetype of request = "+mimetype); // if it is a text page, then user printPage() if (mimetype.startsWith("text")) { @@ -879,6 +879,7 @@ String path = parentPath+relpath; if (!path.endsWith("/")) path += "/"; + logger.info("createFolder "+path); // create category object HashMap attrs = new HashMap(); @@ -891,25 +892,31 @@ if (parentid != null) attrs.put("parent", parentid); } else { - String tmps = parentPath; - int pos = (tmps.substring(0, tmps.length()-1)). - lastIndexOf("/"); - String ppath = tmps.substring(0, pos+1); - String cpath = tmps.substring(pos+1); - int tmpi = createFolder(ppath, cpath, cpath, null); - if (tmpi > 0) - attrs.put("parent", new Integer(tmpi)); - pf = getPortalFolder(parentPath); + if (parentPath.equals("/")) { + attrs.put("parent", new Integer(0)); + } else { + String tmps = parentPath; + int pos = (tmps.substring(0, tmps.length()-1)). + lastIndexOf("/"); + String ppath = tmps.substring(0, pos+1); + String cpath = tmps.substring(pos+1); + int tmpi = createFolder(ppath, cpath, cpath, null); + if (tmpi > 0) + attrs.put("parent", new Integer(tmpi)); + pf = getPortalFolder(parentPath); + } } - logger.info("PortalManagerImpl: trying to create folder: "+path); + logger.info("trying to create folder: "+path); PortalFolder c = (PortalFolder) categoryManager.createCategory(attrs, creator); addPortalFolderToCache(c); - - Set pfChildren = pf.getChildrenIds(); - Integer newChildID= new Integer(c.getId()); - pfChildren.add(newChildID); - pf.setChildrenIds(pfChildren); + + if (pf != null) { + Set pfChildren = pf.getChildrenIds(); + Integer newChildID= new Integer(c.getId()); + pfChildren.add(newChildID); + pf.setChildrenIds(pfChildren); + } return c.getId(); } @@ -1544,6 +1551,9 @@ return true; return false; } + public String toString() { + return prefix; + } } |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:33:48
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29481 Modified Files: OntologyHelper.java Log Message: Index: OntologyHelper.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/OntologyHelper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- OntologyHelper.java 2 May 2006 11:56:09 -0000 1.3 +++ OntologyHelper.java 1 Sep 2006 11:33:44 -0000 1.4 @@ -163,8 +163,10 @@ // if attribute value is not String, then change this Object o = attrs.get(aname); if (!(o instanceof String)) { - o = o.toString(); - attrs.put(aname, o); + if (o!=null) { + o = o.toString(); + attrs.put(aname, o); + } } } |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:33:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29452/migration Modified Files: CatagoryMigration.java ItemMigration.java PortalMigration.java UserMigration.java Log Message: Index: CatagoryMigration.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/CatagoryMigration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CatagoryMigration.java 10 Aug 2005 13:35:35 -0000 1.2 +++ CatagoryMigration.java 1 Sep 2006 11:33:25 -0000 1.3 @@ -66,10 +66,11 @@ public void emptyDestinationTables() { logger.info(">>>>>>>>>>> Starting emptying user tables <<<<<<<<<<<<<"); - toDBAccess.sqlExecute("TRUNCATE TABLE `category`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `cat_attrs`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `cat_attrsuser`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `cat_title`;"); + toDBAccess.sqlExecute("DELETE FROM category"); + toDBAccess.sqlExecute("DELETE FROM cat_attrs"); + toDBAccess.sqlExecute("DELETE FROM cat_attrsuser"); + toDBAccess.sqlExecute("DELETE FROM cat_title"); + logger.info(">>>>>>>>>>> Finished emptying categories tables <<<<<<<<<<<<<"); } Index: UserMigration.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/UserMigration.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- UserMigration.java 11 Jul 2004 13:10:55 -0000 1.4 +++ UserMigration.java 1 Sep 2006 11:33:25 -0000 1.5 @@ -67,16 +67,17 @@ public void emptyDestinationTables() { logger.info(">>>>>>>>>>> Starting emptying user tables <<<<<<<<<<<<<"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_main`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_attr`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_attrcategory`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_attritem`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_attruser`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_role`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_roleperm`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_rolepermattrs`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_roleuser`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `user_subrole`;"); + toDBAccess.sqlExecute("DELETE FROM user_main"); + toDBAccess.sqlExecute("DELETE FROM user_attr"); + toDBAccess.sqlExecute("DELETE FROM user_attrcategory;"); + toDBAccess.sqlExecute("DELETE FROM user_attritem;"); + toDBAccess.sqlExecute("DELETE FROM user_attruser;"); + toDBAccess.sqlExecute("DELETE FROM user_role;"); + toDBAccess.sqlExecute("DELETE FROM user_roleperm;"); + toDBAccess.sqlExecute("DELETE FROM user_rolepermattrs;"); + toDBAccess.sqlExecute("DELETE FROM user_roleuser;"); + toDBAccess.sqlExecute("DELETE FROM user_subrole;"); + logger.info(">>>>>>>>>>> Finished emptying user tables <<<<<<<<<<<<<"); } @@ -232,22 +233,33 @@ if(userLogin.endsWith("@localhost")) { userLogin = userLogin.substring(0,userLogin.indexOf("@localhost")); } - // gets the new attribute name, from the configuration properties file - if(userMigrationProps.containsKey(attrName)) { + // get the new attribute name, from the configuration properties file + if (userMigrationProps.containsKey(attrName)) { newAttrName = userMigrationProps.getProperty(attrName); - logger.info("Creating attribute for user "+userLogin+" with following data." + - " Attribute name : " + attrName+ - " Attribute Value : " + attrValue+ - ""); - try { - if(userManager.checkUser(userLogin)){ - userManager.setUserAttr(userManager.getUserIdForUserLogin(userLogin),newAttrName,attrValue); - userattricnt++; - } else { - logger.debug("There is no such user in DB"); + logger.info("Creating attribute for user "+userLogin + +" with following data: " + + attrName + "=" + attrValue); + + // special handling of some attributes + if (attrName.equals("banlist")) { + // TBD + attrName = ""; + } + if (attrName.equals("network.buddylist")) { + // TBD + attrName = ""; + } + if (attrName != null && attrName.length()>0) { + try { + if(userManager.checkUser(userLogin)){ + userManager.setUserAttr(userManager.getUserIdForUserLogin(userLogin),newAttrName,attrValue); + userattricnt++; + } else { + logger.debug("There is no such user in DB"); + } + } catch(Exception e) { + logger.error("Exception by inserting attribute ",e); } - } catch(Exception e) { - logger.error("Exception by inserting attribute ",e); } } else { logger.debug("Userattribute name unknown."); Index: PortalMigration.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/PortalMigration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PortalMigration.java 8 May 2006 07:48:00 -0000 1.1 +++ PortalMigration.java 1 Sep 2006 11:33:25 -0000 1.2 @@ -242,6 +242,9 @@ } + Map portalpage = new HashMap(); + // maps path+name -> itemid + /** * */ @@ -264,12 +267,17 @@ String name = (String) pinfo.get("name"); String path = (String) pinfo.get("path"); Integer pgid = (Integer) pinfo.get("pgid"); + if (name == null) continue; PortalFolder pfolder = portalManager.getPortalFolder(path); if (pfolder == null) { logger.error("failed getting portal folder for "+path); + continue; + /* + path = "/"; pfolder = portalManager.getPortalFolder("/"); + */ } logger.info("path="+path+", pgid="+pgid+", folderid=" +pfolder.getId()); @@ -290,21 +298,56 @@ + content + "\n\n#parse(\"/templates/"+ten+"-f\")"; } - - // now insert page item - Map itemAttrs = new HashMap(); - itemAttrs.put("itemclass", "portalpage"); - itemAttrs.put("mimetype", "text/html"); - itemAttrs.put("folders", new Integer(pfolder.getId())); - itemAttrs.put("creationdate", cdate); - // TBD itemAttrs.put("creator", cdate); - itemAttrs.put("name", name); - itemAttrs.put("title", title); - itemAttrs.put("content", content); - try { - Item item = itemManager.createItem(itemAttrs); - } catch (Exception e) { - logger.error(LogUtil.ex("failed ...", e)); + + // check if the page is already there (with other + // language versions) + String lang = "de"; + int pos = name.lastIndexOf("."); + if (pos > 3) { // we only support "en" + if (name.substring(pos-3, pos).equals("_en")) { + lang = "en"; + name = name.substring(0, pos-3)+name.substring(pos); + } + } + logger.info("inserting page "+path+name+" for "+lang); + Item it = (Item)portalpage.get(path+name); + if (it != null) { + logger.info("+ updating old page"); + if (lang.equals("de")) { + it.setTitle("de", title); + it.setContent("de", content); + } else { + it.setTitle("en", title); + it.setContent("en", content); + } + try { + itemManager.updateItem(it); + } catch (Exception e) { + logger.error(LogUtil.ex("failed ...", e)); + } + } + else { + // now insert page item + Map itemAttrs = new HashMap(); + itemAttrs.put("itemclass", "portalpage"); + itemAttrs.put("mimetype", "text/html"); + itemAttrs.put("folders", new Integer(pfolder.getId())); + itemAttrs.put("creationdate", cdate); + // TBD itemAttrs.put("creator", cdate); + itemAttrs.put("name", name); + if (lang.equals("de")) { + itemAttrs.put("title_de", title); + itemAttrs.put("content_de", content); + } else { + itemAttrs.put("title_en", title); + itemAttrs.put("content_en", content); + } + try { + Item item = itemManager.createItem(itemAttrs); + portalpage.put(path+name, item); + } catch (Exception e) { + logger.error(LogUtil.ex("failed ...", e)); + } } } } Index: ItemMigration.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/ItemMigration.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ItemMigration.java 30 May 2006 14:32:01 -0000 1.8 +++ ItemMigration.java 1 Sep 2006 11:33:25 -0000 1.9 @@ -80,37 +80,48 @@ public void emptyDestinationTables() { logger.info(">>>>>>>>>>> Starting emptying item tables <<<<<<<<<<<<<"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_annotation`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attachcontent`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attachment`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attrs`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attrscategory`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attrsitem`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_attrsuser`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_content`;"); - toDBAccess.sqlExecute("TRUNCATE TABLE `item_title`;"); + toDBAccess.sqlExecute("DELETE FROM item"); + toDBAccess.sqlExecute("DELETE FROM item_annotation"); + toDBAccess.sqlExecute("DELETE FROM item_attachcontent"); + toDBAccess.sqlExecute("DELETE FROM item_attachment"); + toDBAccess.sqlExecute("DELETE FROM item_attrs"); + toDBAccess.sqlExecute("DELETE FROM item_attrscategory"); + toDBAccess.sqlExecute("DELETE FROM item_attrsitem"); + toDBAccess.sqlExecute("DELETE FROM item_attrsuser"); + toDBAccess.sqlExecute("DELETE FROM item_content"); + toDBAccess.sqlExecute("DELETE FROM item_title"); + logger.info(">>>>>>>>>>> Finished emptying item tables <<<<<<<<<<<<<"); } + + Properties old2newComId = null; private Set getItemCategoriesForItemId(int oldItemId) { - Properties old2newComId = new Properties(); - try{ - FileInputStream inputfile = new FileInputStream("categories.relation.txt"); - old2newComId.load(inputfile); - inputfile.close(); - } catch (Exception fnfe) { - logger.error("Exception by loading categories.relation.txt ",fnfe); - } - List result = fromDBAccess.sqlQuery("SELECT * FROM itemcategories WHERE itemid = "+oldItemId+";"); + if (old2newComId == null) { + old2newComId = new Properties(); + try{ + FileInputStream inputfile = + new FileInputStream("categories.relation.txt"); + old2newComId.load(inputfile); + inputfile.close(); + } catch (Exception fnfe) { + logger.error("Exception by loading categories.relation.txt ",fnfe); + } + } + List result = fromDBAccess. + sqlQuery("SELECT * FROM itemcategories WHERE itemid = " + +oldItemId+";"); Iterator resIter = result.iterator(); Map fromMap; Set toSet = new HashSet(0); - while(resIter.hasNext()){ - fromMap = (Map)resIter.next(); + while (resIter.hasNext()) { + fromMap = (Map)resIter.next(); Object catId = fromMap.get("catid"); Object newCatId = old2newComId.getProperty(catId.toString()); + if (newCatId == null) { + newCatId = new Integer(1000+((Integer)catId).intValue()); + } toSet.add(newCatId); } return toSet; @@ -157,6 +168,7 @@ // if(itemcnto > 100) break; // used for testing purposes, if you don't need to test with all the records from the table Map fromMap = (Map)resIter.next(); Map toMap = new HashMap(); + toMap.put("itemclass", "item"); itemid = -1; if(fromMap.get("itemid") != null){ itemid = Integer.parseInt(fromMap.get("itemid").toString()); @@ -190,7 +202,24 @@ if(keywords_de!=null) {toMap.put("keywords_de",keywords_de); } if(keywords_en!=null) { toMap.put("keywords_en",keywords_en); } if(location!=null) { toMap.put("location",location); } - if(typeid!=null) { toMap.put("itemcase",typeid); } + if(typeid!=null) { + if (typeid.equals("1")) toMap.put("itemclass", "tummsg"); + if (typeid.equals("2")) toMap.put("itemclass", "date"); + if (typeid.equals("3")) toMap.put("itemclass", "bookmark"); + if (typeid.equals("4")) toMap.put("itemclass", "sypro"); + if (typeid.equals("5")) toMap.put("itemclass", "da"); + if (typeid.equals("6")) toMap.put("itemclass", "idp"); + if (typeid.equals("7")) toMap.put("itemclass", "conv"); + if (typeid.equals("8")) toMap.put("itemclass", "schwerp"); + if (typeid.equals("9")) toMap.put("itemclass", "proj"); + if (typeid.equals("10")) toMap.put("itemclass", "odate"); + if (typeid.equals("11")) toMap.put("itemclass", "job"); + if (typeid.equals("12")) toMap.put("itemclass", "fww"); + if (typeid.equals("13")) toMap.put("itemclass", "vwm"); + if (typeid.equals("14")) toMap.put("itemclass", "fipro"); + if (typeid.equals("15")) toMap.put("itemclass", "fipra"); + if (typeid.equals("16")) toMap.put("itemclass", "fidoc"); + } if(author!=null) { toMap.put("author",author); } if(url!=null) { toMap.put("url",url); } if(imageurl!=null) { toMap.put("imageurl",imageurl); } @@ -244,10 +273,11 @@ } } try { - logger.info("Creating item with following ID : "+itemid+ - "Title_DE "+title_de+"Description_DE "+description_de+ - "Title_EN "+title_en+"Description_EN "+description_en - ); + logger. + info("Creating item with following ID : "+itemid+ + "Title_DE "+title_de+"Description_DE "+description_de+ + "Title_EN "+title_en+"Description_EN "+description_en + ); tmpItem = itemManager.createItem(toMap); itemcnt++; if(tmpItem != null){ @@ -301,7 +331,11 @@ publisherlogin1 = publisherlogin1 .substring(0,publisherlogin1.indexOf("@localhost")); } - creatorid = userManager.getUser(userManager.getUserIdForUserLogin(publisherlogin1)).getId(); + User u = userManager.getUser(userManager.getUserIdForUserLogin(publisherlogin1)); + if (u != null) + creatorid = u.getId(); + else + creatorid = 0; } Date creationtime = null; if (attachmentMap.get("publisheddate") != null) { |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:32:54
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29095 Modified Files: PortalRequest.java PortalServletAdaptor.java Log Message: Index: PortalServletAdaptor.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServletAdaptor.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- PortalServletAdaptor.java 11 Jul 2006 10:27:03 -0000 1.20 +++ PortalServletAdaptor.java 1 Sep 2006 11:32:50 -0000 1.21 @@ -361,7 +361,7 @@ HttpSession session = request.getSession(false); if (session == null) { - logger.info("session is null"); + logger.debug("session is null"); // no session information - so check for autologin or return // default user object String userlogin = null; Index: PortalRequest.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- PortalRequest.java 30 May 2006 06:54:40 -0000 1.19 +++ PortalRequest.java 1 Sep 2006 11:32:50 -0000 1.20 @@ -245,13 +245,13 @@ if (!pagePath.endsWith("/")) pagePath += "/"; if (!pagePath.startsWith("/")) pagePath = "/"+pagePath; - // get (requested) language - this is either "en", the language + // get (requested) language - this is either "de", the language // requested in the HTTP request, the value in the "lang" cookie, // the prefered language set in the user attribute // (preference.language) or request parameter or XX if the // page name is of the form "page.XX.html" or "page.html.XX" - lang = "en"; - String acceptlang = request.getHeader("accept-language"); + lang = "de"; + String acceptlang = request.getHeader("Accept-Language"); if (acceptlang!=null) { StringTokenizer st = new StringTokenizer(acceptlang, " ,"); lang = st.nextToken(); |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:32:35
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29073/db Modified Files: user_main.xml Log Message: Index: user_main.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/db/user_main.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- user_main.xml 24 Jun 2004 06:55:42 -0000 1.1 +++ user_main.xml 1 Sep 2006 11:32:31 -0000 1.2 @@ -6,9 +6,9 @@ <column name="userlogin" type="varchar(50)" notnull="true"/> <column name="globalid" type="varchar(50)"/> <column name="userclass" type="varchar(15)"/> - <column name="firstname" type="varchar(30)"/> - <column name="lastname" type="varchar(30)"/> - <column name="passwordcrypt" type="varchar(30)"/> + <column name="firstname" type="varchar(40)"/> + <column name="lastname" type="varchar(40)"/> + <column name="passwordcrypt" type="varchar(40)"/> <column name="email" type="varchar(50)"/> <column name="url" type="varchar(100)"/> <column name="lastlogin" type="timestamp"/> |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:32:35
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29073 Modified Files: UserManagerImpl.java UserPresenter.java Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- UserPresenter.java 11 Jul 2006 10:27:04 -0000 1.36 +++ UserPresenter.java 1 Sep 2006 11:32:31 -0000 1.37 @@ -835,5 +835,17 @@ } + public String getUserLogin(int userid) + { + User user = userManager.getUser(userid); + if (user == null) return ""; + return user.getUserLogin(); + } + + public String getUserLogin(User user) + { + if (user == null) return ""; + return user.getUserLogin(); + } } Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- UserManagerImpl.java 11 Jul 2006 10:27:03 -0000 1.64 +++ UserManagerImpl.java 1 Sep 2006 11:32:31 -0000 1.65 @@ -1181,7 +1181,7 @@ } if (userId == -1) { - logger.error("User Creating failed! :("); + logger.error("Creating user object failed!"); } else { for (Iterator i = tableOfTables.entrySet().iterator(); i .hasNext();) { @@ -1780,18 +1780,21 @@ // user objects cache garbage collection if (cacheSize > 500) { logger.info("User objects cache size is bigger than limit (" - + cacheSize + ")"); - + + cacheSize + ")"); int toDelete = cacheSize - 300; + Set toDeleteSet = new HashSet(); Iterator iter = userObjects.keySet().iterator(); - for (int i = 0; i < toDelete; i++) { Object userid2 = iter.next(); + toDeleteSet.add(userid2); + } + iter = toDeleteSet.iterator(); + while (iter.hasNext()) { + Object userid2 = iter.next(); userObjects.remove(userid2); } - logger.info("User objects cache reduced to " + userObjects.size() - + " entries"); + + " entries"); } userObjects.put(userid, user); |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:32:21
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29047 Modified Files: ItemManagerImpl.java ItemSearch.java itemontology.xml Log Message: Index: ItemManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManagerImpl.java,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- ItemManagerImpl.java 29 May 2006 05:35:25 -0000 1.68 +++ ItemManagerImpl.java 1 Sep 2006 11:32:14 -0000 1.69 @@ -724,7 +724,6 @@ // for all itemclasses y, that are derived from x int pos = query.indexOf("/item[itemclass~"); while (pos >= 0) { - logger.info("trying: "+query); String tmps = query.substring(pos+17); int pos2 = tmps.indexOf("]"); if (pos2 > 0) { @@ -749,6 +748,7 @@ // get item ids resultSet = ItemSearch.getIDsFromSQLQuery(query, this.ontology, this.dbAccess); + if (resultSet != null) { list = new ArrayList(); if (resultSet.size() > 0) { Index: ItemSearch.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemSearch.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ItemSearch.java 3 Jan 2006 09:33:34 -0000 1.24 +++ ItemSearch.java 1 Sep 2006 11:32:14 -0000 1.25 @@ -53,6 +53,7 @@ * * This class should not be instantiated. * + * @author Michael Koch mic...@ac... * @author Andreas Volz vo...@in... * @author Thorsten Eiseler mas...@we... */ @@ -74,6 +75,37 @@ { } + + /** + * This method is an auxiliary method for + * {@link ItemManager#searchItems(String) searchItems()}. + * + * It is the interface to the sql query based search functionality of + * Cobricks. + * + * A given attribute-value map is converted into a fully specified sql + * query. + * + * In case of success of the whole process a set of itemids wrapped by + * an Integer object each is returned representing the items that were + * found by the searching conditions. + * + * @param query The original attribute-value query + * @param ontology Reference to an Ontology object + * @param dbAccess Reference to a DBAccess object + * @return Set of Integer objects of itemid's resulting from query. + */ + public static Set getIDsFromSQLQuery(Map query, Ontology ontology, + DBAccess dbAccess) + { + Set sqlResults = null; + + // TBD + + return sqlResults; + } + + /** * This method is an auxiliary method for ItemManager.searchItems(String). * @see ItemManager#searchItems(String) @@ -265,7 +297,8 @@ * @return String with replaced attributes */ private static String handleReference(String part, Ontology ontology, - DBAccess dbAccess) { + DBAccess dbAccess) + { StringBuffer xPathPart = new StringBuffer(part); // Recognize the reference and handle it @@ -317,7 +350,7 @@ // Do the replacement if (typeName.equals("string")) { return handleStringCollection(xPathPart, element, ontDataType, - dbAccess); + dbAccess); } else { return convertCondition(xPathPart, typeName, dbAccess); @@ -352,8 +385,8 @@ * @return String with replaced datetimespans */ private static String handleDateTimeSpan(String part, String typeName, - String fillIn, DBAccess dbAccess) { - + String fillIn, DBAccess dbAccess) + { StringBuffer xPathPart = new StringBuffer(part); String tagName; String cmpOperator; @@ -438,7 +471,8 @@ * String attributes are replaced with the corresponding ids. */ private static String handleStrings(String part, String typeName, - DBAccess dbAccess) { + DBAccess dbAccess) + { if (part == null) { return null; } @@ -470,8 +504,9 @@ } // Get a list of maps with the desired ids - List result = getIdsForString(typeName, attribute, value, - dbAccess, strict.booleanValue()); + List result = + getIdsForString(typeName, attribute, value, + dbAccess, strict.booleanValue()); if (result == null) { return null; @@ -721,7 +756,10 @@ * @return String with replaced attributes */ private static String handleStringCollection(StringBuffer xPathPart, - String attribute, OntologyDataType ontDataType, DBAccess dbAccess) { + String attribute, + OntologyDataType ontDataType, + DBAccess dbAccess) + { // Check whether the attribute in the query-part is really a Collection // (should always be true) if (!ontDataType.isCollection()) { @@ -830,7 +868,8 @@ * @return String with replaced attributes */ private static String convertCondition(StringBuffer xPathPart, - String typeName, DBAccess dbAccess) { + String typeName, DBAccess dbAccess) + { String condition; StringBuffer finalCondition; int pos; @@ -851,8 +890,9 @@ while (subConditionMatcher.find(nextPos)) { // Get the corresponding ids - String subCondition = handleSubCondition(subConditionMatcher.group(), - typeName, dbAccess); + String subCondition = + handleSubCondition(subConditionMatcher.group(), + typeName, dbAccess); if (subCondition == null) { return null; @@ -873,8 +913,9 @@ // The condition can't be split into smaller pieces because it // consists only of one sub-condition - String subCondition = handleSubCondition(condition, typeName, - dbAccess); + String subCondition = + handleSubCondition(condition, typeName, + dbAccess); if (subCondition == null) { return null; @@ -1109,7 +1150,9 @@ * condition */ private static List getIdsForString(String typeName, String attribute, - String value, DBAccess dbAccess, boolean strict) { + String value, DBAccess dbAccess, + boolean strict) + { List listOfMaps = null; String idType; String tableName; @@ -1121,8 +1164,8 @@ tableName = getTableName(typeName, attribute, true); } else { - return getIdsForStringNotMain(typeName, attribute, value, dbAccess, - strict); + return getIdsForStringNotMain(typeName, attribute, value, + dbAccess, strict); } if ((idType == null) || (tableName == null)) { @@ -1135,27 +1178,32 @@ if (attribute.matches("title_[a-z]{2}")) { String lang = attribute.substring(attribute.length() - 2); - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE TITLE='" + value + "' AND LANG='" + - lang + "'"); + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE TITLE='" + value + + "' AND LANG='" +lang + "'"); } else { - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE " + attribute + "='" + value + "'"); + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE " + attribute + + "='" + value + "'"); } } else { if (attribute.matches("title_[a-z]{2}")) { String lang = attribute.substring(attribute.length() - 2); - - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE TITLE LIKE '%" + value + "%' AND " + - "LANG='" + lang + "'"); + + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE TITLE LIKE '%" + value + + "%' AND " + "LANG='" + lang + "'"); } else { - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE " + attribute + " LIKE '%" + value + - "%'"); + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE " + attribute + + " LIKE '%" + value + "%'"); } } @@ -1168,7 +1216,10 @@ } private static List getIdsForStringNotMain(String typeName, - String attribute, String value, DBAccess dbAccess, boolean strict) { + String attribute, String value, + DBAccess dbAccess, + boolean strict) + { List listOfMaps = null; String idType; String tableName; @@ -1183,19 +1234,21 @@ // Execute the SQL-query depending on the boolean 'strict' if (strict) { - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE " + "aname = '" + attribute + "' and " + - "avalue ='" + value + "'"); + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE " + "aname = '" + attribute + + "' and " + "avalue ='" + value + "'"); } else { - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE " + "aname = '" + attribute + "' and " + - "avalue like '%" + value + "%'"); + listOfMaps = dbAccess. + sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE " + "aname = '" + attribute + + "' and " + "avalue like '%" + value + "%'"); } if ((listOfMaps == null) || (listOfMaps.isEmpty())) { logger.debug("getIdsForString: The condition for the referenced " + - typeName + " returned no result."); + typeName + " returned no result."); } return listOfMaps; @@ -1253,8 +1306,9 @@ } // Process the datetimespans in the query-part - String temp = handleDateTimeSpan(subCondition, typeName, "@id=", - dbAccess); + String temp = + handleDateTimeSpan(subCondition, typeName, "@id=", + dbAccess); if (!temp.equals(subCondition)) { // 'Temp' and the sub-condition passed to the method aren't equal. @@ -1284,8 +1338,9 @@ } // Get the corresponding ids - listOfMaps = getIdsForString(typeName, attribute, value, - dbAccess, strict.booleanValue()); + listOfMaps = + getIdsForString(typeName, attribute, value, + dbAccess, strict.booleanValue()); } else { logger.warn("handleSubCondition: Error in subcondition \"" + @@ -1298,8 +1353,9 @@ } else { // Execute the SQL-query to get the corresponding ids - listOfMaps = dbAccess.sqlQuery("SELECT " + idType + " FROM " + - tableName + " WHERE " + subCondition); + listOfMaps = + dbAccess.sqlQuery("SELECT " + idType + " FROM " + + tableName + " WHERE " + subCondition); } if ((listOfMaps == null) || (listOfMaps.isEmpty())) { @@ -1412,7 +1468,7 @@ exprList = (ExpressionList) (new parser(new Lexer(new StringReader(query))).parse()).value; } - catch (Exception e) { + catch (Exception e) { logger.warn(LogUtil.exall("Parsing failed!", e)); logger.info("Could not parse query!\n Please try again."); return sqlResults; @@ -1422,7 +1478,7 @@ return sqlResults; } - //retrieves all ExpressionListParts as Enumeration + // retrieves all ExpressionListParts as Enumeration Enumeration enu = exprList.elements(); ExpressionListPart exprListPart = null; Vector sqlCollect = new Vector(); //store each single sql query @@ -1438,10 +1494,10 @@ sqlCollect.add(exprListPart); } - //copy potential new ExpressionListPart objects, i.e. converted - //SetExpression instances that may have been created by involved - //handle*()-methods into the ExpressionListPart collecting vector - //for further processing + // copy potential new ExpressionListPart objects, i.e. converted + // SetExpression instances that may have been created by involved + // handle*()-methods into the ExpressionListPart collecting vector + // for further processing Vector tempIntern = null; tempIntern = exprList.getInternStorage(); if ((tempIntern != null) && (tempIntern.size() > 0)) { @@ -1501,7 +1557,7 @@ return null; } - logger.info("Check type of expression and choose appropriate submethod."); + logger.debug("Check type of expression and choose appropriate submethod."); for (int i = 0; i < tempExprs.size(); i++) { expression = (Expression) tempExprs.elementAt(i); @@ -1610,7 +1666,7 @@ } if (i > 0) { - logger.info("Check and set type of boolean connector: AND/OR"); + logger.debug("Check and set type of boolean connector: AND/OR"); if (boolMode == BooleanExpression.NP) { boolMode = exprLP.getBooleanPrefix(); } @@ -1634,17 +1690,17 @@ return null; } - //if no boolean connection, just take the first search path part + // if no boolean connection, just take the first search path part if (boolMode == BooleanExpression.NP) { sqlStruc = correctDuplicates((SQLStructure) sqlStrucsVec. elementAt(0)); idSet = createAndExecuteSQL(sqlStruc, dbAccess); } - //if AND connection, construct each one single condition expression and - //process and execute + // if AND connection, construct each one single condition expression + // and process and execute if (boolMode == BooleanExpression.AND) { - logger.info("Search paths are connected by \"AND\"."); + logger.debug("Search paths are connected by \"AND\"."); String tempCondON = null; String tempCondWHERE = null; @@ -1664,8 +1720,7 @@ boolean whereCondFollow = false; //following position. int onStepControl = 0; //define next step in conditionlist int whereStepControl = 0; // -||- - sqlStruc = new SQLStructure(); - + sqlStruc = new SQLStructure(); for (int i = 0; i < sqlStrucsVec.size(); i++) { tempSELECT = ((SQLStructure) sqlStrucsVec.elementAt(i)). @@ -1678,19 +1733,21 @@ getAfterON(); tempWHERE = ((SQLStructure) sqlStrucsVec.elementAt(i)). getAfterWHERE(); - + // copy contents of SELECT, FROM, JOIN to main // SQLStructure object iterator = tempSELECT.iterator(); - while (iterator.hasNext()) { sqlStruc.addSELECT((String) iterator.next()); } iterator = tempFROM.iterator(); - while (iterator.hasNext()) { - sqlStruc.addFROM((String) iterator.next()); + String tmps = (String) iterator.next(); + sqlStruc.addFROM(tmps); + if (!tmps.equals("item")) { + sqlStruc.addWHERE("(item.itemid = "+tmps+".itemid)"); + } } if (tempJOIN != null) { @@ -1879,7 +1936,6 @@ } sql += "SELECT "; - for (int i = 0; i < selectArray.length; i++) { sql += selectArray[i]; if (i != (selectArray.length - 1)) { @@ -1890,9 +1946,7 @@ if (fromArray == null) { return null; } - sql += " FROM "; - for (int i = 0; i < fromArray.length; i++) { sql += fromArray[i]; if (i != (fromArray.length - 1)) { @@ -1906,25 +1960,9 @@ } } - /* this does not work ... - if ((joinArray != null) && (joinArray.length > 0)) { - sql += " INNER JOIN "; - for (int i = 0; i < joinArray.length; i++) { - sql += joinArray[i]; - if (onArray.length >= i) { - sql += (" ON " + onArray[i]); - } - if (i != (joinArray.length - 1)) { - sql += " INNER JOIN "; - } - } - } - */ - - if ((whereArray == null) || (whereArray.length != 1)) { + if (whereArray == null) { return null; } - sql += " WHERE "; if ((onArray != null) && (onArray.length > 0)) { for (int i = 0; i < onArray.length; i++) { @@ -1932,10 +1970,13 @@ sql += " AND "; } } - sql += whereArray[0]; - logger.info("sql query :" + sql); + for (int i=0; i<whereArray.length; i++) { + if (i>0) sql += " AND "; + sql += whereArray[i]; + } + logger.debug("sql query :" + sql); - //execute and postprocess + // execute and postprocess listOfMaps = ((DBAccessImpl)dbAccess).sqlQuerySpecificIdent(sql); if ((listOfMaps == null) || (listOfMaps.isEmpty())) { //no hits return null; @@ -2617,7 +2658,7 @@ //(c) if (lastPathPart.equals("lang") && - pathPartArray[arrayLength - 2].trim().equals("content")) { + pathPartArray[arrayLength - 2].trim().equals("content")) { contentTable = true; } @@ -2647,8 +2688,8 @@ tableName = getTableName("item", "", false); sideTable = true; whereCondition = "(" + tableName + ".aname = '" + - lastPathPart + "' AND " + tableName + - ".avalue = '" + nodeTest.getValue() + "')"; + lastPathPart + "' AND " + tableName + + ".avalue = '" + nodeTest.getValue() + "')"; attrName = "aname"; } @@ -2761,7 +2802,7 @@ //(ii)item with references to cobricks type: user, item, category } else { - logger.info("Handling Cobricks typed attributes in search path."); + logger.debug("Handling Cobricks typed attributes in search path."); //reference to user: if (pathPartName.equals("creator") || tempAttrType.startsWith("user")) { @@ -3481,15 +3522,14 @@ String langAbbr = null; if (titleString.equals("title")) { - condition = "(" + table + ".title = '" + comparison.getValue() + - "' AND " + table + ".lang LIKE '__')"; - + condition = "(" + table + ".title like '" + comparison.getValue() + + "' AND " + table + ".lang like '__')"; return condition; } if (titleString.startsWith("title_")) { langAbbr = titleString.substring(6); - condition = "(" + table + ".title = '" + comparison.getValue() + + condition = "(" + table + ".title like '" + comparison.getValue() + "' AND " + table + ".lang = '" + langAbbr + "')"; return condition; Index: itemontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/itemontology.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- itemontology.xml 10 Aug 2005 13:34:56 -0000 1.10 +++ itemontology.xml 1 Sep 2006 11:32:14 -0000 1.11 @@ -5,9 +5,12 @@ <attr name="itemid" type="int"/> <attr name="globalid" type="string(64)"/> <attr name="itemclass" type="string(50)"/> -<attr name="title" type="string(100)" multilanguage="true"> +<attr name="title" type="string(200)" multilanguage="true"> <description lang="de">Titel</description> </attr> +<attr name="keywords" type="string(200)" multilanguage="true"> + <description lang="de">Schlüsselworte</description> +</attr> <attr name="content" type="text" multilanguage="true"/> <attr name="creator" type="user"/> <attr name="creationtime" type="datetime"/> |
|
From: Michael K. <ko...@us...> - 2006-09-01 11:32:18
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29047/db Modified Files: item_title.xml Log Message: Index: item_title.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/db/item_title.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- item_title.xml 24 Jun 2004 06:55:38 -0000 1.1 +++ item_title.xml 1 Sep 2006 11:32:14 -0000 1.2 @@ -4,7 +4,7 @@ <column name="itemid" type="int" notnull="true"/> <column name="lang" type="char(2)"/> - <column name="title" type="varchar(100)"/> + <column name="title" type="varchar(200)"/> <index name="item_title_itemid"> <colname>itemid</colname> |
|
From: Michael K. <ko...@us...> - 2006-08-30 10:26:03
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30991 Modified Files: PortalManager.java PortalManagerImpl.java PortalObject.java PortalPresenter.java Log Message: Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- PortalPresenter.java 31 May 2006 06:04:18 -0000 1.41 +++ PortalPresenter.java 30 Aug 2006 10:25:57 -0000 1.42 @@ -181,6 +181,7 @@ String pageContent = portalManager.getPageContent(filename, portalRequest); try { + StringWriter sw = new StringWriter(); Velocity.evaluate(portalRequest.getVelocityContext(), sw, "", pageContent); @@ -490,12 +491,23 @@ public List getPagesForFolder(String folderid) { if (folderid == null) return null; - String xpath = "/item[itemclass='portalpagehtml'] and " + String xpath = "/item[itemclass~'portalpage'] and " +"/item/folders/category/id="+folderid.trim(); List items = itemManager.searchItems(xpath); return items; } + public List getPagesForFolderPath(String folderpath) + { + if (folderpath == null) return null; + PortalFolder pf = portalManager.getPortalFolder(folderpath); + if (pf == null) return null; + String xpath = "/item[itemclass~'portalpage'] and " + +"/item/folders/category/id="+pf.getId(); + List items = itemManager.searchItems(xpath); + return items; + } + /** * This method prints out radio buttons for an html form. Index: PortalManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManager.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- PortalManager.java 29 May 2006 15:57:29 -0000 1.21 +++ PortalManager.java 30 Aug 2006 10:25:57 -0000 1.22 @@ -78,6 +78,8 @@ public PortalFolder getPortalFolder(int catid); public PortalFolder getPortalFolder(String path); + public PortalFolder getRootPortalFolder(); + public List getPortalFolders(); public int createFolder(String parentPath, String name, String title, User creator) Index: PortalObject.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalObject.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PortalObject.java 11 Jul 2006 10:27:03 -0000 1.4 +++ PortalObject.java 30 Aug 2006 10:25:57 -0000 1.5 @@ -239,6 +239,9 @@ if (suffix.equals("ico")) { mimetype = "image/ico"; } + if (suffix.equals("swf")) { + mimetype = "application/x-shockwave-flash"; + } } } return mimetype; Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- PortalManagerImpl.java 31 May 2006 06:04:18 -0000 1.83 +++ PortalManagerImpl.java 30 Aug 2006 10:25:57 -0000 1.84 @@ -126,7 +126,7 @@ protected String adminPermissionDomain = null; protected String adminPermissionAction = null; - protected Category rootPortalFolder = null; + protected PortalFolder rootPortalFolder = null; /** * Map holding all portal folders indexed by categoryid @@ -724,10 +724,12 @@ +"/item[name='"+pageName+"'] and " +"/item/folders/category/id="+Integer.toString(c.getId()); List p = itemManager.searchItems(xpath); + Item item = null; if (p != null && p.size()>0) { - Item i = (Item)p.iterator().next(); - itemid = new Integer(i.getId()); + item = (Item)p.iterator().next(); + itemid = new Integer(item.getId()); } + if (itemid!=null) { pageItemIdCache.put(key, itemid); return itemid.intValue(); @@ -882,14 +884,26 @@ HashMap attrs = new HashMap(); attrs.put("categoryclass", "portalfolder"); attrs.put("title_en", title); - attrs.put("path", path); + attrs.put("path", path); PortalFolder pf = getPortalFolder(parentPath); - Integer parentid = new Integer(pf.getId()); - if (parentid != null) - attrs.put("parent", parentid); + if (pf != null) { + Integer parentid = new Integer(pf.getId()); + if (parentid != null) + attrs.put("parent", parentid); + } else { + String tmps = parentPath; + int pos = (tmps.substring(0, tmps.length()-1)). + lastIndexOf("/"); + String ppath = tmps.substring(0, pos+1); + String cpath = tmps.substring(pos+1); + int tmpi = createFolder(ppath, cpath, cpath, null); + if (tmpi > 0) + attrs.put("parent", new Integer(tmpi)); + pf = getPortalFolder(parentPath); + } logger.info("PortalManagerImpl: trying to create folder: "+path); - PortalFolder c = (PortalFolder)categoryManager. - createCategory(attrs, creator); + PortalFolder c = (PortalFolder) + categoryManager.createCategory(attrs, creator); addPortalFolderToCache(c); Set pfChildren = pf.getChildrenIds(); @@ -1018,7 +1032,7 @@ /** * */ - public Category getRootPortalFolder() + public PortalFolder getRootPortalFolder() { if (rootPortalFolder!=null) return rootPortalFolder; CategoryManager categoryManager = (CategoryManager) @@ -1027,10 +1041,10 @@ Map attrs = new HashMap(); attrs.put("categoryclass", "portalfolder"); attrs.put("title_en", ROOTPORTALFOLDER); - List results = categoryManager.getCategories(attrs); + List results = categoryManager.searchCategories(attrs); if (results!=null) { Iterator i = results.iterator(); - rootPortalFolder = (Category)i.next(); + rootPortalFolder = (PortalFolder)i.next(); } } if (rootPortalFolder==null) @@ -1042,6 +1056,24 @@ /** * */ + public List getPortalFolders() + { + List folderssorted = new ArrayList(); + Set folders = portalFolders.entrySet(); + Iterator i = folders.iterator(); + while (i.hasNext()) { + Map.Entry entry = (Map.Entry)i.next(); + PortalFolder folder = (PortalFolder)entry.getValue(); + folderssorted.add(folder.getPath()); + } + Collections.sort(folderssorted); + return folderssorted; + } + + + /** + * + */ public SessionHandler getSessionHandler() { return sessionHandler; @@ -1446,47 +1478,6 @@ } } - - public String createPageCategory(Map attrs, User creator) - { - try { - Category catid = categoryManager. - createCategory(attrs, creator); - return "success"; - } catch (Exception e) { - logger.error(LogUtil.ex("failed creating category", e)); - } - return "error"; - } - - public String createPortalCategory(Map attrs, User creator) - { - try { - Category catid = categoryManager. - createCategory(attrs, creator); - return "success"; - } catch (Exception e) { - logger.error(LogUtil.ex("failed creating category", e)); - } - return "error"; - } - - public List getPagesWithPageCategory(int pagecategory_id) - { - String xpathQuery = - "/item[itemclass~\"portalobject\"] " - +"and /item[pagecategories/category/id=" + pagecategory_id + "]"; - return itemManager.searchItems(xpathQuery); - } - - public List getPagesWithPortalCategory(int portalcategory_id) - { - String xpathQuery = - "/item[itemclass~\"portalobject\"] " - +"and /item[portalcategory/id=" + portalcategory_id + "]"; - return itemManager.searchItems(xpathQuery); - } - public List searchObjects(String searchExp, boolean searchInTitle) { @@ -1500,7 +1491,6 @@ if (searchInTitle == true) { query = "/item[itemclass~'portalpage'] and /item[(" + "contains(translate(content, 'ABCDEFGHIJKLMNOPSQRTUVWXYZ', 'abcdefghijklmnopsqrtuvwxyz'),'" + searchWord + "') or " + - "contains(translate(navtitle, 'ABCDEFGHIJKLMNOPSQRTUVWXYZ', 'abcdefghijklmnopsqrtuvwxyz'),'" + searchWord + "') or " + "contains(translate(title, 'ABCDEFGHIJKLMNOPSQRTUVWXYZ', 'abcdefghijklmnopsqrtuvwxyz'),'" + searchWord + "')" + ")]"; } else { |
|
From: Michael K. <ko...@us...> - 2006-07-11 17:13:48
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4420 Modified Files: ItemServlet.java Log Message: Index: ItemServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemServlet.java,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- ItemServlet.java 29 May 2006 05:35:25 -0000 1.43 +++ ItemServlet.java 11 Jul 2006 17:13:42 -0000 1.44 @@ -251,6 +251,7 @@ byte[] data = uploadFile.get(); itemManager.storeItemAttachment(ia, data, uploadFile.getName()); + itemManager.addItemAttachment(it, ia); } } |
|
From: Michael K. <ko...@us...> - 2006-07-11 10:27:10
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693/src/org/cobricks/portal Modified Files: PortalObject.java PortalServletAdaptor.java Log Message: Index: PortalObject.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalObject.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- PortalObject.java 29 May 2006 05:40:45 -0000 1.3 +++ PortalObject.java 11 Jul 2006 10:27:03 -0000 1.4 @@ -224,6 +224,9 @@ if (suffix.equals("csv")) { mimetype = "text/csv"; } + if (suffix.equals("vcf")) { + mimetype = "text/x-vcard"; + } if (suffix.equals("gif")) { mimetype = "image/gif"; } Index: PortalServletAdaptor.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServletAdaptor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- PortalServletAdaptor.java 29 May 2006 15:57:29 -0000 1.19 +++ PortalServletAdaptor.java 11 Jul 2006 10:27:03 -0000 1.20 @@ -327,6 +327,8 @@ response.setContentType("text/xml"); else if (pname.endsWith("css")) response.setContentType("text/css"); + else if (pname.endsWith("vcf")) + response.setContentType("text/x-vcard"); else response.setContentType("text/html"); |
|
From: Michael K. <ko...@us...> - 2006-07-11 10:27:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693/src/org/cobricks/user Modified Files: User.java UserManagerImpl.java UserPresenter.java UserServlet.java Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- UserPresenter.java 30 May 2006 14:32:01 -0000 1.35 +++ UserPresenter.java 11 Jul 2006 10:27:04 -0000 1.36 @@ -324,9 +324,7 @@ for (Iterator i = attrNames.iterator(); i.hasNext();) { String compCondition = (String)compareConditions.get(countNames); - aname = (String)i.next(); - if (aname.equalsIgnoreCase(FormConstants.USERLOGIN)) { aname = User.USERLOGIN; } else if (aname.equalsIgnoreCase(FormConstants.LAST_NAME)) { Index: UserServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- UserServlet.java 29 May 2006 15:57:12 -0000 1.41 +++ UserServlet.java 11 Jul 2006 10:27:04 -0000 1.42 @@ -120,6 +120,8 @@ this.addTarget("update", "performUpdate", "", true); this.addTarget("forgotPassword", "performForgotPassword", "", false); this.addTarget("changePassword", "performChangePassword", "", true); + this.addTarget("changePasswordAdmin", + "performChangePasswordAdmin", "", true); this.addTarget("registeradmin", "performRegisterAdmin", "", false); this.addTarget("createrole", "performCreateRole", "", true); this.addTarget("updaterole", "performUpdateRole", "", true); @@ -149,15 +151,8 @@ public String performDefault(PortalRequest prequest, PrintWriter out) throws PortalCompletedException { - String userlogin = prequest.getRequestParameter("userlogin"); - String userid = prequest.getRequestParameter("userid"); - - // tbd - prequest.setReturnCode(1000); return "/index.html"; - - //throw new PortalCompletedException(); } @@ -422,7 +417,7 @@ PrintWriter out) { try { - String tmp = prequest.getRequestParameter(FormConstants.USERLOGIN); + String tmp = prequest.getRequestParameter("auserlogin"); //is userlogin entered? if ((tmp == null) || (tmp.length() < 1)) { @@ -447,7 +442,7 @@ } } - tmp = prequest.getRequestParameter(FormConstants.EMAIL); + tmp = prequest.getRequestParameter("email"); // is the e-mail entered? if ((tmp == null) || (tmp.length() < 1)) { @@ -473,8 +468,8 @@ } String userLogin = - prequest.getRequestParameter(FormConstants.USERLOGIN); - String email = prequest.getRequestParameter(FormConstants.EMAIL); + prequest.getRequestParameter("auserlogin"); + String email = prequest.getRequestParameter("email"); // exists the user with this userlogin and email??? User u = userManager.checkUser(userLogin, email); @@ -531,36 +526,57 @@ } + public String performChangePasswordAdmin(PortalRequest prequest, + PrintWriter out) + { + return doPerformChangePassword(prequest, out, true); + } + public String performChangePassword(PortalRequest prequest, PrintWriter out) { - try { - PortalUser portalUser = prequest.getPortalUser(); - int userId = portalUser.getUserId(); - String tmp = prequest.getRequestParameter(FormConstants.PASSWORD_OLD); + return doPerformChangePassword(prequest, out, false); + } + + public String doPerformChangePassword(PortalRequest prequest, + PrintWriter out, + boolean admin) + { + logger.debug("performChangePassword()"); - // is the old pwd entered? - if ((tmp == null) || (tmp.length() < 1)) { - prequest.setReturnCode(1006); - return "error"; + // check access rights + PortalUser portalUser = prequest.getPortalUser(); + if (admin) { + if (!userManager.checkPermission(portalUser.getUserId(), + "user", "admin", null)) { + prequest.setReturnCode(2000); + return "noaccess"; + } + } + + try { + String tmp = null; + if (!admin) { + tmp = + prequest.getRequestParameter(FormConstants.PASSWORD_OLD); + // is the old pwd entered? + if ((tmp == null) || (tmp.length() < 1)) { + prequest.setReturnCode(1006); + return "error"; + } } - User user = userManager.getUser(userId); + User user = userManager.getUser(portalUser.getUserId()); if (user != null) { - if (!user.checkCredentials(tmp)) { + if (!admin && !user.checkCredentials(tmp)) { // password does not match ... - logger.info("Password for userid " + userId - + " not correct."); - - // TBD: print message prequest.setReturnCode(1001); return "error"; } } tmp = prequest.getRequestParameter(FormConstants.PASSWORD_NEW); - if ((tmp == null) || (tmp.length() < 1)) { prequest.setReturnCode(1007); return "error"; @@ -571,8 +587,8 @@ } } - String tmp2 = prequest.getRequestParameter(FormConstants.CONFIRM_PASSWORD); - + String tmp2 = + prequest.getRequestParameter(FormConstants.CONFIRM_PASSWORD); if (!tmp.equalsIgnoreCase(tmp2)) { prequest.setReturnCode(1002); return "error"; @@ -584,11 +600,8 @@ if (user != null) { user.setCredentials(userManager, tmp2); prequest.setReturnCode(2001); - return "success"; } else { - //user with userlogin exists, try another userlogin! velocity - logger.info("user with userlogin not exists!"); prequest.setReturnCode(1020); return "error"; } @@ -1023,17 +1036,23 @@ * @return **/ public String performDeleteListMember(PortalRequest prequest, - PrintWriter out) { + PrintWriter out) + { + String idstring = prequest.getRequestParameter("uid"); + int id = 0; + try { + id = Integer.parseInt(idstring); + } catch (Exception e) { } + if (id<1) + id = prequest.getPortalUser().getUserId(); String ids[] = prequest.getRequestParameterValues("id"); - if (ids == null) { return "success"; } - + for (int i = 0; i < ids.length; i++) { try { int idToDelete = Integer.parseInt(ids[i]); - int id = prequest.getPortalUser().getUserId(); String name = prequest.getRequestParameter("aname"); userManager.deleteListMember(id, idToDelete, name); } catch (Exception e) { Index: User.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/User.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- User.java 29 May 2006 15:57:12 -0000 1.29 +++ User.java 11 Jul 2006 10:27:03 -0000 1.30 @@ -46,10 +46,18 @@ public static final String LASTNAME = "basic.personal.lastname"; public static final String USERCLASS = "userclass"; - public static final String EMAIL = "basic.contact-work.online.email"; + public static final String EMAIL = "basic.contact.online.email"; + public static final String EMAILP = "basic.contact-priv.online.email"; + public static final String EMAILW = "basic.contact-work.online.email"; public static final String EMAILBOUNCED = + "basic.contact.online.emailbounced"; + public static final String EMAILPBOUNCED = + "basic.contact-priv.online.emailbounced"; + public static final String EMAILWBOUNCED = "basic.contact-work.online.emailbounced"; - public static final String URI = "basic.contact-work.online.uri"; + public static final String URI = "basic.contact.online.uri"; + public static final String URIP = "basic.contact-priv.online.uri"; + public static final String URIW = "basic.contact-work.online.uri"; public static final String IMAGEURI = "basic.personal.imageuri"; public static final String TELECOMMOBILE = "basic.contact-work.telecom.mobile"; Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- UserManagerImpl.java 30 May 2006 14:32:00 -0000 1.63 +++ UserManagerImpl.java 11 Jul 2006 10:27:03 -0000 1.64 @@ -1051,16 +1051,24 @@ * * @return user, if it exist, o/w null */ - public User checkUser(String userLogin, String email) { + public User checkUser(String userLogin, String email) + { int userid = getUserIdForUserLogin(userLogin); if (userid > 0) { User user = getUser(userid); - - if (user.getAttributeAsString(User.EMAIL).equalsIgnoreCase(email)) { + if (user.getAttributeAsString(User.EMAILP). + equalsIgnoreCase(email)) { + return user; + } + if (user.getAttributeAsString(User.EMAILW). + equalsIgnoreCase(email)) { + return user; + } + if (user.getAttributeAsString(User.EMAIL). + equalsIgnoreCase(email)) { return user; } - return null; } |
|
From: Michael K. <ko...@us...> - 2006-07-11 10:27:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/images In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693/src/org/cobricks/cwall/meeting/images Modified Files: ccbBack.jpg ccbForward.jpg ccbNormal.jpg ccbStop.jpg Log Message: Index: ccbStop.jpg =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/images/ccbStop.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvslcCPrJ and /tmp/cvsuM3Go8 differ Index: ccbNormal.jpg =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/images/ccbNormal.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsUEdNuK and /tmp/cvsEsYAJ9 differ Index: ccbBack.jpg =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/images/ccbBack.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs4INefQ and /tmp/cvsEsr7Gf differ Index: ccbForward.jpg =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/cwall/meeting/images/ccbForward.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvseEozc1 and /tmp/cvsFQyLSq differ |
|
From: Michael K. <ko...@us...> - 2006-07-11 10:27:07
|
Update of /cvsroot/cobricks/cobricks2/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693/web/user Modified Files: forgot_password.html.en register.html.en search.html.en Log Message: Index: forgot_password.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/forgot_password.html.en,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- forgot_password.html.en 30 May 2006 14:18:30 -0000 1.4 +++ forgot_password.html.en 11 Jul 2006 10:27:04 -0000 1.5 @@ -74,7 +74,7 @@ <input type="hidden" name="cmd.success" value="/user/forgot_password.html" /> <input type="hidden" name="cmd.error" value="/user/forgot_password.html" /> #if ($returnCode == 2001) - Your cridentials will be sent to the email address <b><font color="black">$email</font></b>. + Your new credentials have been sent to the email address <b><font color="black">$email</font></b>. #else <TABLE BORDER=0> @@ -93,7 +93,7 @@ #set ($login = "$!auserlogin") <p><input type=submit value="Submit"/></p> <p> -If your input proves to be correct, your cridentials will be sent to your +If your input proves to be correct, your new credentials will be sent to your email address. </p> #end Index: register.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/register.html.en,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- register.html.en 30 May 2006 14:18:30 -0000 1.5 +++ register.html.en 11 Jul 2006 10:27:04 -0000 1.6 @@ -83,7 +83,7 @@ <TD>Lastname*:</TD><TD><input name="basic_personal_lastname" size=20 value="$!basic_personal_lastname"></td> </tr> <tr> - <TD>Email*:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact_online_email"></td> + <TD>Email*:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact-priv_online_email"></td> </tr> <tr> <TD>Status:</TD><TD> Index: search.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/search.html.en,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- search.html.en 31 May 2006 06:04:19 -0000 1.11 +++ search.html.en 11 Jul 2006 10:27:04 -0000 1.12 @@ -10,7 +10,7 @@ <INPUT TYPE="hidden" NAME="cmd" VALUE="search" /> -#set ( $tmp = "$!auserlogin$!firstname$!lastname" ) +#set ( $tmp = "$!auserlogin$!firstname$!lastname$!companyname" ) #if ( $tmp != "") #set ($attrsInit = true) Search for users with search criteria @@ -39,6 +39,14 @@ is equal '$!lastname' #end #end + #if ($companyname.length() > 0) + <li>Company name: + #if ($compare_func_companyname == "2") + like '$!companyname' + #else + is equal '$!companyname' + #end + #end </ul> #else #set ($attrsInit = false) @@ -50,14 +58,16 @@ #set ( $login = "$!auserlogin" ) #set ( $fname = "$!firstname" ) #set ( $lname = "$!lastname" ) +#set ( $cname = "$!companyname" ) #set ( $loginCond = "$!compare_func_auserlogin" ) #set ( $fnameCond = "$!compare_func_firstname" ) #set ( $lnameCond = "$!compare_func_lastname" ) +#set ( $cnameCond = "$!compare_func_companyname" ) -#set ( $listNames = ["auserlogin", "basic.personal.firstname", "basic.personal.lastname"] ) -#set ( $listConditions = [$loginCond, $fnameCond, $lnameCond] ) -#set ( $listValues = [$login, $fname, $lname] ) +#set ( $listNames = ["auserlogin", "basic.personal.firstname", "basic.personal.lastname", "basic.work.companyname"] ) +#set ( $listConditions = [$loginCond, $fnameCond, $lnameCond, $cnameCond] ) +#set ( $listValues = [$login, $fname, $lname, $cname] ) #set ($orFlag = false) #if ("$!SearchLogik" == "or") @@ -153,6 +163,16 @@ </tr> <tr> + <TD>Company name:</TD><TD><input name="companyname" size=20 value="$!companyname"></td> + <td> + <select width="15" name="compare_func_companyname" > + <option value="1">is equal + <option value="2">like + </select> + </td> + </tr> + + <tr> <td> order by: </td> |
|
From: Michael K. <ko...@us...> - 2006-07-11 10:27:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16693/src/org/cobricks/course/db Modified Files: course.xml course_module.xml Log Message: Index: course.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- course.xml 29 May 2006 08:46:30 -0000 1.5 +++ course.xml 11 Jul 2006 10:27:03 -0000 1.6 @@ -7,7 +7,9 @@ <column name="cparentid" type="int"/> <column name="cterm" type="char(5)" notnull="true"/> - + + <!-- cname is a subtitle that is added to the title + of the associated module --> <column name="cname" type="varchar(150)"/> <column name="cname_en" type="varchar(150)"/> <column name="ccomment" type="varchar(255)"/> Index: course_module.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_module.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- course_module.xml 29 May 2006 08:46:30 -0000 1.2 +++ course_module.xml 11 Jul 2006 10:27:03 -0000 1.3 @@ -32,6 +32,7 @@ <!-- 0=confirmed/show, 1=archived/hidden, 2=not confirmed/hidden --> <column name="cmcycle" type="varchar(10)"/> + <column name="cmlang" type="char(2)"/> <column name="cmcapacity" type="int"/> <column name="cmresponsible" type="int"/> <!-- reference to lecturer --> |
