From 4f675d3e8d062e2c6bca2c3e45d2930e4cb2dbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Mon, 25 Jul 2011 17:38:48 +0200 Subject: Source code taken from cacert-20110722.tar.bz2 --- CommModule/client.pl | 4 +- includes/about_menu.php | 2 +- includes/general.php | 4 +- includes/mysql.php.sample | 4 +- pages/index/19.php | 94 ++++------------------------------------------- www/index.php | 7 ++++ 6 files changed, 21 insertions(+), 94 deletions(-) diff --git a/CommModule/client.pl b/CommModule/client.pl index 7b417d1..4e09c46 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -670,13 +670,13 @@ sub sendmail($$$$$$$) SysLog "SMTP: ".<$smtp>; print $smtp "HELO hlin.cacert.org\r\n"; SysLog "SMTP: ".<$smtp>; - print $smtp "MAIL FROM: \r\n"; + print $smtp "MAIL FROM:\r\n"; SysLog "MAIL FROM: ".<$smtp>; @bits = split(",", $to); foreach my $user (@bits) { - print $smtp "RCPT TO: <".trim($user).">\r\n"; + print $smtp "RCPT TO:<".trim($user).">\r\n"; SysLog "RCPT TO: ".<$smtp>; } print $smtp "DATA\r\n"; diff --git a/includes/about_menu.php b/includes/about_menu.php index 2f3080d..f34a274 100644 --- a/includes/about_menu.php +++ b/includes/about_menu.php @@ -4,7 +4,7 @@
    • -
    • +
    • < = _ ("PR Materials" ) > ?> < ? = _ ( " CAcert Logos " ) ? > ?> diff --git a/includes/general.php b/includes/general.php index 5789875..16b75e4 100644 --- a/includes/general.php +++ b/includes/general.php @@ -673,12 +673,12 @@ $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "MAIL FROM: \r\n"); + fputs($fp, "MAIL FROM:\r\n"); $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "RCPT TO: <$email>\r\n"); + fputs($fp, "RCPT TO:<$email>\r\n"); $line = trim(fgets($fp, 4096)); fputs($fp, "QUIT\r\n"); fclose($fp); diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index 1f477e4..ff5cfc3 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -55,11 +55,11 @@ $InputBuffer = fgets($smtp, 1024); fputs($smtp, "HELO www.cacert.org\r\n"); $InputBuffer = fgets($smtp, 1024); - fputs($smtp, "MAIL FROM: \r\n"); + fputs($smtp, "MAIL FROM:\r\n"); $InputBuffer = fgets($smtp, 1024); $bits = explode(",", $to); foreach($bits as $user) - fputs($smtp, "RCPT TO: <".trim($user).">\r\n"); + fputs($smtp, "RCPT TO:<".trim($user).">\r\n"); $InputBuffer = fgets($smtp, 1024); fputs($smtp, "DATA\r\n"); $InputBuffer = fgets($smtp, 1024); diff --git a/pages/index/19.php b/pages/index/19.php index c58eb68..b44960d 100644 --- a/pages/index/19.php +++ b/pages/index/19.php @@ -15,90 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> - -Note that the TTP programme is effectively Frozen
    -Until a subsidiary policy under AP is written, it is against AP rules.
    -     - 
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    -     		- :

    - : .

    - :

    -
    -

    -     		- :

    - :

    - :

    -
    -

    -     		- :

    - : ","")?>

    - :

    -
    -

    -     		- :

    - :

    - :

    -
    -

    -     		- :

    - :

    - :

    -
    -

    -     		- :

    - :

    - :

    -
    -

    -     		- :

    - :

    - :

    -
    - (*) -
    -
    +

    +', ''); +?> +

    \ No newline at end of file diff --git a/www/index.php b/www/index.php index fb215c6..13e8dc6 100644 --- a/www/index.php +++ b/www/index.php @@ -627,6 +627,13 @@ if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900) $_SESSION['signup']['year'] = "19XX"; + + if ($id == 19) + { + $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; + $newUrl = $protocol . '://wiki.cacert.org/FAQ/Privileges'; + header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved + } showheader(_("Welcome to CAcert.org")); includeit($id); -- cgit v1.2.1