aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-05-28 09:33:17 +0000
committerplegall <plg@piwigo.org>2014-05-28 09:33:17 +0000
commit682148e9179d52bfc3d85a75f3e6be5bdc3c7c51 (patch)
treef19e6294c8c91aa78265eedd7f21c784264a2bb6 /include
parentbe60fee094e10fab1bee10c90665a9c3e37062ab (diff)
feature 2616, customizations for plupload
* bug fixed, remove debug inserts in table "plupload" * display photo title as tooltip on thumbnail * hide useless .plupload_header * hide any other form fieldset until an album is selected git-svn-id: http://piwigo.org/svn/trunk@28552 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/ws_functions/pwg.images.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/include/ws_functions/pwg.images.php b/include/ws_functions/pwg.images.php
index 6e224e6e4..70a7f694f 100644
--- a/include/ws_functions/pwg.images.php
+++ b/include/ws_functions/pwg.images.php
@@ -1302,18 +1302,7 @@ function ws_images_upload($params, $service)
$chunk = isset($_REQUEST["chunk"]) ? intval($_REQUEST["chunk"]) : 0;
$chunks = isset($_REQUEST["chunks"]) ? intval($_REQUEST["chunks"]) : 0;
- file_put_contents('/tmp/plupload.log', "[".date('c')."] ".__FUNCTION__.', '.$fileName.' '.($chunk+1).'/'.$chunks."\n", FILE_APPEND);
-
- single_insert(
- 'plupload',
- array(
- 'received_on' => date('c'),
- 'filename' => $fileName,
- 'chunk' => $chunk+1,
- 'chunks' => $chunks,
- )
- );
-
+ // file_put_contents('/tmp/plupload.log', "[".date('c')."] ".__FUNCTION__.', '.$fileName.' '.($chunk+1).'/'.$chunks."\n", FILE_APPEND);
// Open temp file
if (!$out = @fopen("{$filePath}.part", $chunks ? "ab" : "wb"))
@@ -1369,6 +1358,7 @@ function ws_images_upload($params, $service)
$query = '
SELECT
id,
+ name,
path
FROM '.IMAGES_TABLE.'
WHERE id = '.$image_id.'
@@ -1378,6 +1368,7 @@ SELECT
return array(
'image_id' => $image_id,
'src' => DerivativeImage::thumb_url($image_infos),
+ 'name' => $image_infos['name'],
);
}
}