[TikiWiki-commits] [Git][tikiwiki/tiki][master] [REF] Remove obsolete feature image gallery related code

ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
610452bd by ushindi bienvenu at 2026-02-02T10:29:08+00:00
[REF] Remove obsolete feature image gallery related code
---
* [REM] Remove legacy Image Gallery wording to avoid confusion

* [REM] Remove image gallery type
  - It was supposed to be removed with commit c6454958885ba67e41504ebce0323a65d217dd1a

* [REF] Remove obsolete feature image gallery related code

See merge request tikiwiki/tiki!9405

- - - - -


17 changed files:

- categorize_list.php
- db/config/tiki.xml
- lib/Logs/LogsQueryLib.php
- lib/categories/categlib.php
- lib/core/CustomRoute/Type/TikiObject.php
- lib/core/Tiki/Command/FilesCheckCommand.php
- lib/objectlib.php
- lib/setup/events.php
- lib/tikilib.php
- lib/wiki-plugins/wikiplugin_comment.php
- lib/wiki-plugins/wikiplugin_img.php
- modules/mod-func-categories.php
- modules/mod-func-last_category_objects.php
- templates/tiki-install.tpl
- tiki-admin_categories.php
- tiki-browse_freetags.php
- tiki-xmlrpc_services.php


Changes:

=====================================
categorize_list.php
=====================================
@@ -35,7 +35,7 @@ if ($prefs['feature_categories'] == 'y' && isset($cat_type) && isset($cat_objid)
         $cats = $categlib->get_default_categories();
     }
 
-    if ($cat_type == 'wiki page' || $cat_type == 'blog' || $cat_type == 'image gallery' || $cat_type == 'mypage') {
+    if ($cat_type == 'wiki page' || $cat_type == 'blog' || $cat_type == 'mypage') {
         $ext = ($cat_type == 'wiki page') ? 'wiki' : str_replace(' ', '_', $cat_type);
         $pref = 'feature_' . $ext . '_mandatory_category';
         if ($prefs[$pref] > 0) {


=====================================
db/config/tiki.xml
=====================================
@@ -143,9 +143,6 @@
             <file>%kernel.root_dir%/lib/wiki/histlib.php</file>
         </service>
         <service id="tiki.lib.iconset" class="Tiki\Lib\Theme\IconsetLib"/>
-        <service id="tiki.lib.imagegal" class="ImageGalsLib">
-            <file>%kernel.root_dir%/lib/imagegals/imagegallib.php</file>
-        </service>
         <service id="tiki.lib.kalturaadmin" class="KalturaLib">
             <file>%kernel.root_dir%/lib/videogals/kalturalib.php</file>
             <argument type="string">2</argument> <!-- KalturaLib::SESSION_ADMIN -->


=====================================
lib/Logs/LogsQueryLib.php
=====================================
@@ -47,11 +47,6 @@ class LogsQueryLib
         return LogsQueryLib::type("file gallery")->id($id);
     }
 
-    public static function imageGallery($id = "")
-    {
-        return LogsQueryLib::type("image gallery")->id($id);
-    }
-
     public static function category($id = "")
     {
         return LogsQueryLib::type("category")->id($id);


=====================================
lib/categories/categlib.php
=====================================
@@ -1511,7 +1511,7 @@ class CategLib extends ObjectLib
             "calendar" => "calendar",
             "img" => "image",
             "template" => "template",
-        ];    //get_strings tra("article");tra("blog");tra("directory");tra("faq");tra("FAQ");tra("file gallery");tra("forum");tra("image gallery");tra("newsletter");
+        ];    //get_strings tra("article");tra("blog");tra("directory");tra("faq");tra("FAQ");tra("file gallery");tra("forum");tra("newsletter");
         //get_strings tra("poll");tra("quiz");tra("survey");tra("tracker");tra("wiki page");tra("image");tra("calendar");tra("template");
 
         $typetitles = [


=====================================
lib/core/CustomRoute/Type/TikiObject.php
=====================================
@@ -29,7 +29,6 @@ class TikiObject extends Type
                     'article' => tr('Article'),
                     'blog' => tr('Blog'),
                     'forum' => tr('Forum'),
-                    'gallery' => tr('Image Gallery'),
                     'wiki page' => tr('Wiki Page'),
                 ],
             ],


