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

Patch CS consistency

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-12 19:48:08 +01:00
parent 99d4895f57
commit 6d2530295c
30 changed files with 105 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/patch/320alpha1a.php
View File

@@ -57,7 +57,7 @@ class patch_320alpha1a implements patchInterface
public function apply(base $databox, Application $app) public function apply(base $databox, Application $app)
{ {
$sql = 'UPDATE record SET parent_record_id = "1" $sql = 'UPDATE record SET parent_record_id = "1"
WHERE parent_record_id != "0"'; WHERE parent_record_id != "0"';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();

13
lib/classes/patch/320alpha1b.php
View File

@@ -56,12 +56,13 @@ class patch_320alpha1b implements patchInterface
public function apply(base $appbox, Application $app) public function apply(base $appbox, Application $app)
{ {
$sql = 'REPLACE INTO records_rights $sql = 'REPLACE INTO records_rights
(SELECT null as id, usr_id, b.sbas_id, record_id, "1" as document (
, null as preview, "push" as `case`, pushFrom as pusher_usr_id SELECT null as id, usr_id, b.sbas_id, record_id, "1" as document, null as preview
FROM sselcont c, ssel s, bas b , "push" as `case`, pushFrom as pusher_usr_id
WHERE c.ssel_id = s.ssel_id FROM sselcont c, ssel s, bas b
AND b.base_id = c.base_id AND c.canHD = 1 WHERE c.ssel_id = s.ssel_id
)'; AND b.base_id = c.base_id AND c.canHD = 1
)';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();

1
lib/classes/patch/320alpha2a.php
View File

@@ -56,7 +56,6 @@ class patch_320alpha2a implements patchInterface
public function apply(base $appbox, Application $app) public function apply(base $appbox, Application $app)
{ {
$sql = 'SELECT * FROM usr WHERE nonce IS NULL'; $sql = 'SELECT * FROM usr WHERE nonce IS NULL';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);

9
lib/classes/patch/320alpha4b.php
View File

@@ -75,9 +75,8 @@ class patch_320alpha4b implements patchInterface
} }
$sql = 'SELECT ssel_id, usr_id, name, descript, pub_date $sql = 'SELECT ssel_id, usr_id, name, descript, pub_date, updater, pub_restrict, homelink
, updater, pub_restrict, homelink FROM ssel WHERE (public = "1" or homelink="1") and migrated = 0';
FROM ssel WHERE (public = "1" or homelink="1") and migrated = 0';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -119,7 +118,7 @@ class patch_320alpha4b implements patchInterface
} }
$sql = 'SELECT sselcont_id, ssel_id, base_id, record_id $sql = 'SELECT sselcont_id, ssel_id, base_id, record_id
FROM sselcont WHERE ssel_id = :ssel_id ORDER BY ord ASC'; FROM sselcont WHERE ssel_id = :ssel_id ORDER BY ord ASC';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute([':ssel_id' => $row['ssel_id']]); $stmt->execute([':ssel_id' => $row['ssel_id']]);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -142,7 +141,7 @@ class patch_320alpha4b implements patchInterface
$app['EM']->persist($entry); $app['EM']->persist($entry);
$sql = 'UPDATE ssel SET deleted = "1", migrated="1" $sql = 'UPDATE ssel SET deleted = "1", migrated="1"
WHERE ssel_id = :ssel_id'; WHERE ssel_id = :ssel_id';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute([':ssel_id' => $row['ssel_id']]); $stmt->execute([':ssel_id' => $row['ssel_id']]);
$stmt->closeCursor(); $stmt->closeCursor();

2
lib/classes/patch/320alpha5a.php
View File

@@ -63,7 +63,7 @@ class patch_320alpha5a implements patchInterface
$stmt->closeCursor(); $stmt->closeCursor();
$sql = 'UPDATE basusr SET order_master="1" $sql = 'UPDATE basusr SET order_master="1"
WHERE base_id = :base_id AND usr_id = :usr_id'; WHERE base_id = :base_id AND usr_id = :usr_id';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
foreach ($rs as $row) { foreach ($rs as $row) {

8
lib/classes/patch/320alpha6a.php
View File

@@ -56,15 +56,15 @@ class patch_320alpha6a implements patchInterface
public function apply(base $databox, Application $app) public function apply(base $databox, Application $app)
{ {
$sql = 'UPDATE record r, subdef s $sql = 'UPDATE record r, subdef s
SET r.mime = s.mime SET r.mime = s.mime
WHERE r.record_id = s.record_id AND s.name="document"'; WHERE r.record_id = s.record_id AND s.name="document"';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
$sql = 'UPDATE subdef s, record r $sql = 'UPDATE subdef s, record r
SET s.updated_on = r.moddate, s.created_on = r.credate SET s.updated_on = r.moddate, s.created_on = r.credate
WHERE s.record_id = r.record_id'; WHERE s.record_id = r.record_id';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();

3
lib/classes/patch/360alpha2a.php
View File

@@ -57,7 +57,8 @@ class patch_360alpha2a implements patchInterface
{ {
$sql = 'UPDATE usr SET usr_mail = NULL $sql = 'UPDATE usr SET usr_mail = NULL
WHERE usr_mail IS NOT NULL AND usr_login LIKE "(#deleted%"'; WHERE usr_mail IS NOT NULL
AND usr_login LIKE "(#deleted%"';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();

24
lib/classes/patch/360alpha2b.php
View File

@@ -60,16 +60,18 @@ class patch_360alpha2b implements patchInterface
*/ */
try { try {
$sql = "ALTER TABLE `metadatas` $sql = "ALTER TABLE `metadatas`
ADD `updated` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1', ADD `updated` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1',
ADD INDEX ( `updated` )"; ADD INDEX ( `updated` )";
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
$sql = 'UPDATE metadatas SET updated = "0" $sql = 'UPDATE metadatas SET updated = "0"
WHERE meta_struct_id WHERE meta_struct_id IN
IN (SELECT id FROM metadatas_structure WHERE multi = "1")'; (
SELECT id FROM metadatas_structure WHERE multi = "1"
)';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
@@ -88,9 +90,9 @@ class patch_360alpha2b implements patchInterface
} }
$sql = 'SELECT m . * $sql = 'SELECT m . *
FROM metadatas_structure s, metadatas m FROM metadatas_structure s, metadatas m
WHERE m.meta_struct_id = s.id WHERE m.meta_struct_id = s.id
AND s.multi = "1" AND updated="0"'; AND s.multi = "1" AND updated="0"';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -102,9 +104,9 @@ class patch_360alpha2b implements patchInterface
while ($n < $rowCount) { while ($n < $rowCount) {
$sql = 'SELECT m . * $sql = 'SELECT m . *
FROM metadatas_structure s, metadatas m FROM metadatas_structure s, metadatas m
WHERE m.meta_struct_id = s.id WHERE m.meta_struct_id = s.id
AND s.multi = "1" LIMIT ' . $n . ', ' . $perPage; AND s.multi = "1" LIMIT ' . $n . ', ' . $perPage;
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -114,7 +116,7 @@ class patch_360alpha2b implements patchInterface
$databox->get_connection()->beginTransaction(); $databox->get_connection()->beginTransaction();
$sql = 'INSERT INTO metadatas(id, record_id, meta_struct_id, value) $sql = 'INSERT INTO metadatas(id, record_id, meta_struct_id, value)
VALUES (null, :record_id, :meta_struct_id, :value)'; VALUES (null, :record_id, :meta_struct_id, :value)';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$databox_fields = []; $databox_fields = [];

2
lib/classes/patch/370alpha3a.php
View File

@@ -69,5 +69,7 @@ class patch_370alpha3a implements patchInterface
$client->set_type(\API_OAuth2_Application::DESKTOP_TYPE); $client->set_type(\API_OAuth2_Application::DESKTOP_TYPE);
$client->set_redirect_uri(\API_OAuth2_Application::NATIVE_APP_REDIRECT_URI); $client->set_redirect_uri(\API_OAuth2_Application::NATIVE_APP_REDIRECT_URI);
} }
return true;
} }
} }

1
lib/classes/patch/370alpha4a.php
View File

@@ -55,7 +55,6 @@ class patch_370alpha4a implements patchInterface
public function apply(base $databox, Application $app) public function apply(base $databox, Application $app)
{ {
$sql = 'SELECT id, src FROM metadatas_structure'; $sql = 'SELECT id, src FROM metadatas_structure';
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();

2
lib/classes/patch/370alpha7a.php
View File

@@ -153,7 +153,7 @@ class patch_370alpha7a implements patchInterface
$stmt->closeCursor(); $stmt->closeCursor();
return; return true;
} }
private function truncateTable(\Doctrine\ORM\EntityManager $em, $className) private function truncateTable(\Doctrine\ORM\EntityManager $em, $className)

2
lib/classes/patch/371alpha1a.php
View File

@@ -62,5 +62,7 @@ class patch_371alpha1a implements patchInterface
foreach ($databox->get_meta_structure() as $databox_field) { foreach ($databox->get_meta_structure() as $databox_field) {
$databox_field->save(); $databox_field->save();
} }
return true;
} }
} }

