diff --git a/apps/i2psnark/i2psnark.config b/apps/i2psnark/i2psnark.config index 861e70f5c..14e68a887 100644 --- a/apps/i2psnark/i2psnark.config +++ b/apps/i2psnark/i2psnark.config @@ -1,7 +1,7 @@ # NOTE: This I2P config file must use UTF-8 encoding # # If you have a 'split' directory installation, with configuration -# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), +# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), # or /Users/(user)/Library/Application Support/i2p (Mac), be sure to # edit the file in the configuration directory, NOT the install directory. # When running as a Linux daemon, the configuration directory is /var/lib/i2p diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java index ee35f426f..3cbdf839a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java @@ -184,7 +184,6 @@ public class ConfigUIHelper extends HelperBase { current = "en"; } StringBuilder buf = new StringBuilder(512); - //buf.append("
\n"); buf.append(" \n"); - //buf.append("
\n"); return buf.toString(); } diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index 74fe13a78..b5ee27978 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -87,13 +87,17 @@ %>

<%=intl._t("Hidden Services of Interest")%>

-
+
+
 
+

<%=intl._t("Applications and Configuration")%>

-
+
+
 
+
diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp index c4ee02435..e00d3d587 100644 --- a/apps/routerconsole/jsp/welcome.jsp +++ b/apps/routerconsole/jsp/welcome.jsp @@ -92,7 +92,6 @@ <% } %> -
diff --git a/installer/java/src/net/i2p/installer/FixWinPaths.java b/installer/java/src/net/i2p/installer/FixWinPaths.java index 605c872c6..59637c554 100644 --- a/installer/java/src/net/i2p/installer/FixWinPaths.java +++ b/installer/java/src/net/i2p/installer/FixWinPaths.java @@ -14,7 +14,7 @@ import java.io.PrintStream; /** *

This class is used by the installer in Windows to process the wrapper.config file. It *

*

diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt index 0ffe68c52..9a09b2d92 100644 --- a/installer/resources/blocklist.txt +++ b/installer/resources/blocklist.txt @@ -1,6 +1,6 @@ # # If you have a 'split' directory installation, with configuration -# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), +# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), # or /Users/(user)/Library/Application Support/i2p (Mac), be sure to # edit the file in the configuration directory, NOT the install directory. # When running as a Linux daemon, the configuration directory is /var/lib/i2p diff --git a/installer/resources/clients.config b/installer/resources/clients.config index e60d7f0e0..99b5fee7f 100644 --- a/installer/resources/clients.config +++ b/installer/resources/clients.config @@ -1,7 +1,7 @@ # NOTE: This I2P config file must use UTF-8 encoding # # If you have a 'split' directory installation, with configuration -# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), +# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), # or /Users/(user)/Library/Application Support/i2p (Mac), be sure to # edit the file in the configuration directory, NOT the install directory. # When running as a Linux daemon, the configuration directory is /var/lib/i2p diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html index 3fe2878a0..0014728ce 100644 --- a/installer/resources/eepsite/docroot/help/index.html +++ b/installer/resources/eepsite/docroot/help/index.html @@ -48,7 +48,7 @@ Package install, running as a service: /var/lib/i2p/i2p-config/eepsite/docroot/

  • Windows
    - %APPDATA%\I2P\eepsite\docroot\ + %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_ar.html b/installer/resources/eepsite/docroot/help/index_ar.html index fefd27886..1a7e569bc 100644 --- a/installer/resources/eepsite/docroot/help/index_ar.html +++ b/installer/resources/eepsite/docroot/help/index_ar.html @@ -36,7 +36,7 @@ تثبيت عادي: ~/.i2p/eepsite/docroot/
    تثبيت الحزمة، وتشغيلها كخدمة: /var/lib/i2p/i2p-config/eepsite/docroot/
  • - ويندوز
    %APPDATA%\I2P\eepsite\docroot\
    • + ويندوز
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • ماك
    /Users/(user)/Library/Application Support/i2p
    • diff --git a/installer/resources/eepsite/docroot/help/index_az.html b/installer/resources/eepsite/docroot/help/index_az.html index d987c1036..2e5037663 100644 --- a/installer/resources/eepsite/docroot/help/index_az.html +++ b/installer/resources/eepsite/docroot/help/index_az.html @@ -35,7 +35,7 @@ Standart quraşdırma:~/.i2p/eepsite/docroot/
    Xidmət kimi çalışan Paket quraşdırma: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_de.html b/installer/resources/eepsite/docroot/help/index_de.html index a5a338dc5..e029060ed 100644 --- a/installer/resources/eepsite/docroot/help/index_de.html +++ b/installer/resources/eepsite/docroot/help/index_de.html @@ -37,7 +37,7 @@ Um Ihre eigenen Daten anzubieten, ändern Sie einfach die Dateien im Wurzelverze Paket Installation, laufend als Service: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_es.html b/installer/resources/eepsite/docroot/help/index_es.html index cb4f152c2..3f95be664 100644 --- a/installer/resources/eepsite/docroot/help/index_es.html +++ b/installer/resources/eepsite/docroot/help/index_es.html @@ -24,7 +24,7 @@

    Servidor web anónimo I2P

    Guía rápida para crear el servidor web en I2P

    Esta es tu eepsite, tu propio servidor web anónimo en I2P - simplemente edita los archivos dentro de ~/.i2p/eepsite/docroot/ (en Linux), - %APPDATA%\I2P\eepsite\docroot\ (en Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (en Windows), o /Users/(user)/Library/Application Support/i2p (en Mac), y podrá ser vistas por otras personas una vez que hayas seguido lo pasos de más abajo. En I2P las eepsites se indican con una 'key o 'clave', la cual se representa como una larga cadena de texto en Base64. @@ -68,7 +68,7 @@ verla inmediatamente.

    • Antes de anunciar tu nueva eepsite al mundo, deberías añadir contenido. Ves a ~/.i2p/eepsite/docroot/ (en Linux), - %APPDATA%\I2P\eepsite\docroot\ (en Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (en Windows), o /Users/(user)/Library/Application Support/i2p (en Mac), y reemplaza la página de redirección index.html con tu contenido. Las carpetas virtuales funcionan, por lo que puedes hospedar archivos desde un subdirectorio sin la necesidad de proveer explícitamente una página con enlaces a los archivos. diff --git a/installer/resources/eepsite/docroot/help/index_fr.html b/installer/resources/eepsite/docroot/help/index_fr.html index c208257fa..27ba6bc80 100644 --- a/installer/resources/eepsite/docroot/help/index_fr.html +++ b/installer/resources/eepsite/docroot/help/index_fr.html @@ -37,7 +37,7 @@ Pour servir votre propre contenu, modifiez simplement les fichiers situés dans Installation par un paquet, exécuté comme service : /var/lib/i2p/i2p-config/eepsite/docroot/

  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • macOS
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_hu.html b/installer/resources/eepsite/docroot/help/index_hu.html index 66437d769..ee14f687c 100644 --- a/installer/resources/eepsite/docroot/help/index_hu.html +++ b/installer/resources/eepsite/docroot/help/index_hu.html @@ -37,7 +37,7 @@ Csomag telepítése, szolgáltatásként futtatva: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(felhasználó)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_in.html b/installer/resources/eepsite/docroot/help/index_in.html index ebf698bab..2d1b9eeb1 100644 --- a/installer/resources/eepsite/docroot/help/index_in.html +++ b/installer/resources/eepsite/docroot/help/index_in.html @@ -34,7 +34,7 @@ Linux
    Standard install: ~/.i2p/eepsite/docroot/
    Package install, dijalankan sebagai service: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_it.html b/installer/resources/eepsite/docroot/help/index_it.html index 4acc92fe9..4bdb53b96 100644 --- a/installer/resources/eepsite/docroot/help/index_it.html +++ b/installer/resources/eepsite/docroot/help/index_it.html @@ -37,7 +37,7 @@ Package install, running as a service: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_nl.html b/installer/resources/eepsite/docroot/help/index_nl.html index d8e3fc0f0..9cca678b8 100644 --- a/installer/resources/eepsite/docroot/help/index_nl.html +++ b/installer/resources/eepsite/docroot/help/index_nl.html @@ -25,7 +25,7 @@

    Korte Handleiding voor Anoniem Webhosten op I2P

    Dit is je eepsite, je eigen anonieme I2P webserver - pas de bestanden onder ~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), of /Users/(user)/Library/Application Support/i2p (Mac), simpelweg aan en ze zijn bereikbaar door anderen zodra je onderstaande instructies hebt opgevolgd. In I2P worden eepsites aangeduid met een 'destination', dit is een erg lange Base64 string. @@ -69,7 +69,7 @@

  • In je browser, voel je eepsite naam in (mijnsite.i2p) en je komt hier hopelijk weer terug.

    • Voordat je de rest van de wereld over je nieuwe eepsite vertelt, zorg eerst voor wat content. Ga naar ~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), of /Users/(user)/Library/Application Support/i2p (Mac), en vervang de index.html verwijs pagina met je eigen content. Virtual folders werken, dus kan je bestanden vanuit een subdirectory hosten zonder dat je een pagina met links naar deze files moet maken. Mocht je een template nodig hebben voor een basis site, weer vrij om deze pagina en deze content te gebruiken en aan te passen!

    Registreer je eigen .I2P Domein

    Nu is het tijd om je eepsite toe te voegen aan een I2P adresboek gehost door een site diff --git a/installer/resources/eepsite/docroot/help/index_pl.html b/installer/resources/eepsite/docroot/help/index_pl.html index f8daeddcf..e9928c0ca 100644 --- a/installer/resources/eepsite/docroot/help/index_pl.html +++ b/installer/resources/eepsite/docroot/help/index_pl.html @@ -36,7 +36,7 @@ Instalacja z paczek, działa jako usługa: /var/lib/i2p/i2p-config/eepsite/docroot/

  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(użytkownik)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_pt.html b/installer/resources/eepsite/docroot/help/index_pt.html index 8c6fbd6da..beb99b4b2 100644 --- a/installer/resources/eepsite/docroot/help/index_pt.html +++ b/installer/resources/eepsite/docroot/help/index_pt.html @@ -37,7 +37,7 @@ Pacote de instalação, em execução como um serviço: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_ro.html b/installer/resources/eepsite/docroot/help/index_ro.html index b3c1fd0cf..0c175f614 100644 --- a/installer/resources/eepsite/docroot/help/index_ro.html +++ b/installer/resources/eepsite/docroot/help/index_ro.html @@ -37,7 +37,7 @@ Pentru a vă servi propriul conținut, pur și simplu editați fișierele din di Instalarea pachetului, care rulează ca serviciu: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_ru.html b/installer/resources/eepsite/docroot/help/index_ru.html index 2ba52c729..07cf1e121 100644 --- a/installer/resources/eepsite/docroot/help/index_ru.html +++ b/installer/resources/eepsite/docroot/help/index_ru.html @@ -37,7 +37,7 @@ Для установленного пакета, запущенного в виде сервиса: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_sv.html b/installer/resources/eepsite/docroot/help/index_sv.html index b62462927..89e5c0b37 100644 --- a/installer/resources/eepsite/docroot/help/index_sv.html +++ b/installer/resources/eepsite/docroot/help/index_sv.html @@ -26,7 +26,7 @@

    Det här är din eepsite, din egen anonyma I2P-webbserver - redigera bara filerna under ~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), eller /Users/(user)/Library/Application Support/i2p (Mac), så kommer andra kunna nå dem efter att du följt instruktionerna nedan. I I2P så adresseras eepsajter med en 'nyckel', som representeras som en väldigt lång Base64-sträng. @@ -70,7 +70,7 @@ Förhoppningsvis fungerade det.

  • Innan du berättar för världen om den nya eepsajt borde du lägga till lite innehåll. Gå till ~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), eller /Users/(user)/Library/Application Support/i2p (Mac), och ersätt omdirigeringssidan index.html med ditt eget innehåll. Virtuella mappar fungerar, så du kan serva filer från en underkatalog utan att behöva ge en sida med länkar till filer. Om du behöver en mall för en enkel sajt så diff --git a/installer/resources/eepsite/docroot/help/index_tr.html b/installer/resources/eepsite/docroot/help/index_tr.html index 82602feda..eeba4e609 100644 --- a/installer/resources/eepsite/docroot/help/index_tr.html +++ b/installer/resources/eepsite/docroot/help/index_tr.html @@ -37,7 +37,7 @@ Paket kurulumu, hizmet olarak çalıştırmak: /var/lib/i2p/i2p-config/eepsite/docroot/
  • -Windows
    %APPDATA%\I2P\eepsite\docroot\ +Windows
    %LOCALAPPDATA%\I2P\eepsite\docroot\
  • Mac
    /Users/(user)/Library/Application Support/i2p diff --git a/installer/resources/eepsite/docroot/help/index_zh.html b/installer/resources/eepsite/docroot/help/index_zh.html index 3fc62185f..a18c3fd1b 100644 --- a/installer/resources/eepsite/docroot/help/index_zh.html +++ b/installer/resources/eepsite/docroot/help/index_zh.html @@ -26,7 +26,7 @@

    I2P匿名网页服务快速指南

    这是您的eepsite，您自己的匿名I2P网络服务器 - 只要编辑 ~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), 或 /Users/(user)/Library/Application Support/i2p (Mac), 下的文件,并且按照以下说明操作后,别人就可以访问了. 在I2P,eepsites是用一个很长的Base64字串"密钥"来寻址访问的. (这"密钥"有点类似于IP地址,且会显示在eepsite的I2PTunnel上 @@ -61,7 +61,7 @@

  • 在您的浏览器内，输入您的 eepsite名称 (something.i2p)您应该会立刻返回这里. 希望它能生效.
  • 在您向全世界宣告您的新eepsite前，您应该增加一些内容. 到~/.i2p/eepsite/docroot/ (Linux), - %APPDATA%\I2P\eepsite\docroot\ (Windows), + %LOCALAPPDATA%\I2P\eepsite\docroot\ (Windows), 或 /Users/(user)/Library/Application Support/i2p (Mac), 并用自己的内容替换掉index.html重定向页面.虚拟文件夹会起作用，这样您就可以从一个子目录中提供文件服务而不用明确需要提供链接到文件的一个页面.如果您需要一个基本的网站模板, 请自由借来并适用 本页 和 内容 !

    • 注册自己的.I2P域名

    diff --git a/installer/resources/eepsite/docroot/index.html b/installer/resources/eepsite/docroot/index.html index 6fe7e4e86..46395ee66 100644 --- a/installer/resources/eepsite/docroot/index.html +++ b/installer/resources/eepsite/docroot/index.html @@ -2,7 +2,7 @@ - + @@ -66,8 +66,8 @@ diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml index d8d49157f..91c23bb75 100644 --- a/installer/resources/eepsite/jetty.xml +++ b/installer/resources/eepsite/jetty.xml @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ - + @@ -103,7 +103,7 @@ SocketConnector below. Do not use for gij or JamVM - comment this out, and uncomment the SocketConnector below. - --> + --> @@ -152,7 +152,7 @@ --> - + diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config index 24b29954b..7a5c025d9 100644 --- a/installer/resources/i2ptunnel.config +++ b/installer/resources/i2ptunnel.config @@ -1,7 +1,7 @@ # NOTE: This I2P config file must use UTF-8 encoding # # If you have a 'split' directory installation, with configuration -# files in ~/.i2p (Linux), %APPDATA%\I2P (Windows), +# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows), # or /Users/(user)/Library/Application Support/i2p (Mac), be sure to # edit the file in the configuration directory, NOT the install directory. # When running as a Linux daemon, the configuration directory is /var/lib/i2p diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java index 63f7358ae..c719022dd 100644 --- a/router/java/src/net/i2p/router/startup/WorkingDir.java +++ b/router/java/src/net/i2p/router/startup/WorkingDir.java @@ -19,7 +19,7 @@ import net.i2p.util.SystemVersion; * Get a working directory for i2p. * * For the location, first try the system property i2p.dir.config - * Next try $HOME/.i2p on linux or %APPDATA%\I2P on Windows. + * Next try $HOME/.i2p on linux or %LOCALAPPDATA%\I2P on Windows. * * If the dir exists, return it. * Otherwise, attempt to create it, and copy files from the base directory. @@ -80,14 +80,14 @@ public class WorkingDir { } else { String home = System.getProperty("user.home"); if (isWindows) { - String appdata = System.getenv("APPDATA"); + String appdata = System.getenv("LOCALAPPDATA"); if (appdata != null) home = appdata; dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS); } else if (SystemVersion.isMac()) { String appdata = "/Library/Application Support/"; File old = new File(home,WORKING_DIR_DEFAULT); - if (old.exists() && old.isDirectory()) + if (old.exists() && old.isDirectory()) dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT); else { home = home+appdata; @@ -418,7 +418,7 @@ public class WorkingDir { /** * Recursive copy a file or dir to a dir - * + * * @param src file or directory, need not exist * @param targetDir the directory to copy to, will be created if it doesn't exist * @return true for success OR if src does not exist @@ -456,7 +456,7 @@ public class WorkingDir { } return rv; } - + /** * @param src not a directory, must exist * @param dst not a directory, will be overwritten if existing, will be mode 600 @@ -487,7 +487,7 @@ public class WorkingDir { /** * Recursive touch all files in a dir to a given time - * + * * @param target the directory or file to touch, must exist * @param time the timestamp * @since 0.8.13 @@ -508,5 +508,5 @@ public class WorkingDir { touchRecursive(children[i], time); } } - + }