=====================================
lib/core/Tiki/Command/FilesCheckCommand.php
=====================================
@@ -15,7 +15,7 @@ use Tiki\Files\CheckAttachmentGallery;
 use Tiki\Files\CheckFileGallery;
 
 /**
- * Command to check the status of the files in File and Image Gallery
+ * Command to check the status of the files in File Gallery
  */
 #[AsCommand(
     name: 'files:check',


=====================================
lib/objectlib.php
=====================================
@@ -40,7 +40,7 @@ class ObjectLib extends TikiLib
      * When creating, if $description is given, use the description, name and URL given as information.
      * Otherwise retrieve it from the object (if $checkHandled is FALSE, fill with empty strings if the object type is not handled).
      * Handled object types: "article", "blog", "calendar", "directory", "faq",
-     * "file", "file gallery", "forum", "image gallery", "poll", "quiz", "tracker", "trackeritem", "wiki page" and "template".
+     * "file", "file gallery", "forum", "poll", "quiz", "tracker", "trackeritem", "wiki page" and "template".
      *
      * Remember to update get_supported_types if this changes
      */
@@ -237,7 +237,6 @@ class ObjectLib extends TikiLib
             'file',
             'file gallery',
             'forum',
-            'image gallery',
             'perspective',
             'poll',
             'quiz',


=====================================
lib/setup/events.php
=====================================
@@ -328,11 +328,6 @@ function tiki_setup_events()
     $events->bind('tiki.image.save', 'tiki.save');
     $events->bind('tiki.image.view', 'tiki.view');
 
-    $events->bind('tiki.imagegallery.create', 'tiki.imagegallery.save');
-    $events->bind('tiki.imagegallery.delete', 'tiki.imagegallery.save');
-    $events->bind('tiki.imagegallery.save', 'tiki.save');
-    $events->bind('tiki.imagegallery.view', 'tiki.view');
-
     $events->bind('tiki.forum.update', 'tiki.forum.save');
     $events->bind('tiki.forum.create', 'tiki.forum.save');
     $events->bind('tiki.forum.delete', 'tiki.forum.save');


=====================================
lib/tikilib.php
=====================================
@@ -4179,7 +4179,6 @@ class TikiLib extends TikiDb_Bridge
         switch ($objectType) {
             case 'tracker':
                 return 'tiki_p_admin_trackers';
-            case 'image gallery':
             case 'image':
                 return 'tiki_p_admin_galleries';
             case 'file gallery':


=====================================
lib/wiki-plugins/wikiplugin_comment.php
=====================================
@@ -23,7 +23,6 @@ function wikiplugin_comment_info()
                 'filter' => 'text',
                 'options' => [
                     ['text' => tr('Tracker Item'), 'value' => 'trackeritem'],
-                    ['text' => tr('Image Gallery'), 'value' => 'image gallery'],
                     ['text' => tr('Image'), 'value' => 'image'],
                     ['text' => tr('File Gallery'), 'value' => 'file gallery'],
                     ['text' => tr('File'), 'value' => 'file'],


=====================================
lib/wiki-plugins/wikiplugin_img.php
=====================================
@@ -839,7 +839,7 @@ function wikiplugin_img($data, $params)
             }
         }
         $imageObj = '';
-        //Deal with images with info in tiki databases (file and image galleries and attachments)
+        //Deal with images with info in tiki databases (file galleries and attachments)
         if (
             empty($imgdata['randomGalleryId']) && (! empty($imgdata['fileId'])
                 || ! empty($imgdata['attId']))
@@ -884,7 +884,7 @@ function wikiplugin_img($data, $params)
                 }
             }
         }
-        //finished getting info from db for images in image or file galleries or attachments
+        //finished getting info from db for images in file galleries or attachments
         if (! empty($dbinfo['path'])) {
             $basepath = $prefs['w_use_dir'];
         }


