Merge lp:~black-ice-wizard/psiphon/sprint3-595232 into lp:psiphon

[Cheskidov Vladimir]

[Rod (rod-psiphon)]

This was a team review. Here are our comments:

- The "These invites expire in 5 days" ends up repeated twice in send invitations. Also, the text isn't translated in one case: ("td colspan="2" class="warning">These invites expire in <?=$config["invitation_ttl"]/86400?>" in invite-m.php). Just remove that case.

- Same selenium issues as in https://code.launchpad.net/~nurlan0000/psiphon/sprint3-610191/+merge/33761.

- Note: you probably don't want your email password in public source code -- even for test account.

- "This link expires in %d days." would be better at the top of the email, after Welcome.

- Would prefer a symbolic value for 86400 --> e.g., SECONDS_IN_DAY defined in config.php.

review: Needs Fixing

[Cheskidov Vladimir (black-ice-wizard)]

I do not understand the item:
> - Note: you probably don't want your email password in public source code --
> even for test account.
Can you please explain, what exactly I need to correct here?

In item:
> - "This link expires in %d days." would be better at the top of the email,
> after Welcome.
I have put this string to the top, and changed it according to the your recomendations in the "Note: This invitation expires in% d days."

[Cheskidov Vladimir (black-ice-wizard)]

In additional:
Our testers have a ticket (Automated testing), in which they should do tests on all Psiphon functional.
So I did not add the tests in my ticket.

[Adam Kruger (adam-kruger)]

Code review comments:

- Since automated testing is being done elsewhere, please do not submit the following files for merging:
trunk/testing/selenium_scripts/invites_expiration_text.html
trunk/testing/selenium_scripts/selenium_test_suite_595232.html

review: Needs Fixing (group review)

[lp:~black-ice-wizard/psiphon/sprint3-595232]

125. By Nurlan <ubuntu@ubuntu-desktop> on 2010-10-21

remove obsolete tests

=== modified file 'trunk/www/config.php'
--- trunk/www/config.php	2010-06-28 20:44:20 +0000
+++ trunk/www/config.php	2010-10-21 05:41:11 +0000
@@ -43,6 +43,8 @@
                   substr(getenv("SCRIPT_NAME"), 0, 
                          strrpos(getenv("SCRIPT_NAME"), "/"));
 
+$config["seconds_in_day"] = 86400; // seconds: 86400 * days
+
 // invitation is valid for 5 days, then it's deleted if not used
 $config["invitation_ttl"] = 86400 * 5; // seconds: 86400 * days
 

=== modified file 'trunk/www/includes/lang.php'
--- trunk/www/includes/lang.php	2010-10-14 16:26:29 +0000
+++ trunk/www/includes/lang.php	2010-10-21 05:41:11 +0000
@@ -1704,6 +1704,7 @@
     'invitation_body' => array(
         'en' => "Welcome to Psiphon!
 
+<<<<<<< TREE
 Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
 
 You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
@@ -1804,6 +1805,136 @@
       %s
 
       Команда Psiphon",
+=======
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'fa' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'ru' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'uz' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'tk' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'cn' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'ar' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'vt' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'fr' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+        'es' => "Welcome to Psiphon!
+
+Note: This invitation expires in %d days.
+
+Do not share the following link or your Psiphon account login details on any public forum.  This will help protect Psiphon from being blocked in your region.
+
+You may encounter an \"invalid security certificate\" warning when you activate or access your Psiphon account.  Please select \"continue\" or \"add an exception\" to enable your browser to establish a secure connection to Psiphon.
+
+Click this link to create your new Psiphon account:
+
+%s
+
+The Psiphon Team",
+>>>>>>> MERGE-SOURCE
     ),
 
     'invitation_subject' => array(
@@ -5022,6 +5153,19 @@
 Пожалуйста, используйте его для входа в Psiphon.",
     ),
 
+    'invitations_expiration' => array(
+        'en' => "These invites expire in %d days",
+        'fa' => "These invites expire in %d days",
+        'ru' => "These invites expire in %d days",
+        'uz' => "These invites expire in %d days",
+        'tk' => "These invites expire in %d days",
+        'cn' => "These invites expire in %d days",
+        'ar' => "These invites expire in %d days",
+        'vt' => "These invites expire in %d days",
+        'fr' => "These invites expire in %d days",
+        'es' => "These invites expire in %d days",
+    ),
+
 // DO NOT MODIFY THIS LINE -- END OF TRANSLATIONS
 );
 

=== modified file 'trunk/www/invite-m.php'
--- trunk/www/invite-m.php	2010-07-14 18:35:25 +0000
+++ trunk/www/invite-m.php	2010-10-21 05:41:11 +0000
@@ -132,7 +132,8 @@
 
         $invite_code = strtoupper(substr(bin2hex(secure_rand(ceil($random_hex_needed/2.0))), 0, $random_hex_needed));
         $url = make_invite_url($config, (int)$_POST['proxy'], $invite_code);
-        $body = sprintf(msg("invitation_body"), $url);
+        $invitation_expiration_time = $config["invitation_ttl"]/$config["seconds_in_day"];
+        $body = sprintf(msg("invitation_body"), $invitation_expiration_time, $url);
         $subject = msg("invitation_subject");
         $proxy = $_POST['proxy'];
 
@@ -197,8 +198,11 @@
 
         // And we need to update $max_invite_count.
         $max_invite_count = ($record_user['invite_token_count'] == Null ? $absolute_max_invite_count : min($record_user['invite_token_count'], $absolute_max_invite_count));
-        
-        $processing_results[] = sprintf(msg("invitations_queued"), $count);
+
+        $invitation_expiration_time = $config["invitation_ttl"]/$config["seconds_in_day"];
+
+        $processing_results[] = sprintf( msg("invitations_queued"), $count );
+        $processing_results[] = sprintf( msg("invitations_expiration"), $invitation_expiration_time );
 
         $invite_success = 1;
     }
@@ -225,7 +229,6 @@
     <input name="csrf_token" value="<?=$record_user['csrf_token']?>" type="hidden"/>
 
     <table cellpadding="2" cellspacing="0" border="0">
-
         <tr>
             <th align="right"><?=msg("invite_tokens")?></th>
             <td><?=($record_user['invite_token_count'] == Null ? msg("unlimited") : escape_html($record_user['invite_token_count']))?></td>

=== modified file 'trunk/www/invite.php'
--- trunk/www/invite.php	2010-07-16 19:31:33 +0000
+++ trunk/www/invite.php	2010-10-21 05:41:11 +0000
@@ -144,7 +144,11 @@
     // And we need to update $max_invite_count.
     $max_invite_count = ($record_user['invite_token_count'] == Null ? $absolute_max_invite_count : min($record_user['invite_token_count'], $absolute_max_invite_count));
 
+    $invitation_expiration_time = $config["invitation_ttl"]/$config["seconds_in_day"];
+
     $processing_results[] = sprintf(msg("invitations_created"), $invites_created);
+    $processing_results[] = sprintf( msg("invitations_expiration"), $invitation_expiration_time );
+    
 
     $invite_success = 1;