Merge pull request #3716 from annando/bugfix-mail

[friendica.git] / include / dbstructure.php

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 84493076385fa3e8bb52b8dc2a87ad95aa3938a7..4d615a2f14ba16dcd8929cb3da4fac6c8507de45 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once "boot.php";
@@ -30,7 +31,7 @@ function convert_to_innodb() {
                $sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
                echo $sql."\n";
 
-               $result = @$db->q($sql);
+               $result = dba::e($sql);
                if (!dbm::is_result($result)) {
                        print_update_error($db, $sql);
                }
@@ -52,7 +53,7 @@ function update_fail($update_id, $error_message) {
 
        // No valid result?
        if (!dbm::is_result($adminlist)) {
-               logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_WARNING);
+               logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
 
                // Don't continue
                return;
@@ -73,7 +74,7 @@ function update_fail($update_id, $error_message) {
                $body = sprintf($body, $error_message);
 
                notification(array(
-                       'type' => "SYSTEM_EMAIL",
+                       'type' => SYSTEM_EMAIL,
                        'to_email' => $admin['email'],
                        'preamble' => $preamble,
                        'body' => $body,
@@ -85,14 +86,15 @@ function update_fail($update_id, $error_message) {
 
 
        /*
+        @TODO deprecated code?
        $email_tpl = get_intltext_template("update_fail_eml.tpl");
        $email_msg = replace_macros($email_tpl, array(
                '$sitename' => $a->config['sitename'],
-               '$siteurl' =>  App::get_baseurl(),
+               '$siteurl' =>  System::baseUrl(),
                '$update' => DB_UPDATE_VERSION,
                '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
        ));
-       $subject=sprintf(t('Update Error at %s'), App::get_baseurl());
+       $subject=sprintf(t('Update Error at %s'), System::baseUrl());
        require_once('include/email.php');
        $subject = email_header_encode($subject,'UTF-8');
        mail($a->config['admin_email'], $subject, $email_msg,
@@ -133,7 +135,7 @@ function table_structure($table) {
                        // On utf8mb4 a varchar index can only have a length of 191
                        // The "show index" command sometimes returns this value although this value wasn't added manually.
                        // Because we don't want to add this number to every index, we ignore bigger numbers
-                       if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 191) OR ($index["Key_name"] == "PRIMARY"))) {
+                       if (($index["Sub_part"] != "") && (($index["Sub_part"] < 191) || ($index["Key_name"] == "PRIMARY"))) {
                                $column .= "(".$index["Sub_part"].")";
                        }
 
@@ -232,7 +234,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        }
 
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-       if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+       if ((version_compare($db->server_info(), '5.7.4') >= 0) &&
                !(strpos($db->server_info(), 'MariaDB') !== false)) {
                $ignore = '';
        } else {
@@ -381,7 +383,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                $field_definition = $database[$name]["fields"][$fieldname];
 
                                // Define the default collation if not given
-                               if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) {
+                               if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
                                        $parameters['Collation'] = 'utf8mb4_general_ci';
                                } else {
                                        $parameters['Collation'] = null;
@@ -389,7 +391,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
                                if ($field_definition['Collation'] != $parameters['Collation']) {
                                        $sql2 = db_modify_table_field($fieldname, $parameters);
-                                       if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) {
+                                       if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) {
                                                $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
                                        } else {
                                                $sql3 .= ", ".$sql2;
@@ -440,9 +442,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                // Ensure index conversion to unique removes duplicates
                                if ($is_unique) {
                                        if ($ignore != "") {
-                                               $db->q("SET session old_alter_table=1;");
+                                               dba::e("SET session old_alter_table=1;");
                                        } else {
-                                               $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+                                               $r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= print_update_error($db, $sql3);
                                                        return $errors;
@@ -450,25 +452,25 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        }
                                }
 
-                               $r = @$db->q($sql3);
+                               $r = @dba::e($sql3);
                                if (!dbm::is_result($r)) {
                                        $errors .= print_update_error($db, $sql3);
                                }
                                if ($is_unique) {
                                        if ($ignore != "") {
-                                               $db->q("SET session old_alter_table=0;");
+                                               dba::e("SET session old_alter_table=0;");
                                        } else {
-                                               $r = $db->q("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
+                                               $r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= print_update_error($db, $sql3);
                                                        return $errors;
                                                }
-                                               $r = $db->q("DROP TABLE `".$name."`;");
+                                               $r = dba::e("DROP TABLE `".$name."`;");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= print_update_error($db, $sql3);
                                                        return $errors;
                                                }
-                                               $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+                                               $r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= print_update_error($db, $sql3);
                                                        return $errors;
@@ -513,7 +515,7 @@ function db_field_command($parameters, $create = true) {
        if ($parameters["extra"] != "")
                $fieldstruct .= " ".$parameters["extra"];
 
-       /*if (($parameters["primary"] != "") AND $create)
+       /*if (($parameters["primary"] != "") && $create)
                $fieldstruct .= " PRIMARY KEY";*/
 
        return($fieldstruct);
@@ -530,7 +532,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
        $primary_keys = array();
        foreach ($fields AS $fieldname => $field) {
                $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
-               if (x($field,'primary') and $field['primary']!='') {
+               if (x($field,'primary') && $field['primary']!='') {
                        $primary_keys[] = $fieldname;
                }
        }
@@ -549,7 +551,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
                echo $sql.";\n";
 
        if ($action)
-               $r = @$db->q($sql);
+               $r = @dba::e($sql);
 
        return $r;
 }
@@ -1571,7 +1573,7 @@ function db_definition() {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "iid" => array("iid"),
+                                       "iid" => array("UNIQUE", "iid"),
                                        )
                        );
        $database["spam"] = array(
@@ -1655,6 +1657,7 @@ function db_definition() {
                                        "uid_created" => array("uid","created"),
                                        "uid_commented" => array("uid","commented"),
                                        "uid_wall_created" => array("uid","wall","created"),
+                                       "private_wall_received" => array("private","wall","received"),
                                        )
                        );
        $database["tokens"] = array(
@@ -1739,11 +1742,14 @@ function db_definition() {
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "executed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "done" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "pid" => array("pid"),
+                                       "parameter" => array("parameter(64)"),
                                        "priority_created" => array("priority", "created"),
+                                       "executed" => array("executed"),
                                        )
                        );
 
@@ -1762,10 +1768,10 @@ function dbstructure_run(&$argv, &$argc) {
        }
 
        if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
+               @include ".htconfig.php";
+               require_once "include/dba.php";
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
-                       unset($db_host, $db_user, $db_pass, $db_data);
+               unset($db_host, $db_user, $db_pass, $db_data);
        }
 
        if ($argc == 2) {