hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1190 from nlegoff/m-fix

Browse Source 
[3.8] Some fixes
This commit is contained in:
Nicolas Le Goff
2014-11-26 00:20:37 +01:00
parent d4fdd6e50c ec64d41ebb
commit df3b6fd4fc
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
View File

@@ -38,7 +38,7 @@ abstract class AbstractDelivery implements ControllerProviderInterface
$response = $app['phraseanet.file-serve']->deliverFile($pathOut, $file->get_file(), $disposition, $file->get_mime()); $response = $app['phraseanet.file-serve']->deliverFile($pathOut, $file->get_file(), $disposition, $file->get_mime());
if (in_array(array('document', 'preview'), $subdef)) { if (in_array($subdef, array('document', 'preview'))) {
$response->setPrivate(); $response->setPrivate();
$this->logView($app, $record, $request); $this->logView($app, $record, $request);
} elseif ($subdef !== 'thumbnail') { } elseif ($subdef !== 'thumbnail') {

4
lib/Alchemy/Phrasea/Controller/Root/Login.php
View File

@@ -880,10 +880,12 @@ class Login implements ControllerProviderInterface
$width = $height = null; $width = $height = null;
if ($app['request']->cookies->has('screen')) { if ($app['request']->cookies->has('screen')) {
$data = explode('x', $app['request']->cookies->get('screen')); $data = array_filter((explode('x', $app['request']->cookies->get('screen', ''))));
if (count($data) === 2) {
$width = $data[0]; $width = $data[0];
$height = $data[1]; $height = $data[1];
} }
}
$session->setIpAddress($app['request']->getClientIp()) $session->setIpAddress($app['request']->getClientIp())
->setScreenHeight($height) ->setScreenHeight($height)
->setScreenWidth($width); ->setScreenWidth($width);

2
lib/Alchemy/Phrasea/Security/Firewall.php
View File

@@ -106,7 +106,7 @@ class Firewall
{ {
$params = array(); $params = array();
if (null !== $request) { if (null !== $request) {
$params['redirect'] = '..' . $request->getPathInfo(); $params['redirect'] = '..' . $request->getPathInfo().'?'.$request->getQueryString();
} }
if (!$this->app['authentication']->isAuthenticated()) { if (!$this->app['authentication']->isAuthenticated()) {
return new RedirectResponse($this->app->path('homepage', $params)); return new RedirectResponse($this->app->path('homepage', $params));

2
www/skins/prod/jquery.main-prod.js
View File

@@ -761,7 +761,7 @@ $(document).ready(function () {
var parent = searchForm.parent(); var parent = searchForm.parent();
var options = { var options = {
size: 'Full', size: (bodySize.x - 120)+'x'+(bodySize.y - 120),
loading: false, loading: false,
closeCallback: function (dialog) { closeCallback: function (dialog) {