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
=== modified file 'trunk/www/bluebar.php'
--- trunk/www/bluebar.php 2011-09-13 15:34:40 +0000
+++ trunk/www/bluebar.php 2014-06-27 20:10:40 +0000
@@ -87,24 +87,6 @@
87<?87<?
88echo $v;88echo $v;
8989
90// add download link if this proxy has SSH configuration
91
92if (strlen($proxy_record['ssh_server_fingerprint']) > 0 &&
93 strlen($proxy_record['ssh_user_name']) > 0 &&
94 strlen($proxy_record['ssh_user_password']) > 0)
95{
96 if ($record_user['last_lang'] == "fa")
97 {
98 $download_url = "/psiphonx_fa.php?url=".urlencode(getenv("psiphon_proxy_uri"));
99 echo "<a style=\"color:red; font-weight:bold\" href=\"$download_url\">".utf8_encode_string("سایفون اکس - جدید")."</a> | ";
100 }
101 else
102 {
103 $download_url = "/psiphonx.php?url=".urlencode(getenv("psiphon_proxy_uri"));
104 echo "<a style=\"color:red; font-weight:bold\" href=\"$download_url\">New! Try PsiphonX</a> | ";
105 }
106}
107
108// Indicate custom user agent, if it configured for the proxied URL90// Indicate custom user agent, if it configured for the proxied URL
10991
110if (isset($_SERVER["psiphon_custom_user_agent"]) && isset($_SERVER["psiphon_custom_user_agent_back_link"])) {92if (isset($_SERVER["psiphon_custom_user_agent"]) && isset($_SERVER["psiphon_custom_user_agent_back_link"])) {
11193
=== removed file 'trunk/www/download.php'
--- trunk/www/download.php 2014-06-27 19:30:53 +0000
+++ trunk/www/download.php 1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
1<?php
2
3/*
4 Psiphon Circumvention Platform
5 Copyright (C) 2009-2010 Psiphon Inc.
6
7 This program is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version.
11
12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
22include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
23
24// Load current proxy information
25
26$query = "SELECT * FROM proxy WHERE hostname = :hostname";
27$result = db_query_execute($config, $query, convert_null_array(array(":hostname" => $_SERVER[HTTP_HOST])));
28$proxy_record = db_fetch_result($config, $result);
29if (!$proxy_record)
30{
31 include($_SERVER[DOCUMENT_ROOT]."/http-errors/404.php");
32}
33
34// error if this isn't a configured proxy (this is also checked in the UI in bluebar.php)
35
36if (!(strlen($proxy_record['ssh_server_fingerprint']) > 0 &&
37 strlen($proxy_record['ssh_user_name']) > 0 &&
38 strlen($proxy_record['ssh_user_password']) > 0))
39{
40 include($_SERVER[DOCUMENT_ROOT]."/http-errors/404.php");
41}
42
43// Update download statistics
44
45// This stats entry is unique for the region, proxy, current day, and user group. If an
46// existing record is found for that key, the counter is incremented. Otherwise, a new
47// record is created.
48
49$date = strftime("%Y-%m-%d");
50
51$region = lookup_region($config);
52
53$query = "UPDATE stat_client_download SET total=total+1 ".
54 "WHERE date = :date AND region = :region AND proxy = :proxy_id AND code = 'PsiphonX'";
55$result = db_query_execute($config, $query, convert_null_array(array(":date" => $date, ":region" => $region, ":proxy_id" => $proxy_id)));
56
57if (!db_num_rows_affected($result))
58{
59 $query = "INSERT INTO stat_client_download (date, region, proxy, total, code) ".
60 "VALUES (:date, :region, :proxy_id, 1, 'PsiphonX')";
61 db_query_execute($config, $query, convert_null_array(array(":date" => $date, ":region" => $region, ":proxy_id" => $proxy)));
62}
63
64// EXE string replacement helper
65
66function replace_string($exe, $placeholder, $value)
67{
68 // The replacement string must be exactly the same size as the
69 // current string or the EXE is invalid. Truncate if more than
70 // 512 characters and pad with zeros if less.
71
72 $padded_value = str_pad($value, strlen($placeholder));
73 if (strlen($padded_value) > strlen($placeholder))
74 {
75 $padded_value = substr($padded_value, 0, strlen($placeholder));
76 }
77
78 return str_replace($placeholder, $padded_value, $exe);
79}
80
81// We'll be outputting an EXE
82
83header('Content-type: application/exe');
84header('Content-Disposition: attachment; filename="psiphonx.exe"');
85
86$exe = file_get_contents('psiphonx.exe');
87
88// populate exe strings with values for current proxy
89
90$http_proxy_port_number_placeholder =
91 "938B0F3298373DC739BA6FF2755090400F38512D59912410B144DB4F36B2D3A5".
92 "94AE0DB5E7D9E92BEB0D59D1C8B8ADABF9FB0CFA4A9D27F76ED297CC9965DB18".
93 "2C39C874EDD978FDAE1842DBF97F534593AC53E59DF0D545BCEEABDE4CE11831".
94 "508CD6A1BF06C15E5E1CCDC420F89E385871B31D95AD574D2A20C989EF844F09".
95 "A6D451065A6A8C835675A5170B2CF5D7FE049D6A738F3720040ABB0C1450B462".
96 "CC462C3D192C4F2E1744659D278A1493151ECED35C00FF9740C0C3C2528FC235".
97 "2393A89D40827099DABF53C2FAECEA7743E40DB4F3329E8EA27C812E06D59385".
98 "50020A285A69ADB17659FE8E60B2AE512EBBAB499C9AF86ED423EEF15F710030";
99
100$exe = replace_string($exe, $http_proxy_port_number_placeholder, $proxy_record['http_proxy_port_number']);
101
102$ssh_server_host_placeholder =
103 "B4FDCA80A6C01F6B5B2712BCDFD56FB890E2A0CDA58BE9E36788D45BFAB69FBE".
104 "FF51CBA580FF7B5600F1D163B52CC4201B115B82DCDED5AD389E94E677590F03".
105 "A45B239D99A2418F8DD4E32AAFE780B03696249D21339C6E50202CCAF38887B1".
106 "8C09A857D20BF284531677264F33B30D0A83F6DCAA4663620DF80ED445A0DA82".
107 "C5F4BC6A4335473F0D37B0252ED1E54F9466D6D8EAB23A3970C4DB15053947E8".
108 "3627AE9F649776818692052E14CCD75DC8275A915C8C78B523307BCE7684D2FC".
109 "2E3C285C5A7C3D6A0EB8FD754D5B6D913BEADEAE254147F752391F052BFB4B61".
110 "5CEAC356123C4C3AD8B00169F08397EBEE6D96AC0E42748F853C97D427901815";
111
112$exe = replace_string($exe, $ssh_server_host_placeholder, $proxy_record['hostname']);
113
114$ssh_server_port_number_placeholder =
115 "997AE2C56FA7B92342541F4386B4402B82B27F32D7A12EF6A5E0F78922BFFD4E".
116 "C8CCDD8729580712EB3E48407398D3CEB97B5DF615AD85C5DEFD47ADB82E5848".
117 "C039F8CEE15BA64721251FD8364BA9BCF25181A2E2333365C1DA0190D7368CEB".
118 "9E4AE5E96535E989AB85C41A0BA453C7008A3C64E12DCFD9BE13C9C707210609".
119 "62F6D63260C91CFE6EFE9BE74692AD522A0E718798045DDEB2A41802C92375B7".
120 "985B19DE665DB03422C6BDFC0489B72E6EA06A1526AD612038DCAEAC5EAF409F".
121 "F291FFB8DD959518C82327928DFF735002B300A5B29064217B7E8774CAC37255".
122 "34D6C26CF8ED2D6D81286E3CB42C7D55E61368202F7E29D29E7B2C33F0120EEB";
123
124$exe = replace_string($exe, $ssh_server_port_number_placeholder, $proxy_record['ssh_server_port_number']);
125
126$ssh_user_name_placeholder =
127 "C189DF9EF00E9BAC0983DB979EE71543FEEC24F1A450C2B4DEC87DB9851AA941".
128 "86851AD05EF9F72C617EEAB0FB3DA90B637A5CB3D5395800A6063355EC99A027".
129 "11D52F53196A6D5F3241EA6CBDE89897B5D0620F7990397EA51332EE72515D73".
130 "15892B5F61E1835FD3B7AF164392F40E790695066F70AB32B61124B20BC59CFD".
131 "8918C649FBDB5000611C92D6B5BEE27B80A3D06B3EF04E036A95CDB85A7BA6E5".
132 "FB98AEBBA647593B85EC15D04F022A761BD43831D07A054583DC33C53A0A5CB4".
133 "E4CA356EA7FAD42EB2863B47D708F309530298D0308639CAFA61093B7A37C6E6".
134 "3C6CA2E9EFC11BB2E6A0E819231986C75B2F30A56457692B399EF9E07DFC3C39";
135
136$exe = replace_string($exe, $ssh_user_name_placeholder, $proxy_record['ssh_user_name']);
137
138$ssh_user_password_placeholder =
139 "C187FA288F23AB96F2FC884A7E1659C0538D1265DE34687D47EA0D4D207E5B79".
140 "066DFDA630FD955A4FFCB6B8A783431DE48091E62148DE66BD88D4B708862D2F".
141 "C78D636B2D735091CF18121104F0121FF5DB799DA814B4CDB2933AD7220C93D6".
142 "1A58AFB2A1667F8792E17C20ABF4B3FE22CA72F6101E905EE0C3CCCDCFEC2CCC".
143 "F55FCFB66CDCB1AC1A5052CF256F044C1CC442BD1D727D5B2445AD39BCE82ECE".
144 "AAF14950BF403C4408C9B94B5EC98410D1CD04F5B0C40615A470070837225CA8".
145 "8167AA6E4619BD2CF43F9760DD28D7C2FA08407F5B2E1A37D429F5DA659A2B61".
146 "F480509F635AA2DEB1BDAFACD56536B23BA205C9D0F559D3A15195FE663A2A2B";
147
148$exe = replace_string($exe, $ssh_user_password_placeholder, $proxy_record['ssh_user_password']);
149
150$ssh_server_fingerprint_placeholder =
151 "666A052FD8A2C6C29583C070DC7865831B69858F561B1C51CEBD18620F008C8F".
152 "2EB54325B1053713F1B56F2AD4E99C26D4B8E8ABEBDBA1263384A8EF77B212AD".
153 "AADFCAC475E781AF4C2702932D6D03839ED17562F27451F879563027DBD56321".
154 "0B03384EA75135F76B44131A59AB2C01246D88C920169588A4A1866A181DF433".
155 "E7AF903C5EE7BA0B0D0201478169108FE1D12E4078F93963F8B47E4D43B23438".
156 "74EEC9B0A52EDB56ECC8EC552575874A231BA0D2DE8D33429ED9BD998FD5377F".
157 "8F6809857640CEF633DA4082BD3D17B11BE2FEB95CF3DEF6CC4389790A315E32".
158 "B5EA0FB3D16F2EAFFAD5A4A3A666E3B63BC9DFEE457D5F1E96B61AB55B339BDA";
159
160$exe = replace_string($exe, $ssh_server_fingerprint_placeholder, $proxy_record['ssh_server_fingerprint']);
161
162// Replace the home page string in the EXE with the user's
163// current Bluebar page. This causes the client to use that
164// URL as the default home page.
165
166// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
167
168$home_page_placeholder =
169 "F0714E23DD7F3ED63AE73E788FC026C7C35AA1EF7D26B78F4560769FDE6FD1DC".
170 "EB28BE6761AB008DF977D2E2C33E7C1D7D8CB9AE1780472CB3BA49C715683EF5".
171 "5958BA45F1E9A32F1C5FA6FC078BE3D7FB1B59A6D98803D38659DB0304645F30".
172 "B114D3C0C68C7B2B029C6EA07590EC01008276DF195C1251F38BA3AD6D57B86E".
173 "FE345018E8E6E32E0EAEFFD77D727609B3A4B4D20611A9CC11FF033657A3A068".
174 "48377A21CA5A6394A2F2DD6194D8DD23BEB4F2A85A5D268698C61E09629A3D29".
175 "E88196FC00FB89DD9601390276634FBCCF90357DAD36E003D29B6C076E13805B".
176 "60F225933A3BFF281801A3FBB58BF76AFFD3E61EF2221A5F727A2DF6621BBF92";
177
178$exe = replace_string($exe, $home_page_placeholder, $_GET['url']);
179
180$temp_file_name = tempnam("/tmp", "psiphonx");
181$temp_file_handle = fopen($temp_file_name, "w");
182fwrite($temp_file_handle, $exe);
183fclose($temp_file_handle);
184$signed_temp_file_name = $temp_file_name . ".signed";
185// No shell injection risk (ie no user input) unless we don't trust tempname()
186exec("osslsigncode -spc code-signing-cert.spc -key code-signing-key.der -in " . $temp_file_name . " -out " . $signed_temp_file_name);
187unlink($temp_file_name);
188if (file_exists($signed_temp_file_name))
189{
190 $signed_temp_file_handle = fopen($signed_temp_file_name, "r");
191 echo fread($signed_temp_file_handle, filesize($signed_temp_file_name));
192 fclose($signed_temp_file_handle);
193 unlink($signed_temp_file_name);
194}
195else
196{
197 echo $exe;
198}
199
200?>
2010
=== removed file 'trunk/www/images/file_download_security_warning.jpg'
202Binary 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 differ1Binary 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
=== removed file 'trunk/www/images/psiphonx_ui.jpg'
203Binary 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 differ2Binary 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
=== removed file 'trunk/www/images/run_security_warning.jpg'
204Binary 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 differ3Binary 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
=== removed file 'trunk/www/psiphonx.exe'
205Binary files trunk/www/psiphonx.exe 2011-03-01 19:51:19 +0000 and trunk/www/psiphonx.exe 1970-01-01 00:00:00 +0000 differ4Binary 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
=== removed file 'trunk/www/psiphonx.php'
--- trunk/www/psiphonx.php 2011-03-01 20:08:05 +0000
+++ trunk/www/psiphonx.php 1970-01-01 00:00:00 +0000
@@ -1,389 +0,0 @@
1<?php
2
3/*
4 Psiphon Circumvention Platform
5 Copyright (C) 2009-2010 Psiphon Inc.
6
7 This program is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version.
11
12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
22include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
23
24// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
25
26$download_url = "/download.php?url=".$_GET['url'];
27?>
28 <table style="width: 100%; font-family: Helvetica,Arial,sans-serif;">
29 <tbody>
30 <tr valign="middle">
31 <td colspan="1" rowspan="1" style="color: rgb(204, 0, 0);">
32 <font size="+2">
33 <a href="%5C%22$download_url%5C%22">
34 <meta http-equiv="content-type"
35 content="text/html; charset=ISO-8859-1">
36 </a>
37 </font>
38 <img style="width: 435px; height: 125px;"
39alt="Psiphon Logo" src="/images/psiphon_logo.jpg">
40 <font size="+2">
41 <br>
42
43 </font>
44 </td>
45 <td style="vertical-align: top;">
46 <br>
47
48 </td>
49 </tr>
50 <tr>
51 <td colspan="1" rowspan="1" style="vertical-align: top;">
52 <br>
53
54 </td>
55 <td style="vertical-align: top;">
56 <br>
57
58 </td>
59 </tr>
60 <tr>
61 <td colspan="1" rowspan="1"
62 style="vertical-align: top; background-color: rgb(204, 204, 204);">
63 <font
64style="color: rgb(0, 0, 153);" size="+2">
65 <a
66href="<?=$download_url?>">Download PsiphonX</a>
67 </font>
68 <font
69size="+2">
70 <font size="+1">
71 &nbsp;&nbsp; <span
72style="color: rgb(153, 0, 0);">(NEW!)</span>
73 </font>
74 </font>
75 </td>
76 <td style="vertical-align: top;">
77 <br>
78
79 </td>
80 </tr>
81 <tr>
82 <td colspan="1" rowspan="1" style="vertical-align: top;">
83 <br>
84
85 </td>
86 <td style="vertical-align: top;">
87 <br>
88
89 </td>
90 </tr>
91 <tr>
92 <td
93 style="vertical-align: top; background-color: rgb(238, 238, 238);">
94 <font
95color="" size="&acirc;€3">
96 <span style="color: rgb(0, 0, 153);">
97 <font
98size="+1">
99 <span style="font-weight: bold;">What is PsiphonX?</span>
100 </font>
101 </span>
102 </font>
103 </td>
104 <td style="vertical-align: top;">
105 <br>
106
107 </td>
108 </tr>
109 <tr>
110 <td style="vertical-align: top;">
111 <br>
112
113 </td>
114 <td style="vertical-align: top;">
115 <br>
116
117 </td>
118 </tr>
119 <tr>
120 <td style="vertical-align: top;">
121 <p>
122 <font color="" size="&acirc;€3">
123 <span style="color: rgb(0, 0, 153);">
124 PsiphonX is a brand-new product from
125 Psiphon that extends your Psiphon browsing experience. A downloadable
126 proxy application,
127 </span>
128 </font>
129 <font color="" size="&acirc;€3">
130 <span
131style="color: rgb(0, 0, 153);">
132 PsiphonX
133 </span>
134 </font>
135 <font color=""
136size="&acirc;€3">
137 <span style="color: rgb(0, 0, 153);">
138 enables you to view
139 and interact with all web-content without any functional limitations.<br>
140</span>
141 </font>
142 </p>
143 <p>
144 <font color="" size="&acirc;€3">
145 <span style="color: rgb(0, 0, 153);">
146 PsiphonX
147 was designed as a simple, straightforward tool that provides Psiphon
148 users with an alternative way to access Internet content and web-sites
149 that are not fully supported by Psiphon 2.x.<br>
150</span>
151 </font>
152 </p>
153 <p>
154 <font color="" size="&acirc;€3">
155 <span style="color: rgb(0, 0, 153);">
156 The
157 PsiphonX
158 </span>
159 </font>
160 <font
161color="" size="&acirc;€3">
162 <span style="color: rgb(0, 0, 153);">
163 code is
164 fully available on our open source site at <a href="http://launchpad.net/psiphon">http://launchpad.net/psiphon</a>.
165 </span>
166 </font>
167 </p>
168 </td>
169 <td style="vertical-align: top;">
170 <br>
171
172 </td>
173 </tr>
174 <tr>
175 <td style="vertical-align: top;">
176 <br>
177
178 </td>
179 <td style="vertical-align: top;">
180 <br>
181
182 </td>
183 </tr>
184 <tr>
185 <td
186 style="vertical-align: top; background-color: rgb(238, 238, 238);">
187 <p>
188 <font color="" size="&acirc;€3">
189 <span style="color: rgb(0, 0, 153);">
190 <font
191size="+1">
192 <span style="font-weight: bold;">PsiphonX</span></font></span></font>
193 <font
194color="" size="&acirc;€3">
195 <span style="color: rgb(0, 0, 153);">
196 <font
197size="+1">
198 <span style="font-weight: bold;"></span>
199 </font>
200 </span>
201 </font>
202 <font
203color="" size="&acirc;€3">
204 <span style="color: rgb(0, 0, 153);">
205 <font
206size="+1">
207 <span style="font-weight: bold;">Requirements </span>
208 </font>
209 </span>
210 </font>
211 </p>
212 </td>
213 <td style="vertical-align: top;">
214 <br>
215
216 </td>
217 </tr>
218 <tr>
219 <td style="vertical-align: top;">
220 <br>
221
222 </td>
223 <td style="vertical-align: top;">
224 <br>
225
226 </td>
227 </tr>
228 <tr>
229 <td style="vertical-align: top;">
230 <span
231style="color: rgb(0, 0, 153);">To run </span>
232 <font
233style="color: rgb(0, 0, 153);" color="" size="&acirc;€3">PsiphonX</font>
234 <span
235style="color: rgb(0, 0, 153);"> you will need </span>
236 <span
237style="font-weight: bold; color: rgb(0, 0, 153);">Windows XP </span>
238 <span
239style="color: rgb(0, 0, 153);">or higher and </span>
240 <span
241style="font-weight: bold; color: rgb(0, 0, 153);">
242 Internet Explorer
243 6.0
244 </span>
245 <span style="color: rgb(0, 0, 153);">or higher or </span>
246 <span
247style="font-weight: bold; color: rgb(0, 0, 153);">Google Chrome</span>
248 <span
249style="color: rgb(0, 0, 153);">.</span>
250 </td>
251 <td style="vertical-align: top;">
252 <br>
253
254 </td>
255 </tr>
256 <tr>
257 <td style="vertical-align: top;">
258 <br>
259
260 </td>
261 <td style="vertical-align: top;">
262 <br>
263
264 </td>
265 </tr>
266 <tr>
267 <td
268 style="vertical-align: top; background-color: rgb(238, 238, 238);">
269 <p style="color: rgb(0, 0, 153);">
270 <font size="+1">
271 <span
272style="font-weight: bold;">Downloading and Running PsiphonX</span></font>
273 </p>
274 </td>
275 <td style="vertical-align: top;">
276 <br>
277
278 </td>
279 </tr>
280 <tr>
281 <td style="vertical-align: top;">
282 <br>
283
284 </td>
285 <td style="vertical-align: top;">
286 <br>
287
288 </td>
289 </tr>
290 <tr>
291 <td style="vertical-align: top;">
292 <p style="color: rgb(0, 0, 153);">
293 To download and run PsiphonX, <a href="<?=$download_url?>">Download PsiphonX</a>
294 and click "<span style="font-weight: bold;">Run</span>" when
295 prompted. You should expect to see the following security warnings:<br>
296 <br>
297</p>
298 <p style="color: rgb(0, 0, 153);">
299 <img
300src="/images/file_download_security_warning.jpg">
301 <br>
302 <br>
303</p>
304 <p style="color: rgb(0, 0, 153);">
305 <img
306src="/images/run_security_warning.jpg">
307 <br>
308 <br>
309</p>
310 <p style="color: rgb(0, 0, 153);">
311 When <font color=""
312size="&acirc;€3">
313 <span style="color: rgb(0, 0, 153);">
314 PsiphonX
315 </span>
316 </font> is running, your
317 browser's proxy settings will be set to a Psiphon proxy and you can
318 begin to surf the web normally. <br>
319</p>
320 <p style="color: rgb(0, 0, 153);">
321 All of your web-requests and
322 content will be routed via the proxy.&nbsp;&nbsp; <br>
323</p>
324 </td>
325 <td style="vertical-align: top;">
326 <br>
327
328 </td>
329 </tr>
330 <tr>
331 <td style="vertical-align: top;">
332 <br>
333
334 </td>
335 <td style="vertical-align: top;">
336 <br>
337
338 </td>
339 </tr>
340 <tr style="color: rgb(0, 0, 153);">
341 <td colspan="1" rowspan="1"
342 style="vertical-align: top; background-color: rgb(255, 255, 0);">
343 <span
344style="font-weight: bold;">Note</span>:&nbsp; Please be aware that
345 although <font size="&acirc;€3">
346 PsiphonX
347 </font><span
348style="color: rgb(153, 0, 0);"> </span>does establish a secure
349 connection to the Psiphon proxy, PsiphonX does not support
350 anonymization.
351</td>
352 <td style="vertical-align: top;">
353 <br>
354
355 </td>
356 </tr>
357 <tr>
358 <td colspan="2" rowspan="1" style="vertical-align: top;">
359 <br>
360
361 </td>
362 </tr>
363 <tr style="color: rgb(0, 0, 153);">
364 <td colspan="1" rowspan="1"
365 style="vertical-align: top;">
366 You can start, stop, and exit <font size="&acirc;€3">
367 PsiphonX
368 </font> using its simple GUI:<br>
369 </td>
370 </tr>
371
372 <tr>
373 <td colspan="2" rowspan="1" style="vertical-align: top;">
374 <br>
375
376 </td>
377 </tr>
378 <tr>
379 <td colspan="1" rowspan="1" style="vertical-align: top;">
380 <p>
381 <img src="/images/psiphonx_ui.jpg"> </p>
382 </td>
383 <td style="vertical-align: top;">
384 <br>
385
386 </td>
387 </tr>
388 </tbody>
389 </table>
3900
=== removed file 'trunk/www/psiphonx_fa.php'
--- trunk/www/psiphonx_fa.php 2011-02-07 17:45:39 +0000
+++ trunk/www/psiphonx_fa.php 1970-01-01 00:00:00 +0000
@@ -1,371 +0,0 @@
1<?php
2
3/*
4 Psiphon Circumvention Platform
5 Copyright (C) 2009-2010 Psiphon Inc.
6
7 This program is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version.
11
12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21include_once($_SERVER[DOCUMENT_ROOT]."/includes/common_includes.php");
22include_once($_SERVER[DOCUMENT_ROOT]."/includes/geoip_helpers.php");
23
24// TODO: validate, escape GET['url']? Possible injection attack against IE command line...
25
26$download_url = "/download.php?url=".$_GET['url'];
27?>
28 <table style="width: 100%; font-family: Helvetica,Arial,sans-serif;">
29 <tbody style="direction: rtl">
30 <tr valign="middle">
31 <td colspan="1" rowspan="1" style="color: rgb(204, 0, 0);">
32 <font size="+2">
33 <a href="%5C%22$download_url%5C%22">
34 <meta http-equiv="content-type"
35 content="text/html; charset=UTF-8">
36 </a>
37 </font>
38 <img style="width: 435px; height: 125px;"
39alt="Psiphon Logo" src="/images/psiphon_logo.jpg">
40 <font size="+2">
41 <br>
42
43 </font>
44 </td>
45 <td style="vertical-align: top;">
46 <br>
47
48 </td>
49 </tr>
50 <tr>
51 <td colspan="1" rowspan="1" style="vertical-align: top;">
52 <br>
53
54 </td>
55 <td style="vertical-align: top;">
56 <br>
57
58 </td>
59 </tr>
60 <tr>
61 <td colspan="1" rowspan="1"
62 style="vertical-align: top; background-color: rgb(204, 204, 204);">
63 <font
64style="color: rgb(0, 0, 153);" size="+2">
65 <a
66href="<?=$download_url?>">دانلود سایفون اکس</a>
67 </font>
68 <font
69size="+2">
70 <font size="+1">
71 &nbsp;&nbsp; <span
72style="color: rgb(153, 0, 0);">جدید</span>
73 </font>
74 </font>
75 </td>
76 <td style="vertical-align: top;">
77 <br>
78
79 </td>
80 </tr>
81 <tr>
82 <td colspan="1" rowspan="1" style="vertical-align: top;">
83 <br>
84
85 </td>
86 <td style="vertical-align: top;">
87 <br>
88
89 </td>
90 </tr>
91 <tr>
92 <td
93 style="vertical-align: top;">
94 <font
95 color="" size="&acirc;€3">
96 <span style="color: rgb(0, 0, 153);">
97 <font
98 size="+1">
99 <span style="font-weight: bold;">PsiphonX</span>
100 </font>
101 </span>
102 </font>
103 </td>
104 </tr>
105 <tr>
106 <td style="vertical-align: top;">
107 <br>
108
109 </td>
110 <td style="vertical-align: top;">
111 <br>
112
113 </td>
114 </tr>
115 <tr>
116 <td
117 style="vertical-align: top; background-color: rgb(238, 238, 238);">
118 <font
119color="" size="&acirc;€3">
120 <span style="color: rgb(0, 0, 153);">
121 <font
122size="+1">
123 <span style="font-weight: bold;">سایفون اکس چیست</span>
124 </font>
125 </span>
126 </font>
127 </td>
128 <td style="vertical-align: top;">
129 <br>
130
131 </td>
132 </tr>
133 <tr>
134 <td style="vertical-align: top;">
135 <br>
136
137 </td>
138 <td style="vertical-align: top;">
139 <br>
140
141 </td>
142 </tr>
143 <tr>
144 <td style="vertical-align: top;">
145 <p>
146 <font color="" size="&acirc;€3">
147 <span style="color: rgb(0, 0, 153);">
148 سایفون اکس جدیدترین محصول شرکت سایفون است که بازدید از سا یتهای اینترنتی را بهتر میکند. این برنامه به شما اجازه میدهد که نه تنها محتویات سایتها را ببینید، بلکه بتوانید ارتباط دوطرفه با محتویات سایتها برقرار کنید<br>
149 </span>
150 </font>
151 </p>
152 <p>
153 <font color="" size="&acirc;€3">
154 <span style="color: rgb(0, 0, 153);">
155 سایفون اکس
156 ابزار ساده ای است که به شما اجازه میدهد به محتویاتی از سایتها که قبلا با سایفون ۲.۵ ممکن نبود دسترسی پیدا کنید<br>
157</span>
158 </font>
159 </p>
160 <p>
161 <font color="" size="&acirc;€3">
162 <span style="color: rgb(0, 0, 153);">
163 کد برنامه سایفون اکس
164 در این سایت قابل دسترسی است<br>
165 </span>
166 <a href="http://launchpad.net/psiphon">http://launchpad.net/psiphon</a>
167 </font>
168 </p>
169 </td>
170 <td style="vertical-align: top;">
171 <br>
172
173 </td>
174 </tr>
175 <tr>
176 <td style="vertical-align: top;">
177 <br>
178
179 </td>
180 <td style="vertical-align: top;">
181 <br>
182
183 </td>
184 </tr>
185 <tr>
186 <td
187 style="vertical-align: top; background-color: rgb(238, 238, 238);">
188 <p>
189 <font color="" size="&acirc;€3">
190 <span style="color: rgb(0, 0, 153);">
191 <font
192size="+1">
193 <span style="font-weight: bold;">نیازهای سایفون اکس</span>
194 </font>
195 </span>
196 </font>
197 </p>
198 </td>
199 <td style="vertical-align: top;">
200 <br>
201
202 </td>
203 </tr>
204 <tr>
205 <td style="vertical-align: top;">
206 <br>
207
208 </td>
209 <td style="vertical-align: top;">
210 <br>
211
212 </td>
213 </tr>
214 <tr>
215 <td style="vertical-align: top;">
216 <span
217style="color: rgb(0, 0, 153);">برای اجرای </span>
218 <font
219style="color: rgb(0, 0, 153);" color="" size="&acirc;€3">سایفون اکس</font>
220 <span
221style="color: rgb(0, 0, 153);"> شما این برنامه ها (یا نسخه جدیدتر آنها) را احتیاج دارید</span><br>
222 <span
223style="font-weight: bold; color: rgb(0, 0, 153);">Windows XP </span>
224<br>
225 <span
226style="font-weight: bold; color: rgb(0, 0, 153);">
227 Internet Explorer
228 6.0
229 </span>
230 <span
231style="font-weight: bold; color: rgb(0, 0, 153);">Google Chrome</span>
232 <span
233style="color: rgb(0, 0, 153);"></span>
234 </td>
235 <td style="vertical-align: top;">
236 <br>
237
238 </td>
239 </tr>
240 <tr>
241 <td style="vertical-align: top;">
242 <br>
243
244 </td>
245 <td style="vertical-align: top;">
246 <br>
247
248 </td>
249 </tr>
250 <tr>
251 <td
252 style="vertical-align: top; background-color: rgb(238, 238, 238);">
253 <p style="color: rgb(0, 0, 153);">
254 <font size="+1">
255 <span
256style="font-weight: bold;">دانلود و اجرای سایفون اکس
257 </span>
258 </font>
259 </p>
260 </td>
261 <td style="vertical-align: top;">
262 <br>
263
264 </td>
265 </tr>
266 <tr>
267 <td style="vertical-align: top;">
268 <br>
269
270 </td>
271 <td style="vertical-align: top;">
272 <br>
273
274 </td>
275 </tr>
276 <tr>
277 <td style="vertical-align: top;">
278 <p style="color: rgb(0, 0, 153);">
279 برای دنلود و اجرای این برنامه روی "دانلود سایفون اکس" کلیک کنید و کلید "اجرا" را انتخاب کنید. پیغامهای زیر را دریافت خواهید کرد<br>
280 <br>
281 <font
282style="color: rgb(0, 0, 153);" size="+2">
283 <a href="<?=$download_url?>">دانلود سایفون اکس</a>
284 </font>
285</p>
286 <p style="color: rgb(0, 0, 153);">
287 <img
288src="/images/file_download_security_warning.jpg">
289 <br>
290 <br>
291</p>
292 <p style="color: rgb(0, 0, 153);">
293 <img
294src="/images/run_security_warning.jpg">
295 <br>
296 <br>
297</p>
298 <p style="color: rgb(0, 0, 153);">
299 وقتی <font color=""
300size="&acirc;€3">
301 <span style="color: rgb(0, 0, 153);">
302 سایفون اکس
303 </span>
304 </font> را اجرا میکنید پروکسی گردشگر اینترنت شما یک پروکسی سایفون میشود و شما میتوانید بطور نرمال سایتهای اینترنت را ببینید <br>
305</p>
306 <p style="color: rgb(0, 0, 153);">
307 درخواستهای گردشگر شما و محتویات دریافتی از طریق پروکسی انجام میشود<br>
308</p>
309 </td>
310 <td style="vertical-align: top;">
311 <br>
312
313 </td>
314 </tr>
315 <tr>
316 <td style="vertical-align: top;">
317 <br>
318
319 </td>
320 <td style="vertical-align: top;">
321 <br>
322
323 </td>
324 </tr>
325 <tr style="color: rgb(0, 0, 153);">
326 <td colspan="1" rowspan="1"
327 style="vertical-align: top; background-color: rgb(255, 255, 0);">
328 <span
329 style="font-weight: bold;">توجه</span>:&nbsp; گرچه ارتباط شما با پروکسی سایفون امن است، <font size="&acirc;€3">
330 سایفون اکس
331 </font><span
332style="color: rgb(153, 0, 0);"> </span>هویت شما را مخفی نمیکند <br>
333</td>
334 </tr>
335 </tr>
336 <td style="vertical-align: top;">
337 <br>
338
339 </td>
340 </tr>
341 <tr style="color: rgb(0, 0, 153);">
342 <td colspan="1" rowspan="1"
343 style="vertical-align: top;">
344 برای شروع، توقف و خروج از <font size="&acirc;€3">
345 سایفون اکس
346 </font> از این رابط کاربری گرافیکی استفاده کنید
347 </td>
348 </tr>
349 <td style="vertical-align: top;">
350 <br>
351
352 </td>
353 </tr>
354 <tr>
355 <td colspan="2" rowspan="1" style="vertical-align: top;">
356 <br>
357
358 </td>
359 </tr>
360 <tr>
361 <td colspan="1" rowspan="1" style="vertical-align: top;">
362 <p>
363 <img src="/images/psiphonx_ui.jpg"> </p>
364 </td>
365 <td style="vertical-align: top;">
366 <br>
367
368 </td>
369 </tr>
370 </tbody>
371 </table>

Subscribers

People subscribed via source and target branches

to all changes: