Merge pull request #19 from mambax7/master

1.08 Beta 1
XoopsModules25x · Nov 27, 2020 · 6499a1c · 6499a1c
2 parents 02dd481 + e55ef0f
commit 6499a1c
Show file tree

Hide file tree

Showing 279 changed files with 9,678 additions and 4,320 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,13 +5,13 @@
 *.cs     diff=csharp
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc     diff=astextplain
+*.DOC     diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF     diff=astextplain
+*.rtf     diff=astextplain
+*.RTF     diff=astextplain
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,50 +1,24 @@
-checks:
+# language: php
+build:
+  nodes:
+    tests: true
+    analysis:
+      dependencies:
+        after:
+        # The following installs the most recent XOOPS CMS version, you might want
+        # to install a specific release tag or branch instead.
+        - git clone --depth=1 https://github.com/XOOPS/XoopsCore25
+        - git clone --depth=1 https://github.com/mambax7/tag
+      project_setup:
+        override: true
+      tests:
+        override:
+          - php-scrutinizer-run --enable-security-analysis
+  environment:
     php:
-        code_rating: true
-        variable_existence: true
-        useless_calls: true
-        use_statement_alias_conflict: true
-        unused_variables: true
-        unused_properties: true
-        unused_parameters: true
-        unused_methods: true
-        unreachable_code: true
-        sql_injection_vulnerabilities: true
-        security_vulnerabilities: true
-        precedence_mistakes: true
-        precedence_in_conditions: true
-        parameter_non_unique: true
-        no_property_on_interface: true
-        no_non_implemented_abstract_methods: true
-        deprecated_code_usage: true
-        closure_use_not_conflicting: true
-        closure_use_modifiable: true
-        avoid_useless_overridden_methods: true
-        avoid_conflicting_incrementers: true
-        assignment_of_null_return: true
-        verify_property_names: true
-        verify_argument_usable_as_reference: true
-        verify_access_scope_valid: true
-        use_self_instead_of_fqcn: true
-        too_many_arguments: true
-        single_namespace_per_use: true
-        return_doc_comment_if_not_inferrable: true
-        return_doc_comments: true
-        require_scope_for_methods: true
-        require_scope_for_properties: true
-        require_php_tag_first: true
-        require_braces_around_control_structures: true
-        psr2_control_structure_declaration: true
-        psr2_switch_declaration: true
-        psr2_class_declaration: true
-        no_eval: true
-        no_else_if_statements: true
-        avoid_corrupting_byteorder_marks: true
-        argument_type_checks: true
-        php5_style_constructor: true
-        parameter_doc_comments: true
-        no_duplicate_arguments: true
-        missing_arguments: true
-        instanceof_class_exists: true
-        foreach_traversable: true
-        no_unnecessary_function_call_in_for_loop: true
+      version: "7.2"
+filter:
+  dependency_paths:
+    - XoopsCore25/*
+    - tag/*
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,20 +1,20 @@
-![alt XOOPS CMS](http://xoops.org/images/logoXoops4GithubRepository.png)
-# Contributing to [XOOPS CMS](http://xoops.org)
-[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](http://xoops.org)
-[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
+![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
+# Contributing to [XOOPS CMS](https://xoops.org)
+[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
+[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
 
 Contributions are **welcome** and will be fully **credited**.
 
-We accept contributions via Pull Requests on [Github](https://github.com/XoopsModules25x/xoopseditors).
+We accept contributions via Pull Requests on [Github](https://github.com/XoopsModules25x/xoopstube).
 
 ## Pull Requests
 
-- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
-- **Add tests!** - We encourage to provide tests for your contributions.
-- **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are kept up-to-date.
+- **[PSR-12 Coding Standard](https://www.php-fig.org/psr/psr-12/)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
+- **Add tests!** - We encourage providing tests for your contributions.
+- **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are up-to-date.
 - **Consider our release cycle** - We try to follow [Semantic Versioning v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
 - **Create feature branches** - Don't ask us to pull from your master branch.
 - **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
 - **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
 
-**Happy coding, and _May the Source be with You_!**
+Happy coding, and **_May the Source be with You_**!
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/blocks/index.php b/EXTRA/themes/xbootstrap/modules/xoopstube/blocks/index.php
@@ -0,0 +1,3 @@
+<?php
+
+header('HTTP/1.0 404 Not Found');
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/blocks/xoopstube_block_new.tpl b/EXTRA/themes/xbootstrap/modules/xoopstube/blocks/xoopstube_block_new.tpl
@@ -0,0 +1,11 @@
+<div class="xoopstube-blocks row">
+    <{foreach item=videoload from=$block.videos}>
+        <div class="col-md-4 xoopstube-thumb">
+            <a href="<{$xoops_url}>/modules/<{$videoload.dirname}>/singlevideo.php?cid=<{$videoload.cid}>&lid=<{$videoload.id}>"><{$videoload.videothumb}></a>
+                <span>
+                    <a href="<{$xoops_url}>/modules/<{$videoload.dirname}>/singlevideo.php?cid=<{$videoload.cid}>&lid=<{$videoload.id}>"><{$videoload.title}></a>
+                    <{$videoload.date}>
+                </span>
+        </div>
+    <{/foreach}>
+</div>
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/index.php b/EXTRA/themes/xbootstrap/modules/xoopstube/index.php
@@ -0,0 +1,3 @@
+<?php
+
+header('HTTP/1.0 404 Not Found');
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/videoload.tpl b/EXTRA/themes/xbootstrap/modules/xoopstube/videoload.tpl
@@ -0,0 +1,50 @@
+<{if $show_category_title === true}>
+<{$smarty.const._MD_XOOPSTUBE_CATEGORYC}> <{$video.category}>
+<{/if}>
+
+<a href="<{$xoops_url}>/modules/<{$video.module_dir}>/singlevideo.php?cid=<{$video.cid}>&amp;lid=<{$video.id}>">
+    <{$video.title}>
+</a>
+<{$video.icons}>
+
+<{if $xoops_isadmin}>
+<{$video.adminvideo}>
+<{/if}>
+
+<{if $video.published > 0 }>
+<a href="<{$xoops_url}>/modules/<{$video.module_dir}>/singlevideo.php?cid=<{$video.cid}>&amp;lid=<{$video.id}>">
+    <img src="<{$xoops_url}>/modules/<{$video.module_dir}>/assets/images/icon/play.png"
+         alt="<{$smarty.const._MD_XOOPSTUBE_VIEWDETAILS}>" title="<{$smarty.const._MD_XOOPSTUBE_VIEWDETAILS}>">
+</a>
+<{/if}>
+<{if $video.showsubmitterx}>
+<{$smarty.const._MD_XOOPSTUBE_SUBMITTER}>: <{$video.submitter}>
+<{/if}>
+<{$smarty.const._MD_XOOPSTUBE_PUBLISHER}>: <{$video.publisher}>
+<{$lang_subdate}>: <{$video.updated}>
+<{$video.hits|wordwrap:50:"\n":true}>
+<{$smarty.const._MD_XOOPSTUBE_TIMEB}> <{$video.time}>
+
+<{if $video.showrating}>
+<br>
+
+<div class="xoopstube_infoblock">
+    <span style="font-weight: bold;"><{$smarty.const._MD_XOOPSTUBE_RATINGC}></span>&nbsp;<img
+        src="<{$xoops_url}>/modules/<{$video.module_dir}>/assets/images/icon/<{$video.rateimg}>" alt="" align="middle">&nbsp;&nbsp;(<{$video.votes}>)
+</div>
+<{/if}>
+</div>
+
+<div style="float: left; padding: 0 4px 4px 0;">
+    <{if $video.screen_shot}>
+    <a href="<{$xoops_url}>/modules/<{$video.module_dir}>/singlevideo.php?cid=<{$video.cid}>&amp;lid=<{$video.id}>"
+       target=""><{$video.videothumb}></a>
+    <{/if}>
+</div>
+
+<div>
+    <span style="font-weight: bold;"><{$smarty.const._MD_XOOPSTUBE_DESCRIPTIONC}></span><br>
+    <{$video.description|truncate:$video.total_chars}>
+</div>
+
+<div style="clear: both; width: 99%;">&nbsp;</div>
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/xoopstube_index.tpl b/EXTRA/themes/xbootstrap/modules/xoopstube/xoopstube_index.tpl
@@ -0,0 +1,73 @@
+<div class="xoopstube ">
+    <{if $catarray.imageheader != ""}>
+        <div class="xoopstube-header text-center">
+            <{$catarray.imageheader}>
+        </div>
+        <!-- .xoopstube-header -->
+    <{/if}>
+
+    <{if $catarray.indexheading != ""}>
+        <div class="text-center xoopstube-header-text">
+            <h1><{$catarray.indexheading}></h1>
+        </div>
+        <!-- .xoopstube-header-text -->
+    <{/if}>
+
+    <{if $catarray.indexheader != ""}>
+        <div class="xoopstube-description text-center">
+            <{$catarray.indexheader}>
+        </div>
+        <!-- .xoopstube-description -->
+    <{/if}>
+
+    <{*-------------Letter Choice Start -----------------------------*}>
+
+    <{if $catarray.letters}>
+        <div class="xoopstube_head_catletters" align="center">
+            <{$letterChoiceTitle}>
+            <{$catarray.letters}></div>
+        <br>
+    <{/if}>
+    <{*-------------Letter Choice End -----------------------------*}>
+
+    <{if $categories|is_array && count($categories) > 0}>
+        <h1 class="xoops-default-title"><{$smarty.const._MD_XOOPSTUBE_MAINLISTING}></h1>
+        <div class="row">
+            <{foreach item=category from=$categories}>
+                <div class="col-sm-4 col-md-4 category-titles">
+                    <a href="<{$xoops_url}>/modules/<{$module_dir}>/viewcat.php?cid=<{$category.id}>" title="<{$category.title}>"
+                       class="btn btn-primary btn-block">
+                        <{$category.title}> <span class="badge"><{$category.totalvideos}></span>
+                    </a>
+                </div>
+                <{if $category.subcategories}>
+                    <{$category.subcategories}>
+                <{/if}>
+            <{/foreach}>
+        </div>
+        <div class="xoopstube-data">
+            <div class="row">
+                <div class="col-md-12 text-right"><{$lang_thereare}></div>
+            </div>
+        </div>
+        <!-- .xoopstube-data -->
+    <{/if}>
+
+    <div class="xoopstube-footer">
+        <{$catarray.indexfooter}>
+    </div><!-- .xoopstube-footer -->
+
+    <{if $showlatest}>
+        <{$smarty.const._MD_XOOPSTUBE_LATESTLIST}>
+        <{if $pagenav}>
+            <{$pagenav}>
+        <{/if}>
+        <{section name=i loop=$video}>
+            <{include file="db:xoopstube_videoload.tpl" video=$video[i]}>
+        <{/section}>
+        <{if $pagenav}>
+            <{$pagenav}>
+        <{/if}>
+    <{/if}>
+    <{include file="db:system_notification_select.tpl"}>
+</div><!-- .xoopstube -->
diff --git a/EXTRA/themes/xbootstrap/modules/xoopstube/xoopstube_letterschoice.tpl b/EXTRA/themes/xbootstrap/modules/xoopstube/xoopstube_letterschoice.tpl
@@ -0,0 +1,97 @@
+<style type="text/css">
+    .button_green {
+        -moz-box-shadow: inset 0 1px 0 0 #d9fbbe;
+        -webkit-box-shadow: inset 0 1px 0 0 #d9fbbe;
+        box-shadow: inset 0 1px 0 0 #d9fbbe;
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #d9fbbe), color-stop(1, #d9fbbe));
+        background: -moz-linear-gradient(, center top, #a5cc52 5%, #d9fbbe 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9fbbe', endColorstr='#b8e356');
+        background-color: #d9fbbe;
+        -webkit-border-radius: 2px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+        text-indent: 0;
+        border: 1px solid #83c41a;
+        display: inline-block;
+        color: inherit;
+        font-family: inherit;
+        font-size: 12px;
+        font-weight: bold;
+        font-style: normal;
+        height: 20px;
+        line-height: 20px;
+        width: auto;
+        min-width: 10px;
+        text-decoration: none;
+        text-align: center;
+        text-shadow: 1px 1px 0 #d9fbbe;
+        margin: 2px 0;
+        padding: 0 4px;
+    }
+
+    .button_green:hover {
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #b8e356), color-stop(1, #a5cc52));
+        background: -moz-linear-gradient(, center top, #b8e356 5%, #a5cc52 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b8e356', endColorstr='#a5cc52');
+        background-color: #86ae47;
+    }
+
+    .button_green:active {
+        position: relative;
+        top: 1px;
+    }
+
+    .button_grey {
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf));
+        background: -moz-linear-gradient(, center top, #ededed 5%, #dfdfdf 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
+        background-color: #ededed;
+        -webkit-border-radius: 2px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+        text-indent: 0;
+        border: 1px solid #dcdcdc;
+        display: inline-block;
+        color: inherit;
+        font-family: inherit;
+        font-size: 12px;
+        font-weight: bold;
+        font-style: normal;
+        height: 20px;
+        line-height: 20px;
+        width: auto;
+        min-width: 10px;
+        text-decoration: none;
+        text-align: center;
+        text-shadow: 1px 1px 0 #ffffff;
+        margin: 2px 0;
+        padding: 0 4px;
+    }
+
+    .button_grey:hover {
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #dfdfdf), color-stop(1, #ededed));
+        background: -moz-linear-gradient(, center top, #dfdfdf 5%, #ededed 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#ededed');
+        background-color: #dfdfdf;
+    }
+
+    .button_grey:active {
+        position: relative;
+        top: 1px;
+    }
+</style>
+<{*<{$smarty.const._MD_XOOPSTUBE_BROWSETOTOPIC}>*}>
+<{*<{$letterChoiceTitle}>*}>
+<br>
+<div>
+    <{assign var="alphabetcount" value=$alphabet|@count}>
+    <{foreach name=letters item=letter from=$alphabet}>
+    <{if ($letter.count > 0)}>
+        <a class='button_green' href='<{$letter.url}>' title='<{$letter.count}>'><{$letter.letter}></a>
+    <{else}>
+        <span class='button_grey'><{$letter.letter}></span>
+    <{/if}>
+    <{if ($smarty.foreach.letters.iteration == (round($alphabetcount/2))+1)}></div>
+<div><{else}><{/if}>
+    <{/foreach}>
+</div>