2
lib/classes/patch/380alpha10a.php
View File

@@ -65,5 +65,7 @@ class patch_380alpha10a implements patchInterface
} }
$stmt->closeCursor(); $stmt->closeCursor();
return true;
} }
} }

4
lib/classes/patch/380alpha11a.php
View File

@@ -63,7 +63,7 @@ class patch_380alpha11a implements patchInterface
$stmt->closeCursor(); $stmt->closeCursor();
} catch (\PDOException $e) { } catch (\PDOException $e) {
// this may fail on oldest versions // this may fail on oldest versions
return; return false;
} }
foreach ($rs as $row) { foreach ($rs as $row) {
@@ -115,5 +115,7 @@ class patch_380alpha11a implements patchInterface
} }
$app['EM']->flush(); $app['EM']->flush();
return true;
} }
} }

2
lib/classes/patch/380alpha2a.php
View File

@@ -66,5 +66,7 @@ class patch_380alpha2a implements patchInterface
} }
$app['configuration']->setConfig($config); $app['configuration']->setConfig($config);
return true;
} }
} }

2
lib/classes/patch/380alpha2b.php
View File

@@ -70,6 +70,6 @@ class patch_380alpha2b implements patchInterface
$app['phraseanet.appbox']->get_connection()->exec($sql); $app['phraseanet.appbox']->get_connection()->exec($sql);
} }
return; return true;
} }
} }

