Update to 1.0.01

+ Fix compatible with NukeViet 4.0.35 (Remove Google Plus). + Fix compatible with PHP 7.2 or higher. + Fix minor bugs. + Revert to JW Player 7.x. + Add Demo License key to test Module.
anhyeuviolet · May 6, 2019 · 7de9937 · 7de9937
1 parent bab6a0e
commit 7de9937
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 4,225 deletions.
diff --git a/config.ini b/config.ini
@@ -2,11 +2,11 @@
 id="313"
 type="module"
 name="videos"
-version="0.2.07"
+version="1.0.01"
 
 [author]
 name="KENNY NGUYEN"
 email="[email protected]"
 
 [note]
-text="Compatible with NukeViet 4.1"
+text="Compatible with NukeViet 4 Final"
diff --git a/modules/videos/action_mysql.php b/modules/videos/action_mysql.php
@@ -301,7 +301,7 @@
 
 $sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'youtube_api', '')";
 
-$sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'jwplayer_license', '')";
+$sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'jwplayer_license', 'NqPyv5C3s2LTybLMlqx3nfOJTvmRqu9cuQPTrQ==')";
 $sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'jwplayer_autoplay', 'false')";
 $sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'jwplayer_loop', 'false')";
 $sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', '" . $module_name . "', 'jwplayer_controlbar', 'true')";

