Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12484] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/xoopsheadline
|
From: <be...@us...> - 2014-04-25 12:12:36
|
Revision: 12484
http://sourceforge.net/p/xoops/svn/12484
Author: beckmi
Date: 2014-04-25 12:12:29 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): XoopsHeadlines
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/blocks/headline.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headline.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headlinerenderer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/xoopsheadlineutility.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.tpl
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/about.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/about.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -11,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright:: The XOOPS Project (http://www.xoops.org)
- * @license:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @license:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
* @package:: xoopsheadline
* @subpackage:: admin
* @since:: 1.10
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_footer.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_footer.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -24,4 +24,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_header.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/admin_header.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -27,6 +27,9 @@
$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
// Load language files
xoops_loadLanguage('admin', $thisModuleDir);
xoops_loadLanguage('modinfo', $thisModuleDir);
@@ -36,8 +39,4 @@
$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
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/index.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/index.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -43,4 +43,4 @@
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/main.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/main.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -36,7 +36,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright:: The XOOPS Project (http://www.xoops.org)
- * @license:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @license:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
* @package:: xoopsheadline
* @subpackage:: admin
* @since:: 1.10
@@ -99,7 +99,7 @@
$encodings = array('utf-8' => 'UTF-8', 'iso-8859-1' => 'ISO-8859-1', 'us-ascii' => 'US-ASCII');
$tdclass = 'odd';
echo ' <tbody>';
- for ($i = 0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; ++$i) {
echo " <tr>\n"
. " <td class='center {$tdclass}' style='vertical-align: middle;'><input style='text-align: right;' type='text' maxlength='3' size='4' name='headline_weight[]' value='" . $headlines[$i]->getVar('headline_weight') . "' /></td>\n"
. " <td class='{$tdclass}' style='vertical-align: middle; padding-left: 1em;'><a href='" . XOOPS_URL . "/modules/{$thisModDir}/index.php?id=" . $headlines[$i]->getVar('headline_id') . "'>" . $headlines[$i]->getVar('headline_name') . "</a></td>\n"
@@ -122,7 +122,7 @@
. " <td class='center {$tdclass}' style='vertical-align: middle;'><input type=\"checkbox\" value=\"1\" name=\"headline_asblock[" . $headlines[$i]->getVar('headline_id') . "]\"{$chkb} /></td>\n"
. " <td class='center {$tdclass}' style='vertical-align: middle;'><a href='main.php?op=edit&headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src={$pathIcon16}/edit.png alt='" . _EDIT . "' title='" . _EDIT . "'></a> \n"
. " <a href='main.php?op=delete&headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src={$pathIcon16}/delete.png alt='" . _DELETE . "' title='" . _DELETE . "'></a>\n"
- . " <a href='main.php?op=flush&headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src='../images/reload.png' alt='" . _AM_HEADLINES_CACHEFL . "' title='" . _AM_HEADLINES_CACHEFL . "'></a>\n"
+ . " <a href='main.php?op=flush&headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src='../assets/images/reload.png' alt='" . _AM_HEADLINES_CACHEFL . "' title='" . _AM_HEADLINES_CACHEFL . "'></a>\n"
. " <input type='hidden' name='headline_id[]' value='" . $headlines[$i]->getVar('headline_id') . "' />\n"
. " </td>\n"
. " </tr>\n";
@@ -184,7 +184,7 @@
foreach ($headline_id as $id) {
$hl =& $hlman->get($id);
if (!is_object($hl)) {
- $i++;
+ ++$i;
continue;
}
$headline_display[$id] = empty($headline_display[$id]) ? 0 : $headline_display[$id];
@@ -208,7 +208,7 @@
}
}
}
- $i++;
+ ++$i;
}
if ($msg != '') {
xoops_cp_header();
@@ -493,4 +493,3 @@
redirect_header('main.php', 2, _AM_HEADLINES_CACHEUPD);
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/menu.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/admin/menu.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: menu.php,v 1.4 2004/12/26 19:12:09 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -27,28 +27,35 @@
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);
-$pathIcon32 = $module->getInfo('icons32');
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
-xoops_loadLanguage('admin', $dirname);
-
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
-
-$i = 1;
+$i=0;
$adminmenu[$i]["title"] = _MI_HEADLINES_MENU_ADMININDEX;
$adminmenu[$i]["link"] = "admin/index.php";
$adminmenu[$i]["desc"] = _MI_HEADLINES_MENU_ADMININDEX_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_HEADLINES_MENU_ADMINHL;
$adminmenu[$i]["link"] = "admin/main.php";
$adminmenu[$i]["desc"] = _MI_HEADLINES_MENU_ADMINHL_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_HEADLINES_MENU_ADMINABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["desc"] = _MI_HEADLINES_MENU_ADMINABOUT_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
-?>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/css/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/css/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/css/index.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png 2014-04-25 12:12:29 UTC (rev 12484)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/headline_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/index.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png 2014-04-25 12:12:29 UTC (rev 12484)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/reload.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif 2014-04-25 12:12:29 UTC (rev 12484)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/images/rss.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/index.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/js/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/js/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/assets/js/index.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/blocks/headline.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/blocks/headline.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/blocks/headline.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: headline.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -41,8 +41,7 @@
$hlman =& xoops_getmodulehandler('headline', 'xoopsheadline');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('headline_asblock',1, '='));
- switch ($moduleConfig['sortby'])
- {
+ switch ($moduleConfig['sortby']) {
case 1:
$criteria->setSort('headline_name');
$criteria->setOrder('DESC');
@@ -63,7 +62,7 @@
}
$headlines =& $hlman->getObjects($criteria);
$count = count($headlines);
- for ($i = 0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; ++$i) {
$renderer = XoopsheadlineUtility::xoopsheadline_getrenderer($headlines[$i]);
if (!$renderer->renderBlock()) {
if (2 == $xoopsConfig['debug_mode']) {
@@ -73,6 +72,6 @@
}
$block['feeds'][] = $renderer->getBlock();
}
+
return $block;
}
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headline.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headline.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headline.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: headline.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: headline.php,v 1.7.6.1 2005/08/15 15:04:59 skalpa Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -28,9 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-if (!defined('XOOPS_ROOT_PATH')) {
- die("XOOPS root path not defined");
-}
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
class XoopsheadlineHeadline extends XoopsObject
{
@@ -66,6 +64,7 @@
if (time() - $this->getVar('headline_updated') > $this->getVar('headline_cachetime')) {
return true;
}
+
return false;
}
}
@@ -82,4 +81,3 @@
parent::__construct($db, 'xoopsheadline', 'xoopsheadline' . 'Headline', 'headline_id');
}
}
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headlinerenderer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headlinerenderer.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/headlinerenderer.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: headlinerenderer.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: headlinerenderer.php,v 1.7.6.1 2005/08/15 15:04:59 skalpa Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -54,7 +54,6 @@
// RSS2 SAX parser
protected $parser;
-
public function __construct(&$headline)
{
$this->hl =& $headline;
@@ -100,6 +99,7 @@
$headline_handler =& xoops_getmodulehandler('headline', 'xoopsheadline');
$retval = $headline_handler->insert($this->hl);
}
+
return $retval;
}
@@ -147,14 +147,15 @@
$items =& $this->parser->getItems();
$count = count($items);
$max = ($count > $this->hl->getVar('headline_mainmax')) ? $this->hl->getVar('headline_mainmax') : $count;
- for ($i = 0; $i < $max; $i++) {
+ for ($i = 0; $i < $max; ++$i) {
array_walk($items[$i], array($this, 'convertFromUtf8'));
$this->tpl->append_by_ref('items', $items[$i]);
}
$this->tpl->assign(array('lang_lastbuild' => _MD_HEADLINES_LASTBUILD, 'lang_language' => _MD_HEADLINES_LANGUAGE, 'lang_description' => _MD_HEADLINES_DESCRIPTION, 'lang_webmaster' => _MD_HEADLINES_WEBMASTER, 'lang_category' => _MD_HEADLINES_CATEGORY, 'lang_generator' => _MD_HEADLINES_GENERATOR, 'lang_title' => _MD_HEADLINES_TITLE, 'lang_pubdate' => _MD_HEADLINES_PUBDATE, 'lang_description' => _MD_HEADLINES_DESCRIPTION, 'lang_more' => _MORE));
- $this->feed =& $this->tpl->fetch('db:xoopsheadline_feed.html');
+ $this->feed =& $this->tpl->fetch('db:xoopsheadline_feed.tpl');
$retval = true;
}
+
return $retval;
}
@@ -180,19 +181,18 @@
$items =& $this->parser->getItems();
$count = count($items);
$max = ($count > $this->hl->getVar('headline_blockmax')) ? $this->hl->getVar('headline_blockmax') : $count;
- for ($i = 0; $i < $max; $i++) {
+ for ($i = 0; $i < $max; ++$i) {
array_walk($items[$i], array($this, 'convertFromUtf8'));
$this->tpl->append_by_ref('items', $items[$i]);
}
$this->tpl->assign(array('site_name' => $this->hl->getVar('headline_name'), 'site_url' => $this->hl->getVar('headline_url'), 'site_id' => $this->hl->getVar('headline_id')));
- $this->block =& $this->tpl->fetch('file:' . XOOPS_ROOT_PATH . '/modules/xoopsheadline/blocks/headline_block.html');
+ $this->block =& $this->tpl->fetch('file:' . XOOPS_ROOT_PATH . '/modules/xoopsheadline/blocks/headline_block.tpl');
$retval = true;
}
+
return $retval;
}
-
-
protected function &_parse()
{
$retval = true;
@@ -217,6 +217,7 @@
$retval = false;
}
}
+
return $retval;
}
@@ -247,6 +248,7 @@
}
}
}
+
return $retval;
}
@@ -266,7 +268,7 @@
if (strtolower($this->hl->getVar('headline_encoding')) == 'iso-8859-1') {
$xmlfile = utf8_encode($xmlfile);
}
+
return $xmlfile;
}
}
-?>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/xoopsheadlineutility.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/xoopsheadlineutility.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/class/xoopsheadlineutility.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -38,11 +38,12 @@
include_once XOOPS_ROOT_PATH.'/modules/xoopsheadline/language/'.$GLOBALS['xoopsConfig']['language'].'/headlinerenderer.php';
if (class_exists('XoopsHeadlineRendererLocal')) {
$myhl = new XoopsHeadlineRendererLocal($headline);
+
return $myhl;
}
}
$myhl = new XoopsHeadlineRenderer($headline);
+
return $myhl;
}
}
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/docs/changelog.txt 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/docs/changelog.txt 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,10 @@
-v1.10 [2012/12/22] (ZySpec)
+1.11 Beta 1 2014-04-23
=================================
+- moved all images, CSS, and JS files to /assets (mamba)
+- renamed .html Smarty templates to .tpl (mamba)
+
+1.10 [2012/12/22] (ZySpec)
+=================================
+ minor CSS changes
+ changed main language file variable names to Xoops Module Standards naming nomenclature
+ changed $HTTP_GET_VARS to $_GET for PHP 5
@@ -19,6 +24,6 @@
+ added /docs folder and moved changelog there
+ added Tutorial (http://goo.gl/1Uiqj) (mamba)
-v1.00
+1.00
=================================
+ initial release
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/index.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/index.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: index.php,v 1.6 2005/06/26 15:38:28 mithyt2 Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -31,14 +31,13 @@
$hlman =& xoops_getmodulehandler('headline');
$hlid = (!empty($_GET['id']) && (intval($_GET['id']) > 0)) ? intval($_GET['id']) : 0;
-$xoopsOption['template_main'] = 'xoopsheadline_index.html';
+$xoopsOption['template_main'] = 'xoopsheadline_index.tpl';
include XOOPS_ROOT_PATH . '/header.php';
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('headline_display',1, '='));
$criteria->add(new Criteria('headline_xml', '', '!='));
-switch (intval($xoopsModuleConfig['sortby']))
-{
+switch (intval($xoopsModuleConfig['sortby'])) {
case 1:
$criteria->setSort('headline_name');
$criteria->setOrder('DESC');
@@ -59,19 +58,18 @@
}
$headlines =& $hlman->getObjects($criteria);
-$modDirName = $xoopsModule->getVar('dirname', 'n');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+global $xoopsModule;
+$pathIcon16 = $xoopsModule->getInfo('icons16');
$userIsAdmin = ((is_object($xoopsUser)) && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) ? true : false ;
$count = count($headlines);
-for ($i = 0; $i < $count; $i++) {
+for ($i = 0; $i < $count; ++$i) {
$thisId = $headlines[$i]->getVar('headline_id');
$editUrl = ($userIsAdmin) ?" <a href='" . XOOPS_URL . "/modules/{$modDirName}/admin/main.php?op=edit&headline_id={$thisId}'><img src='" . $pathIcon16 . "/edit.png' alt='" . _EDIT . "' title='" . _EDIT . "'></a>" : '';
$xoopsTpl->append('feed_sites', array('id' => $thisId, 'name' => $headlines[$i]->getVar('headline_name'), 'editurl' => $editUrl));
}
$xoopsTpl->assign('lang_headlines', _MD_HEADLINES_HEADLINES);
-if ( 0 == $hlid ) {
+if (0 == $hlid) {
$hlid = $headlines[0]->getVar('headline_id');
}
if ($hlid > 0) {
@@ -92,4 +90,3 @@
}
}
include XOOPS_ROOT_PATH . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/admin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/admin.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/admin.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,42 +1,41 @@
-<?php
-/**
- * $Id: admin.php 10523 2012-12-23 12:48:50Z beckmi $
- */
-$admin_mydirname = basename(dirname(dirname(dirname(__FILE__))));
-
-// Admin Module Name Headlines
-define('_AM_HEADLINES_DBUPDATED','Database Updated Successfully!');
-define('_AM_HEADLINES_HEADLINES','Headlines Configuration');
-//define('_AM_HEADLINES_HLMAIN','Headline Main');
-define('_AM_HEADLINES_SITENAME','Site Name');
-define('_AM_HEADLINES_URL','URL');
-define('_AM_HEADLINES_ORDER','Order');
-define('_AM_HEADLINES_ENCODING','RSS Encoding');
-define('_AM_HEADLINES_CACHETIME','Cache Time');
-define('_AM_HEADLINES_CACHEFL','Flush Cache');
-define('_AM_HEADLINES_CACHEUPD','Cache Updated');
-define('_AM_HEADLINES_UPDATE','Update');
-define('_AM_HEADLINES_MAINSETT','Main Page Settings');
-define('_AM_HEADLINES_BLOCKSETT','Block Settings');
-define('_AM_HEADLINES_DISPLAY','Display in main page');
-define('_AM_HEADLINES_DISPIMG','Display image');
-define('_AM_HEADLINES_DISPFULL','Display in full view');
-define('_AM_HEADLINES_DISPMAX','Max items to display');
-define('_AM_HEADLINES_ASBLOCK','Display in block');
-define('_AM_HEADLINES_ADDHEADL','Add Headline');
-define('_AM_HEADLINES_URLEDFXML','URL of RDF/RSS file');
-define('_AM_HEADLINES_EDITHEADL','Edit Headline');
-define('_AM_HEADLINES_WANTDEL','Are you sure you want to delete headline for %s?');
-define('_AM_HEADLINES_WANTFLUSH','Are you sure you want to flush the %s headline cache?');
-define('_AM_HEADLINES_INVALIDID','Invalid ID');
-define('_AM_HEADLINES_OBJECTNG','Object does not exist');
-define('_AM_HEADLINES_FAILUPDATE','Failed saving data to database for headline %s');
-define('_AM_HEADLINES_FAILUPDELETE','Failed deleting data from database for headline %s');
-define('_AM_HEADLINES_FAILFLUSH','Failed attempting to flush the cache for %s');
-define('_AM_HEADLINES_SHOW','Show Feed');
-define('_AM_HEADLINES_HIDE','Hide Feed');
-define('_AM_HEADLINES_ACTIONS','Actions');
-
-
-// Text for Admin footer
-define("_AM_HEADLINES_ADMIN_FOOTER","<div class='center smallsmall italic pad5'><strong>{$admin_mydirname}</strong> is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+<?php
+/**
+ * $Id: $
+ */
+$admin_mydirname = basename(dirname(dirname(dirname(__FILE__))));
+
+// Admin Module Name Headlines
+define('_AM_HEADLINES_DBUPDATED','Database Updated Successfully!');
+define('_AM_HEADLINES_HEADLINES','Headlines Configuration');
+//define('_AM_HEADLINES_HLMAIN','Headline Main');
+define('_AM_HEADLINES_SITENAME','Site Name');
+define('_AM_HEADLINES_URL','URL');
+define('_AM_HEADLINES_ORDER','Order');
+define('_AM_HEADLINES_ENCODING','RSS Encoding');
+define('_AM_HEADLINES_CACHETIME','Cache Time');
+define('_AM_HEADLINES_CACHEFL','Flush Cache');
+define('_AM_HEADLINES_CACHEUPD','Cache Updated');
+define('_AM_HEADLINES_UPDATE','Update');
+define('_AM_HEADLINES_MAINSETT','Main Page Settings');
+define('_AM_HEADLINES_BLOCKSETT','Block Settings');
+define('_AM_HEADLINES_DISPLAY','Display in main page');
+define('_AM_HEADLINES_DISPIMG','Display image');
+define('_AM_HEADLINES_DISPFULL','Display in full view');
+define('_AM_HEADLINES_DISPMAX','Max items to display');
+define('_AM_HEADLINES_ASBLOCK','Display in block');
+define('_AM_HEADLINES_ADDHEADL','Add Headline');
+define('_AM_HEADLINES_URLEDFXML','URL of RDF/RSS file');
+define('_AM_HEADLINES_EDITHEADL','Edit Headline');
+define('_AM_HEADLINES_WANTDEL','Are you sure you want to delete headline for %s?');
+define('_AM_HEADLINES_WANTFLUSH','Are you sure you want to flush the %s headline cache?');
+define('_AM_HEADLINES_INVALIDID','Invalid ID');
+define('_AM_HEADLINES_OBJECTNG','Object does not exist');
+define('_AM_HEADLINES_FAILUPDATE','Failed saving data to database for headline %s');
+define('_AM_HEADLINES_FAILUPDELETE','Failed deleting data from database for headline %s');
+define('_AM_HEADLINES_FAILFLUSH','Failed attempting to flush the cache for %s');
+define('_AM_HEADLINES_SHOW','Show Feed');
+define('_AM_HEADLINES_HIDE','Hide Feed');
+define('_AM_HEADLINES_ACTIONS','Actions');
+
+// Text for Admin footer
+define("_AM_HEADLINES_ADMIN_FOOTER","<div class='center smallsmall italic pad5'><strong>{$admin_mydirname}</strong> is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/blocks.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/blocks.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/blocks.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,9 +1,8 @@
-<?php
-/**
- * $Id: blocks.php 10523 2012-12-23 12:48:50Z beckmi $
- */
-
-// Blocks
-define('_MB_HEADLINES_DISPLAYF','Display site logo');
-define('_MB_HEADLINES_MAXITEM','Max number of items for each headline');
-?>
\ No newline at end of file
+<?php
+/**
+ * $Id: $
+ */
+
+// Blocks
+define('_MB_HEADLINES_DISPLAYF','Display site logo');
+define('_MB_HEADLINES_MAXITEM','Max number of items for each headline');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/main.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/main.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,26 +1,25 @@
-<?php
-/**
- * $Id: main.php 10523 2012-12-23 12:48:50Z beckmi $
- */
-
-define('_MD_HEADLINES_LASTBUILD','Updated');
-define('_MD_HEADLINES_LANGUAGE','Language');
-define('_MD_HEADLINES_DESCRIPTION','Description');
-define('_MD_HEADLINES_WEBMASTER','Webmaster');
-define('_MD_HEADLINES_CATEGORY','Category');
-define('_MD_HEADLINES_GENERATOR','Generator');
-define('_MD_HEADLINES_TITLE','Title');
-define('_MD_HEADLINES_PUBDATE','Published');
-define('_MD_HEADLINES_FAILGET','Failed retrieving RSS feed from %s');
-define('_MD_HEADLINES_GOTOTOP','Goto Top');
-define('_MD_HEADLINES_HEADLINES','Headlines');
-define('_MD_HEADLINES_NOTOPEN','Could not open file: %s');
-define('_MD_HEADLINES_BADOPT','Could not set CURL option');
-
-// Administration
-define('_MD_HEADLINES_XOOPSHEADLINECONF','Xoops Headline Dashboard');
-define('_MD_HEADLINES_TOTALDISPLAYED',"%s Displayed Headlines");
-define('_MD_HEADLINES_TOTALHIDDEN',"%s Hidden Headlines");
-define('_MD_HEADLINES_TOTALHLS',"%s Total Headlines");
-define('_MD_HEADLINES_TOTALASBLOCK',"%s Headlines displayed in block(s)");
-?>
\ No newline at end of file
+<?php
+/**
+ * $Id: $
+ */
+
+define('_MD_HEADLINES_LASTBUILD','Updated');
+define('_MD_HEADLINES_LANGUAGE','Language');
+define('_MD_HEADLINES_DESCRIPTION','Description');
+define('_MD_HEADLINES_WEBMASTER','Webmaster');
+define('_MD_HEADLINES_CATEGORY','Category');
+define('_MD_HEADLINES_GENERATOR','Generator');
+define('_MD_HEADLINES_TITLE','Title');
+define('_MD_HEADLINES_PUBDATE','Published');
+define('_MD_HEADLINES_FAILGET','Failed retrieving RSS feed from %s');
+define('_MD_HEADLINES_GOTOTOP','Goto Top');
+define('_MD_HEADLINES_HEADLINES','Headlines');
+define('_MD_HEADLINES_NOTOPEN','Could not open file: %s');
+define('_MD_HEADLINES_BADOPT','Could not set CURL option');
+
+// Administration
+define('_MD_HEADLINES_XOOPSHEADLINECONF','Xoops Headline Dashboard');
+define('_MD_HEADLINES_TOTALDISPLAYED',"%s Displayed Headlines");
+define('_MD_HEADLINES_TOTALHIDDEN',"%s Hidden Headlines");
+define('_MD_HEADLINES_TOTALHLS',"%s Total Headlines");
+define('_MD_HEADLINES_TOTALASBLOCK',"%s Headlines displayed in block(s)");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/modinfo.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/modinfo.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/language/english/modinfo.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,46 +1,45 @@
-<?php
-/**
- * XoopsHeadline module
- * Description: Module Info Language file
- *
- * 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:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
- * @package:: xoopsheadline
- * @subpackage:: admin
- * @since:: 1.10
- * @author:: onokazu, et al.
- * @version:: $Id $
- **/
-
-// The name of this module
-define("_MI_HEADLINES_NAME","Headlines");
-
-// A brief description of this module
-define("_MI_HEADLINES_DESC","Displays RSS/XML Newsfeed from other sites");
-
-// Names of blocks for this module (Not all module has blocks)
-define("_MI_HEADLINES_BNAME","Headlines");
-
-// Names of admin menu items & their descriptions
-define("_MI_HEADLINES_MENU_ADMININDEX","Home");
-define("_MI_HEADLINES_MENU_ADMINHL","List Headlines");
-define("_MI_HEADLINES_MENU_ADMINABOUT","About");
-define("_MI_HEADLINES_MENU_ADMININDEX_DESC","");
-define("_MI_HEADLINES_MENU_ADMINHL_DESC","Display the headline entries");
-define("_MI_HEADLINES_MENU_ADMINABOUT_DESC","Display information about this module");
-
-// Config Option items
-define("_MI_HEADLINES_SORTORDER","Order to display headlines");
-define("_MI_HEADLINES_SORTORDERDSC","This is the order the headlines will be shown in display and blocks");
-define("_MI_HEADLINES_SORT1","Site Name DESC");
-define("_MI_HEADLINES_SORT2","Site Name ASC");
-define("_MI_HEADLINES_SORT3","Weight DESC");
-define("_MI_HEADLINES_SORT4","Weight ASC");
-?>
\ No newline at end of file
+<?php
+/**
+ * XoopsHeadline module
+ * Description: Module Info Language file
+ *
+ * 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:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package:: xoopsheadline
+ * @subpackage:: admin
+ * @since:: 1.10
+ * @author:: onokazu, et al.
+ * @version:: $Id $
+ **/
+
+// The name of this module
+define("_MI_HEADLINES_NAME","Headlines");
+
+// A brief description of this module
+define("_MI_HEADLINES_DESC","Displays RSS/XML Newsfeed from other sites");
+
+// Names of blocks for this module (Not all module has blocks)
+define("_MI_HEADLINES_BNAME","Headlines");
+
+// Names of admin menu items & their descriptions
+define("_MI_HEADLINES_MENU_ADMININDEX","Home");
+define("_MI_HEADLINES_MENU_ADMINHL","List Headlines");
+define("_MI_HEADLINES_MENU_ADMINABOUT","About");
+define("_MI_HEADLINES_MENU_ADMININDEX_DESC","");
+define("_MI_HEADLINES_MENU_ADMINHL_DESC","Display the headline entries");
+define("_MI_HEADLINES_MENU_ADMINABOUT_DESC","Display information about this module");
+
+// Config Option items
+define("_MI_HEADLINES_SORTORDER","Order to display headlines");
+define("_MI_HEADLINES_SORTORDERDSC","This is the order the headlines will be shown in display and blocks");
+define("_MI_HEADLINES_SORT1","Site Name DESC");
+define("_MI_HEADLINES_SORT2","Site Name ASC");
+define("_MI_HEADLINES_SORT3","Weight DESC");
+define("_MI_HEADLINES_SORT4","Weight ASC");
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.html 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,3 +0,0 @@
-<{foreach item=feed from=$block.feeds}>
-<p><{$feed}></p>
-<{/foreach}>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/blocks/xoopsheadline_block_rss.tpl 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1,3 @@
+<{foreach item=feed from=$block.feeds}>
+<p><{$feed}></p>
+<{/foreach}>
\ No newline at end of file
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.html 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,69 +0,0 @@
-<table style="margin: 1px;" class="outer">
- <tr>
- <th colspan="3"><a href="<{$channel.link}>" target="_blank"><{$channel.title}></a></th>
- </tr>
- <tr>
- <td style="width: 25%;" rowspan="6">
- <{if $image.url != ""}>
- <img src="<{$image.url}>" width="<{$image.width|default:88}>" height="<{$image.height|default:31}>" alt="<{$image.title}>" />
- <{else}>
-
- <{/if}>
- </td>
- <td style="vertical-align: top;" class="head"><{$lang_lastbuild}></td>
- <td class="odd"><{$channel.lastbuilddate|default:" "}></td>
- </tr>
- <tr>
- <td style="vertical-align: top;" class="head"><{$lang_description}></td>
- <td class="even"><{$channel.description|default:" "}></td>
- </tr>
- <tr>
- <td style="vertical-align: top;" class="head"><{$lang_webmaster}></td>
- <td class="odd"><{$channel.webmaster|default:" "}></td>
- </tr>
- <tr>
- <td style="vertical-align: top;" class="head"><{$lang_category}></td>
- <td class="even"><{$channel.category|default:" "}></td>
- </tr>
- <tr>
- <td style="vertical-align: top;" class="head"><{$lang_generator}></td>
- <td class="odd"><{$channel.generator|default:" "}></td>
- </tr>
- <tr>
- <td style="vertical-align: top;" class="head"><{$lang_language}></td>
- <td class="even"><{$channel.language|default:" "}></td>
- </tr>
- <{section name=i loop=$items}>
- <tr class="head">
- <td style="padding-left: 2em;" colspan="3">
- <{if $items[i].title != ""}><a id="<{$items[i].link}>"></a><a href="<{$items[i].link}>" target="_blank"><{$items[i].title}></a>
- <{/if}>
- </td>
- </tr>
- <{if $show_full == true}>
- <{if $items[i].category != ""}>
- <tr>
- <td class="even" style="vertical-align: top;"><{$lang_category}></td>
- <td class="odd" colspan="2"><{$items[i].category}>
- </tr>
- <{/if}>
- <{if $items[i].pubdate != ""}>
- <tr>
- <td class="even" style="vertical-align: top;"><{$lang_pubdate}>:</td>
- <td class="odd" colspan="2"><{$items[i].pubdate}></td>
- </tr>
- <{/if}>
- <{if $items[i].description != ""}>
- <tr>
- <td class="even" style="vertical-align: top;"><{$lang_description}>:</td>
- <td colspan="2" class="odd"><{$items[i].description}><{if $items[i].guid != ""}> <a href="<{$items[i].guid}>" target="_blank"><{$lang_more}></a><{/if}></td>
- </tr>
- <{elseif $items[i].guid != ""}>
- <tr>
- <td class="even" style="vertical-align: top;"></td>
- <td colspan="2" class="odd"><a href="<{$items[i].guid}>" target="_blank"><{$lang_more}></a></td>
- </tr>
- <{/if}>
- <{/if}>
- <{/section}>
-</table>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_feed.tpl 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1,69 @@
+<table style="margin: 1px;" class="outer">
+ <tr>
+ <th colspan="3"><a href="<{$channel.link}>" target="_blank"><{$channel.title}></a></th>
+ </tr>
+ <tr>
+ <td style="width: 25%;" rowspan="6">
+ <{if $image.url != ""}>
+ <img src="<{$image.url}>" width="<{$image.width|default:88}>" height="<{$image.height|default:31}>" alt="<{$image.title}>" />
+ <{else}>
+
+ <{/if}>
+ </td>
+ <td style="vertical-align: top;" class="head"><{$lang_lastbuild}></td>
+ <td class="odd"><{$channel.lastbuilddate|default:" "}></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;" class="head"><{$lang_description}></td>
+ <td class="even"><{$channel.description|default:" "}></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;" class="head"><{$lang_webmaster}></td>
+ <td class="odd"><{$channel.webmaster|default:" "}></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;" class="head"><{$lang_category}></td>
+ <td class="even"><{$channel.category|default:" "}></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;" class="head"><{$lang_generator}></td>
+ <td class="odd"><{$channel.generator|default:" "}></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;" class="head"><{$lang_language}></td>
+ <td class="even"><{$channel.language|default:" "}></td>
+ </tr>
+ <{section name=i loop=$items}>
+ <tr class="head">
+ <td style="padding-left: 2em;" colspan="3">
+ <{if $items[i].title != ""}><a id="<{$items[i].link}>"></a><a href="<{$items[i].link}>" target="_blank"><{$items[i].title}></a>
+ <{/if}>
+ </td>
+ </tr>
+ <{if $show_full == true}>
+ <{if $items[i].category != ""}>
+ <tr>
+ <td class="even" style="vertical-align: top;"><{$lang_category}></td>
+ <td class="odd" colspan="2"><{$items[i].category}>
+ </tr>
+ <{/if}>
+ <{if $items[i].pubdate != ""}>
+ <tr>
+ <td class="even" style="vertical-align: top;"><{$lang_pubdate}>:</td>
+ <td class="odd" colspan="2"><{$items[i].pubdate}></td>
+ </tr>
+ <{/if}>
+ <{if $items[i].description != ""}>
+ <tr>
+ <td class="even" style="vertical-align: top;"><{$lang_description}>:</td>
+ <td colspan="2" class="odd"><{$items[i].description}><{if $items[i].guid != ""}> <a href="<{$items[i].guid}>" target="_blank"><{$lang_more}></a><{/if}></td>
+ </tr>
+ <{elseif $items[i].guid != ""}>
+ <tr>
+ <td class="even" style="vertical-align: top;"></td>
+ <td colspan="2" class="odd"><a href="<{$items[i].guid}>" target="_blank"><{$lang_more}></a></td>
+ </tr>
+ <{/if}>
+ <{/if}>
+ <{/section}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.html 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.html 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,12 +0,0 @@
-<h2 style="text-align: left;"><{$lang_headlines}></h2>
-<div style='padding: 1px; text-align: left;'>
- <ul style="list-style-image:url(images/rss.gif);">
- <!-- start site loop -->
- <{foreach item=site from=$feed_sites}>
- <li><{$site.editurl}> <a href="<{$xoops_url}>/modules/xoopsheadline/index.php?id=<{$site.id}>"><{$site.name}></a></li>
- <{/foreach}>
- <!-- end site loop -->
- </ul>
-</div>
-
-<{$headline}>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/templates/xoopsheadline_index.tpl 2014-04-25 12:12:29 UTC (rev 12484)
@@ -0,0 +1,12 @@
+<h2 style="text-align: left;"><{$lang_headlines}></h2>
+<div style='padding: 1px; text-align: left;'>
+ <ul style="list-style-image:url(assets/images/rss.gif);">
+ <!-- start site loop -->
+ <{foreach item=site from=$feed_sites}>
+ <li><{$site.editurl}> <a href="<{$xoops_url}>/modules/xoopsheadline/index.php?id=<{$site.id}>"><{$site.name}></a></li>
+ <{/foreach}>
+ <!-- end site loop -->
+ </ul>
+</div>
+
+<{$headline}>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/xoops_version.php 2014-04-25 12:10:28 UTC (rev 12483)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/xoops_version.php 2014-04-25 12:12:29 UTC (rev 12484)
@@ -1,5 +1,5 @@
<?php
-// $Id: xoops_version.php 10523 2012-12-23 12:48:50Z beckmi $
+// $Id: xoops_version.php,v 1.5 2004/12/26 19:12:10 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -30,15 +30,15 @@
$modversion = array('name' => _MI_HEADLINES_NAME,
'description' => _MI_HEADLINES_DESC,
- 'version' => 1.10,
- 'module_status' => "Final",
+ 'version' => 1.11,
+ 'module_status' => "Beta 1",
'official' => 1, // maintained by XOOPS Module Development Team
'author' => 'Kazumi Ono ( http://www.xoops.org/ http://www.myweb.ne.jp/ )',
'credits' => 'The Xoops Module Development Team',
'license' => 'GNU GPL 2.0',
- 'license_url' => "www.gnu.org/licenses/gpl-2.0.html/",
+ 'license_url' => "www.gnu.org/licenses/gpl-2.0.html",
'help' => 'page=help',
- 'image' => 'images/headline_slogo.png',
+ 'image' => 'assets/images/headline_slogo.png',
'dirname' => $xhlDirName,
//about
@@ -46,9 +46,9 @@
'author_website_name' => "XOOPS",
'module_website_url' => "http://xoops.org",
'module_website_name' => "XOOPS",
- 'release_date' => '2012/12/22',
- 'min_php' => '5.2.0',
- 'min_xoops' => '2.5.5',
+ 'release_date' => '2014/04/23',
+ 'min_php' => '5.3.7',
+ 'min_xoops' => '2.5.7',
'min_db' => array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7'),
'min_admin' => '1.1',
'dirmoduleadmin' => '/Frameworks/moduleclasses/moduleadmin',
@@ -89,14 +89,13 @@
$modversion['blocks'][1]['name'] = _MI_HEADLINES_BNAME;
$modversion['blocks'][1]['description'] = "Shows headline news via RDF/RSS news feed";
$modversion['blocks'][1]['show_func'] = 'b_xoopsheadline_show';
-$modversion['blocks'][1]['template'] = 'xoopsheadline_block_rss.html';
+$modversion['blocks'][1]['template'] = 'xoopsheadline_block_rss.tpl';
// Menu
$modversion['hasMain'] = 1;
// Templates
-$modversion['templates'][1]['file'] = 'xoopsheadline_index.html';
+$modversion['templates'][1]['file'] = 'xoopsheadline_index.tpl';
$modversion['templates'][1]['description'] = '';
-$modversion['templates'][2]['file'] = 'xoopsheadline_feed.html';
+$modversion['templates'][2]['file'] = 'xoopsheadline_feed.tpl';
$modversion['templates'][2]['description'] = '';
-?>
\ No newline at end of file
|
