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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
This commit is contained in:
Romain Neutron
2014-02-20 16:05:23 +01:00
parent 405dbb7533 53c7af3dbb
commit 12f9575a8b
60 changed files with 168 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/eventsmanager/broker.php
View File

@@ -112,7 +112,7 @@ class eventsmanager_broker
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute($params);
$stmt->closeCursor();
} catch (Exception $e) {
} catch (\Exception $e) {
return false;
}

10
lib/classes/eventsmanager/notify/autoregister.php
View File

@@ -73,7 +73,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$mailColl[$row['usr_id']][] = $row['base_id'];
}
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -104,7 +104,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
try {
$registered_user = User_Adapter::getInstance($params['usr_id'], $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return;
}
@@ -115,7 +115,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($usr_id)) {
try {
$admin_user = User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
continue;
}
@@ -142,7 +142,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$usr_id = (string) $sx->usr_id;
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
@@ -193,7 +193,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
try {
$receiver = Receiver::fromUser($to);
$readyToSend = true;
} catch (Exception $e) {
} catch (\Exception $e) {
}

2
lib/classes/eventsmanager/notify/bridgeuploadfail.php
View File

@@ -120,7 +120,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
try {
$account = Bridge_Account::load_account($this->app, $account_id);
$record = new record_adapter($this->app, $sbas_id, $rid);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

4
lib/classes/eventsmanager/notify/order.php
View File

@@ -63,7 +63,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
$users = $query->on_base_ids($base_ids)
->who_have_right(['order_master'])
->execute()->get_results();
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -140,7 +140,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

4
lib/classes/eventsmanager/notify/orderdeliver.php
View File

@@ -146,7 +146,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
@@ -154,7 +154,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
$ret = [

4
lib/classes/eventsmanager/notify/ordernotdelivered.php
View File

@@ -82,7 +82,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
$emitter = Emitter::fromUser($user_from);
$readyToSend = true;
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -109,7 +109,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

2
lib/classes/eventsmanager/notify/push.php
View File

@@ -121,7 +121,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

4
lib/classes/eventsmanager/notify/register.php
View File

@@ -74,7 +74,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
$mailColl[$row['usr_id']][] = $row['base_id'];
}
} catch (Exception $e) {
} catch (\Exception $e) {
}
@@ -152,7 +152,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

4
lib/classes/eventsmanager/notify/validate.php
View File

@@ -139,7 +139,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
@@ -148,7 +148,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
$basket_name = trim($basket->getName()) ? : $this->app->trans('Une selection');
} catch (Exception $e) {
} catch (\Exception $e) {
$basket_name = $this->app->trans('Une selection');
}

4
lib/classes/eventsmanager/notify/validationdone.php
View File

@@ -133,7 +133,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
try {
$registered_user = User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
@@ -141,7 +141,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}

6
lib/classes/eventsmanager/notify/validationreminder.php
View File

@@ -89,7 +89,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
try {
$user_from = User_Adapter::getInstance($params['from'], $this->app);
$user_to = User_Adapter::getInstance($params['to'], $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return false;
}
@@ -138,7 +138,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
} catch (\Exception $e) {
return [];
}
@@ -147,7 +147,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
$basket_name = trim($basket->getName()) ? : $this->app->trans('Une selection');
} catch (Exception $e) {
} catch (\Exception $e) {
$basket_name = $this->app->trans('Une selection');
}