Thread: [xoops-svn] SF.net SVN: xoops-svn:[12484] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modul

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

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&amp;headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src={$pathIcon16}/edit.png alt='" . _EDIT . "' title='" . _EDIT . "'></a>&nbsp;\n"
                . "          <a href='main.php?op=delete&amp;headline_id=" . $headlines[$i]->getVar('headline_id') . "'><img src={$pathIcon16}/delete.png alt='" . _DELETE . "' title='" . _DELETE . "'></a>\n"
-               . "          <a href='main.php?op=flush&amp;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&amp;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) ?"&nbsp;<a href='" . XOOPS_URL . "/modules/{$modDirName}/admin/main.php?op=edit&amp;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: ...
 
[truncated message content]

Thread: [xoops-svn] SF.net SVN: xoops-svn:[12484] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modul

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

xoops-svn