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

Syntax corrections

Browse Source
This commit is contained in:
Romain Neutron
2011-12-27 15:51:19 +01:00
parent 1617d3e561
commit 2c850bf74f
13 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/changefield.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";
$registry = registry::get_instance(); $registry = registry::get_instance();
require($registry->get('GV_RootPath') . "lib/classes/deprecated/getargs.php"); // le parser d'arguments de la ligne de commande require($registry->get('GV_RootPath') . "lib/classes/deprecated/getargs.php"); // le parser d'arguments de la ligne de commande

2
bin/dumpbase.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";
define('DOCPERDIR', 100); define('DOCPERDIR', 100);

2
bin/suggest_cron.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include dirname(__FILE__) . '/../lib/bootstrap.php'; include __DIR__ . '/../lib/bootstrap.php';
define('FREQ_THRESHOLD', 10); define('FREQ_THRESHOLD', 10);
define('SUGGEST_DEBUG', 0); define('SUGGEST_DEBUG', 0);

2
bin/testextension2.php
View File

@@ -18,7 +18,7 @@ define('USR_ID', 4);
set_time_limit(300); set_time_limit(300);
require(dirname(__FILE__) . "/../lib/bootstrap.php"); require(__DIR__ . "/../lib/bootstrap.php");
phrasea::headers(); phrasea::headers();
$registry = registry::get_instance(); $registry = registry::get_instance();

2
lib/Alchemy/Phrasea/Application/Root.php
View File

@@ -45,7 +45,7 @@ return call_user_func(function()
$app->get('robots.txt', function() use ($app) $app->get('robots.txt', function() use ($app)
{ {
require dirname(__FILE__) . "/../lib/bootstrap.php"; require __DIR__ . "/../lib/bootstrap.php";
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$registry = $appbox->get_registry(); $registry = $appbox->get_registry();

2
lib/Alchemy/Phrasea/Application/Setup.php
View File

@@ -15,7 +15,7 @@ use Silex\Application;
use Alchemy\Phrasea\Controller\Setup as Controller; use Alchemy\Phrasea\Controller\Setup as Controller;
use Alchemy\Phrasea\Controller\Utils as ControllerUtils; use Alchemy\Phrasea\Controller\Utils as ControllerUtils;
require_once dirname(__FILE__) . '/../../../bootstrap.php'; require_once __DIR__ . '/../../../bootstrap.php';
/** /**
* *
* @package * @package

4
lib/Alchemy/Phrasea/Controller/Setup/Installer.php
View File

@@ -126,7 +126,7 @@ class Installer implements ControllerProviderInterface
, 'warnings' => $warnings , 'warnings' => $warnings
, 'current_servername' => $request->getScheme() . '://' . $request->getHttpHost() . '/' , 'current_servername' => $request->getScheme() . '://' . $request->getHttpHost() . '/'
, 'discovered_binaries' => \setup::discover_binaries() , 'discovered_binaries' => \setup::discover_binaries()
, 'rootpath' => dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/' , 'rootpath' => dirname(dirname(dirname(dirname(__DIR__)))) . '/'
) )
); );
@@ -205,7 +205,7 @@ class Installer implements ControllerProviderInterface
if ($databox_name) if ($databox_name)
{ {
$template = new \system_file(dirname(__FILE__) . '/../../../conf.d/data_templates/' . $request->get('db_template') . '.xml'); $template = new \system_file(__DIR__ . '/../../../conf.d/data_templates/' . $request->get('db_template') . '.xml');
$databox = \databox::create($appbox, $connbas, $template, $registry); $databox = \databox::create($appbox, $connbas, $template, $registry);
$user->ACL() $user->ACL()
->give_access_to_sbas(array($databox->get_sbas_id())) ->give_access_to_sbas(array($databox->get_sbas_id()))

6
lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
View File

@@ -40,7 +40,7 @@ class Upgrader implements ControllerProviderInterface
$controllers->get('/', function() use ($app) $controllers->get('/', function() use ($app)
{ {
require_once dirname(__FILE__) . '/../../../../bootstrap.php'; require_once __DIR__ . '/../../../../bootstrap.php';
$upgrade_status = \Setup_Upgrade::get_status(); $upgrade_status = \Setup_Upgrade::get_status();
ini_set('display_errors', 'on'); ini_set('display_errors', 'on');
@@ -62,7 +62,7 @@ class Upgrader implements ControllerProviderInterface
$controllers->get('/status/', function() use ($app) $controllers->get('/status/', function() use ($app)
{ {
require_once dirname(__FILE__) . '/../../../../bootstrap.php'; require_once __DIR__ . '/../../../../bootstrap.php';
ini_set('display_errors', 'on'); ini_set('display_errors', 'on');
$datas = \Setup_Upgrade::get_status(); $datas = \Setup_Upgrade::get_status();
@@ -72,7 +72,7 @@ class Upgrader implements ControllerProviderInterface
$controllers->post('/execute/', function() use ($app) $controllers->post('/execute/', function() use ($app)
{ {
require_once dirname(__FILE__) . '/../../../../bootstrap.php'; require_once __DIR__ . '/../../../../bootstrap.php';
ini_set('display_errors', 'on'); ini_set('display_errors', 'on');
set_time_limit(0); set_time_limit(0);
session_write_close(); session_write_close();

2
www/admin/demand.php
View File

@@ -194,7 +194,7 @@ if (!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept'])
if ($row) if ($row)
{ {
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($row['usr_mail'])) if (PHPMailer::ValidateAddress($row['usr_mail']))
{ {
foreach ($bases as $bas => $isok) foreach ($bases as $bas => $isok)

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

@@ -1,5 +1,5 @@
<?php <?php
$_SERVER["DOCUMENT_ROOT"] = dirname( __FILE__ ) . '/../../../www/'; $_SERVER["DOCUMENT_ROOT"] = __DIR__ . '/../../../www/';
/** /**
* Configuration for default Minify application * Configuration for default Minify application
* @package Minify * @package Minify
@@ -151,7 +151,7 @@ $min_uploaderHoursBehind = 0;
* this accordingly. * this accordingly.
*/ */
$min_libPath = __DIR__ . '/lib'; $min_libPath = __DIR__ . '/lib';
$min_cachePath = dirname( __FILE__ ) . '/../../../tmp/cache_minify'; $min_cachePath = __DIR__ . '/../../../tmp/cache_minify';
// try to disable output_compression (may not have an effect) // try to disable output_compression (may not have an effect)

2
www/login/forgotpwd.php
View File

@@ -27,7 +27,7 @@ $needed = array();
if (isset($parm["mail"]) && trim($parm["mail"]) != "") if (isset($parm["mail"]) && trim($parm["mail"]) != "")
{ {
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['mail'])) if (!PHPMailer::ValidateAddress($parm['mail']))
{ {
return phrasea::redirect('/login/forgotpwd.php?error=noaccount'); return phrasea::redirect('/login/forgotpwd.php?error=noaccount');

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

@@ -41,7 +41,7 @@ catch(Exception_NotFound $e)
$user->set_mail_locked(false); $user->set_mail_locked(false);
random::removeToken($parm['code']); random::removeToken($parm['code']);
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($user->get_email())) if (PHPMailer::ValidateAddress($user->get_email()))
{ {
if (count($user->ACL()->get_granted_base()) > 0) if (count($user->ACL()->get_granted_base()) > 0)

2
www/login/register.php
View File

@@ -102,7 +102,7 @@ if ($request->has_post_datas())
$needed['form_password'] = _('forms::la valeur donnee contient des caracteres invalides'); $needed['form_password'] = _('forms::la valeur donnee contient des caracteres invalides');
//2 - on verifie que lemail a lair correcte si elle est requise //2 - on verifie que lemail a lair correcte si elle est requise
require_once(dirname (__FILE__) . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php'); require_once(__DIR__ . '/../../lib/vendor/PHPMailer_v5.1/class.phpmailer.php');
if (trim($parm['form_email']) != '' && !PHPMailer::ValidateAddress($parm['form_email'])) if (trim($parm['form_email']) != '' && !PHPMailer::ValidateAddress($parm['form_email']))
$needed['form_email'] = _('forms::l\'email semble invalide'); $needed['form_email'] = _('forms::l\'email semble invalide');