From a1dbfdee65b5e17877ffe14ea5671637c44ceb0a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 16 Jun 2014 21:49:45 +0200 Subject: [PATCH 1/7] API: Support of privacy_image_cache - if enabled --- include/Photo.php | 953 ++++++++++++++++++++++++---------------------- include/api.php | 48 ++- 2 files changed, 540 insertions(+), 461 deletions(-) diff --git a/include/Photo.php b/include/Photo.php index 282cf4458e..1ba0177cf5 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -19,34 +19,34 @@ class Photo { * supported mimetypes and corresponding file extensions */ static function supportedTypes() { - if(class_exists('Imagick')) { - /** - * Imagick::queryFormats won't help us a lot there... - * At least, not yet, other parts of friendica uses this array - */ - $t = array( - 'image/jpeg' => 'jpg', - 'image/png' => 'png', - 'image/gif' => 'gif' - ); - } else { - $t = array(); - $t['image/jpeg'] ='jpg'; - if (imagetypes() & IMG_PNG) $t['image/png'] = 'png'; - } + if(class_exists('Imagick')) { + /** + * Imagick::queryFormats won't help us a lot there... + * At least, not yet, other parts of friendica uses this array + */ + $t = array( + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/gif' => 'gif' + ); + } else { + $t = array(); + $t['image/jpeg'] ='jpg'; + if (imagetypes() & IMG_PNG) $t['image/png'] = 'png'; + } - return $t; + return $t; } public function __construct($data, $type=null) { - $this->imagick = class_exists('Imagick'); - $this->types = $this->supportedTypes(); - if (!array_key_exists($type,$this->types)){ - $type='image/jpeg'; - } - $this->type = $type; + $this->imagick = class_exists('Imagick'); + $this->types = $this->supportedTypes(); + if (!array_key_exists($type,$this->types)){ + $type='image/jpeg'; + } + $this->type = $type; - if($this->is_imagick() && $this->load_data($data)) { + if($this->is_imagick() && $this->load_data($data)) { return true; } else { // Failed to load with Imagick, fallback @@ -56,36 +56,36 @@ class Photo { } public function __destruct() { - if($this->image) { - if($this->is_imagick()) { - $this->image->clear(); - $this->image->destroy(); - return; - } - imagedestroy($this->image); - } + if($this->image) { + if($this->is_imagick()) { + $this->image->clear(); + $this->image->destroy(); + return; + } + imagedestroy($this->image); + } } public function is_imagick() { - return $this->imagick; + return $this->imagick; } /** * Maps Mime types to Imagick formats */ public function get_FormatsMap() { - $m = array( - 'image/jpeg' => 'JPG', - 'image/png' => 'PNG', - 'image/gif' => 'GIF' - ); - return $m; + $m = array( + 'image/jpeg' => 'JPG', + 'image/png' => 'PNG', + 'image/gif' => 'GIF' + ); + return $m; } private function load_data($data) { if($this->is_imagick()) { $this->image = new Imagick(); - try { + try { $this->image->readImageBlob($data); } catch (Exception $e) { @@ -93,41 +93,41 @@ class Photo { return false; } - /** - * Setup the image to the format it will be saved to - */ - $map = $this->get_FormatsMap(); - $format = $map[$type]; - $this->image->setFormat($format); + /** + * Setup the image to the format it will be saved to + */ + $map = $this->get_FormatsMap(); + $format = $map[$type]; + $this->image->setFormat($format); - // Always coalesce, if it is not a multi-frame image it won't hurt anyway - $this->image = $this->image->coalesceImages(); + // Always coalesce, if it is not a multi-frame image it won't hurt anyway + $this->image = $this->image->coalesceImages(); - /** - * setup the compression here, so we'll do it only once - */ - switch($this->getType()){ - case "image/png": - $quality = get_config('system','png_quality'); - if((! $quality) || ($quality > 9)) - $quality = PNG_QUALITY; - /** - * From http://www.imagemagick.org/script/command-line-options.php#quality: - * - * 'For the MNG and PNG image formats, the quality value sets - * the zlib compression level (quality / 10) and filter-type (quality % 10). - * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering, - * unless the image has a color map, in which case it means compression level 7 with no PNG filtering' - */ - $quality = $quality * 10; - $this->image->setCompressionQuality($quality); - break; - case "image/jpeg": - $quality = get_config('system','jpeg_quality'); - if((! $quality) || ($quality > 100)) - $quality = JPEG_QUALITY; - $this->image->setCompressionQuality($quality); - } + /** + * setup the compression here, so we'll do it only once + */ + switch($this->getType()){ + case "image/png": + $quality = get_config('system','png_quality'); + if((! $quality) || ($quality > 9)) + $quality = PNG_QUALITY; + /** + * From http://www.imagemagick.org/script/command-line-options.php#quality: + * + * 'For the MNG and PNG image formats, the quality value sets + * the zlib compression level (quality / 10) and filter-type (quality % 10). + * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering, + * unless the image has a color map, in which case it means compression level 7 with no PNG filtering' + */ + $quality = $quality * 10; + $this->image->setCompressionQuality($quality); + break; + case "image/jpeg": + $quality = get_config('system','jpeg_quality'); + if((! $quality) || ($quality > 100)) + $quality = JPEG_QUALITY; + $this->image->setCompressionQuality($quality); + } // The 'width' and 'height' properties are only used by non-Imagick routines. $this->width = $this->image->getImageWidth(); @@ -153,117 +153,117 @@ class Photo { } public function is_valid() { - if($this->is_imagick()) - return ($this->image !== FALSE); - return $this->valid; + if($this->is_imagick()) + return ($this->image !== FALSE); + return $this->valid; } public function getWidth() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) - return $this->image->getImageWidth(); - return $this->width; + if($this->is_imagick()) + return $this->image->getImageWidth(); + return $this->width; } public function getHeight() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) - return $this->image->getImageHeight(); - return $this->height; + if($this->is_imagick()) + return $this->image->getImageHeight(); + return $this->height; } public function getImage() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) { - /* Clean it */ - $this->image = $this->image->deconstructImages(); - return $this->image; - } - return $this->image; + if($this->is_imagick()) { + /* Clean it */ + $this->image = $this->image->deconstructImages(); + return $this->image; + } + return $this->image; } public function getType() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - return $this->type; + return $this->type; } public function getExt() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - return $this->types[$this->getType()]; + return $this->types[$this->getType()]; } public function scaleImage($max) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - $width = $this->getWidth(); - $height = $this->getHeight(); + $width = $this->getWidth(); + $height = $this->getHeight(); - $dest_width = $dest_height = 0; + $dest_width = $dest_height = 0; - if((! $width)|| (! $height)) - return FALSE; + if((! $width)|| (! $height)) + return FALSE; - if($width > $max && $height > $max) { + if($width > $max && $height > $max) { // very tall image (greater than 16:9) // constrain the width - let the height float. if((($height * 9) / 16) > $width) { $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); + $dest_height = intval(( $height * $max ) / $width); } // else constrain both dimensions elseif($width > $height) { - $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); - } - else { - $dest_width = intval(( $width * $max ) / $height); - $dest_height = $max; - } - } - else { - if( $width > $max ) { - $dest_width = $max; - $dest_height = intval(( $height * $max ) / $width); - } - else { - if( $height > $max ) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } + else { + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; + } + } + else { + if( $width > $max ) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } + else { + if( $height > $max ) { // very tall image (greater than 16:9) // but width is OK - don't do anything if((($height * 9) / 16) > $width) { $dest_width = $width; - $dest_height = $height; + $dest_height = $height; } else { - $dest_width = intval(( $width * $max ) / $height); - $dest_height = $max; + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; } - } - else { - $dest_width = $width; - $dest_height = $height; - } - } - } + } + else { + $dest_width = $width; + $dest_height = $height; + } + } + } - if($this->is_imagick()) { + if($this->is_imagick()) { /** * If it is not animated, there will be only one iteration here, * so don't bother checking @@ -283,207 +283,207 @@ class Photo { $this->height = $this->image->getImageHeight(); return; - } + } - $dest = imagecreatetruecolor( $dest_width, $dest_height ); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); - if($this->image) - imagedestroy($this->image); - $this->image = $dest; - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); + $dest = imagecreatetruecolor( $dest_width, $dest_height ); + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); + if($this->image) + imagedestroy($this->image); + $this->image = $dest; + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); } public function rotate($degrees) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) { - $this->image->setFirstIterator(); - do { - $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate() - } while ($this->image->nextImage()); - return; - } + if($this->is_imagick()) { + $this->image->setFirstIterator(); + do { + $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate() + } while ($this->image->nextImage()); + return; + } - $this->image = imagerotate($this->image,$degrees,0); - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); + $this->image = imagerotate($this->image,$degrees,0); + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); } public function flip($horiz = true, $vert = false) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) { - $this->image->setFirstIterator(); - do { - if($horiz) $this->image->flipImage(); - if($vert) $this->image->flopImage(); - } while ($this->image->nextImage()); - return; - } + if($this->is_imagick()) { + $this->image->setFirstIterator(); + do { + if($horiz) $this->image->flipImage(); + if($vert) $this->image->flopImage(); + } while ($this->image->nextImage()); + return; + } - $w = imagesx($this->image); - $h = imagesy($this->image); - $flipped = imagecreate($w, $h); - if($horiz) { - for ($x = 0; $x < $w; $x++) { - imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h); - } - } - if($vert) { - for ($y = 0; $y < $h; $y++) { - imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1); - } - } - $this->image = $flipped; + $w = imagesx($this->image); + $h = imagesy($this->image); + $flipped = imagecreate($w, $h); + if($horiz) { + for ($x = 0; $x < $w; $x++) { + imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h); + } + } + if($vert) { + for ($y = 0; $y < $h; $y++) { + imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1); + } + } + $this->image = $flipped; } public function orient($filename) { - // based off comment on http://php.net/manual/en/function.imagerotate.php + // based off comment on http://php.net/manual/en/function.imagerotate.php - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') ) - return; + if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') ) + return; - $exif = @exif_read_data($filename); + $exif = @exif_read_data($filename); if(! $exif) return; - $ort = $exif['Orientation']; + $ort = $exif['Orientation']; - switch($ort) - { - case 1: // nothing - break; + switch($ort) + { + case 1: // nothing + break; - case 2: // horizontal flip - $this->flip(); - break; + case 2: // horizontal flip + $this->flip(); + break; - case 3: // 180 rotate left - $this->rotate(180); - break; + case 3: // 180 rotate left + $this->rotate(180); + break; - case 4: // vertical flip - $this->flip(false, true); - break; + case 4: // vertical flip + $this->flip(false, true); + break; - case 5: // vertical flip + 90 rotate right - $this->flip(false, true); - $this->rotate(-90); - break; + case 5: // vertical flip + 90 rotate right + $this->flip(false, true); + $this->rotate(-90); + break; - case 6: // 90 rotate right - $this->rotate(-90); - break; + case 6: // 90 rotate right + $this->rotate(-90); + break; - case 7: // horizontal flip + 90 rotate right - $this->flip(); - $this->rotate(-90); - break; + case 7: // horizontal flip + 90 rotate right + $this->flip(); + $this->rotate(-90); + break; - case 8: // 90 rotate left - $this->rotate(90); - break; - } + case 8: // 90 rotate left + $this->rotate(90); + break; + } } public function scaleImageUp($min) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - $width = $this->getWidth(); - $height = $this->getHeight(); + $width = $this->getWidth(); + $height = $this->getHeight(); - $dest_width = $dest_height = 0; + $dest_width = $dest_height = 0; - if((! $width)|| (! $height)) - return FALSE; + if((! $width)|| (! $height)) + return FALSE; - if($width < $min && $height < $min) { - if($width > $height) { - $dest_width = $min; - $dest_height = intval(( $height * $min ) / $width); - } - else { - $dest_width = intval(( $width * $min ) / $height); - $dest_height = $min; - } - } - else { - if( $width < $min ) { - $dest_width = $min; - $dest_height = intval(( $height * $min ) / $width); - } - else { - if( $height < $min ) { - $dest_width = intval(( $width * $min ) / $height); - $dest_height = $min; - } - else { - $dest_width = $width; - $dest_height = $height; - } - } - } + if($width < $min && $height < $min) { + if($width > $height) { + $dest_width = $min; + $dest_height = intval(( $height * $min ) / $width); + } + else { + $dest_width = intval(( $width * $min ) / $height); + $dest_height = $min; + } + } + else { + if( $width < $min ) { + $dest_width = $min; + $dest_height = intval(( $height * $min ) / $width); + } + else { + if( $height < $min ) { + $dest_width = intval(( $width * $min ) / $height); + $dest_height = $min; + } + else { + $dest_width = $width; + $dest_height = $height; + } + } + } - if($this->is_imagick()) - return $this->scaleImage($dest_width,$dest_height); + if($this->is_imagick()) + return $this->scaleImage($dest_width,$dest_height); - $dest = imagecreatetruecolor( $dest_width, $dest_height ); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); - if($this->image) - imagedestroy($this->image); - $this->image = $dest; - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); + $dest = imagecreatetruecolor( $dest_width, $dest_height ); + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); + if($this->image) + imagedestroy($this->image); + $this->image = $dest; + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); } public function scaleImageSquare($dim) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) { - $this->image->setFirstIterator(); - do { - $this->image->scaleImage($dim, $dim); - } while ($this->image->nextImage()); - return; - } + if($this->is_imagick()) { + $this->image->setFirstIterator(); + do { + $this->image->scaleImage($dim, $dim); + } while ($this->image->nextImage()); + return; + } - $dest = imagecreatetruecolor( $dim, $dim ); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height); - if($this->image) - imagedestroy($this->image); - $this->image = $dest; - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); + $dest = imagecreatetruecolor( $dim, $dim ); + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height); + if($this->image) + imagedestroy($this->image); + $this->image = $dest; + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); } public function cropImage($max,$x,$y,$w,$h) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; if($this->is_imagick()) { $this->image->setFirstIterator(); @@ -499,152 +499,152 @@ class Photo { return $this->scaleImage($max); } - $dest = imagecreatetruecolor( $max, $max ); - imagealphablending($dest, false); - imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha - imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h); - if($this->image) - imagedestroy($this->image); - $this->image = $dest; - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); + $dest = imagecreatetruecolor( $max, $max ); + imagealphablending($dest, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha + imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h); + if($this->image) + imagedestroy($this->image); + $this->image = $dest; + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); } public function saveImage($path) { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - $string = $this->imageString(); - file_put_contents($path, $string); + $string = $this->imageString(); + file_put_contents($path, $string); } public function imageString() { - if(!$this->is_valid()) - return FALSE; + if(!$this->is_valid()) + return FALSE; - if($this->is_imagick()) { - /* Clean it */ - $this->image = $this->image->deconstructImages(); - $string = $this->image->getImagesBlob(); - return $string; - } + if($this->is_imagick()) { + /* Clean it */ + $this->image = $this->image->deconstructImages(); + $string = $this->image->getImagesBlob(); + return $string; + } - $quality = FALSE; + $quality = FALSE; - ob_start(); + ob_start(); // Enable interlacing imageinterlace($this->image, true); - switch($this->getType()){ - case "image/png": - $quality = get_config('system','png_quality'); - if((! $quality) || ($quality > 9)) - $quality = PNG_QUALITY; - imagepng($this->image,NULL, $quality); - break; - case "image/jpeg": - $quality = get_config('system','jpeg_quality'); - if((! $quality) || ($quality > 100)) - $quality = JPEG_QUALITY; - imagejpeg($this->image,NULL,$quality); - } - $string = ob_get_contents(); - ob_end_clean(); + switch($this->getType()){ + case "image/png": + $quality = get_config('system','png_quality'); + if((! $quality) || ($quality > 9)) + $quality = PNG_QUALITY; + imagepng($this->image,NULL, $quality); + break; + case "image/jpeg": + $quality = get_config('system','jpeg_quality'); + if((! $quality) || ($quality > 100)) + $quality = JPEG_QUALITY; + imagejpeg($this->image,NULL,$quality); + } + $string = ob_get_contents(); + ob_end_clean(); - return $string; + return $string; } public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') { - $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1", - dbesc($rid) - ); - if(count($r)) - $guid = $r[0]['guid']; - else - $guid = get_guid(); + $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1", + dbesc($rid) + ); + if(count($r)) + $guid = $r[0]['guid']; + else + $guid = get_guid(); - $x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1", - dbesc($rid), - intval($uid), - intval($cid), - intval($scale) - ); - if(count($x)) { - $r = q("UPDATE `photo` - set `uid` = %d, - `contact-id` = %d, - `guid` = '%s', - `resource-id` = '%s', - `created` = '%s', - `edited` = '%s', - `filename` = '%s', - `type` = '%s', - `album` = '%s', - `height` = %d, - `width` = %d, + $x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1", + dbesc($rid), + intval($uid), + intval($cid), + intval($scale) + ); + if(count($x)) { + $r = q("UPDATE `photo` + set `uid` = %d, + `contact-id` = %d, + `guid` = '%s', + `resource-id` = '%s', + `created` = '%s', + `edited` = '%s', + `filename` = '%s', + `type` = '%s', + `album` = '%s', + `height` = %d, + `width` = %d, `datasize` = %d, - `data` = '%s', - `scale` = %d, - `profile` = %d, - `allow_cid` = '%s', - `allow_gid` = '%s', - `deny_cid` = '%s', - `deny_gid` = '%s' - where id = %d", + `data` = '%s', + `scale` = %d, + `profile` = %d, + `allow_cid` = '%s', + `allow_gid` = '%s', + `deny_cid` = '%s', + `deny_gid` = '%s' + where id = %d", - intval($uid), - intval($cid), - dbesc($guid), - dbesc($rid), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(basename($filename)), - dbesc($this->getType()), - dbesc($album), - intval($this->getHeight()), - intval($this->getWidth()), + intval($uid), + intval($cid), + dbesc($guid), + dbesc($rid), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(basename($filename)), + dbesc($this->getType()), + dbesc($album), + intval($this->getHeight()), + intval($this->getWidth()), dbesc(strlen($this->imageString())), - dbesc($this->imageString()), - intval($scale), - intval($profile), - dbesc($allow_cid), - dbesc($allow_gid), - dbesc($deny_cid), - dbesc($deny_gid), - intval($x[0]['id']) - ); - } - else { - $r = q("INSERT INTO `photo` - ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", - intval($uid), - intval($cid), - dbesc($guid), - dbesc($rid), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(basename($filename)), - dbesc($this->getType()), - dbesc($album), - intval($this->getHeight()), - intval($this->getWidth()), + dbesc($this->imageString()), + intval($scale), + intval($profile), + dbesc($allow_cid), + dbesc($allow_gid), + dbesc($deny_cid), + dbesc($deny_gid), + intval($x[0]['id']) + ); + } + else { + $r = q("INSERT INTO `photo` + ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", + intval($uid), + intval($cid), + dbesc($guid), + dbesc($rid), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(basename($filename)), + dbesc($this->getType()), + dbesc($album), + intval($this->getHeight()), + intval($this->getWidth()), dbesc(strlen($this->imageString())), - dbesc($this->imageString()), - intval($scale), - intval($profile), - dbesc($allow_cid), - dbesc($allow_gid), - dbesc($deny_cid), - dbesc($deny_gid) - ); - } - return $r; + dbesc($this->imageString()), + intval($scale), + intval($profile), + dbesc($allow_cid), + dbesc($allow_gid), + dbesc($deny_cid), + dbesc($deny_gid) + ); + } + return $r; } }} @@ -659,35 +659,35 @@ function guess_image_type($filename, $fromcurl=false) { logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG); $type = null; if ($fromcurl) { - $a = get_app(); - $headers=array(); - $h = explode("\n",$a->get_curl_headers()); - foreach ($h as $l) { - list($k,$v) = array_map("trim", explode(":", trim($l), 2)); - $headers[$k] = $v; - } - if (array_key_exists('Content-Type', $headers)) - $type = $headers['Content-Type']; + $a = get_app(); + $headers=array(); + $h = explode("\n",$a->get_curl_headers()); + foreach ($h as $l) { + list($k,$v) = array_map("trim", explode(":", trim($l), 2)); + $headers[$k] = $v; + } + if (array_key_exists('Content-Type', $headers)) + $type = $headers['Content-Type']; } if (is_null($type)){ - // Guessing from extension? Isn't that... dangerous? - if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) { - /** - * Well, this not much better, - * but at least it comes from the data inside the image, - * we won't be tricked by a manipulated extension - */ - $image = new Imagick($filename); - $type = $image->getImageMimeType(); - $image->setInterlaceScheme(Imagick::INTERLACE_PLANE); - } else { - $ext = pathinfo($filename, PATHINFO_EXTENSION); - $types = Photo::supportedTypes(); - $type = "image/jpeg"; - foreach ($types as $m=>$e){ - if ($ext==$e) $type = $m; - } - } + // Guessing from extension? Isn't that... dangerous? + if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) { + /** + * Well, this not much better, + * but at least it comes from the data inside the image, + * we won't be tricked by a manipulated extension + */ + $image = new Imagick($filename); + $type = $image->getImageMimeType(); + $image->setInterlaceScheme(Imagick::INTERLACE_PLANE); + } else { + $ext = pathinfo($filename, PATHINFO_EXTENSION); + $types = Photo::supportedTypes(); + $type = "image/jpeg"; + foreach ($types as $m=>$e){ + if ($ext==$e) $type = $m; + } + } } logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG); return $type; @@ -699,14 +699,14 @@ function import_profile_photo($photo,$uid,$cid) { $a = get_app(); $r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1", - intval($uid), - intval($cid) + intval($uid), + intval($cid) ); if(count($r) && strlen($r[0]['resource-id'])) { - $hash = $r[0]['resource-id']; + $hash = $r[0]['resource-id']; } else { - $hash = photo_new_resource(); + $hash = photo_new_resource(); } $photo_failure = false; @@ -718,38 +718,38 @@ function import_profile_photo($photo,$uid,$cid) { $img = new Photo($img_str, $type); if($img->is_valid()) { - $img->scaleImageSquare(175); + $img->scaleImageSquare(175); - $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 ); + $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 ); - if($r === false) - $photo_failure = true; + if($r === false) + $photo_failure = true; - $img->scaleImage(80); + $img->scaleImage(80); - $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 ); + $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 ); - if($r === false) - $photo_failure = true; + if($r === false) + $photo_failure = true; - $img->scaleImage(48); + $img->scaleImage(48); - $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 ); + $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 ); - if($r === false) - $photo_failure = true; + if($r === false) + $photo_failure = true; - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt(); - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt(); - $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt(); + $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt(); + $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt(); + $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt(); } else - $photo_failure = true; + $photo_failure = true; if($photo_failure) { - $photo = $a->get_baseurl() . '/images/person-175.jpg'; - $thumb = $a->get_baseurl() . '/images/person-80.jpg'; - $micro = $a->get_baseurl() . '/images/person-48.jpg'; + $photo = $a->get_baseurl() . '/images/person-175.jpg'; + $thumb = $a->get_baseurl() . '/images/person-80.jpg'; + $micro = $a->get_baseurl() . '/images/person-48.jpg'; } return(array($photo,$thumb,$micro)); @@ -775,3 +775,52 @@ function get_photo_info($url) { return $data; } + +function scale_image($width, $height, $max) { + + $dest_width = $dest_height = 0; + + if((!$width) || (!$height)) + return FALSE; + + if($width > $max && $height > $max) { + + // very tall image (greater than 16:9) + // constrain the width - let the height float. + + if((($height * 9) / 16) > $width) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } elseif($width > $height) { + // else constrain both dimensions + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } else { + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; + } + } else { + if( $width > $max ) { + $dest_width = $max; + $dest_height = intval(( $height * $max ) / $width); + } else { + if( $height > $max ) { + + // very tall image (greater than 16:9) + // but width is OK - don't do anything + + if((($height * 9) / 16) > $width) { + $dest_width = $width; + $dest_height = $height; + } else { + $dest_width = intval(( $width * $max ) / $height); + $dest_height = $max; + } + } else { + $dest_width = $width; + $dest_height = $height; + } + } + } + return array("width" => $dest_width, "height" => $dest_height); +} diff --git a/include/api.php b/include/api.php index 35f25ddbdd..ac6ecac151 100644 --- a/include/api.php +++ b/include/api.php @@ -710,6 +710,8 @@ if($parent) $_REQUEST['type'] = 'net-comment'; else { +// logger("api_statuses_update: upload ".print_r($_FILES, true)." ".print_r($_POST, true)." ".print_r($_GET, true), LOGGER_DEBUG); +//die("blubb"); $_REQUEST['type'] = 'wall'; if(x($_FILES,'media')) { // upload the image if we have one @@ -1630,6 +1632,8 @@ if ($include_entities != "true") return array(); + $a = get_app(); + $bbcode = bb_CleanPictureLinks($bbcode); // Change pure links in text to bbcode uris @@ -1708,6 +1712,9 @@ //$entities["media"] = array(); $offset = 0; + $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`"); + $image_cache = (count($result) > 0); + foreach ($ordered_images AS $url) { $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url); $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url); @@ -1717,24 +1724,47 @@ $start = iconv_strpos($text, $url, $offset, "UTF-8"); if (!($start === false)) { - $redirects = 0; - $img_str = fetch_url($url,true, $redirects, 10); - $image = @imagecreatefromstring($img_str); + require_once("include/Photo.php"); + $image = get_photo_info($url); if ($image) { + // If privacy_image_cache is activated, then use the following sizes: + // thumb (150), small (340), medium (600) and large (1024) + if ($image_cache) { + require_once("addon/privacy_image_cache/privacy_image_cache.php"); + $media_url = $a->get_baseurl()."/privacy_image_cache/".privacy_image_cache_cachename($url); + + $sizes = array(); + $scale = scale_image($image[0], $image[1], 150); + $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); + + if (($image[0] > 150) OR ($image[1] > 150)) { + $scale = scale_image($image[0], $image[1], 340); + $sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); + } + + $scale = scale_image($image[0], $image[1], 600); + $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); + + if (($image[0] > 600) OR ($image[1] > 600)) { + $scale = scale_image($image[0], $image[1], 1024); + $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); + } + } else { + $media_url = $url; + $sizes["medium"] = array("w" => $image[0], "h" => $image[1], "resize" => "fit"); + } + $entities["media"][] = array( "id" => $start+1, "id_str" => (string)$start+1, "indices" => array($start, $start+strlen($url)), - "media_url" => $url, - "media_url_https" => $url, + "media_url" => normalise_link($media_url), + "media_url_https" => $media_url, "url" => $url, "display_url" => $display_url, "expanded_url" => $url, "type" => "photo", - "sizes" => array("medium" => array( - "w" => imagesx($image), - "h" => imagesy($image), - "resize" => "fit"))); + "sizes" => $sizes); } $offset = $start + 1; } From e0219cf6aff6f7eb153e60878f6be39e2fe25ce8 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 16 Jun 2014 22:36:59 +0200 Subject: [PATCH 2/7] API: Support of privacy_image_cache for calls without entities added --- include/api.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/include/api.php b/include/api.php index ac6ecac151..d61cc3d4aa 100644 --- a/include/api.php +++ b/include/api.php @@ -1619,20 +1619,32 @@ return $ret; } - function api_get_entitities($text, $bbcode) { + function api_get_entitities(&$text, $bbcode) { /* To-Do: * Links at the first character of the post - * different sizes of pictures - * caching picture data (using the id for that?) (See privacy_image_cache) */ + $a = get_app(); + + $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`"); + $image_cache = (count($result) > 0); + $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); - if ($include_entities != "true") - return array(); + if ($include_entities != "true") { + if ($image_cache) { + require_once("addon/privacy_image_cache/privacy_image_cache.php"); - $a = get_app(); + preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images); + + foreach ($images[1] AS $image) { + $replace = $a->get_baseurl()."/privacy_image_cache/".privacy_image_cache_cachename($image); + $text = str_replace($image, $replace, $text); + } + } + return array(); + } $bbcode = bb_CleanPictureLinks($bbcode); @@ -1712,9 +1724,6 @@ //$entities["media"] = array(); $offset = 0; - $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`"); - $image_cache = (count($result) > 0); - foreach ($ordered_images AS $url) { $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url); $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url); From 297d8a6cc691c23280aede12d6e37511fb87af59 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 17 Jun 2014 20:11:35 +0200 Subject: [PATCH 3/7] The icon for the website is now changeable in the config --- boot.php | 10 ++++++++++ view/templates/head.tpl | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index ee5943d61b..8b5cda68ab 100644 --- a/boot.php +++ b/boot.php @@ -693,6 +693,14 @@ if(! class_exists('App')) { else $stylesheet = '$stylesheet'; + $shortcut_icon = get_config("system", "shortcut_icon"); + if ($shortcut_icon == "") + $shortcut_icon = $this->get_baseurl()."/images/friendica-32.png"; + + $touch_icon = get_config("system", "touch_icon"); + if ($touch_icon == "") + $touch_icon = $this->get_baseurl()."/images/friendica-128.png"; + $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! @@ -703,6 +711,8 @@ if(! class_exists('App')) { '$showmore' => t('show more'), '$showfewer' => t('show fewer'), '$update_interval' => $interval, + '$shortcut_icon' => $shortcut_icon, + '$touch_icon' => $touch_icon, '$stylesheet' => $stylesheet )) . $this->page['htmlhead']; } diff --git a/view/templates/head.tpl b/view/templates/head.tpl index f1f6b55052..d60d2603c1 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -13,9 +13,13 @@ + + + + From 38fb43702fd6d13b3c574de7d9a496a8d70e7630 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 20 Jun 2014 00:01:20 +0200 Subject: [PATCH 4/7] Vier: Preview picture in admin settings is now smaller --- view/theme/vier/style.css | 4 ++++ view/theme/vier/theme.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index eb9cfc8897..3fec53fcfe 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -19,6 +19,10 @@ img { /* width: 80%;*/ } +#adminpage .screenshot img { + width: 640px; +} + #pending-update { float:right; color: #ffffff; diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 1d2972b623..928ab6c8b2 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -1,11 +1,11 @@ * Author: Ike * Maintainer: Ike - * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ + * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ */ function vier_init(&$a) { From 5ed5773f57275023decf913ea34822cc54184e39 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 23 Jun 2014 01:24:39 +0200 Subject: [PATCH 5/7] The temporary paths (temp, lock, itemcache) are now detected automatically when used. --- boot.php | 61 +++++++++++++++++++++++++++++++++++++++++-- include/Photo.php | 2 +- include/bbcode.php | 8 +++--- include/cronhooks.php | 2 +- include/onepoll.php | 2 +- include/poller.php | 2 +- include/queue.php | 2 +- mod/admin.php | 9 +++++-- 8 files changed, 75 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index 8b5cda68ab..f5ce32ac5c 100644 --- a/boot.php +++ b/boot.php @@ -2160,7 +2160,7 @@ function random_digits($digits) { } function get_cachefile($file, $writemode = true) { - $cache = get_config("system","itemcache"); + $cache = get_itemcachepath(); if ((! $cache) || (! is_dir($cache))) return(""); @@ -2181,7 +2181,7 @@ function get_cachefile($file, $writemode = true) { function clear_cache($basepath = "", $path = "") { if ($path == "") { - $basepath = get_config('system','itemcache'); + $basepath = get_itemcachepath(); $path = $basepath; } @@ -2209,6 +2209,63 @@ function clear_cache($basepath = "", $path = "") { } } +function get_itemcachepath() { + // Checking, if the cache is deactivated + $cachetime = (int)get_config('system','itemcache_duration'); + if ($cachetime < 0) + return ""; + + $itemcache = get_config('system','itemcache'); + if (($itemcache != "") AND is_dir($itemcache) AND is_writable($itemcache)) + return($itemcache); + + $temppath = get_temppath(); + + if ($temppath != "") { + $itemcache = $temppath."/itemcache"; + mkdir($itemcache); + + if (is_dir($itemcache) AND is_writable($itemcache)) { + set_config("system", "itemcache", $itemcache); + return($itemcache); + } + } + return ""; +} + +function get_lockpath() { + $lockpath = get_config('system','lockpath'); + if (($lockpath != "") AND is_dir($lockpath) AND is_writable($lockpath)) + return($lockpath); + + $temppath = get_temppath(); + + if ($temppath != "") { + $lockpath = $temppath."/lock"; + mkdir($lockpath); + + if (is_dir($lockpath) AND is_writable($lockpath)) { + set_config("system", "lockpath", $lockpath); + return($lockpath); + } + } + return ""; +} + +function get_temppath() { + $temppath = get_config("system","temppath"); + if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) + return($temppath); + + $temppath = sys_get_temp_dir(); + if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) { + set_config("system", "temppath", $temppath); + return($temppath); + } + + return(""); +} + function set_template_engine(&$a, $engine = 'internal') { // This function is no longer necessary, but keep it as a wrapper to the class method // to avoid breaking themes again unnecessarily diff --git a/include/Photo.php b/include/Photo.php index 1ba0177cf5..d20dd2ca08 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -764,7 +764,7 @@ function get_photo_info($url) { if (is_null($data)) { $img_str = fetch_url($url, true, $redirects, 4); - $tempfile = tempnam(get_config("system","temppath"), "cache"); + $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); $data = getimagesize($tempfile); unlink($tempfile); diff --git a/include/bbcode.php b/include/bbcode.php index 4c2d6e547c..63748ef45a 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -424,7 +424,7 @@ function bb_ShareAttributes($match) { $posted = ""; - $itemcache = get_config("system","itemcache"); + $itemcache = get_itemcachepath(); // relative dates only make sense when they aren't cached if ($itemcache == "") { @@ -661,7 +661,7 @@ function bb_ShareAttributes($share, $simplehtml) { $posted = ""; - $itemcache = get_config("system","itemcache"); + $itemcache = get_itemcachepath(); // relative dates only make sense when they aren't cached if ($itemcache == "") { @@ -949,8 +949,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // removing multiplicated newlines if (get_config("system", "remove_multiplicated_lines")) { - $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n"); - $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]"); + $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share "); + $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share "); do { $oldtext = $Text; $Text = str_replace($search, $replace, $Text); diff --git a/include/cronhooks.php b/include/cronhooks.php index 0ba453555c..031011ac36 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -35,7 +35,7 @@ function cronhooks_run(&$argv, &$argc){ } } - $lockpath = get_config('system','lockpath'); + $lockpath = get_lockpath(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'cronhooks'); if($pidfile->is_already_running()) { diff --git a/include/onepoll.php b/include/onepoll.php index 15b8e7c2cc..309764c74f 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -58,7 +58,7 @@ function onepoll_run(&$argv, &$argc){ } // Test - $lockpath = get_config('system','lockpath'); + $lockpath = get_lockpath(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'onepoll'.$contact_id); if($pidfile->is_already_running()) { diff --git a/include/poller.php b/include/poller.php index b04c77f744..46f1079fd1 100644 --- a/include/poller.php +++ b/include/poller.php @@ -41,7 +41,7 @@ function poller_run(&$argv, &$argc){ } } - $lockpath = get_config('system','lockpath'); + $lockpath = get_lockpath(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'poller'); if($pidfile->is_already_running()) { diff --git a/include/queue.php b/include/queue.php index bc3cc258cc..3c28cefaf2 100644 --- a/include/queue.php +++ b/include/queue.php @@ -84,7 +84,7 @@ function queue_run(&$argv, &$argc){ load_config('config'); load_config('system'); - $lockpath = get_config('system','lockpath'); + $lockpath = get_lockpath(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'queue'); if($pidfile->is_already_running()) { diff --git a/mod/admin.php b/mod/admin.php index 76129204c3..3b22811d14 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -548,12 +548,17 @@ function admin_page_site(&$a) { /* Banner */ $banner = get_config('system','banner'); - if($banner == false) + if($banner == false) $banner = 'logoFriendica'; $banner = htmlspecialchars($banner); $info = get_config('config','info'); $info = htmlspecialchars($info); + // Automatically create temporary paths + get_temppath(); + get_lockpath(); + get_itemcachepath(); + //echo "
"; var_dump($lang_choices); die("
"); /* Register policy */ @@ -631,7 +636,7 @@ function admin_page_site(&$a) { '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$suppress_language' => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."), - '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")), + '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")), '$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."), '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."), From 14bacc1e8cb7a19965607ae51a5828d972f5af0e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 23 Jun 2014 01:25:58 +0200 Subject: [PATCH 6/7] markdown export for libertree now handles horizontal tulers correct. --- include/bb2diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index eeed19d816..b70a056619 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -78,7 +78,7 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { else { $Text = bbcode($Text, $preserve_nl, false, 4); // Libertree doesn't convert a harizontal rule if there isn't a linefeed - $Text = str_replace("
", "\n
", $Text); + $Text = str_replace("
", "
", $Text); } // Now convert HTML to Markdown From 79f7f609b3bce65eab5b143d4b306328c1724ca5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 23 Jun 2014 01:27:00 +0200 Subject: [PATCH 7/7] dbstructure: the indexes for longer table fields are now shortened --- include/dbstructure.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 40762a9e94..45ba9b200d 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -354,7 +354,7 @@ function db_definition() { ), "indexes" => array( "PRIMARY" => array("id"), - "access" => array("cat","k"), + "access" => array("cat(30)","k(30)"), ) ); $database["contact"] = array( @@ -638,7 +638,7 @@ function db_definition() { ), "indexes" => array( "PRIMARY" => array("id"), - "hook_file_function" => array("hook","file","function"), + "hook_file_function" => array("hook(30)","file(60)","function(30)"), ) ); $database["intro"] = array( @@ -890,7 +890,7 @@ function db_definition() { ), "indexes" => array( "PRIMARY" => array("id"), - "access" => array("uid","cat","k"), + "access" => array("uid","cat(30)","k(30)"), ) ); $database["photo"] = array(