diff --git a/modules/videos/admin/cat.php b/modules/videos/admin/cat.php
@@ -227,7 +227,7 @@
 
 if (! empty($array_cat_list)) {
     $cat_listsub = array();
-    while (list ($catid_i, $title_i) = each($array_cat_list)) {
+    foreach ($array_cat_list as $catid_i => $title_i) {
         if (! in_array($catid_i, $array_in_cat)) {
             $cat_listsub[] = array(
                 'value' => $catid_i,

diff --git a/modules/videos/admin/content.php b/modules/videos/admin/content.php
@@ -1009,7 +1009,7 @@
 
 // source
 $select = '';
-while (list ($sourceid_i, $source_title_i) = each($array_source_module)) {
+foreach ($array_source_module as $sourceid_i => $source_title_i) {
     $source_sl = ($sourceid_i == $rowcontent['sourceid']) ? ' selected="selected"' : '';
     $select .= "<option value=\"" . $sourceid_i . "\" " . $source_sl . ">" . $source_title_i . "</option>\n";
 }
@@ -1107,29 +1107,6 @@
 $xtpl->assign('UPLOAD_CURRENT', $currentpath);
 $xtpl->assign('UPLOAD_FILE_PATH', $file_path);
 
-$sql = 'SELECT * FROM ' . $db_config['prefix'] . '_googleplus ORDER BY weight ASC';
-$_array = $db->query($sql)->fetchAll();
-if (sizeof($_array)) {
-    $array_googleplus = array();
-    $array_googleplus[] = array(
-        'gid' => - 1,
-        'title' => $lang_module['googleplus_1']
-    );
-    $array_googleplus[] = array(
-        'gid' => 0,
-        'title' => $lang_module['googleplus_0']
-    );
-    foreach ($_array as $row) {
-        $array_googleplus[] = $row;
-    }
-    foreach ($array_googleplus as $grow) {
-        $grow['selected'] = ($rowcontent['gid'] == $grow['gid']) ? ' selected="selected"' : '';
-        $xtpl->assign('GOOGLEPLUS', $grow);
-        $xtpl->parse('main.googleplus.gid');
-    }
-    $xtpl->parse('main.googleplus');
-}
-
 if ($module_config[$module_name]['auto_tags']) {
     $xtpl->parse('main.auto_tags');
 }

diff --git a/modules/videos/admin/main.php b/modules/videos/admin/main.php
@@ -453,17 +453,18 @@
     $xtpl->parse('main.loop');
 }
 
-while (list ($action_i, $title_i) = each($array_list_action)) {
-    if (defined('NV_IS_ADMIN_MODULE') || isset($_permission_action[$action_i])) {
+foreach ($array_list_action as $key => $val) {
+    if (defined('NV_IS_ADMIN_MODULE') || isset($_permission_action[$key])) {
         $action_assign = array(
-            'value' => $action_i,
-            'title' => $title_i
+            'value' => $key,
+            'title' => $val
         );
         $xtpl->assign('ACTION', $action_assign);
         $xtpl->parse('main.action');
     }
 }
 
+
 if (! empty($generate_page)) {
     $xtpl->assign('GENERATE_PAGE', $generate_page);
     $xtpl->parse('main.generate_page');

diff --git a/modules/videos/admin/sources.php b/modules/videos/admin/sources.php
@@ -15,7 +15,7 @@
 list ($sourceid, $title, $link, $logo, $error) = array(
     0,
     '',
-    'http://',
+    'https://',
     '',
     ''
 );

diff --git a/modules/videos/language/admin_en.php b/modules/videos/language/admin_en.php
@@ -5,7 +5,7 @@
 * @Author VINADES.,JSC <[email protected]>
 * @Copyright (C) 2017 VINADES.,JSC. All rights reserved
 * @Language English
-* @License CC BY-SA (http://creativecommons.org/licenses/by-sa/4.0/)
+* @License CC BY-SA (https://creativecommons.org/licenses/by-sa/4.0/)
 * @Createdate Mar 04, 2010, 08:22:00 AM
 */
 
@@ -20,6 +20,7 @@
 $lang_translator['langtype'] = 'lang_module';
 
 $lang_module['no_jwp_lic'] = 'JWplayer License Error';
+$lang_module['preview_jwp_lic'] = 'Demo License';
 $lang_module['categories'] = 'Categories';
 $lang_module['select_category'] = 'Select Category';
 $lang_module['playlists'] = 'Playlists';
@@ -218,7 +219,7 @@
 $lang_module['msgnocheck'] = 'No topic selected';
 $lang_module['facebookAppID'] = 'Facebook App ID';
 $lang_module['setting_youtube_api'] = 'Youtube API';
-$lang_module['facebookAppIDNote'] = '(Form: 1419186468293063, <a href="http://wiki.nukeviet.vn/nukeviet:admin:news:facebookapi" target="_blank">view detail</a>)';
+$lang_module['facebookAppIDNote'] = '(Form: 1419186468293063, <a href="https://wiki.nukeviet.vn/nukeviet:admin:news:facebookapi" target="_blank">view detail</a>)';
 $lang_module['socialbutton'] = 'Display Like facebook, G+, Twitter tools when view aricle';
 $lang_module['block'] = 'Blocks';
 $lang_module['adddefaultblock'] = 'Select the default when creating article';

diff --git a/modules/videos/language/admin_vi.php b/modules/videos/language/admin_vi.php
@@ -5,7 +5,7 @@
 * @Author VINADES.,JSC ([email protected])
 * @Copyright (C) 2016 VINADES.,JSC. All rights reserved
 * @Language Tiếng Việt
-* @License CC BY-SA (http://creativecommons.org/licenses/by-sa/4.0/)
+* @License CC BY-SA (https://creativecommons.org/licenses/by-sa/4.0/)
 * @Createdate Mar 04, 2010, 08:22:00 AM
 */
 
@@ -20,6 +20,7 @@
 $lang_translator['langtype'] = 'lang_module';
 
 $lang_module['no_jwp_lic'] = 'Chưa cấu hình License JWplayer';
+$lang_module['preview_jwp_lic'] = 'Có thể bạn sẽ cần';
 $lang_module['categories'] = 'Quản lý chuyên mục';
 $lang_module['select_category'] = 'Chọn chuyên mục';
 $lang_module['playlists'] = 'Playlist';
@@ -32,7 +33,7 @@
 $lang_module['videos_infomations'] = 'Thông tin Videos';
 $lang_module['videos_count_Fav'] = 'Lượt thích Videos';
 $lang_module['videos_duration'] = 'Thời lượng';
-$lang_module['videos_sources_placeholder'] = 'http://... hoặc Upload';
+$lang_module['videos_sources_placeholder'] = 'https://... hoặc Upload';
 $lang_module['save'] = 'Lưu thay đổi';
 $lang_module['browse_server'] = 'Tải lên';
 $lang_module['action'] = 'Thực hiện';
@@ -224,7 +225,7 @@
 $lang_module['facebookAdminID_tips'] = 'Quản lý bình luận không thông qua FB AppID';
 $lang_module['facebookComment'] = 'Bình luận bằng Facebook';
 $lang_module['setting_youtube_api'] = 'Youtube API';
-$lang_module['facebookAppIDNote'] = ' (Có dạng 1419186468293063, <a href="http://wiki.nukeviet.vn/nukeviet:admin:news:facebookapi" target="_blank">xem chi tiết</a>)';
+$lang_module['facebookAppIDNote'] = ' (Có dạng 1419186468293063, <a href="https://wiki.nukeviet.vn/nukeviet:admin:news:facebookapi" target="_blank">xem chi tiết</a>)';
 $lang_module['facebookAdminIDNote'] = ' (Có dạng 141918646829303)';
 $lang_module['socialbutton'] = 'Hiển thị các công cụ Like facebook, G+, Twitter khi xem Videos';
 $lang_module['block'] = 'Danh sách thể loại';

diff --git a/modules/videos/mobile/index.html b/modules/videos/mobile/index.html
diff --git a/modules/videos/version.php b/modules/videos/version.php
@@ -5,7 +5,7 @@
  * @Author KENNYNGUYEN ([email protected])
  * @Website tradacongnghe.com
  * @License GNU/GPL version 2 or any later version
- * @Createdate Monday, 27 February 2017 08:00:00 GMT
+ * @Createdate Monday, 06 May 2019 08:00:00 GMT
  */
 if (! defined('NV_ADMIN') or ! defined('NV_MAINFILE'))
     die('Stop!!!');
@@ -17,8 +17,8 @@
     'submenu' => 'user-playlist,user-video,rss,search',
     'is_sysmod' => 0, // 1:0 => Co phai la module he thong hay khong
     'virtual' => 1, // 1:0 => Co cho phep ao hoa module hay khong
-    'version' => '0.2.07', // Phien ban cua module
-    'date' => 'Monday, 27 February 2017 08:00:00 GMT', // Ngay phat hanh phien ban
+    'version' => '1.0.01', // Phien ban cua module
+    'date' => 'Monday, 06 May 2019 08:00:00 GMT', // Ngay phat hanh phien ban
     'author' => 'KENNYNGUYEN ([email protected])', // Tac gia
     'note' => 'Compatible with NukeViet 4.1', // Ghi chu
     'uploads_dir' => array(

diff --git a/themes/admin_default/modules/videos/settings.tpl b/themes/admin_default/modules/videos/settings.tpl
@@ -14,6 +14,10 @@
 					<th id="jwplayer_license">{LANG.setting_jwplayer_license}</th>
 					<td><input class="form-control" style="width:50%;" name="jwplayer_license" value="{DATA.jwplayer_license}" type="text"/><span class="text-middle"><br/>{LANG.wiki_get_free_jwlicense}</span></td>
 				</tr>			
+				<tr>
+					<th id="jwplayer_license">{LANG.preview_jwp_lic}</th>
+					<td><pre>NqPyv5C3s2LTybLMlqx3nfOJTvmRqu9cuQPTrQ==</pre></td>
+				</tr>			
 				<tr>
 					<th>{LANG.setting_jwplayer_autoplay}</th>
 					<td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
     list ($sourceid, $title, $link, $logo, $error) = array(
 ,
         '',
-        'http://',
+        'https://',
         '',
         ''
     );
@@ Expand Down @@