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

Remove User_Adapter Inteface References

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-19 12:27:51 +01:00
parent bd2f777ab9
commit 53ae0ccc24
44 changed files with 795 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/module/console/systemUpgrade.php
View File

@@ -62,11 +62,13 @@ class module_console_systemUpgrade extends Command
try {
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
$queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
} catch (\Exception_Setup_FixBadEmailAddresses $e) {
return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
} catch (\Exception $e) {
echo $e->getTraceAsString() . "\n";
}
$queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
if ($input->getOption('dump') || $input->getOption('stderr')) {
if (0 < count($queries)) {

25
lib/classes/module/report/nav.php
View File

@@ -434,22 +434,23 @@ class module_report_nav extends module_report
$sql = "
SELECT
usr_login as identifiant,
usr_nom as nom,
usr_mail as mail,
adresse, tel
FROM usr
login as identifiant,
last_name as nom,
email as mail,
address AS adresse,
phone AS tel
FROM Users
WHERE $on = :value " . (('' !== $filter_id_apbox) ? "AND (" . $filter_id_apbox . ")" : '');
} else {
$sql = '
SELECT
usr_login AS identifiant,
usr_nom AS nom,
usr_mail AS mail,
adresse,
tel
FROM usr
WHERE (usr_id = :value)';
login AS identifiant,
last_name AS nom,
email AS mail,
address AS adresse,
phone AS tel
FROM Users
WHERE (id = :value)';
}
$params2 = [':value' => $val];