Журнал изменений

Remove 52 dead/duplicate fragments from all 3 frontend themes (default, lite, simple) and replace direct getHtmlFrag() calls with canonical helpers where they already exist.

Core changes:

1. Dead fragments removed (templates/default|lite|simple/fragments/):

• 49 fragments with 0 frontend callers (admin-, block wrappers, comment-action-delete, editor-files-, navi-tabs-, pager-, rating-*, voting-close/open/stat-text, td-check, form-checkall, spoiler, etc.)
• 2 lite-specific dead fragments: lite-faq-random-link, lite-head-banner
• 1 duplicate resolved: admin-title-tip (canonical: title-tip)

2. Duplicate fragments resolved:

• recommend-mail-link → files-external-link (identical content) modules/recommend/index.php updated
• contact-admin-option → getTplSelectOption() migration modules/contact/index.php updated

3. Direct getHtmlFrag('form-option') → getTplSelectOption() (10 calls):

• modules/forum/index.php (2 calls, $sel variable removed)
• modules/pages, files, media, faq, links, news, jokes, help/index.php

Benefits:

• Fragment count: 388 → 336 per theme (-52 default/simple, -54 lite)
• All direct form-option calls now route through canonical helper
• Frontend and admin themes now have consistent, non-overlapping fragment sets

Technical notes:

• block-* fragments in blocks/ system kept intact (indirect callers)
• files-external-link kept as canonical for generic target=_blank links
• form-option fragment kept (still used by getTplSelectOption())

Reverts Phase 2: themes (lite, default, simple, admin) are self-contained and must not depend on a shared/ fallback directory.

Core changes:

• templates/shared/: deleted
• templates/lite/, default/, simple/: all 388 files restored
• templates/admin/fragments/: 113 files restored
• core/classes/template.php: removed $shared property, shared fallback in getFile(), and shared path check in checkFile()

Benefits:

• Each theme is fully portable and independent
• No hidden cross-theme dependencies

Extend the Template engine with a shared/ fallback so theme directories only need to contain files that actually differ per theme. Move 388 files that were byte-identical across all three themes into templates/shared/.

Core changes:

1. Template engine fallback (core/classes/template.php):

• Add protected string $shared property, initialized in constructor as BASE_DIR/templates/shared
• Update getFile(): try theme path first, return shared path as fallback (single is_file() check, no extra I/O when theme file exists)
• Update checkFile(): accept files from either $this->base or $this->shared (realpath-based containment check for both roots)

2. Shared template directory (templates/shared/):

• Move 374 fragments, 5 partials, 6 pages, 3 layouts from all three themes
• Source: lite/ (canonical copy), verified identical in default/ and simple/
• Theme-specific files (~24-34 per theme) remain in their theme directories

Benefits:

• Template files: ~1163 -> ~445 (62% reduction)
• Theme directories now contain only genuinely theme-specific overrides
• Adding a new theme requires only the files that differ from shared/
• Zero change to PHP call sites, helpers, or fragment names

Technical notes:

• Theme path takes priority over shared/ (theme-specific override works)
• Admin theme is unaffected (uses its own base path, no shared/ fallback)
• Cache uses realpath-based hash, works transparently for shared files
• Verified: lite, default, simple all resolve fragments via fallback
• Verified: admin theme continues to use templates/admin/ exclusively

Remove 23 delegate wrappers and migrate 7 rendering helpers from core/admin.php to core/helpers.php with proper naming. Inline trivial fragments, merge 4 input fields into one parameterized fragment, and eliminate intra-admin duplicate fragments found via content-hash audit.

Core changes:

1. Helpers migration (core/admin.php, core/helpers.php):

• Delete 23 delegate wrappers (adminFlagBox, adminTitleTip, adminMenuItems, etc.)
• Move 7 rendering helpers to helpers.php with renamed canonical names:
  • setAdminNavi -> getTplAdminNavi
  • adminTabListOpen/Close/Link -> getTplAdminTabOpen/Close/Link
  • adminInfoCountValue/Row/Table -> getTplAdminInfoCount/Row/Table
• Add getTplAdminPanel helper and admin-panel.html fragment
• Add 9 new functions total to core/helpers.php

