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

Remove user variable assignment

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 17:56:00 +02:00
parent 87c00ee4fb
commit 0565bce475
65 changed files with 274 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/classes/set/export.class.php
View File

@@ -44,8 +44,6 @@ class set_export extends set_abstract
{
$this->app = $app;
$user = $app['phraseanet.user'];
$download_list = array();
$remain_hd = array();
@@ -53,7 +51,7 @@ class set_export extends set_abstract
if ($storyWZid) {
$repository = $app['EM']->getRepository('\\Entities\\StoryWZ');
$storyWZ = $repository->findByUserAndId($this->app, $user, $storyWZid);
$storyWZ = $repository->findByUserAndId($this->app, $app['phraseanet.user'], $storyWZid);
$lst = $storyWZ->getRecord($this->app)->get_serialize_key();
}
@@ -62,7 +60,7 @@ class set_export extends set_abstract
$repository = $app['EM']->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($this->app, $sstid, $user, false);
$Basket = $repository->findUserBasket($this->app, $sstid, $app['phraseanet.user'], false);
foreach ($Basket->getElements() as $basket_element) {
/* @var $basket_element \Entities\BasketElement */
@@ -70,8 +68,8 @@ class set_export extends set_abstract
$record_id = $basket_element->getRecord($this->app)->get_record_id();
if (!isset($remain_hd[$base_id])) {
if ($user->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] = $user->ACL()->remaining_download($base_id);
if ($app['phraseanet.user']->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] = $app['phraseanet.user']->ACL()->remaining_download($base_id);
} else {
$remain_hd[$base_id] = false;
}
@@ -108,9 +106,8 @@ class set_export extends set_abstract
$record_id = $child_basrec->get_record_id();
if (!isset($remain_hd[$base_id])) {
if ($user->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] =
$user->ACL()->remaining_download($base_id);
if ($app['phraseanet.user']->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] = $app['phraseanet.user']->ACL()->remaining_download($base_id);
} else {
$remain_hd[$base_id] = false;
}
@@ -132,9 +129,8 @@ class set_export extends set_abstract
$record_id = $record->get_record_id();
if (!isset($remain_hd[$base_id])) {
if ($user->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] =
$user->ACL()->remaining_download($base_id);
if ($app['phraseanet.user']->ACL()->is_restricted_download($base_id)) {
$remain_hd[$base_id] = $app['phraseanet.user']->ACL()->remaining_download($base_id);
} else {
$remain_hd[$base_id] = false;
}
@@ -168,7 +164,7 @@ class set_export extends set_abstract
$this->businessFieldsAccess = false;
foreach ($this->elements as $download_element) {
if ($user->ACL()->has_right_on_base($download_element->get_base_id(), 'canmodifrecord')) {
if ($app['phraseanet.user']->ACL()->has_right_on_base($download_element->get_base_id(), 'canmodifrecord')) {
$this->businessFieldsAccess = true;
}
@@ -220,11 +216,11 @@ class set_export extends set_abstract
$display_ftp = array();
$hasadminright = $user->ACL()->has_right('addrecord')
|| $user->ACL()->has_right('deleterecord')
|| $user->ACL()->has_right('modifyrecord')
|| $user->ACL()->has_right('coll_manage')
|| $user->ACL()->has_right('coll_modify_struct');
$hasadminright = $app['phraseanet.user']->ACL()->has_right('addrecord')
|| $app['phraseanet.user']->ACL()->has_right('deleterecord')
|| $app['phraseanet.user']->ACL()->has_right('modifyrecord')
|| $app['phraseanet.user']->ACL()->has_right('coll_manage')
|| $app['phraseanet.user']->ACL()->has_right('coll_modify_struct');
$this->ftp_datas = array();
@@ -232,7 +228,7 @@ class set_export extends set_abstract
$display_ftp = $display_download;
$this->total_ftp = $this->total_download;
$lst_base_id = array_keys($user->ACL()->get_granted_base());
$lst_base_id = array_keys($app['phraseanet.user']->ACL()->get_granted_base());
if ($hasadminright) {
$sql = "SELECT usr.usr_id,usr_login,usr.addrFTP,usr.loginFTP,usr.sslFTP,
@@ -276,7 +272,7 @@ class set_export extends set_abstract
'passifFTP' => false,
'retryFTP' => 5,
'mailFTP' => '',
'sendermail' => $user->get_email()
'sendermail' => $app['phraseanet.user']->get_email()
);
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
@@ -300,7 +296,7 @@ class set_export extends set_abstract
'passifFTP' => ($row['passifFTP'] > 0),
'retryFTP' => $row['retryFTP'],
'mailFTP' => $row['usr_mail'],
'sendermail' => $user->get_email()
'sendermail' => $app['phraseanet.user']->get_email()
);
}
@@ -847,13 +843,6 @@ class set_export extends set_abstract
*/
public static function log_download(Array $list, $type, $anonymous = false, $comment = '')
{
$user = false;
if ($anonymous) {
} else {
$user = $this->app['phraseanet.user'];
}
$tmplog = array();
$files = $list['files'];
@@ -879,8 +868,9 @@ class set_export extends set_abstract
$log["poids"] = $obj["size"];
$log["shortXml"] = $record_object->get_caption()->serialize(caption_record::SERIALIZE_XML);
$tmplog[$record_object->get_base_id()][] = $log;
if (!$anonymous && $o == 'document')
$user->ACL()->remove_remaining($record_object->get_base_id());
if (!$anonymous && $o == 'document') {
$this->app['phraseanet.user']->ACL()->remove_remaining($record_object->get_base_id());
}
}
unset($record_object);
@@ -903,11 +893,11 @@ class set_export extends set_abstract
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql);
foreach ($list_base as $base_id) {
if ($user->ACL()->is_restricted_download($base_id)) {
if ($this->app['phraseanet.user']->ACL()->is_restricted_download($base_id)) {
$params = array(
':remain_dl' => $user->ACL()->remaining_download($base_id)
':remain_dl' => $this->app['phraseanet.user']->ACL()->remaining_download($base_id)
, ':base_id' => $base_id
, ':usr_id' => $user->get_id()
, ':usr_id' => $this->app['phraseanet.user']->get_id()
);
$stmt->execute($params);

7
lib/classes/set/exportftp.class.php
View File

@@ -33,7 +33,6 @@ class set_exportftp extends set_export
*/
public function export_ftp($usr_to, $host, $login, $password, $ssl, $retry, $passif, $destfolder, $makedirectory, $logfile)
{
$user_f = $this->app['phraseanet.user'];
$conn = $this->app['phraseanet.appbox']->get_connection();
$email_dest = '';
@@ -44,7 +43,7 @@ class set_exportftp extends set_export
$text_mail_receiver = "Bonjour,\n"
. "L'utilisateur "
. $user_f->get_display_name() . " (login : " . $user_f->get_login() . ") "
. $this->app['phraseanet.user']->get_display_name() . " (login : " . $this->app['phraseanet.user']->get_login() . ") "
. "a fait un transfert FTP sur le serveur ayant comme adresse \""
. $host . "\" avec le login \"" . $login . "\" "
. "et pour repertoire de destination \""
@@ -102,10 +101,10 @@ class set_exportftp extends set_export
, ':pwd' => $password
, ':passif' => ($passif == "1" ? "1" : "0")
, ':destfolder' => $destfolder
, ':sendermail' => $user_f->get_email()
, ':sendermail' => $this->app['phraseanet.user']->get_email()
, ':text_mail_receiver' => $text_mail_receiver
, ':text_mail_sender' => $text_mail_sender
, ':usr_id' => $user_f->get_id()
, ':usr_id' => $this->app['phraseanet.user']->get_id()
, ':foldertocreate' => $makedirectory
, ':logfile' => ( ! ! $logfile ? '1' : '0')
);

3
lib/classes/set/order.class.php
View File

@@ -230,7 +230,6 @@ class set_order extends set_abstract
throw new Exception_NotFound('unknown order ' . $id);
$current_user = User_Adapter::getInstance($row['usr_id'], $app);
$user = $app['phraseanet.user'];
$this->id = $row['id'];
$this->user = $current_user;
@@ -241,7 +240,7 @@ class set_order extends set_abstract
$this->total = (int) $row['total'];
$this->ssel_id = (int) $row['ssel_id'];
$base_ids = array_keys($user->ACL()->get_granted_base(array('order_master')));
$base_ids = array_keys($app['phraseanet.user']->ACL()->get_granted_base(array('order_master')));
$sql = 'SELECT e.base_id, e.record_id, e.order_master_id, e.id, e.deny
FROM order_elements e

16
lib/classes/set/selection.class.php
View File

@@ -53,8 +53,6 @@ class set_selection extends set_abstract
*/
public function grep_authorized(Array $rights = array(), Array $sbas_rights = array())
{
$user = $this->app['phraseanet.user'];
$to_remove = array();
foreach ($this->elements as $id => $record) {
@@ -62,26 +60,26 @@ class set_selection extends set_abstract
$sbas_id = $record->get_sbas_id();
$record_id = $record->get_record_id();
if ( ! $rights) {
if ($user->ACL()->has_hd_grant($record)) {
if ($this->app['phraseanet.user']->ACL()->has_hd_grant($record)) {
continue;
}
if ($user->ACL()->has_preview_grant($record)) {
if ($this->app['phraseanet.user']->ACL()->has_preview_grant($record)) {
continue;
}
if ( ! $user->ACL()->has_access_to_base($base_id)) {
if ( ! $this->app['phraseanet.user']->ACL()->has_access_to_base($base_id)) {
$to_remove[] = $id;
continue;
}
} else {
foreach ($rights as $right) {
if ( ! $user->ACL()->has_right_on_base($base_id, $right)) {
if ( ! $this->app['phraseanet.user']->ACL()->has_right_on_base($base_id, $right)) {
$to_remove[] = $id;
continue;
}
}
foreach ($sbas_rights as $right) {
if ( ! $user->ACL()->has_right_on_sbas($sbas_id, $right)) {
if ( ! $this->app['phraseanet.user']->ACL()->has_right_on_sbas($sbas_id, $right)) {
$to_remove[] = $id;
continue;
}
@@ -93,8 +91,8 @@ class set_selection extends set_abstract
$sql = 'SELECT record_id
FROM record
WHERE ((status ^ ' . $user->ACL()->get_mask_xor($base_id) . ')
& ' . $user->ACL()->get_mask_and($base_id) . ')=0
WHERE ((status ^ ' . $this->app['phraseanet.user']->ACL()->get_mask_xor($base_id) . ')
& ' . $this->app['phraseanet.user']->ACL()->get_mask_and($base_id) . ')=0
AND record_id = :record_id';
$stmt = $connsbas->prepare($sql);