harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start removing reserved words from database column names (this run: addon and hook)

Browse Source
This commit is contained in:
redmatrix 2016-05-30 19:44:30 -07:00
parent 490ab9e2c5
commit 6602ff83dd
10 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Extend/Hook.php
View File

@ -10,7 +10,7 @@ class Hook {
$function = serialize($function); $function = serialize($function);
} }
$r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d LIMIT 1", $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `fn` = '%s' and priority = %d and hook_version = %d LIMIT 1",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function), dbesc($function),
@ -23,13 +23,13 @@ class Hook {
// To aid in upgrade and transition, remove old settings for any registered hooks that match in all respects except // To aid in upgrade and transition, remove old settings for any registered hooks that match in all respects except
// for priority or hook_version // for priority or hook_version
$r = q("DELETE FROM `hook` where `hook` = '%s' and `file` = '%s' and `function` = '%s'", $r = q("DELETE FROM `hook` where `hook` = '%s' and `file` = '%s' and `fn` = '%s'",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function) dbesc($function)
); );
$r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`, `hook_version`) VALUES ( '%s', '%s', '%s', %d, %d )", $r = q("INSERT INTO `hook` (`hook`, `file`, `fn`, `priority`, `hook_version`) VALUES ( '%s', '%s', '%s', %d, %d )",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function), dbesc($function),
@ -44,7 +44,7 @@ class Hook {
if(is_array($function)) { if(is_array($function)) {
$function = serialize($function); $function = serialize($function);
} }
$r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d", $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `fn` = '%s' and priority = %d and hook_version = %d",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function), dbesc($function),

2
Zotlabs/Module/Admin.php
View File

@ -1291,7 +1291,7 @@ class Admin extends \Zotlabs\Web\Controller {
$admin_form = ''; $admin_form = '';
$r = q("select * from addon where plugin_admin = 1 and name = '%s' limit 1", $r = q("select * from addon where plugin_admin = 1 and aname = '%s' limit 1",
dbesc($plugin) dbesc($plugin)
); );

8
boot.php
View File

@ -48,7 +48,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.7.1' ); define ( 'STD_VERSION', '1.7.1' );
define ( 'ZOT_REVISION', 1.1 ); define ( 'ZOT_REVISION', 1.1 );
define ( 'DB_UPDATE_VERSION', 1169 ); define ( 'DB_UPDATE_VERSION', 1170 );
/** /**
@ -1522,11 +1522,11 @@ function check_config(&$a) {
if(count($installed)) { if(count($installed)) {
foreach($installed as $i) { foreach($installed as $i) {
if(! in_array($i['name'], $plugins_arr)) { if(! in_array($i['aname'], $plugins_arr)) {
unload_plugin($i['name']); unload_plugin($i['aname']);
} }
else { else {
$installed_arr[] = $i['name']; $installed_arr[] = $i['aname'];
} }
} }
} }

4
include/language.php
View File

@ -132,10 +132,10 @@ function load_translation_table($lang, $install = false) {
} }
if(! $install) { if(! $install) {
$plugins = q("SELECT name FROM addon WHERE installed=1;"); $plugins = q("SELECT aname FROM addon WHERE installed=1;");
if ($plugins !== false) { if ($plugins !== false) {
foreach($plugins as $p) { foreach($plugins as $p) {
$name = $p['name']; $name = $p['aname'];
if(file_exists("addon/$name/lang/$lang/hstrings.php")) { if(file_exists("addon/$name/lang/$lang/hstrings.php")) {
include("addon/$name/lang/$lang/hstrings.php"); include("addon/$name/lang/$lang/hstrings.php");
} }

2
include/network.php
View File

@ -1967,7 +1967,7 @@ function get_site_info() {
$r = q("select * from addon where hidden = 0"); $r = q("select * from addon where hidden = 0");
if(count($r)) if(count($r))
foreach($r as $rr) foreach($r as $rr)
$visible_plugins[] = $rr['name']; $visible_plugins[] = $rr['aname'];
} }
sort($visible_plugins); sort($visible_plugins);

22
include/plugin.php
View File

@ -41,7 +41,7 @@ function uninstall_plugin($plugin) {
$func(); $func();
} }
q("DELETE FROM `addon` WHERE `name` = '%s' ", q("DELETE FROM `addon` WHERE `aname` = '%s' ",
dbesc($plugin) dbesc($plugin)
); );
} }
@ -66,7 +66,7 @@ function install_plugin($plugin) {
$plugin_admin = (function_exists($plugin . '_plugin_admin') ? 1 : 0); $plugin_admin = (function_exists($plugin . '_plugin_admin') ? 1 : 0);
q("INSERT INTO `addon` (`name`, `installed`, `timestamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ", q("INSERT INTO `addon` (`aname`, `installed`, `tstamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ",
dbesc($plugin), dbesc($plugin),
intval($t), intval($t),
$plugin_admin $plugin_admin
@ -111,7 +111,7 @@ function load_plugin($plugin) {
} }
function plugin_is_installed($name) { function plugin_is_installed($name) {
$r = q("select name from addon where name = '%s' and installed = 1 limit 1", $r = q("select aname from addon where aname = '%s' and installed = 1 limit 1",
dbesc($name) dbesc($name)
); );
if($r) if($r)
@ -143,8 +143,8 @@ function reload_plugins() {
if(file_exists($fname)) { if(file_exists($fname)) {
$t = @filemtime($fname); $t = @filemtime($fname);
foreach($installed as $i) { foreach($installed as $i) {
if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { if(($i['aname'] == $pl) && ($i['tstamp'] != $t)) {
logger('Reloading plugin: ' . $i['name']); logger('Reloading plugin: ' . $i['aname']);
@include_once($fname); @include_once($fname);
if(function_exists($pl . '_unload')) { if(function_exists($pl . '_unload')) {
@ -155,7 +155,7 @@ function reload_plugins() {
$func = $pl . '_load'; $func = $pl . '_load';
$func(); $func();
} }
q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d", q("UPDATE `addon` SET `tstamp` = %d WHERE `id` = %d",
intval($t), intval($t),
intval($i['id']) intval($i['id'])
); );
@ -178,7 +178,7 @@ function reload_plugins() {
* @return mixed|bool * @return mixed|bool
*/ */
function register_hook($hook, $file, $function, $priority = 0) { function register_hook($hook, $file, $function, $priority = 0) {
$r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `fn` = '%s' LIMIT 1",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function) dbesc($function)
@ -186,7 +186,7 @@ function register_hook($hook, $file, $function, $priority = 0) {
if($r) if($r)
return true; return true;
$r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' )", $r = q("INSERT INTO `hook` (`hook`, `file`, `fn`, `priority`) VALUES ( '%s', '%s', '%s', '%s' )",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function), dbesc($function),
@ -206,7 +206,7 @@ function register_hook($hook, $file, $function, $priority = 0) {
* @return array * @return array
*/ */
function unregister_hook($hook, $file, $function) { function unregister_hook($hook, $file, $function) {
$r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s'", $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `fn` = '%s'",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function) dbesc($function)
@ -233,7 +233,7 @@ function load_hooks() {
if(! array_key_exists($rr['hook'],App::$hooks)) if(! array_key_exists($rr['hook'],App::$hooks))
App::$hooks[$rr['hook']] = array(); App::$hooks[$rr['hook']] = array();
App::$hooks[$rr['hook']][] = array($rr['file'],$rr['function'],$rr['priority'],$rr['hook_version']); App::$hooks[$rr['hook']][] = array($rr['file'],$rr['fn'],$rr['priority'],$rr['hook_version']);
} }
} }
//logger('hooks: ' . print_r(App::$hooks,true)); //logger('hooks: ' . print_r(App::$hooks,true));
@ -301,7 +301,7 @@ function call_hooks($name, &$data = null) {
else else
$func($a, $data); $func($a, $data);
} else { } else {
q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND function = '%s'", q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'",
dbesc($name), dbesc($name),
dbesc($hook[0]), dbesc($hook[0]),
dbesc($origfn) dbesc($origfn)

2
include/widgets.php
View File

@ -1397,7 +1397,7 @@ function widget_admin($arr) {
$plugins = array(); $plugins = array();
if($r) { if($r) {
foreach ($r as $h){ foreach ($r as $h){
$plugin = $h['name']; $plugin = $h['aname'];
$plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); $plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
// temp plugins with admin // temp plugins with admin
App::$plugins_admin[] = $plugin; App::$plugins_admin[] = $plugin;

8
install/schema_mysql.sql
View File

@ -96,15 +96,15 @@ CREATE TABLE IF NOT EXISTS `account` (
CREATE TABLE IF NOT EXISTS `addon` ( CREATE TABLE IF NOT EXISTS `addon` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` char(255) NOT NULL DEFAULT '', `aname` char(255) NOT NULL DEFAULT '',
`version` char(255) NOT NULL DEFAULT '', `version` char(255) NOT NULL DEFAULT '',
`installed` tinyint(1) NOT NULL DEFAULT '0', `installed` tinyint(1) NOT NULL DEFAULT '0',
`hidden` tinyint(1) NOT NULL DEFAULT '0', `hidden` tinyint(1) NOT NULL DEFAULT '0',
`timestamp` bigint(20) NOT NULL DEFAULT '0', `tstamp` bigint(20) NOT NULL DEFAULT '0',
`plugin_admin` tinyint(1) NOT NULL DEFAULT '0', `plugin_admin` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `hidden` (`hidden`), KEY `hidden` (`hidden`),
KEY `name` (`name`), KEY `aname` (`aname`),
KEY `installed` (`installed`) KEY `installed` (`installed`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@ -519,7 +519,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`hook` char(255) NOT NULL DEFAULT '', `hook` char(255) NOT NULL DEFAULT '',
`file` char(255) NOT NULL DEFAULT '', `file` char(255) NOT NULL DEFAULT '',
`function` char(255) NOT NULL DEFAULT '', `fn` char(255) NOT NULL DEFAULT '',
`priority` int(11) unsigned NOT NULL DEFAULT '0', `priority` int(11) unsigned NOT NULL DEFAULT '0',
`hook_version` int(11) NOT NULL DEFAULT '0', `hook_version` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),

8
install/schema_postgres.sql
View File

@ -94,16 +94,16 @@ create index "account_level" on account ("account_level");
create index "account_password_changed" on account ("account_password_changed"); create index "account_password_changed" on account ("account_password_changed");
CREATE TABLE "addon" ( CREATE TABLE "addon" (
"id" serial NOT NULL, "id" serial NOT NULL,
"name" text NOT NULL, "aname" text NOT NULL,
"version" text NOT NULL DEFAULT '0', "version" text NOT NULL DEFAULT '0',
"installed" numeric(1) NOT NULL DEFAULT '0', "installed" numeric(1) NOT NULL DEFAULT '0',
"hidden" numeric(1) NOT NULL DEFAULT '0', "hidden" numeric(1) NOT NULL DEFAULT '0',
"timestamp" numeric(20) NOT NULL DEFAULT '0', "tstamp" numeric(20) NOT NULL DEFAULT '0',
"plugin_admin" numeric(1) NOT NULL DEFAULT '0', "plugin_admin" numeric(1) NOT NULL DEFAULT '0',
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );
create index "addon_hidden_idx" on addon ("hidden"); create index "addon_hidden_idx" on addon ("hidden");
create index "addon_name_idx" on addon ("name"); create index "addon_name_idx" on addon ("aname");
create index "addon_installed_idx" on addon ("installed"); create index "addon_installed_idx" on addon ("installed");
CREATE TABLE "app" ( CREATE TABLE "app" (
"id" serial NOT NULL, "id" serial NOT NULL,
@ -514,7 +514,7 @@ CREATE TABLE "hook" (
"id" serial NOT NULL, "id" serial NOT NULL,
"hook" text NOT NULL, "hook" text NOT NULL,
"file" text NOT NULL, "file" text NOT NULL,
"function" text NOT NULL, "fn" text NOT NULL,
"priority" bigint NOT NULL DEFAULT '0', "priority" bigint NOT NULL DEFAULT '0',
"hook_version" smallint NOT NULL DEFAULT '0', "hook_version" smallint NOT NULL DEFAULT '0',
PRIMARY KEY ("id") PRIMARY KEY ("id")

20
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1169 ); define( 'UPDATE_VERSION' , 1170 );
/** /**
* *
@ -2114,3 +2114,21 @@ function update_r1168() {
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1169() {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE `addon` CHANGE `timestamp` `tstamp` numeric( 20 ) UNSIGNED NOT NULL DEFAULT '0' ");
$r2 = q("ALTER TABLE `addon` CHANGE `name` `aname` text NOT NULL DEFAULT '' ");
$r3 = q("ALTER TABLE `hook` CHANGE `function` `fn` text NOT NULL DEFAULT '' ");
}
else {
$r1 = q("ALTER TABLE `addon` CHANGE `timestamp` `tstamp` BIGINT( 20 ) UNSIGNED NOT NULL DEFAULT '0' ");
$r2 = q("ALTER TABLE `addon` CHANGE `name` `aname` CHAR(255) NOT NULL DEFAULT '' ");
$r3 = q("ALTER TABLE `hook` CHANGE `function` `fn` CHAR(255) NOT NULL DEFAULT '' ");
}
if($r1 && $r2 && $r3)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}