pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER formats and rebuilding the darn things like we used to do. Check for illegal hex encoded album names in mod/photo so we don't throw php errors. Don't know where they come from but we get a lot of them.

This commit is contained in:
friendica
2014-08-14 23:05:19 -07:00
parent 21adbad4c1
commit 1978500e8f
2 changed files with 29 additions and 0 deletions

View File

@@ -618,6 +618,11 @@ function photos_content(&$a) {
if($datatype === 'album') {
if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
notice( t('Album name could not be decoded') . EOL);
$datum = '';
}
$album = hex2bin($datum);
$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'