Merge lp:~nurlan0000/psiphon/sprint3-610188 into lp:psiphon

[Nurlan Turdaliev]

[e.fryntov (e-fryntov)]

The code looks OK and works as it supposed to.

review: Approve (code read and test install)

[e.fryntov (e-fryntov)]

I overlooked the fact that related tests were missing. Please add tests to this branch.

review: Needs Fixing (code read)

[Samat Jukeshov (jukeshov)]

we commit autotest for this ticket on full package of tests with #28 at https://spreadsheets.google.com/pub?key=0AmM0LQffI9KjdERDTFhycnE5RE4taEJTaVdZbXpWcUE&hl=en&output=html

review: Needs Resubmitting

=== added file 'trunk/sql/upgrade-2.6.sql'
--- trunk/sql/upgrade-2.6.sql	1970-01-01 00:00:00 +0000
+++ trunk/sql/upgrade-2.6.sql	2010-09-02 04:22:39 +0000
@@ -0,0 +1,1 @@
+ALTER TABLE `invitation` ADD COLUMN `homepage` CHAR(255);
\ No newline at end of file

=== modified file 'trunk/tools/psiphon_install.sh'
--- trunk/tools/psiphon_install.sh	2010-06-01 17:50:42 +0000
+++ trunk/tools/psiphon_install.sh	2010-09-02 04:22:39 +0000
@@ -271,7 +271,7 @@
 echo "Enter current password for mysql root (enter for none)"
 
 cat sql/create_db.sql sql/grant.new.sql sql/structure.2.3.sql sql/init.sql \
-sql/upgrade-2.4.sql sql/upgrade-2.5.sql sql/jsf.sql sql/youtube.sql | mysql -uroot -p
+sql/upgrade-2.4.sql sql/upgrade-2.5.sql sql/upgrade-2.6.sql sql/jsf.sql sql/youtube.sql | mysql -uroot -p
 
 rm sql/grant.new.sql
 

=== modified file 'trunk/www/create_account.php'
--- trunk/www/create_account.php	2010-07-16 17:53:05 +0000
+++ trunk/www/create_account.php	2010-09-02 04:22:39 +0000
@@ -426,6 +426,11 @@
         break;
     }
 
+    // Set default homepage
+    $default_homepage_url = $invitation_record['homepage'];
+    if ( is_url($default_homepage_url))
+        $home_page = $default_homepage_url;
+
     $query = "INSERT INTO user (".
                 "email,".
                 "pass,".

=== modified file 'trunk/www/includes/lang.php'
--- trunk/www/includes/lang.php	2010-08-09 18:56:53 +0000
+++ trunk/www/includes/lang.php	2010-09-02 04:22:39 +0000
@@ -3055,6 +3055,19 @@
         'es' => "La URL ya existe",
     ),
 
+    'bad_url' => array(
+        'en' => "Bad URL",
+        'fa' => "Bad URL",
+        'ru' => "Bad URL",
+        'uz' => "Bad URL",
+        'tk' => "Bad URL",
+        'cn' => "Bad URL",
+        'ar' => "Bad URL",
+        'vt' => "Bad URL",
+        'fr' => "Bad URL",
+        'es' => "Bad URL",
+    ),
+
     'bookmark_added' => array(
         'en' => "Link saved",
         'fa' => " این لینک ذخیره شد",
@@ -4538,6 +4551,19 @@
         'es' => "Verify",
     ),
 
+    'default_homepage' => array(
+        'en' => "Default Homepage",
+        'fa' => "Default Homepage",
+        'ru' => "Default Homepage",
+        'uz' => "Default Homepage",
+        'tk' => "Default Homepage",
+        'cn' => "Default Homepage",
+        'ar' => "Default Homepage",
+        'vt' => "Default Homepage",
+        'fr' => "Default Homepage",
+        'es' => "Default Homepage",
+    ),
+
     'login_with_other_account' => array(
         'en' => "Log in with other account",
         'fa' => " با حساب دیگر وارده سا یفون شوید",

=== 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-09-02 04:22:39 +0000
@@ -80,6 +80,20 @@
         break;
     }
 
+    // Validate default homepage url
+    $default_homepage_url = $_POST['default_homepage'];
+    if ( ! $default_homepage_url ) {
+        $processing_errors[] = msg('url_empty');
+        break;
+    }
+
+    if ( ! is_url($default_homepage_url) )
+    {
+        $default_homepage_url = '';
+        $processing_errors[] = msg("bad_url");
+        break;
+    }
+
     // Validate the invitation count.
 
     if ((count($addr_list) <= 0) || (count($addr_list) > $max_invite_count))
