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

Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer

Browse Source
This commit is contained in:
Romain Neutron
2012-03-30 20:12:14 +02:00
parent f835ea84e8
commit 9e640c27cf
27 changed files with 63 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/API/OAuth2/Adapter.class.php
View File

@@ -9,8 +9,6 @@
* file that was distributed with this source code.
*/
require_once __DIR__ . '/../../../vendor/oauth2/lib/OAuth2.inc';
/**
*
*

1
lib/classes/API/V1/result.class.php
View File

@@ -1,6 +1,5 @@
<?php
require_once __DIR__ . "/../../../../lib/vendor/oauth2/lib/OAuth2.inc";
/*
* This file is part of Phraseanet
*

7
lib/classes/Bridge/Api/Auth/Flickr.class.php
View File

@@ -9,13 +9,6 @@
* file that was distributed with this source code.
*/
$include_path = realpath(__DIR__ . '/../../../../vendor/');
if(strpos(get_include_path(), $include_path) === false)
{
$new_include_path = $include_path . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path);
}
/**
*
* @package Bridge

11
lib/classes/Bridge/Api/Flickr.class.php
View File

@@ -9,19 +9,8 @@
* file that was distributed with this source code.
*/
$include_path = realpath(__DIR__ . '/../../../vendor');
if (strpos(get_include_path(), $include_path . ':') === false)
{
$new_include_path = $include_path . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path);
}
use \Symfony\Component\HttpFoundation\Request;
require_once __DIR__ . "/../../../vendor/Phlickr/Api.php";
require_once __DIR__ . "/../../../vendor/Phlickr/Uploader.php";
/**
*
* @package Bridge

13
lib/classes/Bridge/Api/Youtube.class.php
View File

@@ -9,19 +9,6 @@
* file that was distributed with this source code.
*/
$include_path = realpath(__DIR__ . '/../../../vendor/gdata/');
if(strpos(get_include_path(), $include_path) === false)
{
$new_include_path = $include_path . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path);
}
require_once('Zend/Loader.php');
Zend_Loader::loadClass('Zend_Gdata_YouTube');
Zend_Loader::loadClass('Zend_Gdata_HttpClient');
Zend_Loader::loadClass('Zend_Gdata_Query');
Zend_Loader::loadClass('Zend_Gdata_App_MediaFileSource');
use \Symfony\Component\HttpFoundation\Request;
/**

2
lib/classes/binaryAdapter/video/progressive/moovRelocator.class.php
View File

@@ -1,5 +1,5 @@
<?php
require_once __DIR__ . '/../../../../vendor/moov/relocator.class.php';
/*
* This file is part of Phraseanet
*

4
lib/classes/mail.class.php
View File

@@ -188,9 +188,6 @@ class mail
public static function validateEmail($email)
{
$registry = registry::get_instance();
require_once($registry->get('GV_RootPath') . 'lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
return PHPMailer::ValidateAddress($email);
}
@@ -198,7 +195,6 @@ class mail
{
$registry = registry::get_instance();
require_once($registry->get('GV_RootPath') . 'lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
if (!isset($to['email']) || !PHPMailer::ValidateAddress($to['email']))