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

[Cheskidov Vladimir]

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

122. By Nurlan <ubuntu@ubuntu-desktop> on 2010-09-02

db update for tiket 610181

[Adam P (adam+)]

Problems:

1. In both the Admin and Propagator proxy lists, the propagator_notes should be shown in a textarea like the proxy notes are shown in the Admin proxy list. (Right now newlines aren't shown, for example, which makes the notes looked jammed together and messy.)

2. There should be Selenium tests added for this functionality.

3. This isn't a show-stopper, but: In the Proxy list, the notes text areas overlaps the table's vertical grid line. It would be nice if this could be fixed.

review: Needs Fixing

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

123. By Nurlan <ubuntu@ubuntu-desktop> on 2010-09-03

Some small fixes

[Cheskidov Vladimir (black-ice-wizard)]

Our testers have a ticket (Automated
testing<https://bugs.launchpad.net/psiphon/+bug/457334>),
in which they should do tests on all Psiphon functional.
So I did not add the tests in my ticket.

For other items I have done everything

2010/9/2 Adam P <email address hidden>

> Review: Needs Fixing
> Problems:
>
> 1. In both the Admin and Propagator proxy lists, the propagator_notes
> should be shown in a textarea like the proxy notes are shown in the Admin
> proxy list. (Right now newlines aren't shown, for example, which makes the
> notes looked jammed together and messy.)
>
> 2. There should be Selenium tests added for this functionality.
>
> 3. This isn't a show-stopper, but: In the Proxy list, the notes text areas
> overlaps the table's vertical grid line. It would be nice if this could be
> fixed.
> --
>
> https://code.launchpad.net/~black-ice-wizard/psiphon/sprint3-610181/+merge/34381<https://code.launchpad.net/%7Eblack-ice-wizard/psiphon/sprint3-610181/+merge/34381>
> You are the owner of lp:~black-ice-wizard/psiphon/sprint3-610181.
>

[Adam P (adam+)]

Looks good. We won't require Selenium tests from now on, since your testers are changing the way it's done with that Automated Testing item.

review: Approve

=== 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-03 04:54:41 +0000
@@ -0,0 +1,4 @@
+--
+-- Modifications to table proxy(add propagator notes field)
+--
+ALTER TABLE proxy ADD COLUMN propagator_notes text  NOT NULL AFTER notes;

=== 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-03 04:54:41 +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/includes/lang.php'
--- trunk/www/includes/lang.php	2010-08-09 18:56:53 +0000
+++ trunk/www/includes/lang.php	2010-09-03 04:54:41 +0000
@@ -3778,6 +3778,19 @@
         'es' => "Notas del servidor proxy",
     ),
 
+    'propagator_proxy_notes' => array(
+        'en' => "Propagator Proxy Notes",
+        'fa' => "Propagator Proxy Notes",
+        'ru' => "Propagator Proxy Notes",
+        'uz' => "Propagator Proxy Notes",
+        'tk' => "Propagator Proxy Notes",
+        'cn' => "Propagator Proxy Notes",
+        'ar' => "Propagator Proxy Notes",
+        'vt' => "Propagator Proxy Notes",
+        'fr' => "Propagator Proxy Notes",
+        'es' => "Propagator Proxy Notes",
+    ),
+
     'bad_login_url' => array(
         'en' => "Login URL contains illegal characters. Allowed characters are 'a-z', '0-9' and '/'",
         'fa' => "یو ار ال ورود کاراکترهای غیرمجاز دارد. کارا کترهای مجاز اینها هستند:  'a-z', '0-9' and '/'",

=== modified file 'trunk/www/propagator-proxies.php'
--- trunk/www/propagator-proxies.php	2010-07-07 20:45:44 +0000
+++ trunk/www/propagator-proxies.php	2010-09-03 04:54:41 +0000
@@ -43,16 +43,32 @@
 
 $title = msg("proxies_management");
 
+while ($_POST[id]=(int)$_POST[id])
+{
+    $propagator_notes = trim($_POST['propagator_notes']);
+
+    $query = "UPDATE proxy SET propagator_notes = :propagator_notes WHERE id = :id";
+    db_query_execute($config, $query, convert_null_array(array( ":propagator_notes" => $propagator_notes, ":id" => $_POST['id'])));
+
+    break;
+}
+
+
 include($_SERVER[DOCUMENT_ROOT]."/header.php");
 
 
 ?>
+<form name="frm" method="post" action="<?=getenv("SCRIPT_NAME")?>">
+<input name="csrf_token" value="<?=$record_user['csrf_token']?>" type="hidden">
+
 <table cellpadding="2" cellspacing="0" border="0" class="brd">
 
 <tr>
 <th><?=msg("proxy_name")?></th>
 <th><?=msg("proxy_hostname")?>/<?=msg("proxy_ip")?></th>
 <th><?=msg("proxy_login_url")?></th>
+<th><?=msg("propagator_proxy_notes")?></th>
+<th></th>
 </tr>
 
 <?
@@ -66,6 +82,8 @@
 
 $result = db_query_execute($config, $query, convert_null_array($query_params));
 
+$_p=$_s="";
+
 while ($record = escape_html(db_fetch_result($config, $result)))
 {
     echo "<tr>";
@@ -73,6 +91,31 @@
     echo "<td>{$record['name']}</td>\n";
     echo "<td>{$record['hostname']}</td>\n";
     echo "<td>".make_home_url($config, $record[id])."</td>\n";
+    if ($_GET[edit]!=$record[id]) {
+        if (strlen($record['propagator_notes']) == 0)
+        {
+            echo "<td>{$_p}".escape_html($record['propagator_notes'])."{$_s}</td>\n";
+        }
+        else
+        {
+            $rows = (int)substr_count($record['propagator_notes'], "\n");
+            echo "<td>{$_p}<textarea rows=\"".$rows."\" cols=\"60\" wrap=\"off\" style=\"width:98%\" readonly>".escape_html($record['propagator_notes'])."</textarea></td>\n";
+        }
+
+        echo "<td><a href=\"".getenv("SCRIPT_NAME")."?edit={$record[id]}\">{$_p}".msg("edit")."{$_s}</a> &nbsp;";
+        echo "</td>\n";
+    }
+      else {
+        echo "<td>";
+        echo "<textarea name=\"propagator_notes\" rows=\"10\" cols=\"60\" wrap=\"off\" style=\"width:100%\">".escape_html($record['propagator_notes'])."</textarea>";
+        echo "</td>\n";
+        
+
+        echo "<td>";
+        echo "<input type=\"submit\" value=\"".msg("update")."\"> &nbsp; <a href=\"".getenv("SCRIPT_NAME")."\">".msg("cancel")."</a>";
+        echo "<input type=\"hidden\" name=\"id\" value=\"{$record["id"]}\">";
+        echo "</td>\n";
+    }
 
     echo "</tr>\n";
 }
@@ -80,6 +123,8 @@
 
 </table>
 
+</form>
+
 <?
 include($_SERVER[DOCUMENT_ROOT]."/footer.php");
 ?>

=== modified file 'trunk/www/proxies.php'
--- trunk/www/proxies.php	2010-06-09 20:50:02 +0000
+++ trunk/www/proxies.php	2010-09-03 04:54:41 +0000
@@ -189,6 +189,8 @@
 <th><?=msg("proxy_hostname")?>/<?=msg("proxy_ip")?></th>
 <th><?=msg("proxy_login_url")?></th>
 <th><?=msg("proxy_notes")?></th>
+<th><?=msg("propagator_proxy_notes")?></th>
+
 <!--<th><?=msg("last_user_request")?></th>
 <th><?=msg("average_daily_requests")?></th>-->
 <th><a href="<?=getenv("SCRIPT_NAME")?>?add=1"><?=msg("add")?></a></th>
@@ -292,7 +294,17 @@
         else
         {
             $rows = (int)substr_count($record['notes'], "\n");
-            echo "<td>{$_p}<textarea rows=\"".$rows."\" cols=\"60\" wrap=\"off\" style=\"width:100%\" readonly>".escape_html($record['notes'])."</textarea></td>\n";
+            echo "<td>{$_p}<textarea rows=\"".$rows."\" cols=\"60\" wrap=\"off\" style=\"width:98%\" readonly>".escape_html($record['notes'])."</textarea></td>\n";
+        }
+
+        if (strlen($record['propagator_notes']) == 0)
+        {
+            echo "<td>{$_p}".escape_html($record['propagator_notes'])."{$_s}</td>\n";
+        }
+        else
+        {
+            $rows = (int)substr_count($record['propagator_notes'], "\n");
+            echo "<td>{$_p}<textarea rows=\"".$rows."\" cols=\"60\" wrap=\"off\" style=\"width:98%\" readonly>".escape_html($record['propagator_notes'])."</textarea></td>\n";
         }
 //        echo "<td>{$_p}{$last_user_request}{$_s}</td>\n";
 //        echo "<td>{$_p}{$average_daily_requests}{$_s}</td>\n";
@@ -314,6 +326,7 @@
         echo "<td>";
         echo "<textarea name=\"notes\" rows=\"10\" cols=\"60\" wrap=\"off\" style=\"width:100%\">".escape_html($record['notes'])."</textarea>";
         echo "</td>\n";
+        echo "<td>{$record['propagator_notes']}</td>\n";
 //        echo "<td>{$last_user_request}</td>";
 //        echo "<td>{$average_daily_requests}</td>";
         echo "<td>";