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

Cleanup namepaces, variables uses

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 16:06:28 +02:00
parent 372861deb4
commit 1700565862
232 changed files with 593 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ class set_export extends set_abstract
$this->ftp_datas = array();
if ($registry->get('GV_activeFTP') && ($hasadminright || $registry->get('GV_ftp_for_user'))) {
if ($this->app['phraseanet.registry']->get('GV_activeFTP') && ($hasadminright || $this->app['phraseanet.registry']->get('GV_ftp_for_user'))) {
$display_ftp = $display_download;
$this->total_ftp = $this->total_download;
@@ -249,7 +249,7 @@ class set_export extends set_abstract
)
GROUP BY usr_id ";
$params = array();
} elseif ($registry->get('GV_ftp_for_user')) {
} elseif ($this->app['phraseanet.registry']->get('GV_ftp_for_user')) {
$sql = "SELECT usr.usr_id,usr_login,usr.addrFTP,usr.loginFTP,usr.sslFTP,
usr.pwdFTP,usr.destFTP,prefixFTPfolder,
usr.passifFTP,usr.retryFTP,usr.usr_mail
@@ -397,8 +397,6 @@ class set_export extends set_abstract
$includeBusinessFields = !!$includeBusinessFields;
$registry = $this->app['phraseanet.registry'];
$unicode = new unicode();
$files = array();
@@ -628,7 +626,7 @@ class set_export extends set_abstract
$files[$id]["export_name"] = $tmp_name;
if (in_array('caption', $subdefs)) {
$caption_dir = $registry->get('GV_RootPath') . 'tmp/desc_tmp/'
$caption_dir = $this->app['phraseanet.registry']->get('GV_RootPath') . 'tmp/desc_tmp/'
. time() . $this->app['phraseanet.user']->get_id() . '/';
$filesystem->mkdir($caption_dir, 0750);
@@ -649,7 +647,7 @@ class set_export extends set_abstract
$files[$id]["subdefs"]['caption']['businessfields'] = $BF ? '1' : '0';
}
if (in_array('caption-yaml', $subdefs)) {
$caption_dir = $registry->get('GV_RootPath') . 'tmp/desc_tmp/'
$caption_dir = $this->app['phraseanet.registry']->get('GV_RootPath') . 'tmp/desc_tmp/'
. time() . $this->app['phraseanet.user']->get_id() . '/';
$filesystem->mkdir($caption_dir, 0750);

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

@@ -9,8 +9,6 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Core\Configuration;
/**
*
*

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

@@ -10,9 +10,7 @@
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
use Alchemy\Phrasea\Controller\RecordsRequest;
use Doctrine\Common\Collections\ArrayCollection;
/**
*
@@ -458,7 +456,7 @@ class set_order extends set_abstract
*/
public function deny_elements(Array $elements_ids)
{
$conn = $app['phraseanet.appbox']->get_connection();
$conn = $this->app['phraseanet.appbox']->get_connection();
$n = 0;
@@ -480,7 +478,7 @@ class set_order extends set_abstract
}
if ($n > 0) {
$evt_mngr = $app['events-manager'];
$evt_mngr = $this->app['events-manager'];
$params = array(
'from' => $this->app['phraseanet.user']->get_id(),

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

@@ -10,7 +10,6 @@
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
/**
*