=====================================
modules/mod-func-categories.php
=====================================
@@ -17,7 +17,7 @@ function module_categories_info()
         'params' => [
             'type' => [
                 'name' => tra('Object type filter'),
-                'description' => tra('Object type filter to apply when accessing a linked category. Example values:') . ' wiki page, article, faq, blog, image gallery, image, file gallery, tracker, trackerItem, quiz, poll, survey, sheet',
+                'description' => tra('Object type filter to apply when accessing a linked category. Example values:') . tra('wiki page') . ', ' . tra('article') . ', ' . tra('FAQ') . ', ' . tra('blog') . ', ' . tra('image') . ', ' . tra('file gallery') . ', ' . tra('tracker') . ', ' . tra('tracker item') . ', ' . tra('quiz') . ', ' . tra('poll') . ', ' . tra('survey') . ', ' . tra('sheet'),
                 'filter' => 'striptags',
             ],
             'deep' => [


=====================================
modules/mod-func-last_category_objects.php
=====================================
@@ -35,7 +35,7 @@ function module_last_category_objects_info()
             ],
             'type' => [
                 'name' => tra('Object type filter'),
-                'description' => tra('Type of the objects to list. Example values:') . ' *, ' . tra('wiki page') . ', ' . tra('article') . ', ' . tra('faq') . ', blog, image, ' . tra('file gallery') . ', ' . tra('tracker') . ', ',tra('trackerItem') . ', ' . tra('quiz') . ', ' . tra('poll') . ', ' . tra('survey') . ', ' . tra('sheet') . '. ' . tra('Default value:') . tra(' wiki page'),
+                'description' => tra('Type of the objects to list. Example values:') . ' *, ' . tra('wiki page') . ', ' . tra('article') . ', ' . tra('FAQ') . ', ' . tra('blog') . ', ' . tra('image') . ', ' . tra('file gallery') . ', ' . tra('tracker') . ', ' . tra('tracker item') . ', ' . tra('quiz') . ', ' . tra('poll') . ', ' . tra('survey') . ', ' . tra('sheet') . '. ' . tra('Default value:') . tra(' wiki page'),
                 'filter' => 'striptags',
             ]
         ],


=====================================
templates/tiki-install.tpl
=====================================
@@ -268,7 +268,7 @@
                             {icon name="error"} {tr}Tiki was not able to detect the GD library.{/tr}
                             {/remarksbox}
                         {/if}
-                        <p>{tr}Tiki uses the GD library to process images for the Image Gallery and CAPTCHA support.{/tr}</p>
+                        <p>{tr}Tiki uses the GD library to process images for the File Gallery and CAPTCHA support.{/tr}</p>
                         <form action="tiki-install.php" method="post" >
                             <div class="mb-3 text-center">
                                 <input type="hidden" name="install_step" value="3">


=====================================
tiki-admin_categories.php
=====================================
@@ -177,11 +177,6 @@ if (isset($_REQUEST["addforum"]) && $_REQUEST["parentId"] != 0 && $access->check
     $categlib->categorize_any('forum', $_REQUEST["forumId"], $_REQUEST["parentId"]);
     $categorizedObject = $categlib->get_categorized_object('forum', $_REQUEST["forumId"]);
 }
-if (isset($_REQUEST["addgallery"]) && $_REQUEST["parentId"] != 0 && $access->checkCsrf()) {
-    // Here we categorize an image gallery
-    $categlib->categorize_any('image gallery', $_REQUEST["galleryId"], $_REQUEST["parentId"]);
-    $categorizedObject = $categlib->get_categorized_object('image gallery', $_REQUEST["galleryId"]);
-}
 if (isset($_REQUEST["addfilegallery"]) && $_REQUEST["parentId"] != 0 && $access->checkCsrf()) {
     // Here we categorize a file gallery
     $categlib->categorize_any('file gallery', $_REQUEST["file_galleryId"], $_REQUEST["parentId"]);


=====================================
tiki-browse_freetags.php
=====================================
@@ -161,7 +161,6 @@ $smarty->assign(
         'directory',
         'faq',
         'file gallery',
-        'image gallery',
         'image',
         'poll',
         'quiz',


=====================================
tiki-xmlrpc_services.php
=====================================
@@ -63,7 +63,7 @@ function check_individual($user, $blogId, $permName)
     }
 
     // If the object has individual permissions then check
-    // Now get all the permissions that are set for this type of permissions 'image gallery'
+    // whether the user has the requested permission on this object
     if ($userlib->object_has_permission($user, $blogId, 'blog', $permName)) {
         return true;
     } else {



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/610452bdc84bb66e53089ce01a7f6d11d87e8209

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/610452bdc84bb66e53089ce01a7f6d11d87e8209
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs