bug 1112: layout and typo fixes

diff --git a/pages/wot/4.php b/pages/wot/4.php
index 90ddaf2..4847353 100644 (file)
--- a/pages/wot/4.php
+++ b/pages/wot/4.php
@@ -34,18 +34,6 @@ include_once("../includes/wot.inc.php");
 
 <p><?=sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?> </p>
 
 
 <p><?=sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?> </p>
 

-<? _("A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on..")."\n\n" ?>
-
-<? _("With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.")."\n\n" ?>
-
-<? _("Currently CAcert has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.")."\n\n" ?>. 
-
-<? _("We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.")."\n\n" ?> 
-
-<? _("In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only traveling to populated countries, but also remember that assurers may occasionally visit your country or area.")."\n\n" ?>
-
-<? sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<a href='http://wiki.cacert.org/TTP/TTPuser'>http://wiki.cacert.org/TTP/TTPuser</a>","<a href='http://wiki.cacert.org/TTP/TTPAL'>http://wiki.cacert.org/TTP/TTPAL</a>")."\n\n" ?>
-

 <?
 // test for points <100
 if ($_SESSION['profile']['points']<100){
 <?
 // test for points <100
 if ($_SESSION['profile']['points']<100){

diff --git a/www/wot.php b/www/wot.php
index 147b983..e0250c1 100644 (file)
--- a/www/wot.php
+++ b/www/wot.php
@@ -141,7 +141,7 @@ function send_reminder()
         }else{
       $body .= "The user is NOT requesting the TTP TOPUP.\n\n";
      }
         }else{
       $body .= "The user is NOT requesting the TTP TOPUP.\n\n";
      }

-     $body .= "The user received ".$_SESSION['profile']['points']." assurance points up today.\n\n";
+     $body .= "The user received ".(int)$_SESSION['profile']['points']." assurance points up today.\n\n";

                 $body .= "Please start the TTP assurance process.";
           sendmail("support@cacert.org", "[CAcert.org] "._("TTP request."), $body, "support@cacert.org", "", "", "CAcert Website");
 
                 $body .= "Please start the TTP assurance process.";
           sendmail("support@cacert.org", "[CAcert.org] "._("TTP request."), $body, "support@cacert.org", "", "", "CAcert Website");
 


@@ -160,25 +160,7 @@ function send_reminder()
                sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You requested TTP assurances"), $body, "support@cacert.org", "", "", "CAcert Support");
 
     }
                sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You requested TTP assurances"), $body, "support@cacert.org", "", "", "CAcert Support");
 
     }

-     
-    if ($_POST['ttptopup']!='') {
-                //This mail does not need to be transalted
-                $body = "Hi TTP adminstrators \n\n ";
-     $body .= $_SESSION['profile']['fname']." ". $_SESSION['profile']['lname'].", ".$_SESSION['profile']['email']." is requesting a TTP TOPUP assurance.";
-     $body .="The user received ".$_SESSION['profile']['points']." assurance points up today.\n\n";
-                $body .="Please start the TTP TOPUP assurance process.";
-          sendmail("support@cacert.org", "[CAcert.org] "._("TTP TOPUP request."), $body, "support@cacert.org", "", "", "CAcert Website");
-
-     //This mail needs to be translated
-               L10n::set_translation($my_translation);

 
 

-               $body  = _("You are receiving this email because you asked for TTP TOPUP assurance")."\n\n";
-               $body .= _("Best regards")."\n";
-               $body .= _("CAcert Support Team");
-
-               sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You requested a TTP TOPUP assurance"), $body, "support@cacert.org", "", "", "CAcert Support");
-     
-    }

        }
 
        if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6))
        }
 
        if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6))