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

adressed @romainneutron's comments

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-07 11:58:46 +02:00
committed by Romain Neutron
parent aa92dbe124
commit 93b48fdcea
6 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/task/period/cindexer.php
View File

@@ -658,12 +658,10 @@ class task_period_cindexer extends task_abstract
*/
public static function getDefaultSettings(Configuration $config, array $params = array())
{
$binaries = $config['binaries'];
$database = $config['main']['database'];
return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n<binpath>"
. (array_key_exists('phraseanet_indexer', $binaries) ? str_replace('/phraseanet_indexer', '', $binaries['phraseanet_indexer']) : '')
. "</binpath><host>" . $database['host'] . "</host><port>"
return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n"
."<host>" . $database['host'] . "</host><port>"
. $database['port'] . "</port><base>"
. $database['dbname'] . "</base><user>"
. $database['user'] . "</user><password>"

2
lib/classes/task/period/ftp.php
View File

@@ -13,7 +13,6 @@ use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Alchemy\Phrasea\Notification\Mail\MailSuccessFTPSender;
use Alchemy\Phrasea\Notification\Receiver;
class task_period_ftp extends task_appboxAbstract
{
protected $proxy;
@@ -707,7 +706,6 @@ class task_period_ftp extends task_appboxAbstract
return $this;
}
/**
* @param array $params
*/