Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9389] XoopsModules/newsslider/trunk/newsslider
|
From: <ye...@us...> - 2012-04-27 16:13:48
|
Revision: 9389
http://xoops.svn.sourceforge.net/xoops/?rev=9389&view=rev
Author: yerres2
Date: 2012-04-27 16:13:39 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Newsslider 1.2 final
Modified Paths:
--------------
XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
XoopsModules/newsslider/trunk/newsslider/admin/index.php
XoopsModules/newsslider/trunk/newsslider/admin/menu.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php
XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php
XoopsModules/newsslider/trunk/newsslider/s3_style.css
XoopsModules/newsslider/trunk/newsslider/style.css
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_glider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html
XoopsModules/newsslider/trunk/newsslider/xoops_version.php
Modified: XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -1,30 +1,54 @@
<?php
-/**
- * $Id: admin_header.php v 1.0 21 Jan 2012 Yerres Exp $
- * Module: newsslider
- * Version: 1.1
- * Author: yerres
- * Licence: GNU
- */
-
-include("../../../mainfile.php");
-include '../../../include/cp_header.php';
-global $xoopsModule,$xoopsConfig;
+// $Id$
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
-include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
+$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';
-$myts =& MyTextSanitizer::getInstance();
+global $xoopsModule;
-if ( is_object( $xoopsUser) ) {
- $xoopsModule = XoopsModule::getByDirname("newsslider");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",1,_NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL."/",1,_NOPERM);
- exit();
-}
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-?>
\ No newline at end of file
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/admin/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$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);
+ }
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/admin/index.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: index.php v 1.0 21 Jan 2012 Yerres Exp $
- * Module: slider
+ * Module: newsslider
* Version: v 1.00
* Licence: GNU
*/
@@ -9,10 +9,14 @@
include_once "admin_header.php";
xoops_cp_header();
-nws_adminmenu (0,_CPHOME);
-
+
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('index.php');
+echo $indexAdmin->renderIndex();
+
+
echo "<P>"._AM_NWS_INTRO."</P><br/>";
-xoops_cp_footer();
+include "admin_footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/admin/menu.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/menu.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/admin/menu.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -1,29 +1,39 @@
<?php
/**
- * $Id: menu.php v 1.0 21 Jan 2012 Yerres Exp $
- * Module: newsslider
- * Version: 1.1
- * Author: Yerres
- * Licence: GNU
- */
+* $Id: menu.php,v 1.0 2011/12/03 11:52:53 yerres Exp $
+* Module: newsslider
+* Licence: GNU
+*/
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$modid =& $module_handler->get($module->getVar("mid"));
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
global $xoopsModule;
$module_handler =& xoops_gethandler("module");
$xoopsModule =& XoopsModule::getByDirname('newsslider');
$modid =& $module_handler->get($xoopsModule->getVar("mid"));
-$i = 0;
-if (strstr(XOOPS_VERSION, "XOOPS 2.0")){
- $adminmenu[$i]['title'] = _MI_NWS_MENU;
- $adminmenu[$i]['link'] = "admin/myblocksadmin.php";
-} else {
- $adminmenu[$i]['title'] = _MI_NWS_MENU;// uncomment if necessary, this can cause errors
- $adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $xoopsModule->getVar('mid') . '&selmod=-2&selgrp=-1&selvis=-1';
- //$adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list';
-}
-if (isset($xoopsModule)) {
- $i=0;
- $headermenu[$i]['title'] = _MI_NWS_UPDATEMODULE;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
-}
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_NWS_ADMENU1;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_NWS_MENU;// comment this out if you like (can cause errors!)
+//$adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $xoopsModule->getVar('mid') . '&selmod=-2&selgrp=-1&selvis=-1';
+$adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list';
+$adminmenu[$i]["icon"] = $pathIcon32.'/block.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_NWS_ADMENU2;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -11,7 +11,7 @@
if( ! defined( 'XOOPS_ROOT_PATH' ) ) die( 'XOOPS root path not defined' ) ;
function b_news_bxslider_show( $options ) {
- global $xoopsDB, $xoopsUser;
+ global $xoopsDB, $xoopsUser, $xoTheme;
$myts = & MyTextSanitizer :: getInstance();
$block = array();
@@ -40,7 +40,7 @@
$block['controls'] = ($options[14]==1)? 1:0;
$block['includedate'] = ($options[15]==1)? 1:0;
$block['author'] = ($options[16]==1)? 1:0;
-
+ $block['jquery'] = ($options[17]==1)? 1:0;
$tmpstory = new NewsStory;
// for compatibility with old News versions
@@ -48,18 +48,19 @@
$restricted = news_getmoduleoption('restrictindex');
$dateformat = news_getmoduleoption('dateformat');
$infotips = news_getmoduleoption('infotips');
- if($dateformat == '') $dateformat = 'M d, Y g:i:s A';
+ //if($dateformat == '') $dateformat = 'M d, Y g:i:s A';
+ if($dateformat == '') $dateformat = 'd. M Y';
} else {
$restricted = isset($newsConfig['restrictindex']) && $newsConfig['restrictindex'] == 1 ? 1: 0;
$dateformat = isset($newsConfig['dateformat']) && $newsConfig['dateformat'] != '' ? $newsConfig['dateformat']: 'M d, Y g:i:s A';
$infotips = '0';
}
- if ($options[22] == 0) {
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
+ if ($options[23] == 0) {
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1,true, $options[7]);
} else {
- $topics = array_slice($options, 22);
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
+ $topics = array_slice($options, 23);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1,true, $options[7]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -84,17 +85,16 @@
}
if ($options[12] > 0) {
- $html = $story->nohtml() == 1 ? 0 : 1;
- //$html = $options[17] == 1 ? 0 : 1;//
- $smiley = $options[18] == 1 ? 0 : 1;
- $xcode = $options[19] == 1 ? 0 : 1;
- $image = $options[20] == 1 ? 0 : 1;
- $br = $options[21] == 1 ? 0 : 1;
+ //$html = $story->nohtml() == 1 ? 0 : 1;
+ $html = $options[18] == 1 ? 0 : 1;//
+ $smiley = $options[19] == 1 ? 0 : 1;
+ $xcode = $options[20] == 1 ? 0 : 1;
+ $image = $options[21] == 1 ? 0 : 1;
+ $br = $options[22] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
if ($module->getVar('version') <= 160) {
$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[12]+3);
} else {
- //$news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext, $html), $options[12]+3);
$news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[12]+3);
}
if($infotips>0) {
@@ -113,8 +113,8 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
- global $xoTheme;
- $xoTheme -> addStylesheet( 'modules/newsslider/bx_styles.css' );
+ $xoTheme -> addStylesheet( 'modules/newsslider/bx_styles.css' );
+
return $block;
}
@@ -151,7 +151,7 @@
$form .= "<input type='radio' name='options[6]' value='0'".(($options[6]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[7]'>";
- $form .= "<option value='RAND()' ".(($options[7]=='RAND()')?" selected='selected'":"").">"._MB_NWS_RANDOM."</option>\n";
+ $form .= "<option value='topicid' ".(($options[7]=='topicid')?" selected='selected'":"").">"._MB_NWS_TOPIC."</option>\n";
$form .= "<option value='published' ".(($options[7]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
$form .= "<option value='counter' ".(($options[7]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
$form .= "<option value='title' ".(($options[7]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
@@ -188,35 +188,39 @@
$form .= "<tr><td class='even'>"._MB_NWS_SHOWAUTH."</td><td class='odd'>";
$form .= "<input type='radio' name='options[16]' value='1'".(($options[16]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[16]' value='0'".(($options[16]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_JQUERY."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[17]' value='1'".(($options[17]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[17]' value='0'".(($options[17]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'> </td> <td class='odd'> </td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_HTML."</td><td class='odd'>";
- $form .= "<input type='radio' name='options[17]' value='1'".(($options[17]==1)?" checked='checked'":"")." />"._YES." ";
- $form .= "<input type='radio' name='options[17]' value='0'".(($options[17]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
- //---
- $form .= "<tr><td class='even'>"._MB_NWS_SMILEY."</td><td class='odd'>";
$form .= "<input type='radio' name='options[18]' value='1'".(($options[18]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[18]' value='0'".(($options[18]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_XCODE."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_SMILEY."</td><td class='odd'>";
$form .= "<input type='radio' name='options[19]' value='1'".(($options[19]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[19]' value='0'".(($options[19]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
- //---
- $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_XCODE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[20]' value='1'".(($options[20]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[20]' value='0'".(($options[20]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[21]' value='1'".(($options[21]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[21]' value='0'".(($options[21]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[22]' value='1'".(($options[22]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[22]' value='0'".(($options[22]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//--- get allowed topics
- $form .= "<tr><td class='even'>"._MB_NWS_TOPICS."</td><td class='odd'><select id=\"options[22]\" name=\"options[]\" multiple=\"multiple\">";
+ $form .= "<tr><td class='even'>"._MB_NWS_TOPICS."</td><td class='odd'><select id=\"options[23]\" name=\"options[]\" multiple=\"multiple\">";
$module_handler = xoops_gethandler("module");
$newsModule = $module_handler->getByDirname("news");
if (is_object($newsModule)) {
- $isAll = empty($options[22]) ? true : false;
- $options_tops = array_slice($options, 22);
+ $isAll = empty($options[23]) ? true : false;
+ $options_tops = array_slice($options, 23);
include_once XOOPS_ROOT_PATH."/class/xoopsstory.php";
$xt = new XoopsTopic($xoopsDB->prefix("topics"));
$alltopics = $xt->getTopicsList();
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -3,7 +3,7 @@
* XOOPS - PHP Content Management System
* Copyright (c) 2011 <http://www.xoops.org/>
*
- * Module: newsslider 1.1
+ * Module: newsslider 1.2
* Author: Yerres
* Licence : GPL
*
@@ -12,7 +12,7 @@
function b_news_feature_show( $options ) {
- global $xoopsDB, $xoopsUser;
+ global $xoopsDB, $xoopsUser, $xoTheme;
$myts = & MyTextSanitizer :: getInstance();
$block = array();
@@ -26,10 +26,12 @@
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
- $block['speed'] = isset($options[1]) && $options[1] != '' ? $options[1] : '5';
- $block['includedate'] = ($options[2]==1)? 1:0;
- $block['author'] = ($options[3]==1)? 1:0;
+ $block['speed'] = isset($options[0]) && $options[0] != '' ? $options[0] : '5';
+ $block['includedate'] = ($options[1]==1)? 1:0;
+ $block['author'] = ($options[2]==1)? 1:0;
+ $block['topic'] = ($options[3]==1)? 1:0;
$block['sort'] = $options[4];
+ $block['jquery'] = ($options[7]==1)? 1:0;
$tmpstory = new NewsStory;
// for compatibility with old News versions
@@ -46,12 +48,10 @@
}
if ($options[13] == 0) {
- if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, 0, true, $options[4]);
+ $stories = $tmpstory->getAllPublished(4, 0, $restricted, 0, true, true, $options[4]);
} else {
$topics = array_slice($options, 13);
- if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, $topics, true, $options[4]);
+ $stories = $tmpstory->getAllPublished(4, 0, $restricted, $topics, true,true, $options[4]);
}
unset($tmpstory);
@@ -62,14 +62,16 @@
$news = array();
$title = $story->title();
- if (strlen($title) > $options[6])
- $title = xoops_substr($title,0,$options[6]+3);
+ if (strlen($title) > $options[5])
+ $title = xoops_substr($title,0,$options[5]+3);
$news['title'] = $title;
$news['id'] = $story->storyid();
$news['date'] = formatTimestamp($story->published(), $dateformat);
$news['no'] = $i++;
$news['author']= sprintf("%s %s",_POSTEDBY,$story->uname());
- $news['topic_title'] = $story->topic_title();
+ $news_topic_title = $story->topic_title();
+ $news['topic_title'] = $myts -> htmlSpecialChars( xoops_substr ( $news_topic_title, 0, 35-1 ));
+ //$news['topic_title'] = $myts -> htmlSpecialChars( xoops_substr ( $news_topic_title, 0, $options[5]-1 ));
if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/images/image'.$i.'.jpg')) {
$news['picture'] = 'image'.$i.'.jpg';
} else {
@@ -81,18 +83,19 @@
$news['picture'] = 'image1-small.jpg';
}
- if ($options[7] > 0) {
- $html = $story->nohtml() == 1 ? 0 : 1;
- //$html = $options[8] == 1 ? 0 : 1;//
+ if ($options[6] > 0) {
+ //$html = $story->nohtml() == 1 ? 0 : 1;
+ $html = $options[8] == 1 ? 0 : 1;//
$smiley = $options[9] == 1 ? 0 : 1;
$xcode = $options[10] == 1 ? 0 : 1;
$image = $options[11] == 1 ? 0 : 1;
$br = $options[12] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
if ($module->getVar('version') <= 160) {
- $news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[7]+3);
+ $news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[6]+3);
} else {
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[7]+3);
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[6]+3);
+
}
if($infotips>0) {
$news['infotips'] = ' title="'.news_make_infotips($story->hometext()).'"';
@@ -111,17 +114,8 @@
}
$block['lang_read_more']= _MB_NWS_READMORE;
- global $xoTheme;
$xoTheme -> addStylesheet( 'modules/newsslider/style.css' );
- /*$jquery = ($options[8]==1) ? 1:0;
- if ( $jquery ) {
- if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
- if(isset($xoTheme) && is_object($xoTheme)) {
- $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
- $xoTheme -> addScript('/modules/newsslider/js/jquery-ui.min.js', array( 'type' => 'text/javascript' ) );
- }
- }
- }*/
+
return $block;
}
@@ -131,32 +125,33 @@
$myts = & MyTextSanitizer :: getInstance();
$form = "<table width='100%' border='0' class='bg2'>";
$form .= "<tr><th width='50%'>"._OPTIONS."</th><th width='50%'>"._MB_NWS_SETTINGS."</th></tr>";
- $form .= "<tr><td class='even'>"._MB_NWS_BLIMIT."</td><td class='odd'><input type='text' name='options[0]' size='16' maxlength=3 value='".$options[0]."' /></td></tr>";
- //$form .= "<tr><td class='even'>"._MB_NWS_STORIES."</td><td class='odd'><input type='text' name='options[]' value='" . $options[1] . "' size='20'></td></tr>";
- $form .= "<tr><td class='even'>"._MB_NWS_BPACE."</td><td class='odd'><input type='text' name='options[1]' size='16' maxlength=2 value='".$options[1]."' /></td></tr>";
+ $form .= "<tr><td class='even'>"._MB_NWS_BPACE."</td><td class='odd'><input type='text' name='options[0]' size='16' maxlength=2 value='".$options[0]."' /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SHOWDATE."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[1]' value='1'".(($options[1]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[1]' value='0'".(($options[1]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_SHOWAUTH."</td><td class='odd'>";
$form .= "<input type='radio' name='options[2]' value='1'".(($options[2]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[2]' value='0'".(($options[2]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_SHOWAUTH."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_SHOWTOPIC."</td><td class='odd'>";
$form .= "<input type='radio' name='options[3]' value='1'".(($options[3]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[3]' value='0'".(($options[3]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[4]'>";
- $form .= "<option value='RAND()' ".(($options[4]=='RAND()')?" selected='selected'":"").">"._MB_NWS_RANDOM."</option>\n";
+ $form .= "<option value='topicid' ".(($options[4]=='topicid')?" selected='selected'":"").">"._MB_NWS_TOPIC."</option>\n";
$form .= "<option value='published' ".(($options[4]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
$form .= "<option value='counter' ".(($options[4]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
$form .= "<option value='title' ".(($options[4]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
$form .= "</select></td></tr>\n";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_ORDER."</td><td class='odd'><select name='options[5]'>";
- $form .= "<option value='ASC' ".(($options[5]=='ASC')?" selected='selected'":"").">"._ASCENDING."</option>\n";
- $form .= "<option value='DESC' ".(($options[5]=='DESC')?" selected='selected'":"").">"._DESCENDING."</option>\n";
- $form .= "</select></td></tr>\n";
+ $form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[5]' value='".$options[5]."'/></td></tr>";
+ $form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[6]' value='".$options[6]."' /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[6]' value='".$options[6]."'/></td></tr>";
- $form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[7]' value='".$options[7]."' /></td></tr>";
+ $form .= "<tr><td class='even'>"._MB_NWS_JQUERY."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[7]' value='1'".(($options[7]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[7]' value='0'".(($options[7]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>"; //---
//---
$form .= "<tr><td class='even'> </td> <td class='odd'> </td></tr>";
//---
@@ -172,11 +167,11 @@
$form .= "<input type='radio' name='options[10]' value='1'".(($options[10]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[10]' value='0'".(($options[10]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[11]' value='1'".(($options[11]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[11]' value='0'".(($options[11]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
$form .= "<input type='radio' name='options[12]' value='1'".(($options[12]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[12]' value='0'".(($options[12]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//--- get topics
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -3,7 +3,7 @@
* XOOPS - PHP Content Management System
* Copyright (c) 2011 <http://www.xoops.org/>
*
- * Module: newsslider 1.1
+ * Module: newsslider 1.2
* Author: Yerres
* Licence : GPL
*
@@ -37,6 +37,7 @@
$block['autorotate'] = ($options[10]==1)? 1:0;
$block['acycles'] = isset($options[11]) && $options[11] != '' ? $options[11] : '0';
$block['includedate'] = ($options[12]==1)? 1:0;
+ $block['jquery'] = ($options[14]==1)? 1:0;
$uniqueid = substr(md5(uniqid(rand())),25);
$block['divid'] = $uniqueid;
$block['navi'] = ($options[17]==1)? 1:0;
@@ -48,7 +49,8 @@
$restricted = news_getmoduleoption('restrictindex');
$dateformat = news_getmoduleoption('dateformat');
$infotips = news_getmoduleoption('infotips');
- if($dateformat == '') $dateformat = 'M d, Y g:i:s A';
+ //if($dateformat == '') $dateformat = 'M d, Y g:i:s A';
+ if($dateformat == '') $dateformat = 'd. M Y';
} else {
$restricted = isset($newsConfig['restrictindex']) && $newsConfig['restrictindex'] == 1 ? 1: 0;
$dateformat = isset($newsConfig['dateformat']) && $newsConfig['dateformat'] != '' ? $newsConfig['dateformat']: 'M d, Y g:i:s A';
@@ -56,10 +58,10 @@
}
if ($options[23] == 0) {
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, true, $options[13]);
} else {
$topics = array_slice($options, 23);
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, true, $options[13]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -78,16 +80,17 @@
$news['topic_title'] = $story->topic_title();
if ($options[16] > 0) {
- $html = $story->nohtml() == 1 ? 0 : 1;
- //$html = $options[18] == 1 ? 0 : 1;//
+ //$html = $story->nohtml() == 1 ? 0 : 1;
+ $html = $options[18] == 1 ? 0 : 1;//
$smiley = $options[19] == 1 ? 0 : 1;
$xcode = $options[20] == 1 ? 0 : 1;
$image = $options[21] == 1 ? 0 : 1;
$br = $options[22] == 1 ? 0 : 1;
- //--- for News versions prior to 1.60
- //$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[16]+3);
- //--- for News version 1.60+
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[16]+3);
+ if ($module->getVar('version') <= 160) { //--- for News versions prior to 1.60
+ $news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[16]+3);
+ } else { //--- for News version 1.60+
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[16]+3);
+ }
if($infotips>0) {
$news['infotips'] = ' title="'.news_make_infotips($story->hometext()).'"';
} else {
@@ -148,16 +151,15 @@
$form .= "<input type='radio' name='options[12]' value='0'".(($options[12]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[13]'>";
- $form .= "<option value='RAND()' ".(($options[13]=='RAND()')?" selected='selected'":"").">"._MB_NWS_RANDOM."</option>\n";
+ $form .= "<option value='topicid' ".(($options[13]=='topicid')?" selected='selected'":"").">"._MB_NWS_TOPIC."</option>\n";
$form .= "<option value='published' ".(($options[13]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
$form .= "<option value='counter' ".(($options[13]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
$form .= "<option value='title' ".(($options[13]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
$form .= "</select></td></tr>\n";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_ORDER."</td><td class='odd'><select name='options[14]'>";
- $form .= "<option value='ASC' ".(($options[14]=='ASC')?" selected='selected'":"").">"._ASCENDING."</option>\n";
- $form .= "<option value='DESC' ".(($options[14]=='DESC')?" selected='selected'":"").">"._DESCENDING."</option>\n";
- $form .= "</select></td></tr>\n";
+ $form .= "<tr><td class='even'>"._MB_NWS_JQUERY."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[14]' value='1'".(($options[14]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[14]' value='0'".(($options[14]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[15]' value='".$options[15]."'/></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[16]' value='".$options[16]."' /></td></tr>";
@@ -180,11 +182,11 @@
$form .= "<input type='radio' name='options[20]' value='1'".(($options[20]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[20]' value='0'".(($options[20]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[21]' value='1'".(($options[21]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[21]' value='0'".(($options[21]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
$form .= "<input type='radio' name='options[22]' value='1'".(($options[22]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[22]' value='0'".(($options[22]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//--- get allowed topics
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -12,7 +12,7 @@
function b_news_s3slider_show( $options ) {
- global $xoopsDB, $xoopsUser;
+ global $xoopsDB, $xoopsUser, $xoTheme;
$myts = & MyTextSanitizer :: getInstance();
$block = array();
@@ -30,6 +30,7 @@
$block['includedate'] = ($options[2]==1)? 1:0;
$block['author'] = ($options[3]==1)? 1:0;
$block['sort'] = $options[4];
+ $block['jquery'] = ($options[8]==1)? 1:0;
$tmpstory = new NewsStory;
// for compatibility with old News versions
@@ -45,11 +46,11 @@
$infotips = '0';
}
- if ($options[13] == 0) {
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
+ if ($options[14] == 0) {
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1,true, $options[4]);
} else {
- $topics = array_slice($options, 13);
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
+ $topics = array_slice($options, 14);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1,true, $options[4]);
}
unset($tmpstory);
@@ -73,18 +74,17 @@
$news['picture'] = 'image'.$i.'.jpg';
if ($options[7] > 0) {
- $html = $story->nohtml() == 1 ? 0 : 1;
- //$html = $options[8] == 1 ? 0 : 1;//
- $smiley = $options[9] == 1 ? 0 : 1;
- $xcode = $options[10] == 1 ? 0 : 1;
- $image = $options[11] == 1 ? 0 : 1;
- $br = $options[12] == 1 ? 0 : 1;
+ //$html = $story->nohtml() == 1 ? 0 : 1;
+ $html = $options[9] == 1 ? 0 : 1;//
+ $smiley = $options[10] == 1 ? 0 : 1;
+ $xcode = $options[11] == 1 ? 0 : 1;
+ $image = $options[12] == 1 ? 0 : 1;
+ $br = $options[13] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
if ($module->getVar('version') <= 160) {
$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[7]+3);
} else {
//--- for News version 1.60+
- //$news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext, $html), $options[7]+3);
$news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[7]+3);
}
if($infotips>0) {
@@ -103,16 +103,8 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
- global $xoTheme;
$xoTheme -> addStylesheet( 'modules/newsslider/s3_style.css' );
- /*$jquery = ($options[8]==1) ? 1:0;
- if ( $jquery ) {
- if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
- if(isset($xoTheme) && is_object($xoTheme)) {
- $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
- $xoTheme -> addScript('/modules/newsslider/js/s3Slider.js', array( 'type' => 'text/javascript' ) );
- }}
- }*/
+
return $block;
}
@@ -123,7 +115,6 @@
$form = "<table width='100%' border='0' class='bg2'>";
$form .= "<tr><th width='50%'>"._OPTIONS."</th><th width='50%'>"._MB_NWS_SETTINGS."</th></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_BLIMIT."</td><td class='odd'><input type='text' name='options[0]' size='16' maxlength=3 value='".$options[0]."' /></td></tr>";
- //$form .= "<tr><td class='even'>"._MB_NWS_STORIES."</td><td class='odd'><input type='text' name='options[]' value='" . $options[1] . "' size='20'></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_BPACE."</td><td class='odd'><input type='text' name='options[1]' size='16' maxlength=2 value='".$options[1]."' /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SHOWDATE."</td><td class='odd'>";
@@ -135,7 +126,7 @@
$form .= "<input type='radio' name='options[3]' value='0'".(($options[3]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[4]'>";
- $form .= "<option value='RAND()' ".(($options[4]=='RAND()')?" selected='selected'":"").">"._MB_NWS_RANDOM."</option>\n";
+ $form .= "<option value='topicid' ".(($options[4]=='topicid')?" selected='selected'":"").">"._MB_NWS_TOPIC."</option>\n";
$form .= "<option value='published' ".(($options[4]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
$form .= "<option value='counter' ".(($options[4]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
$form .= "<option value='title' ".(($options[4]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
@@ -150,35 +141,39 @@
//---
$form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[6]' value='".$options[6]."'/></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[7]' value='".$options[7]."' /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_JQUERY."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[8]' value='1'".(($options[8]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[8]' value='0'".(($options[8]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'> </td> <td class='odd'> </td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_HTML."</td><td class='odd'>";
- $form .= "<input type='radio' name='options[8]' value='1'".(($options[8]==1)?" checked='checked'":"")." />"._YES." ";
- $form .= "<input type='radio' name='options[8]' value='0'".(($options[8]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
- //---
- $form .= "<tr><td class='even'>"._MB_NWS_SMILEY."</td><td class='odd'>";
$form .= "<input type='radio' name='options[9]' value='1'".(($options[9]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[9]' value='0'".(($options[9]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_XCODE."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_SMILEY."</td><td class='odd'>";
$form .= "<input type='radio' name='options[10]' value='1'".(($options[10]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[10]' value='0'".(($options[10]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
- //---
- $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_XCODE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[11]' value='1'".(($options[11]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[11]' value='0'".(($options[11]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
$form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[12]' value='1'".(($options[12]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[12]' value='0'".(($options[12]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[13]' value='1'".(($options[13]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[13]' value='0'".(($options[13]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//--- get topics
- $form .= "<tr><td class='even'>"._MB_NWS_TOPICS."</td><td class='odd'><select id=\"options[13]\" name=\"options[]\" multiple=\"multiple\">";
+ $form .= "<tr><td class='even'>"._MB_NWS_TOPICS."</td><td class='odd'><select id=\"options[14]\" name=\"options[]\" multiple=\"multiple\">";
$module_handler = xoops_gethandler("module");
$newsModule = $module_handler->getByDirname("news");
if (is_object($newsModule)) {
- $isAll = empty($options[13]) ? true : false;
- $options_tops = array_slice($options, 13);
+ $isAll = empty($options[14]) ? true : false;
+ $options_tops = array_slice($options, 14);
include_once XOOPS_ROOT_PATH."/class/xoopsstory.php";
$xt = new XoopsTopic($xoopsDB->prefix("topics"));
$alltopics = $xt->getTopicsList();
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -3,7 +3,7 @@
* XOOPS - PHP Content Management System
* Copyright (c) 2011 <http://www.xoops.org/>
*
- * Module: newsslider 1.0
+ * Module: newsslider 1.2
* Author : Yerres
* Licence : GPL
*
@@ -29,11 +29,12 @@
$block['direction'] = $options[3];
$block['alternate'] = ($options[4]==1)? 1:0;
$block['includedate'] = ($options[5]==1)? 1:0;
- $block['style'] = $options[6];
+ $block['topic'] = ($options[6]==1)? 1:0;
+ $block['style'] = $options[7];
$uniqueid = substr(md5(uniqid(rand())),25);
$block['divid'] = $uniqueid;
- $block['sort']=$options[7];
+ $block['sort']=$options[8];
$tmpstory = new NewsStory;
// for compatibility with old News versions
if ($module->getVar('version') >= 150) {
@@ -41,7 +42,7 @@
$dateformat = news_getmoduleoption('dateformat');
$infotips = news_getmoduleoption('infotips');
//if($dateformat == '') $dateformat = 'M d, Y g:i A'; //Int. Date
- if($dateformat == '') $dateformat = 'd. M. Y G:i';
+ if($dateformat == '') $dateformat = 'd. M Y';
} else {
$restricted = isset($newsConfig['restrictindex']) && $newsConfig['restrictindex'] == 1 ? 1: 0;
$dateformat = isset($newsConfig['dateformat']) && $newsConfig['dateformat'] != '' ? $newsConfig['dateformat']: 'd. M. Y G:i';
@@ -49,10 +50,10 @@
}
if ($options[16] == 0) {
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, 0, true, true, $options[8]);
} else {
$topics = array_slice($options, 16);
- $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, 0, true, true, $options[8]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -67,25 +68,24 @@
$news['title'] = $title;
$news['id'] = $story->storyid();
$news['date'] = formatTimestamp($story->published(), $dateformat);
- $userlink = '<a style="cursor:help;" href="'.XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid().'">';
+ $userlink = '<a style="cursor:help;background-color: transparent;" href="'.XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid().'">';
$news['url'] = $userlink ;
$news['no'] = $i++;
$news['author']= sprintf("%s %s",_POSTEDBY,$story->uname());
$news['topic_title'] = $story->topic_title();
if ($options[10] > 0) {
- $html = $story->nohtml() == 1 ? 0 : 1;
- //$html = $options[11] == 1 ? 0 : 1;
- $clearhtml = $options[8] == 1 ? 0 : 1;
+ //$html = $story->nohtml() == 1 ? 0 : 1;
+ $html = $options[11] == 1 ? 0 : 1;// actually inherited by each articles' setting in news module
$smiley = $options[12] == 1 ? 0 : 1;
$xcode = $options[13] == 1 ? 0 : 1;
$image = $options[14] == 1 ? 0 : 1;
$br = $options[15] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
- if ($module->getVar('version') <= 160) {
+ if ($module->getVar('version') <= 160) {
$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
} else {
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[10]+3);
}
if($infotips>0) {
$news['infotips'] = ' title="'.news_make_infotips($story->hometext()).'"';
@@ -95,9 +95,10 @@
} else {
$news['teaser'] = '';
if($infotips>0) {
+ $html = $story->nohtml() == 1 ? 0 : 1;
//$newsteaser = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
//---for news version 1.60+
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br )), $options[10]+3);
$news['infotips'] = ' title="'.news_make_infotips($newsteaser).'" ';
} else {
$news['infotips'] = '';
@@ -106,6 +107,7 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
+
return $block;
}
//----
@@ -130,25 +132,24 @@
$form .= "<tr><td class='even'>"._MB_NWS_SHOWDATE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[5]' value='1'".(($options[5]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[5]' value='0'".(($options[5]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
+ //---
+ $form .= "<tr><td class='even'>"._MB_NWS_SHOWTOPIC."</td><td class='odd'>";
+ $form .= "<input type='radio' name='options[6]' value='1'".(($options[6]==1)?" checked='checked'":"")." />"._YES." ";
+ $form .= "<input type='radio' name='options[6]' value='0'".(($options[6]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_DISP."</td><td class='odd'><select name='options[6]'>";
- $form .= "<option value='0' ".(($options[6]=='0')?" selected='selected'":"").">"._MB_NWS_MARQUEE."</option>\n";
- $form .= "<option value='1' ".(($options[6]=='1')?" selected='selected'":"").">"._MB_NWS_PAUSESCROLLER."</option>\n";
- $form .= "<option value='2' ".(($options[6]=='2')?" selected='selected'":"").">"._MB_NWS_DOMTICKER."</option>\n";
+ $form .= "<tr><td class='even'>"._MB_NWS_DISP."</td><td class='odd'><select name='options[7]'>";
+ $form .= "<option value='0' ".(($options[7]=='0')?" selected='selected'":"").">"._MB_NWS_MARQUEE."</option>\n";
+ $form .= "<option value='1' ".(($options[7]=='1')?" selected='selected'":"").">"._MB_NWS_PAUSESCROLLER."</option>\n";
+ $form .= "<option value='2' ".(($options[7]=='2')?" selected='selected'":"").">"._MB_NWS_DOMTICKER."</option>\n";
$form .= "</select></td></tr>\n";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[7]'>";
- $form .= "<option value='RAND()' ".(($options[7]=='RAND()')?" selected='selected'":"").">"._MB_NWS_RANDOM."</option>\n";
- $form .= "<option value='published' ".(($options[7]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
- $form .= "<option value='counter' ".(($options[7]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
- $form .= "<option value='title' ".(($options[7]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
+ $form .= "<tr><td class='even'>"._MB_NWS_SORT."</td><td class='odd'><select name='options[8]'>";
+ $form .= "<option value='topicid' ".(($options[8]=='topicid')?" selected='selected'":"").">"._MB_NWS_TOPIC."</option>\n";
+ $form .= "<option value='published' ".(($options[8]=='published')?" selected='selected'":"").">"._MB_NWS_DATE."</option>\n";
+ $form .= "<option value='counter' ".(($options[8]=='counter')?" selected='selected'":"").">"._MB_NWS_HITS."</option>\n";
+ $form .= "<option value='title' ".(($options[8]=='title')?" selected='selected'":"").">"._MB_NWS_NAME."</option>\n";
$form .= "</select></td></tr>\n";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_ORDER."</td><td class='odd'><select name='options[8]'>";
- $form .= "<option value='ASC' ".(($options[8]=='ASC')?" selected='selected'":"").">"._ASCENDING."</option>\n";
- $form .= "<option value='DESC' ".(($options[8]=='DESC')?" selected='selected'":"").">"._DESCENDING."</option>\n";
- $form .= "</select></td></tr>\n";
- //---
$form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[9]' value='".$options[9]."'/></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[10]' value='".$options[10]."' /></td></tr>";
//---
@@ -166,27 +167,31 @@
$form .= "<input type='radio' name='options[13]' value='1'".(($options[13]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[13]' value='0'".(($options[13]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
$form .= "<input type='radio' name='options[14]' value='1'".(($options[14]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[14]' value='0'".(($options[14]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//---
- $form .= "<tr><td class='even'>"._MB_NWS_IMAGE."</td><td class='odd'>";
+ $form .= "<tr><td class='even'>"._MB_NWS_BR."</td><td class='odd'>";
$form .= "<input type='radio' name='options[15]' value='1'".(($options[15]==1)?" checked='checked'":"")." />"._YES." ";
$form .= "<input type='radio' name='options[15]' value='0'".(($options[15]==0)?" checked='checked'":"")." />"._NO."<br /></td></tr>";
//--- get allowed topics
$form .= "<tr><td class='even'>"._MB_NWS_TOPICS."</td><td class='odd'><select id=\"options[16]\" name=\"options[]\" multiple=\"multiple\">";
- $isAll = empty($options[16]) ? true : false;
- $options_tops = array_slice($options, 16);
- include_once XOOPS_ROOT_PATH."/class/xoopsstory.php";
- $xt = new XoopsTopic($xoopsDB->prefix("topics"));
- $alltopics = $xt->getTopicsList();
- ksort($alltopics);
- $form .= "<option value=\"0\" ";
- if ($isAll) $form .= " selected=\"selected\"";
- $form .= ">"._ALL."</option>";
- foreach ($alltopics as $topicid => $topic) {
- $sel = ( $isAll || in_array($topicid, $options_tops) ) ? " selected" : "";
- $form .= "<option value=\"$topicid\" $sel>".$topic["title"]."</option>";
+ $module_handler = xoops_gethandler("module");
+ $newsModule = $module_handler->getByDirname("news");
+ if (is_object($newsModule)) {
+ $isAll = empty($options[16]) ? true : false;
+ $options_tops = array_slice($options, 16);
+ include_once XOOPS_ROOT_PATH."/class/xoopsstory.php";
+ $xt = new XoopsTopic($xoopsDB->prefix("topics"));
+ $alltopics = $xt->getTopicsList();
+ ksort($alltopics);
+ $form .= "<option value=\"0\" ";
+ if ($isAll) $form .= " selected=\"selected\"";
+ $form .= ">"._ALL."</option>";
+ foreach ($alltopics as $topicid => $topic) {
+ $sel = ( $isAll || in_array($topicid, $options_tops) ) ? " selected" : "";
+ $form .= "<option value=\"$topicid\" $sel>".$topic["title"]."</option>";
+ }
}
$form .= '</select></td></tr>';
$form .= "</table>";
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -14,13 +14,15 @@
define("_MB_NWS_ORDER", "Default order:");
define("_MB_NWS_TEMPLATE", "Layout:");
define("_MB_NWS_DISP","Display Method");
-define("_MB_NWS_SHOWDATE", "Show Date?");
+define("_MB_NWS_SHOWDATE", "Show Date ?");
+define("_MB_NWS_SHOWTOPIC", "Show Topic Title ?");
define("_MB_NWS_TEASER", "Show Teaser Length (0 for no teaser, i.e. Headline-Ticker-mode) (in chars)");
define("_MB_NWS_CHARS","Length of the title (in chars)");
define("_MB_NWS_READMORE","Read more...");
define("_MB_NWS_NAME", "Title");
define("_MB_NWS_DATE", "Date");
define("_MB_NWS_HITS", "Hits");
+define("_MB_NWS_TOPIC", "Topics");
define("_MB_NWS_TOPICS", "News Topics<div style=\" font-size: smaller; align='left'\">Set here the allowed Topics.</div>");
//scrolling news
define("_MB_NWS_BSPEED", "Marquee-Speed (larger is faster)<div style='font-weight:normal'>corresponds to delay in pausescroller</div>");
@@ -74,7 +76,6 @@
define("_MB_NWS_JUSTIFY", "Justify");
define("_MB_NWS_TOPICT", "Show Topics?");
define("_MB_NWS_CAPTIONS", "Show image captions?");
-// RC
+//
define("_MB_NWS_JQUERY", "Load jQuery ?<div style=\" font-size: smaller; align='left'\">If jQuery is already being loaded in the theme, you can disable it here.</div>");
-define("_MB_NWS_STRIPTAGS", "Clear HTML tags ?<div style=\" font-size: smaller; align='left'\">Check here whether HTML-tags shall be cleared out of the text.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -12,7 +12,9 @@
// Names of admin menu items
define("_MI_NWS_MENU","Add/Edit Newsslider");
-define("_MI_NWS_TAGS", "Newsslider");
+define("_MI_NWS_ADMENU2", "About");
+define("_MI_NWS_ADMENU1", "Main");
+define("_MI_NWS_BLOCKS", "Blocks");
define('_MI_NWS_UPDATEMODULE', 'Update module templates and blocks');
// Names of blocks for this module
Modified: XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -15,16 +15,18 @@
define("_MB_NWS_ORDER", "Reihenfolge:");
define("_MB_NWS_TEMPLATE", "Layout:");
define("_MB_NWS_DISP","Anzeige Methode");
-define("_MB_NWS_SHOWDATE", "Datum zeigen?");
-define("_MB_NWS_TEASER", "Länge des Anreissers (Teaser) (0 für keinen Teaser) (in Buchstaben)");
+define("_MB_NWS_SHOWDATE", "Datum zeigen ?");
+define("_MB_NWS_SHOWTOPIC", "Themen Titel zeigen ?");
+define("_MB_NWS_TEASER", "Länge des Anreissers in Buchstaben (0 für keinen Teaser)");
define("_MB_NWS_CHARS","Länge des Titels (in Buchstaben)");
define("_MB_NWS_READMORE","mehr...");
define("_MB_NWS_NAME", "Auflisten nach Titel");
define("_MB_NWS_DATE", "Auflisten nach Datum");
define("_MB_NWS_HITS", "Auflisten nach Aufrufen");
+define("_MB_NWS_TOPIC", "Auflisten nach Themen");
define("_MB_NWS_TOPICS", "News Themen <div style=\" font-size: smaller; align='left'\">Hier können die Themen gesetzt werden.</div>");
//scrolling news
-define("_MB_NWS_BSPEED", "Geschwindigkeit (standard:3)<div style='font-weight:normal'>entspricht Verzögerung im Pausescroller</div>");
+define("_MB_NWS_BSPEED", "Geschwindigkeit <div style='font-weight:normal'>entspricht Verzögerung im Pausescroller (empfohlen für Marquee: 2, für Scroller: 3)</div>");
define("_MB_NWS_BLIMIT", "Anzahl News Artikel: ");
define("_MB_NWS_BACKGROUNDCOLOR", "Hintergrundfarbe:");
define("_MB_NWS_DIRECTION", "Scroll Richtung ?");
@@ -48,7 +50,7 @@
define("_MB_NWS_PERSISTSTATE", "Letzten Inhalt erinnern?");
define("_MB_NWS_BBORDER", "Rahmen Stärke:");
// Featured content Slider
-define("_MB_NWS_SHOWAUTH", "Autor zeigen?");
+define("_MB_NWS_SHOWAUTH", "Autor zeigen ?");
define("_MB_NWS_HTML", "HTML darstellen ?");
define("_MB_NWS_SMILEY", "Smileys zeigen ?");
define("_MB_NWS_XCODE", "Xcode zeigen ?");
@@ -74,6 +76,6 @@
define("_MB_NWS_JUSTIFY", "Blocksatz");
define("_MB_NWS_TOPICT", "Themen anzeigen?");
define("_MB_NWS_CAPTIONS", "Bild Untertitel anzeigen?");
-// RC
+//
define("_MB_NWS_JQUERY", "jQuery im Block Laden?<div style=\" font-size: smaller; align='left'\">Falls jQuery bereits im Theme geladen wird, braucht es nicht im Block geladen zu werden.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php 2012-04-27 14:29:45 UTC (rev 9388)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php 2012-04-27 16:13:39 UTC (rev 9389)
@@ -13,7 +13,9 @@
// Names of admin menu items
define("_MI_NWS_MENU","Newsslider Ändern/hinzufügen");
-define("_MI_NWS_TAGS", "Newsslider");
+define("_MI_NWS_ADMENU1", "Home");
+...
[truncated message content] |