60
lib/classes/patch/380alpha3a.php
View File

@@ -68,44 +68,44 @@ class patch_380alpha3a implements patchInterface
$procedure = " $procedure = "
CREATE PROCEDURE explode_log_table(bound VARCHAR(255)) CREATE PROCEDURE explode_log_table(bound VARCHAR(255))
BEGIN BEGIN
DECLARE l_log_id INT UNSIGNED DEFAULT 0; DECLARE l_log_id INT UNSIGNED DEFAULT 0;
DECLARE l_coll_list TEXT; DECLARE l_coll_list TEXT;
DECLARE occurance INT DEFAULT 0; DECLARE occurance INT DEFAULT 0;
DECLARE i INT DEFAULT 0; DECLARE i INT DEFAULT 0;
DECLARE dest_coll_id INT; DECLARE dest_coll_id INT;
DECLARE done INT DEFAULT 0; DECLARE done INT DEFAULT 0;
DECLARE result_set CURSOR FOR DECLARE result_set CURSOR FOR
SELECT l.id, l.coll_list SELECT l.id, l.coll_list
FROM log l FROM log l
LEFT JOIN log_colls lc ON (lc.log_id = l.id) LEFT JOIN log_colls lc ON (lc.log_id = l.id)
WHERE (lc.log_id IS NULL) AND coll_list != ''; WHERE (lc.log_id IS NULL) AND coll_list != '';
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1; DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
OPEN result_set; OPEN result_set;
read_loop: LOOP read_loop: LOOP
FETCH result_set INTO l_log_id, l_coll_list; FETCH result_set INTO l_log_id, l_coll_list;
IF done THEN IF done THEN
LEAVE read_loop; LEAVE read_loop;
END IF;
SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1);
SET i=1;
START TRANSACTION;
WHILE i <= occurance DO
SET dest_coll_id = (SELECT REPLACE(
SUBSTRING(
SUBSTRING_INDEX(l_coll_list, bound, i),
LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1
),
',',
''
));
IF dest_coll_id > 0 THEN
INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id);
END IF; END IF;
SET i = i + 1; SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1);
END WHILE; SET i=1;
COMMIT; START TRANSACTION;
WHILE i <= occurance DO
SET dest_coll_id = (SELECT REPLACE(
SUBSTRING(
SUBSTRING_INDEX(l_coll_list, bound, i),
LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1
),
',',
''
));
IF dest_coll_id > 0 THEN
INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id);
END IF;
SET i = i + 1;
END WHILE;
COMMIT;
END LOOP; END LOOP;
CLOSE result_set; CLOSE result_set;
END;"; END;";
$stmt = $conn->prepare($procedure); $stmt = $conn->prepare($procedure);

2
lib/classes/patch/380alpha4a.php
View File

@@ -81,5 +81,7 @@ class patch_380alpha4a implements patchInterface
$app['EM']->flush(); $app['EM']->flush();
$app['EM']->clear(); $app['EM']->clear();
return true;
} }
} }

2
lib/classes/patch/380alpha6a.php
View File

@@ -50,5 +50,7 @@ class patch_380alpha6a implements patchInterface
{ {
$app['configuration']->setDefault('registration-fields'); $app['configuration']->setDefault('registration-fields');
$app['configuration']->setDefault('authentication'); $app['configuration']->setDefault('authentication');
return true;
} }
} }

2
lib/classes/patch/380alpha8a.php
View File

@@ -57,7 +57,7 @@ class patch_380alpha8a implements patchInterface
$stmt->closeCursor(); $stmt->closeCursor();
if (!$row) { if (!$row) {
return; return false;
} }
$sxe = simplexml_load_string($row['settings']); $sxe = simplexml_load_string($row['settings']);

2
lib/classes/patch/380alpha9a.php
View File

@@ -70,5 +70,7 @@ class patch_380alpha9a implements patchInterface
$dom->loadXML($sxe->asXML()); $dom->loadXML($sxe->asXML());
$databox->saveStructure($dom); $databox->saveStructure($dom);
return true;
} }
} }

4
lib/classes/patch/381alpha1a.php
View File

@@ -49,8 +49,8 @@ class patch_381alpha1a implements patchInterface
public function apply(base $appbox, Application $app) public function apply(base $appbox, Application $app)
{ {
$sql = 'SELECT base_id, ord, sbas_id $sql = 'SELECT base_id, ord, sbas_id
FROM `bas` FROM `bas`
ORDER BY sbas_id, ord'; ORDER BY sbas_id, ord';
$stmt = $appbox->get_connection()->prepare($sql); $stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);

2
lib/classes/patch/390alpha1a.php
View File

@@ -88,5 +88,7 @@ class patch_390alpha1a implements patchInterface
$em->flush(); $em->flush();
$em->clear(); $em->clear();
return true;
} }
} }

2
lib/classes/patch/390alpha1b.php
View File

@@ -123,5 +123,7 @@ class patch_390alpha1b implements patchInterface
$em->clear(); $em->clear();
$em->getEventManager()->addEventSubscriber(new TimestampableListener()); $em->getEventManager()->addEventSubscriber(new TimestampableListener());
return true;
} }
} }

10
lib/classes/patch/390alpha2a.php
View File

@@ -68,6 +68,8 @@ class patch_390alpha2a implements patchInterface
$this->updateModels($em, $conn); $this->updateModels($em, $conn);
$em->getEventManager()->addEventSubscriber(new TimestampableListener()); $em->getEventManager()->addEventSubscriber(new TimestampableListener());
return true;
} }
/** /**
@@ -76,10 +78,10 @@ class patch_390alpha2a implements patchInterface
private function updateUsers(EntityManager $em, $conn) private function updateUsers(EntityManager $em, $conn)
{ {
$sql = 'SELECT activite, adresse, create_db, canchgftpprofil, canchgprofil, ville, $sql = 'SELECT activite, adresse, create_db, canchgftpprofil, canchgprofil, ville,
societe, pays, usr_mail, fax, usr_prenom, geonameid, invite, fonction, last_conn, lastModel, societe, pays, usr_mail, fax, usr_prenom, geonameid, invite, fonction, last_conn, lastModel,
usr_nom, ldap_created, locale, usr_login, mail_locked, mail_notifications, nonce, usr_password, push_list, usr_nom, ldap_created, locale, usr_login, mail_locked, mail_notifications, nonce, usr_password, push_list,
request_notifications, salted_password, usr_sexe, tel, timezone, cpostal, usr_creationdate, usr_modificationdate request_notifications, salted_password, usr_sexe, tel, timezone, cpostal, usr_creationdate, usr_modificationdate
FROM usr WHERE model_of = 0'; FROM usr WHERE model_of = 0';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute(); $stmt->execute();
$rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);

2
lib/classes/patch/390alpha3a.php
View File

@@ -84,5 +84,7 @@ class patch_390alpha3a implements patchInterface
$em->flush(); $em->flush();
$em->clear(); $em->clear();
return true;
} }
} }

2
lib/classes/patch/390alpha4a.php
View File

@@ -89,5 +89,7 @@ class patch_390alpha4a implements patchInterface
$em->flush(); $em->flush();
$em->clear(); $em->clear();
return true;
} }
} }

2
lib/classes/patch/390alpha5a.php
View File

@@ -85,5 +85,7 @@ class patch_390alpha5a implements patchInterface
$em->flush(); $em->flush();
$em->clear(); $em->clear();
return true;
} }
} }

5
lib/classes/patch/390alpha6a.php
View File

@@ -80,8 +80,7 @@ class patch_390alpha6a implements patchInterface
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
$sql = 'SELECT base_id, record_id, subdef, filename, folder, error, $sql = 'SELECT base_id, record_id, subdef, filename, folder, error, done, businessfields
done, businessfields
FROM ftp_export_elements FROM ftp_export_elements
WHERE ftp_export_id = :export_id'; WHERE ftp_export_id = :export_id';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
@@ -152,5 +151,7 @@ class patch_390alpha6a implements patchInterface
$em->clear(); $em->clear();
$em->getEventManager()->addEventSubscriber(new TimestampableListener()); $em->getEventManager()->addEventSubscriber(new TimestampableListener());
return true;
} }
} }

2
lib/classes/patch/390alpha7a.php
View File

@@ -220,5 +220,7 @@ class patch_390alpha7a implements patchInterface
$em->flush(); $em->flush();
$em->clear(); $em->clear();
return true;
} }
} }