2. Fragment consolidation (templates/admin/fragments/):

• Merge admin-text/number/url/email-input.html into admin-input.html (itype var)
• Inline getTplHrLine() -> return '<hr>' directly
• Inline trivial tr-open/close, br, br-br, table-close, form-close fragments
• Redirect admin-database-status-tag -> admin-flag-box (identical content)
• Redirect admin-fields/replace-tab-content -> admin-tab-content (3-way dup)
• Redirect admin-news-asso-table -> admin-shop-assoc-table (identical)
• Redirect admin-security-ban-tabs -> admin-uploads-config-tabs (identical)
• Inline admin-security-tab-divider (<hr>), admin-*-row-open/close (<tr>/<tr>)
• Delete admin-category-img-preview (use img-preview as canonical)
• Net result: 366 -> 347 fragments in templates/admin/

3. Call-site updates (admin/modules/.php, modules//admin/index.php):

• Replace all old function names with new getTplAdmin* equivalents
• Replace direct getHtmlFrag() calls for duplicate fragments with canonical names

Benefits:

• core/admin.php no longer contains rendering logic (separation of concerns)
• Single entry point for all admin rendering via core/helpers.php
• 19 fewer fragment files in templates/admin/
• Consistent naming convention across all helpers

Technical notes:

• Public API of all helpers unchanged (getTplTextInput etc. still work)
• Fragment variable names updated per naming rules (itype, pid, cont)
• All changes verified with php -l

Replace every inline HTML tag in admin modules, frontend modules, and core helper functions with template fragments or existing helper calls, completing the full PHP-without-HTML migration across the entire codebase.

Core changes:

1. Core functions (core/system.php):

• categorySelectOption(): delegate to getTplOption() — removes <option> inline HTML
• title_tip(): use title-tip.html fragment — removes <nav><div> inline HTML
• ad_status(): use span-btn.html / link-btn.html — removes all <span>/<a> inline HTML

2. New shared fragments (all 4 themes: default/lite/simple/admin):

• title-tip.html: <nav class="sl_tip"><div>{{{ content }}}</div></nav>
• rating-box.html: <div class="min-rate"><div class="rate-like-box">{{{ content }}}</div></div>
• form-checkall.html: checkall <input> for list headers
• td-check.html: <td><input type="checkbox"> for list rows
• tr-open.html / tr-close.html: structural table row wrappers
• img-preview.html: <img id="picture"> for config image preview

3. Admin modules (19 files):

• adminTitleTipLabel/adminTitleTip with <br> separators → getTplAdminTipLine()
• getcat(..., '<option>') → getcat(..., getTplOption())
• <a href target="_blank"> links → getTplAdminTextLink()
• <br><br> before fields → $tpl->getHtmlFrag('br-br', [])
• <div>...<hr> voting preview → div-hr.html fragment
• <tr>/</tr> in news asso table → tr-open.html / tr-close.html
• <th> checkall → th-nosort.html + form-checkall.html
• <td> checkbox → td-check.html
• <img> preview → img-preview.html
• activate() in money/order: add global $tpl, use br-br fragment for email

4. Frontend modules (5 files):

• rss/index.php: <option selected> → getTplOption(..., true)
• users/index.php: <br> tip lines → getTplAdminTipLine(); <div rating> → rating-box.html
• shop/index.php: <br> tip lines → getTplAdminTipLine() in $website/$note
• money/index.php: $sinfo .= val.<br> → getTplAdminInfoLine()
• voting/index.php: <div id="rep..."> → post-div.html fragment

Benefits:

• Zero raw HTML tags remain in any module or core helper PHP file
• All HTML exclusively lives in .html fragment files under templates/
• categorySelectOption, title_tip, ad_status now fully template-driven
• 125/125 phpunit tests pass (1 pre-existing CRLF failure unchanged)

Technical notes:

• Justified exceptions: filterMarkdown class (IS the HTML generator), PDO constructor error path ($tpl unavailable), template engine asset management (circular dependency), RSS/XML generation, commented-out code
• New fragments synced across all 4 theme dirs (hash-identical per phpunit)
• getTplAdminTipLine trailing-<br> differs slightly from original leading-<br> pattern in tooltips — visually equivalent, no behavioral change