diff --git a/build.xml b/build.xml index ab750e0f1..ff0349874 100644 --- a/build.xml +++ b/build.xml @@ -594,7 +594,6 @@ - diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 8af76049d..575595925 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -363,19 +363,7 @@ public class SettingsAck_p { prop.put("info_filter", filter); return prop; } - - if (post.containsKey("dispop")) { - env.setConfig("browserPopUpTrigger", "false"); - prop.put("info", 9);//popup disabled - return prop; - } - - if (post.containsKey("enpop")) { - env.setConfig("browserPopUpTrigger", "true"); - prop.put("info", 10);//popup enabled - return prop; - } - + if (post.containsKey("pmode")) { env.setConfig("onlineMode", "2"); prop.put("info", 11);//permanent online mode diff --git a/htroot/Settings_Http.inc b/htroot/Settings_Http.inc index 52723dc11..2ffc1b617 100644 --- a/htroot/Settings_Http.inc +++ b/htroot/Settings_Http.inc @@ -25,7 +25,7 @@ Specifies if the proxy should send the X-Forwarded-For http header. -  Changes will take effect immediately. +  Changes will take effect immediately. diff --git a/htroot/Settings_MessageForwarding.inc b/htroot/Settings_MessageForwarding.inc index e20fe8131..db777496a 100644 --- a/htroot/Settings_MessageForwarding.inc +++ b/htroot/Settings_MessageForwarding.inc @@ -19,7 +19,7 @@ The recipient email-address.
e.g.: root@localhost -  Changes will take effect immediately. +  Changes will take effect immediately. diff --git a/htroot/Settings_Parser.inc b/htroot/Settings_Parser.inc index 7309b63de..9c82a8b7a 100644 --- a/htroot/Settings_Parser.inc +++ b/htroot/Settings_Parser.inc @@ -37,7 +37,7 @@ For a detailed description of the various MIME-types take a look at   -  Changes take effect immediately +  Changes take effect immediately diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc index e5795f5ca..548600c36 100644 --- a/htroot/Settings_Proxy.inc +++ b/htroot/Settings_Proxy.inc @@ -58,7 +58,7 @@ -   Changes will take effect immediately. +   Changes will take effect immediately. diff --git a/htroot/Settings_Seed.inc b/htroot/Settings_Seed.inc index 92517c161..ee0be2978 100644 --- a/htroot/Settings_Seed.inc +++ b/htroot/Settings_Seed.inc @@ -27,7 +27,7 @@ but only if there have been changes to the seed-list. http://www.<my-host>.net/yacy/seed.txt' - + diff --git a/htroot/Settings_Seed_UploadFile.inc b/htroot/Settings_Seed_UploadFile.inc index 9c963dea7..403a149d9 100644 --- a/htroot/Settings_Seed_UploadFile.inc +++ b/htroot/Settings_Seed_UploadFile.inc @@ -9,7 +9,7 @@ Here you can specify the path within the filesystem where the seed-list file should be stored. - + diff --git a/htroot/Settings_Seed_UploadFtp.inc b/htroot/Settings_Seed_UploadFtp.inc index 5de47805e..bbac0fb99 100644 --- a/htroot/Settings_Seed_UploadFtp.inc +++ b/htroot/Settings_Seed_UploadFtp.inc @@ -29,7 +29,7 @@ but only if there had been changes to the seed-list. The password - + diff --git a/htroot/Settings_Seed_UploadScp.inc b/htroot/Settings_Seed_UploadScp.inc index 92960b748..217530f28 100644 --- a/htroot/Settings_Seed_UploadScp.inc +++ b/htroot/Settings_Seed_UploadScp.inc @@ -30,7 +30,7 @@ The password - + diff --git a/htroot/Settings_ServerAccess.inc b/htroot/Settings_ServerAccess.inc index ed4800724..e9c8b2a02 100644 --- a/htroot/Settings_ServerAccess.inc +++ b/htroot/Settings_ServerAccess.inc @@ -44,7 +44,7 @@ you will not be able to access the server pages anymore. - + diff --git a/htroot/Settings_SystemBehaviour.inc b/htroot/Settings_SystemBehaviour.inc deleted file mode 100644 index 207a4ace0..000000000 --- a/htroot/Settings_SystemBehaviour.inc +++ /dev/null @@ -1,8 +0,0 @@ -

-
System Behaviour Settings - - - -
Auto pop-up of status page on start-up: /
-
-

diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html index 63508b765..b5bd27655 100644 --- a/htroot/Settings_p.html +++ b/htroot/Settings_p.html @@ -35,7 +35,6 @@
  • HTTP Networking
  • Remote Proxy (optional)
  • Port Forwarding (optional)
    • -
  • System Behaviour Settings
  • Seed Upload Settings
  • Message Forwarding (optional)
    • diff --git a/htroot/Status.java b/htroot/Status.java index f39ba2375..3c68e1232 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -96,8 +96,26 @@ public class Status { ((plasmaSwitchboard)env).continueCrawlJob(plasmaSwitchboard.CRAWLJOB_GLOBAL_CRAWL_TRIGGER); } else if (post.containsKey("ResetTraffic")) { httpdByteCountInputStream.resetCount(); - httpdByteCountOutputStream.resetCount(); + httpdByteCountOutputStream.resetCount(); + //enables or disables the browser popup on Yacy-start + } else if (post.containsKey("popup")) { + String trigger_enabled = (String) post.get("popup"); + if (trigger_enabled.equals("false")) { + env.setConfig("browserPopUpTrigger", "false"); + } else if (trigger_enabled.equals("true")){ + env.setConfig("browserPopUpTrigger", "true"); } + } + + /* + } else if (post.containsKey("popup")) { + env.setConfig("browserPopUpTrigger", "false"); + prop.put("info", 9); //popup disabled + } else if (post.containsKey("enpop")) { + env.setConfig("browserPopUpTrigger", "true"); + prop.put("info", 10); //popup enabled + } */ + prop.put("LOCATION",""); } return prop; diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index 6c4ad2184..134d8cd0c 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -11,7 +11,7 @@ Protection #(protection)# - Your settings are _not_ protected! Please go to the settings page immediately and set an administration password. + Your settings are _not_ protected! Please go to the settings page immediately and set an administration password. :: Your settings are protected by a password. #(/protection)# @@ -35,14 +35,22 @@ Auto-popup on start-up - #(popup)# - Disabled. To enable this again please use the Settings page. + + Disabled + + + [Enable] + :: - Enabled. To disable this please use the Settings page. + + Enabled + + + [Disable] + #(/popup)# - Memory Usage @@ -121,7 +129,10 @@ Seed server #(seedServer)# - Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server. You can configure your account details on the Settings page. + Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server. + + + [Configure]. :: Enabled: Updating periodically to server #[seedServer]#. Last upload: #[lastUpload]# ago. @@ -129,5 +140,5 @@ Enabled: Updating periodically to file #[seedFile]#. Last upload: #[lastUpload]# ago. #(/seedServer)# - + diff --git a/locales/de.lng b/locales/de.lng index 466e12573..a521aaeaf 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -1508,7 +1508,7 @@ Connects \(==Verbindungen ( "disconnected peers"=="nichtverbundene Peers" peers/hour==Peers/Stunde This peer's status==Status dieses Peers -Virgin - You have not published your peer seed yet. This happens automatically, just wait. While you have this status you are not allowed to search other peers.==Virgin - Ihr Peer ist dem Netzwerk noch nicht bekannt. Warten Sie noch ein wenig, dies geschieht automatisch. Während Sie diesen Status haben, ist es Ihnen nicht erlaubt andere Peers zu durchsuchen. +Virgin - You have not published your peer seed yet. This happens automatically, just wait. While you have this status you are not allowed to search other peers.==Virgin - Ihr Peer ist dem Netzwerk noch nicht bekannt. Warten Sie noch ein wenig, dies geschieht automatisch. Während Sie diesen Status haben, ist es Ihnen nicht erlaubt andere Peers zu durchsuchen. Junior - You cannot be reached from outside. A possible reason is that you are behind a firewall, NAT or Router. But you can search the internet using the other peers' global index on your own search page. We encourage you to open your firewall for the port you configured \(usually: 8080\), or to set up a 'virtual server' in your router settings \(often called DMZ\). Please be fair, contribute your own index to the global index.==Junior - Ihr Peer kann nicht von außen erreicht werden. Ein möglicher Grund ist, dass Sie sich hinter einer Firewall, NAT oder einem Router befinden. Trotzdem können Sie das Internet durchsuchen, indem Sie den globalen Index der anderen Peers von Ihrer Suchseite aus benutzen. Wir möchten Sie ermutigen den Port, den Sie für YaCy eingestellt haben (Vorgabe: 8080) in Ihrer Firewall zu öffnen, oder einen "virtuellen Server" in Ihrem Router aufzusetzten (oft auch DMZ genannt). Bitte seien Sie fair und tragen Sie Ihren Teil zum globalen Index bei! Senior - You are running a server and you support the global internet index, which you can also search yourself. Thank you!==Senior - Sie lassen YaCy bei sich laufen und unterstützen den globalen Index, den Sie auch selbst durchsuchen können. Danke! Principal - You are senior and you publish your seed-list to a public accessible server where it can be retrieved using the URL==Principal - Sie haben den Senior-Status und laden zusätzlich Ihre Seed-Liste auf einen öffentlich zugänglichen Server hoch, von wo aus sie unter folgender Adresse erreichbar ist: @@ -1523,13 +1523,18 @@ To switch online-mode, press one of the following buttons:==Um den Online Modus "event-based Mode"=="aktivitätsbasierten Modus" "Permanent Mode"=="Permanenter Modus" You are in event-based online mode.==Sie sind im aktivitätsbasierten Onlinemodus. -The YaCy p2p network will boot when you start using YaCy as a web proxy or you switch to permanent mode.==Das YaCy-P2P-Netzwerk wird aktiviert, wenn Sie YaCy zum ersten Mal als Web Proxy benutzen oder Sie in den permanenten Modus wechseln. +The YaCy p2p network will boot when you start using YaCy as a web proxy or you switch to permanent mode.==Das YaCy-P2P-Netzwerk wird aktiviert, wenn Sie YaCy zum ersten Mal als Web Proxy benutzen oder Sie in den permanenten Modus wechseln. "Go on-line"=="Online gehen" "Go to Cache-Mode"=="In Cache-Modus gehen" You are in permanent mode.==Sie sind im permanenten Modus. Last Refresh:==Letzte Aktualisierung: Click here to==Klicken Sie log in as administrator and see full status.==hier, um sich als Administrator einzuloggen und den vollständigen Status zu sehen. +Disable==Abschalten +Disabled==Abgeschaltet +Enable==Anschalten +Enabled==Angeschaltet + #-----------------------------