diff --git a/htdocs/class/libraries/composer.json b/htdocs/class/libraries/composer.json index 93cd5814d..41be2b2fe 100644 --- a/htdocs/class/libraries/composer.json +++ b/htdocs/class/libraries/composer.json @@ -5,7 +5,7 @@ "description": "Libraries for XOOPS 2.5.8", "require": { "php": ">=5.3.7", - "xoops/xmf": "1.0.0-RC", + "xoops/xmf": "1.0.0-RC2", "ircmaxell/password-compat": "^1.0.4" } } diff --git a/htdocs/class/libraries/composer.lock b/htdocs/class/libraries/composer.lock index 48c3cfd54..476d8ce41 100644 --- a/htdocs/class/libraries/composer.lock +++ b/htdocs/class/libraries/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2745281710448458d003d0b80eac6b1d", - "content-hash": "7ddd07d651a6f254af595606b979d147", + "hash": "ba60218844160ff388a2bbd4ac8028b2", + "content-hash": "7a91e39fbee8beaef4ca9ee3a6ab0bdb", "packages": [ { "name": "firebase/php-jwt", @@ -287,16 +287,16 @@ }, { "name": "xoops/xmf", - "version": "v1.0.0-RC", + "version": "v1.0.0-RC2", "source": { "type": "git", "url": "https://github.com/XOOPS/xmf.git", - "reference": "6385801c3740a9f14954e50c7bb427717728646e" + "reference": "197a1b51b9f39f97a7e1c316756d0af329696ee1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/XOOPS/xmf/zipball/6385801c3740a9f14954e50c7bb427717728646e", - "reference": "6385801c3740a9f14954e50c7bb427717728646e", + "url": "https://api.github.com/repos/XOOPS/xmf/zipball/197a1b51b9f39f97a7e1c316756d0af329696ee1", + "reference": "197a1b51b9f39f97a7e1c316756d0af329696ee1", "shasum": "" }, "require": { @@ -317,7 +317,7 @@ "GPL-2.0+" ], "description": "XMF - XOOPS Module Framework", - "time": "2016-02-29 22:26:31" + "time": "2016-03-07 22:41:14" } ], "packages-dev": [], diff --git a/htdocs/class/libraries/vendor/composer/installed.json b/htdocs/class/libraries/vendor/composer/installed.json index 30a17736c..e65f83118 100644 --- a/htdocs/class/libraries/vendor/composer/installed.json +++ b/htdocs/class/libraries/vendor/composer/installed.json @@ -101,42 +101,6 @@ "php" ] }, - { - "name": "xoops/xmf", - "version": "v1.0.0-RC", - "version_normalized": "1.0.0.0-RC", - "source": { - "type": "git", - "url": "https://github.com/XOOPS/xmf.git", - "reference": "6385801c3740a9f14954e50c7bb427717728646e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/XOOPS/xmf/zipball/6385801c3740a9f14954e50c7bb427717728646e", - "reference": "6385801c3740a9f14954e50c7bb427717728646e", - "shasum": "" - }, - "require": { - "firebase/php-jwt": "^3.0.0", - "ircmaxell/random-lib": "^1.1.0", - "php": ">=5.3.7", - "raveren/kint": "1.0.10", - "symfony/yaml": "2.4.*" - }, - "time": "2016-02-29 22:26:31", - "type": "project", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Xmf\\": "src/Xmf" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "description": "XMF - XOOPS Module Framework" - }, { "name": "ircmaxell/password-compat", "version": "v1.0.4", @@ -324,5 +288,41 @@ ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt" + }, + { + "name": "xoops/xmf", + "version": "v1.0.0-RC2", + "version_normalized": "1.0.0.0-RC2", + "source": { + "type": "git", + "url": "https://github.com/XOOPS/xmf.git", + "reference": "197a1b51b9f39f97a7e1c316756d0af329696ee1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/XOOPS/xmf/zipball/197a1b51b9f39f97a7e1c316756d0af329696ee1", + "reference": "197a1b51b9f39f97a7e1c316756d0af329696ee1", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "^3.0.0", + "ircmaxell/random-lib": "^1.1.0", + "php": ">=5.3.7", + "raveren/kint": "1.0.10", + "symfony/yaml": "2.4.*" + }, + "time": "2016-03-07 22:41:14", + "type": "project", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Xmf\\": "src/Xmf" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "XMF - XOOPS Module Framework" } ] diff --git a/htdocs/class/libraries/vendor/xoops/xmf/docs/changelog.md b/htdocs/class/libraries/vendor/xoops/xmf/docs/changelog.md index 1cc6dafa1..4c54ded21 100644 --- a/htdocs/class/libraries/vendor/xoops/xmf/docs/changelog.md +++ b/htdocs/class/libraries/vendor/xoops/xmf/docs/changelog.md @@ -1,6 +1,10 @@ xmf ChangeLog ============= +04-Mar-2016 V1.0.0 RC1 +------------------------- +- Preparation for release in XOOPS 2.5.8 + 09-Feb-2016 ----------- - Convert to library instead of module diff --git a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/TableLoad.php b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/TableLoad.php index 988192432..567e58f75 100644 --- a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/TableLoad.php +++ b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/TableLoad.php @@ -116,14 +116,14 @@ public static function truncateTable($table) } /** - * rowCount - get count of rows in a table + * countRows - get count of rows in a table * * @param string $table name of table to count * @param \CriteriaElement $criteria optional criteria * * @return int number of rows */ - public static function rowCount($table, $criteria = null) + public static function countRows($table, $criteria = null) { /** @var \XoopsDatabase */ $db = \XoopsDatabaseFactory::getDatabaseConnection(); @@ -137,6 +137,65 @@ public static function rowCount($table, $criteria = null) $row = $db->fetchArray($result); $count = $row['count']; $db->freeRecordSet($result); - return $count; + return (int)$count; + } + + /** + * extractRows - get rows, all or a subset, from a table as an array + * + * @param string $table name of table to count + * @param \CriteriaElement $criteria optional criteria + * @param string[] $skipColumns do not include columns in this list + * + * @return array of table rows + */ + public static function extractRows($table, $criteria = null, $skipColumns = array()) + { + /** @var \XoopsDatabase */ + $db = \XoopsDatabaseFactory::getDatabaseConnection(); + + $prefixedTable = $db->prefix($table); + $sql = 'SELECT * FROM ' . $prefixedTable . ' '; + if (isset($criteria) && is_subclass_of($criteria, '\CriteriaElement')) { + $sql .= $criteria->renderWhere(); + } + $rows = array(); + $result = $db->query($sql); + if ($result) { + while ($row = $db->fetchArray($result)) { + $rows[] = $row; + } + } + + $db->freeRecordSet($result); + + if (!empty($skipColumns)) { + foreach ($rows as $index => $row) { + foreach ($skipColumns as $column) { + unset($rows[$index][$column]); + } + } + } + + return $rows; + } + + /** + * Save table data to a YAML file + * + * @param string $table name of table to load without prefix + * @param string $yamlFile name of file containing data dump in YAML format + * @param \CriteriaElement $criteria optional criteria + * @param string[] $skipColumns do not include columns in this list + * + * @return bool true on success, false on error + */ + public static function saveTableToYamlFile($table, $yamlFile, $criteria = null, $skipColumns = array()) + { + $rows = static::extractRows($table, $criteria, $skipColumns); + + $count = Yaml::save($rows, $yamlFile); + + return (false !== $count); } } diff --git a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/Tables.php b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/Tables.php index 2bc11ff71..56b308779 100644 --- a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/Tables.php +++ b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/Database/Tables.php @@ -21,7 +21,7 @@ * Build a work queue of database changes needed to implement new and * changed tables. Define table(s) you are dealing with and any desired * change(s). If the changes are already in place (i.e. the new column - * already exists) no work is added. Then queueExecute() to process the + * already exists) no work is added. Then executeQueue() to process the * whole set. * * @category Xmf\Database\Tables @@ -35,11 +35,6 @@ */ class Tables { - /** - * for add/alter column position - */ - const POSITION_FIRST = 1; - /** * @var \XoopsDatabase */ @@ -80,7 +75,7 @@ public function __construct() $this->db = \XoopsDatabaseFactory::getDatabaseConnection(); $this->databaseName = XOOPS_DB_NAME; - $this->queueReset(); + $this->resetQueue(); } /** @@ -101,16 +96,13 @@ protected function name($table) * @param string $table table to contain the column * @param string $column name of column to add * @param string $attributes column_definition - * @param mixed $position FIRST, string of column name to add new - * column after, or null for natural append * * @return bool true if no errors, false if errors encountered */ - public function addColumn($table, $column, $attributes, $position = null) + public function addColumn($table, $column, $attributes) { $columnDef = array( 'name' => $column, - 'position' => $position, 'attributes' => $attributes ); @@ -119,49 +111,15 @@ public function addColumn($table, $column, $attributes, $position = null) $tableDef = &$this->tables[$table]; // Is this on a table we are adding? if (isset($tableDef['create']) && $tableDef['create']) { - switch ($position) { - case static::POSITION_FIRST: - array_unshift($tableDef['columns'], $columnDef); - break; - case '': - case null: - case false: - array_push($tableDef['columns'], $columnDef); - break; - default: - // should be a column name to add after - // loop thru and find that column - $i = 0; - foreach ($tableDef['columns'] as $col) { - ++$i; - if (strcasecmp($col['name'], $position) == 0) { - array_splice($tableDef['columns'], $i, 0, array($columnDef)); - break; - } - } - } - - return true; + array_push($tableDef['columns'], $columnDef); } else { foreach ($tableDef['columns'] as $col) { if (strcasecmp($col['name'], $column) == 0) { return true; } } - switch ($position) { - case static::POSITION_FIRST: - $pos = 'FIRST'; - break; - case '': - case null: - case false: - $pos = ''; - break; - default: - $pos = "AFTER `{$position}`"; - } $this->queue[] = "ALTER TABLE `{$tableDef['name']}`" - . " ADD COLUMN {$column} {$columnDef['attributes']} {$pos} "; + . " ADD COLUMN `{$column}` {$columnDef['attributes']}"; } } else { return $this->tableNotEstablished(); @@ -181,8 +139,54 @@ public function addColumn($table, $column, $attributes, $position = null) */ public function addPrimaryKey($table, $column) { + $columns = str_getcsv(str_replace(' ', '', $column)); + $columnList = ''; + $firstComma = ''; + foreach ($columns as $col) { + $columnList .= "{$firstComma}`{$col}`"; + $firstComma = ', '; + } + if (isset($this->tables[$table])) { + if (isset($this->tables[$table]['create']) && $this->tables[$table]['create']) { + $this->tables[$table]['keys']['PRIMARY']['columns'] = $columnList; + } else { + $this->queue[] = "ALTER TABLE `{$this->tables[$table]['name']}` ADD PRIMARY KEY({$columnList})"; + } + } else { + return $this->tableNotEstablished(); + } + + return true; + } + + /** + * Add new index definition for index to work queue + * + * @param string $name name of index to add + * @param string $table table indexed + * @param string $column column or a comma separated list of columns + * to use as the key + * @param bool $unique true if index is to be unique + * + * @return bool true if no errors, false if errors encountered + */ + public function addIndex($name, $table, $column, $unique = false) + { + $columns = str_getcsv(str_replace(' ', '', $column)); + $columnList = ''; + $firstComma = ''; + foreach ($columns as $col) { + $columnList .= "{$firstComma}`{$col}`"; + $firstComma = ', '; + } if (isset($this->tables[$table])) { - $this->queue[] = "ALTER TABLE `{$table}` ADD PRIMARY KEY({$column})"; + if (isset($this->tables[$table]['create']) && $this->tables[$table]['create']) { + $this->tables[$table]['keys'][$name]['columns'] = $columnList; + $this->tables[$table]['keys'][$name]['unique'] = (bool) $unique; + } else { + $add = ($unique ? 'ADD UNIQUE INDEX' : 'ADD INDEX'); + $this->queue[] = "ALTER TABLE `{$this->tables[$table]['name']}` {$add} `{$name}` ({$columnList})"; + } } else { return $this->tableNotEstablished(); } @@ -211,10 +215,12 @@ public function addTable($table) } else { if ($tableDef === true) { $tableDef = array( - 'name' => $this->db->prefix($table), - 'options' => 'ENGINE=InnoDB' + 'name' => $this->name($table), + 'options' => 'ENGINE=InnoDB', + 'columns' => array(), + 'keys' => array(), + 'create' => true, ); - $tableDef['create'] = true; $this->tables[$table] = $tableDef; $this->queue[] = array('createtable' => $table); @@ -294,12 +300,10 @@ public function getTableIndexes($table) * @param string $column column to alter * @param string $attributes new column_definition * @param string $newName new name for column, blank to keep same - * @param mixed $position FIRST, string of column name to add new - * column after, or null for no change * * @return bool true if no errors, false if errors encountered */ - public function alterColumn($table, $column, $attributes, $newName = '', $position = null) + public function alterColumn($table, $column, $attributes, $newName = '') { if (empty($newName)) { $newName = $column; @@ -308,9 +312,7 @@ public function alterColumn($table, $column, $attributes, $newName = '', $positi if (isset($this->tables[$table])) { $tableDef = &$this->tables[$table]; // Is this on a table we are adding? - if (isset($tableDef['create']) && $tableDef['create'] - && empty($position) - ) { + if (isset($tableDef['create']) && $tableDef['create']) { // loop thru and find the column foreach ($tableDef['columns'] as &$col) { if (strcasecmp($col['name'], $column) == 0) { @@ -322,20 +324,8 @@ public function alterColumn($table, $column, $attributes, $newName = '', $positi return true; } else { - switch ($position) { - case static::POSITION_FIRST: - $pos = 'FIRST'; - break; - case '': - case null: - case false: - $pos = ''; - break; - default: - $pos = "AFTER `{$position}`"; - } $this->queue[] = "ALTER TABLE `{$tableDef['name']}` " . - "CHANGE COLUMN `{$column}` `{$newName}` {$attributes} {$pos} "; + "CHANGE COLUMN `{$column}` `{$newName}` {$attributes} "; } } else { return $this->tableNotEstablished(); @@ -380,29 +370,6 @@ public function copyTable($table, $newTable, $withData = false) } } - /** - * Add new index definition for index to work queue - * - * @param string $name name of index to add - * @param string $table table indexed - * @param string $column column or a comma separated list of columns - * to use as the key - * @param bool $unique true if index is to be unique - * - * @return bool true if no errors, false if errors encountered - */ - public function createIndex($name, $table, $column, $unique = false) - { - if (isset($this->tables[$table])) { - $add = ($unique ? 'ADD UNIQUE INDEX' : 'ADD INDEX'); - $this->queue[] = "ALTER TABLE `{$table}` {$add} {$name} ({$column})"; - } else { - return $this->tableNotEstablished(); - } - - return true; - } - /** * Add drop column operation to the work queue * @@ -415,7 +382,7 @@ public function dropColumn($table, $column) { // Find table def. if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $this->queue[] = "ALTER TABLE `{$tableDef['name']}` DROP COLUMN `{$column}`"; } else { return $this->tableNotEstablished(); @@ -435,7 +402,7 @@ public function dropColumn($table, $column) public function dropIndex($name, $table) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $this->queue[] = "ALTER TABLE `{$tableDef['name']}` DROP INDEX `{$name}`"; } else { return $this->tableNotEstablished(); @@ -490,7 +457,7 @@ public function dropIndexes($table) public function dropPrimaryKey($table) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $this->queue[] = "ALTER TABLE `{$tableDef['name']}` DROP PRIMARY KEY "; } else { return $this->tableNotEstablished(); @@ -509,7 +476,7 @@ public function dropPrimaryKey($table) public function dropTable($table) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $this->queue[] = "DROP TABLE `{$tableDef['name']}` "; unset($this->tables[$table]); } @@ -529,10 +496,12 @@ public function dropTable($table) public function renameTable($table, $newName) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $newTable = $this->name($newName); $this->queue[] = "ALTER TABLE `{$tableDef['name']}` RENAME TO `{$newTable}`"; $tableDef['name'] = $newTable; + $this->tables[$newName] = $tableDef; + unset($this->tables[$table]); } else { return $this->tableNotEstablished(); } @@ -551,16 +520,20 @@ public function renameTable($table, $newName) */ public function setTableOptions($table, $options) { - // ENGINE=MEMORY DEFAULT CHARSET=utf8; if (isset($this->tables[$table])) { $tableDef = &$this->tables[$table]; - $this->queue[] = "ALTER TABLE `{$tableDef['name']}` {$options} "; - $tableDef['options'] = $options; + // Is this on a table we are adding? + if (isset($tableDef['create']) && $tableDef['create']) { + $tableDef['options'] = $options; + return true; + } else { + $this->queue[] = "ALTER TABLE `{$tableDef['name']}` {$options} "; + $tableDef['options'] = $options; + return true; + } } else { return $this->tableNotEstablished(); } - - return true; } @@ -569,7 +542,7 @@ public function setTableOptions($table, $options) * * @return void */ - public function queueReset() + public function resetQueue() { $this->tables = array(); $this->queue = array(); @@ -582,7 +555,7 @@ public function queueReset() * * @return bool true if no errors, false if errors encountered */ - public function queueExecute($force = false) + public function executeQueue($force = false) { $this->expandQueue(); foreach ($this->queue as &$ddl) { @@ -615,10 +588,10 @@ public function queueExecute($force = false) public function delete($table, $criteria) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $where = ''; if (is_scalar($criteria)) { - $where = 'WHERE ' . $criteria; + $where = $criteria; } elseif (is_object($criteria)) { $where = $criteria->renderWhere(); } @@ -640,7 +613,7 @@ public function delete($table, $criteria) public function insert($table, $columns) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $colSql = ''; $valSql = ''; foreach ($tableDef['columns'] as $col) { @@ -671,10 +644,10 @@ public function insert($table, $columns) public function update($table, $columns, $criteria) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $where = ''; if (is_scalar($criteria)) { - $where = 'WHERE ' . $criteria; + $where = $criteria; } elseif (is_object($criteria)) { $where = $criteria->renderWhere(); } @@ -705,7 +678,7 @@ public function update($table, $columns, $criteria) public function truncate($table) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $this->queue[] = "TRUNCATE TABLE `{$tableDef['name']}`"; } else { return $this->tableNotEstablished(); @@ -729,25 +702,25 @@ public function truncate($table) protected function renderTableCreate($table, $prefixed = false) { if (isset($this->tables[$table])) { - $tableDef = &$this->tables[$table]; + $tableDef = $this->tables[$table]; $tableName = ($prefixed ? $tableDef['name'] : $table); - $sql = "CREATE TABLE `{$tableName}` (\n"; + $sql = "CREATE TABLE `{$tableName}` ("; + $firstComma = ''; foreach ($tableDef['columns'] as $col) { - $sql .= " {$col['name']} {$col['attributes']},\n"; + $sql .= "{$firstComma}\n `{$col['name']}` {$col['attributes']}"; + $firstComma = ','; } $keySql = ''; foreach ($tableDef['keys'] as $keyName => $key) { - $comma = empty($keySql) ? ' ' : ', '; if ($keyName === 'PRIMARY') { - $keySql .= " {$comma}PRIMARY KEY ({$key['columns']})\n"; + $keySql .= ",\n PRIMARY KEY ({$key['columns']})"; } else { $unique = $key['unique'] ? 'UNIQUE ' : ''; - $keySql .= " {$comma}{$unique}KEY {$keyName} " - . " ({$key['columns']})\n"; + $keySql .= ",\n {$unique}KEY {$keyName} ({$key['columns']})"; } } $sql .= $keySql; - $sql .= ") {$tableDef['options']};\n"; + $sql .= "\n) {$tableDef['options']};\n"; return $sql; } else { @@ -787,8 +760,7 @@ protected function execSql($sql, $force = false) * * @param resource $result as returned by query * - * @return bool true if no errors and table is loaded, false if - * error presented. Error message in $this->lastError; + * @return mixed false on error */ protected function fetch($result) { @@ -800,8 +772,8 @@ protected function fetch($result) * * @param string $table table * - * @return bool true if no errors and table is loaded, false if - * error presented. Error message in $this->lastError; + * @return array|bool table definition array if table exists, true if table not defined, or + * false on error. Error message in $this->lastError; */ protected function getTable($table) { @@ -842,7 +814,6 @@ protected function getTable($table) $columnDef = array( 'name' => $column['COLUMN_NAME'], - 'position' => $column['ORDINAL_POSITION'], 'attributes' => $attributes ); diff --git a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/FilterInput.php b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/FilterInput.php index 83ea3a70f..46d8c4384 100644 --- a/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/FilterInput.php +++ b/htdocs/class/libraries/vendor/xoops/xmf/src/Xmf/FilterInput.php @@ -127,7 +127,9 @@ public static function getInstance( ) { static $instances; - $sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto))); + $className = get_called_class(); // so an extender gets an instance of itself + + $sig = md5(serialize(array($className, $tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto))); if (!isset($instances)) { $instances = array(); @@ -216,7 +218,7 @@ public static function clean($source, $type = 'string') break; case 'ALPHANUM': - case 'ALNUM': // for BC only + case 'ALNUM': $result = (string) preg_replace('/[^A-Z0-9]/i', '', $source); break; @@ -320,9 +322,9 @@ protected function filterTags($source) $postTag = $source; // find initial tag's position $tagOpen_start = strpos($source, '<'); - // interate through string until no tags left + // iterate through string until no tags left while ($tagOpen_start !== false) { - // process tag interatively + // process tag iteratively $preTag .= substr($postTag, 0, $tagOpen_start); $postTag = substr($postTag, $tagOpen_start); $fromTagOpen = substr($postTag, 1); diff --git a/upgrade/upd-2.5.7-to-2.5.8/index.php b/upgrade/upd-2.5.7-to-2.5.8/index.php index 813b8db64..02ba12860 100644 --- a/upgrade/upd-2.5.7-to-2.5.8/index.php +++ b/upgrade/upd-2.5.7-to-2.5.8/index.php @@ -98,7 +98,7 @@ public function apply_users_pass() } $migrate->alterColumn('users', 'pass', "varchar(255) NOT NULL DEFAULT ''"); - return $migrate->queueExecute(true); + return $migrate->executeQueue(true); } /** @@ -119,7 +119,7 @@ public function apply_com_ip() $migrate = new Tables(); $migrate->useTable('xoopscomments'); $migrate->alterColumn('xoopscomments', 'com_ip', "varchar(45) NOT NULL DEFAULT ''"); - return $migrate->queueExecute(true); + return $migrate->executeQueue(true); } /** @@ -140,7 +140,7 @@ public function apply_sess_ip() $migrate = new Tables(); $migrate->useTable('session'); $migrate->alterColumn('session', 'sess_ip', "varchar(45) NOT NULL DEFAULT ''"); - return $migrate->queueExecute(true); + return $migrate->executeQueue(true); } /** @@ -161,7 +161,7 @@ public function apply_online_ip() $migrate = new Tables(); $migrate->useTable('online'); $migrate->alterColumn('online', 'online_ip', "varchar(45) NOT NULL DEFAULT ''"); - return $migrate->queueExecute(true); + return $migrate->executeQueue(true); } }