removed concept of empty passwords as "no passwords used",

because we now start YaCy with a default password (yacy).
This has impact of all function that check the current state of
password-protection that included the empty password situation,
including the warnings to set a password in case that none is set (which
cannot be the case any more).

2 files changed, 33 insertions, 35 deletions

diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html
index f248c5491..c16e5db50 100644
--- a/htroot/ConfigAccounts_p.html
+++ b/htroot/ConfigAccounts_p.html
@@ -8,7 +8,7 @@
     #%env/templates/header.template%#
     #%env/templates/submenuUseCaseAccount.template%#
     <h2>User Administration</h2>
-    
+
     <!-- Page 1: Results -->
     #(text)#
     ::
@@ -26,23 +26,28 @@
     ::
     <p class="error">Username already used (not allowed).</p>
     #(/error)#
-    #(passwordNotSetWarning)#::<div class="error">No password is set for the administration account. Please define a password for the admin account.</div>#(/passwordNotSetWarning)#
+    #(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>
       <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8">
-      	  <input type="hidden" name="transactionToken" value="#[transactionToken]#"/>
+            <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>
+                <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)# />
@@ -62,22 +67,22 @@
           </fieldset>
       </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]#"/>
+              <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>
+              <dt></dt>
               <dd><input type="submit" name="setAccess" value="Set Access Rules" class="btn btn-primary"/></dd>
             </dl>
       </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]#"/>
@@ -98,7 +103,7 @@
         </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>
@@ -118,11 +123,9 @@
           <dt><label for="address">Address</label>:</dt>
           <dd><input type="text" id="address" name="address" value="#[address]#" /></dd>
           <dt>Rights:</dt>
-          <dd>
-          	#{rights}#
+          <dd>#{rights}#
             <input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br />
-            #{/rights}#
-          </dd>
+          #{/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>
diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc
index 6c6275622..715b0815c 100644
--- a/htroot/Status_p.inc
+++ b/htroot/Status_p.inc
@@ -14,22 +14,17 @@
     <div>Processors: #[processors]#</div>

     <div>Load: #[load]#</div>

     <div>Threads: #[processesCurrentInclDaemon]#/#[processesCurrentOnlyDaemon]#, peak:#[processesPeak]#, total:#[processesTotal]#</div>

-    

+

     </dd>

     <dt>Protection</dt>

     <dd>#(protection)#

-      <strong>Password is missing.</strong>

+      <strong>Default password is not changed</strong>

+      <a href="ConfigAccounts_p.html">[Configure]</a>

       ::

       password-protected

       #(/protection)#

-

-      #(unrestrictedLocalAccess)#

-      ::

-      <br />Unrestricted access from localhost.

-      #(/unrestrictedLocalAccess)#

-      <a href="ConfigAccounts_p.html">[Configure]</a>

     </dd>

-    

+

     <dt>Address</dt>

     <dd>Host: #[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: <a href="ConfigBasic.html">enabled</a> (port <a href="Settings_p.html?page=ProxyAccess">#[sslPort]#</a>)#(/sslSupport)#<br />

     #(peerAddress)#

@@ -38,12 +33,12 @@
       Public Address: http://#[address]#<br/>

       YaCy Address: http://#[peername]#.yacy

       #(/peerAddress)#</dd>

-    

+

     #(portForwarding)#::

     <dt>Port Forwarding Host</dt>

     <dd>#[host]#:#[port]# (#(status)#broken::connected#(/status)#)</dd>

     #(/portForwarding)#

-    

+

     <dt>Proxy</dt>

     <dd>Transparent <a href="Settings_p.html?page=ProxyAccess">#(info_isTransparentProxy)#on::off#(/info_isTransparentProxy)#</a>&nbsp;&nbsp;

         URL <a href="Settings_p.html?page=UrlProxyAccess">#(info_proxyURL)#on::off#(/info_proxyURL)#</a></dd>

@@ -56,7 +51,7 @@
     Enabled <a href="Status.html?popup=false">[Disable]</a>

     #(/popup)#

     </dd>

-    

+

     <dt>Tray-Icon</dt>

     <dd>

     #(tray)#

@@ -67,7 +62,7 @@
     <a href="ConfigProperties_p.html" onclick="alert('Set\ntray.icon.force = true\n\nWARNING:\nYou do this on your own risk. If you do this without YaCy running on a desktop-pc, this will possibly break startup. In this case, you will have to edit the configuration manually in DATA/SETTINGS/yacy.conf');">Experimental</a>

     #(/tray)#

     </dd>

-      

+

     <dt><a href="PerformanceMemory_p.html">Memory Usage</a></dt>

     <dd><table border="0" cellspacing="0">

     <tr><td>RAM used:</td><td align="right">#[usedMemory]#</td></tr>

@@ -75,13 +70,13 @@
     <tr><td>DISK used:</td><td align="right">(approx.) #[usedDisk]#</td></tr>

     <tr><td>DISK free:</td><td align="right">#[freeDisk]#</td></tr>

     </table></dd>

-    

+

     <dt>Traffic [<a href="Status.html?ResetTraffic=">Reset</a>]</dt>

     <dd>Proxy: #[trafficProxy]#<br/>Crawler: #[trafficCrawler]#</dd>

-    

+

     <dt><a href="Connections_p.html">Incoming Connections</a></dt>

     <dd>Active: #[connectionsActive]# | Max: <a href="PerformanceQueues_p.html#ThreadPoolSettings">#[connectionsMax]#</a></dd>

-    

+

     <dt><a href="Crawler_p.html">Queues</a></dt>

     <dd>

     <a href="IndexCreateLoaderQueue_p.html">Loader Queue</a>:

@@ -110,7 +105,7 @@
       </tr>  

       </table>

     </dd>

-    

+

     <dt>Seed server</dt>

     <dd>

     #(seedServer)#

@@ -124,7 +119,7 @@
       Last upload: #[lastUpload]# ago.

     #(/seedServer)#

     </dd>

-    

+

   </dl>

 </fieldset>

 </div>
\ No newline at end of file