@@ -139,19 +153,21 @@
         // Insert a record into the invitation table.
 
         $query=
-            "INSERT INTO invitation (date, proxy, pass, user, email, status, url, lang, grp) ".
-            "VALUES (UNIX_TIMESTAMP(), :proxy, :pass, :user, :email, -1, :url, :lang, :grp)";
+            "INSERT INTO invitation (date, proxy, pass, user, email, status, url, lang, grp, homepage) ".
+            "VALUES (UNIX_TIMESTAMP(), :proxy, :pass, :user, :email, -1, :url, :lang, :grp, :homepage)";
         db_query_execute(
             $config,
             $query,
             convert_null_array(array(
-                ":proxy" => $proxy,
-                ":pass" => $invite_code,
-                ":user" => $record_user['id'],
-                ":email" => $addr,
-                ":url" => $url,
-                ":lang" => $record_user['last_lang'],
-                ":grp" => $_POST['user_class'])));
+                ":proxy"    => $proxy,
+                ":pass"     => $invite_code,
+                ":user"     => $record_user['id'],
+                ":email"    => $addr,
+                ":url"      => $url,
+                ":lang"     => $record_user['last_lang'],
+                ":grp"      => $_POST['user_class'],
+                ':homepage' => $default_homepage_url
+            )));
 
         // Get the id of the invitation table entry we just created.
         $invitation_id = db_get_last_insert_id($config);
@@ -264,6 +280,10 @@
         <tr valign="top">
             <th align="right"><?=sprintf(msg("emails"), $max_invite_count)?></th>
             <td><textarea name="addr_list" cols="30" rows="20"><?=htmlentities($_POST['addr_list'], ENT_QUOTES, charset())?></textarea></td>
+        </tr
+        <tr valign="top">
+            <th align="right"><?php echo msg("default_homepage"); ?></th>
+            <td><input type="text" name="default_homepage" value="<?php echo htmlentities($default_homepage_url, ENT_QUOTES, charset())?>" /></td>
         </tr>
 
         <tr>

=== modified file 'trunk/www/invite.php'
--- trunk/www/invite.php	2010-07-16 19:31:33 +0000
+++ trunk/www/invite.php	2010-09-02 04:22:39 +0000
@@ -80,6 +80,20 @@
         break;
     }
 
+    // Validate default homepage url
+    $default_homepage_url = $_POST['default_homepage'];
+    if ( ! $default_homepage_url ) {
+        $processing_errors[] = msg('url_empty');
+        break;
+    }
+
+    if ( ! is_url($default_homepage_url) )
+    {
+        $default_homepage_url = '';
+        $processing_errors[] = msg("bad_url");
+        break;
+    }
+
     // Create the invitations and put them into the DB.
 
     $invite_codes = "";
@@ -110,18 +124,20 @@
         // Put the invitation into the DB.
 
         $query=
-            "INSERT INTO invitation (date, proxy, pass, user, status, url, lang, grp) ".
-            "VALUES (UNIX_TIMESTAMP(), :proxy, :pass, :user, -1, :url, :lang, :grp)";
+            "INSERT INTO invitation (date, proxy, pass, user, status, url, lang, grp, homepage) ".
+            "VALUES (UNIX_TIMESTAMP(), :proxy, :pass, :user, -1, :url, :lang, :grp, :homepage)";
         db_query_execute(
             $config,
             $query,
             convert_null_array(array(
-                ":proxy" => $_POST['proxy'],
-                ":pass" => $invite_code,
-                ":user" => $record_user['id'],
-                ":url" => $invite_link,
-                ":lang" => $record_user['last_lang'],
-                ":grp" => $_POST['user_class'])));
+                ":proxy"    => $_POST['proxy'],
+                ":pass"     => $invite_code,
+                ":user"     => $record_user['id'],
+                ":url"      => $invite_link,
+                ":lang"     => $record_user['last_lang'],
+                ":grp"      => $_POST['user_class'],
+                ':homepage' => $default_homepage_url
+            )));
 
         $invites_created++;
     }
@@ -205,6 +221,11 @@
         </tr>
 
         <tr>
+            <th align="right"><?php echo msg("default_homepage"); ?></th>
+            <td><input type="text" name="default_homepage" value="<?php echo htmlentities($default_homepage_url, ENT_QUOTES, charset())?>" /></td>
+        </tr>
+
+        <tr>
             <td><input type="hidden" name="invite" value="1"/></td>
             <td><input type="submit" <?=($record_user['invite_token_count'] == "0" ? "disabled=true" : "")?> value="<?=msg("invite")?>"/></td>
         </tr>