mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Final changes from TYPE=MyISAM to ENGINE=MyISAM

Browse Source
This commit is contained in:
e107steved
2011-05-02 20:51:21 +00:00
parent 820da43f63
commit 4d340285a4
5 changed files with 301 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/db_verify.php
View File

@@ -554,7 +554,7 @@ if(isset($_POST['do_fix']))
$query = "CREATE TABLE `".MPREFIX.$table."` ({$newval}"; $query = "CREATE TABLE `".MPREFIX.$table."` ({$newval}";
if (!preg_match('#.*?\s+?(?:TYPE|ENGINE)\s*\=\s*(.*?);#is', $newval)) if (!preg_match('#.*?\s+?(?:TYPE|ENGINE)\s*\=\s*(.*?);#is', $newval))
{ {
$query .= ') TYPE=MyISAM;'; $query .= ') ENGINE=MyISAM;';
} }
break; break;
} }

2
e107_admin/sql/extended_country.php
View File

@@ -26,7 +26,7 @@ CREATE TABLE user_extended_country (
country_iso char(2) NOT NULL default '', country_iso char(2) NOT NULL default '',
PRIMARY KEY (country_code), PRIMARY KEY (country_code),
KEY country_iso (country_iso) KEY country_iso (country_iso)
) TYPE=MyISAM; ) ENGINE=MyISAM;
INSERT INTO user_extended_country VALUES('AFG', 'Afghanistan', 'Asia', 'Southern and Central Asia', 'AF'); INSERT INTO user_extended_country VALUES('AFG', 'Afghanistan', 'Asia', 'Southern and Central Asia', 'AF');
INSERT INTO user_extended_country VALUES('NLD', 'Netherlands', 'Europe', 'Western Europe', 'NL'); INSERT INTO user_extended_country VALUES('NLD', 'Netherlands', 'Europe', 'Western Europe', 'NL');

592
e107_files/utilities/passconv.php
View File

