diff --git a/e107_media/index.html b/e107_media/index.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/e107_web/utilities/dbgen.php b/e107_web/utilities/dbgen.php
index c31678432..e6f0acdd9 100644
--- a/e107_web/utilities/dbgen.php
+++ b/e107_web/utilities/dbgen.php
@@ -1,206 +1,2 @@
get_table_def('',e_CORE.'sql/core_sql.php');
-$tableArray = array();
-
-foreach ($tableStruct as $t)
-{
- $tableArray[$t[1]] = array('src' => e_CORE.'sql/core_sql.php', 'desc' => 'core:'.$t[1]);
-}
-
-
-// Now do the plugins
-$sqlFiles = e107::getPref('e_sql_list');
-foreach ($sqlFiles as $p => $f)
-{
- $targ = e_PLUGIN.$p.'/'.$f.'.php';
- //echo $p.':'.$targ.'
';
- $tableStruct = $dbAdm->get_table_def('',$targ);
- foreach ($tableStruct as $t)
- {
- $tableArray[$t[1]] = array('src' => $targ, 'desc' => 'plug:'.$p.':'.$t[1]);
- }
-}
-unset($tableStruct);
-unset($sqlFiles);
-
-
-function genFileSelect($tableDefs, $name,$fl)
-{
- $ret = "\n";
- return $ret;
-}
-
-
-
-
-
-//$HEADER = '';
-//$FOOTER = '';
-require(HEADERF);
-
-
-$message = '';
-//========================================================
-// ACTION
-//========================================================
-if (isset($_POST['do_conversion']))
-{
- if (varset($_POST['selected_plugin'],FALSE))
- {
- $table = $_POST['selected_plugin'];
- if (!isset($tableArray[$table]))
- {
- $message = 'Bad table name specified';
- $table = '';
- }
- }
- else
- {
- $message = 'No table name specified';
- }
-}
-
-if ($table)
-{
- $baseStruct = $dbAdm->get_table_def($table,$tableArray[$table]['src']);
- $fieldDefs = $dbAdm->parse_field_defs($baseStruct[0][2]); // Required definitions
- $outDefs = array();
- foreach ($fieldDefs as $k => $v)
- {
- switch ($v['type'])
- {
- case 'field' :
- if (vartrue($v['autoinc']))
- {
- if (isset($outDefs['WHERE']))
- {
- }
- else
- {
- $outDefs['WHERE'] = "`{$v['name']}` = \$id";
- }
- break;
- }
- $baseType = preg_replace('#\(\d+?\)#', '', $v['fieldtype']); // Should strip any length
- switch ($baseType)
- {
- case 'int' :
- case 'shortint' :
- case 'tinyint' :
- $outDefs['_FIELD_TYPES'][$v['name']] = 'int';
- break;
- case 'char' :
- case 'text' :
- case 'varchar' :
- $outDefs['_FIELD_TYPES'][$v['name']] = 'todb';
- break;
- }
- if (isset($v['nulltype']) && !isset($v['default']))
- {
- $outDefs['_NOTNULL'][$v['name']] = '';
- }
- break;
- case 'pkey' :
- case 'ukey' :
- case 'key' :
- break; // Do nothing with keys for now
- default :
- echo "Unexpected field type: {$k} => {$v['type']}
";
- }
- }
- $toSave = e107::serialize($outDefs, FALSE); // 2nd parameter to TRUE if needs to be written to DB
-}
-
-//========================================================
-// FORM
-//========================================================
-$text =
- "
";
- $ns->tablerender('SQL Definition Parser', $text);
-
-require(FOOTERF);
-
-
-?>
+// Deprecated
\ No newline at end of file
diff --git a/e107_web/utilities/passcalc.php b/e107_web/utilities/passcalc.php
index a9b8271b3..35a78999a 100644
--- a/e107_web/utilities/passcalc.php
+++ b/e107_web/utilities/passcalc.php
@@ -1,126 +1,2 @@
-
-
";
- $ns->tablerender(LAN_PCALC_11, $text);
-
-require(FOOTERF);
-
-
-?>
+// Deprecated
diff --git a/e107_web/utilities/passconv.php b/e107_web/utilities/passconv.php
index 4d17eba96..e6f0acdd9 100644
--- a/e107_web/utilities/passconv.php
+++ b/e107_web/utilities/passconv.php
@@ -1,297 +1,2 @@
$t)
- {
- $sel = ($v == $currentval) ? " checked='checked'" : "";
- $ret .= $gap." ".$t."\n";
-// $gap = " ";
- $gap = "
";
- }
- return $ret;
- }
-
-
-$recordCount = 0;
-$emailProcess = 0;
-$saltProcess = 0;
-$cantProcess = 0;
-$cookieChange = '';
-
-require(HEADERF);
-$pc_db = new db;
-if (isset($_POST['GetOnWithIt']))
-{
- $doBackup = varset($_POST['doDBBackup'],0);
- $saltConvert = varset($_POST['convertToSalt'],0);
- $emailGen = varset($_POST['EmailPasswords'],0);
- if ($doBackup == 2)
- {
- $saltConvert = 0; // Don't do conversions if restoring database
- $emailGen = 0;
- }
-
- $error = '';
- if ($emailGen == 1)
- { // Scan DB for salted passwords
- }
-
-
-//-----------------------------------------
-// Backup user DB (selected fields)
-//-----------------------------------------
- if (!$error && ($doBackup == 1))
- {
- echo LAN_PCONV_13;
- if ($pc_db->db_Table_exists('user_backup'))
- { // Completely delete table - avoids problems with incorrect structure
- $pc_db->db_Select_gen('DROP TABLE `#user_backup` ');
- }
-
- $qry = "CREATE TABLE `#user_backup` (
- user_id int(10) unsigned NOT NULL,
- user_name varchar(100) NOT NULL default '',
- user_loginname varchar(100) NOT NULL default '',
- user_password varchar(50) NOT NULL default '',
- user_email varchar(100) NOT NULL default '',
- user_prefs text NOT NULL,
- PRIMARY KEY (user_id),
- UNIQUE KEY user_name (user_name)
-) ENGINE=MyISAM;"; // If not exists, of course
-
- if (!$pc_db->db_Select_gen($qry))
- {
- $error = LAN_PCONV_20;
- }
-
- if (!$error)
- {
- $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)
- {
- $error = LAN_PCONV_21;
- }
- }
- if (!$error) echo '...'.LAN_PCONV_14.'
';
- }
-
-
-
-//--------------------------------------
-// Restore from backup
-//--------------------------------------
- if (!$error && ($doBackup == 2))
- {
- echo LAN_PCONV_28;
- if (!$pc_db->db_Table_exists('user_backup'))
- {
- $error = LAN_PCONV_28;
- }
- if (!$error && $pc_db->db_Select('user_backup','*'))
- {
- while ($row = $pc_db->db_Fetch())
- {
- $uid = $row['user_id'];
- unset($row['user_id']);
- $sql->db_UpdateArray('user',$row," WHERE `user_id`={$uid}"); // Intentionally use $sql here
- if (USERID == $uid)
- {
- $cookieChange = $row['user_password'];
- }
- }
- }
- else
- {
- $error = LAN_PCONV_30;
- }
-
- if (!$error) echo '...'.LAN_PCONV_14.'
';
- }
-
-
-
-
-//--------------------------------------
-// Change passwords
-//--------------------------------------
- if (!$error && $emailGen || $saltConvert)
- { // Run through the DB doing conversions.
- echo LAN_PCONV_17;
- if ($pc_db->db_Select('user', 'user_id, user_name, user_loginname, user_password, user_email, user_prefs', '') === FALSE)
- {
- $error = LAN_PCONV_18;
- }
- if (!$error)
- {
- while ($row = $pc_db->db_Fetch())
- { // Do conversions
- $recordCount++;
- $newData = array();
- $newPrefs = '';
- $user_prefs = e107::getArrayStorage()->unserialize($row['user_prefs']);
- if(!$user_prefs && $row['user_prefs']) $user_prefs = unserialize($row['user_prefs']);
- if ($saltConvert)
- {
- if ($user_info->canConvert($row['user_password']))
- {
- $newData['user_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_loginname']);
- $saltProcess++;
- if (USERID == $row['user_id'])
- {
- $cookieChange = $newData['user_password'];
- }
- }
- else
- {
- $cantProcess++;
- }
- }
- if (($emailGen == 1) && $user_info->canConvert($row['user_password']))
- {
- $user_prefs['email_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_email']);
- $emailProcess++;
- }
- elseif ($emailGen == 2)
- {
- unset($user_prefs['email_password']);
- $emailProcess++;
- }
- if (count($user_prefs)) $newPrefs = e107::getArrayStorage()->serialize($user_prefs); else $newPrefs = '';
- if($newPrefs != $user_prefs)
- {
- $newData['user_prefs'] = $newPrefs;
- }
-
- if (count($newData)) $sql->db_UpdateArray('user',$newData, " WHERE `user_id`={$row['user_id']}");
- }
- }
- echo str_replace('--TOTAL--',$recordCount, LAN_PCONV_22).'
';
- echo str_replace('--TOTAL--',$saltProcess, LAN_PCONV_24).'
';
- echo str_replace('--TOTAL--',$emailProcess, LAN_PCONV_23).'
';
- echo str_replace('--TOTAL--',$cantProcess, LAN_PCONV_25).'
';
- echo '
';
- }
-
- if ($error)
- {
- echo '
'.$error.'
';
- require_once(FOOTERF);
- exit;
- }
-
-
- if ($cookieChange)
- {
-// echo "Cookie Updated.
";
- $cookieval = USERID.".".md5($cookieChange); // Just changed admin password, and hence cookie
- cookie($pref['cookie_name'], $cookieval);
- }
-}
-
-
-$text =
- "
";
- $ns->tablerender(LAN_PCONV_01, $text);
-
-require_once(FOOTERF);
-
-
-
-?>
+// Deprecated
\ No newline at end of file