MERGE: リビジョン1714のマージ。SQL文からバッククオート（`）を取り除いた。

http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1714

REMOVE: backtick (a.k.a backquote, grave accent) from identifier in SQL
statement

For enabling to use under several SQL implementations such as SQLite,
the sql statements generated by Nucleus CMS need to be compatible for
several SQL implements.

For this issue, we select ANSI SQL89 standard. According the standard,
identifier such as database name, table name and so on should consist of
alphanumeric and underscore with no quotations. ANSI SQL92 just allow us
to use reserved woords (a.k.a keywords) for identifier with double
quotation.

The identifier with backticks is MySQL extension. In detail, please
refer to MySQL document.
http://dev.mysql.com/doc/refman/5.0/en/identifiers.html

diff --git a/install/index.php b/install/index.php
index e91e2a4..20f3940 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -845,7 +845,7 @@ function do_install()
        /*\r
         * 3. try to create database if needed\r
         */\r
-       if ( !sql_query('CREATE DATABASE IF NOT EXISTS `' . $MYSQL_DATABASE . '`') )\r
+       if ( !sql_query("CREATE DATABASE IF NOT EXISTS {$MYSQL_DATABASE}") )\r
        {\r
                $errors[] = _INST_ERROR1 . ': ' . sql_error();\r
        }\r

diff --git a/install/install.sql b/install/install.sql
index fabcbd0..8d0b892 100644 (file)
--- a/install/install.sql
+++ b/install/install.sql
@@ -1,279 +1,279 @@
-CREATE TABLE `nucleus_actionlog` (\r
-  `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',\r
-  `message` varchar(255) NOT NULL default ''\r
+CREATE TABLE nucleus_actionlog (\r
+  timestamp datetime NOT NULL default '0000-00-00 00:00:00',\r
+  message varchar(255) NOT NULL default ''\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_activation` (\r
-  `vkey` varchar(40) NOT NULL default '',\r
-  `vtime` datetime NOT NULL default '0000-00-00 00:00:00',\r
-  `vmember` int(11) NOT NULL default '0',\r
-  `vtype` varchar(15) NOT NULL default '',\r
-  `vextra` varchar(128) NOT NULL default '',\r
-  PRIMARY KEY  (`vkey`)\r
+CREATE TABLE nucleus_activation (\r
+  vkey varchar(40) NOT NULL default '',\r
+  vtime datetime NOT NULL default '0000-00-00 00:00:00',\r
+  vmember int(11) NOT NULL default '0',\r
+  vtype varchar(15) NOT NULL default '',\r
+  vextra varchar(128) NOT NULL default '',\r
+  PRIMARY KEY  (vkey)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_ban` (\r
-  `iprange` varchar(15) NOT NULL default '',\r
-  `reason` varchar(255) NOT NULL default '',\r
-  `blogid` int(11) NOT NULL default '0'\r
+CREATE TABLE nucleus_ban (\r
+  iprange varchar(15) NOT NULL default '',\r
+  reason varchar(255) NOT NULL default '',\r
+  blogid int(11) NOT NULL default '0'\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_blog` (\r
-  `bnumber` int(11) NOT NULL auto_increment,\r
-  `bname` varchar(60) NOT NULL default '',\r
-  `bshortname` varchar(15) NOT NULL default '',\r
-  `bdesc` varchar(200) default NULL,\r
-  `bcomments` tinyint(2) NOT NULL default '1',\r
-  `bmaxcomments` int(11) NOT NULL default '0',\r
-  `btimeoffset` decimal(3,1) NOT NULL default '0.0',\r
-  `bnotify` varchar(128) default NULL,\r
-  `burl` varchar(100) default NULL,\r
-  `bupdate` varchar(60) default NULL,\r
-  `bdefskin` int(11) NOT NULL default '1',\r
-  `bpublic` tinyint(2) NOT NULL default '1',\r
-  `bconvertbreaks` tinyint(2) NOT NULL default '1',\r
-  `bdefcat` int(11) default NULL,\r
-  `bnotifytype` int(11) NOT NULL default '15',\r
-  `ballowpast` tinyint(2) NOT NULL default '0',\r
-  `bincludesearch` tinyint(2) NOT NULL default '0',\r
-  `breqemail` TINYINT( 2 ) DEFAULT '0' NOT NULL,\r
-  `bfuturepost` TINYINT(2) DEFAULT '0' NOT NULL,\r
-  PRIMARY KEY  (`bnumber`),\r
---  UNIQUE KEY `bnumber` (`bnumber`),\r
-  UNIQUE KEY `bshortname` (`bshortname`)\r
+CREATE TABLE nucleus_blog (\r
+  bnumber int(11) NOT NULL auto_increment,\r
+  bname varchar(60) NOT NULL default '',\r
+  bshortname varchar(15) NOT NULL default '',\r
+  bdesc varchar(200) default NULL,\r
+  bcomments tinyint(2) NOT NULL default '1',\r
+  bmaxcomments int(11) NOT NULL default '0',\r
+  btimeoffset decimal(3,1) NOT NULL default '0.0',\r
+  bnotify varchar(128) default NULL,\r
+  burl varchar(100) default NULL,\r
+  bupdate varchar(60) default NULL,\r
+  bdefskin int(11) NOT NULL default '1',\r
+  bpublic tinyint(2) NOT NULL default '1',\r
+  bconvertbreaks tinyint(2) NOT NULL default '1',\r
+  bdefcat int(11) default NULL,\r
+  bnotifytype int(11) NOT NULL default '15',\r
+  ballowpast tinyint(2) NOT NULL default '0',\r
+  bincludesearch tinyint(2) NOT NULL default '0',\r
+  breqemail TINYINT( 2 ) DEFAULT '0' NOT NULL,\r
+  bfuturepost TINYINT(2) DEFAULT '0' NOT NULL,\r
+  PRIMARY KEY  (bnumber),\r
+--  UNIQUE KEY bnumber (bnumber),\r
+  UNIQUE KEY bshortname (bshortname)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-INSERT INTO `nucleus_blog` VALUES (1, 'My Nucleus CMS', 'mynucleuscms', '', 1, 0, 0.0, '', 'http://localhost:8080/nucleus/', '', 5, 1, 1, 1, 1, 1, 0, 0, 0);\r
+INSERT INTO nucleus_blog VALUES (1, 'My Nucleus CMS', 'mynucleuscms', '', 1, 0, 0.0, '', 'http://localhost:8080/nucleus/', '', 5, 1, 1, 1, 1, 1, 0, 0, 0);\r
 \r
-CREATE TABLE `nucleus_category` (\r
-  `catid` int(11) NOT NULL auto_increment,\r
-  `cblog` int(11) NOT NULL default '0',\r
-  `cname` varchar(200) default NULL,\r
-  `cdesc` varchar(200) default NULL,\r
-  PRIMARY KEY  (`catid`)\r
+CREATE TABLE nucleus_category (\r
+  catid int(11) NOT NULL auto_increment,\r
+  cblog int(11) NOT NULL default '0',\r
+  cname varchar(200) default NULL,\r
+  cdesc varchar(200) default NULL,\r
+  PRIMARY KEY  (catid)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-INSERT INTO `nucleus_category` VALUES (1, 1, 'General', 'Items that do not fit in other categories');\r
+INSERT INTO nucleus_category VALUES (1, 1, 'General', 'Items that do not fit in other categories');\r
 \r
-CREATE TABLE `nucleus_comment` (\r
-  `cnumber` int(11) NOT NULL auto_increment,\r
-  `cbody` text NOT NULL,\r
-  `cuser` varchar(40) default NULL,\r
-  `cmail` varchar(100) default NULL,\r
-  `cemail` VARCHAR( 100 ),\r
-  `cmember` int(11) default NULL,\r
-  `citem` int(11) NOT NULL default '0',\r
-  `ctime` datetime NOT NULL default '0000-00-00 00:00:00',\r
-  `chost` varchar(60) default NULL,\r
-  `cip` varchar(15) NOT NULL default '',\r
-  `cblog` int(11) NOT NULL default '0',\r
-  PRIMARY KEY  (`cnumber`),\r
---  UNIQUE KEY `cnumber` (`cnumber`),\r
-  KEY `citem` (`citem`),\r
-  FULLTEXT KEY `cbody` (`cbody`),\r
-  INDEX `cblog` (`cblog`)\r
+CREATE TABLE nucleus_comment (\r
+  cnumber int(11) NOT NULL auto_increment,\r
+  cbody text NOT NULL,\r
+  cuser varchar(40) default NULL,\r
+  cmail varchar(100) default NULL,\r
+  cemail VARCHAR( 100 ),\r
+  cmember int(11) default NULL,\r
+  citem int(11) NOT NULL default '0',\r
+  ctime datetime NOT NULL default '0000-00-00 00:00:00',\r
+  chost varchar(60) default NULL,\r
+  cip varchar(15) NOT NULL default '',\r
+  cblog int(11) NOT NULL default '0',\r
+  PRIMARY KEY  (cnumber),\r
+--  UNIQUE KEY cnumber (cnumber),\r
+  KEY citem (citem),\r
+  FULLTEXT KEY cbody (cbody),\r
+  INDEX cblog (cblog)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_config` (\r
-  `name` varchar(20) NOT NULL default '',\r
-  `value` varchar(128) default NULL,\r
-  PRIMARY KEY  (`name`)\r
+CREATE TABLE nucleus_config (\r
+  name varchar(20) NOT NULL default '',\r
+  value varchar(128) default NULL,\r
+  PRIMARY KEY  (name)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-INSERT INTO `nucleus_config` VALUES ('DefaultBlog', '1');\r
-INSERT INTO `nucleus_config` VALUES ('AdminEmail', 'example@example.org');\r
-INSERT INTO `nucleus_config` VALUES ('IndexURL', 'http://localhost:8080/nucleus/');\r
-INSERT INTO `nucleus_config` VALUES ('Locale', 'en_Latn_US');\r
-INSERT INTO `nucleus_config` VALUES ('SessionCookie', '');\r
-INSERT INTO `nucleus_config` VALUES ('AllowMemberCreate', '');\r
-INSERT INTO `nucleus_config` VALUES ('AllowMemberMail', '1');\r
-INSERT INTO `nucleus_config` VALUES ('SiteName', 'My Nucleus CMS');\r
-INSERT INTO `nucleus_config` VALUES ('AdminURL', 'http://localhost:8080/nucleus/nucleus/');\r
-INSERT INTO `nucleus_config` VALUES ('NewMemberCanLogon', '1');\r
-INSERT INTO `nucleus_config` VALUES ('DisableSite', '');\r
-INSERT INTO `nucleus_config` VALUES ('DisableSiteURL', 'http://www.this-page-intentionally-left-blank.org/');\r
-INSERT INTO `nucleus_config` VALUES ('LastVisit', '');\r
-INSERT INTO `nucleus_config` VALUES ('MediaURL', 'http://localhost:8080/nucleus/media/');\r
-INSERT INTO `nucleus_config` VALUES ('AllowedTypes', 'jpg,jpeg,gif,mpg,mpeg,avi,mov,mp3,swf,png');\r
-INSERT INTO `nucleus_config` VALUES ('AllowLoginEdit', '');\r
-INSERT INTO `nucleus_config` VALUES ('AllowUpload', '1');\r
-INSERT INTO `nucleus_config` VALUES ('DisableJsTools', '2');\r
-INSERT INTO `nucleus_config` VALUES ('CookiePath', '/');\r
-INSERT INTO `nucleus_config` VALUES ('CookieDomain', '');\r
-INSERT INTO `nucleus_config` VALUES ('CookieSecure', '');\r
-INSERT INTO `nucleus_config` VALUES ('CookiePrefix', '');\r
-INSERT INTO `nucleus_config` VALUES ('MediaPrefix', '1');\r
-INSERT INTO `nucleus_config` VALUES ('MaxUploadSize', '1048576');\r
-INSERT INTO `nucleus_config` VALUES ('NonmemberMail', '');\r
-INSERT INTO `nucleus_config` VALUES ('PluginURL', 'http://localhost:8080/nucleus/nucleus/plugins/');\r
-INSERT INTO `nucleus_config` VALUES ('ProtectMemNames', '1');\r
-INSERT INTO `nucleus_config` VALUES ('BaseSkin', '5');\r
-INSERT INTO `nucleus_config` VALUES ('SkinsURL', 'http://localhost:8080/nucleus/skins/');\r
-INSERT INTO `nucleus_config` VALUES ('ActionURL', 'http://localhost:8080/nucleus/action.php');\r
-INSERT INTO `nucleus_config` VALUES ('URLMode', 'normal');\r
-INSERT INTO `nucleus_config` VALUES ('DatabaseVersion', '350');\r
-INSERT INTO `nucleus_config` VALUES ('DebugVars', '0');\r
-INSERT INTO `nucleus_config` VALUES ('DefaultListSize', '10');\r
-INSERT INTO `nucleus_config` VALUES ('AdminCSS', 'original');\r
+INSERT INTO nucleus_config VALUES ('DefaultBlog', '1');\r
+INSERT INTO nucleus_config VALUES ('AdminEmail', 'example@example.org');\r
+INSERT INTO nucleus_config VALUES ('IndexURL', 'http://localhost:8080/nucleus/');\r
+INSERT INTO nucleus_config VALUES ('Locale', 'en_Latn_US');\r
+INSERT INTO nucleus_config VALUES ('SessionCookie', '');\r
+INSERT INTO nucleus_config VALUES ('AllowMemberCreate', '');\r
+INSERT INTO nucleus_config VALUES ('AllowMemberMail', '1');\r
+INSERT INTO nucleus_config VALUES ('SiteName', 'My Nucleus CMS');\r
+INSERT INTO nucleus_config VALUES ('AdminURL', 'http://localhost:8080/nucleus/nucleus/');\r
+INSERT INTO nucleus_config VALUES ('NewMemberCanLogon', '1');\r
+INSERT INTO nucleus_config VALUES ('DisableSite', '');\r
+INSERT INTO nucleus_config VALUES ('DisableSiteURL', 'http://www.this-page-intentionally-left-blank.org/');\r
+INSERT INTO nucleus_config VALUES ('LastVisit', '');\r
+INSERT INTO nucleus_config VALUES ('MediaURL', 'http://localhost:8080/nucleus/media/');\r
+INSERT INTO nucleus_config VALUES ('AllowedTypes', 'jpg,jpeg,gif,mpg,mpeg,avi,mov,mp3,swf,png');\r
+INSERT INTO nucleus_config VALUES ('AllowLoginEdit', '');\r
+INSERT INTO nucleus_config VALUES ('AllowUpload', '1');\r
+INSERT INTO nucleus_config VALUES ('DisableJsTools', '2');\r
+INSERT INTO nucleus_config VALUES ('CookiePath', '/');\r
+INSERT INTO nucleus_config VALUES ('CookieDomain', '');\r
+INSERT INTO nucleus_config VALUES ('CookieSecure', '');\r
+INSERT INTO nucleus_config VALUES ('CookiePrefix', '');\r
+INSERT INTO nucleus_config VALUES ('MediaPrefix', '1');\r
+INSERT INTO nucleus_config VALUES ('MaxUploadSize', '1048576');\r
+INSERT INTO nucleus_config VALUES ('NonmemberMail', '');\r
+INSERT INTO nucleus_config VALUES ('PluginURL', 'http://localhost:8080/nucleus/nucleus/plugins/');\r
+INSERT INTO nucleus_config VALUES ('ProtectMemNames', '1');\r
+INSERT INTO nucleus_config VALUES ('BaseSkin', '5');\r
+INSERT INTO nucleus_config VALUES ('SkinsURL', 'http://localhost:8080/nucleus/skins/');\r
+INSERT INTO nucleus_config VALUES ('ActionURL', 'http://localhost:8080/nucleus/action.php');\r
+INSERT INTO nucleus_config VALUES ('URLMode', 'normal');\r
+INSERT INTO nucleus_config VALUES ('DatabaseVersion', '350');\r
+INSERT INTO nucleus_config VALUES ('DebugVars', '0');\r
+INSERT INTO nucleus_config VALUES ('DefaultListSize', '10');\r
+INSERT INTO nucleus_config VALUES ('AdminCSS', 'original');\r
 \r
-CREATE TABLE `nucleus_item` (\r
-  `inumber` int(11) NOT NULL auto_increment,\r
-  `ititle` varchar(160) default NULL,\r
-  `ibody` text NOT NULL,\r
-  `imore` text,\r
-  `iblog` int(11) NOT NULL default '0',\r
-  `iauthor` int(11) NOT NULL default '0',\r
-  `itime` datetime NOT NULL default '0000-00-00 00:00:00',\r
-  `iclosed` tinyint(2) NOT NULL default '0',\r
-  `idraft` tinyint(2) NOT NULL default '0',\r
-  `ikarmapos` int(11) NOT NULL default '0',\r
-  `icat` int(11) default NULL,\r
-  `ikarmaneg` int(11) NOT NULL default '0',\r
-  `iposted` tinyint(2) NOT NULL default '1',\r
-  PRIMARY KEY  (`inumber`),\r
---  UNIQUE KEY `inumber` (`inumber`),\r
-  KEY `itime` (`itime`),\r
-  INDEX `iblog` (`iblog`),\r
-  INDEX `idraft` (`idraft`),\r
-  INDEX `icat` (`icat`),\r
-  FULLTEXT KEY `ibody` (`ibody`,`ititle`,`imore`)\r
+CREATE TABLE nucleus_item (\r
+  inumber int(11) NOT NULL auto_increment,\r
+  ititle varchar(160) default NULL,\r
+  ibody text NOT NULL,\r
+  imore text,\r
+  iblog int(11) NOT NULL default '0',\r
+  iauthor int(11) NOT NULL default '0',\r
+  itime datetime NOT NULL default '0000-00-00 00:00:00',\r
+  iclosed tinyint(2) NOT NULL default '0',\r
+  idraft tinyint(2) NOT NULL default '0',\r
+  ikarmapos int(11) NOT NULL default '0',\r
+  icat int(11) default NULL,\r
+  ikarmaneg int(11) NOT NULL default '0',\r
+  iposted tinyint(2) NOT NULL default '1',\r
+  PRIMARY KEY  (inumber),\r
+--  UNIQUE KEY inumber (inumber),\r
+  KEY itime (itime),\r
+  INDEX iblog (iblog),\r
+  INDEX idraft (idraft),\r
+  INDEX icat (icat),\r
+  FULLTEXT KEY ibody (ibody,ititle,imore)\r
 ) ENGINE=MyISAM PACK_KEYS=0 DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_karma` (\r
-  `itemid` int(11) NOT NULL default '0',\r
-  `ip` char(15) NOT NULL default ''\r
+CREATE TABLE nucleus_karma (\r
+  itemid int(11) NOT NULL default '0',\r
+  ip char(15) NOT NULL default ''\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_member` (\r
-  `mnumber` int(11) NOT NULL auto_increment,\r
-  `mname` varchar(32) NOT NULL default '',\r
-  `mrealname` varchar(60) default NULL,\r
-  `mpassword` varchar(40) NOT NULL default '',\r
-  `memail` varchar(60) default NULL,\r
-  `murl` varchar(100) default NULL,\r
-  `mnotes` varchar(100) default NULL,\r
-  `madmin` tinyint(2) NOT NULL default '0',\r
-  `mcanlogin` tinyint(2) NOT NULL default '1',\r
-  `mcookiekey` varchar(40) default NULL,\r
-  `mlocale` varchar(20) NOT NULL default '',\r
-  `mautosave` tinyint(2) NOT NULL default '1',\r
-  PRIMARY KEY  (`mnumber`),\r
---  UNIQUE KEY `mnumber` (`mnumber`),\r
-  UNIQUE KEY `mname` (`mname`)\r
+CREATE TABLE nucleus_member (\r
+  mnumber int(11) NOT NULL auto_increment,\r
+  mname varchar(32) NOT NULL default '',\r
+  mrealname varchar(60) default NULL,\r
+  mpassword varchar(40) NOT NULL default '',\r
+  memail varchar(60) default NULL,\r
+  murl varchar(100) default NULL,\r
+  mnotes varchar(100) default NULL,\r
+  madmin tinyint(2) NOT NULL default '0',\r
+  mcanlogin tinyint(2) NOT NULL default '1',\r
+  mcookiekey varchar(40) default NULL,\r
+  mlocale varchar(20) NOT NULL default '',\r
+  mautosave tinyint(2) NOT NULL default '1',\r
+  PRIMARY KEY  (mnumber),\r
+--  UNIQUE KEY mnumber (mnumber),\r
+  UNIQUE KEY mname (mname)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-INSERT INTO `nucleus_member` VALUES (1, 'example', 'example', '1a79a4d60de6718e8e5b326e338ae533', 'example@example.org', 'http://localhost:8080/nucleus/', '', 1, 1, 'd767aefc60415859570d64c649257f19', '', 1);\r
+INSERT INTO nucleus_member VALUES (1, 'example', 'example', '1a79a4d60de6718e8e5b326e338ae533', 'example@example.org', 'http://localhost:8080/nucleus/', '', 1, 1, 'd767aefc60415859570d64c649257f19', '', 1);\r
 \r
-CREATE TABLE `nucleus_plugin` (\r
-  `pid` int(11) NOT NULL auto_increment,\r
-  `pfile` varchar(40) NOT NULL default '',\r
-  `porder` int(11) NOT NULL default '0',\r
-  PRIMARY KEY  (`pid`),\r
---  KEY `pid` (`pid`),\r
-  KEY `porder` (`porder`)\r
+CREATE TABLE nucleus_plugin (\r
+  pid int(11) NOT NULL auto_increment,\r
+  pfile varchar(40) NOT NULL default '',\r
+  porder int(11) NOT NULL default '0',\r
+  PRIMARY KEY  (pid),\r
+--  KEY pid (pid),\r
+  KEY porder (porder)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_plugin_event` (\r
-  `pid` int(11) NOT NULL default '0',\r
-  `event` varchar(40) default NULL,\r
-  KEY `pid` (`pid`)\r
+CREATE TABLE nucleus_plugin_event (\r
+  pid int(11) NOT NULL default '0',\r
+  event varchar(40) default NULL,\r
+  KEY pid (pid)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_plugin_option` (\r
-  `ovalue` text NOT NULL,\r
-  `oid` int(11) NOT NULL auto_increment,\r
-  `ocontextid` int(11) NOT NULL default '0',\r
-  PRIMARY KEY  (`oid`,`ocontextid`)\r
+CREATE TABLE nucleus_plugin_option (\r
+  ovalue text NOT NULL,\r
+  oid int(11) NOT NULL auto_increment,\r
+  ocontextid int(11) NOT NULL default '0',\r
+  PRIMARY KEY  (oid,ocontextid)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_plugin_option_desc` (\r
-  `oid` int(11) NOT NULL auto_increment,\r
-  `opid` int(11) NOT NULL default '0',\r
-  `oname` varchar(20) NOT NULL default '',\r
-  `ocontext` varchar(20) NOT NULL default '',\r
-  `odesc` varchar(255) default NULL,\r
-  `otype` varchar(20) default NULL,\r
-  `odef` text,\r
-  `oextra` text,\r
-  PRIMARY KEY  (`opid`,`oname`,`ocontext`),\r
-  UNIQUE KEY `oid` (`oid`)\r
+CREATE TABLE nucleus_plugin_option_desc (\r
+  oid int(11) NOT NULL auto_increment,\r
+  opid int(11) NOT NULL default '0',\r
+  oname varchar(20) NOT NULL default '',\r
+  ocontext varchar(20) NOT NULL default '',\r
+  odesc varchar(255) default NULL,\r
+  otype varchar(20) default NULL,\r
+  odef text,\r
+  oextra text,\r
+  PRIMARY KEY  (opid,oname,ocontext),\r
+  UNIQUE KEY oid (oid)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-CREATE TABLE `nucleus_skin` (\r
-  `sdesc` int(11) NOT NULL default '0',\r
-  `stype` varchar(20) NOT NULL default '',\r
-  `scontent` text NOT NULL,\r
-  PRIMARY KEY  (`sdesc`,`stype`)\r
+CREATE TABLE nucleus_skin (\r
+  sdesc int(11) NOT NULL default '0',\r
+  stype varchar(20) NOT NULL default '',\r
+  scontent text NOT NULL,\r
+  PRIMARY KEY  (sdesc,stype)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
--- INSERT INTO `nucleus_skin` VALUES (2, 'index', '<?xml version=\"1.0\" encoding=\"<%charset%>\"?>\n\n<feed xml:lang=\"en-us\" xmlns=\"http://www.w3.org/2005/Atom\">\n    <title><%blogsetting(name)%></title>\n    <id><%blogsetting(url)%>:<%blogsetting(id)%></id>\n\n    <link rel=\"alternate\" type=\"text/html\" href=\"<%blogsetting(url)%>\" />\n    <link rel=\"self\" type=\"application/atom+xml\" href=\"<%blogsetting(url)%><%self%>\" />\n    <generator uri=\"http://nucleuscms.org/\"><%version%></generator>\n    <updated><%blog(feeds/atom/modified,1)%></updated>\n\n    <%blog(feeds/atom/entries,10)%>\n</feed>');\r
--- INSERT INTO `nucleus_skin` VALUES (4, 'index', '<?xml version="1.0"?>\r\n<rsd version="1.0">\r\n <service>\r\n  <engineName><%version%></engineName>\r\n  <engineLink>http://nucleuscms.org/</engineLink>\r\n  <homepageLink><%sitevar(url)%></homepageLink>\r\n  <apis>\r\n   <api name="MetaWeblog" preferred="true" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n   <api name="Blogger" preferred="false" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n  </apis>\r\n </service>\r\n</rsd>');\r
--- INSERT INTO `nucleus_skin` VALUES (3, 'index', '<?xml version="1.0" encoding="<%charset%>"?>\r\n<rss version="2.0">\r\n  <channel>\r\n    <title><%blogsetting(name)%></title>\r\n    <link><%blogsetting(url)%></link>\r\n    <description><%blogsetting(desc)%></description>\r\n    <language>en-us</language>           \r\n    <generator><%version%></generator>\r\n    <copyright>?</copyright>             \r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%blogsetting(url)%>/nucleus/nucleus2.gif</url>\r\n      <title><%blogsetting(name)%></title>\r\n      <link><%blogsetting(url)%></link>\r\n    </image>\r\n    <%blog(feeds/rss20,10)%>\r\n  </channel>\r\n</rss>');\r
+-- INSERT INTO nucleus_skin VALUES (2, 'index', '<?xml version=\"1.0\" encoding=\"<%charset%>\"?>\n\n<feed xml:lang=\"en-us\" xmlns=\"http://www.w3.org/2005/Atom\">\n    <title><%blogsetting(name)%></title>\n    <id><%blogsetting(url)%>:<%blogsetting(id)%></id>\n\n    <link rel=\"alternate\" type=\"text/html\" href=\"<%blogsetting(url)%>\" />\n    <link rel=\"self\" type=\"application/atom+xml\" href=\"<%blogsetting(url)%><%self%>\" />\n    <generator uri=\"http://nucleuscms.org/\"><%version%></generator>\n    <updated><%blog(feeds/atom/modified,1)%></updated>\n\n    <%blog(feeds/atom/entries,10)%>\n</feed>');\r
+-- INSERT INTO nucleus_skin VALUES (4, 'index', '<?xml version="1.0"?>\r\n<rsd version="1.0">\r\n <service>\r\n  <engineName><%version%></engineName>\r\n  <engineLink>http://nucleuscms.org/</engineLink>\r\n  <homepageLink><%sitevar(url)%></homepageLink>\r\n  <apis>\r\n   <api name="MetaWeblog" preferred="true" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n   <api name="Blogger" preferred="false" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n  </apis>\r\n </service>\r\n</rsd>');\r
+-- INSERT INTO nucleus_skin VALUES (3, 'index', '<?xml version="1.0" encoding="<%charset%>"?>\r\n<rss version="2.0">\r\n  <channel>\r\n    <title><%blogsetting(name)%></title>\r\n    <link><%blogsetting(url)%></link>\r\n    <description><%blogsetting(desc)%></description>\r\n    <language>en-us</language>           \r\n    <generator><%version%></generator>\r\n    <copyright>?</copyright>             \r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%blogsetting(url)%>/nucleus/nucleus2.gif</url>\r\n      <title><%blogsetting(name)%></title>\r\n      <link><%blogsetting(url)%></link>\r\n    </image>\r\n    <%blog(feeds/rss20,10)%>\r\n  </channel>\r\n</rss>');\r
 \r
-CREATE TABLE `nucleus_skin_desc` (\r
-  `sdnumber` int(11) NOT NULL auto_increment,\r
-  `sdname` varchar(20) NOT NULL default '',\r
-  `sddesc` varchar(200) default NULL,\r
-  `sdtype` varchar(40) NOT NULL default 'text/html',\r
-  `sdincmode` varchar(10) NOT NULL default 'normal',\r
-  `sdincpref` varchar(50) NOT NULL default '',\r
-  PRIMARY KEY  (`sdnumber`),\r
---  UNIQUE KEY `sdnumber` (`sdnumber`),\r
-  UNIQUE KEY `sdname` (`sdname`)\r
+CREATE TABLE nucleus_skin_desc (\r
+  sdnumber int(11) NOT NULL auto_increment,\r
+  sdname varchar(20) NOT NULL default '',\r
+  sddesc varchar(200) default NULL,\r
+  sdtype varchar(40) NOT NULL default 'text/html',\r
+  sdincmode varchar(10) NOT NULL default 'normal',\r
+  sdincpref varchar(50) NOT NULL default '',\r
+  PRIMARY KEY  (sdnumber),\r
+--  UNIQUE KEY sdnumber (sdnumber),\r
+  UNIQUE KEY sdname (sdname)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
--- INSERT INTO `nucleus_skin_desc` VALUES (2, 'feeds/atom', 'Atom 1.0 weblog syndication', 'application/atom+xml', 'normal', '');\r
--- INSERT INTO `nucleus_skin_desc` VALUES (3, 'feeds/rss20', 'RSS 2.0 syndication of weblogs', 'text/xml', 'normal', '');\r
--- INSERT INTO `nucleus_skin_desc` VALUES (4, 'xml/rsd', 'RSD (Really Simple Discovery) information for weblog clients', 'text/xml', 'normal', '');\r
--- INSERT INTO `nucleus_skin_desc` VALUES (5, 'default', 'Nucleus CMS default skin', 'text/html', 'skindir', 'default/');\r
+-- INSERT INTO nucleus_skin_desc VALUES (2, 'feeds/atom', 'Atom 1.0 weblog syndication', 'application/atom+xml', 'normal', '');\r
+-- INSERT INTO nucleus_skin_desc VALUES (3, 'feeds/rss20', 'RSS 2.0 syndication of weblogs', 'text/xml', 'normal', '');\r
+-- INSERT INTO nucleus_skin_desc VALUES (4, 'xml/rsd', 'RSD (Really Simple Discovery) information for weblog clients', 'text/xml', 'normal', '');\r
+-- INSERT INTO nucleus_skin_desc VALUES (5, 'default', 'Nucleus CMS default skin', 'text/html', 'skindir', 'default/');\r
 \r
-CREATE TABLE `nucleus_team` (\r
-  `tmember` int(11) NOT NULL default '0',\r
-  `tblog` int(11) NOT NULL default '0',\r
-  `tadmin` tinyint(2) NOT NULL default '0',\r
-  PRIMARY KEY  (`tmember`,`tblog`)\r
+CREATE TABLE nucleus_team (\r
+  tmember int(11) NOT NULL default '0',\r
+  tblog int(11) NOT NULL default '0',\r
+  tadmin tinyint(2) NOT NULL default '0',\r
+  PRIMARY KEY  (tmember,tblog)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
-INSERT INTO `nucleus_team` VALUES (1, 1, 1);\r
+INSERT INTO nucleus_team VALUES (1, 1, 1);\r
 \r
-CREATE TABLE `nucleus_template` (\r
-  `tdesc` int(11) NOT NULL default '0',\r
-  `tpartname` varchar(64) NOT NULL default '',\r
-  `tcontent` text NOT NULL,\r
-  PRIMARY KEY  (`tdesc`,`tpartname`)\r
+CREATE TABLE nucleus_template (\r
+  tdesc int(11) NOT NULL default '0',\r
+  tpartname varchar(64) NOT NULL default '',\r
+  tcontent text NOT NULL,\r
+  PRIMARY KEY  (tdesc,tpartname)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
--- INSERT INTO `nucleus_template` VALUES (3, 'ITEM', '<item>\r\n <title><%title(xml)%></title>\r\n <link><%blogurl%>index.php?itemid=<%itemid%></link>\r\n<description><![CDATA[<%body%><%more%>]]></description>\r\n <category><%category%></category>\r\n<comments><%blogurl%>index.php?itemid=<%itemid%></comments>\r\n <pubDate><%date(rfc822)%></pubDate>\r\n</item>');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'EDITLINK', '<a href="<%editlink%>" onclick="<%editpopupcode%>">edit</a>');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'FORMAT_DATE', '%x');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'FORMAT_TIME', '%X');\r
--- INSERT INTO `nucleus_template` VALUES (4, 'ITEM', '<%date(utc)%>');\r
--- INSERT INTO `nucleus_template` VALUES (5, 'ITEM', '<entry>\n <title type=\"html\"><![CDATA[<%title%>]]></title>\n <link rel=\"alternate\" type=\"text/html\" href=\"<%blogurl%>index.php?itemid=<%itemid%>\" />\n <author>\n  <name><%author%></name>\n </author>\n <updated><%date(utc)%></updated>\n <published><%date(iso8601)%></published>\n <content type=\"html\"><![CDATA[<%body%><%more%>]]></content>\n <id><%blogurl%>:<%blogid%>:<%itemid%></id>\n</entry>');\r
--- INSERT INTO `nucleus_template` VALUES (5, 'POPUP_CODE', '<%media%>');\r
--- INSERT INTO `nucleus_template` VALUES (5, 'IMAGE_CODE', '<%image%>');\r
--- INSERT INTO `nucleus_template` VALUES (5, 'MEDIA_CODE', '<%media%>');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'POPUP_CODE', '<%image%>');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'MEDIA_CODE', '<%media%>');\r
--- INSERT INTO `nucleus_template` VALUES (3, 'IMAGE_CODE', '<%media%>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'ITEM', '<item>\r\n <title><%title(xml)%></title>\r\n <link><%blogurl%>index.php?itemid=<%itemid%></link>\r\n<description><![CDATA[<%body%><%more%>]]></description>\r\n <category><%category%></category>\r\n<comments><%blogurl%>index.php?itemid=<%itemid%></comments>\r\n <pubDate><%date(rfc822)%></pubDate>\r\n</item>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'EDITLINK', '<a href="<%editlink%>" onclick="<%editpopupcode%>">edit</a>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'FORMAT_DATE', '%x');\r
+-- INSERT INTO nucleus_template VALUES (3, 'FORMAT_TIME', '%X');\r
+-- INSERT INTO nucleus_template VALUES (4, 'ITEM', '<%date(utc)%>');\r
+-- INSERT INTO nucleus_template VALUES (5, 'ITEM', '<entry>\n <title type=\"html\"><![CDATA[<%title%>]]></title>\n <link rel=\"alternate\" type=\"text/html\" href=\"<%blogurl%>index.php?itemid=<%itemid%>\" />\n <author>\n  <name><%author%></name>\n </author>\n <updated><%date(utc)%></updated>\n <published><%date(iso8601)%></published>\n <content type=\"html\"><![CDATA[<%body%><%more%>]]></content>\n <id><%blogurl%>:<%blogid%>:<%itemid%></id>\n</entry>');\r
+-- INSERT INTO nucleus_template VALUES (5, 'POPUP_CODE', '<%media%>');\r
+-- INSERT INTO nucleus_template VALUES (5, 'IMAGE_CODE', '<%image%>');\r
+-- INSERT INTO nucleus_template VALUES (5, 'MEDIA_CODE', '<%media%>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'POPUP_CODE', '<%image%>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'MEDIA_CODE', '<%media%>');\r
+-- INSERT INTO nucleus_template VALUES (3, 'IMAGE_CODE', '<%media%>');\r
 \r
-CREATE TABLE `nucleus_template_desc` (\r
-  `tdnumber` int(11) NOT NULL auto_increment,\r
-  `tdname` varchar(64) NOT NULL default '',\r
-  `tddesc` varchar(200) default NULL,\r
-  PRIMARY KEY  (`tdnumber`),\r
---  UNIQUE KEY `tdnumber` (`tdnumber`),\r
-  UNIQUE KEY `tdname` (`tdname`)\r
+CREATE TABLE nucleus_template_desc (\r
+  tdnumber int(11) NOT NULL auto_increment,\r
+  tdname varchar(64) NOT NULL default '',\r
+  tddesc varchar(200) default NULL,\r
+  PRIMARY KEY  (tdnumber),\r
+--  UNIQUE KEY tdnumber (tdnumber),\r
+  UNIQUE KEY tdname (tdname)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
 \r
--- INSERT INTO `nucleus_template_desc` VALUES (4, 'feeds/atom/modified', 'Atom feeds: Inserts last modification date');\r
--- INSERT INTO `nucleus_template_desc` VALUES (5, 'feeds/atom/entries', 'Atom feeds: Feed items');\r
--- INSERT INTO `nucleus_template_desc` VALUES (3, 'feeds/rss20', 'Used for RSS 2.0 syndication of your blog');\r
--- INSERT INTO `nucleus_template_desc` VALUES (8, 'default/index', 'Nucleus CMS default index template');\r
--- INSERT INTO `nucleus_template_desc` VALUES (9, 'default/item', 'Nucleus CMS default item template');\r
+-- INSERT INTO nucleus_template_desc VALUES (4, 'feeds/atom/modified', 'Atom feeds: Inserts last modification date');\r
+-- INSERT INTO nucleus_template_desc VALUES (5, 'feeds/atom/entries', 'Atom feeds: Feed items');\r
+-- INSERT INTO nucleus_template_desc VALUES (3, 'feeds/rss20', 'Used for RSS 2.0 syndication of your blog');\r
+-- INSERT INTO nucleus_template_desc VALUES (8, 'default/index', 'Nucleus CMS default index template');\r
+-- INSERT INTO nucleus_template_desc VALUES (9, 'default/item', 'Nucleus CMS default item template');\r
 \r
-CREATE TABLE `nucleus_tickets` (\r
-  `ticket` varchar(40) NOT NULL default '',\r
-  `ctime` datetime NOT NULL default '0000-00-00 00:00:00',\r
-  `member` int(11) NOT NULL default '0',\r
-  PRIMARY KEY  (`ticket`,`member`)\r
+CREATE TABLE nucleus_tickets (\r
+  ticket varchar(40) NOT NULL default '',\r
+  ctime datetime NOT NULL default '0000-00-00 00:00:00',\r
+  member int(11) NOT NULL default '0',\r
+  PRIMARY KEY  (ticket,member)\r
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r

diff --git a/nucleus/convert/wordpress.php b/nucleus/convert/wordpress.php
index 93d8da4..02b4338 100644 (file)
--- a/nucleus/convert/wordpress.php
+++ b/nucleus/convert/wordpress.php
@@ -157,7 +157,7 @@ a:hover{text-decoration:underline}
       $catdd = $total_num;
       $total_num++;
 
-      $query="SELECT * FROM `".$prefixwp."term_taxonomy` , `".$prefixwp."terms` WHERE ".$prefixwp."term_taxonomy.term_taxonomy_id = ".$prefixwp."terms.term_id AND ".$prefixwp."term_taxonomy.taxonomy='category'";
+      $query="SELECT * FROM ".$prefixwp."term_taxonomy , ".$prefixwp."terms WHERE ".$prefixwp."term_taxonomy.term_taxonomy_id = ".$prefixwp."terms.term_id AND ".$prefixwp."term_taxonomy.taxonomy='category'";
       $querywp=mysql_query($query,$linkwp) or die($query);
       echo "<p>rows to transfer: ".mysql_num_rows($querywp)."</p>";
       echo "<p>";

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 155b4c6..424e392 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -6160,7 +6160,7 @@ selector();
 \r
                                $name = $matches[1];\r
                                // only show in list when not yet installed\r
-                               $res = sql_query('SELECT * FROM ' . sql_table('plugin') . ' WHERE `pfile` = "NP_' . sql_real_escape_string($name) . '"');\r
+                               $res = sql_query('SELECT * FROM ' . sql_table('plugin') . ' WHERE pfile = "NP_' . sql_real_escape_string($name) . '"');\r
 \r
                                if (sql_num_rows($res) == 0)\r
                                {\r

diff --git a/nucleus/libs/COMMENT.php b/nucleus/libs/COMMENT.php
index 4f69bd5..36e725a 100644 (file)
--- a/nucleus/libs/COMMENT.php
+++ b/nucleus/libs/COMMENT.php
@@ -17,19 +17,35 @@
  * @copyright Copyright (C) 2002-2007 The Nucleus Group\r
  * @version $Id: COMMENT.php 1624 2012-01-09 11:36:20Z sakamocchi $\r
  */\r
-class COMMENT {\r
-\r
+class COMMENT\r
+{\r
        /**\r
-         * Returns the requested comment\r
-         *\r
-         * @static\r
-         */\r
-       function getComment($commentid) {\r
-               $query = 'SELECT `cnumber` AS commentid, `cbody` AS body, `cuser` AS user, `cmail` AS userid, `cemail` AS email, `cmember` AS memberid, `ctime`, `chost` AS host, `mname` AS member, `cip` AS ip, `cblog` AS blogid'\r
-                                       . ' FROM ' . sql_table('comment') . ' LEFT OUTER JOIN ' . sql_table('member') . ' ON `cmember` = `mnumber`'\r
-                                       . ' WHERE `cnumber` = ' . intval($commentid);\r
-               $comments = sql_query($query);\r
-\r
+        * COMMENT::getComment()\r
+        * Returns the requested comment\r
+        * \r
+        * @static\r
+        * @param       integer $commentid\r
+        * @return      array   comment information\r
+        * \r
+        */\r
+       function getComment($commentid)\r
+       {\r
+               $query = 'SELECT cnumber AS commentid,'\r
+                             . 'cbody AS body,'\r
+                             . 'cuser AS user,'\r
+                             . 'cmail AS userid,'\r
+                             . 'cemail AS email,'\r
+                             . 'cmember AS memberid,'\r
+                             . 'ctime,'\r
+                             . 'chost AS host,'\r
+                             . 'mname AS member,'\r
+                             . 'cip AS ip,'\r
+                             . 'cblog AS blogid'\r
+                      . 'FROM %s LEFT OUTER JOIN %s ON cmember = mnumber'\r
+                      . 'WHERE cnumber = %d;';\r
+               \r
+               $query = sprintf($query, sql_table('comment'), sql_table('member'), (integer) $commentid);\r
+               \r
                $aCommentInfo = sql_fetch_assoc($comments);\r
 \r
                if ($aCommentInfo) {\r

diff --git a/nucleus/libs/backup.php b/nucleus/libs/backup.php
index 23b3ce7..b2c5a70 100644 (file)
--- a/nucleus/libs/backup.php
+++ b/nucleus/libs/backup.php
@@ -202,7 +202,7 @@ class Backup
                        $fields[] = sql_field_name($result, $j);\r
                }\r
                \r
-               return '(`' . implode('`, `', $fields) . '`)';  \r
+               return '(' . implode(', ', $fields) . ')';      \r
        }\r
        \r
        /**\r
@@ -238,7 +238,7 @@ class Backup
                while ( $row = sql_fetch_array($result) )\r
                {\r
                        // Start building the SQL statement.\r
-                       echo "INSERT INTO `".$tablename."` $tablename_list VALUES(";\r
+                       echo "INSERT INTO ".$tablename." $tablename_list VALUES(";\r
                        \r
                        // Loop through the rows and fill in data for each column\r
                        for ( $j = 0; $j < $num_fields; $j++ )\r

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 3ebb7d7..1f0b14a 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -826,7 +826,7 @@ $manager->notify(
         */\r
        function getBlogIDFromName($name)\r
        {\r
-               return quickQuery('SELECT `bnumber` AS `result` FROM `' . sql_table('blog') . '` WHERE `bshortname` = "' . sql_real_escape_string($name) . '"');\r
+               return quickQuery('SELECT bnumber AS result FROM ' . sql_table('blog') . ' WHERE bshortname = "' . sql_real_escape_string($name) . '"');\r
        }\r
 \r
 \r
@@ -837,7 +837,7 @@ $manager->notify(
         */\r
        function getBlogNameFromID($id)\r
        {\r
-               return quickQuery('SELECT `bname` AS `result` FROM `' . sql_table('blog') . '` WHERE `bnumber` = ' . intval($id));\r
+               return quickQuery('SELECT bname AS result FROM ' . sql_table('blog') . ' WHERE bnumber = ' . intval($id));\r
        }\r
 \r
 \r
@@ -848,7 +848,7 @@ $manager->notify(
         */\r
        function getBlogIDFromItemID($item_id)\r
        {\r
-               return quickQuery('SELECT `iblog` AS `result` FROM `' . sql_table('item') . '` WHERE `inumber` = ' . intval($item_id));\r
+               return quickQuery('SELECT iblog AS result FROM ' . sql_table('item') . ' WHERE inumber = ' . intval($item_id));\r
        }\r
 \r
 \r
@@ -859,7 +859,7 @@ $manager->notify(
         */\r
        function getBlogIDFromCommentID($comment_id)\r
        {\r
-               return quickQuery('SELECT `cblog` AS `result` FROM `' . sql_table('comment') . '` WHERE `cnumber` = ' . intval($comment_id));\r
+               return quickQuery('SELECT cblog AS result FROM ' . sql_table('comment') . ' WHERE cnumber = ' . intval($comment_id));\r
        }\r
 \r
 \r
@@ -870,7 +870,7 @@ $manager->notify(
         */\r
        function getBlogIDFromCatID($category_id)\r
        {\r
-               return quickQuery('SELECT `cblog` AS `result` FROM `' . sql_table('category') . '` WHERE `catid` = ' . intval($category_id));\r
+               return quickQuery('SELECT cblog AS result FROM ' . sql_table('category') . ' WHERE catid = ' . intval($category_id));\r
        }\r
 \r
 \r
@@ -881,7 +881,7 @@ $manager->notify(
         */\r
        function getCatIDFromName($name)\r
        {\r
-               return quickQuery('SELECT `catid` AS `result` FROM `' . sql_table('category') . '` WHERE `cname` = "' . sql_real_escape_string($name) . '"');\r
+               return quickQuery('SELECT catid AS result FROM ' . sql_table('category') . ' WHERE cname = "' . sql_real_escape_string($name) . '"');\r
        }\r
 \r
 \r
@@ -1692,7 +1692,7 @@ function ticketForPlugin()
        \r
        // Solve the plugin name.\r
        $plugins = array();\r
-       $query = 'SELECT `pfile` FROM '.sql_table('plugin');\r
+       $query = 'SELECT pfile FROM '.sql_table('plugin');\r
        $res = sql_query($query);\r
        \r
        while($row = sql_fetch_row($res) )\r

diff --git a/nucleus/plugins/NP_SecurityEnforcer.php b/nucleus/plugins/NP_SecurityEnforcer.php
index 1c079c8..38f389f 100644 (file)
--- a/nucleus/plugins/NP_SecurityEnforcer.php
+++ b/nucleus/plugins/NP_SecurityEnforcer.php
@@ -50,10 +50,10 @@ class NP_SecurityEnforcer extends NucleusPlugin
                
                // create needed tables
                sql_query("CREATE TABLE IF NOT EXISTS ". sql_table('plug_securityenforcer').
-                                       " (`login` varchar(255),
-                                          `fails` int(11) NOT NULL default '0',
-                                          `lastfail` bigint NOT NULL default '0',
-                                          KEY `login` (`login`)) ENGINE=MyISAM");
+                                       " (login varchar(255),
+                                          fails int(11) NOT NULL default '0',
+                                          lastfail bigint NOT NULL default '0',
+                                          KEY login (login)) ENGINE=MyISAM");
                return;
        }
        

diff --git a/nucleus/upgrades/upgrade.functions.php b/nucleus/upgrades/upgrade.functions.php
index d91c859..5062c23 100644 (file)
--- a/nucleus/upgrades/upgrade.functions.php
+++ b/nucleus/upgrades/upgrade.functions.php
@@ -337,10 +337,8 @@
                // begin if: no upgrade failures; update the database version in the config table
                if ( $upgrade_failures == 0 )
                {
-                       $query = 'UPDATE `%s` ' .
-                               'SET `value` = "%s" ' .
-                               'WHERE `name` = "DatabaseVersion"';
-
+                       $query = 'UPDATE %s SET value = "%s" WHERE name = "DatabaseVersion";';
+                       
                        $query = sprintf($query, sql_table('config'), $version);
                        upgrade_query($message, $query);
                }
@@ -365,7 +363,7 @@
                // get info for indices from database
                $indices = array();
 
-               $query = 'SHOW INDEX FROM `' . sql_table($table) . '`';
+               $query = 'SHOW INDEX FROM ' . sql_table($table);
                $result = @mysql_query($query);
 
                // begin loop: each result object
@@ -405,7 +403,7 @@
         */
        function upgrade_checkIfTableExists($table)
        {
-               $query = 'SHOW TABLES LIKE `' . sql_table($table) . '`';
+               $query = 'SHOW TABLES LIKE ' . sql_table($table);
                $result = @mysql_query($query);
 
                // begin if: query executed successfully and one row was returned
@@ -430,7 +428,7 @@
          */
        function upgrade_checkIfCVExists($value)
        {
-               $query = 'SELECT `name` FROM `' . sql_table('config') . '` WHERE `name` = "' . $value . '"';
+               $query = 'SELECT name FROM ' . sql_table('config') . ' WHERE name = "' . $value . '"';
                $result = @mysql_query($query);
 
                // begin if: query executed successfully and one row was returned
@@ -456,7 +454,7 @@
          */
        function upgrade_checkIfColumnExists($table, $column)
        {
-               $query = 'DESC `' . sql_table($table) . '` `' . $column . '`';
+               $query = 'DESC ' . sql_table($table) . ' ' . $column;
                $result = @mysql_query($query);
 
                // begin if: query executed successfully and one row was returned

diff --git a/nucleus/upgrades/upgrade3.3.php b/nucleus/upgrades/upgrade3.3.php
index 924d897..eac4c49 100644 (file)
--- a/nucleus/upgrades/upgrade3.3.php
+++ b/nucleus/upgrades/upgrade3.3.php
@@ -21,15 +21,15 @@ function upgrade_do330() {
                return 'already installed';
 
        if (!upgrade_checkIfColumnExists('comment','cemail')) {
-               $query = "      ALTER TABLE `" . sql_table('comment') . "`
-                                       ADD `cemail` VARCHAR( 100 ) AFTER `cmail` ;";
+               $query = "      ALTER TABLE " . sql_table('comment') . "
+                                       ADD cemail VARCHAR( 100 ) AFTER cmail ;";
 
                upgrade_query('Altering ' . sql_table('comment') . ' table', $query);
        }
 
        if (!upgrade_checkIfColumnExists('blog','breqemail')) {
-               $query = "      ALTER TABLE `" . sql_table('blog') . "`
-                                       ADD `breqemail` TINYINT( 2 ) DEFAULT '0' NOT NULL ;";
+               $query = "      ALTER TABLE " . sql_table('blog') . "
+                                       ADD breqemail TINYINT( 2 ) DEFAULT '0' NOT NULL ;";
 
                upgrade_query('Altering ' . sql_table('blog') . ' table', $query);
        }
@@ -42,15 +42,15 @@ function upgrade_do330() {
        );
 
        if (!upgrade_checkIfColumnExists('item','iposted')) {
-               $query = "      ALTER TABLE `" . sql_table('item') . "`
-                                ADD `iposted` TINYINT(2) DEFAULT 1 NOT NULL ;";
+               $query = "      ALTER TABLE " . sql_table('item') . "
+                                ADD iposted TINYINT(2) DEFAULT 1 NOT NULL ;";
 
                upgrade_query('Altering ' . sql_table('item') . ' table', $query);
        }
 
        if (!upgrade_checkIfColumnExists('blog','bfuturepost')) {
-               $query = "      ALTER TABLE `" . sql_table('blog') . "`
-                                ADD `bfuturepost` TINYINT(2) DEFAULT 0 NOT NULL ;";
+               $query = "      ALTER TABLE " . sql_table('blog') . "
+                                ADD bfuturepost TINYINT(2) DEFAULT 0 NOT NULL ;";
 
                upgrade_query('Altering ' . sql_table('blog') . ' table', $query);
        }

diff --git a/nucleus/upgrades/upgrade3.4.php b/nucleus/upgrades/upgrade3.4.php
index 0497c3c..2a33d65 100644 (file)
--- a/nucleus/upgrades/upgrade3.4.php
+++ b/nucleus/upgrades/upgrade3.4.php
@@ -26,14 +26,14 @@ function upgrade_do340() {
         }
 
        // lengthen tpartname column of nucleus_template
-       $query = "      ALTER TABLE `" . sql_table('template') . "`
-                                       MODIFY `tpartname` varchar(64) NOT NULL default '' ;";
+       $query = "      ALTER TABLE " . sql_table('template') . "
+                                       MODIFY tpartname varchar(64) NOT NULL default '' ;";
 
        upgrade_query('Altering ' . sql_table('template') . ' table', $query);
        
        // lengthen tdname column of nucleus_template_desc
-       $query = "      ALTER TABLE `" . sql_table('template_desc') . "`
-                                       MODIFY `tdname` varchar(64) NOT NULL default '' ;";
+       $query = "      ALTER TABLE " . sql_table('template_desc') . "
+                                       MODIFY tdname varchar(64) NOT NULL default '' ;";
 
        upgrade_query('Altering ' . sql_table('template_desc') . ' table', $query);
        

diff --git a/nucleus/upgrades/upgrade3.5.php b/nucleus/upgrades/upgrade3.5.php
index bfed694..cf15a9a 100644 (file)
--- a/nucleus/upgrades/upgrade3.5.php
+++ b/nucleus/upgrades/upgrade3.5.php
@@ -26,15 +26,15 @@ function upgrade_do350() {
         }
        
        // changing the member table to lengthen display name (mname)
-    $query = " ALTER TABLE `" . sql_table('member') . "`
-                                       MODIFY `mname` varchar(32) NOT NULL default '' ;";
+    $query = " ALTER TABLE " . sql_table('member') . "
+                                       MODIFY mname varchar(32) NOT NULL default '' ;";
 
        upgrade_query('Altering ' . sql_table('member') . ' table', $query);
 
        // changing the blog table to remove bsendping flag
     if (upgrade_checkIfColumnExists('blog', 'bsendping')) {
-               $query = "      ALTER TABLE `" . sql_table('blog') . "`
-                                       DROP `bsendping`;";
+               $query = "      ALTER TABLE " . sql_table('blog') . "
+                                       DROP bsendping;";
        
                upgrade_query('Altering ' . sql_table('blog') . ' table', $query);
        }

diff --git a/nucleus/upgrades/upgrade3.6.php b/nucleus/upgrades/upgrade3.6.php
index e4ea314..90eca6e 100644 (file)
--- a/nucleus/upgrades/upgrade3.6.php
+++ b/nucleus/upgrades/upgrade3.6.php
@@ -26,8 +26,8 @@ function upgrade_do360() {
         }
        
        // changing the blog table to lengthen bnotify field 
-    $query = " ALTER TABLE `" . sql_table('blog') . "`
-                                       MODIFY `bnotify` varchar(128) default NULL ;";
+       $query = "      ALTER TABLE " . sql_table('blog') . "
+                                       MODIFY bnotify varchar(128) default NULL ;";
 
        upgrade_query('Altering ' . sql_table('blog') . ' table', $query);