mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 04:15:12 +00:00
restrict sslify to img tags by default - set config system.sslify_everything if you want to proxy media files also.
This commit is contained in:
parent
612efe56f1
commit
06ec5424c7
3 changed files with 13 additions and 3 deletions
|
@ -75,8 +75,9 @@ require_once('include/attach.php');
|
||||||
try {
|
try {
|
||||||
$oauth = new FKOAuth1();
|
$oauth = new FKOAuth1();
|
||||||
$req = OAuthRequest::from_request();
|
$req = OAuthRequest::from_request();
|
||||||
|
|
||||||
list($consumer,$token) = $oauth->verify_request($req);
|
list($consumer,$token) = $oauth->verify_request($req);
|
||||||
// list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request());
|
|
||||||
if (!is_null($token)){
|
if (!is_null($token)){
|
||||||
$oauth->loginUser($token->uid);
|
$oauth->loginUser($token->uid);
|
||||||
|
|
||||||
|
|
|
@ -912,8 +912,17 @@ function sslify($s) {
|
||||||
if (strpos(z_root(),'https:') === false)
|
if (strpos(z_root(),'https:') === false)
|
||||||
return $s;
|
return $s;
|
||||||
|
|
||||||
|
// By default we'll only sslify img tags because media files will probably choke.
|
||||||
|
// You can set sslify_everything if you want - but it will likely white-screen if it hits your php memory limit.
|
||||||
|
// The downside is that http: media files will likely be blocked by your browser
|
||||||
|
// Complain to your browser maker
|
||||||
|
|
||||||
|
$allow = get_config('system','sslify_everything');
|
||||||
|
|
||||||
|
$pattern = (($allow) ? "/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/" : "/\<img(.*?)src=\"(http\:.*?)\"(.*?)\>/" );
|
||||||
|
|
||||||
$matches = null;
|
$matches = null;
|
||||||
$cnt = preg_match_all("/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/",$s,$matches,PREG_SET_ORDER);
|
$cnt = preg_match_all($pattern,$s,$matches,PREG_SET_ORDER);
|
||||||
if ($cnt) {
|
if ($cnt) {
|
||||||
foreach ($matches as $match) {
|
foreach ($matches as $match) {
|
||||||
$filename = basename( parse_url($match[2], PHP_URL_PATH) );
|
$filename = basename( parse_url($match[2], PHP_URL_PATH) );
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2015-10-27.1198
|
2015-10-28.1199
|
||||||
|
|
Loading…
Reference in a new issue