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

Fix CS

Browse Source
This commit is contained in:
Romain Neutron
2013-01-21 23:21:33 +01:00
parent 4f96fbda7b
commit 23a8bbbebf
5 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Cache/MemcacheCache.php
View File

@@ -11,7 +11,7 @@
namespace Alchemy\Phrasea\Cache; namespace Alchemy\Phrasea\Cache;
use \Doctrine\Common\Cache\MemcacheCache as DoctrineMemcache; use Doctrine\Common\Cache\MemcacheCache as DoctrineMemcache;
/** /**
* *

3
lib/classes/API/V1/result.php
View File

@@ -10,6 +10,7 @@
*/ */
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
/** /**
* *
@@ -19,8 +20,6 @@ use Symfony\Component\HttpFoundation\Response;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com * @link www.phraseanet.com
*/ */
use \Symfony\Component\HttpFoundation\Request;
class API_V1_result class API_V1_result
{ {
/** /**

8
lib/classes/Bridge/Api/Dailymotion.php
View File

@@ -11,7 +11,7 @@
require_once __DIR__ . "/../../../classes/DailymotionWithoutOauth2.php"; require_once __DIR__ . "/../../../classes/DailymotionWithoutOauth2.php";
use \Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
/** /**
* *
@@ -194,7 +194,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
{ {
return array(self::CONTAINER_TYPE_PLAYLIST => _('Playlists')); return array(self::CONTAINER_TYPE_PLAYLIST => _('Playlists'));
} }
public function get_oauth_token() public function get_oauth_token()
{ {
return $this->oauth_token; return $this->oauth_token;
@@ -203,10 +203,10 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
public function set_oauth_token($oauth_token) public function set_oauth_token($oauth_token)
{ {
$this->oauth_token = $oauth_token; $this->oauth_token = $oauth_token;
return $this; return $this;
} }
/** /**
* *
* @param string $type * @param string $type

4
lib/classes/Bridge/Api/Youtube.php
View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use \Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
/** /**
* *
@@ -726,7 +726,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
if (false === $cxml = simplexml_load_file($url_cat)) { if (false === $cxml = simplexml_load_file($url_cat)) {
throw new Bridge_Exception_ApiConnectorRequestFailed('Failed to retrive youtube categories'); throw new Bridge_Exception_ApiConnectorRequestFailed('Failed to retrive youtube categories');
} }
$cxml->registerXPathNamespace('atom', 'http://www.w3.org/2005/Atom'); $cxml->registerXPathNamespace('atom', 'http://www.w3.org/2005/Atom');
$categories = $cxml->xpath('//atom:category'); $categories = $cxml->xpath('//atom:category');

18
lib/classes/task/period/writemeta.php
View File

@@ -43,23 +43,13 @@ class task_period_writemeta extends task_databoxAbstract
{ {
$request = http_request::getInstance(); $request = http_request::getInstance();
$parm2 = $request->get_parms( $parm2 = $request->get_parms('period', 'cleardoc', 'maxrecs', 'maxmegs');
'period'
, 'cleardoc'
, 'maxrecs'
, 'maxmegs'
);
$dom = new DOMDocument(); $dom = new DOMDocument();
$dom->preserveWhiteSpace = false; $dom->preserveWhiteSpace = false;
$dom->formatOutput = true; $dom->formatOutput = true;
if ($dom->loadXML($oldxml)) { if ($dom->loadXML($oldxml)) {
$xmlchanged = false; $xmlchanged = false;
foreach (array( foreach (array('str:period', 'str:maxrecs', 'str:maxmegs', 'boo:cleardoc') as $pname) {
'str:period'
, 'str:maxrecs'
, 'str:maxmegs'
, 'boo:cleardoc'
) as $pname) {
$ptype = substr($pname, 0, 3); $ptype = substr($pname, 0, 3);
$pname = substr($pname, 4); $pname = substr($pname, 4);
$pvalue = $parm2[$pname]; $pvalue = $parm2[$pname];
@@ -119,7 +109,7 @@ class task_period_writemeta extends task_databoxAbstract
<?php echo $form ?>.maxmegs.value = "<?php echo p4string::MakeString($sxml->maxmegs, "js", '"') ?>"; <?php echo $form ?>.maxmegs.value = "<?php echo p4string::MakeString($sxml->maxmegs, "js", '"') ?>";
</script> </script>
<?php <?php
return(""); return("");
} else { // ... so we NEVER come here } else { // ... so we NEVER come here
// bad xml // bad xml
@@ -210,7 +200,7 @@ class task_period_writemeta extends task_databoxAbstract
protected function retrieveSbasContent(databox $databox) protected function retrieveSbasContent(databox $databox)
{ {
$this->dependencyContainer['exiftool.writer']->setModule(Writer::MODULE_MWG, true); $this->dependencyContainer['exiftool.writer']->setModule(Writer::MODULE_MWG, true);
$connbas = $databox->get_connection(); $connbas = $databox->get_connection();
$subdefgroups = $databox->get_subdef_structure(); $subdefgroups = $databox->get_subdef_structure();
$metasubdefs = array(); $metasubdefs = array();