Browse Source

issues with private photos - hitting internal size limits

pull/1/head
Friendika 10 years ago
parent
commit
59fd70e568
11 changed files with 32 additions and 10 deletions
  1. +12
    -1
      boot.php
  2. +1
    -1
      htconfig.php
  3. +10
    -2
      include/Photo.php
  4. +1
    -0
      include/items.php
  5. +2
    -0
      index.php
  6. +1
    -1
      view/de/htconfig.tpl
  7. +1
    -1
      view/en/htconfig.tpl
  8. +1
    -1
      view/es/htconfig.tpl
  9. +1
    -1
      view/fr/htconfig.tpl
  10. +1
    -1
      view/it/htconfig.tpl
  11. +1
    -1
      view/sv/htconfig.tpl

+ 12
- 1
boot.php View File

@ -1,6 +1,7 @@
<?php
set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.1.968' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
@ -9,7 +10,17 @@ define ( 'DB_UPDATE_VERSION', 1054 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'DOWN_ARROW', '&#x21e9;' );
/**
*
* Image storage quality. Lower numbers save space at cost of image detail.
* For ease of upgrade, please do not change here. Change jpeg quality with
* set_config('system','jpeg_quality',n) in .htconfig.php
* where n is netween 1 and 100, and with very poor results below about 50
*
*/
define ( 'JPEG_QUALITY', 100 );
/**
* SSL redirection policies


+ 1
- 1
htconfig.php View File

@ -38,7 +38,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 10
- 2
include/Photo.php View File

@ -162,12 +162,20 @@ class Photo {
}
public function saveImage($path) {
imagejpeg($this->image,$path,100);
$quality = get_config('system','jpeg_quality');
if((! $quality) || ($quality > 100))
$quality = JPEG_QUALITY;
imagejpeg($this->image,$path,$quality);
}
public function imageString() {
ob_start();
imagejpeg($this->image,NULL,100);
$quality = get_config('system','jpeg_quality');
if((! $quality) || ($quality > 100))
$quality = JPEG_QUALITY;
imagejpeg($this->image,NULL,$quality);
$s = ob_get_contents();
ob_end_clean();
return $s;


+ 1
- 0
include/items.php View File

@ -701,6 +701,7 @@ function item_store($arr,$force_parent = false) {
$parent_id = 0;
$arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $arr['uri'];
$arr['gravity'] = 0;
}
else {
logger('item_store: item parent was not found - ignoring item');


+ 2
- 0
index.php View File

@ -1,5 +1,7 @@
<?php
error_reporting(E_ERROR | E_WARNING | E_PARSE);
/**
*
* Friendika


+ 1
- 1
view/de/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 1
- 1
view/en/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 1
- 1
view/es/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 1
- 1
view/fr/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 1
- 1
view/it/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


+ 1
- 1
view/sv/htconfig.tpl View File

@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited
$a->config['max_import_size'] = 10000;
$a->config['max_import_size'] = 200000;
// maximum size of uploaded photos


Loading…
Cancel
Save