[GNUnet-SVN] r5122 - GNUnet-docs/WWW

[gnunet]

Author: grothoff
Date: 2007-06-22 02:43:43 -0600 (Fri, 22 Jun 2007)
New Revision: 5122

Modified:
   GNUnet-docs/WWW/index.php
   GNUnet-docs/WWW/old_news.php3
Log:
fix

Modified: GNUnet-docs/WWW/index.php
===================================================================
--- GNUnet-docs/WWW/index.php   2007-06-22 08:43:17 UTC (rev 5121)
+++ GNUnet-docs/WWW/index.php   2007-06-22 08:43:43 UTC (rev 5122)
@@ -1,145 +1,129 @@
-<?php
-include("scripts.php3");
-$title = "GNUnet";
-$description="GNUnet - an anonymous distributed backup system :-)";
-include("html_header.php3");
-
-H2("About GNUnet");
-
-BP();
-W("GNUnet is a framework for secure peer-to-peer networking that does not use 
any centralized or otherwise trusted services.");
-W("A first service implemented on top of the networking layer allows anonymous 
censorship-resistant file-sharing.");
-W("GNUnet uses a simple, excess-based economic model to allocate resources.");
-W("Peers in GNUnet monitor each others behavior with respect to resource 
usage; peers that contribute to the network are rewarded with better service.");
-P();
-
-W("GNUnet is part of the %s.",
-  extlink_("http://www.gnu.org/","GNU project"));
-W("Our official GNU website can be found at %s.",
-  
extlink_("http://www.gnu.org/software/gnunet/","http://www.gnu.org/software/gnunet/";));
-W("GNUnet can be downloaded from this site or the %s.",
-  extlink_("http://www.gnu.org/prep/ftp.html","GNU mirrors"));
-P();
-
-W("%s is a graphical user interface for the GNUnet framework.",
-  intlink_("gnunetgtk.php3", "gnunet-gtk"));
-W("It is a separate %s; some %s are available.", 
-  ARRAY(intlink_("download.php3", "download"),
-        intlink_("screenshots.php3","screenshots")));
-
-EP();
-H2("Why GNUnet?");
-BP();
-W("The first question that developers of any of the dozens of emerging P2P 
networks (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) should probably answer is 
<em>why yet another network?</em>",
-  ARRAY(extlink_("http://freenetproject.org/";, "1"),
-        extlink_("http://tor.eff.org/";, "2"),
-        extlink_("http://mnet.sourceforge.net/";, "3"),
-        extlink_("http://www.i2p.net/";, "4"),
-        extlink_("http://gift.sf.net/";, "5"),
-        extlink_("http://entropy.stop1984.com/";, "6"),
-        extlink_("http://thecircle.org.au/";, "7"),
-        extlink_("http://www.invisiblenet.net/iip/";, "8"),
-        extlink_("http://mute-net.sourceforge.net/";, "9"),
-        extlink_("http://rshare.de/";, "10"),
-        extlink_("http://larytet.sourceforge.net/btRat.shtml";, "11")));
-W("GNUnet was started in late 2001 with a set of new technical ideas for 
secure peer-to-peer networking.");
-W("Most of the key technical contributions behind GNUnet are described in 
detail in our %s.",
-  intlink_("papers.php3", "research papers"));
-W("The ideas include an improved content encoding (ECRS, the encoding for 
censorship resistant sharing) and a new protocol for anonymous routing (gap).");
-W("Properties of the content encoding and the routing protocol allow GNUnet to 
reward contributing peers with better service using an excess-based economic 
model for resource allocation.");
-W("Furthermore, GNUnet is extensible and makes it easy to build new 
peer-to-peer applications or add alternative network transports to the base 
system.");
-W("When GNUnet was started, existing systems were investigated (at the time in 
particular %s and %s) to find a starting point.",
-  ARRAY(extlink_("http://freenetproject.org/";, "Freenet"),
-        extlink_("http://mnet.sourceforge.net/";, "mnet")));
-W("However, the conclusion was that the envisioned system was too far from the 
existing codebases to benefit from building on top of any of those.");
-P();
-W("GNUnet continues to improve both in terms of technical ideas and 
implementation, often thanks to discussions with developers from related 
projects.");
-W("Probably the most well-known such project is %s, a peer-to-peer network 
that acts as a proxy which anonymizes low-latency TCP traffic.",
-  extlink_("http://tor.eff.org/";, "TOR"));
-W("TOR is general in design and lacks features that would be specific to 
(anonymous) file-sharing, such as searching, swarming or caching.");
-P();
-W("In conclusion, we believe that GNUnet is (or at least will become) the best 
solution for (anonymous) file-sharing.");
-W("The key technical ideas continue to distinguish GNUnet from other projects 
with similar goals.");
-W("Some GNUnet developers also have the ambition to provide a good general 
infrastructure for developing new peer-to-peer protocols.");
-W("In the meantime, users that are looking for %s solutions or to %s should 
probably look elsewhere.",
-  ARRAY(extlink_("http://www.bittorrent.com/";, "faster, non-anonymous"),
-        extlink_("http://tor.eff.org/";, "anonymize their HTTP traffic")));
-
-EP();
-H2("News");
-BP();
-W("Older news can be found %s.\n",
-  intlink_("old_news.php3", "here"));
-EP();
-echo "<dl>\n";
-
-function convert_time($mysql_timestamp){
-if (ereg("^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})" .
-           "([0-9]{2})([0-9]{2})",$mysql_timestamp,$res)):
-  $year=$res[1];
-  $month=$res[2];
-  $day=$res[3];
-  $hour=$res[4];
-  $min=$res[5];
-  $sec=$res[6];
-
- return(array($year,$month,$day,$hour,$min,$sec));
-  else:
-     return(false);
- endif;
-}
-
-// definition: news is what is less than 3 months old :-)
-$query = "SELECT title,include,posted FROM news " .
-   "WHERE TO_DAYS(NOW())-TO_DAYS(posted) < 90 " .
-   "ORDER BY posted DESC";
-$result = mysql_query($query, $connection);
-$num = 0;
-if ($result) {
-  $num = mysql_numrows($result);
-}
-for ($i=0;$i<$num;$i++) {
-  $row = mysql_fetch_array($result);
-  $pd = $row["posted"];
-  echo "<dt>" . strtok($pd, " ") . ": " . W_($row["title"]) . "</dt>\n";
-  echo "<dd>\n";
-  include("news/" . $row["include"]);
-  echo "\n</dd>\n";
-}
-echo "</dl>\n";
-H2("Helping GNUnet");
-BP();
-W("Help is always welcome.");
-BR();
-W("Here are some ideas:");
-echo "<ul>";
-LI("join our IRC channel #gnunet and our %s and help newcomers",
-       extlink_("https://gnunet.org/drupal";, "community"));
-LI("write easy setup instructions");
-LI("build universal static binaries and upload them");
-LI("build binary packages for your OS/distribution and upload them");
-LI("Fix %s or contribute new code",
-       extlink_("https://gnunet.org/mantis/","bugs";));
-echo "</ul>";
-EP();
-H2("Roadmap");
-BP();
-W("Here is the current development plan:");
-echo "<ul>\n";
-LI("fix %s",
-   extlink_("https://gnunet.org/mantis/","bugs";));
-LI("add testbed harness to allow automated testing and profiling");
-LI("extend GTK UI (unindex, more statistics, configuration)");
-LI("complete and integrate DHT implementation");
-echo "</ul>\n";
-EP();
-H2("Contact");
-BP();
-W("GNUnet is developed by %s.",
-  extlink_("http://www.gnu.org/software/gnunet/","the GNUnet developers"));
-W("For questions about GNUnet send E-Mail to %s.",
-  extlink_("mailto:address@hidden","address@hidden";));
-EP();
-
-include("html_footer.php3");
-?>
+<?php
+include("scripts.php3");
+$title = "GNUnet";
+$description="GNUnet - an anonymous distributed backup system :-)";
+include("html_header.php3");
+
+H2("About GNUnet");
+
+BP();
+W("GNUnet is a framework for secure peer-to-peer networking that does not use 
any centralized or otherwise trusted services.");
+W("A first service implemented on top of the networking layer allows anonymous 
censorship-resistant file-sharing.");
+W("GNUnet uses a simple, excess-based economic model to allocate resources.");
+W("Peers in GNUnet monitor each others behavior with respect to resource 
usage; peers that contribute to the network are rewarded with better service.");
+P();
+
+W("GNUnet is part of the %s.",
+  extlink_("http://www.gnu.org/","GNU project"));
+W("Our official GNU website can be found at %s.",
+  
extlink_("http://www.gnu.org/software/gnunet/","http://www.gnu.org/software/gnunet/";));
+W("GNUnet can be downloaded from this site or the %s.",
+  extlink_("http://www.gnu.org/prep/ftp.html","GNU mirrors"));
+P();
+
+W("%s is a graphical user interface for the GNUnet framework.",
+  intlink_("gnunetgtk.php3", "gnunet-gtk"));
+W("It is a separate %s; some %s are available.", 
+  ARRAY(intlink_("download.php3", "download"),
+        intlink_("screenshots.php3","screenshots")));
+
+EP();
+H2("Why GNUnet?");
+BP();
+W("The first question that developers of any of the dozens of emerging P2P 
networks (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) should probably answer is 
<em>why yet another network?</em>",
+  ARRAY(extlink_("http://freenetproject.org/";, "1"),
+        extlink_("http://tor.eff.org/";, "2"),
+        extlink_("http://mnet.sourceforge.net/";, "3"),
+        extlink_("http://www.i2p.net/";, "4"),
+        extlink_("http://gift.sf.net/";, "5"),
+        extlink_("http://entropy.stop1984.com/";, "6"),
+        extlink_("http://thecircle.org.au/";, "7"),
+        extlink_("http://www.invisiblenet.net/iip/";, "8"),
+        extlink_("http://mute-net.sourceforge.net/";, "9"),
+        extlink_("http://rshare.de/";, "10"),
+        extlink_("http://larytet.sourceforge.net/btRat.shtml";, "11")));
+W("GNUnet was started in late 2001 with a set of new technical ideas for 
secure peer-to-peer networking.");
+W("Most of the key technical contributions behind GNUnet are described in 
detail in our %s.",
+  intlink_("papers.php3", "research papers"));
+W("The ideas include an improved content encoding (ECRS, the encoding for 
censorship resistant sharing) and a new protocol for anonymous routing (gap).");
+W("Properties of the content encoding and the routing protocol allow GNUnet to 
reward contributing peers with better service using an excess-based economic 
model for resource allocation.");
+W("Furthermore, GNUnet is extensible and makes it easy to build new 
peer-to-peer applications or add alternative network transports to the base 
system.");
+W("When GNUnet was started, existing systems were investigated (at the time in 
particular %s and %s) to find a starting point.",
+  ARRAY(extlink_("http://freenetproject.org/";, "Freenet"),
+        extlink_("http://mnet.sourceforge.net/";, "mnet")));
+W("However, the conclusion was that the envisioned system was too far from the 
existing codebases to benefit from building on top of any of those.");
+P();
+W("GNUnet continues to improve both in terms of technical ideas and 
implementation, often thanks to discussions with developers from related 
projects.");
+W("Probably the most well-known such project is %s, a peer-to-peer network 
that acts as a proxy which anonymizes low-latency TCP traffic.",
+  extlink_("http://tor.eff.org/";, "TOR"));
+W("TOR is general in design and lacks features that would be specific to 
(anonymous) file-sharing, such as searching, swarming or caching.");
+P();
+W("In conclusion, we believe that GNUnet is (or at least will become) the best 
solution for (anonymous) file-sharing.");
+W("The key technical ideas continue to distinguish GNUnet from other projects 
with similar goals.");
+W("Some GNUnet developers also have the ambition to provide a good general 
infrastructure for developing new peer-to-peer protocols.");
+W("In the meantime, users that are looking for %s solutions or to %s should 
probably look elsewhere.",
+  ARRAY(extlink_("http://www.bittorrent.com/";, "faster, non-anonymous"),
+        extlink_("http://tor.eff.org/";, "anonymize their HTTP traffic")));
+
+EP();
+H2("News");
+BP();
+W("Older news can be found %s.\n",
+  intlink_("old_news.php3", "here"));
+EP();
+echo "<dl>\n";
+
+// definition: news is what is less than 3 months old :-)
+$query = "SELECT title,include,posted FROM news " .
+   "WHERE TO_DAYS(NOW())-TO_DAYS(posted) < 90 " .
+   "ORDER BY posted DESC";
+$result = mysql_query($query, $connection);
+$num = 0;
+if ($result) {
+  $num = mysql_numrows($result);
+}
+for ($i=0;$i<$num;$i++) {
+  $row = mysql_fetch_array($result);
+  $pd = $row["posted"];
+  echo "<dt>" . strtok($pd, " ") . ": " . W_($row["title"]) . "</dt>\n";
+  echo "<dd>\n";
+  include("news/" . $row["include"]);
+  echo "\n</dd>\n";
+}
+echo "</dl>\n";
+H2("Helping GNUnet");
+BP();
+W("Help is always welcome.");
+BR();
+W("Here are some ideas:");
+echo "<ul>";
+LI("join our IRC channel #gnunet and our %s and help newcomers",
+       extlink_("https://gnunet.org/drupal";, "community"));
+LI("write easy setup instructions");
+LI("build universal static binaries and upload them");
+LI("build binary packages for your OS/distribution and upload them");
+LI("Fix %s or contribute new code",
+       extlink_("https://gnunet.org/mantis/","bugs";));
+echo "</ul>";
+EP();
+H2("Roadmap");
+BP();
+W("Here is the current development plan:");
+echo "<ul>\n";
+LI("fix %s",
+   extlink_("https://gnunet.org/mantis/","bugs";));
+LI("add testbed harness to allow automated testing and profiling");
+LI("extend GTK UI (unindex, more statistics, configuration)");
+LI("complete and integrate DHT implementation");
+echo "</ul>\n";
+EP();
+H2("Contact");
+BP();
+W("GNUnet is developed by %s.",
+  extlink_("http://www.gnu.org/software/gnunet/","the GNUnet developers"));
+W("For questions about GNUnet send E-Mail to %s.",
+  extlink_("mailto:address@hidden","address@hidden";));
+EP();
+
+include("html_footer.php3");
+?>

Modified: GNUnet-docs/WWW/old_news.php3
===================================================================
--- GNUnet-docs/WWW/old_news.php3       2007-06-22 08:43:17 UTC (rev 5121)
+++ GNUnet-docs/WWW/old_news.php3       2007-06-22 08:43:43 UTC (rev 5122)
@@ -11,22 +11,6 @@
 EP();
 echo "<dl>\n";
 
-function convert_time($mysql_timestamp){
-if (ereg("^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})" .
-           "([0-9]{2})([0-9]{2})",$mysql_timestamp,$res)):
- $year=$res[1];
-  $month=$res[2];
-  $day=$res[3];
- $hour=$res[4];
-  $min=$res[5];
-  $sec=$res[6];
-
- return(array($year,$month,$day,$hour,$min,$sec));
-  else:
-     return(false);
- endif;
-}
-
 $query = "SELECT title,include,posted FROM news " .
    "ORDER BY posted DESC";
 $result = mysql_query($query, $connection);
@@ -36,8 +20,8 @@
 }
 for ($i=0;$i<$num;$i++) {
   $row = mysql_fetch_array($result);
-  $pd = convert_time($row["posted"]);
-  echo "<dt>" . $pd[0] . "-" . $pd[1] . "-" . $pd[2] .  ": " . 
W_($row["title"]) . "</dt>\n";
+  $pd = $row["posted"];
+  echo "<dt>" . strtok($pd, " ") .  ": " . W_($row["title"]) . "</dt>\n";
   echo "<dd>\n";
   include("news/" . $row["include"]);
   echo "</dd>\n";