diff options
| author | Michael Peter Christen <mc@yacy.net> | 2026-07-11 11:11:06 +0200 |
|---|---|---|
| committer | Michael Peter Christen <mc@yacy.net> | 2026-07-11 11:11:06 +0200 |
| commit | b1380c4a9f479de4fc456b6305bee57bc752ad03 (patch) | |
| tree | c0d42fb103edafa5e9b8e5f04f48bfdcc658441e /htroot | |
| parent | f2b0f41d8492ebf92b0e331e8c9c78e626f371c9 (diff) | |
cleaned up user authentication
this removes the userDB-exception in the normal
authentication process which affected mostly wiki
and blog which are not required any more. We also
cleaned up translation messages as this function was
not used at all. This is a required step forward
a renovation of the jetty server.
Diffstat (limited to 'htroot')
29 files changed, 78 insertions, 1023 deletions
diff --git a/htroot/Blog.html b/htroot/Blog.html deleted file mode 100644 index baae0ff90..000000000 --- a/htroot/Blog.html +++ /dev/null @@ -1,166 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>YaCy '#[clientname]#': Blog</title>
- #%env/templates/metas.template%#
- <link rel="alternate" type="application/rss+xml" title="RSS" href="Blog.rss" />
- </head>
- <body id="Blog">
- #(display)#
- #%env/templates/simpleheader.template%#
- #%env/templates/submenuPublication.template%#
- ::
- #%env/templates/header.template%#
- #%env/templates/submenuPublication.template%#
- ::
- #%env/templates/embeddedheader.template%#
- #(/display)#
- #(mode)#
- <!-- 0: viewing -->
- #{entries}#
- <div class="Post">
- <h2 class="PostSubject"><a href="BlogComments.html?page=#[pageid]#">#[subject]#</a></h2>
- <div class="PostBody">#[page]#</div>
- <p class="PostInfo">
- #[date]# | by #[author]# #(commentsactive)#::| <a href="BlogComments.html?page=#[pageid]#">#[comments]# Comments</a>#(/commentsactive)#
- #(admin)#::| <a href="Blog.html?page=#[pageid]#&edit=true">edit</a>
- - <a href="Blog.html?page=#[pageid]#&delete=try">delete</a>#(/admin)#
- </p>
- </div>
- #{/entries}#
- <div class="BlogCommentPrevNext">
- <p>
- #(preventries)#
- << previous entries
- ::
- <a href="Blog.html?start=#[start]#&num=#[num]#"><< previous entries</a>
- #(/preventries)#
-
- #(moreentries)#
- next entries >>
- ::
- <a href="Blog.html?start=#[start]#&num=#[num]#">next entries >></a>
- #(/moreentries)#
- </p>
- </div>
- <p class="Navigation">
- #(admin)#<a href="Blog.html?login=true">Login</a> - ::<a href="Blog.html?edit=true">new entry</a> - <a href="Blog.html?import=xml">import XML-File</a> - <a href="Blog.xml?xml=1">export as XML</a> - #(/admin)#<a href="Blog.html">Blog-Home</a>
- </p>
- ::
- <!-- 1: edit -->
- <h2>Edit</h2>
- <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="20" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="subject">Subject:</label></dt>
- <dd>
- <input name="subject" id="subject" type="text" size="80" maxlength="80" value="#[subject]#" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="24">#[page-code]#</textarea>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Yacy-Wiki Code</a> here.
- </p>
- </dd>
- <dt><label for="commentMode">Comments:</label></dt>
- <dd>
- <select name="commentMode" id="commentMode">
- <option value="0" #(commentMode)#selected="selected"::#(/commentMode)#>deactivated</option>
- <option value="1" #(commentMode)#::selected="selected"#(/commentMode)#>activated</option>
- <option value="2" #(commentMode)#::::selected="selected"#(/commentMode)#>moderated</option>
- </select>
- </dd>
- </dl>
- <input type="hidden" name="page" value="#[pageid]#" />
- <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
- <input type="submit" name="preview" class="btn btn-default" value="Preview" />
- <input type="submit" name="discard" class="btn btn-danger" value="Discard" />
- </fieldset>
- </form>
- ::
- <!-- 2: preview -->
- <h2>Preview</h2>
- <p>No changes have been submitted so far!</p>
- <div class="Post">
- <h2 class="PostSubject">#[subject]#</h2>
- <div class="PostBody">#[page]#</div>
- <p class="PostInfo">#[date]# | by #[author]#</p>
- </div>
- <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="20" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="subject">Subject:</label></dt>
- <dd>
- <input name="subject" id="subject" type="text" size="20" maxlength="80" value="#[subject]#" />
- </dd>
- <dt>
- <label for="content">Text:</label>
- </dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="24">#[page-code]#</textarea>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Yacy-Wiki Code</a> here.
- </p>
- </dd>
- <dt><label for="commentMode">Comments:</label></dt>
- <dd>
- <select name="commentMode" id="commentMode">
- <option value="0" #(commentMode)#selected="selected"::#(/commentMode)#>deactivated</option>
- <option value="1" #(commentMode)#::selected="selected"#(/commentMode)#>activated</option>
- <option value="2" #(commentMode)#::::selected="selected"#(/commentMode)#>moderated</option>
- </select>
- </dd>
- </dl>
- <input type="hidden" name="page" value="#[pageid]#" />
- <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
- <input type="submit" name="preview" class="btn btn-default" value="Preview" />
- <input type="submit" name="discard" class="btn btn-danger" value="Discard" />
- </fieldset>
- </form>
- ::
- <!-- 3: Access Denied (no rights) -->
- <h3>Access denied</h3>
- <p>To edit or create blog-entries you need to be logged in as Admin or User who has Blog rights.</p>
- ::
- <!-- 4: Delete Confirmation -->
- <h3>Are you sure...</h3>
- <p>... that you want to delete <strong>#[subject]#</strong> by <span class="tt">#[author]#</span>?</p>
- <fieldset><legend>Confirm deletion</legend>
- <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <input type="hidden" name="delete" value="sure" />
- <input type="hidden" name="page" value="#[pageid]#" />
- <input type="submit" class="btn btn-danger" value="Yes, delete it." />
- </form>
- <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <input type="submit" class="btn btn-primary" value="No, leave it." />
- </form>
- </fieldset>
- ::
- <!-- 5: XML-Import -->
- <h3>XML-Import</h3>
- #(state)#
- ::
- <p>Import was successful!</p>
- ::
- <p>Import failed, maybe the supplied file was no valid blog-backup?</p>
- #(/state)#
- <p>Please select the XML-file you want to import:</p>
- <form action="Blog.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <input type="file" size="50" name="xmlfile" />
- <input type="submit" name="importxml" class="btn btn-primary" value="Import" />
- </fieldset>
- </form>
- #(/mode)#
- #%env/templates/footer.template%#
- </body>
-</html>
diff --git a/htroot/Blog.rss b/htroot/Blog.rss deleted file mode 100644 index bec8fbc64..000000000 --- a/htroot/Blog.rss +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0">
-<channel>
- <title><![CDATA[YaCy '#[clientname]#': Blog]]></title>
- <link>#[context]#/Blog.html</link>
- <image>
- <url>#[context]#/env/grafics/YaCyLogo_60ppi.png</url>
- <title>YaCy</title>
- <link>#[context]#/</link>
- </image>
-
- #(mode)# #{entries}#<item>
- <author><![CDATA[#[author]#]]></author>
- <title><![CDATA[#[subject]#]]></title>
- <link>#[context]#/Blog.html?page=#[pageid]#</link>
- <pubDate>#[rfc822date]#</pubDate>
- <guid>#[pageid]#</guid>
- <description><![CDATA[
-#[page]#]]></description>
- #(commentsactive)#::<comments>#[context]#/BlogComments.html?page=#[pageid]#</comments>#(/commentsactive)#
- </item>#{/entries}# #(/mode)#
-</channel>
-</rss>
\ No newline at end of file diff --git a/htroot/Blog.xml b/htroot/Blog.xml deleted file mode 100644 index 56d758918..000000000 --- a/htroot/Blog.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<blog>
- #(mode)#
- #{entries}#
- <item>
- <id>#[pageid]#</id>
- <timestamp>#[timestamp]#</timestamp>
- <ip>#[ip]#</ip>
- <author><![CDATA[#[author]#]]></author>
- <subject><![CDATA[#[subject]#]]></subject>
- <content><![CDATA[#[page]#]]></content>
- </item>
- #{/entries}#
- #(/mode)#
-</blog>
\ No newline at end of file diff --git a/htroot/BlogComments.html b/htroot/BlogComments.html deleted file mode 100644 index 42b8d1e4d..000000000 --- a/htroot/BlogComments.html +++ /dev/null @@ -1,122 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>YaCy '#[clientname]#': Blog</title>
- #%env/templates/metas.template%#
- </head>
- <body id="Blog">
- #%env/templates/header.template%#
- #(mode)#
- <!-- 0: viewing -->
- <div class="Post">
- <h2 class="PostSubject"><a href="BlogComments.html?page=#[pageid]#">#[subject]#</a></h2>
- <div class="PostBody">#[page]#</div>
- <p class="PostInfo">
- #[date]# | by #[author]# | <a href="BlogComments.html?page=#[pageid]#">#[comments]# Comments</a>
- </p>
- </div>
- <p class="Navigation">
- #(admin)#<a href="Blog.html?login=true">Login</a> - ::#(/admin)#<a href="Blog.html">Blog-Home</a>
- </p>
- <h3>Comments:</h3>
- #{entries}#
- <div class="BlogCommentPost">
- <h2 class="PostSubject">#[subject]#</h2>
- <div class="PostBody">#[page]#</div>
- <p class="PostInfo">
- #[date]# | by #[author]#
- #(admin)#::| <a href="BlogComments.html?page=#[pageid]#&comment=#[commentid]#&delete=try">delete</a> #(moderate)#::| <a href="BlogComments.html?page=#[pageid]#&comment=#[commentid]#&allow=try">allow</a>#(/moderate)##(/admin)#
- </p>
- </div>
- #{/entries}#
- <div class="BlogCommentPrevNext">
- <p>
- #(preventries)#
- << previous entries
- ::
- <a href="BlogComments.html?page=#[pageid]#&start=#[start]#&num=#[num]#"><< previous entries</a>
- #(/preventries)#
-
- #(moreentries)#
- next entries >>
- ::
- <a href="BlogComments.html?page=#[pageid]#&start=#[start]#&num=#[num]#">next entries >></a>
- #(/moreentries)#
- </p>
- </div>
- #(allow)#
- <fieldset>
- <p>Comments are not allowed for this posting!</p>
- </fieldset>
- ::
- <h2>Comment on this Blog</h2>
- <form action="BlogComments.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="80" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="subject">Subject:</label></dt>
- <dd>
- <input name="subject" id="subject" type="text" size="80" maxlength="80" value="" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="12"></textarea>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Yacy-Wiki Code</a> here.
- </p>
- </dd>
- </dl>
- <input type="hidden" name="page" value="#[pageid]#" />
- <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
- <input type="submit" name="preview" class="btn btn-default" value="Preview" />
- <input type="submit" name="view" class="btn btn-danger" value="Discard" />
- </fieldset>
- </form>
- #(/allow)#
- ::
- <!-- 1: preview -->
- <div class="Post">
- <h2 class="PostSubject"><a href="Blog.html?page=#[pageid]#">#[subject]#</a></h2>
- <div class="PostBody">#[page]#</div>
- <p class="PostInfo">
- #[date]# | by #[author]#
- </p>
- </div>
- <p class="Navigation">
- #(admin)#<a href="Blog.html?login=true">Login</a> - ::<a href="Blog.html?edit=true">new entry</a> - <a href="Blog.html?import=xml">import XML-File</a> - <a href="Blog.xml?xml=1">export as XML</a> - #(/admin)#<a href="Blog.html">Blog-Home</a>
- </p>
- <form action="BlogComments.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="80" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="subject">Subject:</label></dt>
- <dd>
- <input name="subject" id="subject" type="text" size="80" maxlength="80" value="#[subject]#" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="12">#[page-code]#</textarea>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Yacy-Wiki Code</a> here.
- </p>
- </dd>
- </dl>
- <input type="hidden" name="page" value="#[pageid]#" />
- <!-- <input type="text" name="page" value="#[pageid]#" /> -->
- <input type="submit" name="submit" class="btn btn-primary" value="Submit" />
- <input type="submit" name="preview" class="btn btn-default" value="Preview" />
- <input type="submit" name="view" class="btn btn-danger" value="Discard" />
- </fieldset>
- </form>
-
- #(/mode)#
-
- #%env/templates/footer.template%#
- </body>
-</html>
diff --git a/htroot/ConfigAccountList_p.html b/htroot/ConfigAccountList_p.html deleted file mode 100644 index 036a56502..000000000 --- a/htroot/ConfigAccountList_p.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>YaCy '#[clientname]#': User Accounts</title> - #%env/templates/metas.template%# - <script type="text/javascript" src="js/sorttable.js"></script> - </head> -<body> - #%env/templates/header.template%# - #%env/templates/submenuUseCaseAccount.template%# - <h2>User List</h2> - - <fieldset><legend>User Accounts</legend> - <table class="sortable"> - <tr class="TableHeader"> - <th>User</th><th>First name</th><th>Last name</th><th>Address</th><th>Last Access</th><th>Rights</th><th>Time</th><th>Traffic</th> - </tr> - #{userlist}# - <tr> - <td><a href="ConfigUser_p.html?user=#[username]#">#[username]#</a></td><td>#[firstname]#</td><td>#[lastname]#</td><td>#[address]#</td><td>#[lastaccess]#</td><td>#[rights]#</td><td>#[time]#</td><td>#[traffic]#</td> - </tr> - #{/userlist}# - </table> - - </fieldset> - -#%env/templates/footer.template%# -</body> -</html> diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html index c16e5db50..8b70837f0 100644 --- a/htroot/ConfigAccounts_p.html +++ b/htroot/ConfigAccounts_p.html @@ -1,142 +1,83 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>YaCy '#[clientname]#': User Accounts</title> + <title>YaCy '#[clientname]#': Admin Account</title> #%env/templates/metas.template%# </head> <body> #%env/templates/header.template%# #%env/templates/submenuUseCaseAccount.template%# - <h2>User Administration</h2> + <h2>Admin Account</h2> - <!-- Page 1: Results --> - #(text)# - :: - <p>User created: #[username]#</p> - :: - <p>User changed: #[username]#</p> - #(/text)# #(error)# :: - <p class="error">Generic error.</p> + <p class="error">Invalid administrator settings.</p> :: <p class="error">Passwords do not match.</p> :: - <p class="error">Username too short. Username must be >= 4 Characters.</p> + <p class="error">Administrator username is required.</p> :: - <p class="error">Username already used (not allowed).</p> + <p class="error">Administrator password is required.</p> #(/error)# - #(changedfltpw)#:: - <div class="alert alert-danger" role="alert"> - <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy". - Change the password as soon as possible! - </div> - #(/changedfltpw)# <fieldset><legend>Admin Account</legend> + #(changedfltpw)#:: + <div class="alert alert-danger" role="alert"> + <b>Default administrator password is active.</b> + This YaCy instance can still be administered with the username "admin" and the default password "yacy". Replace these credentials using the form directly below. + </div> + #(/changedfltpw)# + <p> + These credentials are used for remote administration and whenever administrative access from localhost without authentication is disabled. + </p> <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8"> - <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> - <fieldset> - <legend> - <input type="radio" name="access" id="access_localhost" value="localhost"#(localhost.checked)#:: checked="checked"#(/localhost.checked)# /> - <label for="access_localhost">Access from localhost without account</label> - </legend> - Access to your peer from your own computer (localhost access) is granted with administrator rights. No need to configure an administration account. - <div class="alert alert-warning" role="alert"> - This setting is convenient but less secure than using a qualified admin account. - Please use with care, notably when you browse untrusted and potentially malicious websites while running your YaCy peer on the same computer. - </div> - </fieldset> - - <fieldset> - <legend> - <input type="radio" name="access" id="access_account" value="account"#(account.checked)#:: checked="checked"#(/account.checked)# /> - <label for="access_account">Access only with qualified account</label> - </legend> - This is required if you want a remote access to your peer, but it also hardens access controls on administration operations of your peer. - <dl class="userConfig"> - <dt><label for="adminuser">Peer User:</label></dt> - <dd><input type="text" name="adminuser" id="adminuser" value="#[defaultUser]#" size="16" maxlength="32" onFocus="document.getElementById('access_account').checked = true;"/></dd> - <dt><label for="adminpw1">New Peer Password:</label></dt> - <dd><input type="password" name="adminpw1" id="adminpw1" value="" size="16" maxlength="1024" onFocus="document.getElementById('access_account').checked = true;"/></dd> - <dt><label for="adminpw2">Repeat Peer Password:</label></dt> - <dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="1024" onFocus="document.getElementById('access_account').checked = true;"/></dd> - <dt></dt> - <dd><input type="submit" name="setAdmin" value="Define Administrator" class="btn btn-primary"/></dd> - </dl> - </fieldset> + <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> + <dl class="userConfig"> + <dt><label for="adminuser">Administrator Username:</label></dt> + <dd><input type="text" name="adminuser" id="adminuser" value="#[defaultUser]#" size="16" maxlength="32"/></dd> + <dt><label for="adminpw1">New Administrator Password:</label></dt> + <dd><input type="password" name="adminpw1" id="adminpw1" value="" size="16" maxlength="1024"/></dd> + <dt><label for="adminpw2">Repeat Administrator Password:</label></dt> + <dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="1024"/></dd> + <dt></dt> + <dd><input type="submit" name="setAdmin" value="Change Administrator Credentials" class="btn btn-primary"/></dd> + <dt></dt> + <dd> + <p class="alert alert-info" role="note"> + If you need to reset the administrator password from the console, run bin/passwd.sh from the YaCy installation directory. + </p> + </dd> + </dl> </form> </fieldset> <fieldset><legend>Access Rules</legend> <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8"> - <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> - <dl class="userConfig"> - <dt>Protection of all pages: if set to on, access to all pages need authorization; if off, only pages with "_p" extension are protected.</dt> - <dd><input type="checkbox" name="adminAccountAllPages" data-size="small"#(adminAccountAllPages.checked)#:: checked="checked"#(/adminAccountAllPages.checked)#></dd> - <script>$("[name='adminAccountAllPages']").bootstrapSwitch(); - $("[name='adminAccountAllPages']").bootstrapSwitch('onText', 'ON'); - $("[name='adminAccountAllPages']").bootstrapSwitch('offText', 'OFF');</script> - <dt></dt> - <dd><input type="submit" name="setAccess" value="Set Access Rules" class="btn btn-primary"/></dd> - </dl> + <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> + <input type="hidden" id="accessRuleAction" value="1"/> + <dl class="userConfig"> + <dt><label for="adminAccountForLocalhost">Allow administrative access from localhost without authentication</label></dt> + <dd><input type="checkbox" name="adminAccountForLocalhost" id="adminAccountForLocalhost" data-size="small"#(adminAccountForLocalhost.checked)#:: checked="checked"#(/adminAccountForLocalhost.checked)# /></dd> + <dt></dt> + <dd>When enabled, eligible requests from the same computer receive administrator rights without sending credentials.</dd> + <dt><label for="adminAccountAllPages">Require administrator authorization for all applicable pages</label></dt> + <dd><input type="checkbox" name="adminAccountAllPages" id="adminAccountAllPages" data-size="small"#(adminAccountAllPages.checked)#:: checked="checked"#(/adminAccountAllPages.checked)# /></dd> + <dt></dt> + <dd>When disabled, administration pages whose names contain "_p" remain protected. When enabled, all applicable pages require administrator authorization.</dd> + </dl> + <script type="text/javascript"> + var accessRuleSwitches = $("[name='adminAccountForLocalhost'], [name='adminAccountAllPages']"); + accessRuleSwitches.bootstrapSwitch(); + accessRuleSwitches.bootstrapSwitch('onText', 'ON'); + accessRuleSwitches.bootstrapSwitch('offText', 'OFF'); + accessRuleSwitches.on('switchChange.bootstrapSwitch', function() { + document.getElementById('accessRuleAction').name = this.name === 'adminAccountForLocalhost' ? 'setLocalhostAccess' : 'setAccess'; + this.form.submit(); + }); + </script> </form> </fieldset> - <fieldset><legend>User Accounts</legend> - <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8"> - <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> - <fieldset><legend>Select user</legend> - <dl> - <dt><label for="user">Select user</label>:</dt> - <dd> - <select name="user" id="user"> - <option value="newuser">New user</option>#{users}# - <option>#[user]#</option>#{/users}# - </select> or goto user <a href="ConfigAccountList_p.html">account list</a> - </dd> - <dt> </dt> - <dd> - <input type="submit" name="change_user" value="Edit User" class="btn btn-primary"/> - <input type="submit" name="delete_user" value="Delete User" class="btn btn-danger"/> - </dd> - </dl> - </fieldset> - </form> - - <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8"> - <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> - <fieldset><legend>Edit current user: #[username]#</legend> - <!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> --> - <input type="hidden" name="current_user" value="#[current_user]#" /> - <dl> - <dt><label for="username">Username</label>:</dt> - <dd><input type="text" id="username" name="username" value="#[username]#" /></dd> - <dt><label for="password">Password</label>:</dt> - <dd><input type="password" id="password" name="password" /></dd> - <dt><label for="password2">Repeat password</label>:</dt> - <dd><input type="password" id="password2" name="password2" /></dd> - <dt><label for="firstname">First name</label>:</dt> - <dd><input type="text" id="firstname" name="firstname" value="#[firstname]#" /></dd> - <dt><label for="lastname">Last name</label>:</dt> - <dd><input type="text" id="lastname" name="lastname" value="#[lastname]#" /></dd> - <dt><label for="address">Address</label>:</dt> - <dd><input type="text" id="address" name="address" value="#[address]#" /></dd> - <dt>Rights:</dt> - <dd>#{rights}# - <input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br /> - #{/rights}#</dd> - <dt><label for="tlimit">Timelimit</label>:</dt> - <dd><input type="text" id="tlimit" name="timelimit" value="#[timelimit]#" /></dd> - <dt><label for="tused">Time used</label>:</dt> - <dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd> - <dt> </dt> - <dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/></dd> - </dl> - </fieldset> - </form> - </fieldset> - #%env/templates/footer.template%# </body> </html> diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html index d0cca65c6..cee5fa2ec 100644 --- a/htroot/ConfigLanguage_p.html +++ b/htroot/ConfigLanguage_p.html @@ -57,8 +57,7 @@ <p>Make sure that you only download data from trustworthy sources. The new language file
might overwrite existing data if a file of the same name exists already.</p>
</fieldset>
- <p><a href="Translator_p.html">Simple Editor</a> to add untranslated text</p>
- </form>
+ </form> #(status)#
::<p><strong>Unable to get URL: #[url]#</strong></p>
::<p><strong>Error saving the language file.</strong></p>
diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index c08bb85f0..416a9edca 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -58,7 +58,7 @@ <dt><label for="comment">Comment</label></dt>
<dd>
<textarea name="comment" id="comment" cols="40" rows="10">#[comment]#</textarea>
- <p class="help">You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.</p>
+ <p class="help">You can use <a href="WikiCodeHelp.html" onclick="window.open('WikiCodeHelp.html','WikiCodeHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">WikiCode formatting</a> here.</p> </dd>
</dl>
<dl>
diff --git a/htroot/ConfigRobotsTxt_p.html b/htroot/ConfigRobotsTxt_p.html index 74b5e7775..06dd0d03c 100644 --- a/htroot/ConfigRobotsTxt_p.html +++ b/htroot/ConfigRobotsTxt_p.html @@ -31,10 +31,6 @@ <dd><input type="checkbox" id="surftips" name="surftips"#(surftips.checked)#:: checked="checked"#(/surftips.checked)# /></dd> <dt><label for="news">News pages</label></dt> <dd><input type="checkbox" id="news" name="news"#(news.checked)#:: checked="checked"#(/news.checked)# /></dd> - <dt><label for="blog">Blog</label></dt> - <dd><input type="checkbox" id="blog" name="blog"#(blog.checked)#:: checked="checked"#(/blog.checked)# /></dd> - <dt><label for="wiki">Wiki</label></dt> - <dd><input type="checkbox" id="wiki" name="wiki"#(wiki.checked)#:: checked="checked"#(/wiki.checked)# /></dd> <dt><label for="bookmarks">Public bookmarks</label></dt> <dd><input type="checkbox" id="bookmarks" name="bookmarks"#(bookmarks.checked)#:: checked="checked"#(/bookmarks.checked)# /></dd> <dt><label for="homepage">Home Page</label></dt> diff --git a/htroot/ConfigUser_p.html b/htroot/ConfigUser_p.html deleted file mode 100644 index e284f984f..000000000 --- a/htroot/ConfigUser_p.html +++ /dev/null @@ -1,67 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>YaCy '#[clientname]#': User Editor</title> - #%env/templates/metas.template%# - </head> -<body> - #%env/templates/header.template%# - #%env/templates/submenuUseCaseAccount.template%# - <h2>User Account Editor</h2> - - <!-- Page 1: Results --> - #(text)# - :: - <p>User created: #[username]#</p> - :: - <p>User changed: #[username]#</p> - #(/text)# - #(error)# - :: - <p class="error">Generic error.</p> - :: - <p class="error">Passwords do not match.</p> - :: - <p class="error">Username too short. Username must be >= 4 Characters.</p> - :: - <p class="error">Username already used (not allowed).</p> - #(/error)# - - <form action="ConfigUser_p.html" method="post" accept-charset="UTF-8"> - <fieldset><legend>Edit current user: #[username]#</legend> - <!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> --> - <input type="hidden" name="current_user" value="#[current_user]#" /> - <dl> - <dt><label for="username">Username</label>:</dt> - <dd><input type="text" id="username" name="username" value="#[username]#" /></dd> - <dt><label for="password">Password</label>:</dt> - <dd><input type="password" id="password" name="password" /></dd> - <dt><label for="password2">Repeat password</label>:</dt> - <dd><input type="password" id="password2" name="password2" /></dd> - <dt><label for="firstname">First name</label>:</dt> - <dd><input type="text" id="firstname" name="firstname" value="#[firstname]#" /></dd> - <dt><label for="lastname">Last name</label>:</dt> - <dd><input type="text" id="lastname" name="lastname" value="#[lastname]#" /></dd> - <dt><label for="address">Address</label>:</dt> - <dd><input type="text" id="address" name="address" value="#[address]#" /></dd> - <dt>Rights:</dt> - <dd> - #{rights}# - <input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br /> - #{/rights}# - </dd> - <dt><label for="tlimit">Timelimit</label>:</dt> - <dd><input type="text" id="tlimit" name="timelimit" value="#[timelimit]#" /></dd> - <dt><label for="tused">Time used</label>:</dt> - <dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd> - <dt> </dt> - <dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/> - <input type="submit" name="delete" value="Delete User" class="btn btn-danger"/> - <button name="cancel" class="btn btn-default btn-link" value="ConfigAccountList_p.html">back to user list</button></dd> - </dl> - </fieldset> - </form> - -#%env/templates/footer.template%# -</body> -</html> diff --git a/htroot/MessageSend_p.html b/htroot/MessageSend_p.html index 7334f7ab8..6a8496ff5 100644 --- a/htroot/MessageSend_p.html +++ b/htroot/MessageSend_p.html @@ -38,7 +38,7 @@ <dd>
<textarea name="message" id="message" cols="80" rows="8">#[message]#</textarea>
<p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
+ You can use <a href="WikiCodeHelp.html" onclick="window.open('WikiCodeHelp.html','WikiCodeHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">WikiCode formatting</a> here. </p>
</dd>
<dt></dt>
@@ -108,7 +108,7 @@ <dd>
<textarea name="message" id="message" cols="80" rows="8">#[message]#</textarea>
<p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
+ You can use <a href="WikiCodeHelp.html" onclick="window.open('WikiCodeHelp.html','WikiCodeHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">WikiCode formatting</a> here. </p>
</dd>
<dt></dt>
diff --git a/htroot/Network.html b/htroot/Network.html index 1523129cb..f6dff525b 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -157,11 +157,7 @@ document.getElementById("apilink").setAttribute("href", "Network.xml?" + window. <td><nobr>
<a href="MessageSend_p.html?hash=#[hash]#" title="Send message to peer #[fullname]#">m</a>
<a href="ViewProfile.html?hash=#[hash]#&display=1" title="View profile of peer #[fullname]#">p</a>
- <a href="goto_p.html?hash=#[hash]#&path=/Wiki.html" title="Read and edit wiki on peer #[fullname]#">w</a>
- <a href="goto_p.html?hash=#[hash]#&path=/Blog.html" title="Browse blog of peer #[fullname]#">b</a>
#(updatedProfile)#::<a href="ViewProfile.html?hash=#[hash]#&display=1"><img src="env/grafics/profile.gif" width="54" height="11" alt="Profile updated" /></a>#(/updatedProfile)#
- #(updatedWiki)#::<a href="http://#[address]#/Wiki.html?page=#[page]#" title="#[page]#"><img src="env/grafics/wiki.gif" width="54" height="11" alt="Wiki updated" /></a>#(/updatedWiki)#
- #(updatedBlog)#::<a href="http://#[address]#/Blog.html?page=#[page]#" title="#[subject]#"><img src="env/grafics/blog.gif" width="54" height="11" alt="Blog updated" /></a>#(/updatedBlog)#
#(isCrawling)#::<a href="#[page]#"><img src="env/grafics/crawl.gif" width="54" height="11" alt="Crawl" /></a>#(/isCrawling)#
</nobr></td>
</tr>
diff --git a/htroot/News.html b/htroot/News.html index d1373e0cf..3f81e278f 100644 --- a/htroot/News.html +++ b/htroot/News.html @@ -43,10 +43,6 @@ A change in the personal profile will create a news entry. You can see recently made changes of
profile entries on the Network page, where that profile change is visualized with a '*' beside the 'P' (profile) - selector.
</li>
- <li>
- Publishing of added or modified translation for the user interface. Other peers may include it in their local translation list.
- To publish a translation, use the integrated <a href="Translator_p.html">translation editor</a> to add a translation and publish it afterwards.
- </li>
</ul>
<p>
More news services will follow.
diff --git a/htroot/SearchAccessRate_p.html b/htroot/SearchAccessRate_p.html index d2dff52cc..5186a6505 100644 --- a/htroot/SearchAccessRate_p.html +++ b/htroot/SearchAccessRate_p.html @@ -9,8 +9,7 @@ #%env/templates/submenuAccessTracker.template%#
<h2>Local Search access rate limitations</h2>
<p>
- You can configure here limitations on access rate to this peer search interface by unauthenticated users and users without extended search right
- (see the <a href="ConfigAccounts_p.html">Accounts</a> configuration page for details on users' rights).
+ You can configure here limitations on access rate to this peer search interface by unauthenticated users. </p>
<form action="SearchAccessRate_p.html" method="post"
@@ -22,7 +21,7 @@ <p>
Access rate limitations to this peer search interface.
- When a user with limited rights (unauthenticated or without extended search right) exceeds a limit, the search is blocked.
+ When an unauthenticated user exceeds a limit, the search is blocked. </p>
<div class="form-group">
@@ -59,7 +58,7 @@ <p>
Access rate limitations to the peer-to-peer search mode.
- When a user with limited rights (unauthenticated or without extended search right) exceeds a limit, the search scope falls back to only this local peer index.
+ When an unauthenticated user exceeds a limit, the search scope falls back to only this local peer index. </p>
<div class="form-group">
@@ -100,7 +99,7 @@ <p>
Access rate limitations to the peer-to-peer search mode with browser-side JavaScript results resorting enabled
(check the 'Remote results resorting' section in the <a href="ConfigPortal_p.html">Search Portal</a> configuration page).
- When a user with limited rights (unauthenticated or without extended search right) exceeds a limit, results resorting becomes only applicable on demand, server-side.
+ When an unauthenticated user exceeds a limit, results resorting becomes only applicable on demand, server-side. </p>
<div class="form-group">
@@ -140,7 +139,7 @@ <p>
Limitations on snippet loading from remote websites.
- When a user with limited rights (unauthenticated or without extended search right) exceeds a limit, the snippets fetch strategy falls back to 'CACHEONLY'
+ When an unauthenticated user exceeds a limit, the snippets fetch strategy falls back to 'CACHEONLY'. (check the default Snippet Fetch Strategy on the <a href="ConfigPortal_p.html">Search Portal</a> configuration page).
</p>
@@ -195,4 +194,4 @@ #%env/templates/footer.template%#
</body>
-</html>
\ No newline at end of file +</html> diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc index 90a630a5a..1b41cd5f9 100644 --- a/htroot/Settings_ProxyAccess.inc +++ b/htroot/Settings_ProxyAccess.inc @@ -61,18 +61,15 @@ <p>
<strong>Server Access Restrictions</strong><br />
<br />
- You can restrict the access to this proxy/server using a two-stage security barrier:
+ You can restrict access to this proxy/server with an IP-number filter: </p>
<ul>
<li>define an <em>access domain</em> with a list of granted client IP-numbers or with wildcards</li>
- <li>define an <em>user account</em> with an user:password - pair</li>
</ul>
<p>
- This is the account that restricts access to the proxy function.
- You probably don't want to share the proxy to the internet, so you should set the
- IP-Number Access Domain to a pattern that corresponds to you local intranet.
- The default setting should be right in most cases. If you want, you can also set a proxy account
- so that every proxy user must authenticate first, but this is rather unusual.
+ You probably don't want to share the proxy to the internet, so you should set the + IP-Number Access Domain to a pattern that corresponds to you local intranet. + The default setting should be right in most cases. </p>
<table border="0" cellspacing="5">
<tr valign="top">
@@ -82,14 +79,7 @@ </td>
</tr>
<tr valign="top">
- <td><label for="accounts">Accounts</label>:</td>
- <td>
- <input name="use_proxyaccounts" id="accounts" type="checkbox" size="16" maxlength="16" value="on"#(use_proxyAccounts)#:: checked="checked"#(/use_proxyAccounts)# />
- Use <a href="ConfigAccounts_p.html">Proxy Accounts</a>
- </td>
- </tr>
- <tr valign="top">
- <td colspan="2"><input class="btn btn-primary btn-sm" type="submit" name="proxyaccount" value="Submit" /></td>
+ <td colspan="2"><input class="btn btn-primary btn-sm" type="submit" name="proxyaccess" value="Submit" /></td> </tr>
</table>
</fieldset>
diff --git a/htroot/TransNews_p.html b/htroot/TransNews_p.html deleted file mode 100644 index 33531238d..000000000 --- a/htroot/TransNews_p.html +++ /dev/null @@ -1,63 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>YaCy '#[clientname]#': Translation News</title> - #%env/templates/metas.template%# - </head> - <body> - #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# - <h2 class="yacy">Translation News for Language #[currentlang]#</h2> - - <form method="post" enctype="multipart/form-data"> - <p> - You can share your local addition to translations and distribute it to other peers. - The remote peer can vote on your translation and add it to its own local translation.<br> - (#[transsize]# entries available) <input type="submit" class="btn btn-default" name="publishtranslation" value="Publish"> - <small>You can check your outgoing messages <a href="News.html?page=3">here</a>.</small> - To edit or add local translations you can use <a href="Translator_p.html">Translator_p.html</a>. - </p> - </form> - #(errmsg)#::<p class="error">Please activate a different language <a href='ConfigBasic.html'>here</a></p>#(/errmsg)# - #{results}# - <!-- link begin --> - - <fieldset> - <table> - <tr> - <th>File:</th><th><a href="#[url]#" target="transnewsfile">#[filename]#</a></th><th>Originator</th> - </tr> - <tr> - <td>English:</td><td>#[source]#</td><td></td> - </tr> - #(existing)#:: - <tr> - <td>existing</td><td class="warning">#[target]#</td><td></td> - </tr> - #(/existing)# - <tr> - <td>Translation:</td><td>#[target]#</td><td>#[peername]#</td> - </tr> - - <tr><td><small>score #[score]#</small></td> - <td> - <a href="TransNews_p.html?voteNegative=#[refid]#" title="negative vote"> - <span class="warning glyphicon glyphicon-thumbs-down"></span></a> - - <a href="TransNews_p.html?votePositive=#[refid]#&filename=#[filename]#&source=#[source]#&target=#[target]#" title="positive vote" > - <span class="success glyphicon glyphicon-thumbs-up"></span></a> - <small>Vote on this translation. If you vote positive the translation is added to your local translation list.</small> - </td><td></td> - </tr> - </table> - </fieldset> - - <!-- link end --> - #{/results}# - <p> - <br> - </p> - - #%env/templates/footer.template%# - </body> -</html> diff --git a/htroot/Translator_p.html b/htroot/Translator_p.html deleted file mode 100644 index b8551ba97..000000000 --- a/htroot/Translator_p.html +++ /dev/null @@ -1,53 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <title>YaCy '#[clientname]#': Translation Editor</title> - #%env/templates/metas.template%# - - </head> - <body id="Translator"> - - #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# - <h2>Translation Editor</h2> - - <p>Translate untranslated text of the user interface (current language). The modified translation file is stored in DATA/LOCALE directory.</p> - <form id="Translation" method="post" action="Translator_p.html" enctype="multipart/form-data" accept-charset="UTF-8"> - <input type="hidden" name="transactionToken" value="#[transactionToken]#"/> - <fieldset> - <legend> - <label>UI Translation</label> - </legend> - <p>Target Language: <b>#[targetlang]#</b></p> #(errmsg)#::<p class="error">activate a different language <a href='ConfigBasic.html'>here</a></p>#(/errmsg)# - <label for="sourcefile">Source File</label> - <select name="sourcefile" onchange="submit();"> - #{filelist}# - <option value="#[filename]#" #(selected)#::selected="selected"#(/selected)#>#[filename]#</option> - #{/filelist}# - </select> <a href="#[sourcefile]#" target="sourcefilewindow" >view it</a> - <label for="filteruntranslated">filter untranslated</label> - <input type="checkbox" name="filteruntranslated" id="filteruntranslated" value="true" onclick="submit();" #(filter.checked)#::checked="checked"#(/filter.checked)# /> - <table> - <tr><th style="border-bottom: solid gray; border-bottom-width: 1px;">Source Text</th> - <th style="border-bottom: solid gray; border-bottom-width: 1px;">Translated Text ( #[targetlang]# )</th></tr> - #{textlist}# - <tr> - <td style="border-bottom: solid gray; border-bottom-width: 1px;" valign="top"> - <!--<input type="text" name="sourcetxt" id="sourcetxt#[tokenid]#" size="80" disabled="true" value="#[sourcetxt]#"/>--> - <label for="targettxt#[tokenid]#" >#[sourcetxt]#</label> - </td> - <td style="border-bottom: solid gray; border-bottom-width: 1px;" valign="top" nowrap> - <input type="text" name="targettxt#[tokenid]#" id="targettxt#[tokenid]#" size="80" value="#[targettxt]#" title="#[targettxt]#" #(filteruntranslated)#disabled::#(/filteruntranslated)#/>#(filteruntranslated)#<button name="editapproved" type="submit" value="#[tokenid]#" class="btn btn-sm"><span class="glyphicon glyphicon-pencil"/></button>::<button name="approve" type="submit" value="#[tokenid]#" class="btn btn-sm"><span class="glyphicon glyphicon-ok-sign" style="color: green"/></button>#(/filteruntranslated)# - </td> - </tr> - #{/textlist}# - </table> - - <input type="submit" name="savetranslationlist" value="Save translation" class="btn btn-primary"/> - - </fieldset> - </form> - <p>Check for remote translation proposals and/or share your own added translations <a href="TransNews_p.html">Translation News</a></p> - #%env/templates/footer.template%# - </body> -</html> diff --git a/htroot/User.html b/htroot/User.html deleted file mode 100644 index d2a5f689e..000000000 --- a/htroot/User.html +++ /dev/null @@ -1,73 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>YaCy '#[clientname]#': User Page</title>
- #%env/templates/metas.template%#
- </head>
-<body>
- #%env/templates/header.template%#
- <h2>User Page</h2>
- #(logged-in)#
- <p>
- You are not logged in.<br />
- <form action="User.html" method="post" accept-charset="UTF-8">
- <input type="hidden" name="returnto" value="#[returnto]#" />
- Username: <input type="text" name="username" value="#[username]#" /><br />
- Password: <input type="password" name="password" /><br />
- <input type="submit" class="btn btn-primary" value="login" />
- </form>
- </p>
- ::
- <p>
- You are currently logged in as #[username]#.<br />
- (Identified by #(identified-by)#IP::Username/Password::Cookie#(/identified-by)#)<br />
- <form action="User.html" accept-charset="UTF-8">
- <input type="submit" name="logout" class="btn btn-danger" value="logout">
- </form>
- #(limit)#::
- #{percent}#<img src="env/grafics/red-block.png" alt="red bar" />#{/percent}##{percent2}#<img src="env/grafics/green-block.png" alt="green bar" />#{/percent2}#
- <br />
- You have used <strong>#[timeused]#</strong> minutes of your onlinetime limit of <strong>#[timelimit]#</strong> minutes per day.<br />
- #(/limit)#
- </p>
- <form action="User.html" method="post" accept-charset="UTF-8">
- <table border="1">
- <tr>
- <td><label for="oldpass">old Password</label></td>
- <td><input type="password" name="oldpass" id="oldpass" /></td>
- </tr>
- <tr>
- <td><label for="newpass">new Password</label></td>
- <td><input type="password" name="newpass" id="newpass" /></td>
- </tr>
- <tr>
- <td><label for="newpass2">new Password(repetition)</label></td>
- <td><input type="password" name="newpass2" id="newpass2" /></td>
- </tr>
- <tr>
- <td colspan="2"><input type="submit" name="changepass" class="btn btn-primary" value="Change" /></td>
- </tr>
- </table>
- </form>
- ::
- You are currently logged in as admin.<br />
- <form action="User.html" accept-charset="UTF-8">
- <input type="submit" name="logout" class="btn btn-danger" value="logout">
- </form>
- <br />
- <p>(after logout you will be prompted for your password again. simply click "cancel")</p>
- #(/logged-in)#
- <b>
- #(status)#
- ::
- #(password)#
- Password was changed.::
- Old Password is wrong.::
- New Password and its repetition do not match.::
- New Password is empty.
- #(/password)#
- #(/status)#
- </b>
- #%env/templates/footer.template%#
- </body>
-</html>
diff --git a/htroot/Wiki.html b/htroot/Wiki.html deleted file mode 100644 index 36d22099b..000000000 --- a/htroot/Wiki.html +++ /dev/null @@ -1,207 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>YaCy '#[clientname]#': Wiki</title>
- #%env/templates/metas.template%#
- </head>
- <body id="Wiki">
- #(topmenu)#
- #%env/templates/embeddedheader.template%#
- ::
- #%env/templates/simpleheader.template%#
- #(/topmenu)#
-
- #(mode)#
- <!-- 0: viewing -->
- <div class="Post">
- <h2 class="PostSubject">YaCyWiki page: #[pagename]#</h2>
- <div class="PostBody">
- #[page]#
- </div>
- <p class="PostInfo">
- last edited by #[author]# | change date #[date]# | <a href="Wiki.html?page=#[pagename]#&edit=Edit">Edit</a> #(access)#(only granted to admin)::#(/access)#
- </p>
- </div>
- <p class="Navigation">
- <a href="Wiki.html">Start Page</a> -
- <a href="Wiki.html?index=Index">Index</a> -
- <a href="Wiki.html?page=#[pagename]#&diff=">Versions</a> -
- </p>
- <form method="post" action="Wiki.html"><div>
- <label for="access">Grant Write Access to</label>
- #(access)#<input type="submit" id="access" name="access" value="all" />::<input type="submit" id="access" name="access" value="admin" />#(/access)#
- </div></form>
- ::
- <!-- 1: edit -->
- <h2>Edit</h2>
- <form action="Wiki.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="80" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="24">#[page-code]#</textarea>
- </dd>
- </dl>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
- </p>
- <input type="hidden" name="page" value="#[pagename]#" />
- <input type="hidden" name="reason" value="edit" />
- <input type="submit" name="submit" value="Submit" />
- <input type="submit" name="preview" value="Preview" />
- <input type="submit" name="view" value="Discard" />
- </fieldset>
- </form>
- ::
- <!-- 2: preview -->
- <h2>Preview</h2>
- <p>No changes have been submitted so far!</p>
- <div class="Post">
- <h2 class="PostSubject">YaCyWiki page: #[pagename]#</h2>
- <div class="PostBody">
- #[page]#
- </div>
- <p class="PostInfo">
- last edited by #[author]# | change date #[date]#
- </p>
- </div>
- <form action="Wiki.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <input type="submit" name="submit" value="Submit" />
- <input type="submit" name="view" value="Discard" />
- </fieldset>
-
- <h2>Edit</h2>
-
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="80" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="24">#[page-code]#</textarea>
- </dd>
- </dl>
- <p class="help">
- You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
- </p>
- <input type="hidden" name="page" value="#[pagename]#" />
- <input type="hidden" name="reason" value="edit" />
- <input type="submit" name="submit" value="Submit" />
- <input type="submit" name="preview" value="Preview" />
- <input type="submit" name="view" value="Discard" />
- </fieldset>
- </form>
- ::
- <!-- 3: Index -->
- <h2>Index</h2>
- <table border="0" cellpadding="5" cellspacing="0">
- <tr class="TableHeader">
- <td>Subject</td>
- <td>Change Date</td>
- <td>Last Author</td>
- </tr>
- #{pages}#
- <tr class="TableCellLight">
- <td><a href="Wiki.html?page=#[name]#">#[subject]#</a></td>
- <td>#[date]#</td>
- <td>#[author]#</td>
- </tr>
- #{/pages}#
- </table>
- #(error)#::<p class="error">IO Error reading wiki database: #[message]#</p>#(/error)#
- <p class="Navigation">
- <a href="Wiki.html">Start Page</a>
- </p>
- ::
- <!-- 4: Diff -->
- <h2>Versions</h2>
- #(error)#<!-- no error -->
- <form method="get" action="Wiki.html">
- <fieldset><legend>Select versions of page '#[page]#'</legend>
- <input type="hidden" name="page" value="#[page]#" />
- <input type="hidden" name="diff" value="" />
- <dl>
- <dt><label for="old">Compare version from</label>:</dt>
- <dd>
- <select id="old" name="old">#{versions}#
- <option value="#[date]#"#(oldselected)#:: selected="selected"#(/oldselected)#>#[fdate]#</option>#{/versions}#
- </select>
- <input type="submit" name="viewold" value="Show" />
- </dd>
- <dt><label for="new">with version from</label>:</dt>
- <dd>
- <select id="new" name="new">
- <optgroup label="current"><option value="#[curdate]#"#(curselected)#:: selected="selected"#(/curselected)#>#[curfdate]#</option></optgroup>#{versions}#
- <option value="#[date]#"#(newselected)#:: selected="selected"#(/newselected)#>#[fdate]#</option>#{/versions}#
- </select>
- </dd>
- <dt><input type="submit" name="compare" value="Compare" /></dt>
- </dl>
- </fieldset>
- </form>
- ::<!-- IO error -->
- <h2>Error</h2>
- <p class="error">IO Error reading wiki database: #[message]#</p>
- ::<!-- no entries available for #[name]# -->
- #(/error)#
- #(versioning)#
- ::<!-- 1: View diff -->
- #[diff]#
- ::<!-- 2: View selected version -->
- <h2>Preview</h2>
- <p>No changes have been submitted so far!</p>
- <div class="Post">
- <h2 class="PostSubject">YaCyWiki page: #[pagename]#</h2>
- <div class="PostBody">
- #[page]#
- </div>
- <p class="PostInfo">
- last edited by #[author]# | change date #[date]#
- </p>
- </div>
- <form action="Wiki.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
- <fieldset>
- <input type="submit" name="submit" value="Submit" />
- <input type="submit" name="view" value="Discard" />
- </fieldset>
- <h2>Edit</h2>
- <fieldset>
- <dl>
- <dt><label for="author">Author:</label></dt>
- <dd>
- <input name="author" id="author" type="text" size="80" maxlength="80" value="#[author]#" />
- </dd>
- <dt><label for="content">Text:</label></dt>
- <dd>
- <textarea name="content" id="content" cols="80" rows="24">#[page-code]#</textarea>
- </dd>
- </dl>
- <p class="help">
- You can use
- <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
- </p>
- <input type="hidden" name="page" value="#[pagename]#" />
- <input type="hidden" name="reason" value="edit" />
- <input type="submit" name="submit" value="Submit" />
- <input type="submit" name="preview" value="Preview" />
- <input type="submit" name="view" value="Discard" />
- </fieldset>
- </form>
- #(/versioning)#
- <p class="Navigation">
- <a href="Wiki.html">Start Page</a> -
- <a href="Wiki.html?page=#[page]#">Return to #[page]#</a>
- </p>
- #(/mode)#
-
- <p>Changes will be published as announcement on YaCyNews</p>
- #%env/templates/footer.template%#
- </body>
-</html>
\ No newline at end of file diff --git a/htroot/WikiHelp.html b/htroot/WikiCodeHelp.html index 809024487..900491d44 100644 --- a/htroot/WikiHelp.html +++ b/htroot/WikiCodeHelp.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> - <title>YaCy '#[clientname]#': Wiki Help</title> + <title>YaCy '#[clientname]#': WikiCode Help</title> #%env/templates/metas.template%# </head> <body> @@ -9,9 +9,8 @@ <h2>Wiki-Code</h2> <table width="100%" border="1" cellspacing="0" cellpadding="4"> <caption> - This table contains a short description of the tags that can be used in the Wiki and several other servlets - of YaCy. For a more detailed description visit the - <a href="https://wiki.yacy.net/index.php/Hauptseite" target="_blank">YaCy Wiki</a>. + This table describes the WikiCode formatting supported in YaCy messages, + profiles, and MediaWiki dump imports. </caption> <tr valign="top"> <th> @@ -117,7 +116,8 @@ <span class="tt" style="white-space: nowrap;">[[pagename|description]]</span> </td> <td> - This tag creates links to other pages of the wiki. + Internal-link markup retains its visible label but no longer creates a link, + because the local Wiki application has been retired. </td> </tr> @@ -190,4 +190,4 @@ </table> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/htroot/env/base.css b/htroot/env/base.css index b618d9ab2..77c1a1814 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -939,24 +939,11 @@ body#QuickCrawlLink p, body#QuickCrawlLink h4 { padding:0 5%; } -body#Wiki form fieldset p.help{ - clear:both; -} /* Crawler_p.html */ body#watchCrawler table.watchCrawler {float:left; margin: 0px 5px 5px 0px;} body#watchCrawler p.watchCrawler {clear:both;} body#watchCrawler p#crawlingQueues{clear:both; margin: 20px 0px 0px 0px;} -/* BlogComments.html */ -div.BlogCommentPost { -margin: 0px 30px 0px 30px; -background-color:#eeeeee; -} - -div.BlogCommentPrevNext { -text-align: center; -} - /* other ------------------------------------*/ ul#menu { padding:0; diff --git a/htroot/env/grafics/blog.gif b/htroot/env/grafics/blog.gif Binary files differdeleted file mode 100644 index 618347ec9..000000000 --- a/htroot/env/grafics/blog.gif +++ /dev/null diff --git a/htroot/env/grafics/wiki.gif b/htroot/env/grafics/wiki.gif Binary files differdeleted file mode 100644 index dd1f1add4..000000000 --- a/htroot/env/grafics/wiki.gif +++ /dev/null diff --git a/htroot/env/templates/submenuComputation.template b/htroot/env/templates/submenuComputation.template index 99d1a75de..c0c6b7bd5 100644 --- a/htroot/env/templates/submenuComputation.template +++ b/htroot/env/templates/submenuComputation.template @@ -33,7 +33,6 @@ <h3>Community Data</h3> <ul class="SubMenu"> <li><a href="Surftips.html" class="MenuItemLink">Surftips</a></li> - <li><a href="Wiki.html?display=1" class="MenuItemLink">Local Peer Wiki</a></li> <li><a href="Bookmarks.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks</a></li> </ul> </div> diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template index ad5451fc5..c02079f24 100644 --- a/htroot/env/templates/submenuConfig.template +++ b/htroot/env/templates/submenuConfig.template @@ -5,6 +5,5 @@ <li><a href="PerformanceQueues_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Performance Settings of Busy Queues</a></li> <li><a href="Tables_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Viewer and administration for database tables</a></li> <li><a href="ConfigProperties_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Properties</a></li> - <li><a href="TransNews_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">UI Translations</a></li> </ul> -</div>
\ No newline at end of file +</div> diff --git a/htroot/env/templates/submenuPublication.template b/htroot/env/templates/submenuPublication.template deleted file mode 100644 index 41a7d5661..000000000 --- a/htroot/env/templates/submenuPublication.template +++ /dev/null @@ -1,7 +0,0 @@ -<div class="SubMenu"> - <h3>Publication</h3> - <ul class="SubMenu"> - <li><a href="Wiki.html?display=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Wiki</a></li> - <li><a href="Blog.html?display=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Blog</a></li> - </ul> -</div> diff --git a/htroot/mediawiki_p.html b/htroot/mediawiki_p.html index 9b323922b..4b642eac6 100644 --- a/htroot/mediawiki_p.html +++ b/htroot/mediawiki_p.html @@ -3,7 +3,7 @@ <head> <title>#[title]#</title> </head> - <body id="Wiki"> + <body id="MediaWiki"> #[page]# </body> -</html>
\ No newline at end of file +</html> diff --git a/htroot/proxymsg/authfail.inc b/htroot/proxymsg/authfail.inc deleted file mode 100644 index cdf8dca0c..000000000 --- a/htroot/proxymsg/authfail.inc +++ /dev/null @@ -1,12 +0,0 @@ - <form action="/User.html" method="POST"> - <fieldset><legend><span class="error">Your Username/Password is wrong.</span></legend> - <dl> - <dt><label for="username">Username</label>:</dt> - <dd><input type="text" id="username" name="username" /></dd> - <dt><label for="password">Password</label>:</dt> - <dd><input type="password" id="password" name="password" /></dd> - <dt><input type="submit" value="login" /></dt> - </dl> - <input type="hidden" name="returnto" value="#[returnto]#" /> - </fieldset> - </form> diff --git a/htroot/robots.txt b/htroot/robots.txt index 709996e48..f75cbc0a7 100644 --- a/htroot/robots.txt +++ b/htroot/robots.txt @@ -23,16 +23,6 @@ Disallow: /#[page]# # bookmarks Disallow: /Bookmarks.html#(/bookmarks)# -#(wiki)#:: -# wiki -Disallow: /Wiki.html#(/wiki)# - -#(blog)#:: -# blog -Disallow: /Blog.html -Disallow: /Blog.rss -Disallow: /Blog.xml#(/blog)# - #(news)#:: # news Disallow: /News.html#(/news)# @@ -68,4 +58,4 @@ Disallow: /ViewProfile.xml#(/profile)# :: # all Disallow: / -#(/all)#
\ No newline at end of file +#(/all)# |
