continue removing author names in code

This commit is contained in:
Marc Delisle
2010-04-05 09:16:36 -04:00
parent 6b5f3b9962
commit 3ca82375d5
10 changed files with 16 additions and 17 deletions

View File

@@ -36,7 +36,7 @@ $cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['extension'] = 'mysql';
$cfg['Servers'][$i]['AllowNoPassword'] = false; $cfg['Servers'][$i]['AllowNoPassword'] = false;
/* rajk - for blobstreaming */ /* for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = 50; $cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
$cfg['Servers'][$i]['bs_repository_threshold'] = '32M'; $cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600; $cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;

View File

@@ -151,7 +151,7 @@ $hidden_fields = array();
$odd_row = true; $odd_row = true;
$sum_row_count_pre = ''; $sum_row_count_pre = '';
// added by rajk - for blobstreaming // for blobstreaming
$PMA_Config = $GLOBALS['PMA_Config']; $PMA_Config = $GLOBALS['PMA_Config'];
if (!empty($PMA_Config)) if (!empty($PMA_Config))
@@ -473,7 +473,7 @@ if ($is_show_stats) {
<th align="center" nowrap="nowrap"> <th align="center" nowrap="nowrap">
<?php <?php
// for blobstreaming - if the number of tables is 0, set tableReductionCount to 0 // for blobstreaming - if the number of tables is 0, set tableReductionCount to 0
// (we don't want negative numbers here) - rajk // (we don't want negative numbers here)
if ($num_tables == 0) if ($num_tables == 0)
$tableReductionCount = 0; $tableReductionCount = 0;

View File

@@ -283,7 +283,7 @@ class PMA_File
$file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary); $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary);
} }
// rajk - for blobstreaming // for blobstreaming
$is_bs_upload = FALSE; $is_bs_upload = FALSE;
// check if this field requires a repository upload // check if this field requires a repository upload
@@ -491,7 +491,7 @@ class PMA_File
if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]) if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])
&& is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) { && is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) {
// ... whether with multiple rows ... // ... whether with multiple rows ...
// rajk - for blobstreaming // for blobstreaming
$is_bs_upload = FALSE; $is_bs_upload = FALSE;
// check if this field requires a repository upload // check if this field requires a repository upload
@@ -631,7 +631,7 @@ class PMA_File
} }
} elseif (! empty($_REQUEST['fields_uploadlocal_' . $key]) } elseif (! empty($_REQUEST['fields_uploadlocal_' . $key])
&& is_string($_REQUEST['fields_uploadlocal_' . $key])) { && is_string($_REQUEST['fields_uploadlocal_' . $key])) {
// rajk - for blobstreaming // for blobstreaming
$is_bs_upload = FALSE; $is_bs_upload = FALSE;
// check if this field requires a repository upload // check if this field requires a repository upload

View File

@@ -471,9 +471,9 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
'pma_lang', 'pma_charset', 'pma_collation_connection', 'pma_lang', 'pma_charset', 'pma_collation_connection',
/* Possible login form */ /* Possible login form */
'pma_servername', 'pma_username', 'pma_password', 'pma_servername', 'pma_username', 'pma_password',
/* rajk - for playing blobstreamable media */ /* for playing blobstreamable media */
'media_type', 'custom_type', 'bs_reference', 'media_type', 'custom_type', 'bs_reference',
/* rajk - for changing BLOB repository file MIME type */ /* for changing BLOB repository file MIME type */
'bs_db', 'bs_table', 'bs_ref', 'bs_new_mime_type' 'bs_db', 'bs_table', 'bs_ref', 'bs_new_mime_type'
); );
/** /**
@@ -966,10 +966,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
unset($_SESSION['profiling']); unset($_SESSION['profiling']);
} }
// rajk - library file for blobstreaming // library file for blobstreaming
require_once './libraries/blobstreaming.lib.php'; require_once './libraries/blobstreaming.lib.php';
// rajk - checks for blobstreaming plugins and databases that support // checks for blobstreaming plugins and databases that support
// blobstreaming (by having the necessary tables for blobstreaming) // blobstreaming (by having the necessary tables for blobstreaming)
if (checkBLOBStreamingPlugins()) { if (checkBLOBStreamingPlugins()) {
checkBLOBStreamableDatabases(); checkBLOBStreamableDatabases();

View File

@@ -793,7 +793,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$table_groups = array(); $table_groups = array();
// for blobstreaming - list of blobstreaming tables - rajk // for blobstreaming - list of blobstreaming tables
// load PMA configuration // load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config']; $PMA_Config = $GLOBALS['PMA_Config'];

View File

@@ -138,7 +138,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp';
*/ */
$cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['extension'] = 'mysql';
/* rajk - added for blobstreaming */ /* added for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = ''; $cfg['Servers'][$i]['bs_garbage_threshold'] = '';
$cfg['Servers'][$i]['bs_repository_threshold'] = ''; $cfg['Servers'][$i]['bs_repository_threshold'] = '';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = ''; $cfg['Servers'][$i]['bs_temp_blob_timeout'] = '';

View File

@@ -298,7 +298,7 @@ function PMA_getTableCount($db)
$num_tables = PMA_DBI_num_rows($tables); $num_tables = PMA_DBI_num_rows($tables);
// for blobstreaming - get blobstreaming tables // for blobstreaming - get blobstreaming tables
// for use in determining if a table here is a blobstreaming table - rajk // for use in determining if a table here is a blobstreaming table
// load PMA configuration // load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config']; $PMA_Config = $GLOBALS['PMA_Config'];

View File

@@ -1278,7 +1278,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
if (!isset($row[$i]) || is_null($row[$i])) { if (!isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
} else { } else {
// rajk - for blobstreaming // for blobstreaming
$bs_reference_exists = $allBSTablesExist = FALSE; $bs_reference_exists = $allBSTablesExist = FALSE;

View File

@@ -818,7 +818,7 @@ foreach ($rows as $row_id => $vrow) {
if (($cfg['ProtectBinary'] && $field['is_blob']) if (($cfg['ProtectBinary'] && $field['is_blob'])
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo "\n"; echo "\n";
// rajk - for blobstreaming // for blobstreaming
$bs_reference_exists = FALSE; $bs_reference_exists = FALSE;
if (isset ($tbl_type) && strlen ($tbl_type) > 0) if (isset ($tbl_type) && strlen ($tbl_type) > 0)
@@ -917,7 +917,6 @@ foreach ($rows as $row_id => $vrow) {
// (displayed whatever value the ProtectBinary has) // (displayed whatever value the ProtectBinary has)
if ($is_upload && $field['is_blob']) { if ($is_upload && $field['is_blob']) {
// added by rajk
// check if field type is of longblob // check if field type is of longblob
if ($field['pma_type'] == "longblob") if ($field['pma_type'] == "longblob")
{ {

View File

@@ -226,7 +226,7 @@ foreach ($loop_array as $rowcount => $where_clause) {
require './libraries/tbl_replace_fields.inc.php'; require './libraries/tbl_replace_fields.inc.php';
// rajk - for blobstreaming // for blobstreaming
if ($blob_streaming_active && (NULL != $primary_field || strlen($primary_field) > 0)) { if ($blob_streaming_active && (NULL != $primary_field || strlen($primary_field) > 0)) {
$remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL; $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL;
$upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL; $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;