mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-22 03:15:19 +00:00
Merge remote branch 'upstream/master'
This commit is contained in:
commit
ddf4ef7520
5 changed files with 29 additions and 18 deletions
|
@ -907,12 +907,12 @@ function get_diaspora_reshare_xml($url,$recurse = 0) {
|
||||||
|
|
||||||
$x = z_fetch_url($url);
|
$x = z_fetch_url($url);
|
||||||
if(! $x['success'])
|
if(! $x['success'])
|
||||||
$x = z_fetch_url(str_replace('https://','http://',$source_url));
|
$x = z_fetch_url(str_replace('https://','http://',$url));
|
||||||
if(! $x['success']) {
|
if(! $x['success']) {
|
||||||
logger('get_diaspora_reshare_xml: unable to fetch source url ' . $source_url);
|
logger('get_diaspora_reshare_xml: unable to fetch source url ' . $url);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
logger('diaspora_reshare: source: ' . $x['body'], LOGGER_DATA);
|
logger('get_diaspora_reshare_xml: source: ' . $x['body'], LOGGER_DEBUG);
|
||||||
|
|
||||||
$source_xml = parse_xml_string($x['body'],false);
|
$source_xml = parse_xml_string($x['body'],false);
|
||||||
|
|
||||||
|
|
|
@ -512,11 +512,13 @@ function guess_image_type($filename, $headers = '') {
|
||||||
$type = $hdrs['Content-Type'];
|
$type = $hdrs['Content-Type'];
|
||||||
}
|
}
|
||||||
if (is_null($type)){
|
if (is_null($type)){
|
||||||
// FIXME!!!!
|
|
||||||
$ignore_imagick = get_config('system', 'ignore_imagick');
|
$ignore_imagick = get_config('system', 'ignore_imagick');
|
||||||
// Guessing from extension? Isn't that... dangerous?
|
// Guessing from extension? Isn't that... dangerous?
|
||||||
if(class_exists('Imagick') && !$ignore_imagick) {
|
if(class_exists('Imagick') && !$ignore_imagick) {
|
||||||
logger('using imagemagick', LOGGER_DEBUG);
|
$v = Imagick::getVersion();
|
||||||
|
preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m);
|
||||||
|
if(version_compare($m[1],'6.6.7') >= 0) {
|
||||||
/**
|
/**
|
||||||
* Well, this not much better,
|
* Well, this not much better,
|
||||||
* but at least it comes from the data inside the image,
|
* but at least it comes from the data inside the image,
|
||||||
|
@ -524,7 +526,16 @@ function guess_image_type($filename, $headers = '') {
|
||||||
*/
|
*/
|
||||||
$image = new Imagick($filename);
|
$image = new Imagick($filename);
|
||||||
$type = $image->getImageMimeType();
|
$type = $image->getImageMimeType();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
|
// earlier imagick versions have issues with scaling png's
|
||||||
|
// don't log this because it will just fill the logfile.
|
||||||
|
// leave this note here so those who are looking for why
|
||||||
|
// we aren't using imagick can find it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(is_null($type)) {
|
||||||
$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
||||||
$ph = photo_factory('');
|
$ph = photo_factory('');
|
||||||
$types = $ph->supportedTypes();
|
$types = $ph->supportedTypes();
|
||||||
|
|
|
@ -33,7 +33,7 @@ head_add_js('library/cryptojs/components/core-min.js');
|
||||||
head_add_js('library/cryptojs/rollups/aes.js');
|
head_add_js('library/cryptojs/rollups/aes.js');
|
||||||
head_add_js('library/cryptojs/rollups/rabbit.js');
|
head_add_js('library/cryptojs/rollups/rabbit.js');
|
||||||
head_add_js('library/cryptojs/rollups/tripledes.js');
|
head_add_js('library/cryptojs/rollups/tripledes.js');
|
||||||
head_add_js('library/stylish_select/jquery.stylish-select.js');
|
//head_add_js('library/stylish_select/jquery.stylish-select.js');
|
||||||
head_add_js('acl.js');
|
head_add_js('acl.js');
|
||||||
head_add_js('webtoolkit.base64.js');
|
head_add_js('webtoolkit.base64.js');
|
||||||
head_add_js('main.js');
|
head_add_js('main.js');
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<h3 id="search">{{$title}}</h3>
|
<h3 id="search">{{$title}}</h3>
|
||||||
{{$searchbox}}
|
{{$searchbox}}
|
||||||
|
|
||||||
<ul id="saved-search-ul">
|
<ul id="saved-search-ul" class="nav nav-pills nav-stacked">
|
||||||
{{foreach $saved as $search}}
|
{{foreach $saved as $search}}
|
||||||
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
|
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
|
||||||
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a>
|
<a title="{{$search.delete}}" class="pull-right" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a>
|
||||||
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
|
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
|
||||||
</li>
|
</li>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<h3 id="search">{{$title}}</h3>
|
<h3 id="search">{{$title}}</h3>
|
||||||
{{$searchbox}}
|
{{$searchbox}}
|
||||||
|
|
||||||
<ul id="saved-search-ul">
|
<ul id="saved-search-ul" class="nav nav-pills nav-stacked" >
|
||||||
{{foreach $saved as $search}}
|
{{foreach $saved as $search}}
|
||||||
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
|
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
|
||||||
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a>
|
<a title="{{$search.delete}}" class="pull-right" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a>
|
||||||
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a>
|
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a>
|
||||||
</li>
|
</li>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
|
|
Loading…
Reference in a new issue