Thread: [xoops-svn] SF.net SVN: xoops-svn:[10490] XoopsModules/xoopstube/trunk/xoopstube

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10490
          http://sourceforge.net/p/xoops/svn/10490
Author:   beckmi
Date:     2012-12-23 00:04:20 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Updating to 1.05 Final

Modified Paths:
--------------
    XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php
    XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php
    XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php
    XoopsModules/xoopstube/trunk/xoopstube/admin/menu.php
    XoopsModules/xoopstube/trunk/xoopstube/admin/permissions.php
    XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_top.php
    XoopsModules/xoopstube/trunk/xoopstube/brokenvideo.php
    XoopsModules/xoopstube/trunk/xoopstube/docs/changelog.txt
    XoopsModules/xoopstube/trunk/xoopstube/include/functions.php
    XoopsModules/xoopstube/trunk/xoopstube/language/english/modinfo.php
    XoopsModules/xoopstube/trunk/xoopstube/xoops_version.php

Added Paths:
-----------
    XoopsModules/xoopstube/trunk/xoopstube/docs/install.txt
    XoopsModules/xoopstube/trunk/xoopstube/docs/lang_diff.txt

Removed Paths:
-------------
    XoopsModules/xoopstube/trunk/xoopstube/class/category.php

Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php
===================================================================

--- XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -1,6 +1,6 @@
 <?php
 echo"<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n"
-    . "    <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+    . "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
     . "  </div>\n" . "  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
 
 xoops_cp_footer();
\ No newline at end of file

Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -40,12 +40,9 @@
 $pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
-    include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
-} else {
-    redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, FALSE);
-}
 
+include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+
 include  $thisModulePath . '/include/config.php';
 include_once  $thisModulePath . '/include/functions.php';
 include_once  $thisModulePath . '/include/video.php';

Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -158,9 +158,9 @@
                 . '" target="_blank">' . $videoshowname . '</a></td>';
 
             if ($email == '') {
-                echo '<td class="even">' . xoops_getLinkedUnameFromId($sender) . ' (' . $ip . ')</td>';
+                echo '<td class="even">' . XoopsUserUtility::getUnameFromId($sender) . ' (' . $ip . ')</td>';
             } else {
-                echo'<td class="even"><a href="mailto:' . $email . '">' . xoops_getLinkedUnameFromId($sender) . '</a> ('
+                echo'<td class="even"><a href="mailto:' . $email . '">' . XoopsUserUtility::getUnameFromId($sender) . '</a> ('
                     . $ip . ')</td>';
             }
             if ($owneremail == '') {

Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/menu.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/menu.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/menu.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -37,18 +37,13 @@
 $adminmenu[$i]["title"] = _MI_XTUBE_BINDEX;
 $adminmenu[$i]["link"]  = "admin/main.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/manage.png';
-$i++;
-
-$adminmenu[$i]["title"] = _MI_XTUBE_INDEXPAGE;
-$adminmenu[$i]["link"]  = "admin/indexpage.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . '/index.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_XTUBE_MCATEGORY;
-$adminmenu[$i]['link']  = "admin/category.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . '/category.png';
 //$i++;
+//$adminmenu[$i]['title'] = _MI_XTUBE_MCATEGORY;
+//$adminmenu[$i]['link']  = "admin/category.php";
+//$adminmenu[$i]["icon"]  = $pathIcon32 . '/category.png';
+//$i++;
 //$adminmenu[$i]['title'] = _MI_XTUBE_MVIDEOS;
-//$adminmenu[$i]['link']  = "admin/main.php?op=edit";
+//$adminmenu[$i]['link']  = "admin/xoopstube.php?op=edit";
 //$adminmenu[$i]["icon"]  = $pathIcon32 . '/marquee.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_XTUBE_SNEWFILESVAL;
@@ -84,7 +79,12 @@
 $adminmenu[$i]['title'] = _MI_XTUBE_MVOTEDATA;
 $adminmenu[$i]['link']  = "admin/votedata.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/poll.png';
+$i++;
 
+$adminmenu[$i]["title"] = _MI_XTUBE_INDEXPAGE;
+$adminmenu[$i]["link"]  = "admin/indexpage.php";
+$adminmenu[$i]["icon"]  = $pathIcon32 . '/index.png';
+
 $i++;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]["link"]  = "admin/about.php";

Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/permissions.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/permissions.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/permissions.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -51,7 +51,7 @@
     break;
 }
 
