Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11722] XoopsModules/xoopstube/trunk/xoopstube
|
From: <be...@us...> - 2013-06-19 16:48:02
|
Revision: 11722
http://sourceforge.net/p/xoops/svn/11722
Author: beckmi
Date: 2013-06-19 16:47:58 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Preparing for Beta 2 (see /docs/changelog.txt)
Modified Paths:
--------------
XoopsModules/xoopstube/trunk/xoopstube/admin/about.php
XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php
XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php
XoopsModules/xoopstube/trunk/xoopstube/admin/altcat.php
XoopsModules/xoopstube/trunk/xoopstube/admin/blockform.php
XoopsModules/xoopstube/trunk/xoopstube/admin/blocksadmin.php
XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php
XoopsModules/xoopstube/trunk/xoopstube/admin/category.php
XoopsModules/xoopstube/trunk/xoopstube/admin/index.php
XoopsModules/xoopstube/trunk/xoopstube/admin/indexpage.php
XoopsModules/xoopstube/trunk/xoopstube/admin/main.php
XoopsModules/xoopstube/trunk/xoopstube/admin/menu.php
XoopsModules/xoopstube/trunk/xoopstube/admin/modifications.php
XoopsModules/xoopstube/trunk/xoopstube/admin/newvideos.php
XoopsModules/xoopstube/trunk/xoopstube/admin/permissions.php
XoopsModules/xoopstube/trunk/xoopstube/admin/upload.php
XoopsModules/xoopstube/trunk/xoopstube/admin/votedata.php
XoopsModules/xoopstube/trunk/xoopstube/admin/vupload.php
XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_banner.php
XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_block_tag.php
XoopsModules/xoopstube/trunk/xoopstube/blocks/xoopstube_top.php
XoopsModules/xoopstube/trunk/xoopstube/brokenvideo.php
XoopsModules/xoopstube/trunk/xoopstube/class/class_lists.php
XoopsModules/xoopstube/trunk/xoopstube/class/class_thumbnail.php
XoopsModules/xoopstube/trunk/xoopstube/class/myts_extended.php
XoopsModules/xoopstube/trunk/xoopstube/class/uploader.php
XoopsModules/xoopstube/trunk/xoopstube/class/xtube_lists.php
XoopsModules/xoopstube/trunk/xoopstube/comment_delete.php
XoopsModules/xoopstube/trunk/xoopstube/comment_edit.php
XoopsModules/xoopstube/trunk/xoopstube/comment_new.php
XoopsModules/xoopstube/trunk/xoopstube/comment_post.php
XoopsModules/xoopstube/trunk/xoopstube/comment_reply.php
XoopsModules/xoopstube/trunk/xoopstube/docs/changelog.txt
XoopsModules/xoopstube/trunk/xoopstube/docs/readme.txt
XoopsModules/xoopstube/trunk/xoopstube/header.php
XoopsModules/xoopstube/trunk/xoopstube/images/category/index.html
XoopsModules/xoopstube/trunk/xoopstube/images/category/thumbs/index.html
XoopsModules/xoopstube/trunk/xoopstube/images/screenshots/thumbs/index.html
XoopsModules/xoopstube/trunk/xoopstube/include/comment_functions.php
XoopsModules/xoopstube/trunk/xoopstube/include/config.php
XoopsModules/xoopstube/trunk/xoopstube/include/functions.php
XoopsModules/xoopstube/trunk/xoopstube/include/notification.inc.php
XoopsModules/xoopstube/trunk/xoopstube/include/onupdate.inc.php
XoopsModules/xoopstube/trunk/xoopstube/include/plugin.tag.php
XoopsModules/xoopstube/trunk/xoopstube/include/search.inc.php
XoopsModules/xoopstube/trunk/xoopstube/include/update.php
XoopsModules/xoopstube/trunk/xoopstube/include/video.php
XoopsModules/xoopstube/trunk/xoopstube/include/videoloadinfo.php
XoopsModules/xoopstube/trunk/xoopstube/index.php
XoopsModules/xoopstube/trunk/xoopstube/language/english/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/english/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/english/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/english/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/english/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/french/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/french/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/french/help/help.html
XoopsModules/xoopstube/trunk/xoopstube/language/french/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/french/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/french/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/german/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/german/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/german/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/german/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/german/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/nederlands/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/nederlands/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/nederlands/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/nederlands/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/nederlands/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/persian/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/persian/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/persian/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/persian/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/persian/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguese/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguese/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguese/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguese/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguese/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguesebr/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguesebr/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguesebr/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguesebr/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/portuguesebr/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/language/spanish/admin.php
XoopsModules/xoopstube/trunk/xoopstube/language/spanish/blocks.php
XoopsModules/xoopstube/trunk/xoopstube/language/spanish/local.php
XoopsModules/xoopstube/trunk/xoopstube/language/spanish/main.php
XoopsModules/xoopstube/trunk/xoopstube/language/spanish/modinfo.php
XoopsModules/xoopstube/trunk/xoopstube/list.tag.php
XoopsModules/xoopstube/trunk/xoopstube/newlist.php
XoopsModules/xoopstube/trunk/xoopstube/notification_update.php
XoopsModules/xoopstube/trunk/xoopstube/ratevideo.php
XoopsModules/xoopstube/trunk/xoopstube/sbookmarks.php
XoopsModules/xoopstube/trunk/xoopstube/singlevideo.php
XoopsModules/xoopstube/trunk/xoopstube/submit.php
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_new.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_new_h.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_new_t.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_random.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_random_h.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_top.html
XoopsModules/xoopstube/trunk/xoopstube/templates/blocks/xoopstube_block_top_t.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_brokenvideo.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_index.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_newlistindex.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_ratevideo.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_singlevideo.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_singlevideo.htmlold
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_topten.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_videoload.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_videoloadsimple.html
XoopsModules/xoopstube/trunk/xoopstube/templates/xoopstube_viewcat.html
XoopsModules/xoopstube/trunk/xoopstube/topten.php
XoopsModules/xoopstube/trunk/xoopstube/view.tag.php
XoopsModules/xoopstube/trunk/xoopstube/viewcat.php
XoopsModules/xoopstube/trunk/xoopstube/xoops_version.php
XoopsModules/xoopstube/trunk/xoopstube/xtubestyle.css
Added Paths:
-----------
XoopsModules/xoopstube/trunk/xoopstube/class/xoopstubetree.php
XoopsModules/xoopstube/trunk/xoopstube/include/common.php
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/about.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/about.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/about.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,29 +1,29 @@
<?php
/**
- * Mastop Go2 module
+ * Module: XoopsTube
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source code
* which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package MastopGo2
- * @since 2.5.0
- * @author Mage, Mamba
- * @version $Id $
- **/
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author XOOPS Development Team
+ * @copyright 2001-2013 The XOOPS Project
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version $Id$
+ * @link http://sourceforge.net/projects/xoops/
+ * @since 1.0.6
+ */
include_once dirname(__FILE__) . '/admin_header.php';
-
xoops_cp_header();
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE);
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/admin_footer.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,6 +1,24 @@
<?php
-echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\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>";
+/**
+ * Module: XoopsTube
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author XOOPS Development Team
+ * @copyright 2001-2013 The XOOPS Project
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version $Id$
+ * @link http://sourceforge.net/projects/xoops/
+ * @since 1.0.6
+ */
-xoops_cp_footer();
\ No newline at end of file
+echo "<div class='adminfooter'>\n" . " <div style='text-align: center;'>\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();
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/admin_header.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,27 +1,30 @@
<?php
/**
- * XoopsTube module
+ * Module: XoopsTube
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source code
* which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package xoopstube
- * @since 1.0.5
- * @author XOOPS Development Team
- * @version $Id $
- **/
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author XOOPS Development Team
+ * @copyright 2001-2013 The XOOPS Project
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version $Id$
+ * @link http://sourceforge.net/projects/xoops/
+ * @since 1.0.6
+ */
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
include_once $path . '/include/cp_functions.php';
require_once $path . '/include/cp_header.php';
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
global $xoopsModule;
$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
@@ -32,24 +35,27 @@
//require_once $thisModulePath . '/include/functions.php';
// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+//xoops_loadLanguage('admin', $thisModuleDir);
+//xoops_loadLanguage('modinfo', $thisModuleDir);
+//xoops_loadLanguage('main', $thisModuleDir);
+xoops_loadLanguage('admin', XTUBE_DIRNAME);
+xoops_loadLanguage('modinfo', XTUBE_DIRNAME);
+xoops_loadLanguage('main', XTUBE_DIRNAME);
$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+require_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
-include $thisModulePath . '/include/config.php';
-include_once $thisModulePath . '/include/functions.php';
-include_once $thisModulePath . '/include/video.php';
-include_once $thisModulePath . '/class/xtube_lists.php';
-include_once $thisModulePath . '/class/myts_extended.php';
+include $thisModulePath . '/include/config.php';
+include_once $thisModulePath . '/include/functions.php';
+include_once $thisModulePath . '/include/video.php';
+include_once $thisModulePath . '/class/xtube_lists.php';
+include_once $thisModulePath . '/class/myts_extended.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH . '/modules/xoopstube/class/xoopstubetree.php';
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/altcat.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/altcat.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/altcat.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,24 +1,39 @@
<?php
/**
- * $Id: altcat.php
* Module: XoopsTube
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author XOOPS Development Team
+ * @copyright 2001-2013 The XOOPS Project
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version $Id$
+ * @link http://sourceforge.net/projects/xoops/
+ * @since 1.0.6
*/
include 'admin_header.php';
global $xoopsModuleConfig;
-$op = xtube_cleanRequestVars($_REQUEST, 'op', '');
-$lid = xtube_cleanRequestVars($_REQUEST, 'lid', 0);
+$op = xtubeCleanRequestVars($_REQUEST, 'op', '');
+$lid = xtubeCleanRequestVars($_REQUEST, 'lid', 0);
-function makeTreeCheckTable($xt, $itemid, $title, $checks, $order = '') {
+function makeTreeCheckTable($xt, $itemid, $title, $checks, $order = '')
+{
global $xtubemyts;
echo '<div style="text-align: left;">';
echo '<form name="altcat" method="post" action="' . xoops_getenv('PHP_SELF') . '">';
echo '<table width="100%" callspacing="1" class="outer">';
- $sql = 'SELECT ' . $xt->id . ', ' . $title . ' FROM ' . $xt->table . ' WHERE ' . $xt->pid . '=0' . ' ORDER BY '
- . $title;
+ $sql = 'SELECT ' . $xt->id . ', ' . $title . ' FROM ' . $xt->table . ' WHERE ' . $xt->pid . '=0'
+ . ' ORDER BY ' . $title;
if ($order != '') {
$sql .= ' ORDER BY ' . $order;
}
@@ -29,12 +44,12 @@
$disabled = ($cid == intval($_GET['cid'])) ? "disabled='yes'" : "";
$level = 1;
echo '
- <tr style="text-align: left;">
- <td width="30%" class="head">' . $name . '</td>
- <td class="head">
- <input type="checkbox" name="cid-' . $cid . '" value="0" ' . $checked . ' ' . $disabled . '/>
- </td>
- </tr>';
+ <tr style="text-align: left;">
+ <td width="30%" class="head">' . $name . '</td>
+ <td class="head">
+ <input type="checkbox" name="cid-' . $cid . '" value="0" ' . $checked . ' ' . $disabled . '/>
+ </td>
+ </tr>';
$arr = $xt->getChildTreeArray($cid, $order);
foreach ($arr as $cat) {
$cat['prefix'] = str_replace('.', '-', $cat['prefix']);
@@ -44,70 +59,70 @@
$level = substr_count($cat['prefix'], '-') + 1;
// echo "<tr><td>" . $catpath . "<input type='checkbox' name='cid-" . $cat['cid'] . "' value='0' " . $checked . " " . $disabled . "/></td></tr>\n";
echo '
- <tr style="text-align: left;">
- <td width="30%" class="even">' . $catpath . '</td>
- <td class="even">
- <input type="checkbox" name="cid-' . $cat['cid'] . '" value="0" ' . $checked . ' ' . $disabled . '/>
- </td>
- </tr>';
+ <tr style="text-align: left;">
+ <td width="30%" class="even">' . $catpath . '</td>
+ <td class="even">
+ <input type="checkbox" name="cid-' . $cat['cid'] . '" value="0" ' . $checked . ' ' . $disabled . '/>
+ </td>
+ </tr>';
}
}
echo '<tr>
- <td width="30%"></td>
- <td style="text-align: left;">
- <input type="submit" class="mainbutton" value="save" />
- <input type="hidden" name="op" value="save" />
- <input type="hidden" name="lid" value="' . $itemid . '" />
- </td>
- </tr>';
+ <td width="30%"></td>
+ <td style="text-align: left;">
+ <input type="submit" class="mainbutton" value="save" />
+ <input type="hidden" name="op" value="save" />
+ <input type="hidden" name="lid" value="' . $itemid . '" />
+ </td>
+ </tr>';
echo '</table></form></div>';
}
switch (strtolower($op)) {
-case 'save':
- // first delete all alternate categories for this topic
- $sql = 'DELETE FROM ' . $xoopsDB->prefix('xoopstube_altcat') . ' WHERE lid=' . $lid;
- if (!$result = $xoopsDB->query($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
- }
+ case 'save':
+ // first delete all alternate categories for this topic
+ $sql = 'DELETE FROM ' . $xoopsDB->prefix('xoopstube_altcat') . ' WHERE lid=' . $lid;
+ if (!$result = $xoopsDB->query($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- $k = array_keys($_REQUEST);
- foreach ($k as $sid) {
- if (preg_match("/cid-([0-9]*)/", $sid, $cid)) {
- $sql
- = 'INSERT INTO ' . $xoopsDB->prefix('xoopstube_altcat') . '(cid, lid) VALUES("' . $cid[1] . '","' . $lid
- . '")';
- if (!$result = $xoopsDB->query($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
+ return false;
+ }
+
+ $k = array_keys($_REQUEST);
+ foreach ($k as $sid) {
+ if (preg_match("/cid-([0-9]*)/", $sid, $cid)) {
+ $sql
+ = 'INSERT INTO ' . $xoopsDB->prefix('xoopstube_altcat') . '(cid, lid) VALUES("' . $cid[1] . '","'
+ . $lid . '")';
+ if (!$result = $xoopsDB->query($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
+
+ return false;
+ }
}
}
- }
- redirect_header('index.php', 1, _AM_XTUBE_ALTCAT_CREATED);
- break;
+ redirect_header('index.php', 1, _AM_XTUBE_ALTCAT_CREATED);
+ break;
-case 'main':
-default:
- xoops_cp_header();
- //xtube_adminmenu(_AM_XTUBE_MALTCAT);
- echo '<fieldset><legend style="font-weight: bold; color: #0A3760;">' . _AM_XTUBE_ALTCAT_MODIFYF . '</legend>
- <div style="padding: 8px;">' . _AM_XTUBE_ALTCAT_INFOTEXT . '</div>
- </fieldset>';
+ case 'main':
+ default:
+ xoops_cp_header();
+ //xtubeRenderAdminMenu(_AM_XTUBE_MALTCAT);
+ echo '<fieldset><legend style="font-weight: bold; color: #0A3760;">' . _AM_XTUBE_ALTCAT_MODIFYF . '</legend>
+ <div style="padding: 8px;">' . _AM_XTUBE_ALTCAT_INFOTEXT . '</div>
+ </fieldset>';
- echo '<div style="text-align: left;"><h3> ' . $_REQUEST['title'] . ' </h3></div>';
- // Get an array of all alternate categories for this topic
- $sql = $xoopsDB->query(
- 'SELECT cid FROM ' . $xoopsDB->prefix('xoopstube_altcat') . ' WHERE lid="' . $lid . '" ORDER BY lid'
- );
- $altcats = array();
- while ($altcat = $xoopsDB->fetchArray($sql)) {
- $altcats[$altcat['cid']] = TRUE;
- }
- $mytree = new XoopsTree($xoopsDB->prefix('xoopstube_cat'), 'cid', 'pid');
- makeTreeCheckTable($mytree, $lid, 'title', $altcats);
- xoops_cp_footer();
+ echo '<div style="text-align: left;"><h3> ' . $_REQUEST['title'] . ' </h3></div>';
+ // Get an array of all alternate categories for this topic
+ $sql = $xoopsDB->query(
+ 'SELECT cid FROM ' . $xoopsDB->prefix('xoopstube_altcat') . ' WHERE lid="' . $lid . '" ORDER BY lid'
+ );
+ $altcats = array();
+ while ($altcat = $xoopsDB->fetchArray($sql)) {
+ $altcats[$altcat['cid']] = true;
+ }
+ $mytree = new XoopstubeTree($xoopsDB->prefix('xoopstube_cat'), 'cid', 'pid');
+ makeTreeCheckTable($mytree, $lid, 'title', $altcats);
+ xoops_cp_footer();
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/blockform.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/blockform.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/blockform.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,38 +1,46 @@
<?php
-### =============================================================
-### Mastop InfoDigital - Paix\xE3o por Internet
-### =============================================================
-### Formul\xE1rio para a Clonagem de Blocos
-### =============================================================
-### Developer: Fernando Santos (topet05), fer...@ma...
-### Copyright: Mastop InfoDigital \xA9 2003-2007
-### -------------------------------------------------------------
-### www.mastop.com.br
-### =============================================================
-### $Id: blockform.php,v 1.1 2007/06/16 22:41:07 kleber Exp $
-### =============================================================
+/**
+ * Module: XoopsTube
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author Fernando Santos (topet05), fer...@ma...
+ * @copyright Mastop InfoDigital \xA9 2003-2007
+ * @link http://www.mastop.com.br
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @since 1.0.6
+ * @version $Id$
+ */
+
+
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
-$form = new XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', "post", TRUE);
+$form = new XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', "post", true);
if (isset($block['name'])) {
$form->addElement(new XoopsFormLabel(_AM_NAME, $block['name']));
}
$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
$side_select->addOptionArray(
array(
- 0 => _AM_SBLEFT,
- 1 => _AM_SBRIGHT,
- 3 => _AM_CBLEFT,
- 4 => _AM_CBRIGHT,
- 5 => _AM_CBCENTER,
- 7 => _AM_CBBOTTOMLEFT,
- 8 => _AM_CBBOTTOMRIGHT,
- 9 => _AM_CBBOTTOM,
+ 0 => _AM_SBLEFT,
+ 1 => _AM_SBRIGHT,
+ 3 => _AM_CBLEFT,
+ 4 => _AM_CBRIGHT,
+ 5 => _AM_CBCENTER,
+ 7 => _AM_CBBOTTOMLEFT,
+ 8 => _AM_CBBOTTOMRIGHT,
+ 9 => _AM_CBBOTTOM,
)
);
$form->addElement($side_select);
$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight']));
$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible']));
-$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, TRUE);
+$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, true);
$module_handler =& xoops_gethandler('module');
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
@@ -42,22 +50,25 @@
ksort($module_list);
$mod_select->addOptionArray($module_list);
$form->addElement($mod_select);
-$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), FALSE);
+$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
if ($block['is_custom']) {
$textarea = new XoopsFormDhtmlTextArea(_AM_CONTENT, 'bcontent', $block['content'], 15, 70);
$textarea->setDescription(
'<span style="font-size:x-small;font-weight:bold;">' . _AM_USEFULTAGS
- . '</span><br /><span style="font-size:x-small;font-weight:normal;">'
- . sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>'
+ . '</span><br /><span style="font-size:x-small;font-weight:normal;">' . sprintf(
+ _AM_BLOCKTAG1,
+ '{X_SITEURL}',
+ XOOPS_URL . '/'
+ ) . '</span>'
);
- $form->addElement($textarea, TRUE);
+ $form->addElement($textarea, true);
$ctype_select = new XoopsFormSelect(_AM_CTYPE, 'bctype', $block['ctype']);
$ctype_select->addOptionArray(
array(
- 'H' => _AM_HTML,
- 'P' => _AM_PHP,
- 'S' => _AM_AFWSMILE,
- 'T' => _AM_AFNOSMILE
+ 'H' => _AM_HTML,
+ 'P' => _AM_PHP,
+ 'S' => _AM_AFWSMILE,
+ 'T' => _AM_AFNOSMILE
)
);
$form->addElement($ctype_select);
@@ -69,7 +80,7 @@
$form->addElement(
new XoopsFormLabel(_AM_CONTENT,
'<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&op=edittpl&id='
- . $btemplate[0]->getVar('tpl_id') . '">' . _AM_EDITTPL . '</a>')
+ . $btemplate[0]->getVar('tpl_id') . '">' . _AM_EDITTPL . '</a>')
);
} else {
$btemplate2 =& $tplfile_handler->find('default', 'block', $block['bid']);
@@ -77,29 +88,29 @@
$form->addElement(
new XoopsFormLabel(_AM_CONTENT,
'<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&op=edittpl&id='
- . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_EDITTPL . '</a>')
+ . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_EDITTPL . '</a>')
);
}
}
}
- if ($block['edit_form'] != FALSE) {
+ if ($block['edit_form'] != false) {
$form->addElement(new XoopsFormLabel(_AM_OPTIONS, $block['edit_form']));
}
}
$cache_select = new XoopsFormSelect(_AM_BCACHETIME, 'bcachetime', $block['cachetime']);
$cache_select->addOptionArray(
array(
- '0' => _NOCACHE,
- '30' => sprintf(_SECONDS, 30),
- '60' => _MINUTE,
- '300' => sprintf(_MINUTES, 5),
- '1800' => sprintf(_MINUTES, 30),
- '3600' => _HOUR,
- '18000' => sprintf(_HOURS, 5),
- '86400' => _DAY,
- '259200' => sprintf(_DAYS, 3),
- '604800' => _WEEK,
- '2592000' => _MONTH
+ '0' => _NOCACHE,
+ '30' => sprintf(_SECONDS, 30),
+ '60' => _MINUTE,
+ '300' => sprintf(_MINUTES, 5),
+ '1800' => sprintf(_MINUTES, 30),
+ '3600' => _HOUR,
+ '18000' => sprintf(_HOURS, 5),
+ '86400' => _DAY,
+ '259200' => sprintf(_DAYS, 3),
+ '604800' => _WEEK,
+ '2592000' => _MONTH
)
);
$form->addElement($cache_select);
@@ -113,4 +124,4 @@
$button_tray->addElement(new XoopsFormButton('', 'previewblock', _PREVIEW, "submit"));
}
$button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, "submit"));
-$form->addElement($button_tray);
\ No newline at end of file
+$form->addElement($button_tray);
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/blocksadmin.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/blocksadmin.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/blocksadmin.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,17 +1,24 @@
<?php
-### =============================================================
-### Mastop InfoDigital - Paix\xE3o por Internet
-### =============================================================
-### Manuten\xE7\xE3o Individual de Blocos e Grupos
-### =============================================================
-### Developer: Fernando Santos (topet05), fer...@ma...
-### Copyright: Mastop InfoDigital \xA9 2003-2007
-### -------------------------------------------------------------
-### www.mastop.com.br
-### =============================================================
-### $Id: blocksadmin.php,v 1.3 2007/06/16 22:40:09 kleber Exp $
-### =============================================================
-include_once("admin_header.php");
+/**
+ * Module: XoopsTube
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author Fernando Santos (topet05), fer...@ma...
+ * @copyright Mastop InfoDigital \xA9 2003-2007
+ * @link http://www.mastop.com.br
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @since 1.0.6
+ * @version $Id$
+ */
+
+include_once 'admin_header.php';
if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
exit(MPU_ADM_403);
}
@@ -30,7 +37,13 @@
$bid = isset($_GET['bid']) ? intval($_GET['bid']) : 0;
}
}
- function listar_blocos() {
+
+
+ /**
+ *
+ */
+ function listBlocks()
+ {
global $xoopsUser, $xoopsConfig, $xoopsModule;
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$db =& XoopsDatabaseFactory::getDatabaseConnection();
@@ -39,8 +52,8 @@
)
) {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin.php");
- include_once(
- XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin/blocksadmin.php");
+ include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language']
+ . "/admin/blocksadmin.php");
//include_once(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/groups.php");
} else {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/portuguesebr/admin.php");
@@ -63,10 +76,10 @@
echo "<form action='" . $_SERVER['PHP_SELF'] . "' name='blockadmin' method='post'>
<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
<tr valign='middle'><th align='center'>" . _AM_XTUBE_TITLE . "</th><th align='center' nowrap='nowrap'>"
- . _AM_XTUBE_SIDE . "<br />" . _LEFT . "-" . _CENTER . "-" . _RIGHT . "</th><th align='center'>"
- . _AM_XTUBE_WEIGHT . "</th><th align='center'>" . _AM_XTUBE_VISIBLE . "</th><th align='center'>"
- . _AM_SYSTEM_BLOCKS_VISIBLEIN . "</th><th align='center'>" . _AM_SYSTEM_ADGS . "</th><th align='center'>"
- . _AM_XTUBE_ACTION . "</th></tr>
+ . _AM_XTUBE_SIDE . "<br />" . _LEFT . "-" . _CENTER . "-" . _RIGHT . "</th><th align='center'>"
+ . _AM_XTUBE_WEIGHT . "</th><th align='center'>" . _AM_XTUBE_VISIBLE . "</th><th align='center'>"
+ . _AM_SYSTEM_BLOCKS_VISIBLEIN . "</th><th align='center'>" . _AM_SYSTEM_ADGS . "</th><th align='center'>"
+ . _AM_XTUBE_ACTION . "</th></tr>
";
$block_arr =& XoopsBlock::getByModule($xoopsModule->mid());
$block_count = count($block_arr);
@@ -110,54 +123,57 @@
$title = $i->getVar("title");
}
$name = $i->getVar("name");
- echo"<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar("bid")
+ echo
+ "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar("bid")
. "]' value='" . $title . "'></td><td class='$class' align='center' nowrap='nowrap'>
- <div align='center' >
+ <div align='center' >
<input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_LEFT . "'$ssel2 />
- <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_CENTER . "'$ssel3 />
+ <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_CENTER
+ . "'$ssel3 />
<input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_RIGHT . "'$ssel4 />
- </div>
- <div>
- <span style='float:right'><input type='radio' name='side[" . $i->getVar("bid") . "]' value='"
+ </div>
+ <div>
+ <span style='float:right'><input type='radio' name='side[" . $i->getVar("bid") . "]' value='"
. XOOPS_SIDEBLOCK_RIGHT . "'$ssel1 /></span>
<div align='left'><input type='radio' name='side[" . $i->getVar("bid") . "]' value='"
. XOOPS_SIDEBLOCK_LEFT . "'$ssel0 /></div>
- </div>
- <div align='center'>
- <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_BOTTOMLEFT . "'$ssel5 />
- <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_BOTTOM . "'$ssel7 />
+ </div>
+ <div align='center'>
+ <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_BOTTOMLEFT
+ . "'$ssel5 />
+ <input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_BOTTOM
+ . "'$ssel7 />
<input type='radio' name='side[" . $i->getVar("bid") . "]' value='" . XOOPS_CENTERBLOCK_BOTTOMRIGHT
. "'$ssel6 />
- </div>
+ </div>
</td><td class='$class' align='center'><input type='text' name='weight[" . $i->getVar("bid")
- . "]' value='" . $i->getVar("weight")
- . "' size='5' maxlength='5' /></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
+ . "]' value='" . $i->getVar("weight") . "' size='5' maxlength='5' /></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
. $i->getVar("bid") . "]' value='1'$sel1>" . _YES . " <input type='radio' name='visible["
. $i->getVar("bid") . "]' value='0'$sel0>" . _NO . "</td>";
- echo"<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar("bid")
- . "][]' id='bmodule[" . $i->getVar("bid") . "][]' multiple='multiple'>";
+ echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar("bid")
+ . "][]' id='bmodule[" . $i->getVar("bid") . "][]' multiple='multiple'>";
foreach ($module_list as $k => $v) {
echo "<option value='$k'" . ((in_array($k, $modules)) ? " selected='selected'" : "") . ">$v</option>";
}
echo "</select></td>";
-
- echo"<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar("bid")
- . "][]' id='groups[" . $i->getVar("bid") . "][]' multiple='multiple'>";
+ echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar("bid")
+ . "][]' id='groups[" . $i->getVar("bid") . "][]' multiple='multiple'>";
foreach ($groups as $grp) {
- echo"<option value='" . $grp->getVar('groupid') . "' "
- . ((in_array($grp->getVar('groupid'), $groups_perms)) ? " selected='selected'" : "") . ">"
- . $grp->getVar('name') . "</option>";
+ echo "<option value='" . $grp->getVar('groupid') . "' " . ((in_array(
+ $grp->getVar('groupid'),
+ $groups_perms
+ )) ? " selected='selected'" : "") . ">" . $grp->getVar('name') . "</option>";
}
echo "</select></td>";
- echo"<td class='$class' align='center'><a href='" . XOOPS_URL
- . "/modules/system/admin.php?fct=blocksadmin&op=edit&bid=" . $i->getVar("bid") . "'>" . _EDIT
- . "</a> <a href='blocksadmin.php?op=clone&bid=" . $i->getVar("bid") . "'>" . _CLONE . "</a>";
+ echo "<td class='$class' align='center'><a href='" . XOOPS_URL
+ . "/modules/system/admin.php?fct=blocksadmin&op=edit&bid=" . $i->getVar("bid") . "'>" . _EDIT
+ . "</a> <a href='blocksadmin.php?op=clone&bid=" . $i->getVar("bid") . "'>" . _CLONE . "</a>";
if ($i->getVar('block_type') != 'S' && $i->getVar('block_type') != 'M') {
- echo" <a href='" . XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=delete&bid="
- . $i->getVar("bid") . "'>" . _DELETE . "</a>";
+ echo " <a href='" . XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=delete&bid="
+ . $i->getVar("bid") . "'>" . _DELETE . "</a>";
}
echo "
<input type='hidden' name='oldtitle[" . $i->getVar("bid") . "]' value='" . $i->getVar('title') . "' />
@@ -178,15 +194,20 @@
<br /><br />";
}
- function clone_block($bid) {
+
+ /**
+ * @param $bid
+ */
+ function cloneBlock($bid)
+ {
global $xoopsConfig;
if (file_exists(
XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin/blocksadmin.php"
)
) {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin.php");
- include_once(
- XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin/blocksadmin.php");
+ include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language']
+ . "/admin/blocksadmin.php");
//include_once(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/groups.php");
} else {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/portuguesebr/admin.php");
@@ -202,7 +223,7 @@
while ($row = $db->fetchArray($result)) {
$modules[] = intval($row['module_id']);
}
- $is_custom = ($myblock->getVar('block_type') == 'C' || $myblock->getVar('block_type') == 'E') ? TRUE : FALSE;
+ $is_custom = ($myblock->getVar('block_type') == 'C' || $myblock->getVar('block_type') == 'E') ? true : false;
$block = array(
'title' => $myblock->getVar('title') . ' Clone',
'form_title' => _AM_CLONEBLOCK,
@@ -221,23 +242,35 @@
'template' => $myblock->getVar('template'),
'options' => $myblock->getVar('options')
);
- echo'<a href="blocksadmin.php">' . _AM_BADMIN
- . '</a> <span style="font-weight:bold;">»»</span> ' . _AM_CLONEBLOCK . '<br /><br />';
+ echo '<a href="blocksadmin.php">' . _AM_BADMIN
+ . '</a> <span style="font-weight:bold;">»»</span> ' . _AM_CLONEBLOCK
+ . '<br /><br />';
include 'blockform.php';
$form->display();
xoops_cp_footer();
exit();
}
- function clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options) {
+
+ /**
+ * @param $bid
+ * @param $bside
+ * @param $bweight
+ * @param $bvisible
+ * @param $bcachetime
+ * @param $bmodule
+ * @param $options
+ */
+ function isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options)
+ {
global $xoopsUser, $xoopsConfig;
if (file_exists(
XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin/blocksadmin.php"
)
) {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin.php");
- include_once(
- XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language'] . "/admin/blocksadmin.php");
+ include_once(XOOPS_ROOT_PATH . "/modules/system/language/" . $xoopsConfig['language']
+ . "/admin/blocksadmin.php");
//include_once(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/groups.php");
} else {
include_once(XOOPS_ROOT_PATH . "/modules/system/language/portuguesebr/admin.php");
@@ -288,21 +321,32 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
foreach ($bmodule as $bmid) {
$sql = 'INSERT INTO ' . $db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', '
- . $bmid . ')';
+ . $bmid . ')';
$db->query($sql);
}
$groups =& $xoopsUser->getGroups();
$count = count($groups);
for ($i = 0; $i < $count; $i++) {
- $sql = "INSERT INTO " . $db->prefix('group_permission')
- . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (" . $groups[$i] . ", " . $newid
- . ", 1, 'block_read')";
+ $sql
+ =
+ "INSERT INTO " . $db->prefix('group_permission')
+ . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (" . $groups[$i] . ", "
+ . $newid . ", 1, 'block_read')";
$db->query($sql);
}
redirect_header('blocksadmin.php?op=listar', 1, _AM_DBUPDATED);
}
- function setar_ordem($bid, $title, $weight, $visible, $side) {
+
+ /**
+ * @param $bid
+ * @param $title
+ * @param $weight
+ * @param $visible
+ * @param $side
+ */
+ function xtubeSetOrder($bid, $title, $weight, $visible, $side)
+ {
$myblock = new XoopsBlock($bid);
$myblock->setVar('title', $title);
$myblock->setVar('weight', $weight);
@@ -314,7 +358,7 @@
if ($op == "list") {
xoops_cp_header();
// mpu_adm_menu();
- listar_blocos();
+ listBlocks();
include 'admin_footer.php';
exit();
}
@@ -328,17 +372,27 @@
if ($oldtitle[$i] != $title[$i] || $oldweight[$i] != $weight[$i] || $oldvisible[$i] != $visible[$i]
|| $oldside[$i] != $side[$i]
) {
- setar_ordem($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bmodule[$i]);
+ xtubeSetOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bmodule[$i]);
}
if (!empty($bmodule[$i]) && count($bmodule[$i]) > 0) {
$sql = sprintf("DELETE FROM %s WHERE block_id = %u", $xoopsDB->prefix('block_module_link'), $bid[$i]);
$xoopsDB->query($sql);
if (in_array(0, $bmodule[$i])) {
- $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $xoopsDB->prefix('block_module_link'), $bid[$i], 0);
+ $sql = sprintf(
+ "INSERT INTO %s (block_id, module_id) VALUES (%u, %d)",
+ $xoopsDB->prefix('block_module_link'),
+ $bid[$i],
+ 0
+ );
$xoopsDB->query($sql);
} else {
foreach ($bmodule[$i] as $bmid) {
- $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $xoopsDB->prefix('block_module_link'), $bid[$i], intval($bmid));
+ $sql = sprintf(
+ "INSERT INTO %s (block_id, module_id) VALUES (%u, %d)",
+ $xoopsDB->prefix('block_module_link'),
+ $bid[$i],
+ intval($bmid)
+ );
$xoopsDB->query($sql);
}
}
@@ -347,7 +401,12 @@
$xoopsDB->query($sql);
if (!empty($groups[$i])) {
foreach ($groups[$i] as $grp) {
- $sql = sprintf("INSERT INTO %s (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $xoopsDB->prefix('group_permission'), $grp, $bid[$i]);
+ $sql = sprintf(
+ "INSERT INTO %s (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')",
+ $xoopsDB->prefix('group_permission'),
+ $grp,
+ $bid[$i]
+ );
$xoopsDB->query($sql);
}
}
@@ -356,12 +415,12 @@
exit();
}
if ($op == 'clone') {
- clone_block($bid);
+ cloneBlock($bid);
}
if ($op == 'clone_ok') {
- clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
+ isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
}
} else {
echo MPU_ADM_403;
-}
\ No newline at end of file
+}
Modified: XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php 2013-06-19 16:45:08 UTC (rev 11721)
+++ XoopsModules/xoopstube/trunk/xoopstube/admin/brokenvideo.php 2013-06-19 16:47:58 UTC (rev 11722)
@@ -1,190 +1,211 @@
<?php
/**
- * $Id: brokenvideo.php
* Module: XoopsTube
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * PHP version 5
+ *
+ * @category Module
+ * @package Xoopstube
+ * @author XOOPS Development Team
+ * @copyright 2001-2013 The XOOPS Project
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version $Id$
+ * @link http://sourceforge.net/projects/xoops/
+ * @since 1.0.6
*/
include 'admin_header.php';
-global $imagearray, $xoopsModule;
+global $imagearray, $xoopsModule, $xoopsDB;
-$op = xtube_cleanRequestVars($_REQUEST, 'op', '');
-$lid = xtube_cleanRequestVars($_REQUEST, 'lid', 0);
+$op = xtubeCleanRequestVars($_REQUEST, 'op', '');
+$lid = xtubeCleanRequestVars($_REQUEST, 'lid', 0);
$lid = intval($lid);
switch (strtolower($op)) {
-case 'updatenotice':
- $ack = xtube_cleanRequestVars($_REQUEST, 'ack', 0);
- $con = xtube_cleanRequestVars($_REQUEST, 'con', 1);
- $update_mess = '';
+ case 'updatenotice':
+ $ack = xtubeCleanRequestVars($_REQUEST, 'ack', 0);
+ $con = xtubeCleanRequestVars($_REQUEST, 'con', 1);
+ $update_mess = '';
- if ($ack && !$con) {
- $acknowledged = ($ack == 0) ? 1 : 0;
- $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET acknowledged=' . $acknowledged;
- if ($acknowledged == 0) {
- $sql .= ', confirmed=0 ';
+ if ($ack && !$con) {
+ $acknowledged = ($ack == 0) ? 1 : 0;
+ $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET acknowledged=' . $acknowledged;
+ if ($acknowledged == 0) {
+ $sql .= ', confirmed=0 ';
+ }
+ $sql .= ' WHERE lid=' . $lid;
+ if (!$result = $xoopsDB->queryF($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
+
+ return false;
+ }
+ $update_mess = _AM_XTUBE_BROKEN_NOWACK;
+ } elseif (!$ack && !$con) {
+ $acknowledged = ($ack == 0) ? 1 : 0;
+ $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET acknowledged=' . $acknowledged;
+ if ($acknowledged == 0) {
+ $sql .= ', confirmed=0 ';
+ }
+ $sql .= ' WHERE lid=' . $lid;
+ if (!$result = $xoopsDB->queryF($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
+
+ return false;
+ }
+
+ $update_mess = _AM_XTUBE_BROKEN_NOWACK;
}
- $sql .= ' WHERE lid=' . $lid;
- if (!$result = $xoopsDB->queryF($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
- }
- $update_mess = _AM_XTUBE_BROKEN_NOWACK;
- } elseif (!$ack && !$con) {
- $acknowledged = ($ack == 0) ? 1 : 0;
- $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET acknowledged=' . $acknowledged;
- if ($acknowledged == 0) {
- $sql .= ', confirmed=0 ';
- }
- $sql .= ' WHERE lid=' . $lid;
- if (!$result = $xoopsDB->queryF($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
- }
- $update_mess = _AM_XTUBE_BROKEN_NOWACK;
- }
+ if ($con) {
+ $confirmed = ($con == 0) ? 1 : 0;
+ $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET confirmed=' . $confirmed;
+ if ($confirmed == 1) {
+ $sql .= ', acknowledged=' . $confirmed;
+ }
+ $sql .= ' WHERE lid=' . $lid;
+ if (!$result = $xoopsDB->queryF($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- if ($con) {
- $confirmed = ($con == 0) ? 1 : 0;
- $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET confirmed=' . $confirmed;
- if ($confirmed == 1) {
- $sql .= ', acknowledged=' . $confirmed;
+ return false;
+ }
+ $update_mess = _AM_XTUBE_BROKEN_NOWCON;
+ } elseif (!$con) {
+ $confirmed = ($con == 0) ? 1 : 0;
+ $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET confirmed=' . $confirmed;
+ if ($confirmed == 1) {
+ $sql .= ', acknowledged=' . $confirmed;
+ }
+ $sql .= ' WHERE lid=' . $lid;
+ if (!$result = $xoopsDB->queryF($sql)) {
+ XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
+
+ return false;
+ }
+ $update_mess = _AM_XTUBE_BROKEN_NOWCON;
}
- $sql .= ' WHERE lid=' . $lid;
- if (!$result = $xoopsDB->queryF($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
- }
- $update_mess = _AM_XTUBE_BROKEN_NOWCON;
- } elseif (!$con) {
- $confirmed = ($con == 0) ? 1 : 0;
- $sql = 'UPDATE ' . $xoopsDB->prefix('xoopstube_broken') . ' SET confirmed=' . $confirmed;
- if ($confirmed == 1) {
- $sql .= ', acknowledged=' . $confirmed;
- }
- $sql .= ' WHERE lid=' . $lid;
- if (!$result = $xoopsDB->queryF($sql)) {
- XoopsErrorHandler_HandleError(E_USER_WARNING, $sql, __FILE__, __LINE__);
- return FALSE;
- }
- $update_mess = _AM_XTUBE_BROKEN_NOWCON;
- }
- redirect_header('brokenvideo.php?op=default', 1, $update_mess);
- break;
+ redirect_header('brokenvideo.php?op=default', 1, $update_mess);
+ break;
-case 'delbrokenvideos':
- $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' WHERE lid=' . $lid);
- $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_videos') . ' WHERE lid=' . $lid);
- $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_votedata') . ' WHERE lid=' . $lid);
- redirect_header('brokenvideo.php?op=default', 1, _AM_XTUBE_BROKENFILEDELETED);
- exit();
- break;
+ case 'delbrokenvideos':
+ $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' WHERE lid=' . $lid);
+ $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_videos') . ' WHERE lid=' . $lid);
+ $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_votedata') . ' WHERE lid=' . $lid);
+ redirect_header('brokenvideo.php?op=default', 1, _AM_XTUBE_BROKENFILEDELETED);
+ exit();
+ break;
-case 'ignorebrokenvideos':
- $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' WHERE lid=' . $lid);
- redirect_header('brokenvideo.php?op=default', 1, _AM_XTUBE_BROKEN_FILEIGNORED);
- break;
+ case 'ignorebrokenvideos':
+ $xoopsDB->queryF('DELETE FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' WHERE lid=' . $lid);
+ redirect_header('brokenvideo.php?op=default', 1, _AM_XTUBE_BROKEN_FILEIGNORED);
+ break;
-default:
- $result = $xoopsDB->query(
- 'SELECT * FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' ORDER BY reportid'
- );
- $totalbrokenvideos = $xoopsDB->getRowsNum($result);
+ default:
+ $result = $xoopsDB->query(
+ 'SELECT * FROM ' . $xoopsDB->prefix('xoopstube_broken') . ' ORDER BY reportid'
+ );
+ $totalbrokenvideos = $xoopsDB->getRowsNum($result);
- xoops_cp_header();
-// xtube_adminmenu( _AM_XTUBE_BROKEN_FILE );
+ xoops_cp_header();
+// xtubeRenderAdminMenu( _AM_XTUBE_BROKEN_FILE );
- echo '
- <fieldset style="border: #E8E8E8 1px solid;">
- <legend style="display: inline; font-weight: bold; color: #0A3760;">' . _AM_XTUBE_BROKEN_REPORTINFO . '</legend>
- <div style="padding: 8px;">' . _AM_XTUBE_BROKEN_REPORTSNO . ' <b>' . $totalbrokenvideos . '</b><div>
- <div style="padding-left: 8px;">
- <ul>
- <li>' . $imagearray['ignore'] . ' ' . _AM_XTUBE_BROKEN_IGNOREDESC . '</li>
- <li>' . $imagearray['editimg'] . ' ' . _AM_XTUBE_BROKEN_EDITDESC . '</li>
- <li>' . $imagearray['deleteimg'] . ' ' . _AM_XTUBE_BROKEN_DELETEDESC . '</li>
- </ul>
- </div>
- </fieldset>';
+ echo '
+ <fieldset style="border: #E8E8E8 1px solid;">
+ <legend style="display: inline; font-weight: bold; color: #0A3760;">' . _AM_XTUBE_BROKEN_REPORTINFO . '</legend>
+ <div style="padding: 8px;">' . _AM_XTUBE_BROKEN_REPORTSNO . ' <b>' . $totalbrokenvideos . '</b><div>
+ <div style="padding-left: 8px;">
+ <ul>
+ <li>' . $imagearray['ignore'] . ' ' . _AM_XTUBE_BROKEN_IGNOREDESC . '</li>
+ <li>' . $imagearray['editimg'] . ' ' . _AM_XTUBE_BROKEN_EDITDESC . '</li>
+ <li>' . $imagearray['deleteimg'] . ' ' . _AM_XTUBE_BROKEN_DELETEDESC . '</li>
+ </ul>
+ </div>
+ </fieldset>';
- echo '<table width="100%" border="0" cellspacing="1" cellpadding="2" class="outer" style="font-size: smaller;">';
- echo '<tr style="text-align: center;">';
- echo '<th width="3%" style="text-align: center;">' . _AM_XTUBE_BROKEN_ID . '</th>';
- echo '<th width="35%" style="text-align: left;">' . _AM_XTUBE_BROKEN_TITLE . '</th>';
- echo '<th>' . _AM_XTUBE_BROKEN_REPORTER . '</th>';
- echo '<th>' . _AM_XTUBE_BROKEN_FILESUBMITTER . '</th>';
- echo '<th>' . _AM_XTUBE_BROKEN_DATESUBMITTED . '</th>';
- echo '<th>' . _AM_XTUBE_BROKEN_ACKNOWLEDGED . '</th>';
- echo '<th>' . _AM_XTUBE_BROKEN_DCONFIRMED . '</th>';
- echo '<th style="text-align: center;">' . _AM_XTUBE_BROKEN_ACTION . '</th>';
- echo '</tr>';
+ echo '<table width="100%" border="0" cellspacing="1" cellpadding="2" class="outer" style="font-size: smaller;">';
+ echo '<tr style="text-align: center;">';
+ echo '<th width="3%" style="text-align: center;">' . _AM_XTUBE_BROKEN_ID . '</th>';
+ echo '<th width="35%" style="text-align: left;">' . _AM_XTUBE_BROKEN_TITLE . '</th>';
+ echo '<th>' . _AM_XTUBE_BROKEN_REPORTER . '</th>';
+ echo '<th>' . _AM_XTUBE_BROKEN_FILESUBMITTER . '</th>';
+ echo '<th>' . _AM_XTUBE_BROKEN_DATESUBMITTED . '</th>';
+ echo '<th>' . _AM_XTUBE_BROKEN_ACKNOWLEDGED . '</th>';
+ echo '<th>' . _AM_XTUBE_BROKEN_DCONFIRMED . '</th>';
+ echo '<th style="text-align: center;">' . _AM_XTUBE_BROKEN_ACTION . '</th>';
+ echo '</tr>';
- if ($totalbrokenvideos == 0) {
- echo'<tr style="text-align: center;"><td style="text-align: center;" class="head" colspan="8">'
- . _AM...
[truncated message content] |
