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

Removing dirname(__FILE__)

Browse Source
This commit is contained in:
Romain Neutron
2011-12-26 20:42:31 +01:00
parent 03a0703441
commit cda51b4686
179 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
require_once dirname(__FILE__) . '/../../../vendor/oauth2/lib/OAuth2.inc'; require_once __DIR__ . '/../../../vendor/oauth2/lib/OAuth2.inc';
/** /**
* *

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

@@ -41,7 +41,7 @@ class API_OAuth2_Autoloader
*/ */
static public function autoload($class) static public function autoload($class)
{ {
if (file_exists($file = dirname(__FILE__) . '/../../../vendor/oauth2/lib/' . str_replace(array('_', "\0"), array('/', ''), $class) . '.inc')) if (file_exists($file = __DIR__ . '/../../../vendor/oauth2/lib/' . str_replace(array('_', "\0"), array('/', ''), $class) . '.inc'))
{ {
require $file; require $file;
} }

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

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

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

@@ -9,11 +9,11 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
$new_include_path = dirname(__FILE__) . "/../../../../vendor/" . PATH_SEPARATOR . get_include_path(); $new_include_path = __DIR__ . "/../../../../vendor/" . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path); set_include_path($new_include_path);
require_once dirname(__FILE__) . "/../../../../vendor/Phlickr/Api.php"; require_once __DIR__ . "/../../../../vendor/Phlickr/Api.php";
require_once dirname(__FILE__) . "/../../../../vendor/Phlickr/Uploader.php"; require_once __DIR__ . "/../../../../vendor/Phlickr/Uploader.php";
/** /**
* *

2
lib/classes/Bridge/Api/Dailymotion.class.php
View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
require_once dirname(__FILE__) . "/../../../classes/DailymotionWithoutOauth2.php"; require_once __DIR__ . "/../../../classes/DailymotionWithoutOauth2.php";
use \Symfony\Component\HttpFoundation\Request; use \Symfony\Component\HttpFoundation\Request;

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

@@ -9,13 +9,13 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
$new_include_path = dirname(__FILE__) . "/../../../vendor/" . PATH_SEPARATOR . get_include_path(); $new_include_path = __DIR__ . "/../../../vendor/" . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path); set_include_path($new_include_path);
use \Symfony\Component\HttpFoundation\Request; use \Symfony\Component\HttpFoundation\Request;
require_once dirname(__FILE__) . "/../../../vendor/Phlickr/Api.php"; require_once __DIR__ . "/../../../vendor/Phlickr/Api.php";
require_once dirname(__FILE__) . "/../../../vendor/Phlickr/Uploader.php"; require_once __DIR__ . "/../../../vendor/Phlickr/Uploader.php";
/** /**
* *

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

@@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
$new_include_path = dirname(__FILE__) . '/../../../vendor/gdata/' . PATH_SEPARATOR . get_include_path(); $new_include_path = __DIR__ . '/../../../vendor/gdata/' . PATH_SEPARATOR . get_include_path();
set_include_path($new_include_path); set_include_path($new_include_path);
require_once('Zend/Loader.php'); require_once('Zend/Loader.php');

2
lib/classes/Setup/Upgrade.class.php
View File

@@ -179,7 +179,7 @@ class Setup_Upgrade
*/ */
public static function get_lock_file() public static function get_lock_file()
{ {
return dirname(__FILE__) . '/../../../tmp/upgrade.lock'; return __DIR__ . '/../../../tmp/upgrade.lock';
} }
/** /**

2
lib/classes/User/Adapter.class.php
View File

@@ -1376,7 +1376,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{ {
$lngs = array(); $lngs = array();
$path = dirname(__FILE__) . "/../../../locale"; $path = __DIR__ . "/../../../locale";
if ($hdir = opendir($path)) if ($hdir = opendir($path))
{ {
while (false !== ($file = readdir($hdir))) while (false !== ($file = readdir($hdir)))

8
lib/classes/appbox.class.php
View File

@@ -74,7 +74,7 @@ class appbox extends base
$this->registry = $registry; $this->registry = $registry;
$this->session = Session_Handler::getInstance($this); $this->session = Session_Handler::getInstance($this);
require dirname(__FILE__) . '/../../config/connexion.inc'; require __DIR__ . '/../../config/connexion.inc';
$this->host = $hostname; $this->host = $hostname;
$this->port = $port; $this->port = $port;
@@ -409,7 +409,7 @@ class appbox extends base
{ {
$credentials['dbname'] = $dbname; $credentials['dbname'] = $dbname;
} }
$connexion = dirname(__FILE__) . "/../../config/connexion.inc"; $connexion = __DIR__ . "/../../config/connexion.inc";
if (is_file($connexion)) if (is_file($connexion))
unlink($connexion); unlink($connexion);
@@ -422,7 +422,7 @@ class appbox extends base
} }
if (!file_put_contents($connexion, $connexionINI, FILE_APPEND) !== false) if (!file_put_contents($connexion, $connexionINI, FILE_APPEND) !== false)
throw new Exception(sprintf(_('Impossible d\'ecrire dans le dossier %s'), dirname(dirname(__FILE__)) . "/config/")); throw new Exception(sprintf(_('Impossible d\'ecrire dans le dossier %s'), dirname(__DIR__) . "/config/"));
if (function_exists('chmod')) if (function_exists('chmod'))
chmod($connexion, 0700); chmod($connexion, 0700);
@@ -545,7 +545,7 @@ class appbox extends base
public static function list_databox_templates() public static function list_databox_templates()
{ {
$files = array(); $files = array();
$dir = new DirectoryIterator(dirname(__FILE__) . '/../conf.d/data_templates/'); $dir = new DirectoryIterator(__DIR__ . '/../conf.d/data_templates/');
foreach ($dir as $fileinfo) foreach ($dir as $fileinfo)
{ {
if ($fileinfo->isFile()) if ($fileinfo->isFile())

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

@@ -268,7 +268,7 @@ abstract class base implements cache_cacheableInterface
protected function upgradeDb($apply_patches, Setup_Upgrade &$upgrader) protected function upgradeDb($apply_patches, Setup_Upgrade &$upgrader)
{ {
require_once dirname(__FILE__) . '/../version.inc'; require_once __DIR__ . '/../version.inc';
$recommends = array(); $recommends = array();
@@ -393,7 +393,7 @@ abstract class base implements cache_cacheableInterface
return $this; return $this;
$structure = simplexml_load_file(dirname(__FILE__) . "/../../lib/conf.d/bases_structure.xml"); $structure = simplexml_load_file(__DIR__ . "/../../lib/conf.d/bases_structure.xml");
if (!$structure) if (!$structure)
throw new Exception('Unable to load schema'); throw new Exception('Unable to load schema');

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

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

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

@@ -134,9 +134,9 @@ class connection
} }
else else
{ {
if (!is_file(dirname(__FILE__) . '/../../config/connexion.inc')) if (!is_file(__DIR__ . '/../../config/connexion.inc'))
throw new Exception('Unable to load config file'); throw new Exception('Unable to load config file');
require (dirname(__FILE__) . '/../../config/connexion.inc'); require (__DIR__ . '/../../config/connexion.inc');
} }
if (isset($connection_params[$name])) if (isset($connection_params[$name]))
{ {

2
lib/classes/connection/pdo.class.php
View File

@@ -88,7 +88,7 @@ class connection_pdo extends connection_abstract implements connection_interface
*/ */
protected function log($message) protected function log($message)
{ {
file_put_contents(dirname(__FILE__) . '/../../../logs/sql_log.log', $message . "\n", FILE_APPEND); file_put_contents(__DIR__ . '/../../../logs/sql_log.log', $message . "\n", FILE_APPEND);
return $this; return $this;
} }

2
lib/classes/databox.class.php
View File

@@ -722,7 +722,7 @@ class databox extends base
public static function get_available_metadatas() public static function get_available_metadatas()
{ {
$available_fields = array(); $available_fields = array();
$dir = dirname(__FILE__) . '/metadata/description/'; $dir = __DIR__ . '/metadata/description/';
$registry = registry::get_instance(); $registry = registry::get_instance();
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY) as $file)
{ {

10
lib/classes/eventsmanager/broker.class.php
View File

@@ -67,17 +67,17 @@ class eventsmanager_broker
{ {
$iterators_pool = array(); $iterators_pool = array();
$root = dirname(__FILE__) . '/../../'; $root = __DIR__ . '/../../';
if ($type == 'event') if ($type == 'event')
{ {
$iterators_pool['event'][] = new DirectoryIterator(dirname(__FILE__) . '/event/'); $iterators_pool['event'][] = new DirectoryIterator(__DIR__ . '/event/');
if (file_exists(dirname(__FILE__) . '/event/')) if (file_exists(__DIR__ . '/event/'))
$iterators_pool['event'][] = new DirectoryIterator(dirname(__FILE__) . '/event/'); $iterators_pool['event'][] = new DirectoryIterator(__DIR__ . '/event/');
} }
if ($type == 'notify') if ($type == 'notify')
{ {
$iterators_pool['notify'][] = new DirectoryIterator(dirname(__FILE__) . '/notify/'); $iterators_pool['notify'][] = new DirectoryIterator(__DIR__ . '/notify/');
} }
$ret = array(); $ret = array();

2
lib/classes/module/console/aboutAuthors.class.php
View File

@@ -37,7 +37,7 @@ class module_console_aboutAuthors extends Command
public function execute(InputInterface $input, OutputInterface $output) public function execute(InputInterface $input, OutputInterface $output)
{ {
$output->writeln(file_get_contents(dirname(__FILE__) . '/../../../../AUTHORS')); $output->writeln(file_get_contents(__DIR__ . '/../../../../AUTHORS'));
return; return;
} }

2
lib/classes/module/console/aboutLicense.class.php
View File

@@ -37,7 +37,7 @@ class module_console_aboutLicense extends Command
public function execute(InputInterface $input, OutputInterface $output) public function execute(InputInterface $input, OutputInterface $output)
{ {
$output->writeln(file_get_contents(dirname(__FILE__) . '/../../../../LICENSE')); $output->writeln(file_get_contents(__DIR__ . '/../../../../LICENSE'));
return; return;
} }

2
lib/classes/module/console/schedulerStart.class.php
View File

@@ -45,7 +45,7 @@ class module_console_schedulerStart extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$scheduler = new task_Scheduler(); $scheduler = new task_Scheduler();
$scheduler->run($output, true); $scheduler->run($output, true);

2
lib/classes/module/console/schedulerState.class.php
View File

@@ -40,7 +40,7 @@ class module_console_schedulerState extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$task_manager = new task_manager($appbox); $task_manager = new task_manager($appbox);

2
lib/classes/module/console/schedulerStop.class.php
View File

@@ -40,7 +40,7 @@ class module_console_schedulerStop extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$task_manager = new task_manager($appbox); $task_manager = new task_manager($appbox);

4
lib/classes/module/console/systemBackupDB.class.php
View File

@@ -31,7 +31,7 @@ class module_console_systemBackupDB extends Command
$dir = sprintf( $dir = sprintf(
'%s/config/' '%s/config/'
, dirname(dirname(dirname(dirname(dirname(__FILE__))))) , dirname(dirname(dirname(dirname(__DIR__))))
); );
$this->setDescription('Backup Phraseanet Databases'); $this->setDescription('Backup Phraseanet Databases');
@@ -48,7 +48,7 @@ class module_console_systemBackupDB extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$output->write('Phraseanet is going to be backup...', true); $output->write('Phraseanet is going to be backup...', true);

8
lib/classes/module/console/systemClearCache.class.php
View File

@@ -44,8 +44,8 @@ class module_console_systemClearCache extends Command
->exclude('.git') ->exclude('.git')
->exclude('.svn') ->exclude('.svn')
->in(array( ->in(array(
dirname(__FILE__) . '/../../../../tmp/cache_minify/' __DIR__ . '/../../../../tmp/cache_minify/'
, dirname(__FILE__) . '/../../../../tmp/cache_twig/' , __DIR__ . '/../../../../tmp/cache_twig/'
)) ))
; ;
$count = 1; $count = 1;
@@ -59,8 +59,8 @@ class module_console_systemClearCache extends Command
$finder $finder
->directories() ->directories()
->in(array( ->in(array(
dirname(__FILE__) . '/../../../../tmp/cache_minify' __DIR__ . '/../../../../tmp/cache_minify'
, dirname(__FILE__) . '/../../../../tmp/cache_twig' , __DIR__ . '/../../../../tmp/cache_twig'
)) ))
->exclude('.git') ->exclude('.git')
->exclude('.svn') ->exclude('.svn')

8
lib/classes/module/console/systemTemplateGenerator.class.php
View File

@@ -36,16 +36,16 @@ class module_console_systemTemplateGenerator extends Command
public function execute(InputInterface $input, OutputInterface $output) public function execute(InputInterface $input, OutputInterface $output)
{ {
require_once dirname(__FILE__) . '/../../../../lib/vendor/Twig/lib/Twig/Autoloader.php'; require_once __DIR__ . '/../../../../lib/vendor/Twig/lib/Twig/Autoloader.php';
require_once dirname(__FILE__) . '/../../../../lib/vendor/Twig-extensions/lib/Twig/Extensions/Autoloader.php'; require_once __DIR__ . '/../../../../lib/vendor/Twig-extensions/lib/Twig/Extensions/Autoloader.php';
Twig_Autoloader::register(); Twig_Autoloader::register();
Twig_Extensions_Autoloader::register(); Twig_Extensions_Autoloader::register();
$tplDir = dirname(__FILE__) . '/../../../../templates/'; $tplDir = __DIR__ . '/../../../../templates/';
$tmpDir = dirname(__FILE__) . '/../../../../tmp/cache_twig/'; $tmpDir = __DIR__ . '/../../../../tmp/cache_twig/';
$loader = new Twig_Loader_Filesystem($tplDir); $loader = new Twig_Loader_Filesystem($tplDir);
$twig = new Twig_Environment($loader, array( $twig = new Twig_Environment($loader, array(

8
lib/classes/module/console/systemUpgrade.class.php
View File

@@ -39,9 +39,9 @@ class module_console_systemUpgrade extends Command
if (!setup::is_installed()) if (!setup::is_installed())
{ {
if (file_exists(dirname(__FILE__) . "/../../../../config/connexion.inc") if (file_exists(__DIR__ . "/../../../../config/connexion.inc")
&& !file_exists(dirname(__FILE__) . "/../../../../config/config.inc") && !file_exists(__DIR__ . "/../../../../config/config.inc")
&& file_exists(dirname(__FILE__) . "/../../../../config/_GV.php")) && file_exists(__DIR__ . "/../../../../config/_GV.php"))
{ {
$output->writeln('This version of Phraseanet requires a config/config.inc'); $output->writeln('This version of Phraseanet requires a config/config.inc');
@@ -76,7 +76,7 @@ class module_console_systemUpgrade extends Command
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$output->write('Phraseanet is going to be upgraded', true); $output->write('Phraseanet is going to be upgraded', true);
$dialog = $this->getHelperSet()->get('dialog'); $dialog = $this->getHelperSet()->get('dialog');

2
lib/classes/module/console/tasklist.class.php
View File

@@ -42,7 +42,7 @@ class module_console_tasklist extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$task_manager = new task_manager($appbox); $task_manager = new task_manager($appbox);

2
lib/classes/module/console/taskrun.class.php
View File

@@ -50,7 +50,7 @@ class module_console_taskrun extends Command
throw new RuntimeException('Phraseanet is not set up'); throw new RuntimeException('Phraseanet is not set up');
} }
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php'; require_once __DIR__ . '/../../../../lib/bootstrap.php';
$task_id = (int) $input->getArgument('task_id'); $task_id = (int) $input->getArgument('task_id');

6
lib/classes/patch/320aa.class.php
View File

@@ -54,9 +54,9 @@ class patch_320aa implements patchInterface
function apply(base &$appbox) function apply(base &$appbox)
{ {
if(is_file(dirname(__FILE__) . '/../../../config/_GV.php')) if(is_file(__DIR__ . '/../../../config/_GV.php'))
require dirname(__FILE__) . '/../../../config/_GV.php'; require __DIR__ . '/../../../config/_GV.php';
require dirname(__FILE__) . '/../../../lib/conf.d/_GV_template.inc'; require __DIR__ . '/../../../lib/conf.d/_GV_template.inc';
define('GV_STATIC_URL', ''); define('GV_STATIC_URL', '');
define('GV_sphinx', false); define('GV_sphinx', false);

6
lib/classes/phrasea.class.php
View File

@@ -105,7 +105,7 @@ class phrasea
public static function start() public static function start()
{ {
require (dirname(__FILE__) . '/../../config/connexion.inc'); require (__DIR__ . '/../../config/connexion.inc');
if (!extension_loaded('phrasea2')) if (!extension_loaded('phrasea2'))
printf("Missing Extension php-phrasea"); printf("Missing Extension php-phrasea");
@@ -283,7 +283,7 @@ class phrasea
putenv('LANGUAGE=' . $locale . '.' . $codeset); putenv('LANGUAGE=' . $locale . '.' . $codeset);
bind_textdomain_codeset($textdomain, 'UTF-8'); bind_textdomain_codeset($textdomain, 'UTF-8');
bindtextdomain($textdomain, dirname(__FILE__) . '/../../locale/'); bindtextdomain($textdomain, __DIR__ . '/../../locale/');
setlocale(LC_ALL setlocale(LC_ALL
, $locale . '.UTF-8' , $locale . '.UTF-8'
, $locale . '.UTF8' , $locale . '.UTF8'
@@ -497,7 +497,7 @@ class phrasea
else else
{ {
$request->set_code($code); $request->set_code($code);
include(dirname(__FILE__) . '/../../www/include/error.php'); include(__DIR__ . '/../../www/include/error.php');
} }
die(); die();
break; break;

6
lib/classes/registry.class.php
View File

@@ -41,7 +41,7 @@ class registry implements registryInterface
*/ */
public static function get_instance() public static function get_instance()
{ {
$prefix = crc32(dirname(__FILE__)); $prefix = crc32(__DIR__);
if (!self::$_instance instanceof self) if (!self::$_instance instanceof self)
self::$_instance = new self(new cache_opcode_adapter($prefix)); self::$_instance = new self(new cache_opcode_adapter($prefix));
@@ -57,8 +57,8 @@ class registry implements registryInterface
{ {
$this->cache = $cache; $this->cache = $cache;
require dirname(__FILE__) . '/../../config/config.inc'; require __DIR__ . '/../../config/config.inc';
$this->cache->set('GV_RootPath', dirname(dirname(dirname(__FILE__))) . '/'); $this->cache->set('GV_RootPath', dirname(dirname(__DIR__)) . '/');
$this->cache->set('GV_ServerName', p4string::addEndSlash($servername)); $this->cache->set('GV_ServerName', p4string::addEndSlash($servername));
$this->cache->set('GV_debug', !!$debug); $this->cache->set('GV_debug', !!$debug);
$this->cache->set('GV_maintenance', !!$maintenance); $this->cache->set('GV_maintenance', !!$maintenance);

2
lib/classes/searchEngine/adapter/sphinx/engine.class.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require_once dirname(__FILE__) . '/../../../../vendor/sphinx/sphinxapi.php'; require_once __DIR__ . '/../../../../vendor/sphinx/sphinxapi.php';
/* /*
* This file is part of Phraseanet * This file is part of Phraseanet
* *

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

@@ -956,7 +956,7 @@ class set_export extends set_abstract
public static function stream_file( public static function stream_file(
$file, $exportname, $mime, $disposition='attachment') $file, $exportname, $mime, $disposition='attachment')
{ {
require_once dirname(__FILE__) . "/../../../lib/vendor/Silex/autoload.php"; require_once __DIR__ . "/../../../lib/vendor/Silex/autoload.php";
$registry = registry::get_instance(); $registry = registry::get_instance();
$disposition = in_array($disposition, array('inline', 'attachment')) ? $disposition = in_array($disposition, array('inline', 'attachment')) ?

22
lib/classes/setup.class.php
View File

@@ -68,13 +68,13 @@ class setup
public static function is_installed() public static function is_installed()
{ {
return file_exists(dirname(__FILE__) . "/../../config/connexion.inc") return file_exists(__DIR__ . "/../../config/connexion.inc")
&& file_exists(dirname(__FILE__) . "/../../config/config.inc"); && file_exists(__DIR__ . "/../../config/config.inc");
} }
function create_global_values(registryInterface &$registry, $datas=array()) function create_global_values(registryInterface &$registry, $datas=array())
{ {
require(dirname(__FILE__) . "/../../lib/conf.d/_GV_template.inc"); require(__DIR__ . "/../../lib/conf.d/_GV_template.inc");
if ($registry->is_set('GV_timezone')) if ($registry->is_set('GV_timezone'))
@@ -257,12 +257,12 @@ class setup
{ {
if (system_server::get_platform() == 'WINDOWS') if (system_server::get_platform() == 'WINDOWS')
{ {
$exiftool = dirname(dirname(__FILE__)) . '/vendor/exiftool/exiftool.exe'; $exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool.exe';
$indexer = dirname(dirname(dirname(__FILE__))) . '/bin/phraseanet_indexer.exe'; $indexer = dirname(dirname(__DIR__)) . '/bin/phraseanet_indexer.exe';
} }
else else
{ {
$exiftool = dirname(dirname(__FILE__)) . '/vendor/exiftool/exiftool'; $exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool';
$indexer = null; $indexer = null;
} }
@@ -453,7 +453,7 @@ class setup
public static function check_writability(registryInterface $registry) public static function check_writability(registryInterface $registry)
{ {
$root = p4string::addEndSlash(realpath(dirname(__FILE__) . '/../../')); $root = p4string::addEndSlash(realpath(__DIR__ . '/../../'));
$pathes = array( $pathes = array(
$root . 'config', $root . 'config',
@@ -765,17 +765,17 @@ class setup
public static function get_config_filepath() public static function get_config_filepath()
{ {
return dirname(__FILE__) . '/../../config/config.inc'; return __DIR__ . '/../../config/config.inc';
} }
public static function get_connexion_filepath() public static function get_connexion_filepath()
{ {
return dirname(__FILE__) . '/../../config/connexion.inc'; return __DIR__ . '/../../config/connexion.inc';
} }
public static function rollback(connection_pdo $conn, connection_pdo $connbas =null) public static function rollback(connection_pdo $conn, connection_pdo $connbas =null)
{ {
$structure = simplexml_load_file(dirname(__FILE__) . "/../../lib/conf.d/bases_structure.xml"); $structure = simplexml_load_file(__DIR__ . "/../../lib/conf.d/bases_structure.xml");
if (!$structure) if (!$structure)
throw new Exception('Unable to load schema'); throw new Exception('Unable to load schema');
@@ -814,7 +814,7 @@ class setup
} }
} }
} }
$connexion = dirname(__FILE__) . "/../../config/connexion.inc"; $connexion = __DIR__ . "/../../config/connexion.inc";
if (file_exists($connexion)) if (file_exists($connexion))
unlink($connexion); unlink($connexion);

2
lib/classes/sphinx/configuration.class.php
View File

@@ -37,7 +37,7 @@ class sphinx_configuration
public function get_available_charsets() public function get_available_charsets()
{ {
$available_charsets = array(); $available_charsets = array();
$dir = dirname(__FILE__) . '/charsetTable/'; $dir = __DIR__ . '/charsetTable/';
echo $dir; echo $dir;
$registry = registry::get_instance(); $registry = registry::get_instance();
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY) as $file)

4
lib/classes/task/Scheduler.class.php
View File

@@ -45,14 +45,14 @@ class task_Scheduler
protected static function get_connection() protected static function get_connection()
{ {
require dirname(__FILE__) . '/../../../config/connexion.inc'; require __DIR__ . '/../../../config/connexion.inc';
return new connection_pdo('appbox', $hostname, $port, $user, $password, $dbname); return new connection_pdo('appbox', $hostname, $port, $user, $password, $dbname);
} }
public function run(OutputInterface $output = null, $log_tasks = true) public function run(OutputInterface $output = null, $log_tasks = true)
{ {
require_once dirname(__FILE__) . '/../../bootstrap.php'; require_once __DIR__ . '/../../bootstrap.php';
$this->output = $output; $this->output = $output;
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/admin/adminFeedback.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
phrasea::headers(200, false, 'text/html', 'UTF-8', false); phrasea::headers(200, false, 'text/html', 'UTF-8', false);
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/admin/cgus.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/collection.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/collorder.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/database.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

6
www/admin/databases.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$usr_id = $session->get_usr_id(); $usr_id = $session->get_usr_id();
@@ -97,7 +97,7 @@ phrasea::headers();
{ {
try try
{ {
require dirname(__FILE__) . '/../../config/connexion.inc'; require __DIR__ . '/../../config/connexion.inc';
$data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml'); $data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml');
$connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname']); $connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname']);
@@ -159,7 +159,7 @@ phrasea::headers();
{ {
try try
{ {
require dirname(__FILE__) . '/../../config/connexion.inc'; require __DIR__ . '/../../config/connexion.inc';
$appbox->get_connection()->beginTransaction(); $appbox->get_connection()->beginTransaction();
$base = databox::mount($appbox, $hostname, $port, $user, $password, $parm['new_dbname'], $registry); $base = databox::mount($appbox, $hostname, $port, $user, $password, $parm['new_dbname'], $registry);
$base->registerAdmin($user_obj); $base->registerAdmin($user_obj);

2
www/admin/demand.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/description.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/getinfousr.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$request = http_request::getInstance(); $request = http_request::getInstance();
$parm = $request->get_parms("u"); $parm = $request->get_parms("u");

2
www/admin/global_values.php
View File

@@ -22,7 +22,7 @@ require($registry->get('GV_RootPath') . "lib/classes/deprecated/countries.php");
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox); $user = User_Adapter::getInstance($session->get_usr_id(), $appbox);
require(dirname(__FILE__) . "/../../lib/conf.d/_GV_template.inc"); require(__DIR__ . "/../../lib/conf.d/_GV_template.inc");
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/admin/import.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/import0.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/index.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/admin/newcoll.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/runscheduler.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/sessionwhois.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
?> ?>

2
www/admin/showlogtask.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/sitestruct.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/sphinxconf.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$registry = registry::get_instance(); $registry = registry::get_instance();
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/admin/statbits.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/structure.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/subdefs.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/sugval.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/task2.js.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$request = http_request::getInstance(); $request = http_request::getInstance();
$parm = $request->get_parms('tid' // task_id $parm = $request->get_parms('tid' // task_id

2
www/admin/task2.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/task2utils.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/admin/taskfacility.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(dirname(dirname(__FILE__))) . "/lib/bootstrap.php"; require_once dirname(dirname(__DIR__)) . "/lib/bootstrap.php";
$request = http_request::getInstance(); $request = http_request::getInstance();
$parm = $request->get_parms('cls', 'taskid'); $parm = $request->get_parms('cls', 'taskid');

2
www/admin/taskmanager.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/api/login/login.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../../lib/bootstrap.php"; require_once __DIR__ . "/../../../lib/bootstrap.php";
//SPECIAL ZINO //SPECIAL ZINO

2
www/api/test.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/api/test_upl.php
View File

@@ -21,7 +21,7 @@ $session = $appbox->get_session();
<body> <body>
<div style='background-color:#e0e0e0'> <div style='background-color:#e0e0e0'>
<?php <?php
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
//SPECIAL ZINO //SPECIAL ZINO
ini_set('display_errors', 'off'); ini_set('display_errors', 'off');

2
www/api/upload/upload.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../../lib/bootstrap.php"; require_once __DIR__ . "/../../../lib/bootstrap.php";
//SPECIAL ZINO //SPECIAL ZINO

2
www/client/answer.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/client/baskets.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/client/clientFeedBack.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/client/index.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/cguUtils.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/delses.php
View File

@@ -17,7 +17,7 @@
*/ */
ignore_user_abort(true); ignore_user_abort(true);
set_time_limit(0); set_time_limit(0);
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/include/download.php
View File

@@ -16,7 +16,7 @@
* @link www.phraseanet.com * @link www.phraseanet.com
*/ */
/* @var $Core \Alchemy\Phrasea\Core */ /* @var $Core \Alchemy\Phrasea\Core */
$Core = require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; $Core = require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/include/download_anonymous.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();

2
www/include/download_prepare.exe.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$gatekeeper = gatekeeper::getInstance(); $gatekeeper = gatekeeper::getInstance();
$gatekeeper->require_session(); $gatekeeper->require_session();

2
www/include/download_prepare.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/include/error.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
include_once dirname(__FILE__) . '/../../lib/bootstrap.php'; include_once __DIR__ . '/../../lib/bootstrap.php';
$appbox = appbox::get_instance(registry::get_instance()); $appbox = appbox::get_instance(registry::get_instance());
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/include/geonames.feedback.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
include(dirname(__FILE__) . '/../../lib/bootstrap.php'); include(__DIR__ . '/../../lib/bootstrap.php');
$output = ''; $output = '';
$request = http_request::getInstance(); $request = http_request::getInstance();

6
www/include/minify/builder/index.php
View File

@@ -8,7 +8,7 @@ if (phpversion() < 5) {
$encodeOutput = (function_exists('gzdeflate') $encodeOutput = (function_exists('gzdeflate')
&& !ini_get('zlib.output_compression')); && !ini_get('zlib.output_compression'));
require dirname(__FILE__) . '/../config.php'; require __DIR__ . '/../config.php';
if (! $min_enableBuilder) { if (! $min_enableBuilder) {
header('Location: /'); header('Location: /');
@@ -162,14 +162,14 @@ $serveOpts = array(
,'lastModifiedTime' => max( ,'lastModifiedTime' => max(
// regenerate cache if either of these change // regenerate cache if either of these change
filemtime(__FILE__) filemtime(__FILE__)
,filemtime(dirname(__FILE__) . '/../config.php') ,filemtime(__DIR__ . '/../config.php')
) )
,'minifyAll' => true ,'minifyAll' => true
,'encodeOutput' => $encodeOutput ,'encodeOutput' => $encodeOutput
); );
ob_end_clean(); ob_end_clean();
set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__ . '/../lib' . PATH_SEPARATOR . get_include_path());
require 'Minify.php'; require 'Minify.php';

2
www/include/minify/builder/ocCheck.php
View File

@@ -8,7 +8,7 @@
$_oc = ini_get('zlib.output_compression'); $_oc = ini_get('zlib.output_compression');
// allow access only if builder is enabled // allow access only if builder is enabled
require dirname(__FILE__) . '/../config.php'; require __DIR__ . '/../config.php';
if (! $min_enableBuilder) { if (! $min_enableBuilder) {
header('Location: /'); header('Location: /');
exit(); exit();

2
www/include/minify/config.php
View File

@@ -150,7 +150,7 @@ $min_uploaderHoursBehind = 0;
* Path to Minify's lib folder. If you happen to move it, change * Path to Minify's lib folder. If you happen to move it, change
* this accordingly. * this accordingly.
*/ */
$min_libPath = dirname(__FILE__) . '/lib'; $min_libPath = __DIR__ . '/lib';
$min_cachePath = dirname( __FILE__ ) . '/../../../tmp/cache_minify'; $min_cachePath = dirname( __FILE__ ) . '/../../../tmp/cache_minify';

2
www/include/minify/index.php
View File

@@ -7,7 +7,7 @@
* @package Minify * @package Minify
*/ */
define('MINIFY_MIN_DIR', dirname(__FILE__)); define('MINIFY_MIN_DIR', __DIR__);
// load config // load config
require MINIFY_MIN_DIR . '/config.php'; require MINIFY_MIN_DIR . '/config.php';

4
www/include/minify/utils.php
View File

@@ -34,7 +34,7 @@ function Minify_groupUri($group, $forceAmpersand = false)
: "/?g={$group}"; : "/?g={$group}";
return _Minify_getBuild($group)->uri( return _Minify_getBuild($group)->uri(
'/' . basename(dirname(__FILE__)) . $path '/' . basename(__DIR__) . $path
,$forceAmpersand ,$forceAmpersand
); );
} }
@@ -83,7 +83,7 @@ function _Minify_getBuild($group)
static $builds = array(); static $builds = array();
static $gc = false; static $gc = false;
if (false === $gc) { if (false === $gc) {
$gc = (require dirname(__FILE__) . '/groupsConfig.php'); $gc = (require __DIR__ . '/groupsConfig.php');
} }
if (! isset($builds[$group])) { if (! isset($builds[$group])) {
$builds[$group] = new Minify_Build($gc[$group]); $builds[$group] = new Minify_Build($gc[$group]);

2
www/include/multiexports.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/printpage.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/printpage_pdf.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/sendmailpage.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . '/../../lib/bootstrap.php'; require_once __DIR__ . '/../../lib/bootstrap.php';
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/include/updses.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

4
www/login/account.php
View File

@@ -14,9 +14,9 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
require_once dirname(__FILE__) . "/../../lib/classes/API/OAuth2/Autoloader.class.php"; require_once __DIR__ . "/../../lib/classes/API/OAuth2/Autoloader.class.php";
API_OAuth2_Autoloader::register(); API_OAuth2_Autoloader::register();

2
www/login/authenticate.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/login/forgotpwd.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

2
www/login/index.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/login/logout.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/login/register-confirm.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$request = http_request::getInstance(); $request = http_request::getInstance();

2
www/login/register.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();

4
www/login/reset-email.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();
@@ -133,7 +133,7 @@ if (isset($parm['form_password']) && isset($parm['form_email']) && isset($parm['
if (str_replace(array("\r\n", "\r", "\n", "\t"), '_', trim($parm['form_email'])) == $parm['form_email_confirm']) if (str_replace(array("\r\n", "\r", "\n", "\t"), '_', trim($parm['form_email'])) == $parm['form_email_confirm'])
{ {
require_once(dirname(__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php'); require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
if (PHPMailer::ValidateAddress($parm['form_email'])) if (PHPMailer::ValidateAddress($parm['form_email']))
{ {
if (mail::reset_email($parm['form_email'], $session->get_usr_id()) === true) if (mail::reset_email($parm['form_email'], $session->get_usr_id()) === true)

2
www/login/reset-password.php
View File

@@ -14,7 +14,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
www/login/sendmail-confirm.php
View File

@@ -15,7 +15,7 @@
* @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
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$request = http_request::getInstance(); $request = http_request::getInstance();
$parm = $request->get_post_datas('usr_id'); $parm = $request->get_post_datas('usr_id');

2
www/prod/answer.php
View File

@@ -18,7 +18,7 @@
* @see http://developer.phraseanet.com * @see http://developer.phraseanet.com
* *
*/ */
require_once dirname(__FILE__) . "/../../lib/bootstrap.php"; require_once __DIR__ . "/../../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$session = $appbox->get_session(); $session = $appbox->get_session();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

Some files were not shown because too many files have changed in this diff Show More