Minor improvements (#906)

admin/admin_attachments.php

@@ -207,7 +207,7 @@ if ($check_upload) {
     }
 
     if (!$error) {
-        if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb'))) {
+        if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb+'))) {
             $error = true;
             $error_msg = sprintf($lang['DIRECTORY_NOT_WRITEABLE'], $attach_config['upload_dir']) . '<br />';
         } else {
@@ -347,7 +347,7 @@ if ($check_image_cat) {
 
     // Does the target directory exist, is it a directory and writeable
     if (!@file_exists(amod_realpath($upload_dir))) {
-        if (!mkdir($upload_dir, 0755) && !is_dir($upload_dir)) {
+        if (!bb_mkdir($upload_dir, 0755) && !is_dir($upload_dir)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $upload_dir));
         }
         @chmod($upload_dir, 0777);
@@ -364,7 +364,7 @@ if ($check_image_cat) {
     }
 
     if (!$error) {
-        if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb'))) {
+        if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb+'))) {
             $error = true;
             $error_msg = sprintf($lang['DIRECTORY_NOT_WRITEABLE'], $upload_dir) . '<br />';
         } else {

library/config.php

@@ -494,10 +494,10 @@ $bb_cfg['max_savebox_privmsgs'] = 500; // максимальное число с
 $bb_cfg['max_sentbox_privmsgs'] = 500; // максимальное число сообщений в папке отправленные
 $bb_cfg['max_smilies_pm'] = 15; // максимальное число смайлов в сообщении (0 - без ограничения)
 $bb_cfg['max_symbols_pm'] = 1500; // TODO: максимальное число символов в сообщении (0 - без ограничения)
-$bb_cfg['pm_days_keep'] = 180; // время хранения ЛС
+$bb_cfg['pm_days_keep'] = 0; // время хранения ЛС (0 - без ограничения)
 
 // Actions log
-$bb_cfg['log_days_keep'] = 365; // время хранения истории действий
+$bb_cfg['log_days_keep'] = 365; // время хранения истории действий (0 - без ограничения)
 
 // Users
 $bb_cfg['color_nick'] = true; // Окраска ников пользователей по user_rank

library/defines.php

@@ -67,7 +67,8 @@ define('XS_TAG_BEGINELSE', 11);
 define('APP_DEBUG', true); // enable application debug
 define('SQL_DEBUG', true); // enable forum sql & cache debug
 define('SQL_LOG_ERRORS', true); // all SQL_xxx options enabled only if SQL_DEBUG == TRUE
-define('SQL_LOG_NAME', 'sql_error_bb'); // mysql log filename
+define('SQL_BB_LOG_NAME', 'sql_error_bb'); // mysql log filename (Board)
+define('SQL_TR_LOG_NAME', 'sql_error_tr'); // mysql log filename (Tracker)
 define('SQL_CALC_QUERY_TIME', true); // for stats
 define('SQL_LOG_SLOW_QUERIES', true); // log sql slow queries
 define('SQL_SLOW_QUERY_TIME', 10); // slow query in seconds

library/includes/cron/jobs/attach_maintenance.php

@@ -11,6 +11,8 @@ if (!defined('BB_ROOT')) {
     die(basename(__FILE__));
 }
 
+global $attach_config;
+
 DB()->expect_slow_query(600);
 
 $fix_errors = true;
@@ -35,6 +37,16 @@ DB()->add_shutdown_query("DROP TEMPORARY TABLE IF EXISTS $tmp_attach_tbl");
 // Get attach_mod config
 $attach_dir = get_attachments_dir();
 
+// Creates thumb directory if not exists
+if ((int)$attach_config['img_create_thumbnail']) {
+    $thumb_dir = "$attach_dir/" . THUMB_DIR;
+
+    if (!is_dir($thumb_dir)) {
+        bb_mkdir($thumb_dir, 0755);
+        @chmod($thumb_dir, 0777);
+    }
+}
+
 // Get all names of existed attachments and insert them into $tmp_attach_tbl
 if ($dir = @opendir($attach_dir)) {
     $check_attachments = true;

library/includes/cron/jobs/clean_log.php

@@ -13,7 +13,6 @@ if (!defined('BB_ROOT')) {
 
 $log_days_keep = (int)$bb_cfg['log_days_keep'];
 
-DB()->query("
+if ($log_days_keep !== 0) {
-	DELETE FROM " . BB_LOG . "
+    DB()->query("DELETE FROM " . BB_LOG . " WHERE log_time < " . (TIMENOW - 86400 * $log_days_keep));
-	WHERE log_time < " . (TIMENOW - 86400 * $log_days_keep) . "
+}
-");

library/includes/cron/jobs/clean_pm.php

@@ -13,7 +13,6 @@ if (!defined('BB_ROOT')) {
 
 $pm_days_keep = (int)$bb_cfg['pm_days_keep'];
 
-DB()->query("
+if ($pm_days_keep !== 0) {
-	DELETE FROM " . BB_PRIVMSGS . "
+    DB()->query("DELETE FROM " . BB_PRIVMSGS . " WHERE privmsgs_date < " . (TIMENOW - 86400 * $pm_days_keep));
-	WHERE privmsgs_date < " . (TIMENOW - 86400 * $pm_days_keep) . "
+}
-");

src/Legacy/SqlDb.php

@@ -939,7 +939,7 @@ class SqlDb
         $msg[] = 'PID     : ' . sprintf('%05d', getmypid());
         $msg[] = 'Request : ' . trim(print_r($_REQUEST, true)) . str_repeat('_', 78) . LOG_LF;
         $msg[] = '';
-        bb_log($msg, SQL_LOG_NAME);
+        bb_log($msg, IN_TRACKER ? SQL_TR_LOG_NAME : SQL_BB_LOG_NAME);
     }
 
     /**