Skip to content

Commit

Permalink
continue removing author names in code
Browse files Browse the repository at this point in the history
  • Loading branch information
lem9 committed Apr 5, 2010
1 parent 6b5f3b9 commit 3ca8237
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion config.sample.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$cfg['Servers'][$i]['extension'] = 'mysql';
$cfg['Servers'][$i]['AllowNoPassword'] = false;

/* rajk - for blobstreaming */
/* for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
Expand Down
4 changes: 2 additions & 2 deletions db_structure.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
$odd_row = true;
$sum_row_count_pre = '';

// added by rajk - for blobstreaming
// for blobstreaming
$PMA_Config = $GLOBALS['PMA_Config'];

if (!empty($PMA_Config))
Expand Down Expand Up @@ -473,7 +473,7 @@
<th align="center" nowrap="nowrap">
<?php
// 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)
$tableReductionCount = 0;

Expand Down
6 changes: 3 additions & 3 deletions libraries/File.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function setUploadedFromTblChangeRequest($key, $primary = null)
$file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary);
}

// rajk - for blobstreaming
// for blobstreaming
$is_bs_upload = FALSE;

// check if this field requires a repository upload
Expand Down Expand Up @@ -491,7 +491,7 @@ function setSelectedFromTblChangeRequest($key, $primary = null)
if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])
&& is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) {
// ... whether with multiple rows ...
// rajk - for blobstreaming
// for blobstreaming
$is_bs_upload = FALSE;

// check if this field requires a repository upload
Expand Down Expand Up @@ -631,7 +631,7 @@ function setSelectedFromTblChangeRequest($key, $primary = null)
}
} elseif (! empty($_REQUEST['fields_uploadlocal_' . $key])
&& is_string($_REQUEST['fields_uploadlocal_' . $key])) {
// rajk - for blobstreaming
// for blobstreaming
$is_bs_upload = FALSE;

// check if this field requires a repository upload
Expand Down
8 changes: 4 additions & 4 deletions libraries/common.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,9 @@
'pma_lang', 'pma_charset', 'pma_collation_connection',
/* Possible login form */
'pma_servername', 'pma_username', 'pma_password',
/* rajk - for playing blobstreamable media */
/* for playing blobstreamable media */
'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'
);
/**
Expand Down Expand Up @@ -966,10 +966,10 @@
unset($_SESSION['profiling']);
}

// rajk - library file for blobstreaming
// library file for blobstreaming
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)
if (checkBLOBStreamingPlugins()) {
checkBLOBStreamableDatabases();
Expand Down
2 changes: 1 addition & 1 deletion libraries/common.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =

$table_groups = array();

// for blobstreaming - list of blobstreaming tables - rajk
// for blobstreaming - list of blobstreaming tables

// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
Expand Down
2 changes: 1 addition & 1 deletion libraries/config.default.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
*/
$cfg['Servers'][$i]['extension'] = 'mysql';

/* rajk - added for blobstreaming */
/* added for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = '';
$cfg['Servers'][$i]['bs_repository_threshold'] = '';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = '';
Expand Down
2 changes: 1 addition & 1 deletion libraries/core.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function PMA_getTableCount($db)
$num_tables = PMA_DBI_num_rows($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
$PMA_Config = $GLOBALS['PMA_Config'];
Expand Down
2 changes: 1 addition & 1 deletion libraries/display_tbl.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
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";
} else {
// rajk - for blobstreaming
// for blobstreaming

$bs_reference_exists = $allBSTablesExist = FALSE;

Expand Down
3 changes: 1 addition & 2 deletions tbl_change.php
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ class="textfield" <?php echo $unnullify_trigger; ?>
if (($cfg['ProtectBinary'] && $field['is_blob'])
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo "\n";
// rajk - for blobstreaming
// for blobstreaming
$bs_reference_exists = FALSE;

if (isset ($tbl_type) && strlen ($tbl_type) > 0)
Expand Down Expand Up @@ -917,7 +917,6 @@ class="textfield" <?php echo $unnullify_trigger; ?>
// (displayed whatever value the ProtectBinary has)

if ($is_upload && $field['is_blob']) {
// added by rajk
// check if field type is of longblob
if ($field['pma_type'] == "longblob")
{
Expand Down
2 changes: 1 addition & 1 deletion tbl_replace.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@

require './libraries/tbl_replace_fields.inc.php';

// rajk - for blobstreaming
// for blobstreaming
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;
$upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;
Expand Down

0 comments on commit 3ca8237

Please sign in to comment.