From afa54a91ba5e51eb6f808b0e0678bfcac93bc008 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sun, 5 Feb 2012 22:59:25 +0000 Subject: [PATCH] r357 UPDATE `bb_config` SET `config_value` = '3' WHERE `config_name` = 'pic_max_size'; git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@357 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- install/sql/mysql.sql | 2 +- upload/admin/admin_reports.php | 9 +-------- upload/config.php | 2 +- upload/gallery.php | 8 ++------ upload/misc/html/sidebar1.html | 2 +- upload/templates/admin/report_config_body.tpl | 6 +++++- upload/templates/admin/report_modules_body.tpl | 7 ++++++- upload/templates/default/gallery.tpl | 8 ++++---- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index c7e77fef6..908df882a 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -642,7 +642,7 @@ INSERT INTO `bb_config` VALUES ('reports_enabled', '1'); INSERT INTO `bb_config` VALUES ('gold_silver_enabled', '1'); INSERT INTO `bb_config` VALUES ('gallery_enabled', '1'); INSERT INTO `bb_config` VALUES ('pic_dir', 'pictures/'); -INSERT INTO `bb_config` VALUES ('pic_max_size', '3*1024*1024'); +INSERT INTO `bb_config` VALUES ('pic_max_size', '3'); INSERT INTO `bb_config` VALUES ('auto_delete_posted_pics', '1'); INSERT INTO `bb_config` VALUES ('magnet_links_enabled', '1'); INSERT INTO `bb_config` VALUES ('no_avatar', 'images/avatars/gallery/noavatar.png'); diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php index ca408da11..1a1a07e62 100644 --- a/upload/admin/admin_reports.php +++ b/upload/admin/admin_reports.php @@ -75,9 +75,7 @@ if ($mode == 'config') 'REPORT_LIST_ADMIN_OFF' => (!$bb_cfg['report_list_admin']) ? ' checked="checked"' : '', 'REPORT_NEW_WINDOW_ON' => ($bb_cfg['report_new_window']) ? ' checked="checked"' : '', 'REPORT_NEW_WINDOW_OFF' => (!$bb_cfg['report_new_window']) ? ' checked="checked"' : '', - - 'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION']) - ); + )); print_page('report_config_body.tpl', 'admin'); } @@ -486,11 +484,6 @@ else { case '': $report_modules = report_modules(); - - $template->assign_vars(array( - 'L_REPORTS_TITLE' => $lang['REPORTS'] . ': ' . $lang['MODULES_REASONS']) - ); - $report_counts = report_counts_obtain(); $report_reason_counts = report_reason_counts_obtain(); diff --git a/upload/config.php b/upload/config.php index 036b3a27a..93348f189 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R356'; +$bb_cfg['tp_release_state'] = 'R357'; $bb_cfg['tp_release_date'] = '06-02-2012'; // Database diff --git a/upload/gallery.php b/upload/gallery.php index 444b4bed7..3b3b6efd6 100644 --- a/upload/gallery.php +++ b/upload/gallery.php @@ -3,7 +3,7 @@ define('IN_PHPBB', true); define('BB_SCRIPT', 'gallery'); define('BB_ROOT', './'); -require(BB_ROOT ."common.php"); +require(BB_ROOT .'common.php'); // Start session management $user->session_start(array('req_login' => true)); @@ -16,7 +16,7 @@ if(bf($userdata['user_opt'], 'user_opt', 'allow_gallery')) { bb_die($lang['USE_GALLERY_OFF']); } $go = isset($_GET['go']) ? $_GET['go'] : ''; -$max_size = $bb_cfg['pic_max_size']; +$max_size = $bb_cfg['pic_max_size']*1024*1024; $dir = $bb_cfg['pic_dir']; $url = make_url('/'); @@ -187,10 +187,6 @@ if ($go == 'delete' && IS_ADMIN && !empty($_GET['fn'])) $template->assign_vars(array( 'MSG' => $msg, 'MAX_SIZE' => humn_size($max_size), - 'MAX_SIZE_HINT' => $lang['GALLERY_MAX_FILE_SIZE'], - 'CREATE_THUMB' => $lang['GALLERY_CREATE_THUMB'], - 'UPLOAD' => $lang['GALLERY_UPLOAD_IMAGE'], - 'MORE' => $lang['GALLERY_MORE_LINK'], )); print_page('gallery.tpl'); \ No newline at end of file diff --git a/upload/misc/html/sidebar1.html b/upload/misc/html/sidebar1.html index 85e0e1890..584065147 100644 --- a/upload/misc/html/sidebar1.html +++ b/upload/misc/html/sidebar1.html @@ -4,7 +4,7 @@

BitTorrent клиенты

diff --git a/upload/templates/admin/report_config_body.tpl b/upload/templates/admin/report_config_body.tpl index 0f6405996..e620f275f 100644 --- a/upload/templates/admin/report_config_body.tpl +++ b/upload/templates/admin/report_config_body.tpl @@ -1,8 +1,12 @@ -

{L_CONFIGURATION_TITLE}

+

{L_CONFIGURATION}

{L_REPORT_CONFIG_EXPLAIN}


+{L_CONFIGURATION} · +{L_MODULES_REASONS} +

+
diff --git a/upload/templates/admin/report_modules_body.tpl b/upload/templates/admin/report_modules_body.tpl index da7155e96..440efcbf8 100644 --- a/upload/templates/admin/report_modules_body.tpl +++ b/upload/templates/admin/report_modules_body.tpl @@ -1,6 +1,11 @@ -

{L_REPORTS_TITLE}

+

{L_MODULES_REASONS}

{L_REPORT_ADMIN_EXPLAIN}

+
+ +{L_CONFIGURATION} · +{L_MODULES_REASONS} +

diff --git a/upload/templates/default/gallery.tpl b/upload/templates/default/gallery.tpl index c58da0fda..2c26e2a26 100644 --- a/upload/templates/default/gallery.tpl +++ b/upload/templates/default/gallery.tpl @@ -94,16 +94,16 @@ function add_image_field(i)
-

{MAX_SIZE_HINT} {MAX_SIZE}

+

{L_GALLERY_MAX_FILE_SIZE} {MAX_SIZE}

{MSG}
-
{MORE}
+
{L_GALLERY_MORE_LINK}

- +
- +