harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip sslify for images if it already were cached with https enabled

Browse Source
This commit is contained in:
Max Kostikov 2018-11-29 20:36:21 +01:00
parent 1a9ea64523
commit 3265c2e543
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/text.php
View File

@ -1111,7 +1111,8 @@ function linkify($s, $me = false) {
function sslify($s) { function sslify($s) {
// Local photo cache // Local photo cache
if(get_config('system','photo_cache_enable', 0) && local_channel()) { $cacheon = get_config('system','photo_cache_enable', 0);
if($cache && local_channel()) {
$matches = null; $matches = null;
$cnt = preg_match_all("/\<img(.+?)src=[\"|'](https?\:.*?)[\"|'](.*?)\>/",$s,$matches,PREG_SET_ORDER); $cnt = preg_match_all("/\<img(.+?)src=[\"|'](https?\:.*?)[\"|'](.*?)\>/",$s,$matches,PREG_SET_ORDER);
if ($cnt) { if ($cnt) {
@ -1138,6 +1139,10 @@ function sslify($s) {
// Complain to your browser maker // Complain to your browser maker
$allow = get_config('system','sslify_everything'); $allow = get_config('system','sslify_everything');
//We can skip next part if this only images and cache is on
if((! $allow) && $cacheon)
return $s;
$pattern = (($allow) ? "/\<(.*?)src=[\"|'](http\:.*?)[\"|'](.*?)\>/" : "/\<img(.*?)src=[\"|'](http\:.*?)[\"|'](.*?)\>/" ); $pattern = (($allow) ? "/\<(.*?)src=[\"|'](http\:.*?)[\"|'](.*?)\>/" : "/\<img(.*?)src=[\"|'](http\:.*?)[\"|'](.*?)\>/" );