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

Hide debug info from view when not in debug mode.

Browse Source
This commit is contained in:
CaMer0n
2009-10-22 14:31:28 +00:00
parent 3d22c7170a
commit b297a1ab56
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
e107_admin/update_routines.php
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_admin/update_routines.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $
| $Revision: 1.54 $ | $Revision: 1.55 $
| $Date: 2009-09-21 19:52:38 $ | $Date: 2009-10-22 14:31:28 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -678,6 +678,7 @@ function update_706_to_800($type='')
if (plugInstalled($plugName)) if (plugInstalled($plugName))
{ {
$ttc = explode(',',$plugList); $ttc = explode(',',$plugList);
$mes = e107::getMessage();
foreach ($ttc as $ct) foreach ($ttc as $ct)
{ {
$sqlDefs = e_PLUGIN.$plugName.'/'.$plugName.'_sql.php'; // Filename containing definitions $sqlDefs = e_PLUGIN.$plugName.'/'.$plugName.'_sql.php'; // Filename containing definitions
@@ -689,7 +690,13 @@ function update_706_to_800($type='')
continue; continue;
} }
$req_fields = $db_parser->parse_field_defs($req_defs[0][2]); // Required definitions $req_fields = $db_parser->parse_field_defs($req_defs[0][2]); // Required definitions
if (E107_DBG_FILLIN8) echo "Required plugin table structure: <br />".$db_parser->make_field_list($req_fields); if (E107_DBG_SQLDETAILS)
{
$message = "Required plugin table structure: <br />".$db_parser->make_field_list($req_fields);
$mes->add($message, E_MESSAGE_DEBUG);
}
if ((($actual_defs = $db_parser->get_current_table($ct)) === FALSE) || !is_array($actual_defs)) // Adds current default prefix if ((($actual_defs = $db_parser->get_current_table($ct)) === FALSE) || !is_array($actual_defs)) // Adds current default prefix
{ {
@@ -699,16 +706,28 @@ function update_706_to_800($type='')
{ {
// echo $db_parser->make_table_list($actual_defs); // echo $db_parser->make_table_list($actual_defs);
$actual_fields = $db_parser->parse_field_defs($actual_defs[0][2]); $actual_fields = $db_parser->parse_field_defs($actual_defs[0][2]);
if (E107_DBG_FILLIN8) echo "Actual table structure: <br />".$db_parser->make_field_list($actual_fields); if (E107_DBG_SQLDETAILS)
{
$message= "Actual table structure: <br />".$db_parser->make_field_list($actual_fields);
$mes->add($message, E_MESSAGE_DEBUG);
}
$diffs = $db_parser->compare_field_lists($req_fields,$actual_fields); $diffs = $db_parser->compare_field_lists($req_fields,$actual_fields);
if (count($diffs[0])) if (count($diffs[0]))
{ // Changes needed { // Changes needed
if (E107_DBG_FILLIN8) echo "List of changes found:<br />".$db_parser->make_changes_list($diffs); if (E107_DBG_SQLDETAILS)
{
$message = "List of changes found:<br />".$db_parser->make_changes_list($diffs);
$mes->add($message, E_MESSAGE_DEBUG);
}
if ($just_check) return update_needed("Field changes rqd; plugin table: ".$ct); if ($just_check) return update_needed("Field changes rqd; plugin table: ".$ct);
// Do the changes here // Do the changes here
$qry = 'ALTER TABLE '.MPREFIX.$ct.' '.implode(', ',$diffs[1]); $qry = 'ALTER TABLE '.MPREFIX.$ct.' '.implode(', ',$diffs[1]);
if (E107_DBG_FILLIN8) echo "Update Query used: ".$qry."<br />"; if (E107_DBG_SQLDETAILS)
{
$message = "Update Query used: ".$qry."<br />";
$mes->add($message, E_MESSAGE_DEBUG);
}
$sql->db_Select_gen($qry); $sql->db_Select_gen($qry);
$updateMessages[] = LAN_UPDATE_51.$ct; $updateMessages[] = LAN_UPDATE_51.$ct;
catch_error(); catch_error();

14
e107_handlers/db_table_admin_class.php
View File

@@ -9,9 +9,9 @@
* Database utilities * Database utilities
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/db_table_admin_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/db_table_admin_class.php,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* $Date: 2009-09-13 20:22:39 $ * $Date: 2009-10-22 14:31:28 $
* $Author: secretr $ * $Author: e107coders $
*/ */
/* /*
@@ -225,7 +225,11 @@ class db_table_admin
$defs['autoinc'] = TRUE; $defs['autoinc'] = TRUE;
break; break;
default: default:
echo "Unknown definition {$i}: ".$fd[$i]."<br />"; if(E107_DBG_SQLDETAILS)
{
$mes = e107::getMessage();
$mes->add("db_table_admin_class.php :: parse_field_defs() Line: 230 - Unknown definition {$i}: ".$fd[$i], E_MESSAGE_DEBUG);
}
} }
$i++; $i++;
} }
@@ -599,7 +603,7 @@ class db_table_admin
global $sql; global $sql;
// Pull out table name // Pull out table name
$debugLevel = E107_DBG_SQLDETAILS; $debugLevel = E107_DBG_SQLDETAILS;
$tableName = $newStructure[1]; $tableName = $newStructure[1];
if (!$sql->db_Table_exists($tableName)) if (!$sql->db_Table_exists($tableName))
{ {