psiphon

Merge lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon

  1. psiphon
  2. Merge into trunk
Proposed by Vlad
Status: Merged
Merged at revision: 346
Proposed branch: lp:~t7-vla7-lz/psiphon/psiphon
Merge into: lp:psiphon
Diff against target: 1011 lines (+0/-978)
4 files modified
trunk/www/bluebar.php (+0/-18)
trunk/www/download.php (+0/-200)
trunk/www/psiphonx.php (+0/-389)
trunk/www/psiphonx_fa.php (+0/-371)
To merge this branch: bzr merge lp:~t7-vla7-lz/psiphon/psiphon
Reviewer Review Type Date Requested Status
Psiphon Inc. Pending
Review via email: mp+224895@code.launchpad.net
To post a comment you must log in.
lp:~t7-vla7-lz/psiphon/psiphon updated
346. By e-fryntov

Merged Vlad's changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'trunk/www/bluebar.php'
2--- trunk/www/bluebar.php 2011-09-13 15:34:40 +0000
3+++ trunk/www/bluebar.php 2014-06-27 20:10:40 +0000
4@@ -87,24 +87,6 @@
5 <?
6 echo $v;
7
8-// add download link if this proxy has SSH configuration
9-
10-if (strlen($proxy_record['ssh_server_fingerprint']) > 0 &&
11- strlen($proxy_record['ssh_user_name']) > 0 &&
12- strlen($proxy_record['ssh_user_password']) > 0)
13-{
14- if ($record_user['last_lang'] == "fa")
15- {
16- $download_url = "/psiphonx_fa.php?url=".urlencode(getenv("psiphon_proxy_uri"));
17- echo "<a style=\"color:red; font-weight:bold\" href=\"$download_url\">".utf8_encode_string("سایفون اکس - جدید")."</a> | ";
18- }
19- else
20- {
21- $download_url = "/psiphonx.php?url=".urlencode(getenv("psiphon_proxy_uri"));
22- echo "<a style=\"color:red; font-weight:bold\" href=\"$download_url\">New! Try PsiphonX</a> | ";
23- }
24-}
25-
26 // Indicate custom user agent, if it configured for the proxied URL
27
28 if (isset($_SERVER["psiphon_custom_user_agent"]) && isset($_SERVER["psiphon_custom_user_agent_back_link"])) {
29
30=== removed file 'trunk/www/download.php'
31--- trunk/www/download.php 2014-06-27 19:30:53 +0000
32+++ trunk/www/download.php 1970-01-01 00:00:00 +0000
33@@ -1,200 +0,0 @@
34-<?php
35-
36-/*
37- Psiphon Circumvention Platform
38- Copyright (C) 2009-2010 Psiphon Inc.
39-
40- This program is free software: you can redistribute it and/or modify
41- it under the terms of the GNU General Public License as published by
42- the Free Software Foundation, either version 3 of the License, or
43- (at your option) any later version.
44-
45- This program is distributed in the hope that it will be useful,
46- but WITHOUT ANY WARRANTY; without even the implied warranty of
47- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
48- GNU General Public License for more details.
49-
50- You should have received a copy of the GNU General Public License
51- along with this program. If not, see <http://www.gnu.org/licenses/>.
52-*/
53-
54-include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
55-include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
56-
57-// Load current proxy information
58-
59-$query = "SELECT * FROM proxy WHERE hostname = :hostname";
60-$result = db_query_execute($config, $query, convert_null_array(array(":hostname" => $_SERVER[HTTP_HOST])));
61-$proxy_record = db_fetch_result($config, $result);
62-if (!$proxy_record)
63-{
64- include($_SERVER[DOCUMENT_ROOT]."/http-errors/404.php");
65-}
66-
67-// error if this isn't a configured proxy (this is also checked in the UI in bluebar.php)
68-
69-if (!(strlen($proxy_record['ssh_server_fingerprint']) > 0 &&
70- strlen($proxy_record['ssh_user_name']) > 0 &&
71- strlen($proxy_record['ssh_user_password']) > 0))
72-{
73- include($_SERVER[DOCUMENT_ROOT]."/http-errors/404.php");
74-}
75-
76-// Update download statistics
77-
78-// This stats entry is unique for the region, proxy, current day, and user group. If an
79-// existing record is found for that key, the counter is incremented. Otherwise, a new
80-// record is created.
81-
82-$date = strftime("%Y-%m-%d");
83-
84-$region = lookup_region($config);
85-
86-$query = "UPDATE stat_client_download SET total=total+1 ".
87- "WHERE date = :date AND region = :region AND proxy = :proxy_id AND code = 'PsiphonX'";
88-$result = db_query_execute($config, $query, convert_null_array(array(":date" => $date, ":region" => $region, ":proxy_id" => $proxy_id)));
89-
90-if (!db_num_rows_affected($result))
91-{
92- $query = "INSERT INTO stat_client_download (date, region, proxy, total, code) ".
93- "VALUES (:date, :region, :proxy_id, 1, 'PsiphonX')";
94- db_query_execute($config, $query, convert_null_array(array(":date" => $date, ":region" => $region, ":proxy_id" => $proxy)));
95-}
96-
97-// EXE string replacement helper
98-
99-function replace_string($exe, $placeholder, $value)
100-{
101- // The replacement string must be exactly the same size as the
102- // current string or the EXE is invalid. Truncate if more than
103- // 512 characters and pad with zeros if less.
104-
105- $padded_value = str_pad($value, strlen($placeholder));
106- if (strlen($padded_value) > strlen($placeholder))
107- {
108- $padded_value = substr($padded_value, 0, strlen($placeholder));
109- }
110-
111- return str_replace($placeholder, $padded_value, $exe);
112-}
113-
114-// We'll be outputting an EXE
115-
116-header('Content-type: application/exe');
117-header('Content-Disposition: attachment; filename="psiphonx.exe"');
118-
119-$exe = file_get_contents('psiphonx.exe');
120-
121-// populate exe strings with values for current proxy
122-
123-$http_proxy_port_number_placeholder =
124- "938B0F3298373DC739BA6FF2755090400F38512D59912410B144DB4F36B2D3A5".
125- "94AE0DB5E7D9E92BEB0D59D1C8B8ADABF9FB0CFA4A9D27F76ED297CC9965DB18".
126- "2C39C874EDD978FDAE1842DBF97F534593AC53E59DF0D545BCEEABDE4CE11831".
127- "508CD6A1BF06C15E5E1CCDC420F89E385871B31D95AD574D2A20C989EF844F09".
128- "A6D451065A6A8C835675A5170B2CF5D7FE049D6A738F3720040ABB0C1450B462".
129- "CC462C3D192C4F2E1744659D278A1493151ECED35C00FF9740C0C3C2528FC235".
130- "2393A89D40827099DABF53C2FAECEA7743E40DB4F3329E8EA27C812E06D59385".
131- "50020A285A69ADB17659FE8E60B2AE512EBBAB499C9AF86ED423EEF15F710030";
132-
133-$exe = replace_string($exe, $http_proxy_port_number_placeholder, $proxy_record['http_proxy_port_number']);
134-
135-$ssh_server_host_placeholder =
136- "B4FDCA80A6C01F6B5B2712BCDFD56FB890E2A0CDA58BE9E36788D45BFAB69FBE".
137- "FF51CBA580FF7B5600F1D163B52CC4201B115B82DCDED5AD389E94E677590F03".
138- "A45B239D99A2418F8DD4E32AAFE780B03696249D21339C6E50202CCAF38887B1".
139- "8C09A857D20BF284531677264F33B30D0A83F6DCAA4663620DF80ED445A0DA82".
140- "C5F4BC6A4335473F0D37B0252ED1E54F9466D6D8EAB23A3970C4DB15053947E8".
141- "3627AE9F649776818692052E14CCD75DC8275A915C8C78B523307BCE7684D2FC".
142- "2E3C285C5A7C3D6A0EB8FD754D5B6D913BEADEAE254147F752391F052BFB4B61".
143- "5CEAC356123C4C3AD8B00169F08397EBEE6D96AC0E42748F853C97D427901815";
144-
145-$exe = replace_string($exe, $ssh_server_host_placeholder, $proxy_record['hostname']);
146-
147-$ssh_server_port_number_placeholder =
148- "997AE2C56FA7B92342541F4386B4402B82B27F32D7A12EF6A5E0F78922BFFD4E".
149- "C8CCDD8729580712EB3E48407398D3CEB97B5DF615AD85C5DEFD47ADB82E5848".
150- "C039F8CEE15BA64721251FD8364BA9BCF25181A2E2333365C1DA0190D7368CEB".
151- "9E4AE5E96535E989AB85C41A0BA453C7008A3C64E12DCFD9BE13C9C707210609".
152- "62F6D63260C91CFE6EFE9BE74692AD522A0E718798045DDEB2A41802C92375B7".
153- "985B19DE665DB03422C6BDFC0489B72E6EA06A1526AD612038DCAEAC5EAF409F".
154- "F291FFB8DD959518C82327928DFF735002B300A5B29064217B7E8774CAC37255".
155- "34D6C26CF8ED2D6D81286E3CB42C7D55E61368202F7E29D29E7B2C33F0120EEB";
156-
157-$exe = replace_string($exe, $ssh_server_port_number_placeholder, $proxy_record['ssh_server_port_number']);
158-
159-$ssh_user_name_placeholder =
160- "C189DF9EF00E9BAC0983DB979EE71543FEEC24F1A450C2B4DEC87DB9851AA941".
161- "86851AD05EF9F72C617EEAB0FB3DA90B637A5CB3D5395800A6063355EC99A027".
162- "11D52F53196A6D5F3241EA6CBDE89897B5D0620F7990397EA51332EE72515D73".
163- "15892B5F61E1835FD3B7AF164392F40E790695066F70AB32B61124B20BC59CFD".
164- "8918C649FBDB5000611C92D6B5BEE27B80A3D06B3EF04E036A95CDB85A7BA6E5".
165- "FB98AEBBA647593B85EC15D04F022A761BD43831D07A054583DC33C53A0A5CB4".
166- "E4CA356EA7FAD42EB2863B47D708F309530298D0308639CAFA61093B7A37C6E6".
167- "3C6CA2E9EFC11BB2E6A0E819231986C75B2F30A56457692B399EF9E07DFC3C39";
168-
169-$exe = replace_string($exe, $ssh_user_name_placeholder, $proxy_record['ssh_user_name']);
170-
171-$ssh_user_password_placeholder =
172- "C187FA288F23AB96F2FC884A7E1659C0538D1265DE34687D47EA0D4D207E5B79".
173- "066DFDA630FD955A4FFCB6B8A783431DE48091E62148DE66BD88D4B708862D2F".
174- "C78D636B2D735091CF18121104F0121FF5DB799DA814B4CDB2933AD7220C93D6".
175- "1A58AFB2A1667F8792E17C20ABF4B3FE22CA72F6101E905EE0C3CCCDCFEC2CCC".
176- "F55FCFB66CDCB1AC1A5052CF256F044C1CC442BD1D727D5B2445AD39BCE82ECE".
177- "AAF14950BF403C4408C9B94B5EC98410D1CD04F5B0C40615A470070837225CA8".
178- "8167AA6E4619BD2CF43F9760DD28D7C2FA08407F5B2E1A37D429F5DA659A2B61".
179- "F480509F635AA2DEB1BDAFACD56536B23BA205C9D0F559D3A15195FE663A2A2B";
180-
181-$exe = replace_string($exe, $ssh_user_password_placeholder, $proxy_record['ssh_user_password']);
182-
183-$ssh_server_fingerprint_placeholder =
184- "666A052FD8A2C6C29583C070DC7865831B69858F561B1C51CEBD18620F008C8F".
185- "2EB54325B1053713F1B56F2AD4E99C26D4B8E8ABEBDBA1263384A8EF77B212AD".
186- "AADFCAC475E781AF4C2702932D6D03839ED17562F27451F879563027DBD56321".
187- "0B03384EA75135F76B44131A59AB2C01246D88C920169588A4A1866A181DF433".
188- "E7AF903C5EE7BA0B0D0201478169108FE1D12E4078F93963F8B47E4D43B23438".
189- "74EEC9B0A52EDB56ECC8EC552575874A231BA0D2DE8D33429ED9BD998FD5377F".
190- "8F6809857640CEF633DA4082BD3D17B11BE2FEB95CF3DEF6CC4389790A315E32".
191- "B5EA0FB3D16F2EAFFAD5A4A3A666E3B63BC9DFEE457D5F1E96B61AB55B339BDA";
192-
193-$exe = replace_string($exe, $ssh_server_fingerprint_placeholder, $proxy_record['ssh_server_fingerprint']);
194-
195-// Replace the home page string in the EXE with the user's
196-// current Bluebar page. This causes the client to use that
197-// URL as the default home page.
198-
199-// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
200-
201-$home_page_placeholder =
202- "F0714E23DD7F3ED63AE73E788FC026C7C35AA1EF7D26B78F4560769FDE6FD1DC".
203- "EB28BE6761AB008DF977D2E2C33E7C1D7D8CB9AE1780472CB3BA49C715683EF5".
204- "5958BA45F1E9A32F1C5FA6FC078BE3D7FB1B59A6D98803D38659DB0304645F30".
205- "B114D3C0C68C7B2B029C6EA07590EC01008276DF195C1251F38BA3AD6D57B86E".
206- "FE345018E8E6E32E0EAEFFD77D727609B3A4B4D20611A9CC11FF033657A3A068".
207- "48377A21CA5A6394A2F2DD6194D8DD23BEB4F2A85A5D268698C61E09629A3D29".
208- "E88196FC00FB89DD9601390276634FBCCF90357DAD36E003D29B6C076E13805B".
209- "60F225933A3BFF281801A3FBB58BF76AFFD3E61EF2221A5F727A2DF6621BBF92";
210-
211-$exe = replace_string($exe, $home_page_placeholder, $_GET['url']);
212-
213-$temp_file_name = tempnam("/tmp", "psiphonx");
214-$temp_file_handle = fopen($temp_file_name, "w");
215-fwrite($temp_file_handle, $exe);
216-fclose($temp_file_handle);
217-$signed_temp_file_name = $temp_file_name . ".signed";
218-// No shell injection risk (ie no user input) unless we don't trust tempname()
219-exec("osslsigncode -spc code-signing-cert.spc -key code-signing-key.der -in " . $temp_file_name . " -out " . $signed_temp_file_name);
220-unlink($temp_file_name);
221-if (file_exists($signed_temp_file_name))
222-{
223- $signed_temp_file_handle = fopen($signed_temp_file_name, "r");
224- echo fread($signed_temp_file_handle, filesize($signed_temp_file_name));
225- fclose($signed_temp_file_handle);
226- unlink($signed_temp_file_name);
227-}
228-else
229-{
230- echo $exe;
231-}
232-
233-?>
234
235=== removed file 'trunk/www/images/file_download_security_warning.jpg'
236Binary files trunk/www/images/file_download_security_warning.jpg 2011-02-07 17:45:39 +0000 and trunk/www/images/file_download_security_warning.jpg 1970-01-01 00:00:00 +0000 differ
237=== removed file 'trunk/www/images/psiphonx_ui.jpg'
238Binary files trunk/www/images/psiphonx_ui.jpg 2011-02-07 17:45:39 +0000 and trunk/www/images/psiphonx_ui.jpg 1970-01-01 00:00:00 +0000 differ
239=== removed file 'trunk/www/images/run_security_warning.jpg'
240Binary files trunk/www/images/run_security_warning.jpg 2011-02-07 17:45:39 +0000 and trunk/www/images/run_security_warning.jpg 1970-01-01 00:00:00 +0000 differ
241=== removed file 'trunk/www/psiphonx.exe'
242Binary files trunk/www/psiphonx.exe 2011-03-01 19:51:19 +0000 and trunk/www/psiphonx.exe 1970-01-01 00:00:00 +0000 differ
243=== removed file 'trunk/www/psiphonx.php'
244--- trunk/www/psiphonx.php 2011-03-01 20:08:05 +0000
245+++ trunk/www/psiphonx.php 1970-01-01 00:00:00 +0000
246@@ -1,389 +0,0 @@
247-<?php
248-
249-/*
250- Psiphon Circumvention Platform
251- Copyright (C) 2009-2010 Psiphon Inc.
252-
253- This program is free software: you can redistribute it and/or modify
254- it under the terms of the GNU General Public License as published by
255- the Free Software Foundation, either version 3 of the License, or
256- (at your option) any later version.
257-
258- This program is distributed in the hope that it will be useful,
259- but WITHOUT ANY WARRANTY; without even the implied warranty of
260- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
261- GNU General Public License for more details.
262-
263- You should have received a copy of the GNU General Public License
264- along with this program. If not, see <http://www.gnu.org/licenses/>.
265-*/
266-
267-include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
268-include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
269-
270-// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
271-
272-$download_url = "/download.php?url=".$_GET['url'];
273-?>
274- <table style="width: 100%; font-family: Helvetica,Arial,sans-serif;">
275- <tbody>
276- <tr valign="middle">
277- <td colspan="1" rowspan="1" style="color: rgb(204, 0, 0);">
278- <font size="+2">
279- <a href="%5C%22$download_url%5C%22">
280- <meta http-equiv="content-type"
281- content="text/html; charset=ISO-8859-1">
282- </a>
283- </font>
284- <img style="width: 435px; height: 125px;"
285-alt="Psiphon Logo" src="/images/psiphon_logo.jpg">
286- <font size="+2">
287- <br>
288-
289- </font>
290- </td>
291- <td style="vertical-align: top;">
292- <br>
293-
294- </td>
295- </tr>
296- <tr>
297- <td colspan="1" rowspan="1" style="vertical-align: top;">
298- <br>
299-
300- </td>
301- <td style="vertical-align: top;">
302- <br>
303-
304- </td>
305- </tr>
306- <tr>
307- <td colspan="1" rowspan="1"
308- style="vertical-align: top; background-color: rgb(204, 204, 204);">
309- <font
310-style="color: rgb(0, 0, 153);" size="+2">
311- <a
312-href="<?=$download_url?>">Download PsiphonX</a>
313- </font>
314- <font
315-size="+2">
316- <font size="+1">
317- &nbsp;&nbsp; <span
318-style="color: rgb(153, 0, 0);">(NEW!)</span>
319- </font>
320- </font>
321- </td>
322- <td style="vertical-align: top;">
323- <br>
324-
325- </td>
326- </tr>
327- <tr>
328- <td colspan="1" rowspan="1" style="vertical-align: top;">
329- <br>
330-
331- </td>
332- <td style="vertical-align: top;">
333- <br>
334-
335- </td>
336- </tr>
337- <tr>
338- <td
339- style="vertical-align: top; background-color: rgb(238, 238, 238);">
340- <font
341-color="" size="&acirc;€3">
342- <span style="color: rgb(0, 0, 153);">
343- <font
344-size="+1">
345- <span style="font-weight: bold;">What is PsiphonX?</span>
346- </font>
347- </span>
348- </font>
349- </td>
350- <td style="vertical-align: top;">
351- <br>
352-
353- </td>
354- </tr>
355- <tr>
356- <td style="vertical-align: top;">
357- <br>
358-
359- </td>
360- <td style="vertical-align: top;">
361- <br>
362-
363- </td>
364- </tr>
365- <tr>
366- <td style="vertical-align: top;">
367- <p>
368- <font color="" size="&acirc;€3">
369- <span style="color: rgb(0, 0, 153);">
370- PsiphonX is a brand-new product from
371- Psiphon that extends your Psiphon browsing experience. A downloadable
372- proxy application,
373- </span>
374- </font>
375- <font color="" size="&acirc;€3">
376- <span
377-style="color: rgb(0, 0, 153);">
378- PsiphonX
379- </span>
380- </font>
381- <font color=""
382-size="&acirc;€3">
383- <span style="color: rgb(0, 0, 153);">
384- enables you to view
385- and interact with all web-content without any functional limitations.<br>
386-</span>
387- </font>
388- </p>
389- <p>
390- <font color="" size="&acirc;€3">
391- <span style="color: rgb(0, 0, 153);">
392- PsiphonX
393- was designed as a simple, straightforward tool that provides Psiphon
394- users with an alternative way to access Internet content and web-sites
395- that are not fully supported by Psiphon 2.x.<br>
396-</span>
397- </font>
398- </p>
399- <p>
400- <font color="" size="&acirc;€3">
401- <span style="color: rgb(0, 0, 153);">
402- The
403- PsiphonX
404- </span>
405- </font>
406- <font
407-color="" size="&acirc;€3">
408- <span style="color: rgb(0, 0, 153);">
409- code is
410- fully available on our open source site at <a href="http://launchpad.net/psiphon">http://launchpad.net/psiphon</a>.
411- </span>
412- </font>
413- </p>
414- </td>
415- <td style="vertical-align: top;">
416- <br>
417-
418- </td>
419- </tr>
420- <tr>
421- <td style="vertical-align: top;">
422- <br>
423-
424- </td>
425- <td style="vertical-align: top;">
426- <br>
427-
428- </td>
429- </tr>
430- <tr>
431- <td
432- style="vertical-align: top; background-color: rgb(238, 238, 238);">
433- <p>
434- <font color="" size="&acirc;€3">
435- <span style="color: rgb(0, 0, 153);">
436- <font
437-size="+1">
438- <span style="font-weight: bold;">PsiphonX</span></font></span></font>
439- <font
440-color="" size="&acirc;€3">
441- <span style="color: rgb(0, 0, 153);">
442- <font
443-size="+1">
444- <span style="font-weight: bold;"></span>
445- </font>
446- </span>
447- </font>
448- <font
449-color="" size="&acirc;€3">
450- <span style="color: rgb(0, 0, 153);">
451- <font
452-size="+1">
453- <span style="font-weight: bold;">Requirements </span>
454- </font>
455- </span>
456- </font>
457- </p>
458- </td>
459- <td style="vertical-align: top;">
460- <br>
461-
462- </td>
463- </tr>
464- <tr>
465- <td style="vertical-align: top;">
466- <br>
467-
468- </td>
469- <td style="vertical-align: top;">
470- <br>
471-
472- </td>
473- </tr>
474- <tr>
475- <td style="vertical-align: top;">
476- <span
477-style="color: rgb(0, 0, 153);">To run </span>
478- <font
479-style="color: rgb(0, 0, 153);" color="" size="&acirc;€3">PsiphonX</font>
480- <span
481-style="color: rgb(0, 0, 153);"> you will need </span>
482- <span
483-style="font-weight: bold; color: rgb(0, 0, 153);">Windows XP </span>
484- <span
485-style="color: rgb(0, 0, 153);">or higher and </span>
486- <span
487-style="font-weight: bold; color: rgb(0, 0, 153);">
488- Internet Explorer
489- 6.0
490- </span>
491- <span style="color: rgb(0, 0, 153);">or higher or </span>
492- <span
493-style="font-weight: bold; color: rgb(0, 0, 153);">Google Chrome</span>
494- <span
495-style="color: rgb(0, 0, 153);">.</span>
496- </td>
497- <td style="vertical-align: top;">
498- <br>
499-
500- </td>
501- </tr>
502- <tr>
503- <td style="vertical-align: top;">
504- <br>
505-
506- </td>
507- <td style="vertical-align: top;">
508- <br>
509-
510- </td>
511- </tr>
512- <tr>
513- <td
514- style="vertical-align: top; background-color: rgb(238, 238, 238);">
515- <p style="color: rgb(0, 0, 153);">
516- <font size="+1">
517- <span
518-style="font-weight: bold;">Downloading and Running PsiphonX</span></font>
519- </p>
520- </td>
521- <td style="vertical-align: top;">
522- <br>
523-
524- </td>
525- </tr>
526- <tr>
527- <td style="vertical-align: top;">
528- <br>
529-
530- </td>
531- <td style="vertical-align: top;">
532- <br>
533-
534- </td>
535- </tr>
536- <tr>
537- <td style="vertical-align: top;">
538- <p style="color: rgb(0, 0, 153);">
539- To download and run PsiphonX, <a href="<?=$download_url?>">Download PsiphonX</a>
540- and click "<span style="font-weight: bold;">Run</span>" when
541- prompted. You should expect to see the following security warnings:<br>
542- <br>
543-</p>
544- <p style="color: rgb(0, 0, 153);">
545- <img
546-src="/images/file_download_security_warning.jpg">
547- <br>
548- <br>
549-</p>
550- <p style="color: rgb(0, 0, 153);">
551- <img
552-src="/images/run_security_warning.jpg">
553- <br>
554- <br>
555-</p>
556- <p style="color: rgb(0, 0, 153);">
557- When <font color=""
558-size="&acirc;€3">
559- <span style="color: rgb(0, 0, 153);">
560- PsiphonX
561- </span>
562- </font> is running, your
563- browser's proxy settings will be set to a Psiphon proxy and you can
564- begin to surf the web normally. <br>
565-</p>
566- <p style="color: rgb(0, 0, 153);">
567- All of your web-requests and
568- content will be routed via the proxy.&nbsp;&nbsp; <br>
569-</p>
570- </td>
571- <td style="vertical-align: top;">
572- <br>
573-
574- </td>
575- </tr>
576- <tr>
577- <td style="vertical-align: top;">
578- <br>
579-
580- </td>
581- <td style="vertical-align: top;">
582- <br>
583-
584- </td>
585- </tr>
586- <tr style="color: rgb(0, 0, 153);">
587- <td colspan="1" rowspan="1"
588- style="vertical-align: top; background-color: rgb(255, 255, 0);">
589- <span
590-style="font-weight: bold;">Note</span>:&nbsp; Please be aware that
591- although <font size="&acirc;€3">
592- PsiphonX
593- </font><span
594-style="color: rgb(153, 0, 0);"> </span>does establish a secure
595- connection to the Psiphon proxy, PsiphonX does not support
596- anonymization.
597-</td>
598- <td style="vertical-align: top;">
599- <br>
600-
601- </td>
602- </tr>
603- <tr>
604- <td colspan="2" rowspan="1" style="vertical-align: top;">
605- <br>
606-
607- </td>
608- </tr>
609- <tr style="color: rgb(0, 0, 153);">
610- <td colspan="1" rowspan="1"
611- style="vertical-align: top;">
612- You can start, stop, and exit <font size="&acirc;€3">
613- PsiphonX
614- </font> using its simple GUI:<br>
615- </td>
616- </tr>
617-
618- <tr>
619- <td colspan="2" rowspan="1" style="vertical-align: top;">
620- <br>
621-
622- </td>
623- </tr>
624- <tr>
625- <td colspan="1" rowspan="1" style="vertical-align: top;">
626- <p>
627- <img src="/images/psiphonx_ui.jpg"> </p>
628- </td>
629- <td style="vertical-align: top;">
630- <br>
631-
632- </td>
633- </tr>
634- </tbody>
635- </table>
636
637=== removed file 'trunk/www/psiphonx_fa.php'
638--- trunk/www/psiphonx_fa.php 2011-02-07 17:45:39 +0000
639+++ trunk/www/psiphonx_fa.php 1970-01-01 00:00:00 +0000
640@@ -1,371 +0,0 @@
641-<?php
642-
643-/*
644- Psiphon Circumvention Platform
645- Copyright (C) 2009-2010 Psiphon Inc.
646-
647- This program is free software: you can redistribute it and/or modify
648- it under the terms of the GNU General Public License as published by
649- the Free Software Foundation, either version 3 of the License, or
650- (at your option) any later version.
651-
652- This program is distributed in the hope that it will be useful,
653- but WITHOUT ANY WARRANTY; without even the implied warranty of
654- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
655- GNU General Public License for more details.
656-
657- You should have received a copy of the GNU General Public License
658- along with this program. If not, see <http://www.gnu.org/licenses/>.
659-*/
660-
661-include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
662-include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
663-
664-// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
665-
666-$download_url = "/download.php?url=".$_GET['url'];
667-?>
668- <table style="width: 100%; font-family: Helvetica,Arial,sans-serif;">
669- <tbody style="direction: rtl">
670- <tr valign="middle">
671- <td colspan="1" rowspan="1" style="color: rgb(204, 0, 0);">
672- <font size="+2">
673- <a href="%5C%22$download_url%5C%22">
674- <meta http-equiv="content-type"
675- content="text/html; charset=UTF-8">
676- </a>
677- </font>
678- <img style="width: 435px; height: 125px;"
679-alt="Psiphon Logo" src="/images/psiphon_logo.jpg">
680- <font size="+2">
681- <br>
682-
683- </font>
684- </td>
685- <td style="vertical-align: top;">
686- <br>
687-
688- </td>
689- </tr>
690- <tr>
691- <td colspan="1" rowspan="1" style="vertical-align: top;">
692- <br>
693-
694- </td>
695- <td style="vertical-align: top;">
696- <br>
697-
698- </td>
699- </tr>
700- <tr>
701- <td colspan="1" rowspan="1"
702- style="vertical-align: top; background-color: rgb(204, 204, 204);">
703- <font
704-style="color: rgb(0, 0, 153);" size="+2">
705- <a
706-href="<?=$download_url?>">دانلود سایفون اکس</a>
707- </font>
708- <font
709-size="+2">
710- <font size="+1">
711- &nbsp;&nbsp; <span
712-style="color: rgb(153, 0, 0);">جدید</span>
713- </font>
714- </font>
715- </td>
716- <td style="vertical-align: top;">
717- <br>
718-
719- </td>
720- </tr>
721- <tr>
722- <td colspan="1" rowspan="1" style="vertical-align: top;">
723- <br>
724-
725- </td>
726- <td style="vertical-align: top;">
727- <br>
728-
729- </td>
730- </tr>
731- <tr>
732- <td
733- style="vertical-align: top;">
734- <font
735- color="" size="&acirc;€3">
736- <span style="color: rgb(0, 0, 153);">
737- <font
738- size="+1">
739- <span style="font-weight: bold;">PsiphonX</span>
740- </font>
741- </span>
742- </font>
743- </td>
744- </tr>
745- <tr>
746- <td style="vertical-align: top;">
747- <br>
748-
749- </td>
750- <td style="vertical-align: top;">
751- <br>
752-
753- </td>
754- </tr>
755- <tr>
756- <td
757- style="vertical-align: top; background-color: rgb(238, 238, 238);">
758- <font
759-color="" size="&acirc;€3">
760- <span style="color: rgb(0, 0, 153);">
761- <font
762-size="+1">
763- <span style="font-weight: bold;">سایفون اکس چیست</span>
764- </font>
765- </span>
766- </font>
767- </td>
768- <td style="vertical-align: top;">
769- <br>
770-
771- </td>
772- </tr>
773- <tr>
774- <td style="vertical-align: top;">
775- <br>
776-
777- </td>
778- <td style="vertical-align: top;">
779- <br>
780-
781- </td>
782- </tr>
783- <tr>
784- <td style="vertical-align: top;">
785- <p>
786- <font color="" size="&acirc;€3">
787- <span style="color: rgb(0, 0, 153);">
788- سایفون اکس جدیدترین محصول شرکت سایفون است که بازدید از سا یتهای اینترنتی را بهتر میکند. این برنامه به شما اجازه میدهد که نه تنها محتویات سایتها را ببینید، بلکه بتوانید ارتباط دوطرفه با محتویات سایتها برقرار کنید<br>
789- </span>
790- </font>
791- </p>
792- <p>
793- <font color="" size="&acirc;€3">
794- <span style="color: rgb(0, 0, 153);">
795- سایفون اکس
796- ابزار ساده ای است که به شما اجازه میدهد به محتویاتی از سایتها که قبلا با سایفون ۲.۵ ممکن نبود دسترسی پیدا کنید<br>
797-</span>
798- </font>
799- </p>
800- <p>
801- <font color="" size="&acirc;€3">
802- <span style="color: rgb(0, 0, 153);">
803- کد برنامه سایفون اکس
804- در این سایت قابل دسترسی است<br>
805- </span>
806- <a href="http://launchpad.net/psiphon">http://launchpad.net/psiphon</a>
807- </font>
808- </p>
809- </td>
810- <td style="vertical-align: top;">
811- <br>
812-
813- </td>
814- </tr>
815- <tr>
816- <td style="vertical-align: top;">
817- <br>
818-
819- </td>
820- <td style="vertical-align: top;">
821- <br>
822-
823- </td>
824- </tr>
825- <tr>
826- <td
827- style="vertical-align: top; background-color: rgb(238, 238, 238);">
828- <p>
829- <font color="" size="&acirc;€3">
830- <span style="color: rgb(0, 0, 153);">
831- <font
832-size="+1">
833- <span style="font-weight: bold;">نیازهای سایفون اکس</span>
834- </font>
835- </span>
836- </font>
837- </p>
838- </td>
839- <td style="vertical-align: top;">
840- <br>
841-
842- </td>
843- </tr>
844- <tr>
845- <td style="vertical-align: top;">
846- <br>
847-
848- </td>
849- <td style="vertical-align: top;">
850- <br>
851-
852- </td>
853- </tr>
854- <tr>
855- <td style="vertical-align: top;">
856- <span
857-style="color: rgb(0, 0, 153);">برای اجرای </span>
858- <font
859-style="color: rgb(0, 0, 153);" color="" size="&acirc;€3">سایفون اکس</font>
860- <span
861-style="color: rgb(0, 0, 153);"> شما این برنامه ها (یا نسخه جدیدتر آنها) را احتیاج دارید</span><br>
862- <span
863-style="font-weight: bold; color: rgb(0, 0, 153);">Windows XP </span>
864-<br>
865- <span
866-style="font-weight: bold; color: rgb(0, 0, 153);">
867- Internet Explorer
868- 6.0
869- </span>
870- <span
871-style="font-weight: bold; color: rgb(0, 0, 153);">Google Chrome</span>
872- <span
873-style="color: rgb(0, 0, 153);"></span>
874- </td>
875- <td style="vertical-align: top;">
876- <br>
877-
878- </td>
879- </tr>
880- <tr>
881- <td style="vertical-align: top;">
882- <br>
883-
884- </td>
885- <td style="vertical-align: top;">
886- <br>
887-
888- </td>
889- </tr>
890- <tr>
891- <td
892- style="vertical-align: top; background-color: rgb(238, 238, 238);">
893- <p style="color: rgb(0, 0, 153);">
894- <font size="+1">
895- <span
896-style="font-weight: bold;">دانلود و اجرای سایفون اکس
897- </span>
898- </font>
899- </p>
900- </td>
901- <td style="vertical-align: top;">
902- <br>
903-
904- </td>
905- </tr>
906- <tr>
907- <td style="vertical-align: top;">
908- <br>
909-
910- </td>
911- <td style="vertical-align: top;">
912- <br>
913-
914- </td>
915- </tr>
916- <tr>
917- <td style="vertical-align: top;">
918- <p style="color: rgb(0, 0, 153);">
919- برای دنلود و اجرای این برنامه روی "دانلود سایفون اکس" کلیک کنید و کلید "اجرا" را انتخاب کنید. پیغامهای زیر را دریافت خواهید کرد<br>
920- <br>
921- <font
922-style="color: rgb(0, 0, 153);" size="+2">
923- <a href="<?=$download_url?>">دانلود سایفون اکس</a>
924- </font>
925-</p>
926- <p style="color: rgb(0, 0, 153);">
927- <img
928-src="/images/file_download_security_warning.jpg">
929- <br>
930- <br>
931-</p>
932- <p style="color: rgb(0, 0, 153);">
933- <img
934-src="/images/run_security_warning.jpg">
935- <br>
936- <br>
937-</p>
938- <p style="color: rgb(0, 0, 153);">
939- وقتی <font color=""
940-size="&acirc;€3">
941- <span style="color: rgb(0, 0, 153);">
942- سایفون اکس
943- </span>
944- </font> را اجرا میکنید پروکسی گردشگر اینترنت شما یک پروکسی سایفون میشود و شما میتوانید بطور نرمال سایتهای اینترنت را ببینید <br>
945-</p>
946- <p style="color: rgb(0, 0, 153);">
947- درخواستهای گردشگر شما و محتویات دریافتی از طریق پروکسی انجام میشود<br>
948-</p>
949- </td>
950- <td style="vertical-align: top;">
951- <br>
952-
953- </td>
954- </tr>
955- <tr>
956- <td style="vertical-align: top;">
957- <br>
958-
959- </td>
960- <td style="vertical-align: top;">
961- <br>
962-
963- </td>
964- </tr>
965- <tr style="color: rgb(0, 0, 153);">
966- <td colspan="1" rowspan="1"
967- style="vertical-align: top; background-color: rgb(255, 255, 0);">
968- <span
969- style="font-weight: bold;">توجه</span>:&nbsp; گرچه ارتباط شما با پروکسی سایفون امن است، <font size="&acirc;€3">
970- سایفون اکس
971- </font><span
972-style="color: rgb(153, 0, 0);"> </span>هویت شما را مخفی نمیکند <br>
973-</td>
974- </tr>
975- </tr>
976- <td style="vertical-align: top;">
977- <br>
978-
979- </td>
980- </tr>
981- <tr style="color: rgb(0, 0, 153);">
982- <td colspan="1" rowspan="1"
983- style="vertical-align: top;">
984- برای شروع، توقف و خروج از <font size="&acirc;€3">
985- سایفون اکس
986- </font> از این رابط کاربری گرافیکی استفاده کنید
987- </td>
988- </tr>
989- <td style="vertical-align: top;">
990- <br>
991-
992- </td>
993- </tr>
994- <tr>
995- <td colspan="2" rowspan="1" style="vertical-align: top;">
996- <br>
997-
998- </td>
999- </tr>
1000- <tr>
1001- <td colspan="1" rowspan="1" style="vertical-align: top;">
1002- <p>
1003- <img src="/images/psiphonx_ui.jpg"> </p>
1004- </td>
1005- <td style="vertical-align: top;">
1006- <br>
1007-
1008- </td>
1009- </tr>
1010- </tbody>
1011- </table>

Subscribers

People subscribed via source and target branches

to all changes: