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/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);