1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00

Database Utilities administration ready;

Database Verification administration ready;
minor admin improvements
This commit is contained in:
secretr
2008-12-30 13:51:41 +00:00
parent d387caf6a1
commit 53cc80a9c0
12 changed files with 1208 additions and 744 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,71 +1,80 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * e107 website system
| e107 website system *
| * Copyright (C) 2001-2008 e107 Inc (e107.org)
| <20>Steve Dunstan 2001-2002 * Released under the terms and conditions of the
| http://e107.org * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| jalist@e107.org *
| * Administration - DB Verify
| Released under the terms and conditions of the *
| GNU General Public License (http://gnu.org). * $Source: /cvs_backup/e107_0.8/e107_admin/db_verify.php,v $
| * $Revision: 1.5 $
| $Source: /cvs_backup/e107_0.8/e107_admin/db_verify.php,v $ * $Date: 2008-12-30 13:51:41 $
| $Revision: 1.4 $ * $Author: secretr $
| $Date: 2007-11-24 15:42:35 $ *
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/ */
require_once("../class2.php"); require_once("../class2.php");
$e_sub_cat = 'database'; $e_sub_cat = 'database';
require_once("auth.php");
if(varset($_POST['db_tools_back']))
$filename = "sql/core_sql.php"; {
$fd = fopen ($filename, "r"); header("Location:".e_ADMIN_ABS."db.php");
$sql_data = @fread($fd, filesize($filename));
fclose ($fd);
if (!$sql_data) {
echo DBLAN_1."<br /><br />";
exit; exit;
} }
$tables["core"] = $sql_data; require_once("auth.php");
if (!getperms("0")) { require_once(e_HANDLER."form_handler.php");
header("location:".e_BASE."index.php"); $frm = new e_form();
require_once (e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
$sql_data = file_get_contents(e_ADMIN.'sql/core_sql.php');
if (!$sql_data)
{
exit(DBLAN_1);
}
$tables["core"] = $sql_data;
if (!getperms("0"))
{
header("Location:".SITEURL."index.php");
exit; exit;
} }
//Get any plugin _sql.php files //Get any plugin _sql.php files
foreach($pref['e_sql_list'] as $path => $file)
foreach($pref['e_sql_list'] as $path => $file) {
{
$filename = e_PLUGIN.$path."/".$file.".php"; $filename = e_PLUGIN.$path."/".$file.".php";
if(is_readable($filename)){ if(is_readable($filename))
$fd = fopen($filename, "r"); {
$sql_data = fread($fd, filesize($filename));
fclose ($fd);
$id = str_replace("_sql","",$file); $id = str_replace("_sql","",$file);
$tables[$id] = $sql_data; $tables[$id] = file_get_contents($filename);
}else{
echo $filename.DBLAN_22."<br />";
} }
else
{
$emessage->add($filename.DBLAN_22, E_MESSAGE_WARNING);
} }
}
function read_tables($tab) { function read_tables($tab)
global $tablines; {
global $table_list; global $tablines, $table_list, $tables, $pref;
global $tables,$sql,$pref;
$file = split("\n", $tables[$tab]); $file = split("\n", $tables[$tab]);
foreach($file as $line) { foreach($file as $line)
{
$line = ltrim(stripslashes($line)); $line = ltrim(stripslashes($line));
if (preg_match("/CREATE TABLE (.*) /", $line, $match)) { $match = array();
if($match[1] != "user_extended"){ if (preg_match('/CREATE TABLE (.*) /', $line, $match))
{
if($match[1] != "user_extended")
{
$table_list[$match[1]] = 1; $table_list[$match[1]] = 1;
$current_table = $match[1]; $current_table = $match[1];
$x = 0; $x = 0;
@@ -73,44 +82,47 @@ function read_tables($tab) {
} }
} }
if (strpos($line, "TYPE=") !== FALSE) { if (strpos($line, "TYPE=") !== FALSE)
{
$current_table = ""; $current_table = "";
} }
if ($current_table && $x) { if ($current_table && $x)
{
$tablines[$current_table][$cnt++] = $line; $tablines[$current_table][$cnt++] = $line;
} }
$x = 1; $x = 1;
} }
// Get multi-language tables as well // Get multi-language tables as well
if($pref['multilanguage']){ if($pref['multilanguage'])
{
$langs = table_list(); $langs = table_list();
foreach($table_list as $name=>$stuff){ foreach(array_keys($table_list) as $name)
if($langs[$name]){ {
if($langs[$name])
{
$ltab = $langs[$name]; $ltab = $langs[$name];
$table_list[$ltab] = 1; $table_list[$ltab] = 1;
$tablines[$ltab] = $tablines[$name]; $tablines[$ltab] = $tablines[$name];
} }
} }
} }
} }
// Get list of fields and keys for a table // Get list of fields and keys for a table
function get_current($tab, $prefix = "") function get_current($tab, $prefix = "")
{ {
if (!$prefix) if(! $prefix)
{ {
$prefix = MPREFIX; $prefix = MPREFIX;
} }
$result = mysql_query('SET SQL_QUOTE_SHOW_CREATE = 1'); mysql_query('SET SQL_QUOTE_SHOW_CREATE = 1');
$qry = 'SHOW CREATE TABLE `'.$prefix.$tab."`"; $qry = 'SHOW CREATE TABLE `' . $prefix . $tab . "`";
$z = mysql_query($qry); $z = mysql_query($qry);
if ($z) if($z)
{ {
$row = mysql_fetch_row($z); $row = mysql_fetch_row($z);
return str_replace("`", "", stripslashes($row[1])); return str_replace("`", "", stripslashes($row[1]));
@@ -123,30 +135,48 @@ function get_current($tab, $prefix = "")
function check_tables($what) function check_tables($what)
{ {
global $tablines; global $tablines, $table_list, $frm;
global $table_list;
global $ns; $cur = 0;
$cur=0;
$table_list = ""; $table_list = "";
read_tables($what); read_tables($what);
$fix_active = FALSE; // Flag set as soon as there's a fix - enables 'Fix it' button $fix_active = FALSE; // Flag set as soon as there's a fix - enables 'Fix it' button
$text = "<form method='post' action='".e_SELF."' id='checktab'> $text = "
<div style='text-align:center'> <form method='post' action='".e_SELF."'>
<table style='".ADMIN_WIDTH."' class='fborder'> <fieldset id='core-db-verify-{$what}'>
<tr> <legend>".DBLAN_16." - $what ".DBLAN_18."</legend>
<td class='fcaption' style='text-align:center'>".DBLAN_4."</td> ";
<td class='fcaption' style='text-align:center'>".DBLAN_5."</td>
<td class='fcaption' style='text-align:center'>".DBLAN_6."</td>
<td class='fcaption' style='text-align:center'>".DBLAN_7."</td>
</tr>";
foreach(array_keys($table_list) as $k) foreach(array_keys($table_list) as $k)
{ // $k is the DB table name (less prefix) { // $k is the DB table name (less prefix)
$text .= "
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='4'>
<col style='width: 25%'></col>
<col style='width: 25%'></col>
<col style='width: 10%'></col>
<col style='width: 30%'></col>
<col style='width: 10%'></col>
</colgroup>
<thead>
<tr>
<th>".DBLAN_4.": {$k}</th>
<th>".DBLAN_5."</th>
<th class='center'>".DBLAN_6."</th>
<th>".DBLAN_7."</th>
<th class='center last'>".DBLAN_19."</th>
</tr>
</thead>
<tbody>
";
$prefix = MPREFIX; $prefix = MPREFIX;
$current_tab = get_current($k, $prefix); // Get list of fields and keys from actual table $current_tab = get_current($k, $prefix); // Get list of fields and keys from actual table
unset($fields); unset($fields);
unset($xfields); unset($xfields);
if ($current_tab) if ($current_tab)
{ {
$lines = split("\n", $current_tab); // Create one element of $lines per field or other line of info $lines = split("\n", $current_tab); // Create one element of $lines per field or other line of info
@@ -157,7 +187,13 @@ function check_tables($what)
$fieldnum++; $fieldnum++;
$ffound = 0; $ffound = 0;
list($fname, $fparams) = split(" ", $x, 2); list($fname, $fparams) = split(" ", $x, 2);
if ($fname == "KEY") if ($fname == "UNIQUE")
{
list($key, $key1, $keyname, $keyparms) = split(" ", $x, 4);
$fname = $key." ".$key1." ".$keyname;
$fparams = $keyparms;
}
elseif ($fname == "KEY")
{ {
list($key, $keyname, $keyparms) = split(" ", $x, 3); list($key, $keyname, $keyparms) = split(" ", $x, 3);
$fname = $key." ".$keyname; $fname = $key." ".$keyname;
@@ -167,48 +203,61 @@ function check_tables($what)
$fparams = ltrim(rtrim($fparams)); $fparams = ltrim(rtrim($fparams));
$fparams = preg_replace("/\r?\n$|\r[^\n]$|,$/", "", $fparams); $fparams = preg_replace("/\r?\n$|\r[^\n]$|,$/", "", $fparams);
if(stristr($k, "lan_") !== FALSE && $cur != 1) if(stristr($k, "lan_") !== FALSE && $cur != 1)
{ {
$text .= "<tr><td colspan='6' class='fcaption'>".ADLAN_132."</td></tr>";
$cur = 1; $cur = 1;
}; }
$text .= "
<tr>
<td>{$k}</td>
<td>{$fname}
";
$text .= "<tr><td class='forumheader3'>$k</td><td class='forumheader3'>$fname";
if (strpos($fparams, "KEY") !== FALSE) if (strpos($fparams, "KEY") !== FALSE)
{ {
$text .= " $fparams"; $text .= " $fparams";
} }
$text .= "</td>";
$s = 0; $text .= "
</td>
";
//$s = 0; - never used
$xfieldnum = -1; $xfieldnum = -1;
foreach($lines as $l) foreach($lines as $l)
{ {
$xfieldnum++; $xfieldnum++;
list($xl, $tmp) = split("\n", $l, 2); // $tmp should be null list($xl, $tmp) = split("\n", $l, 2); // $tmp should be null
$xl = ltrim(rtrim(stripslashes($xl))); $xl = ltrim(rtrim(stripslashes($xl)));
$xl = preg_replace("/\r?\n$|\r[^\n]$/", "", $xl); $xl = preg_replace("/\r?\n$|\r[^\n]$/", "", $xl);
$xl = str_replace(' ',' ',$xl); // Remove double spaces $xl = str_replace(' ',' ',$xl); // Remove double spaces
list($xfname, $xfparams) = split(" ", $xl, 2); // Field name and the rest list($xfname, $xfparams) = split(" ", $xl, 2); // Field name and the rest
if ($xfname == "UNIQUE")
if ($xfname == "KEY") {
list($key, $key1, $keyname, $keyparms) = split(" ", $xl, 4);
$xfname = $key." ".$key1." ".$keyname;
$xfparams = $keyparms;
}
elseif ($xfname == "KEY")
{ {
list($key, $keyname, $keyparms) = split(" ", $xl, 3); list($key, $keyname, $keyparms) = split(" ", $xl, 3);
$xfname = $key." ".$keyname; $xfname = $key." ".$keyname;
$xfparams = $keyparms; $xfparams = $keyparms;
} }
if ($xfname != "CREATE" && $xfname != ")") if ($xfname != "CREATE" && $xfname != ")")
{ {
$xfields[$xfname] = 1; $xfields[$xfname] = 1;
} }
$xfparams = preg_replace("/,$/", "", $xfparams); $xfparams = preg_replace('/,$/', '', $xfparams);
$fparams = preg_replace("/,$/", "", $fparams); $fparams = preg_replace('/,$/', '', $fparams);
if ($xfname == $fname) if ($xfname == $fname)
{ // Field names match - or it could be the word 'KEY' and its name which matches { // Field names match - or it could be the word 'KEY' and its name which matches
$ffound = 1; $ffound = 1;
// echo "Field: ".$xfname." Actuals: ".$xfparams." Expected: ".$fparams."<br />"; //echo "Field: ".$xfname." Actuals: ".$xfparams." Expected: ".$fparams."<br />";
$xfsplit = explode(' ',$xfparams); $xfsplit = explode(' ',$xfparams);
$fsplit = explode(' ',$fparams); $fsplit = explode(' ',$fparams);
$skip = FALSE; $skip = FALSE;
@@ -219,23 +268,23 @@ function check_tables($what)
if ($skip) if ($skip)
{ {
$skip = FALSE; $skip = FALSE;
// echo " Unskip: ".$xf."<br />"; // echo " Unskip: ".$xf."<br />";
} }
elseif (strcasecmp(trim($xf),'collate') == 0) elseif (strcasecmp(trim($xf),'collate') == 0)
{ // Strip out the collation definition { // Strip out the collation definition
$skip = TRUE; $skip = TRUE;
// echo "Skip = ".$xf; // cho "Skip = ".$xf;
} }
else else
{ {
// echo "Compare: ".$xf." - ".$fsplit[$i]."<br />"; // echo "Compare: ".$xf." - ".$fsplit[$i]."<br />";
// Since VARCHAR and CHAR are interchangeable, convert to CHAR (strictly, VARCHAR(3) and smalller becomes CHAR() ) // Since VARCHAR and CHAR are interchangeable, convert to CHAR (strictly, VARCHAR(3) and smalller becomes CHAR() )
if (stripos($xf,'VARCHAR') === 0) $xf = substr($xf,3); if (stripos($xf,'VARCHAR') === 0) $xf = substr($xf,3);
if (stripos($fsplit[$i],'VARCHAR') === 0) $fsplit[$i] = substr($fsplit[$i],3); if (stripos($fsplit[$i],'VARCHAR') === 0) $fsplit[$i] = substr($fsplit[$i],3);
if (strcasecmp(trim($xf),trim($fsplit[$i])) != 0) if (strcasecmp(trim($xf),trim($fsplit[$i])) != 0)
{ {
$fld_err = TRUE; $fld_err = TRUE;
// echo "Mismatch: ".$xf." - ".$fsplit[$i]."<br />"; //echo "Mismatch: ".$xf." - ".$fsplit[$i]."<br />";
} }
$i++; $i++;
} }
@@ -243,61 +292,129 @@ function check_tables($what)
if ($fld_err) if ($fld_err)
{ {
$text .= "<td class='forumheader' style='text-align:center'>".DBLAN_8."</td>"; $text .= "
$text .= "<td class='forumheader3' style='text-align:center'>".DBLAN_9."<div class='indent'>".$xfparams."</div><b>".DBLAN_10."</b><div class='indent'>".$fparams." <br />".fix_form($k,$fname,$fparams,"alter")."</div></td>"; <td class='center middle error'>".DBLAN_8."</td>
<td>
<strong>".DBLAN_9."</strong>
<div class='indent'>{$xfparams}</div>
<strong>".DBLAN_10."</strong>
<div class='indent'>{$fparams}</div>
</td>
<td class='center middle autocheck e-pointer'>".fix_form($k, $fname, $fparams, "alter")."</td>
";
$fix_active = TRUE; $fix_active = TRUE;
} }
elseif ($fieldnum != $xfieldnum) elseif ($fieldnum != $xfieldnum)
{ // Field numbers different - missing field? { // Field numbers different - missing field?
$text .= "<td class='fcaption' style='text-align:center'>".DBLAN_5." ".DBLAN_8."</td> $text .= "
<td class='forumheader3' style='text-align:center'>".DBLAN_9." #{$xfieldnum}<br />".DBLAN_10." #{$fieldnum}</td>"; <td class='center middle error'>".DBLAN_5." ".DBLAN_8."</td>
<td>
<strong>".DBLAN_9.": </strong>#{$xfieldnum}
<br />
<strong>".DBLAN_10.": </strong>#{$fieldnum}
</td>
<td class='center middle'>&nbsp;</td>
";
} }
else else
{ {
$text .= "<td class='forumheader3' style='text-align:center;'>OK</td> $text .= "
<td class='forumheader3' style='text-align:center'>&nbsp;</td>"; <td class='center'>OK</td>
<td>&nbsp;</td>
<td class='center middle'>&nbsp;</td>
";
/**/
} }
} }
} // Finished checking one field } // Finished checking one field
if ($ffound == 0) if ($ffound == 0)
{ {
$text .= "<td class='forumheader' style='text-align:center'><strong><em>".DBLAN_11."</em></strong></td> $prev_fname = $fname;
<td class='forumheader3' style='text-align:center'><b>".DBLAN_10." [$fparams]</b><br />".fix_form($k,$fname,$fparams,"insert",$prev_fname)."<br /></td>"; $text .= "
<td class='center middle error'>".DBLAN_11."</td>
<td>
<strong>".DBLAN_10."</strong>
<div class='indent'>{$fparams}</div>
</td>
<td class='center middle autocheck e-pointer'>".fix_form($k, $fname, $fparams, "insert", $prev_fname)."</td>
";
$fix_active = TRUE; $fix_active = TRUE;
} }
$prev_fname = $fname;
$text .= "</tr>\n"; $text .= "
</tr>
";
} }
foreach(array_keys($xfields) as $tf) foreach(array_keys($xfields) as $tf)
{ {
if (!$fields[$tf] && $k != "user_extended") if (!$fields[$tf] && $k != "user_extended")
{ {
$fix_active = TRUE; $fix_active = TRUE;
$text .= "<tr><td class='forumheader3' style='text-align:center'>$k</td><td class='forumheader3' style='text-align:center'>$tf</td><td class='forumheader3' style='text-align:center'><strong><em>".DBLAN_12."</em></strong></td><td class='forumheader3' style='text-align:center'>&nbsp;".fix_form($k,$tf,$fparams,"drop")."</td></tr>"; $text .= "
<tr>
<td>$k</td>
<td>$tf</td>
<td class='center middle'>".DBLAN_12."</td>
<td>&nbsp;</td>
<td class='center middle autocheck e-pointer'>".fix_form($k, $tf, $fparams, "drop")."</td>
</tr>
";
} }
} }
} }
else else
{ // Table Missing. { // Table Missing.
$text .= "<tr><td class='forumheader3' style='text-align:center'>$k</td><td class='forumheader3' style='text-align:center'>&nbsp;</td><td class='forumheader' style='text-align:center'>".DBLAN_13."<br /><td class='forumheader3' style='text-align:center'>&nbsp;".fix_form($k,$tf,$tablines[$k],"create")."</td></tr>"; $text .= "
<tr>
<td>{$k}</td>
<td>&nbsp;</td>
<td class='center middle error'>".DBLAN_13."</td>
<td>&nbsp;</td>
<td class='center middle autocheck e-pointer'>".fix_form($k, $tf, $tablines[$k], "create") . "</td>
</tr>
";
$fix_active = TRUE; $fix_active = TRUE;
} }
$text .= "
</tbody>
</table>
<br/>
";
} }
$text .= "</table></div>";
if($fix_active){ if($fix_active)
$text .= "<div style='".ADMIN_WIDTH.";text-align:right'> {
<input class='button' type='submit' name='do_fix' value='".DBLAN_21."' /></div>\n"; $text .= "
<div class='buttons-bar right'>
".$frm->admin_button('do_fix', DBLAN_21, 'execute', '', array('id'=>false))."
".$frm->admin_button('check_all', 'jstarget:fix_active', 'action', LAN_CHECKALL, array('id'=>false))."
".$frm->admin_button('uncheck_all', 'jstarget:fix_active', 'action', LAN_UNCHECKALL, array('id'=>false))."
</div>
";
} }
foreach(array_keys($_POST) as $j) { foreach(array_keys($_POST) as $j) {
if (preg_match("/table_(.*)/", $j, $mitch)) { $match = array();
$lx = $mitch[1]; if (preg_match('/table_(.*)/', $j, $match))
$text .= "<input type='hidden' name='table_{$lx}' value='1' />\n"; {
$lx = $match[1];
$text .= "<div><input type='hidden' name='table_{$lx}' value='1' /></div>\n";
} }
} }
$text .= "</form>";
$text .= "
</fieldset>
<div class='buttons-bar center'>
".$frm->admin_button('back', DBLAN_17, 'back')."
</div>
</form>
";
return $text; return $text;
} }
@@ -306,16 +423,21 @@ global $table_list;
// -------------------- Table Fixing ------------------------------ // -------------------- Table Fixing ------------------------------
if(isset($_POST['do_fix'])){ if(isset($_POST['do_fix']))
$text = "<div><table class='fborder' style='".ADMIN_WIDTH."'>"; {
foreach( $_POST['fix_active'] as $key=>$val){ //$emessage->add(DBLAN_20);
foreach( $_POST['fix_active'] as $key=>$val)
{
if (MAGIC_QUOTES_GPC == TRUE) { if (MAGIC_QUOTES_GPC == TRUE)
{
$table = stripslashes($_POST['fix_table'][$key][0]); $table = stripslashes($_POST['fix_table'][$key][0]);
$newval = stripslashes($_POST['fix_newval'][$key][0]); $newval = stripslashes($_POST['fix_newval'][$key][0]);
$mode = stripslashes($_POST['fix_mode'][$key][0]); $mode = stripslashes($_POST['fix_mode'][$key][0]);
$after = stripslashes($_POST['fix_after'][$key][0]); $after = stripslashes($_POST['fix_after'][$key][0]);
} else { }
else
{
$table = $_POST['fix_table'][$key][0]; $table = $_POST['fix_table'][$key][0];
$newval = $_POST['fix_newval'][$key][0]; $newval = $_POST['fix_newval'][$key][0];
$mode = $_POST['fix_mode'][$key][0]; $mode = $_POST['fix_mode'][$key][0];
@@ -325,94 +447,127 @@ if(isset($_POST['do_fix'])){
$field= $key; $field= $key;
if($mode == "alter"){ if($mode == "alter")
{
$query = "ALTER TABLE `".MPREFIX.$table."` CHANGE `$field` `$field` $newval"; $query = "ALTER TABLE `".MPREFIX.$table."` CHANGE `$field` `$field` $newval";
} }
if($mode == "insert"){ if($mode == "insert")
{
$query = "ALTER TABLE `".MPREFIX.$table."` ADD `$field` $newval AFTER $after"; $query = "ALTER TABLE `".MPREFIX.$table."` ADD `$field` $newval AFTER $after";
} }
if($mode == "drop"){ if($mode == "drop")
{
$query = "ALTER TABLE `".MPREFIX.$table."` DROP `$field` "; $query = "ALTER TABLE `".MPREFIX.$table."` DROP `$field` ";
} }
if($mode == "index"){ if($mode == "index")
{
$query = "ALTER TABLE `".MPREFIX.$table."` ADD INDEX `$field` (`$newval`)"; $query = "ALTER TABLE `".MPREFIX.$table."` ADD INDEX `$field` (`$newval`)";
} }
if($mode == "indexdrop"){ if($mode == "indexdrop")
{
$query = "ALTER TABLE `".MPREFIX.$table."` DROP INDEX `$field`"; $query = "ALTER TABLE `".MPREFIX.$table."` DROP INDEX `$field`";
} }
if($mode == "create"){ if($mode == "create")
{
$query = "CREATE TABLE ".MPREFIX.$table." ($newval) TYPE=MyISAM;"; $query = "CREATE TABLE ".MPREFIX.$table." ($newval) TYPE=MyISAM;";
} }
if(mysql_query($query)) $emessage->add(LAN_UPDATED.' ['.$query.']', E_MESSAGE_SUCCESS);
$text .= "<tr><td class='forumheader3' style='vertical-align:top;width:70%'>".$query."</td><td class='forumheader3' style='vertical-align:top;width:30%'>"; else $emessage->add(LAN_UPDATED_FAILED.' ['.$query.']', E_MESSAGE_WARNING);
$text .= (mysql_query($query)) ? " - <b>".LAN_UPDATED."</b>" : " - <b>".LAN_UPDATED_FAILED."</b>";
$text .= "</td></tr>";
} }
$text .= "</table></div>";
$text .="<div style='text-align:center'><br />
<form method='post' action='db.php'>
<input class='button' type='submit' name='back' value='".DBLAN_17."' />
</form>
</div>";
$ns -> tablerender(DBLAN_20, $text);
} }
// ---------------------- Main Form and Submit. ------------------------ // ---------------------- Main Form and Submit. ------------------------
if (!$_POST['db_verify'] && !$_POST['do_fix']) { if (varset($_POST['db_verify']) || varset($_POST['do_fix']))
$text = " {
<form method='post' action='".e_SELF."'> $text = '';
<table border=0 align='center'> foreach(array_keys($_POST) as $k)
<tr><td>".DBLAN_14."<br /><br />"; {
foreach(array_keys($tables) as $x) { $match = array();
$text .= "<input type='checkbox' name='table_".$x."' />".$x."<br />"; if (preg_match("/table_(.*)/", $k, $match))
} {
$text .= "
<br /><input class='button' name='db_verify' type='submit' value='".DBLAN_15."' />
</td></tr></table></form>";
$ns->tablerender(DBLAN_16, $text);
} else {
foreach(array_keys($_POST) as $k) {
if (preg_match("/table_(.*)/", $k, $match)) {
$xx = $match[1]; $xx = $match[1];
$str = "<br /> $text .= check_tables($xx);
<div style='text-align:center'>
<form method='post' action='db.php'>
<input class='button' type='submit' name='back' value='".DBLAN_17."' />
</form>
</div>";
$ns->tablerender(DBLAN_16." - $xx ".DBLAN_18, check_tables($xx).$str);
} }
} }
if(!$text) $emessage->add(DBLAN_24, E_MESSAGE_WARNING);
else
{
$e107->ns->tablerender(DBLAN_23.' - '.DBLAN_16, $emessage->render().$text);
require_once(e_ADMIN."footer.php");
exit;
}
} }
$text = "
<form method='post' action='".e_SELF."' id='core-db-verify-sql-tables-form'>
<fieldset id='core-db-verify-sql-tables'>
<legend>".DBLAN_14."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='1'>
<col style='width: 100%'></col>
</colgroup>
<thead>
<tr>
<th class='last'>".$frm->checkbox_toggle('check-all-verify', 'table_').LAN_CHECKALL.' | '.LAN_UNCHECKALL."</th>
</tr>
</thead>
<tbody>
";
foreach(array_keys($tables) as $x) {
$text .= "
<tr>
<td>
".$frm->checkbox('table_'.$x, $x).$frm->label($x, 'table_'.$x, $x)."
</td>
</tr>
";
}
$text .= "
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('db_verify', DBLAN_15)."
".$frm->admin_button('db_tools_back', DBLAN_17, 'back')."
</div>
</fieldset>
</form>
";
$e107->ns->tablerender(DBLAN_23.' - '.DBLAN_16, $emessage->render().$text);
require_once(e_ADMIN."footer.php");
exit;
// -------------------------------------------------------------- // --------------------------------------------------------------
function fix_form($table,$field, $newvalue,$mode,$after =''){ function fix_form($table,$field, $newvalue,$mode,$after =''){
global $frm;
if(stristr($field, "KEY ") !== FALSE){ if(stristr($field, "KEY ") !== FALSE)
{
$field = chop(str_replace("KEY ","",$field)); $field = chop(str_replace("KEY ","",$field));
$mode = ($mode == "drop") ? "indexdrop" : "index"; $mode = ($mode == "drop") ? "indexdrop" : "index";
$search = array("(",")"); $search = array("(",")");
$newvalue = str_replace($search,"",$newvalue); $newvalue = str_replace($search,"",$newvalue);
} }
if($mode == "create"){ if($mode == "create")
{
$newvalue = implode("\n",$newvalue); $newvalue = implode("\n",$newvalue);
} }
$text .= "<input type='checkbox' name=\"fix_active[$field][]\" value='1' /> ".DBLAN_19."\n"; // 'attempt to fix' $field = trim($field, '`');
$text .= $frm->checkbox("fix_active[$field][]", 1, false, array('id'=>false));
$text .= "<input type='hidden' name=\"fix_newval[$field][]\" value=\"$newvalue\" />\n"; $text .= "<input type='hidden' name=\"fix_newval[$field][]\" value=\"$newvalue\" />\n";
$text .= "<input type='hidden' name=\"fix_table[$field][]\" value=\"$table\" />\n"; $text .= "<input type='hidden' name=\"fix_table[$field][]\" value=\"$table\" />\n";
$text .= "<input type='hidden' name=\"fix_mode[$field][]\" value=\"$mode\" />\n"; $text .= "<input type='hidden' name=\"fix_mode[$field][]\" value=\"$mode\" />\n";
@@ -421,7 +576,8 @@ function fix_form($table,$field, $newvalue,$mode,$after =''){
return $text; return $text;
} }
function table_list() { function table_list()
{
// grab default language lists. // grab default language lists.
global $mySQLdefaultdb; global $mySQLdefaultdb;
@@ -439,17 +595,18 @@ function table_list() {
$exclude[] = "pm_messages"; $exclude[] = "pm_messages";
$exclude[] = "pm_blocks"; $exclude[] = "pm_blocks";
// print_r($search);
$tables = mysql_list_tables($mySQLdefaultdb); $tables = mysql_list_tables($mySQLdefaultdb);
while (list($temp) = mysql_fetch_array($tables)){ while (list($temp) = mysql_fetch_array($tables))
{
$prefix = MPREFIX."lan_"; $prefix = MPREFIX."lan_";
$match = array();
if(preg_match("/^".$prefix."(.*)/", $temp, $match)){ if(preg_match('/^'.$prefix.'(.*)/', $temp, $match))
{
$e107tab = str_replace(MPREFIX, "", $temp); $e107tab = str_replace(MPREFIX, "", $temp);
$pos = strrpos($match[1],"_")+1; $pos = strrpos($match[1],"_")+1;
$core = substr(str_replace("lan_","",$e107tab),$pos); $core = substr(str_replace("lan_","",$e107tab),$pos);
if (str_replace($exclude, "", $e107tab)){ if (str_replace($exclude, "", $e107tab))
{
$tabs[$core] = $e107tab; $tabs[$core] = $e107tab;
} }
} }
@@ -458,8 +615,29 @@ function table_list() {
return $tabs; return $tabs;
} }
/**
* Handle page DOM within the page header
*
* @return string JS source
*/
function headerjs()
{
require_once (e_HANDLER.'js_helper.php');
$ret = "
<script type='text/javascript'>
if(typeof e107Admin == 'undefined') var e107Admin = {}
/**
* OnLoad Init Control
*/
e107Admin.initRules = {
'Helper': true,
'AdminMenu': false
}
</script>
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
";
return $ret;
require_once(e_ADMIN."footer.php"); }
?> ?>

View File

@@ -9,8 +9,8 @@
* Manage/View failed login attempts * Manage/View failed login attempts
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $
* $Revision: 1.6 $ * $Revision: 1.7 $
* $Date: 2008-12-23 16:25:06 $ * $Date: 2008-12-30 13:51:41 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -166,7 +166,7 @@ else
</th> </th>
<th class='center last'> <th class='center last'>
".LAN_BAN."<br/> ".LAN_BAN."<br/>
".$frm->checkbox('check_all_ban', 'jstarget:flaban', false, array('id'=>false,'class'=>'checkbox toggle-all'))." ".$frm->checkbox_toggle('check-all-ban', 'flaban')."
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -225,8 +225,6 @@ function headerjs()
require_once(e_HANDLER.'js_helper.php'); require_once(e_HANDLER.'js_helper.php');
$ret = " $ret = "
<script type='text/javascript'> <script type='text/javascript'>
//add required core lan - delete confirm message
(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
if(typeof e107Admin == 'undefined') var e107Admin = {} if(typeof e107Admin == 'undefined') var e107Admin = {}
/** /**

View File

@@ -8,8 +8,8 @@
* e107 Admin Helper * e107 Admin Helper
* *
* $Source: /cvs_backup/e107_0.8/e107_files/jslib/core/admin.js,v $ * $Source: /cvs_backup/e107_0.8/e107_files/jslib/core/admin.js,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* $Date: 2008-12-29 15:23:06 $ * $Date: 2008-12-30 13:51:41 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -111,10 +111,12 @@ e107Admin.Helper = {
* by default or any value set by checkbox value (special command 'jstarget:start_with_selector') * by default or any value set by checkbox value (special command 'jstarget:start_with_selector')
* This method is auto-attached (if init() method is executed) to every checkbox having class toggle-all * This method is auto-attached (if init() method is executed) to every checkbox having class toggle-all
* *
* Example of valid button being auto-observed: * Example of valid checkbox being auto-observed:
* <input type='checkbox' class='toggle-all' name='not_important' value='multitoggle'> * <input type='checkbox' class='toggle-all' name='not_important' value='jstarget:your_selector'>
* *
* Demo: e107_admin/fla.php * Demo: e107_admin/fla.php, e107_admin/db_verify.php
* Note: You could use e_form::checkbox_toggle() method (e107_handlers/form_handler.php),
* which produces multi-toggle checkbox observer in very convenient way
* *
*/ */
allToggleChecked: function(event) { allToggleChecked: function(event) {

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
| $Revision: 1.46 $ | $Revision: 1.47 $
| $Date: 2008-12-28 22:37:43 $ | $Date: 2008-12-30 13:51:41 $
| $Author: e107steved $ | $Author: secretr $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -596,7 +596,7 @@ class e_parse
function textclean ($text, $wrap=100) function textclean ($text, $wrap=100)
{ {
$text = str_replace ("\n\n\n", "\n\n", $text); $text = str_replace ("\n\n\n", "\n\n", $text);
$text = $this -> htmlwrap($text, $wrap); $text = $this->htmlwrap($text, $wrap);
$text = str_replace (array ("<br /> ", " <br />", " <br /> "), "<br />", $text); $text = str_replace (array ("<br /> ", " <br />", " <br /> "), "<br />", $text);
/* we can remove any linebreaks added by htmlwrap function as any \n's will be converted later anyway */ /* we can remove any linebreaks added by htmlwrap function as any \n's will be converted later anyway */
return $text; return $text;

View File

@@ -9,8 +9,8 @@
* Form Handler * Form Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* $Date: 2008-12-23 08:28:42 $ * $Date: 2008-12-30 13:51:41 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -108,6 +108,12 @@ class e_form
} }
function checkbox_toggle($name, $selector = 'multitoggle')
{
$selector = 'jstarget:'.$selector;
return $this->checkbox($name, $selector, false, array('id'=>false,'class'=>'checkbox toggle-all'));
}
function radio($name, $value, $checked = false, $options = array()) function radio($name, $value, $checked = false, $options = array())
{ {
$options['checked'] = $checked; //comes as separate argument just for convenience $options['checked'] = $checked; //comes as separate argument just for convenience

View File

@@ -9,8 +9,8 @@
* Message Handler * Message Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* $Date: 2008-12-23 16:25:06 $ * $Date: 2008-12-30 13:51:41 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -317,7 +317,8 @@ class eMessage
E_MESSAGE_ERROR => array(), E_MESSAGE_ERROR => array(),
E_MESSAGE_WARNING => array(), E_MESSAGE_WARNING => array(),
E_MESSAGE_SUCCESS => array(), E_MESSAGE_SUCCESS => array(),
E_MESSAGE_INFO => array() E_MESSAGE_INFO => array(),
E_MESSAGE_DEBUG => array()
); );
} }

View File

@@ -1,13 +1,10 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
| e107 website system - Language File. * $Id: lan_cpage.php,v 1.5 2008-12-30 13:51:41 secretr Exp $
| *
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_cpage.php,v $ * Admin Language File
| $Revision: 1.4 $ *
| $Date: 2008-12-29 15:23:06 $
| $Author: secretr $
+----------------------------------------------------------------------------+
*/ */
define("CUSLAN_1", "Title"); define("CUSLAN_1", "Title");
define("CUSLAN_2", "Type"); define("CUSLAN_2", "Type");

View File

@@ -1,50 +1,47 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
| e107 website system - Language File. * $Id: lan_db.php,v 1.4 2008-12-30 13:51:41 secretr Exp $
| *
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_db.php,v $ * Admin Language File
| $Revision: 1.3 $ *
| $Date: 2007-03-15 15:55:08 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/ */
define("DBLAN_1", "Core settings backed up in database."); define("DBLAN_1", "Core settings backed up in database.");
define("DBLAN_2", "Click button to save a backup of your e107 database"); define("DBLAN_2", "Select to save a backup of your e107 database");
define("DBLAN_3", "Backup SQL database"); define("DBLAN_3", "Backup SQL database");
define("DBLAN_4", "Click button to check validity of e107 database"); define("DBLAN_4", "Select to check validity of e107 database");
define("DBLAN_5", "Check database validity"); define("DBLAN_5", "Check database validity");
define("DBLAN_6", "Click button to optimize your e107 database"); define("DBLAN_6", "Select to optimize your e107 database");
define("DBLAN_7", "Optimize SQL database"); define("DBLAN_7", "Optimize SQL database");
define("DBLAN_8", "Click button to backup your core settings"); define("DBLAN_8", "Select to backup your core settings");
define("DBLAN_9", "Backup core"); define("DBLAN_9", "Backup core");
define("DBLAN_10", "Database Utilities"); define("DBLAN_10", "Database Utilities");
define("DBLAN_11", "MySQL database"); define("DBLAN_11", "MySQL database");
define("DBLAN_12", "optimized"); define("DBLAN_12", "optimized");
define("DBLAN_13", "Back"); define("DBLAN_13", "Back");
define("DBLAN_14", "Done"); define("DBLAN_14", "Done");
define("DBLAN_15", "Click button to check for any available db updates"); define("DBLAN_15", "Select to check for any available db updates");
define("DBLAN_16", "Check for Updates"); define("DBLAN_16", "Check for Updates");
define("DBLAN_17", "Pref. Name"); define("DBLAN_17", "Pref. Name");
define("DBLAN_18", "Pref. Value"); define("DBLAN_18", "Pref. Value");
define("DBLAN_19", "Click button to open the preferences editor (for advanced users only)"); define("DBLAN_19", "Select to open the preferences editor (for advanced users only)");
define("DBLAN_20", "Preferences Editor"); define("DBLAN_20", "Preferences Editor");
define("DBLAN_21", "Delete Checked"); define("DBLAN_21", "Delete Checked");
define("DBLAN_22", "Plugin: View and Scan"); define("DBLAN_22", "Plugin View and Scan");
define("DBLAN_23", "Scan Completed"); define("DBLAN_23", "Scan Completed");
define("DBLAN_24", "Name"); define("DBLAN_24", "Name");
define("DBLAN_25", "Directory"); define("DBLAN_25", "Directory");
define("DBLAN_26", "Included add-ons"); define("DBLAN_26", "Included add-ons");
define("DBLAN_27", "Installed"); define("DBLAN_27", "Installed");
define("DBLAN_28", "Click button to scan plugin directories for changes"); define("DBLAN_28", "Select to scan plugin directories for changes");
define("DBLAN_29", "Scan plugin directories"); define("DBLAN_29", "Scan plugin directories");
define("DBLAN_30", " (If an addon shows an error, check for characters outside the PHP opening/closing tags)"); define("DBLAN_30", "If an addon shows an error, check for characters outside the PHP opening/closing tags.");
define("DBLAN_31", "Pass"); define("DBLAN_31", "Pass");
define("DBLAN_32", "Error"); define("DBLAN_32", "Error");
define("DBLAN_33", "Inaccessible"); define("DBLAN_33", "Inaccessible");
define("DBLAN_34", "Not checked"); define("DBLAN_34", "Not checked");
define("DBLAN_35", "Click button to check validity of e107 database records"); define("DBLAN_35", "Select to check validity of e107 database records");
define("DBLAN_36", "Check database record validity"); define("DBLAN_36", "Check database record validity");
define("DBLAN_37", "Choose table(s) to validate"); define("DBLAN_37", "Choose table(s) to validate");
define("DBLAN_38", "Start Verify"); define("DBLAN_38", "Start Verify");
@@ -58,8 +55,11 @@ define("DBLAN_45", "Id Not Found!");
define("DBLAN_46", "Table Not Found!"); define("DBLAN_46", "Table Not Found!");
define("DBLAN_47", "delete"); define("DBLAN_47", "delete");
define("DBLAN_48", "Delete Checked"); define("DBLAN_48", "Delete Checked");
define("DBLAN_49", "no records present in the table, so nothing to validate"); define("DBLAN_49", "No records present in the table, so nothing to validate");
define("DBLAN_50", "Sql Record Validation"); define("DBLAN_50", "Sql Record Validation");
define("DBLAN_51", "Execute Selected");
define("DBLAN_52", "Delete Duplicate"); //plugin scan
define("DBLAN_53", "Please select action.");
define("DBLAN_54", "No Validation errors found.");
?> ?>

View File

@@ -4,9 +4,9 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_db_verify.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_db_verify.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2007-05-29 18:53:07 $ | $Date: 2008-12-30 13:51:41 $
| $Author: e107steved $ | $Author: secretr $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
define("DBLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/admin/sql</b> directory."); define("DBLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/admin/sql</b> directory.");
@@ -31,4 +31,6 @@ define("DBLAN_19", "Attempt to Fix");
define("DBLAN_20", "Attempting to fix tables"); define("DBLAN_20", "Attempting to fix tables");
define("DBLAN_21", "Fix Selected Items"); define("DBLAN_21", "Fix Selected Items");
define("DBLAN_22", " is not readable"); define("DBLAN_22", " is not readable");
define("DBLAN_23", "Database Utilities");
define("DBLAN_24", "Please select action.");
?> ?>

View File

@@ -79,6 +79,16 @@ ul,ol { list-style:none; }
.no-bg { background:none !important; } .no-bg { background:none !important; }
.clear { clear: both; } .clear { clear: both; }
pre {
overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
/* width: 99%; */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
/*******************************************************************************************************************/ /*******************************************************************************************************************/
/* E107 CORE ADMIN CSS *********************************************************************************************/ /* E107 CORE ADMIN CSS *********************************************************************************************/
@@ -87,7 +97,7 @@ ul,ol { list-style:none; }
/******** Decorate JS */ /******** Decorate JS */
/* Admin List Table */ /* Admin List Table */
.adminlist { width:100%; border:1px solid #ddd;} .adminlist { width:100%; border:1px solid #ddd;}
.adminlist th { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; font-weight: bold; white-space:nowrap; } .adminlist th { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; font-weight: bold }
.adminlist td { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; } .adminlist td { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
.adminlist th.last, .adminlist th.last,
.adminlist td.last { border-right: 0px solid;} .adminlist td.last { border-right: 0px solid;}
@@ -197,6 +207,7 @@ label { cursor: pointer; }
#s-message div.info, #s-message div.info,
#s-message div.error, #s-message div.error,
#s-message div.success, #s-message div.success,
#s-message div.debug,
#s-message div.warning { padding: 5px; margin-bottom: 10px; } #s-message div.warning { padding: 5px; margin-bottom: 10px; }
@@ -204,6 +215,7 @@ label { cursor: pointer; }
#s-message div.error { background-color:#FFCECE; border: 1px solid #CC0000; } #s-message div.error { background-color:#FFCECE; border: 1px solid #CC0000; }
#s-message div.success { background-color:#DFFFDF; border: 1px solid #009900; } #s-message div.success { background-color:#DFFFDF; border: 1px solid #009900; }
#s-message div.warning { background-color:#FFFFD5; border: 1px solid #FFCC00; } #s-message div.warning { background-color:#FFFFD5; border: 1px solid #FFCC00; }
#s-message div.debug { background-color:#FFFFFF; border: 1px solid #EAEAEA; }
.message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; font-size: 14px; font-weight: bold; line-height: 32px; } .message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; font-size: 14px; font-weight: bold; line-height: 32px; }
@@ -211,6 +223,7 @@ label { cursor: pointer; }
#s-message div.error .message-title { background-image: url(images/messagebox_critical.png); } #s-message div.error .message-title { background-image: url(images/messagebox_critical.png); }
#s-message div.success .message-title { background-image: url(images/ok.png); } #s-message div.success .message-title { background-image: url(images/ok.png); }
#s-message div.warning .message-title { background-image: url(images/messagebox_warning.png); } #s-message div.warning .message-title { background-image: url(images/messagebox_warning.png); }
#s-message div.debug .message-title { background-image: url(images/messagebox_info.png); }
.message-body { padding-left: 42px; } .message-body { padding-left: 42px; }
.message-item () .message-item ()

View File

@@ -1,6 +1,7 @@
<?php <?php
define("EMESSLAN_TITLE_INFO", "System Information"); define("EMESSLAN_TITLE_INFO", "System Information");
define("EMESSLAN_TITLE_ERROR", "Critical Error"); define("EMESSLAN_TITLE_ERROR", "Error");
define("EMESSLAN_TITLE_SUCCESS", "Success"); define("EMESSLAN_TITLE_SUCCESS", "Success");
define("EMESSLAN_TITLE_WARNING", "Warning"); define("EMESSLAN_TITLE_WARNING", "Warning");
define("EMESSLAN_TITLE_DEBUG", "System Debug");
?> ?>