@@ -1,296 +1,296 @@
<?php <?php
require('..\..\class2.php'); require('..\..\class2.php');
require_once(e_HANDLER.'user_handler.php'); require_once(e_HANDLER.'user_handler.php');
if (!check_class(e_UC_MAINADMIN)) if (!check_class(e_UC_MAINADMIN))
{ {
exit; exit;
} }
$user_info = new userHandler; $user_info = new userHandler;
define('LAN_PCONV_01','E107 Password Conversion Utility'); define('LAN_PCONV_01','E107 Password Conversion Utility');
define('LAN_PCONV_02','This utility converts all the passwords in your user database to current formats'); define('LAN_PCONV_02','This utility converts all the passwords in your user database to current formats');
define('LAN_PCONV_03','Caution!!!! Back up your database first!!!!!'); define('LAN_PCONV_03','Caution!!!! Back up your database first!!!!!');
define('LAN_PCONV_04','Proceed'); define('LAN_PCONV_04','Proceed');
define('LAN_PCONV_05','Convert md5 passwords to salted passwords'); define('LAN_PCONV_05','Convert md5 passwords to salted passwords');
define('LAN_PCONV_06','Passwords for email address login'); define('LAN_PCONV_06','Passwords for email address login');
define('LAN_PCONV_07','Create'); define('LAN_PCONV_07','Create');
define('LAN_PCONV_08','Delete'); define('LAN_PCONV_08','Delete');
define('LAN_PCONV_09','Do nothing'); define('LAN_PCONV_09','Do nothing');
define('LAN_PCONV_10','Back up user database'); define('LAN_PCONV_10','Back up user database');
define('LAN_PCONV_11', 'Yes'); define('LAN_PCONV_11', 'Yes');
define('LAN_PCONV_12', 'Have you backed up your database?'); define('LAN_PCONV_12', 'Have you backed up your database?');
define('LAN_PCONV_13', 'Backing up database'); define('LAN_PCONV_13', 'Backing up database');
define('LAN_PCONV_14', 'Done'); define('LAN_PCONV_14', 'Done');
define('LAN_PCONV_15', 'Creating email passwords'); define('LAN_PCONV_15', 'Creating email passwords');
define('LAN_PCONV_16', 'Deleting email passwords'); define('LAN_PCONV_16', 'Deleting email passwords');
define('LAN_PCONV_17', 'Scanning database...'); define('LAN_PCONV_17', 'Scanning database...');
define('LAN_PCONV_18', 'Cannot open user table'); define('LAN_PCONV_18', 'Cannot open user table');
define('LAN_PCONV_19', 'Creates a table called \'user_backup\' with the information about to be changed. If the table already exists, it is emptied first'); define('LAN_PCONV_19', 'Creates a table called \'user_backup\' with the information about to be changed. If the table already exists, it is emptied first');
define('LAN_PCONV_20', 'Error creating backup table'); define('LAN_PCONV_20', 'Error creating backup table');
define('LAN_PCONV_21', 'Error copying to backup table'); define('LAN_PCONV_21', 'Error copying to backup table');
define('LAN_PCONV_22', 'Total --TOTAL-- users checked'); define('LAN_PCONV_22', 'Total --TOTAL-- users checked');
define('LAN_PCONV_23', 'Total --TOTAL-- email passwords calculated'); define('LAN_PCONV_23', 'Total --TOTAL-- email passwords calculated');
define('LAN_PCONV_24', 'Total --TOTAL-- user passwords updated'); define('LAN_PCONV_24', 'Total --TOTAL-- user passwords updated');
define('LAN_PCONV_25', 'Total --TOTAL-- users could not be updated'); define('LAN_PCONV_25', 'Total --TOTAL-- users could not be updated');
define('LAN_PCONV_26', 'Create Backup'); define('LAN_PCONV_26', 'Create Backup');
define('LAN_PCONV_27', 'Restore backup'); define('LAN_PCONV_27', 'Restore backup');
define('LAN_PCONV_28', 'Restoring from backup....'); define('LAN_PCONV_28', 'Restoring from backup....');
define('LAN_PCONV_29', 'Backup database table not found!'); define('LAN_PCONV_29', 'Backup database table not found!');
define('LAN_PCONV_30', 'Cannot access backup table'); define('LAN_PCONV_30', 'Cannot access backup table');
define('LAN_PCONV_31', ''); define('LAN_PCONV_31', '');
define('LAN_PCONV_32', ''); define('LAN_PCONV_32', '');
define('LAN_PCONV_33', ''); define('LAN_PCONV_33', '');
define('LAN_PCONV_34', ''); define('LAN_PCONV_34', '');
define('LAN_PCONV_35', ''); define('LAN_PCONV_35', '');
function multi_radio($name, $textsVals, $currentval = '') function multi_radio($name, $textsVals, $currentval = '')
{ {
$ret = ''; $ret = '';
$gap = ''; $gap = '';
foreach ($textsVals as $v => $t) foreach ($textsVals as $v => $t)
{ {
$sel = ($v == $currentval) ? " checked='checked'" : ""; $sel = ($v == $currentval) ? " checked='checked'" : "";
$ret .= $gap."<input type='radio' name='{$name}' value='{$v}'{$sel} /> ".$t."\n"; $ret .= $gap."<input type='radio' name='{$name}' value='{$v}'{$sel} /> ".$t."\n";
// $gap = "&nbsp;&nbsp;"; // $gap = "&nbsp;&nbsp;";
$gap = "<br />"; $gap = "<br />";
} }
return $ret; return $ret;
} }
$recordCount = 0; $recordCount = 0;
$emailProcess = 0; $emailProcess = 0;
$saltProcess = 0; $saltProcess = 0;
$cantProcess = 0; $cantProcess = 0;
$cookieChange = ''; $cookieChange = '';
require(HEADERF); require(HEADERF);
$pc_db = new db; $pc_db = new db;
if (isset($_POST['GetOnWithIt'])) if (isset($_POST['GetOnWithIt']))
{ {
$doBackup = varset($_POST['doDBBackup'],0); $doBackup = varset($_POST['doDBBackup'],0);
$saltConvert = varset($_POST['convertToSalt'],0); $saltConvert = varset($_POST['convertToSalt'],0);
$emailGen = varset($_POST['EmailPasswords'],0); $emailGen = varset($_POST['EmailPasswords'],0);
if ($doBackup == 2) if ($doBackup == 2)
{ {
$saltConvert = 0; // Don't do conversions if restoring database $saltConvert = 0; // Don't do conversions if restoring database
$emailGen = 0; $emailGen = 0;
} }
$error = ''; $error = '';
if ($emailGen == 1) if ($emailGen == 1)
{ // Scan DB for salted passwords { // Scan DB for salted passwords
} }
//----------------------------------------- //-----------------------------------------
// Backup user DB (selected fields) // Backup user DB (selected fields)
//----------------------------------------- //-----------------------------------------
if (!$error && ($doBackup == 1)) if (!$error && ($doBackup == 1))
{ {
echo LAN_PCONV_13; echo LAN_PCONV_13;
if ($pc_db->db_Table_exists('user_backup')) if ($pc_db->db_Table_exists('user_backup'))
{ // Completely delete table - avoids problems with incorrect structure { // Completely delete table - avoids problems with incorrect structure
$pc_db->db_Select_gen('DROP TABLE `#user_backup` '); $pc_db->db_Select_gen('DROP TABLE `#user_backup` ');
} }
$qry = "CREATE TABLE `#user_backup` ( $qry = "CREATE TABLE `#user_backup` (
user_id int(10) unsigned NOT NULL, user_id int(10) unsigned NOT NULL,
user_name varchar(100) NOT NULL default '', user_name varchar(100) NOT NULL default '',
user_loginname varchar(100) NOT NULL default '', user_loginname varchar(100) NOT NULL default '',
user_password varchar(50) NOT NULL default '', user_password varchar(50) NOT NULL default '',
user_email varchar(100) NOT NULL default '', user_email varchar(100) NOT NULL default '',
user_prefs text NOT NULL, user_prefs text NOT NULL,
PRIMARY KEY (user_id), PRIMARY KEY (user_id),
UNIQUE KEY user_name (user_name) UNIQUE KEY user_name (user_name)
) TYPE=MyISAM;"; // If not exists, of course ) ENGINE=MyISAM;"; // If not exists, of course
if (!$pc_db->db_Select_gen($qry)) if (!$pc_db->db_Select_gen($qry))
{ {
$error = LAN_PCONV_20; $error = LAN_PCONV_20;
} }
if (!$error) if (!$error)
{ {
$qry = "INSERT INTO `#user_backup` SELECT user_id, user_name, user_loginname, user_password, user_email, user_prefs FROM `#user` "; $qry = "INSERT INTO `#user_backup` SELECT user_id, user_name, user_loginname, user_password, user_email, user_prefs FROM `#user` ";
if ($pc_db->db_Select_gen($qry) === FALSE) if ($pc_db->db_Select_gen($qry) === FALSE)
{ {
$error = LAN_PCONV_21; $error = LAN_PCONV_21;
} }
} }
if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />'; if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />';
} }
//-------------------------------------- //--------------------------------------
// Restore from backup // Restore from backup
//-------------------------------------- //--------------------------------------
if (!$error && ($doBackup == 2)) if (!$error && ($doBackup == 2))
{ {
echo LAN_PCONV_28; echo LAN_PCONV_28;
if (!$pc_db->db_Table_exists('user_backup')) if (!$pc_db->db_Table_exists('user_backup'))
{ {
$error = LAN_PCONV_28; $error = LAN_PCONV_28;
} }
if (!$error && $pc_db->db_Select('user_backup','*')) if (!$error && $pc_db->db_Select('user_backup','*'))
{ {
while ($row = $pc_db->db_Fetch(MYSQL_ASSOC)) while ($row = $pc_db->db_Fetch(MYSQL_ASSOC))
{ {
$uid = $row['user_id']; $uid = $row['user_id'];
unset($row['user_id']); unset($row['user_id']);
$sql->db_UpdateArray('user',$row," WHERE `user_id`={$uid}"); // Intentionally use $sql here $sql->db_UpdateArray('user',$row," WHERE `user_id`={$uid}"); // Intentionally use $sql here
if (USERID == $uid) if (USERID == $uid)
{ {
$cookieChange = $row['user_password']; $cookieChange = $row['user_password'];
} }
} }
} }
else else
{ {
$error = LAN_PCONV_30; $error = LAN_PCONV_30;
} }
if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />'; if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />';
} }
//-------------------------------------- //--------------------------------------
// Change passwords // Change passwords
//-------------------------------------- //--------------------------------------
if (!$error && $emailGen || $saltConvert) if (!$error && $emailGen || $saltConvert)
{ // Run through the DB doing conversions. { // Run through the DB doing conversions.
echo LAN_PCONV_17; echo LAN_PCONV_17;
if ($pc_db->db_Select('user', 'user_id, user_name, user_loginname, user_password, user_email, user_prefs', '') === FALSE) if ($pc_db->db_Select('user', 'user_id, user_name, user_loginname, user_password, user_email, user_prefs', '') === FALSE)
{ {
$error = LAN_PCONV_18; $error = LAN_PCONV_18;
} }
if (!$error) if (!$error)
{ {
while ($row = $pc_db->db_Fetch()) while ($row = $pc_db->db_Fetch())
{ // Do conversions { // Do conversions
$recordCount++; $recordCount++;
$newData = array(); $newData = array();
$newPrefs = ''; $newPrefs = '';
$user_prefs = unserialize($row['user_prefs']); $user_prefs = unserialize($row['user_prefs']);
if ($saltConvert) if ($saltConvert)
{ {
if ($user_info->canConvert($row['user_password'])) if ($user_info->canConvert($row['user_password']))
{ {
$newData['user_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_loginname']); $newData['user_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_loginname']);
$saltProcess++; $saltProcess++;
if (USERID == $row['user_id']) if (USERID == $row['user_id'])
{ {
$cookieChange = $newData['user_password']; $cookieChange = $newData['user_password'];
} }
} }
else else
{ {
$cantProcess++; $cantProcess++;
} }
} }
if (($emailGen == 1) && $user_info->canConvert($row['user_password'])) if (($emailGen == 1) && $user_info->canConvert($row['user_password']))
{ {
$user_prefs['email_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_email']); $user_prefs['email_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_email']);
$emailProcess++; $emailProcess++;
} }
elseif ($emailGen == 2) elseif ($emailGen == 2)
{ {
unset($user_prefs['email_password']); unset($user_prefs['email_password']);
$emailProcess++; $emailProcess++;
} }
if (count($user_prefs)) $newPrefs = serialize($user_prefs); else $newPrefs = ''; if (count($user_prefs)) $newPrefs = serialize($user_prefs); else $newPrefs = '';
if($newPrefs != $user_prefs) if($newPrefs != $user_prefs)
{ {
$newData['user_prefs'] = $newPrefs; $newData['user_prefs'] = $newPrefs;
} }
if (count($newData)) $sql->db_UpdateArray('user',$newData, " WHERE `user_id`={$row['user_id']}"); if (count($newData)) $sql->db_UpdateArray('user',$newData, " WHERE `user_id`={$row['user_id']}");
} }
} }
echo str_replace('--TOTAL--',$recordCount, LAN_PCONV_22).'<br />'; echo str_replace('--TOTAL--',$recordCount, LAN_PCONV_22).'<br />';
echo str_replace('--TOTAL--',$saltProcess, LAN_PCONV_24).'<br />'; echo str_replace('--TOTAL--',$saltProcess, LAN_PCONV_24).'<br />';
echo str_replace('--TOTAL--',$emailProcess, LAN_PCONV_23).'<br />'; echo str_replace('--TOTAL--',$emailProcess, LAN_PCONV_23).'<br />';
echo str_replace('--TOTAL--',$cantProcess, LAN_PCONV_25).'<br />'; echo str_replace('--TOTAL--',$cantProcess, LAN_PCONV_25).'<br />';
echo '<br />'; echo '<br />';
} }
if ($error) if ($error)
{ {
echo '<br />'.$error.'<br /><br />'; echo '<br />'.$error.'<br /><br />';
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
if ($cookieChange) if ($cookieChange)
{ {
// echo "Cookie Updated.<br /><br />"; // echo "Cookie Updated.<br /><br />";
$cookieval = USERID.".".md5($cookieChange); // Just changed admin password, and hence cookie $cookieval = USERID.".".md5($cookieChange); // Just changed admin password, and hence cookie
cookie($pref['cookie_name'], $cookieval); cookie($pref['cookie_name'], $cookieval);
} }
} }
$text = $text =
"<div style='text-align:center'> "<div style='text-align:center'>
<form method='post' action='".e_SELF."' onsubmit=\"return jsconfirm('".LAN_PCONV_12."')\"> <form method='post' action='".e_SELF."' onsubmit=\"return jsconfirm('".LAN_PCONV_12."')\">
<table style='width:95%' class='fborder'> <table style='width:95%' class='fborder'>
<colgroup> <colgroup>
<col style='width:60%' /> <col style='width:60%' />
<col style='width:40%' /> <col style='width:40%' />
</colgroup> </colgroup>
<tr> <tr>
<td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_01." <td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_01."
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_02."<br />".LAN_PCONV_03." <td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_02."<br />".LAN_PCONV_03."
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='forumheader3'>".LAN_PCONV_10."<br /><span class='smalltext'>".LAN_PCONV_19."</span></td> <td class='forumheader3'>".LAN_PCONV_10."<br /><span class='smalltext'>".LAN_PCONV_19."</span></td>
<td class='forumheader3'>".multi_radio('doDBBackup',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_26, '2' => LAN_PCONV_27),'')." <td class='forumheader3'>".multi_radio('doDBBackup',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_26, '2' => LAN_PCONV_27),'')."
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='forumheader3'>".LAN_PCONV_05."</td> <td class='forumheader3'>".LAN_PCONV_05."</td>
<td class='forumheader3'>".multi_radio('convertToSalt',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_11),'')." <td class='forumheader3'>".multi_radio('convertToSalt',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_11),'')."
</td> </td>
</tr> </tr>
<tr> <tr>
<td class='forumheader3'>".LAN_PCONV_06."</td> <td class='forumheader3'>".LAN_PCONV_06."</td>
<td class='forumheader3'>".multi_radio('EmailPasswords',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_07, '2' => LAN_PCONV_08),'')." <td class='forumheader3'>".multi_radio('EmailPasswords',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_07, '2' => LAN_PCONV_08),'')."
</td> </td>
</tr>"; </tr>";
$text .= " $text .= "
<tr> <tr>
<td class='forumheader3' colspan='3' style='text-align:center'> <td class='forumheader3' colspan='3' style='text-align:center'>
<input class='button' type='submit' name='GetOnWithIt' value='".LAN_PCONV_04."' /> <input class='button' type='submit' name='GetOnWithIt' value='".LAN_PCONV_04."' />
</td> </td>
</tr>"; </tr>";
$text .= " $text .= "
</table>\n </table>\n
</form> </form>
</div><br />"; </div><br />";
$ns->tablerender(LAN_PCONV_01, $text); $ns->tablerender(LAN_PCONV_01, $text);
require_once(FOOTERF); require_once(FOOTERF);
?> ?>