-$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc);
+$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php');
 $result   = $xoopsDB->query('SELECT cid, pid, title FROM ' . $xoopsDB->prefix('xoopstube_cat') . ' ORDER BY title ASC');
 if ($xoopsDB->getRowsNum($result)) {
     while ($permrow = $xoopsDB->fetcharray($result)) {

Modified: XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_top.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_top.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_top.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -46,6 +46,135 @@
     return TRUE;
 }
 
+
+function b_xoopstube_top_thumbs( $bvidid, $btitle, $bsource, $bpicurl, $size = array() )
+{
+  $thumbb='';
+  $modhandler = xoops_gethandler( 'module' );
+  $xtubeModule = $modhandler -> getByDirname( 'xoopstube' );
+  $config_handler = xoops_gethandler( 'config' );
+  $xtubeModuleConfig = $config_handler -> getConfigsByCat( 0, $xtubeModule -> getVar( 'mid' ) );
+  if( isset($size['shotwidth'])) {
+    $xtubeModuleConfig['shotwidth'] = $size['shotwidth'];
+  }
+  if (isset($size['shotheight'])) {
+    $xtubeModuleConfig['shotheight'] = $size['shotheight'];
+  }
+// Determine if video source YouTube
+  if ($bsource == 0)
+  {
+  $thumbb = '<img src="http://img.youtube.com/vi/' . $bvidid . '/default.jpg" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+ // Determine if video source MetaCafe
+  if ($bsource == 1)
+  {
+  list($metaclip) = split('[/]', $bvidid);
+  $videothumb['metathumb'] = $metaclip;
+  $thumbb = '<img src="http://www.metacafe.com/thumb/' . $videothumb['metathumb'] . '.jpg" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+// Determine if video source iFilm/Spike
+  if ($bsource == 2)
+  {
+  $thumbb = '<img src="http://img2.ifilmpro.com/resize/image/stills/films/resize/istd/' . $bvidid . '.jpg?width=' . $xtubeModuleConfig['shotwidth'] . ' title="' . $btitle . '" alt="' . $btitle . '" border="0" />';
+  }
+// Determine if video source Photobucket
+  if ($bsource == 3)
+  {
+  $thumbb = '<img src="http://i153.photobucket.com/albums/' . $bvidid . '.jpg" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+// Determine if video source Google Video / MySpace TV / DailyMotion
+  if ($bsource == 100)
+  {
+  $thumbb = '<img src="' . $bpicurl . '" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+// Determine if video source MySpace TV
+  if ($bsource == 101)
+  {
+  $thumbb = '<img src="' . $bpicurl . '" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+// Determine if video source DailyMotion
+  if ($bsource == 102)
+  {
+  $thumbb = '<img src="' . $bpicurl . '" title="' . $btitle . '" alt="' . $btitle . '" width="' . $xtubeModuleConfig['shotwidth'] . '" height="' . $xtubeModuleConfig['shotheight'] . '"  border="0" />';
+  }
+  return $thumbb;
+}
+
+/* Function: b_xoopstube_spotlight_show
+ * Input   : $options[0] = date for the most recent videos
+ * 			   hits for the most popular videos
+ *           $block['content'] = The optional above content
+ *           $options[1] = How many videos are displayes
+ * Output  : Returns the most recent or most popular videos
+ */
+function b_xoopstube_spotlight( $options )
+{
+    global $xoopsDB, $xoopsModuleConfig;
+    include_once dirname(dirname(__FILE__)) . '/include/video.php';
+    $block = array();
+    $modhandler = xoops_gethandler( 'module' );
+    $xtubeModule = $modhandler -> getByDirname( 'xoopstube' );
+    $config_handler = xoops_gethandler( 'config' );
+    $xtubeModuleConfig = $config_handler -> getConfigsByCat( 0, $xtubeModule -> getVar( 'mid' ) );
+    $xtubemyts = &MyTextSanitizer :: getInstance();
+
+    $options[1] = 4;
+    $result = $xoopsDB -> query( "SELECT lid, cid, title, vidid, date, hits, vidsource, picurl FROM " . $xoopsDB -> prefix( 'xoopstube_videos' ) . " WHERE published > 0 AND published <= " . time() . " AND (expired = 0 OR expired > " . time() . ") AND offline = 0 ORDER BY " . $options[0] . " DESC", $options[1], 0 );
+
+    $i = 0;
+    while ( $myrow = $xoopsDB -> fetchArray( $result ) )
+    {
+        if ( false == checkXTubeBlockGroups( $myrow['cid'] ) || $myrow['cid'] == 0 )
+        {
+            continue;
+        }
+        if ( xtube_b_checkgroups( $myrow['cid'] ) == false )
+        {
+            exit;
+        }
+        $videoload = array();
+        $title = $xtubemyts -> htmlSpecialChars( $xtubemyts ->stripSlashesGPC($myrow["title"]) );
+        if ( !XOOPS_USE_MULTIBYTES )
+        {
+            if ( strlen( $myrow['title'] ) >= $options[2] )
+            {
+                $title = substr( $myrow['title'], 0, ( $options[2] -1 ) ) . "...";
+            }
+        }
+        $videoload['id'] = intval($myrow['lid']);
+        $videoload['cid'] = intval($myrow['cid']);
+        $videoload['title'] = $title;
+        if ( $options[0] == "date" )
+        {
+            $videoload['date'] = formatTimestamp( $myrow['date'], $xtubeModuleConfig['dateformat'] );
+        }
+            elseif ( $options[0] == "hits" )
+        {
+            $videoload['hits'] = $myrow['hits'];
+        }
+
+        $size = array();
+        $rate = 425/350;
+        $size['shotwidth']  = '100';
+        $size['shotheight'] =  intval($size['shotwidth'] / $rate);
+
+        if ($i == 0 && $myrow['vidsource'] == 0) {
+            $videowidth = 340;
+            $videoheight = intval($videowidth / $rate);
+            $showvideo = '<object width="' . $videowidth . '" height="' . $videoheight . '"><param name="movie" value="http://www.youtube.com/v/' . $myrow['vidid'] . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $myrow['vidid'] . '" type="application/x-shockwave-flash" wmode="transparent" width="' . $videowidth . '" height="' . $videoheight . '"></embed></object>';
+            $videoload['showvideo'] = $showvideo;
+        }
+
+        $videoload['videothumb'] = b_xoopstube_top_thumbs($myrow['vidid'],$title,$myrow['vidsource'],$myrow['picurl'],$size);
+
+        $videoload['dirname'] = $xtubeModule -> getVar( 'dirname' );
+        $block['videos'][] = $videoload;
+        $i++;
+    }
+    unset( $_block_check_array );
+    return $block;
+}
+
 // Function: b_xoopstube_top_show
 // Input   : $options[0] = date for the most recent videos
 // 			   hits for the most popular videos
@@ -64,7 +193,7 @@
     $xtubeModuleConfig = $config_handler->getConfigsByCat(0, $xtubeModule->getVar('mid'));
     $xtubemyts         = &MyTextSanitizer :: getInstance();
 
-    if ($options[4] > 0) {
+    if (isset($options[4]) && ($options[4] > 0)) {
         $result = $xoopsDB->query(
             'SELECT lid, cid, title, vidid, screenshot, published, hits, vidsource, picurl FROM '
                 . $xoopsDB->prefix('xoopstube_videos') . ' WHERE published>0
@@ -140,7 +269,7 @@
     $xtubeModuleConfig = $config_handler->getConfigsByCat(0, $xtubeModule->getVar('mid'));
     $xtubemyts         = &MyTextSanitizer :: getInstance();
 
-    if ($options[4] > 0) {
+    if (isset($options[4]) && ($options[4] > 0)) {
         $result2 = $xoopsDB->query(
             'SELECT lid, cid, title, vidid, screenshot, published, vidsource, picurl FROM '
                 . $xoopsDB->prefix('xoopstube_videos') . ' WHERE published > 0
@@ -179,7 +308,9 @@
         $videorandom['id']         = intval($myrow['lid']);
         $videorandom['cid']        = intval($myrow['cid']);
         $videorandom['title']      = $title;
+        if (isset($options[3])) {
         $videorandom['date']       = xoopstube_time(formatTimestamp($myrow['published'], $options[3]));
+        }
         $videorandom['videothumb'] = xtube_videothumb(
             $myrow['vidid'], $myrow['title'], $myrow['vidsource'], $myrow['picurl'],
             $xtubeModuleConfig['videoimgdir'] . '/'
@@ -205,7 +336,8 @@
     $xtubeModuleConfig = $config_handler->getConfigsByCat(0, $xtubeModule->getVar('mid'));
     $xtubemyts         = &MyTextSanitizer :: getInstance();
 
-    if ($options[4] > 0) {
+
+if (isset($options[4]) && ($options[4] > 0)) {
         $result2 = $xoopsDB->query(
             'SELECT lid, cid, title, vidid, screenshot, published, vidsource, picurl FROM '
                 . $xoopsDB->prefix('xoopstube_videos') . ' WHERE published > 0
@@ -226,6 +358,7 @@
         );
     }
 
+
     include_once XOOPS_ROOT_PATH . '/modules/' . $xtubeModule->getVar('dirname') . '/include/video.php';
     include_once XOOPS_ROOT_PATH . '/modules/' . $xtubeModule->getVar('dirname') . '/include/functions.php';
 
@@ -245,7 +378,9 @@
         $videorandomh['id']    = intval($myrow['lid']);
         $videorandomh['cid']   = intval($myrow['cid']);
         $videorandomh['title'] = $title;
+        if (isset($options[3]) ) {
         $videorandomh['date']  = xoopstube_time(formatTimestamp($myrow['published'], $options[3]));
+        }
         include_once XOOPS_ROOT_PATH . '/modules/' . $xtubeModule->getVar('dirname') . '/include/video.php';
         $videorandomh['videothumb'] = xtube_videothumb(
             $myrow['vidid'], $myrow['title'], $myrow['vidsource'], $myrow['picurl'],

Modified: XoopsModules/xoopstube/trunk/xoopstube/brokenvideo.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/brokenvideo.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/brokenvideo.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -104,11 +104,11 @@
 
     $sql       = 'SELECT * FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' WHERE lid=' . intval($lid);
     $broke_arr = $xoopsDB->fetchArray($xoopsDB->query($sql));
-
+    xoops_load('XoopsUserUtility');
     if (is_array($broke_arr)) {
         $broken['title']        = $xtubemyts->htmlSpecialCharsStrip($video_arr['title']);
         $broken['id']           = $broke_arr['reportid'];
-        $broken['reporter']     = xoops_getLinkedUnameFromId($broke_arr['sender']);
+        $broken['reporter']     =XoopsUserUtility::getUnameFromId($broke_arr['sender']);
         $broken['date']         = xoopstube(formatTimestamp($broke_arr['date'], $xoopsModuleConfig['dateformat']));
         $broken['acknowledged'] = ($broke_arr['acknowledged'] == 1) ? _YES : _NO;
         $broken['confirmed']    = ($broke_arr['confirmed'] == 1) ? _YES : _NO;
@@ -126,8 +126,9 @@
         $time               = ($video_arr['published'] > 0) ? $video_arr['published'] : $link_arr['updated'];
         $video['updated']   = xoopstube_time(formatTimestamp($time, $xoopsModuleConfig['dateformat']));
         $is_updated         = ($video_arr['updated'] != 0) ? _MD_XTUBE_UPDATEDON : _MD_XTUBE_SUBMITDATE;
-        $video['publisher'] = xoops_getLinkedUnameFromId($video_arr['submitter']);
 
+        $video['publisher'] =XoopsUserUtility::getUnameFromId($video_arr['submitter']);
+
         $xoopsTpl->assign('video_id', intval($lid));
         $xoopsTpl->assign('lang_subdate', $is_updated);
         $xoopsTpl->assign('video', $video);

Deleted: XoopsModules/xoopstube/trunk/xoopstube/class/category.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/class/category.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/class/category.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -1,8 +0,0 @@
-<?php
-/**
- * Created by JetBrains PhpStorm.
- * User: Mamba
- * Date: 4/30/12
- * Time: 7:14 AM
- * To change this template use File | Settings | File Templates.
- */
\ No newline at end of file

Modified: XoopsModules/xoopstube/trunk/xoopstube/docs/changelog.txt
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/docs/changelog.txt	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/docs/changelog.txt	2012-12-23 00:04:20 UTC (rev 10490)
@@ -1,11 +1,18 @@
-CHANGE LOG:
+=========================================================
+2012-12-19  1.05 Final
+=========================================================
 
+- Final Release
+- TODO: fix spotlight block
+
 =========================================================
-2012-04-25  1.05 RC 1 
+2012-04-25  1.05 RC1
 =========================================================
-- fixed bug related to xtubeTextSanitizer constructor overriding (mamba)
+
+- added spotlight blocks (Mariane)
+
 =========================================================
-2012-04-25  1.05 Beta 1 
+2012-04-25  1.05 Beta 1
 =========================================================
 
 - converted to XOOPS 2.5.x Admin GUI (mamba)

Added: XoopsModules/xoopstube/trunk/xoopstube/docs/install.txt
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/docs/install.txt	                        (rev 0)
+++ XoopsModules/xoopstube/trunk/xoopstube/docs/install.txt	2012-12-23 00:04:20 UTC (rev 10490)
@@ -0,0 +1,6 @@
+INSTALL/UNISTALL
+=================
+
+No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+
+Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i)
\ No newline at end of file

Added: XoopsModules/xoopstube/trunk/xoopstube/docs/lang_diff.txt
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/docs/lang_diff.txt	                        (rev 0)
+++ XoopsModules/xoopstube/trunk/xoopstube/docs/lang_diff.txt	2012-12-23 00:04:20 UTC (rev 10490)
@@ -0,0 +1,15 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Legend :
++ Added
+- Removed
+* Modified
+x renamed
+
+---------------------------------------
+1.05 Final  2012-12-19
+---------------------------------------
+

Modified: XoopsModules/xoopstube/trunk/xoopstube/include/functions.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/include/functions.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/include/functions.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -798,15 +798,15 @@
 }
 
 function xtube_uploading(
-    $_FILES, $uploaddir = 'uploads', $allowed_mimetypes = '', $redirecturl = 'index.php', $num = 0, $redirect = 0,
+    $FILES, $uploaddir = 'uploads', $allowed_mimetypes = '', $redirecturl = 'index.php', $num = 0, $redirect = 0,
     $usertype = 1
 ) {
-    global $_FILES, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
+    global $FILES, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
     $down = array();
     include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/class/uploader.php';
     if (empty($allowed_mimetypes)) {
-        $allowed_mimetypes = xtube_retmime($_FILES['userfile']['name'], $usertype);
+        $allowed_mimetypes = xtube_retmime($FILES['userfile']['name'], $usertype);
     }
     $upload_dir = XOOPS_ROOT_PATH . '/' . $uploaddir . '/';
 

Modified: XoopsModules/xoopstube/trunk/xoopstube/language/english/modinfo.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/language/english/modinfo.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/language/english/modinfo.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -31,7 +31,7 @@
 define("_MI_XTUBE_BINDEX","Admin");
 define("_MI_XTUBE_INDEXPAGE","Index Page");
 define("_MI_XTUBE_MCATEGORY","Categories ");
-define("_MI_XTUBE_MVIDEOS","Videos");
+define("_MI_XTUBE_MVIDEOS","Local Videos");
 define("_MI_XTUBE_MUPLOADS","Image Upload");
 define("_MI_XTUBE_PERMISSIONS","Permissions");
 define("_MI_XTUBE_BLOCKADMIN","Block Settings");
@@ -305,4 +305,5 @@
 define("_MI_XTUBE_SREVIEWS","Reviews: ");
 define("_MI_XTUBE_SBROKENSUBMIT","Broken");
 
-?>
\ No newline at end of file
+//Version 1.05 RC2
+define("_MI_XTUBE_BNAME11","Spotlight videos");
\ No newline at end of file

Modified: XoopsModules/xoopstube/trunk/xoopstube/xoops_version.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/xoops_version.php	2012-12-23 00:02:26 UTC (rev 10489)
+++ XoopsModules/xoopstube/trunk/xoopstube/xoops_version.php	2012-12-23 00:04:20 UTC (rev 10490)
@@ -8,7 +8,7 @@
 
 $modversion['name']        = _MI_XTUBE_NAME;
 $modversion['version']     = '1.05';
-$modversion['releasedate'] = 'June 19, 2012';
+//$modversion['releasedate'] = 'June 19, 2012';
 $modversion['status']      = 'Final';
 $modversion['description'] = _MI_XTUBE_DESC;
 //$modversion['license'] 		= _MI_XTUBE_LICENSEDSC;
@@ -35,12 +35,12 @@
 $modversion['icons32']        = '../../Frameworks/moduleclasses/icons/32';
 
 //about
-$modversion['release_date']        = '2012/06/19';
+$modversion['release_date']        = '2012/12/19';
 $modversion["module_website_url"]  = "www.xoops.org/";
 $modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"]       = "RC 1";
+$modversion["module_status"]       = "Final";
 $modversion['min_php']             = '5.2';
-$modversion['min_xoops']           = "2.5";
+$modversion['min_xoops']           = "2.5.5";
 $modversion['min_admin']           = '1.1';
 $modversion['min_db']              = array(
     'mysql'  => '5.0.7',
@@ -163,6 +163,16 @@
 $modversion['blocks'][10]['template']    = 'xoopstube_tag_block_tag.html';
 $modversion['blocks'][10]['can_clone']   = TRUE;
 
+
+$modversion['blocks'][11]['file'] = "xoopstube_top.php";
+$modversion['blocks'][11]['name'] = _MI_XTUBE_BNAME11;
+$modversion['blocks'][11]['description'] = "Shows spotlight video";
+$modversion['blocks'][11]['show_func'] = "b_xoopstube_spotlight";
+$modversion['blocks'][11]['edit_func'] = "b_xoopstube_top_edit";
+$modversion['blocks'][11]['options'] = "date|3|19";
+$modversion['blocks'][11]['template'] = 'xoopstube_block_spotlight.html';
+$modversion['blocks'][11]['can_clone'] = true ;
+
 // Menu
 $modversion['hasMain'] = 1;
 





Thread: [xoops-svn] SF.net SVN: xoops-svn:[10490] XoopsModules/xoopstube/trunk/xoopstube

The world's leading content management systems (CMS) written in PHP

xoops-svn