akanyuk · akanyuk · Jan 9, 2025 · Sep 15, 2024 · Sep 19, 2024 · Sep 21, 2024
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,8 @@ config.local.php
 debug.php
 var/images_cache
 var/protected_media
+var/SxGeo.dat
+var/SxGeoCity.dat
 public_html/assets
 public_html/cache
 public_html/files

diff --git a/TODO.txt b/TODO.txt
@@ -0,0 +1 @@
+* Removing `Preview` button from preview work (not repeated)
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "require": {
     "ccampbell/chromephp": "^4.1",
     "akanyuk/speccy_gfx_converter": "^1.1.3",
-    "akanyuk/nfw": "^v1.3.4",
+    "akanyuk/nfw": "^v1.4.0",
     "ext-zip": "*",
     "ext-iconv": "*",
     "ext-mbstring": "*",
@@ -11,6 +11,21 @@
     "ext-dom": "*",
     "ext-simplexml": "*",
     "ext-libxml": "*",
-    "ext-apcu": "*"
+    "ext-apcu": "*",
+    "twbs/bootstrap": "5.3.3",
+    "thomaspark/bootswatch": "5.3.3"
+  },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/thomaspark/bootswatch.git"
+    }
+  ],
+  "scripts": {
+    "post-update-cmd": [
+      "rm -rf public_html/vendor/bootstrap5 && mkdir -p public_html/vendor/bootstrap5/theme && cp -R vendor/twbs/bootstrap/dist/* public_html/vendor/bootstrap5/ && cp -f vendor/thomaspark/bootswatch/dist/cosmo/bootstrap.min.css public_html/vendor/bootstrap5/theme/ && sed -i -e 's/@import url(https:\\/\\/fonts.googleapis.com\\/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap);//g' public_html/vendor/bootstrap5/theme/bootstrap.min.css",
+      "cd var && rm -f SxGeo*.* && wget https://sypexgeo.net/files/SxGeoCountry.zip && unzip SxGeoCountry.zip && rm SxGeoCountry.zip && wget https://sypexgeo.net/files/SxGeoCity_utf8.zip && unzip SxGeoCity_utf8.zip && rm SxGeoCity_utf8.zip",
+      "cp -R src/resources/icons public_html/assets && cp -R vendor/akanyuk/nfw/resources/icons public_html/assets"
+    ]
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   nginx:
     build:

diff --git a/empty.sql b/empty.sql
diff --git a/linter.php b/linter.php
@@ -1,10 +1,33 @@
 <?php
 
 $CVote = new vote();
-$CVote->actionMainRequestVotekey();
-$CVote->actionMainAddVote();
 $CVote->actionAdminVotekeys();
 $CVote->actionAdminVotes();
 $CVote->actionAdminAddVote();
 $CVote->actionAdminResults();
 
+$CWorks = new works();
+$CWorks->actionAdminAdmin();
+$CWorks->actionAdminGetPos();
+$CWorks->actionAdminSetPos();
+$CWorks->actionAdminInsert();
+$CWorks->actionAdminUpdate();
+$CWorks->actionAdminDelete();
+$CWorks->actionAdminPreview();
+$CWorks->actionAdminUpdateWork();
+$CWorks->actionAdminUpdateStatus();
+$CWorks->actionAdminUpdateLinks();
+$CWorks->actionAdminMyStatus();
+
+$CWorksMedia = new works_media();
+$CWorksMedia->actionAdminRenameFile();
+$CWorksMedia->actionAdminPreviewZx();
+$CWorksMedia->actionAdminConvertZx();
+$CWorksMedia->actionAdminFileIdDiz();
+$CWorksMedia->actionAdminMakeRelease();
+$CWorksMedia->actionAdminRemoveRelease();
+$CWorksMedia->actionAdminUpdateProperties();
+
+$CWorksActivity = new works_activity();
+$CWorksActivity->actionAdminList();
+$CWorksActivity->actionAdminMessage();
diff --git a/migration/from-v2.7.0.sql b/migration/from-v2.7.0.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `events` ADD `content_column` text COLLATE 'utf8mb3_general_ci' NULL COMMENT 'Content for column' AFTER `content`;
+
+DELETE FROM `settings` WHERE id=3;
+UPDATE `settings` SET
+`attributes` = 'meta_description.desc = SEO: meta_description\r\nmeta_description.type=str\r\n\r\nmeta_keywords.desc = SEO: meta_keywords\r\nmeta_keywords.type=str\r\n\r\nemail_from.desc = e-mail in notifies\r\nemail_from.type=str\r\n\r\nemail_from_name.desc = Sender name in notifies\r\nemail_from_name.type=str\r\n\r\nfooter.desc = Footer content (HTML)\r\nfooter.type = textarea\r\n\r\n53c_competition_id.desc = 53c competition ID\r\n53c_competition_id.type = int'
+WHERE id=1;
diff --git a/migration/from-v2.8.0.sql b/migration/from-v2.8.0.sql
@@ -0,0 +1,51 @@
+DROP TABLE `news`;
+UPDATE `pages`
+SET `is_active` = '0'
+WHERE `id` = '24';
+
+DROP TABLE IF EXISTS `all_comments_viewed`;
+CREATE TABLE `all_comments_viewed`
+(
+    `user_id` int unsigned NOT NULL,
+    UNIQUE KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
+
+DROP TABLE IF EXISTS `works_activity`;
+CREATE TABLE `works_activity`
+(
+    `id`        int unsigned NOT NULL AUTO_INCREMENT,
+    `type`      int unsigned NOT NULL DEFAULT '0',
+    `work_id`   int unsigned NOT NULL DEFAULT '0',
+    `message`   text,
+    `metadata`  text,
+    `posted`    int unsigned NOT NULL DEFAULT '0',
+    `posted_by` int unsigned NOT NULL DEFAULT '1',
+    PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
+
+DROP TABLE IF EXISTS `works_activity_unread`;
+CREATE TABLE `works_activity_unread`
+(
+    `work_id` int unsigned NOT NULL DEFAULT '0',
+    `user_id` int unsigned NOT NULL DEFAULT '0',
+    UNIQUE KEY `work_id_user_id` (`work_id`,`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
+
+DROP TABLE IF EXISTS `works_activity_last_read`;
+CREATE TABLE `works_activity_last_read`
+(
+    `activity_id` int unsigned NOT NULL DEFAULT '0',
+    `work_id`        int unsigned NOT NULL DEFAULT '0',
+    `user_id`        int unsigned NOT NULL DEFAULT '0',
+    UNIQUE KEY `activity_id_work_id_user_id` (`activity_id`,`work_id`,`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
+
+UPDATE works_managers_notes
+SET comment = ""
+WHERE is_marked = 0;
+ALTER TABLE `works_managers_notes`
+DROP
+`is_checked`,
+DROP
+`is_marked`,
+CHANGE `comment` `comment` text COLLATE 'utf8mb3_general_ci' NOT NULL AFTER `user_id`;
diff --git a/public_html/media/news/.gitkeep b/public_html/media/news/.gitkeep
diff --git a/public_html/media/news/tmb/.gitkeep b/public_html/media/news/tmb/.gitkeep
diff --git a/src/configs/config.php b/src/configs/config.php
@@ -45,6 +45,21 @@
     'use_browscap' => true,
 
     'media' => array(
+        'availableIcons' => [
+            'ay',
+            'mg2',
+            'mgs',
+            'mp3',
+            'ogg',
+            'pt2',
+            'pt3',
+            'scl',
+            'scr',
+            'sna',
+            'tap',
+            'trd',
+            'tzx',
+        ],
         'MAX_FILE_SIZE' => 67108864,    // MAX_FILE_SIZE # 64Mb
         'MAX_SESSION_SIZE' => 67108864, // MAX_SESSION_SIZE # 64Mb
         'fs_encoding' => 'utf8',        // Filesystem encoding

diff --git a/src/controlers/api_test.php b/src/controlers/api_test.php
@@ -1,11 +1,8 @@
 <?php
-NFWX::i()->main_search_box = false;
-NFWX::i()->main_right_pane = false;
-
-NFW::i()->registerResource('jquery.activeForm');
-active_field('set_defaults', array('labelCols' => 4, 'inputCols' => 8));
-
-ob_start();
+	NFW::i()->registerResource('jquery.activeForm');
+    active_field('set_defaults', array('labelCols' => 2, 'inputCols' => 10));
+
+	ob_start();
 ?>
     <style>
         FORM {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Removing `Preview` button from preview work (not repeated)