2
e107_plugins/content/plugin.php
View File

@@ -82,7 +82,7 @@ $eplug_tables = array(
content_meta text NOT NULL, content_meta text NOT NULL,
content_layout varchar(255) NOT NULL default '', content_layout varchar(255) NOT NULL default '',
PRIMARY KEY (content_id) PRIMARY KEY (content_id)
) TYPE=MyISAM;", ) ENGINE=MyISAM;",
"INSERT INTO ".MPREFIX."pcontent VALUES (1, 'content', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '1', '0', '', '')", "INSERT INTO ".MPREFIX."pcontent VALUES (1, 'content', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '1', '0', '', '')",
"INSERT INTO ".MPREFIX."pcontent VALUES (2, 'article', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '2', '0', '', '')", "INSERT INTO ".MPREFIX."pcontent VALUES (2, 'article', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '2', '0', '', '')",
"INSERT INTO ".MPREFIX."pcontent VALUES (3, 'review', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '3', '0', '', '')" "INSERT INTO ".MPREFIX."pcontent VALUES (3, 'review', '', '', '', '1', '', '', '', '0', '0', '0', '0', '', '".time()."', '0', '0', '', '3', '0', '', '')"

4
e107_plugins/pm/plugin.php
View File

@@ -66,7 +66,7 @@ $eplug_tables = array(
pm_option varchar(250) NOT NULL default '', pm_option varchar(250) NOT NULL default '',
pm_size int(10) unsigned NOT NULL default '0', pm_size int(10) unsigned NOT NULL default '0',
PRIMARY KEY (pm_id) PRIMARY KEY (pm_id)
) TYPE=MyISAM AUTO_INCREMENT=1 ;", ) ENGINE=MyISAM AUTO_INCREMENT=1 ;",
"CREATE TABLE ".MPREFIX."private_msg_block ( "CREATE TABLE ".MPREFIX."private_msg_block (
pm_block_id int(10) unsigned NOT NULL auto_increment, pm_block_id int(10) unsigned NOT NULL auto_increment,
pm_block_from int(10) unsigned NOT NULL default '0', pm_block_from int(10) unsigned NOT NULL default '0',
@@ -74,7 +74,7 @@ $eplug_tables = array(
pm_block_datestamp int(10) unsigned NOT NULL default '0', pm_block_datestamp int(10) unsigned NOT NULL default '0',
pm_block_count int(10) unsigned NOT NULL default '0', pm_block_count int(10) unsigned NOT NULL default '0',
PRIMARY KEY (pm_block_id) PRIMARY KEY (pm_block_id)
) TYPE=MyISAM AUTO_INCREMENT=1 ;" ) ENGINE=MyISAM AUTO_INCREMENT=1 ;"
); );
// Create a link in main menu (yes=TRUE, no=FALSE) ------------------------------------------------------------- // Create a link in main menu (yes=TRUE, no=FALSE) -------------------------------------------------------------