summaryrefslogtreecommitdiff
path: root/core/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'core/helpers')
-rw-r--r--core/helpers/access.php12
-rw-r--r--core/helpers/core_installer.php56
-rw-r--r--core/helpers/graphics.php2
-rw-r--r--core/helpers/module.php2
4 files changed, 36 insertions, 36 deletions
diff --git a/core/helpers/access.php b/core/helpers/access.php
index 8a88bdf5..a9f48c20 100644
--- a/core/helpers/access.php
+++ b/core/helpers/access.php
@@ -404,8 +404,8 @@ class access_Core {
$db = Database::instance();
$field = "{$perm_name}_{$group->id}";
$cache_table = $perm_name == "view" ? "items" : "access_caches";
- $db->query("ALTER TABLE `$cache_table` DROP `$field`");
- $db->query("ALTER TABLE `access_intents` DROP `$field`");
+ $db->query("ALTER TABLE `[$cache_table]` DROP `$field`");
+ $db->query("ALTER TABLE `[access_intents]` DROP `$field`");
ORM::factory("access_intent")->clear_cache();
}
@@ -420,8 +420,8 @@ class access_Core {
$db = Database::instance();
$field = "{$perm_name}_{$group->id}";
$cache_table = $perm_name == "view" ? "items" : "access_caches";
- $db->query("ALTER TABLE `$cache_table` ADD `$field` TINYINT(2) NOT NULL DEFAULT 0");
- $db->query("ALTER TABLE `access_intents` ADD `$field` BOOLEAN DEFAULT NULL");
+ $db->query("ALTER TABLE `[$cache_table]` ADD `$field` TINYINT(2) NOT NULL DEFAULT 0");
+ $db->query("ALTER TABLE `[access_intents]` ADD `$field` BOOLEAN DEFAULT NULL");
$db->update("access_intents", array($field => 0), array("item_id" => 1));
ORM::factory("access_intent")->clear_cache();
}
@@ -547,9 +547,9 @@ class access_Core {
->find_all();
foreach ($query as $row) {
$db->query(
- "UPDATE `access_caches` SET `$field` = {$row->$field} " .
+ "UPDATE `[access_caches]` SET `$field` = {$row->$field} " .
"WHERE `item_id` IN " .
- " (SELECT `id` FROM `items` " .
+ " (SELECT `id` FROM `[items]` " .
" WHERE `left` >= $row->left " .
" AND `right` <= $row->right)");
}
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index e1dd34c2..d3eb3090 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -31,19 +31,19 @@ class core_installer {
}
if ($version == 0) {
- $db->query("CREATE TABLE `access_caches` (
+ $db->query("CREATE TABLE `[access_caches]` (
`id` int(9) NOT NULL auto_increment,
`item_id` int(9),
PRIMARY KEY (`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `access_intents` (
+ $db->query("CREATE TABLE `[access_intents]` (
`id` int(9) NOT NULL auto_increment,
`item_id` int(9),
PRIMARY KEY (`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `graphics_rules` (
+ $db->query("CREATE TABLE `[graphics_rules]` (
`id` int(9) NOT NULL auto_increment,
`priority` int(9) NOT NULL,
`module_name` varchar(64) NOT NULL,
@@ -53,7 +53,7 @@ class core_installer {
PRIMARY KEY (`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `items` (
+ $db->query("CREATE TABLE `[items]` (
`album_cover_item_id` int(9) default NULL,
`created` int(9) default NULL,
`description` varchar(255) default NULL,
@@ -84,7 +84,7 @@ class core_installer {
KEY `random` (`rand_key` DESC))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `logs` (
+ $db->query("CREATE TABLE `[logs]` (
`id` int(9) NOT NULL auto_increment,
`category` varchar(64) default NULL,
`html` varchar(255) default NULL,
@@ -97,7 +97,7 @@ class core_installer {
PRIMARY KEY (`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `messages` (
+ $db->query("CREATE TABLE `[messages]` (
`id` int(9) NOT NULL auto_increment,
`key` varchar(255) default NULL,
`value` varchar(255) default NULL,
@@ -106,7 +106,7 @@ class core_installer {
UNIQUE KEY(`key`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `modules` (
+ $db->query("CREATE TABLE `[modules]` (
`id` int(9) NOT NULL auto_increment,
`name` varchar(64) default NULL,
`version` int(9) default NULL,
@@ -114,7 +114,7 @@ class core_installer {
UNIQUE KEY(`name`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `themes` (
+ $db->query("CREATE TABLE `[themes]` (
`id` int(9) NOT NULL auto_increment,
`name` varchar(64) default NULL,
`version` int(9) default NULL,
@@ -122,7 +122,7 @@ class core_installer {
UNIQUE KEY(`name`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `permissions` (
+ $db->query("CREATE TABLE `[permissions]` (
`id` int(9) NOT NULL auto_increment,
`name` varchar(64) default NULL,
`display_name` varchar(64) default NULL,
@@ -130,7 +130,7 @@ class core_installer {
UNIQUE KEY(`name`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `incoming_translations` (
+ $db->query("CREATE TABLE `[incoming_translations]` (
`id` int(9) NOT NULL auto_increment,
`key` char(32) NOT NULL,
`locale` char(10) NOT NULL,
@@ -142,7 +142,7 @@ class core_installer {
KEY `locale_key` (`locale`, `key`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `outgoing_translations` (
+ $db->query("CREATE TABLE `[outgoing_translations]` (
`id` int(9) NOT NULL auto_increment,
`key` char(32) NOT NULL,
`locale` char(10) NOT NULL,
@@ -154,14 +154,14 @@ class core_installer {
KEY `locale_key` (`locale`, `key`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `sessions` (
+ $db->query("CREATE TABLE `[sessions]` (
`session_id` varchar(127) NOT NULL,
`last_activity` int(10) UNSIGNED NOT NULL,
`data` text NOT NULL,
PRIMARY KEY (`session_id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `tasks` (
+ $db->query("CREATE TABLE `[tasks]` (
`callback` varchar(128) default NULL,
`context` text NOT NULL,
`done` boolean default 0,
@@ -176,7 +176,7 @@ class core_installer {
KEY (`owner_id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
- $db->query("CREATE TABLE `vars` (
+ $db->query("CREATE TABLE `[vars]` (
`id` int(9) NOT NULL auto_increment,
`module_name` varchar(64) NOT NULL,
`name` varchar(64) NOT NULL,
@@ -266,20 +266,20 @@ class core_installer {
static function uninstall() {
$db = Database::instance();
- $db->query("DROP TABLE IF EXISTS `access_caches`;");
- $db->query("DROP TABLE IF EXISTS `access_intents`;");
- $db->query("DROP TABLE IF EXISTS `graphics_rules`;");
- $db->query("DROP TABLE IF EXISTS `items`;");
- $db->query("DROP TABLE IF EXISTS `logs`;");
- $db->query("DROP TABLE IF EXISTS `messages`;");
- $db->query("DROP TABLE IF EXISTS `modules`;");
- $db->query("DROP TABLE IF EXISTS `themes`;");
- $db->query("DROP TABLE IF EXISTS `incoming_translations`;");
- $db->query("DROP TABLE IF EXISTS `outgoing_translations`;");
- $db->query("DROP TABLE IF EXISTS `permissions`;");
- $db->query("DROP TABLE IF EXISTS `sessions`;");
- $db->query("DROP TABLE IF EXISTS `tasks`;");
- $db->query("DROP TABLE IF EXISTS `vars`;");
+ $db->query("DROP TABLE IF EXISTS `[access_caches]`;");
+ $db->query("DROP TABLE IF EXISTS `[access_intents]`;");
+ $db->query("DROP TABLE IF EXISTS `[graphics_rules]`;");
+ $db->query("DROP TABLE IF EXISTS `[items`;");
+ $db->query("DROP TABLE IF EXISTS `[logs]`;");
+ $db->query("DROP TABLE IF EXISTS `[messages]`;");
+ $db->query("DROP TABLE IF EXISTS `[modules]`;");
+ $db->query("DROP TABLE IF EXISTS `[themes]`;");
+ $db->query("DROP TABLE IF EXISTS `[incoming_translations]`;");
+ $db->query("DROP TABLE IF EXISTS `[outgoing_translations]`;");
+ $db->query("DROP TABLE IF EXISTS `[permissions]`;");
+ $db->query("DROP TABLE IF EXISTS `[sessions]`;");
+ $db->query("DROP TABLE IF EXISTS `[tasks]`;");
+ $db->query("DROP TABLE IF EXISTS `[vars]`;");
foreach (array("albums", "resizes", "thumbs", "uploads", "modules") as $dir) {
system("/bin/rm -rf " . VARPATH . $dir);
}
diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php
index d30701a0..5c3480c9 100644
--- a/core/helpers/graphics.php
+++ b/core/helpers/graphics.php
@@ -223,7 +223,7 @@ class graphics_Core {
*/
static function find_dirty_images_query() {
return Database::instance()->query(
- "SELECT `id` FROM `items` " .
+ "SELECT `id` FROM `[items]` " .
"WHERE (`thumb_dirty` = 1 AND (`type` <> 'album' OR `album_cover_item_id` IS NOT NULL))" .
" OR (`resize_dirty` = 1 AND `type` = 'photo')");
}
diff --git a/core/helpers/module.php b/core/helpers/module.php
index 23e90a3c..1bc8214f 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -241,7 +241,7 @@ class module_Core {
*/
static function incr_var($module_name, $name, $increment=1) {
Database::instance()->query(
- "UPDATE `vars` SET `value` = `value` + $increment " .
+ "UPDATE `[vars]` SET `value` = `value` + $increment " .
"WHERE `module_name` = '$module_name' " .
"AND `name` = '$name'");
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 18:24:56 +0000