split sql schema from php

html/makefile.am

@@ -17,7 +17,7 @@ dist_www_DATA = index.html chat.html newuser.html safechat.js			  \
                 envelope.svg functions.php menu.svg pfeil.svg			  \
                 photo.png photo.svg safechat-rodrigo-angleton.svg		  \
                 safe-mimooh.svg send.svg update-messages.js video.png		  \
-                video.svg
+                video.svg messagetable.sql usertable.sql
 
 EXTRA_DIST = documentation.dox
 

html/messagetable.php

@@ -23,29 +23,7 @@
 
 require_once("opendb.php");
 try {
-  $query = <<<EOD
+  $db->query(file_get_contents("messagetable.sql"));
-    create table if not exists
-      message (
-        id
-          int primary key not null auto_increment
-          comment "id of the message, it is used in the client to check if a message has already been downloaded or not",
-        time
-          timestamp default current_timestamp
-          comment "time when the message has been stored on the server",
-        user
-          varchar(50) not null
-          comment "name of the user that sent the message",
-        msg
-          longtext not null
-          comment "message content, must be armored gnupg encrypted format",
-        foreign key (user)
-          references user(name)
-          on delete cascade
-          on update cascade
-      ) character set utf8 engine=innodb
-        comment="table to hold all messages for later download by the receiver";
-EOD;
-  $db->query($query);
   $db->query('set global max_allowed_packet=1000000000');
   $db->query('set global net_buffer_length=1000000');
 } catch (Exception $e) {

html/messagetable.sql

@@ -0,0 +1,20 @@
+    create table if not exists
+      'message' (
+        'id'
+          int primary key not null auto_increment
+          comment "id of the message, it is used in the client to check if a message has already been downloaded or not",
+        'time'
+          timestamp default current_timestamp
+          comment "time when the message has been stored on the server",
+        'user'
+          varchar(50) not null
+          comment "name of the user that sent the message",
+        'msg'
+          longtext not null
+          comment "message content, must be armored gnupg encrypted format",
+        foreign key ('user')
+          references 'user'('name')
+          on delete cascade
+          on update cascade
+      ) character set utf8 engine=innodb
+        comment="table to hold all messages for later download by the receiver";

html/usertable.php

@@ -24,19 +24,7 @@
 
 require_once("opendb.php");
 try {
-  $query = <<<EOD
+  $db->query(file_get_contents("usertable.sql"));
-    create table if not exists
-      user (
-          name
-            varchar(50) not null primary key
-            comment "unique name of the user",
-          pubkey
-            text not null
-            comment "armored gnupg public key of the user"
-      ) character set utf8 engine=innodb
-        comment="list of all registered users and their public keys";
-EOD;
-  $db->query($query);
 } catch (Exception $e) {
   error('database error on server');
 }

html/usertable.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS `user` (
+  `name` varchar(50) NOT NULL COMMENT 'unique name of the user',
+  `pubkey` text NOT NULL COMMENT 'armored gnupg public key of the user',
+  PRIMARY KEY (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='list of all registered users and their public keys';