Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-05-16 08:28:16
|
Revision: 9523
http://xoops.svn.sourceforge.net/xoops/?rev=9523&view=rev
Author: beckmi
Date: 2012-05-16 08:28:03 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fixing some bugs (Mazarin, Mamba, others)
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/about.php
XoopsModules/news/branches/mamba/news/admin/admin_footer.php
XoopsModules/news/branches/mamba/news/admin/admin_header.php
XoopsModules/news/branches/mamba/news/admin/groupperms.php
XoopsModules/news/branches/mamba/news/admin/index.php
XoopsModules/news/branches/mamba/news/admin/menu.php
XoopsModules/news/branches/mamba/news/article.php
XoopsModules/news/branches/mamba/news/backendt.php
XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php
XoopsModules/news/branches/mamba/news/class/class.newsstory.php
XoopsModules/news/branches/mamba/news/class/wideimage/Canvas.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/Dimension.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/Exception.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/FileMapperFactory.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/Image.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/OpFactory.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/PaletteImage.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/TrueColorImage.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/WideImage.inc.php
XoopsModules/news/branches/mamba/news/class/wideimage/mappers/ImageFileMapper_GD.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/mappers/ImageFileMapper_GD2.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/mappers/ImageFileMapper_GIF.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/mappers/ImageFileMapper_JPEG.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/mappers/ImageFileMapper_PNG.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/ApplyConvolution.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/ApplyFilter.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/ApplyMask.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/AsGrayscale.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/CopyChannelsPalette.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/CopyChannelsTrueColor.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/CorrectGamma.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Crop.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Flip.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/GetMask.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Merge.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Mirror.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Resize.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Rotate.class.php
XoopsModules/news/branches/mamba/news/class/wideimage/operations/Unsharp.class.php
XoopsModules/news/branches/mamba/news/docs/lang.diff
XoopsModules/news/branches/mamba/news/extra/modules/tag/plugin/news.php
XoopsModules/news/branches/mamba/news/include/install_function.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
XoopsModules/news/branches/mamba/news/language/english/help/help.html
XoopsModules/news/branches/mamba/news/language/german/newsletter.php
XoopsModules/news/branches/mamba/news/list.tag.php
XoopsModules/news/branches/mamba/news/print.php
XoopsModules/news/branches/mamba/news/submit.php
XoopsModules/news/branches/mamba/news/templates/news_article.html
XoopsModules/news/branches/mamba/news/view.tag.php
XoopsModules/news/branches/mamba/news/xoops_version.php
Added Paths:
-----------
XoopsModules/news/branches/mamba/news/admin/index.html
XoopsModules/news/branches/mamba/news/class/news_stories.php
XoopsModules/news/branches/mamba/news/class/news_topics.php
XoopsModules/news/branches/mamba/news/language/englishUTF8/help/
XoopsModules/news/branches/mamba/news/language/englishUTF8/help/help.html
XoopsModules/news/branches/mamba/news/language/englishUTF8/help/index.html
XoopsModules/news/branches/mamba/news/language/french/help/help.html
XoopsModules/news/branches/mamba/news/language/french/help/index.html
XoopsModules/news/branches/mamba/news/language/frenchUTF8/help/help.html
XoopsModules/news/branches/mamba/news/language/frenchUTF8/help/index.html
XoopsModules/news/branches/mamba/news/language/german/help/help.html
XoopsModules/news/branches/mamba/news/language/german/help/index.html
XoopsModules/news/branches/mamba/news/language/italian/
XoopsModules/news/branches/mamba/news/language/italian/admin.php
XoopsModules/news/branches/mamba/news/language/italian/aggiornamento.txt
XoopsModules/news/branches/mamba/news/language/italian/blocks.php
XoopsModules/news/branches/mamba/news/language/italian/help/
XoopsModules/news/branches/mamba/news/language/italian/help/help.html
XoopsModules/news/branches/mamba/news/language/italian/help/index.html
XoopsModules/news/branches/mamba/news/language/italian/index.html
XoopsModules/news/branches/mamba/news/language/italian/mail_template/
XoopsModules/news/branches/mamba/news/language/italian/mail_template/global_newcategory_notify.tpl
XoopsModules/news/branches/mamba/news/language/italian/mail_template/global_newstory_notify.tpl
XoopsModules/news/branches/mamba/news/language/italian/mail_template/global_storysubmit_notify.tpl
XoopsModules/news/branches/mamba/news/language/italian/mail_template/index.html
XoopsModules/news/branches/mamba/news/language/italian/mail_template/story_approve_notify.tpl
XoopsModules/news/branches/mamba/news/language/italian/mail_template/topic_newstory_notify.tpl
XoopsModules/news/branches/mamba/news/language/italian/main.php
XoopsModules/news/branches/mamba/news/language/italian/modinfo.php
XoopsModules/news/branches/mamba/news/language/italian/newsletter.php
Modified: XoopsModules/news/branches/mamba/news/admin/about.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/about.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/about.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,28 +1,28 @@
-<?php
-/**
- * News module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package News
- * @since 2.5.0
- * @author XOOPS Development Team
- * @version $Id $
- **/
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-
+<?php
+/**
+ * News module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package News
+ * @since 2.5.0
+ * @author XOOPS Development Team
+ * @version $Id $
+ **/
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/admin/admin_footer.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/admin_footer.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/admin_footer.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -10,11 +10,15 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
* @package News
- * @since 2.5.0
+ * @since 1.6.7
* @author Mamba (www.xoops.org)
* @version $Id $
**/
+echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
+ . " <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
+
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/admin/admin_header.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/admin_header.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/admin_header.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,44 +1,70 @@
-<?php
-/**
- * News module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package news
- * @since 2.5.0
- * @author XOOPS Development Team
- * @version $Id $
-**/
-$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';
-
-global $xoopsModule;
-
-$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);
-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
+<?php
+/**
+ * News module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package news
+ * @since 1.6.7
+ * @author XOOPS Development Team
+ * @version $Id $
+**/
+$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';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$thisModulePath = dirname(dirname(__FILE__));
+
+//if functions.php file exist
+require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+//require_once $thisModulePath . '/include/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);
+}
+
+
+$topicsHandler=& xoops_getModuleHandler('news_topics','news');
+$storiesHandler=& xoops_getModuleHandler('news_stories','news');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -31,8 +31,9 @@
include_once XOOPS_ROOT_PATH . '/modules/news/admin/functions.php';
include_once 'admin_header.php';
xoops_cp_header();
+$permAdmin = new ModuleAdmin();
+echo $permAdmin->addNavigation('groupperms.php');
-//news_adminmenu(2);
echo '<br /><br /><br />';
$permtoset = isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
$selected = array('', '', '');
Added: XoopsModules/news/branches/mamba/news/admin/index.html
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/index.html (rev 0)
+++ XoopsModules/news/branches/mamba/news/admin/index.html 2012-05-16 08:28:03 UTC (rev 9523)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/admin/index.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/index.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -125,7 +125,7 @@
echo "<td align='center'><b>" . $autostory -> storyid() . "</b>
</td><td align='left'><a href='" . XOOPS_URL . "/modules/news/article.php?storyid=" . $autostory->storyid() . "'>" . $autostory->title() . "</a>
</td><td align='center'>" . $topic->topic_title() . "
- </td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $autostory->uid() . "'>" . $autostory->uname() . "</a></td><td align='center' class='nw'>" . formatTimestamp($autostory->published(),$dateformat) . "</td><td align='center'>" . $expire . "</td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $autostory->storyid() . "'><img src='" . $pathIcon16."/edit.png. ' '. title="._AM_EDIT."> </a>-<a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $autostory->storyid() . "'><img src='" . $pathIcon16."/delete.png". ' '. 'title='._AM_DELETE."'></a>";
+ </td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $autostory->uid() . "'>" . $autostory->uname() . "</a></td><td align='center' class='nw'>" . formatTimestamp($autostory->published(),$dateformat) . "</td><td align='center'>" . $expire . "</td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $autostory->storyid() . "'><img src='" . $pathIcon16."/edit.png. ' '. title="._AM_EDIT."> </a> <a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $autostory->storyid() . "'><img src='" . $pathIcon16."/delete.png. ' '. title='._AM_DELETE.'></a>";
echo "</td></tr>\n";
}
@@ -276,7 +276,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- //news_adminmenu(3);
+ $pruneAdmin = new ModuleAdmin();
+ echo $pruneAdmin->addNavigation('index.php?op=prune');
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_PRUNENEWS, 'pruneform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$sform->addElement(new XoopsFormTextDateSelect(_AM_NEWS_PRUNE_BEFORE, 'prune_date',15,time()), true);
@@ -369,7 +370,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- //news_adminmenu(5);
+ $newsletterAdmin = new ModuleAdmin();
+ echo $newsletterAdmin->addNavigation('index.php?op=configurenewsletter');
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_NEWSLETTER, 'newsletterform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NEWS_NEWSLETTER_BETWEEN);
@@ -412,7 +414,8 @@
{
global $xoopsConfig, $dateformat;
xoops_cp_header();
- //news_adminmenu(5);
+ $newsletterAdmin = new ModuleAdmin();
+ echo $newsletterAdmin->addNavigation('index.php?op=configurenewsletter');
$newslettertemplate = '';
if (file_exists(XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php')) {
include_once XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php';
@@ -484,7 +487,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- //news_adminmenu(4);
+ $exportAdmin = new ModuleAdmin();
+ echo $exportAdmin->addNavigation('index.php?op=export');
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_EXPORT_NEWS, 'exportform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NEWS_EXPORT_BETWEEN);
@@ -526,7 +530,8 @@
function LaunchExport()
{
xoops_cp_header();
- //news_adminmenu(4);
+ $exportAdmin = new ModuleAdmin();
+ echo $exportAdmin->addNavigation('index.php?op=export');
echo '<br />';
$story = new NewsStory();
$topic= new NewsTopic();
@@ -632,8 +637,9 @@
global $xoopsDB, $xoopsConfig, $xoopsModule, $myts;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- //news_adminmenu(0);
-
+ $topicAdmin = new ModuleAdmin();
+ echo $topicAdmin->addNavigation('index.php?op=topicsmanager');
+
global $pathIcon16;
$uploadfolder=sprintf(_AM_UPLOAD_WARNING,XOOPS_URL . '/uploads/news/image');
@@ -645,10 +651,10 @@
$totaltopics = count($topics_arr);
$class='';
- echo '<h4>' . _AM_CONFIG . '</h4>';
- news_collapsableBar('topicsmanager', 'toptopicsmanager');
+ //echo '<h4>' . _AM_CONFIG . '</h4>';
+ //news_collapsableBar('topicsmanager', 'toptopicsmanager');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='toptopicsmanager' name='toptopicsmanager' src='" . $pathIcon16."/close12.gif' alt='' /></a> "._AM_TOPICSMNGR . ' (' . $totaltopics . ')'."</h4>";
+ //echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='toptopicsmanager' name='toptopicsmanager' src='" . $pathIcon16."/close12.gif' alt='' /></a> "._AM_TOPICSMNGR . ' (' . $totaltopics . ')'."</h4>";
echo "<div id='topicsmanager'>";
@@ -1110,12 +1116,13 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
- //news_adminmenu(6);
+ $statsAdmin = new ModuleAdmin();
+ echo $statsAdmin->addNavigation('index.php?op=stats');
$news = new NewsStory();
$stats = array();
$stats=$news->GetStats(news_getmoduleoption('storycountadmin'));
$totals=array(0,0,0,0,0);
- printf("<h1>%s</h1>\n",_AM_NEWS_STATS);
+ //printf("<h1>%s</h1>\n",_AM_NEWS_STATS);
// First part of the stats, everything about topics
$storiespertopic=$stats['storiespertopic'];
@@ -1254,8 +1261,9 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
- //news_adminmenu(8);
- echo "<h1>"._AM_NEWS_METAGEN."</h1>";
+ $metagenAdmin = new ModuleAdmin();
+ echo $metagenAdmin->addNavigation('index.php?op=metagen');
+ //echo "<h1>"._AM_NEWS_METAGEN."</h1>";
echo _AM_NEWS_METAGEN_DESC."<br /><br />";
// Metagen Options
@@ -1368,8 +1376,7 @@
} elseif(isset($_GET['op'])) {
$op=$_GET['op'];
}
-
-
+$indexAdmin = new ModuleAdmin();
switch ($op) {
case 'deletefile':
xoops_cp_header();
@@ -1394,7 +1401,7 @@
case 'newarticle':
xoops_cp_header();
- //news_adminmenu(1);
+ echo $indexAdmin->addNavigation('index.php?op=newarticle');
echo '<h4>' . _AM_CONFIG . '</h4>';
include_once XOOPS_ROOT_PATH . '/class/module.textsanitizer.php';
newSubmissions();
@@ -1470,7 +1477,7 @@
}
break;
- case 'topicsmanager':
+ case 'topicsmanager':
topicsmanager();
break;
@@ -1496,6 +1503,7 @@
break;
case 'prune':
+ echo $indexAdmin->addNavigation('index.php?op=prune');
PruneManager();
break;
@@ -1508,6 +1516,7 @@
break;
case 'export':
+ echo $indexAdmin->addNavigation('index.php?op=export');
NewsExport();
break;
@@ -1516,18 +1525,22 @@
break;
case 'configurenewsletter':
+ //echo $indexAdmin->addNavigation('index.php?op=configurenewsletter');
Newsletter();
break;
case 'launchnewsletter':
+ //echo $indexAdmin->addNavigation('index.php?op=configurenewsletter');
LaunchNewsletter();
break;
case 'stats':
+ echo $indexAdmin->addNavigation('index.php?op=stats');
Stats();
break;
case 'metagen':
+ echo $indexAdmin->addNavigation('index.php?op=metagen');
Metagen();
break;
@@ -1558,10 +1571,34 @@
XOOPS_ROOT_PATH . '/uploads/news/',
XOOPS_ROOT_PATH . '/uploads/news/file',
XOOPS_ROOT_PATH . '/uploads/news/image',
- );
-
- $indexAdmin = new ModuleAdmin();
-
+ );
+
+ //compte "total"
+ $count_stories = $storiesHandler->getCount();
+ //compte "attente"
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("menu", 1));
+ $stories_ihome = $storiesHandler->getCount($criteria);
+
+ //compte "total"
+ $count_topics = $topicsHandler->getCount();
+ //compte "attente"
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("menu", 1));
+ $topics_menu = $topicsHandler->getCount($criteria);
+
+ $clr_count_stories = ($count_stories == 0) ? 'red': 'green';
+ $clr_count_topics = ($count_topics == 0) ? 'red': 'green';
+ $clr_ihome_stories = ($stories_ihome == 0) ? 'red': 'green';
+ $clr_menu_topics = ($topics_menu == 0) ? 'red': 'green';
+
+ $indexAdmin->addInfoBox(_AM_NEWS_STATISTICS);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS, $count_topics, $clr_count_topics);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS_ONLINE, $topics_menu, $clr_menu_topics);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES, $count_stories, $clr_count_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_ONLINE, $stories_ihome, $clr_ihome_stories);
+
+
foreach (array_keys( $folder) as $i) {
$indexAdmin->addConfigBoxLine($folder[$i], 'folder');
$indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
Modified: XoopsModules/news/branches/mamba/news/admin/menu.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/menu.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/admin/menu.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -27,16 +27,24 @@
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();
-global $xoopsModule;
$i = 1;
$adminmenu[$i]["title"] = _MI_NEWS_HOME;
@@ -81,7 +89,6 @@
$adminmenu[$i]['title'] = _MI_NEWS_METAGEN;
$adminmenu[$i]['link'] = "admin/index.php?op=metagen";
$adminmenu[$i]['icon'] = $pathIcon32.'/metagen.png';
-
$i++;
$adminmenu[$i]['title'] = _MI_NEWS_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
Modified: XoopsModules/news/branches/mamba/news/article.php
===================================================================
--- XoopsModules/news/branches/mamba/news/article.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/article.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -279,7 +279,7 @@
if(is_object($xoopsUser)) {
if( $xoopsUser->isAdmin($xoopsModule->getVar('mid')) || (news_getmoduleoption('authoredit') && $article->uid() == $xoopsUser->getVar('uid')) ) {
$isadmin = true;
- $story['adminlink'] = $article->adminlink();
+// $story['adminlink'] = $article->adminlink();
}
}
$story['topicid'] = $article->topicid();
Modified: XoopsModules/news/branches/mamba/news/backendt.php
===================================================================
--- XoopsModules/news/branches/mamba/news/backendt.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/backendt.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -66,7 +66,7 @@
header ('Content-Type:text/xml; charset='.$charset);
$story = new NewsStory();
$tpl = new XoopsTpl();
-$tpl->xoops_setCaching(2);
+$tpl->caching=2;
$tpl->xoops_setCacheTime(3600); // Change this to the value you want
if (!$tpl->is_cached('db:news_rss.html', $topicid)) {
$xt = new NewsTopic($topicid);
Modified: XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php
===================================================================
--- XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,60 +1,60 @@
-<?php
-// ------------------------------------------------------------------------ //
-// 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 //
-// ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) {
- die('XOOPS root path not defined');
-}
-
-function news_tag_block_cloud_show($options)
-{
- require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
- if(!isset($moduleDirName)) {
- $moduleDirName = 'news';
- }
- return tag_block_cloud_show($options, $moduleDirName);
-}
-
-function news_tag_block_cloud_edit($options)
-{
- require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
- return tag_block_cloud_edit($options);
-}
-
-function news_tag_block_top_show($options)
-{
- require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
- if(!isset($moduleDirName)) {
- $moduleDirName = 'news';
- }
- return tag_block_top_show($options, $moduleDirName);
-}
-
-function news_tag_block_top_edit($options)
-{
- require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
- return tag_block_top_edit($options);
-}
+<?php
+// ------------------------------------------------------------------------ //
+// 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 //
+// ------------------------------------------------------------------------ //
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ die('XOOPS root path not defined');
+}
+
+function news_tag_block_cloud_show($options)
+{
+ require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
+ if(!isset($moduleDirName)) {
+ $moduleDirName = 'news';
+ }
+ return tag_block_cloud_show($options, $moduleDirName);
+}
+
+function news_tag_block_cloud_edit($options)
+{
+ require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
+ return tag_block_cloud_edit($options);
+}
+
+function news_tag_block_top_show($options)
+{
+ require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
+ if(!isset($moduleDirName)) {
+ $moduleDirName = 'news';
+ }
+ return tag_block_top_show($options, $moduleDirName);
+}
+
+function news_tag_block_top_edit($options)
+{
+ require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
+ return tag_block_top_edit($options);
+}
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/class/class.newsstory.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -42,6 +42,8 @@
public $picture;
public $topic_imgurl;
public $topic_title;
+// public $subtitle;
+// public $pictureinfo;
/**
@@ -560,10 +562,9 @@
$module_handler =& xoops_gethandler('module');
$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathIcon16 = $moduleInfo->getInfo('icons16');
-
$ret = " <a href=".XOOPS_URL."/modules/news/submit.php?op=edit&storyid=".$this->storyid()."><img src=" . $pathIcon16 .'/edit.png'. ' '.'title='._NW_EDIT."></a>"
."<a href=".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=".$this->storyid()."><img src=" . $pathIcon16."/delete.png". ' '."title="._NW_DELETE."></a> "
;
@@ -646,7 +647,7 @@
$module_handler =& xoops_gethandler('module');
$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
- $pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+ $pathIcon16 = $moduleInfo->getInfo('icons16');
$myts =& MyTextSanitizer::getInstance();
$infotips = news_getmoduleoption('infotips');
@@ -681,7 +682,12 @@
$story['text'] = $this->hometext();
$story['text'] = str_replace('[summary]', $auto_summary, $story['text']);
- $story['picture'] = XOOPS_URL.'/uploads/news/image/'.$this->picture();
+ //$story['picture'] = XOOPS_URL.'/uploads/news/image/'.$this->picture();
+ if ($this->picture() != ''){
+ $story['picture'] = XOOPS_URL.'/uploads/news/image/'.$this->picture();
+ } else {
+ $story['picture'] = '';
+ }
$story['pictureinfo'] = $this->pictureinfo();
$introcount = strlen($story['text']);
@@ -915,6 +921,11 @@
return $this->pictureinfo;
}
+ function subtitle()
+ {
+ return $this->subtitle;
+ }
+
function rating()
{
return $this->rating;
@@ -1368,11 +1379,11 @@
}
-class news_NewsStoryHandler extends XoopsPersistableObjectHandler
-{
- function __construct(&$db)
- {
- parent::__construct($db, "stories", 'stories', 'storieid', 'title');
- }
+class news_NewsStoryHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "stories", 'stories', 'storieid', 'title');
+ }
}
?>
Added: XoopsModules/news/branches/mamba/news/class/news_stories.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/news_stories.php (rev 0)
+++ XoopsModules/news/branches/mamba/news/class/news_stories.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -0,0 +1,89 @@
+<?php
+/**
+ * ****************************************************************************
+ * - Developers TEAM TDM Xoops - (http://www.xoops.org)
+ * ****************************************************************************
+ * NEWS - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2011
+ * TXMod Xoops (http://www.txmodxoops.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.
+ *
+ * ------------------------------------------------------------------------
+ *
+ * @copyright TXMod Xoops (http://www.txmodxoops.org)
+ * @license GPL see LICENSE
+ * @package news
+ * @author TXMod Xoops (in...@tx...)
+ *
+ * Version : 1.67 Tue 2012/02/13 22:29:36 : Timgno Exp $
+ * ****************************************************************************
+ */
+if (!defined("XOOPS_ROOT_PATH")) {
+ die("XOOPS root path not defined");
+}
+
+if (!class_exists("XoopsPersistableObjectHandler")) {
+ include_once XOOPS_ROOT_PATH."/kernel/object.php";
+}
+
+class news_stories extends XoopsObject
+{
+ //Constructor
+ function __construct()
+ {
+ $this->XoopsObject();
+ $this->initVar("storyid",XOBJ_DTYPE_INT,null,false,8);
+ $this->initVar("uid",XOBJ_DTYPE_INT,null,false,5);
+ $this->initVar("title",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("created",XOBJ_DTYPE_INT,null,false,10);
+ $this->initVar("published",XOBJ_DTYPE_INT,null,false,10);
+ $this->initVar("expired",XOBJ_DTYPE_INT,null,false,10);
+ $this->initVar("hostname",XOBJ_DTYPE_TXTBOX,null,false,150);
+ $this->initVar("nohtml",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("nosmiley",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("hometext",XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("bodytext",XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("keywords",XOBJ_DTYPE_TXTBOX,null,false,255);
+ $this->initVar("description",XOBJ_DTYPE_TXTBOX,null,false,255);
+ $this->initVar("counter",XOBJ_DTYPE_INT,null,false,8);
+ $this->initVar("topicid",XOBJ_DTYPE_INT,null,false,4);
+ $this->initVar("ihome",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("notifypub",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("story_type",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("topicdisplay",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("topicalign",XOBJ_DTYPE_TXTBOX,null,false,1);
+ $this->initVar("comments",XOBJ_DTYPE_INT,null,false,5);
+ $this->initVar("rating",XOBJ_DTYPE_DECIMAL,null,false,6,4);
+ $this->initVar("votes",XOBJ_DTYPE_INT,null,false,11);
+ $this->initVar("picture",XOBJ_DTYPE_TXTBOX,null,false,50);
+ $this->initVar("pictureinfo",XOBJ_DTYPE_TXTBOX,null,false,255);
+ $this->initVar("subtitle",XOBJ_DTYPE_TXTBOX,null,false,255);
+ }
+
+ function news_stories()
+ {
+ $this->__construct();
+ }
+}
+class newsnews_storiesHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "news_stories", "stories", "storyid", "uid");
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/news/branches/mamba/news/class/news_topics.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/news_topics.php (rev 0)
+++ XoopsModules/news/branches/mamba/news/class/news_topics.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -0,0 +1,73 @@
+<?php
+/**
+ * ****************************************************************************
+ * - Developers TEAM TDM Xoops - (http://www.xoops.org)
+ * ****************************************************************************
+ * NEWS - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2011
+ * TXMod Xoops (http://www.txmodxoops.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.
+ *
+ * ------------------------------------------------------------------------
+ *
+ * @copyright TXMod Xoops (http://www.txmodxoops.org)
+ * @license GPL see LICENSE
+ * @package news
+ * @author TXMod Xoops (in...@tx...)
+ *
+ * Version : 1.67 Tue 2012/02/13 22:29:36 : Timgno Exp $
+ * ****************************************************************************
+ */
+if (!defined("XOOPS_ROOT_PATH")) {
+ die("XOOPS root path not defined");
+}
+
+if (!class_exists("XoopsPersistableObjectHandler")) {
+ include_once XOOPS_ROOT_PATH."/kernel/object.php";
+}
+
+class news_topics extends XoopsObject
+{
+ //Constructor
+ function __construct()
+ {
+ $this->XoopsObject();
+ $this->initVar("topic_id",XOBJ_DTYPE_INT,null,false,4);
+ $this->initVar("topic_pid",XOBJ_DTYPE_INT,null,false,4);
+ $this->initVar("topic_title",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("topic_imgurl",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("menu",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("topic_frontpage",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("topic_rssurl",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("topic_description",XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("topic_color",XOBJ_DTYPE_TXTBOX,null,false);
+ }
+
+ function news_topics()
+ {
+ $this->__construct();
+ }
+}
+class newsnews_topicsHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "news_topics", "topics", "topic_id", "topic_pid");
+ }
+}
+
+?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/Canvas.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/Canvas.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/Canvas.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,48 +1,48 @@
-<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
- class wiCanvas
- {
- protected $handle = 0;
- protected $image = null;
- protected $font = null;
-
- function __construct($img)
- {
- $this->handle = $img->getHandle();
- $this->image = $img;
- }
-
- function setFont($font)
- {
- $this->font = $font;
- }
-
- function writeText($x, $y, $text, $angle)
- {
- $angle = - floatval($angle);
- if ($angle < 0)
- $angle = 360 + $angle;
- $angle = $angle % 360;
-
- $box = $this->font->getBoundsRect($text);
- $this->font->writeText($this->image, $x + $box['offset_x'], $y + $box['offset_y'], $text, $angle);
- }
- }
+<?php
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
+ class wiCanvas
+ {
+ protected $handle = 0;
+ protected $image = null;
+ protected $font = null;
+
+ function __construct($img)
+ {
+ $this->handle = $img->getHandle();
+ $this->image = $img;
+ }
+
+ function setFont($font)
+ {
+ $this->font = $font;
+ }
+
+ function writeText($x, $y, $text, $angle)
+ {
+ $angle = - floatval($angle);
+ if ($angle < 0)
+ $angle = 360 + $angle;
+ $angle = $angle % 360;
+
+ $box = $this->font->getBoundsRect($text);
+ $this->font->writeText($this->image, $x + $box['offset_x'], $y + $box['offset_y'], $text, $angle);
+ }
+ }
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/Dimension.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/Dimension.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/Dimension.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
class wiDimension
{
static function isPercent($dim)
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/Exception.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/Exception.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/Exception.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
// hack for those without SPL -- define RuntimeException
if (!class_exists('RuntimeException'))
{
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/FileMapperFactory.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/FileMapperFactory.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/FileMapperFactory.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
class wiUnsupportedFormatException extends wiException {}
abstract class wiFileMapperFactory
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/Image.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/Image.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/Image.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
if (!defined('WI_LIB_PATH'))
define('WI_LIB_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
@@ -26,7 +26,7 @@
abstract class wiImage
{
protected $handle = null;
- protected $handleReleased = false;
+ protected $handleReleased = false;
protected $canvas = null;
function __construct($handle)
@@ -272,23 +272,23 @@
function getRGBAt($x, $y)
{
return $this->getColorRGB($this->getColorAt($x, $y));
- }
-
- /**
- * Writes a pixel at the designated coordinates
- *
- * Takes an associative array of colours and uses getExactColor() to
- * retrieve the exact index color to write to the image with.
- *
- * @param int $x
- * @param int $y
- * @param array $color
- */
- function setRGBAt($x, $y, $color) {
- $this->setColorAt($x, $y, $this->getExactColor($color));
}
/**
+ * Writes a pixel at the designated coordinates
+ *
+ * Takes an associative array of colours and uses getExactColor() to
+ * retrieve the exact index color to write to the image with.
+ *
+ * @param int $x
+ * @param int $y
+ * @param array $color
+ */
+ function setRGBAt($x, $y, $color) {
+ $this->setColorAt($x, $y, $this->getExactColor($color));
+ }
+
+ /**
* @result mixed RGBA array for a color with index $colorIndex
*/
function getColorRGB($colorIndex)
@@ -468,15 +468,15 @@
function copyTo($dest, $left = 0, $top = 0)
{
imageCopy($dest->getHandle(), $this->handle, $left, $top, 0, 0, $this->getWidth(), $this->getHeight());
- }
-
- function getCanvas()
- {
- if ($this->canvas == null)
- $this->canvas = new wiCanvas($this);
- return $this->canvas;
}
+ function getCanvas()
+ {
+ if ($this->canvas == null)
+ $this->canvas = new wiCanvas($this);
+ return $this->canvas;
+ }
+
abstract function isTrueColor();
abstract function asTrueColor();
abstract function asPalette();
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/OpFactory.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/OpFactory.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/OpFactory.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
-<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with WideImage; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- **/
-
+<?php
+ /**
+ This file is part of WideImage.
+
+ WideImage is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ WideImage 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with WideImage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ **/
+
class wiUnknownImageOperationException extends wiException {}
class wiOpFactory
Modified: XoopsModules/news/branches/mamba/news/class/wideimage/PaletteImage.class.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/wideimage/PaletteImage.class.php 2012-05-16 01:25:21 UTC (rev 9522)
+++ XoopsModules/news/branches/mamba/news/class/wideimage/PaletteImage.class.php 2012-05-16 08:28:03 UTC (rev 9523)
@@ -1,22 +1,22 @@
-<?php
- /**
- This file is part of WideImage.
-
- WideImage is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- WideImage 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser Ge...
[truncated message content] |
|
From: <be...@us...> - 2012-05-16 19:51:24
|
Revision: 9529
http://xoops.svn.sourceforge.net/xoops/?rev=9529&view=rev
Author: beckmi
Date: 2012-05-16 19:51:17 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fixing bugs reported by Cesag
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/groupperms.php
XoopsModules/news/branches/mamba/news/archive.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
Modified: XoopsModules/news/branches/mamba/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -66,7 +66,18 @@
foreach ($alltopics as $topic_id => $topic) {
$permform->addItem($topic_id, $topic['title'], $topic['pid']);
}
-echo $permform->render();
-echo "<br /><br /><br /><br />\n";
+//echo $permform->render();
+//echo "<br /><br /><br /><br />\n";
+
+//check if topics exist before rendering the form
+$result_view = $xoopsDB->query("SELECT topic_id, topic_title FROM " . $xoopsDB->prefix("topics") . " ");
+if ($xoopsDB->getRowsNum($result_view)) {
+ echo $permform->render();
+} else {
+ //echo _AM_XFAQ_NOPERMSSET;
+redirect_header("index.php?op=topicsmanager", 5, _AM_NEWS_NOPERMSSET, false);
+}
+
+
unset($permform);
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/archive.php
===================================================================
--- XoopsModules/news/branches/mamba/news/archive.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/archive.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -83,6 +83,7 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
$lastyear = 0;
$lastmonth = 0;
+$this_year = 0;
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
-// Added in verisn 1.50
+// Added in version 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
@@ -192,7 +192,7 @@
define('_AM_NEWS_META_KEYWORDS_FREQ1',"Words frequency's order");
define('_AM_NEWS_META_KEYWORDS_FREQ2',"Reverse order of words frequency");
-// Added in verisn 1.67
+// Added in version 1.67
// About.php
define('_AM_NEWS_ABOUT_RELEASEDATE', "Released: ");
define('_AM_NEWS_ABOUT_UPDATEDATE', "Updated: ");
@@ -215,12 +215,15 @@
define ("_AM_NEWS_STATISTICS", "Statistics News");
define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database");
define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online");
-define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database");
-define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories in the database");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories online");
define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database");
define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online");
define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed");
define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
+define("_AM_NEWS_NOPERMSSET","Permission cannot be set: There are no Topics created yet! Please create a Topic first.");
+
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-22 11:13:52
|
Revision: 9572
http://xoops.svn.sourceforge.net/xoops/?rev=9572&view=rev
Author: beckmi
Date: 2012-05-22 11:13:40 +0000 (Tue, 22 May 2012)
Log Message:
-----------
fixing minor bugs as reported by Cesag
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/groupperms.php
XoopsModules/news/branches/mamba/news/admin/index.php
XoopsModules/news/branches/mamba/news/archive.php
XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php
XoopsModules/news/branches/mamba/news/class/class.newsstory.php
XoopsModules/news/branches/mamba/news/include/install_function.php
XoopsModules/news/branches/mamba/news/include/storyform.inc.php
XoopsModules/news/branches/mamba/news/include/storyform.original.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
XoopsModules/news/branches/mamba/news/language/english/modinfo.php
XoopsModules/news/branches/mamba/news/language/english/newsletter.php
XoopsModules/news/branches/mamba/news/submit.php
XoopsModules/news/branches/mamba/news/xoops_version.php
Modified: XoopsModules/news/branches/mamba/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -66,18 +66,7 @@
foreach ($alltopics as $topic_id => $topic) {
$permform->addItem($topic_id, $topic['title'], $topic['pid']);
}
-//echo $permform->render();
-//echo "<br /><br /><br /><br />\n";
-
-//check if topics exist before rendering the form
-$result_view = $xoopsDB->query("SELECT topic_id, topic_title FROM " . $xoopsDB->prefix("topics") . " ");
-if ($xoopsDB->getRowsNum($result_view)) {
- echo $permform->render();
-} else {
- //echo _AM_XFAQ_NOPERMSSET;
-redirect_header("index.php?op=topicsmanager", 5, _AM_NEWS_NOPERMSSET, false);
-}
-
-
+echo $permform->render();
+echo "<br /><br /><br /><br />\n";
unset($permform);
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/admin/index.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/index.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -440,7 +440,7 @@
}
$tbltopics = array();
$exportedstories = $story->NewsExport($timestamp1, $timestamp2, $topiclist, 0, $tbltopics);
- $newsfile = XOOPS_ROOT_PATH.'/uploads/newsletter.txt';
+ $newsfile = XOOPS_ROOT_PATH.'/uploads/news/letter.txt';
if(count($exportedstories)) {
$fp = fopen($newsfile,'w');
if(!$fp) {
@@ -466,7 +466,7 @@
fwrite($fp, $footer);
}
fclose($fp);
- $newsfile=XOOPS_URL.'/uploads/newsletter.txt';
+ $newsfile=XOOPS_URL.'/uploads/news/newsletter.txt';
printf(_AM_NEWS_NEWSLETTER_READY,$newsfile,XOOPS_URL.'/modules/news/admin/index.php?op=deletefile&type=newsletter');
} else {
printf(_AM_NEWS_NOTHING);
@@ -548,7 +548,7 @@
$tbltopics=array();
$exportedstories=$story->NewsExport($timestamp1, $timestamp2, $topiclist, $topicsexport, $tbltopics);
if(count($exportedstories)) {
- $xmlfile=XOOPS_ROOT_PATH.'/uploads/stories.xml';
+ $xmlfile=XOOPS_ROOT_PATH.'/uploads/news/stories.xml';
$fp=fopen($xmlfile,'w');
if(!$fp) {
redirect_header('index.php',4,sprintf(_AM_NEWS_EXPORT_ERROR,$xmlfile));
@@ -606,7 +606,7 @@
}
fwrite($fp,news_utf8_encode("</news_stories>\n"));
fclose($fp);
- $xmlfile=XOOPS_URL.'/uploads/stories.xml';
+ $xmlfile=XOOPS_URL.'/uploads/news/stories.xml';
printf(_AM_NEWS_EXPORT_READY,$xmlfile,XOOPS_URL.'/modules/news/admin/index.php?op=deletefile&type=xml');
} else {
printf(_AM_NEWS_EXPORT_NOTHING);
@@ -1381,7 +1381,7 @@
case 'deletefile':
xoops_cp_header();
if($_GET['type']=='newsletter') {
- $newsfile=XOOPS_ROOT_PATH.'/uploads/newsletter.txt';
+ $newsfile=XOOPS_ROOT_PATH.'/uploads/news/newsletter.txt';
if(unlink($newsfile)) {
redirect_header('index.php', 2, _AM_NEWS_DELETED_OK);
} else {
@@ -1389,7 +1389,7 @@
}
} else {
if($_GET['type']=='xml') {
- $xmlfile=XOOPS_ROOT_PATH.'/uploads/stories.xml';
+ $xmlfile=XOOPS_ROOT_PATH.'/uploads/news/stories.xml';
if(unlink($xmlfile)) {
redirect_header( 'index.php', 2, _AM_NEWS_DELETED_OK );
} else {
Modified: XoopsModules/news/branches/mamba/news/archive.php
===================================================================
--- XoopsModules/news/branches/mamba/news/archive.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/archive.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -83,7 +83,6 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
$lastyear = 0;
$lastmonth = 0;
-$this_year = 0;
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
Modified: XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php
===================================================================
--- XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/blocks/news_block_tag.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -28,6 +28,8 @@
die('XOOPS root path not defined');
}
+if(file_exists(XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php')) {
+
function news_tag_block_cloud_show($options)
{
require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
@@ -57,4 +59,5 @@
require_once XOOPS_ROOT_PATH.'/modules/tag/blocks/block.php';
return tag_block_top_edit($options);
}
+}
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/class/class.newsstory.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -42,8 +42,8 @@
public $picture;
public $topic_imgurl;
public $topic_title;
-// public $subtitle;
-// public $pictureinfo;
+ public $subtitle;
+ public $pictureinfo;
/**
Modified: XoopsModules/news/branches/mamba/news/include/install_function.php
===================================================================
--- XoopsModules/news/branches/mamba/news/include/install_function.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/include/install_function.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -59,24 +59,24 @@
$dir = XOOPS_ROOT_PATH."/uploads/news";
if(!is_dir($dir))
- mkdir($dir, 0777);
+ mkdir($dir, 0777);
chmod($dir, 0777);
$dir = XOOPS_ROOT_PATH."/uploads/news/file";
if(!is_dir($dir))
- mkdir($dir, 0777);
+ mkdir($dir, 0777);
chmod($dir, 0777);
$dir = XOOPS_ROOT_PATH."/uploads/news/image";
if(!is_dir($dir))
- mkdir($dir, 0777);
+ mkdir($dir, 0777);
chmod($dir, 0777);
// Copy index.html files on uploads folders
$indexFile = XOOPS_ROOT_PATH."/modules/news/include/index.html";
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/index.html");
- copy($indexFile, XOOPS_ROOT_PATH."/uploads/extgallery/file/index.html");
- copy($indexFile, XOOPS_ROOT_PATH."/uploads/extgallery/image/index.html");
+ copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/file/index.html");
+ copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/image/index.html");
return true;
}
Modified: XoopsModules/news/branches/mamba/news/include/storyform.inc.php
===================================================================
--- XoopsModules/news/branches/mamba/news/include/storyform.inc.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/include/storyform.inc.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -164,6 +164,7 @@
$sform->addElement($pictureTray);
}
}
+ $pictureinfo = '';
$sform->addElement(new XoopsFormFile(_NW_SELECT_IMAGE, 'attachedimage', $xoopsModuleConfig['maxuploadsize']), false);
$sform->addElement(new XoopsFormText(_NW_SELECT_IMAGE_DESC, 'pictureinfo', 50, 255, $pictureinfo), false);
}
Modified: XoopsModules/news/branches/mamba/news/include/storyform.original.php
===================================================================
--- XoopsModules/news/branches/mamba/news/include/storyform.original.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/include/storyform.original.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -37,6 +37,9 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
include_once XOOPS_ROOT_PATH.'/modules/news/config.php';
+if (!isset($subtitle)) $subtitle='';
+if (!isset($pictureinfo)) $pictureinfo='';
+
$sform = new XoopsThemeForm(_NW_SUBMITNEWS, "storyform", XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/submit.php');
$sform->setExtra('enctype="multipart/form-data"');
$sform->addElement(new XoopsFormText(_NW_TITLE, 'title', 50, 255, $title), true);
@@ -154,7 +157,7 @@
}
}
$sform->addElement(new XoopsFormFile(_NW_SELECT_IMAGE, 'attachedimage', $xoopsModuleConfig['maxuploadsize']), false);
- $sform->addElement(new XoopsFormText(_NW_SELECT_IMAGE_DESC, 'pictureinfo', 50, 255, $pictureinfo), false);
+ $sform->addElement(new XoopsFormText(_NW_SELECT_IMAGE_DESC, 'pictureinfo', 50, 255, $pictureinfo), false);
}
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
-// Added in version 1.50
+// Added in verisn 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
@@ -192,7 +192,7 @@
define('_AM_NEWS_META_KEYWORDS_FREQ1',"Words frequency's order");
define('_AM_NEWS_META_KEYWORDS_FREQ2',"Reverse order of words frequency");
-// Added in version 1.67
+// Added in verisn 1.67
// About.php
define('_AM_NEWS_ABOUT_RELEASEDATE', "Released: ");
define('_AM_NEWS_ABOUT_UPDATEDATE', "Updated: ");
@@ -215,15 +215,12 @@
define ("_AM_NEWS_STATISTICS", "Statistics News");
define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database");
define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online");
-define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories in the database");
-define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories online");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online");
define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database");
define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online");
define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed");
define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
-define("_AM_NEWS_NOPERMSSET","Permission cannot be set: There are no Topics created yet! Please create a Topic first.");
-
-
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/language/english/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/modinfo.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/language/english/modinfo.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -187,14 +187,14 @@
define("_MI_NEWS_ABOUT", "About");
define("_MI_NEWS_HOME", "Home");
define("_MI_NEWS_UPGRADE", "Upgrade");
-define("_MI_NEWS_DESCRIPTION", "With this Xoops module, you can create an unlimited number of news articles on your site. </br></br>
-You can create all articles you want and organize them in topics.</br></br>
-With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
+define("_MI_NEWS_DESCRIPTION", "With this Xoops module, you can create an unlimited number of news articles on your site. <br /><br />
+You can create all articles you want and organize them in topics.<br /><br />
+With a very powerful permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
-define("_MI_NEWS_SHARE_ME","Display share icons ?");
+define("_MI_NEWS_SHARE_ME","Display share icons?");
define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
-define("_MI_NEWS_SHOWICONS","Display item icons ?");
-define("_MI_NEWS_SHOWICONS_DSC","Display print , PDF and email icons in buttom of each article");
+define("_MI_NEWS_SHOWICONS","Display item icons?");
+define("_MI_NEWS_SHOWICONS_DSC","Display icons for Print, PDF and Email at the bottom of each article");
//1.67
define("_MI_NEWS_FACEBOOKCOMMENTS","Use Facebook Comments ?");
define("_MI_NEWS_FACEBOOKCOMMENTS_DSC","Let your users use Facebook to add comments to your articles");
Modified: XoopsModules/news/branches/mamba/news/language/english/newsletter.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/newsletter.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/language/english/newsletter.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -1,5 +1,6 @@
<?php
$newslettertemplate=<<<contentend
+
Title : %title%
Topic : %topic_title%
Publisher : %publisher%
Modified: XoopsModules/news/branches/mamba/news/submit.php
===================================================================
--- XoopsModules/news/branches/mamba/news/submit.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/submit.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -160,7 +160,7 @@
$topicid = $story->topicid();
$notifypub = $story->notifypub();
$picture = $story->picture();
- $pictureinfo = $story->pictureinfo('Edit');
+ $pictureinfo = $story->pictureinfo;
$approve = 0;
$published = $story->published();
if (isset($published) && $published > 0) {
Modified: XoopsModules/news/branches/mamba/news/xoops_version.php
===================================================================
--- XoopsModules/news/branches/mamba/news/xoops_version.php 2012-05-21 19:31:22 UTC (rev 9571)
+++ XoopsModules/news/branches/mamba/news/xoops_version.php 2012-05-22 11:13:40 UTC (rev 9572)
@@ -68,8 +68,8 @@
$modversion['tables'][3] = 'stories_votedata';
// Scripts to run upon installation or update
-$modversion['onInstall']['file'] = "include/install_function.php";
-$modversion['onInstall']['func'] = "xoops_module_install_news";
+//$modversion['onInstall']['file'] = "include/install_function.php";
+//$modversion['onInstall']['func'] = "xoops_module_install_news";
//$modversion['onUpdate'] = "include/update.php";
// Admin things
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-10 06:13:00
|
Revision: 9629
http://xoops.svn.sourceforge.net/xoops/?rev=9629&view=rev
Author: beckmi
Date: 2012-06-10 06:12:53 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Code cleanup
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/index.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
Modified: XoopsModules/news/branches/mamba/news/admin/index.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 04:01:22 UTC (rev 9628)
+++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 06:12:53 UTC (rev 9629)
@@ -1587,17 +1587,17 @@
$criteria->add(new Criteria("published", 0,'>'));
$stories_published = $storiesHandler->getCount($criteria);
- $storiesNeedApproval = $count_stories- $stories_published;
+ $stories_need_approval = $count_stories- $stories_published;
$criteria = new CriteriaCompo();
$criteria->add(new Criteria("expired", 0,'>'));
$criteria->add(new Criteria("expired", time(),'<'));
$stories_expired = $storiesHandler->getCount($criteria);
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria("expired", 0,'>'));
- $criteria->add(new Criteria("expired", time(),'>'));
- $storiesExpiredSoon = $storiesHandler->getCount($criteria);
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("expired", 0,'>'));
+ $criteria->add(new Criteria("expired", time(),'>'));
+ $stories_expired_soon = $storiesHandler->getCount($criteria);
//compte "total"
$count_topics = $topicsHandler->getCount();
@@ -1609,18 +1609,23 @@
$clr_count_stories = ($count_stories == 0) ? 'red': 'green';
$clr_count_topics = ($count_topics == 0) ? 'red': 'green';
$clr_ihome_stories = ($stories_ihome == 0) ? 'red': 'green';
- $clr_menu_topics = ($topics_menu == 0) ? 'red': 'green';
-
+ $clr_menu_topics = ($topics_menu == 0) ? 'red': 'green';
+
+ $clr_published_stories = ($stories_published == 0) ? 'red': 'green';
+ $clr_need_approval_stories = ($stories_need_approval == 0) ? 'green': 'red';
+ $clr_expired_stories = ($stories_expired == 0) ? 'red': 'green';
+ $clr_need_expired_soon_stories = ($stories_expired_soon == 0) ? 'red': 'green';
+
$indexAdmin->addInfoBox(_AM_NEWS_STATISTICS);
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS, $count_topics, $clr_count_topics);
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS_ONLINE, $topics_menu, $clr_menu_topics);
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES, $count_stories, $clr_count_stories);
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_ONLINE, $stories_ihome, $clr_ihome_stories);
- $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories);
- $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $storiesNeedApproval, 'red');
- $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_ihome_stories);
- $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $storiesExpiredSoon, $clr_ihome_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $stories_need_approval, $clr_need_approval_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_expired_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $stories_expired_soon, $clr_need_expired_soon_stories);
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 04:01:22 UTC (rev 9628)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 06:12:53 UTC (rev 9629)
@@ -223,6 +223,6 @@
define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "There are <span class='red bold'>%s</span> Expired News");
-define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to be Expired soon");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to Expire soon");
define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "There are <span class='red bold'>%s</span> Approved News");
define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "There are <span class='red bold'>%s</span> News that need Approval");
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-10 04:01:28
|
Revision: 9628
http://xoops.svn.sourceforge.net/xoops/?rev=9628&view=rev
Author: beckmi
Date: 2012-06-10 04:01:22 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Fixing Statistics in Dashboard
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/index.php
XoopsModules/news/branches/mamba/news/class/news_stories.php
XoopsModules/news/branches/mamba/news/class/news_topics.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
Modified: XoopsModules/news/branches/mamba/news/admin/index.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 03:09:41 UTC (rev 9627)
+++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 04:01:22 UTC (rev 9628)
@@ -82,7 +82,7 @@
} else {
echo " <a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $newstory -> storyid() . "'>" . $title . "</a>\n";
}
- echo "</td><td>" . $newstory->topic_title() . "</td><td align='center' class='nw'>" . formatTimestamp($newstory->created(),$dateformat) . "</td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $newstory->uid() . "'>" . $newstory->uname() . "</a></td><td align='center'><a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/delete.png' title='"._AM_DELETE."'></a></td></tr>\n";
+ echo "</td><td>" . $newstory->topic_title() . "</td><td align='center' class='nw'>" . formatTimestamp($newstory->created(),$dateformat) . "</td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $newstory->uid() . "'>" . $newstory->uname() . "</a></td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/edit.png' title='"._AM_EDIT."'></a><a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/delete.png' title='"._AM_DELETE."'></a></td></tr>\n";
}
echo '</table></div>';
@@ -686,7 +686,7 @@
$submenu=$topics_arr[$tmpcpt]['menu'] ? _YES : _NO;
$class = ($class == 'even') ? 'odd' : 'even';
- $output = $output . "<tr class='".$class."'><td>" . $topics_arr[$tmpcpt]['topic_id'] . "</td><td align='left'>" . $topics_arr[$tmpcpt]['prefix'] . $myts->displayTarea($topics_arr[$tmpcpt]['topic_title']) . "</td><td align='left'>" . $parent . "</td><td>" . $submenu . "</td><td>" . $action_edit . $action_delete ."</td></tr>";
+ $output = $output . "<tr class='".$class."'><td>" . $topics_arr[$tmpcpt]['topic_id'] . "</td><td align='left'>" . $topics_arr[$tmpcpt]['prefix'] . $myts->displayTarea($topics_arr[$tmpcpt]['topic_title']) . "</td><td align='left'>" . $parent . "</td><td align='center'>" . $submenu . "</td><td align='center'>" . $action_edit . $action_delete ."</td></tr>";
@@ -1572,13 +1572,32 @@
XOOPS_ROOT_PATH . '/uploads/news/file',
XOOPS_ROOT_PATH . '/uploads/news/image',
);
-
+
+ $topicsHandler=& xoops_getmodulehandler('news_topics','news');
+ $storiesHandler=& xoops_getmodulehandler('news_stories','news');
+
//compte "total"
$count_stories = $storiesHandler->getCount();
//compte "attente"
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria("menu", 1));
+ $criteria->add(new Criteria("ihome", 1));
$stories_ihome = $storiesHandler->getCount($criteria);
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("published", 0,'>'));
+ $stories_published = $storiesHandler->getCount($criteria);
+
+ $storiesNeedApproval = $count_stories- $stories_published;
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("expired", 0,'>'));
+ $criteria->add(new Criteria("expired", time(),'<'));
+ $stories_expired = $storiesHandler->getCount($criteria);
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("expired", 0,'>'));
+ $criteria->add(new Criteria("expired", time(),'>'));
+ $storiesExpiredSoon = $storiesHandler->getCount($criteria);
//compte "total"
$count_topics = $topicsHandler->getCount();
@@ -1598,7 +1617,13 @@
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES, $count_stories, $clr_count_stories);
$indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_ONLINE, $stories_ihome, $clr_ihome_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $storiesNeedApproval, 'red');
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_ihome_stories);
+ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $storiesExpiredSoon, $clr_ihome_stories);
+
+
foreach (array_keys( $folder) as $i) {
$indexAdmin->addConfigBoxLine($folder[$i], 'folder');
$indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
Modified: XoopsModules/news/branches/mamba/news/class/news_stories.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/news_stories.php 2012-06-10 03:09:41 UTC (rev 9627)
+++ XoopsModules/news/branches/mamba/news/class/news_stories.php 2012-06-10 04:01:22 UTC (rev 9628)
@@ -83,7 +83,7 @@
{
function __construct(&$db)
{
- parent::__construct($db, "news_stories", "stories", "storyid", "uid");
+ parent::__construct($db, "stories", "news_stories", "storyid", "uid");
}
}
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/class/news_topics.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/news_topics.php 2012-06-10 03:09:41 UTC (rev 9627)
+++ XoopsModules/news/branches/mamba/news/class/news_topics.php 2012-06-10 04:01:22 UTC (rev 9628)
@@ -66,7 +66,7 @@
{
function __construct(&$db)
{
- parent::__construct($db, "news_topics", "topics", "topic_id", "topic_pid");
+ parent::__construct($db, "topics", "news_topics", "topic_id", "topic_pid");
}
}
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 03:09:41 UTC (rev 9627)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 04:01:22 UTC (rev 9628)
@@ -212,15 +212,17 @@
define("_AM_NEWS_CONFIG_PHP","Minimum PHP required: %s (your version is %s)");
define("_AM_NEWS_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)");
-define ("_AM_NEWS_STATISTICS", "Statistics News");
+define ("_AM_NEWS_STATISTICS", "News Statistics");
define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database");
-define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online");
+define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News published in Home");
define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database");
define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online");
define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database");
-define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online");
+define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories visible in Menu");
define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed");
define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
-
-?>
\ No newline at end of file
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "There are <span class='red bold'>%s</span> Expired News");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to be Expired soon");
+define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "There are <span class='red bold'>%s</span> Approved News");
+define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "There are <span class='red bold'>%s</span> News that need Approval");
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-17 20:21:39
|
Revision: 9665
http://xoops.svn.sourceforge.net/xoops/?rev=9665&view=rev
Author: beckmi
Date: 2012-06-17 20:21:31 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
fixing typos and errors reported by Cesag
replacing GoogleBuzz with GooglePlus
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/amsimport.php
XoopsModules/news/branches/mamba/news/class/class.newsstory.php
XoopsModules/news/branches/mamba/news/docs/changelog.txt
XoopsModules/news/branches/mamba/news/docs/lang.diff
XoopsModules/news/branches/mamba/news/include/storyform.inc.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
XoopsModules/news/branches/mamba/news/language/english/main.php
XoopsModules/news/branches/mamba/news/language/englishUTF8/admin.php
XoopsModules/news/branches/mamba/news/language/german/admin.php
XoopsModules/news/branches/mamba/news/language/italian/admin.php
XoopsModules/news/branches/mamba/news/language/italian/main.php
XoopsModules/news/branches/mamba/news/submit.php
XoopsModules/news/branches/mamba/news/templates/news_article.html
Modified: XoopsModules/news/branches/mamba/news/admin/amsimport.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/amsimport.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/admin/amsimport.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -161,8 +161,8 @@
$news->setNosmiley($article['nosmiley']);
$news->setHometext($text_lastversion['hometext']);
$news->setBodytext($text_lastversion['bodytext'].$links.$forum);
- $news->Setkeywords('');
- $news->Setdescription('');
+ $news->setKeywords('');
+ $news->setDescription('');
$news->counter=$article['counter'];
$news->setTopicId($news_topicid);
$news->setIhome($article['ihome']);
Modified: XoopsModules/news/branches/mamba/news/class/class.newsstory.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -936,12 +936,12 @@
return $this->votes;
}
- function Setpicture($data)
+ function setPicture($data)
{
$this->picture = $data;
}
- function Setpictureinfo($data)
+ function setPictureinfo($data)
{
$this->pictureinfo = $data;
}
@@ -952,12 +952,12 @@
}
- function Setdescription($data)
+ function setDescription($data)
{
$this->description=$data;
}
- function Setkeywords($data)
+ function setKeywords($data)
{
$this->keywords=$data;
}
Modified: XoopsModules/news/branches/mamba/news/docs/changelog.txt
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/changelog.txt 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/docs/changelog.txt 2012-06-17 20:21:31 UTC (rev 9665)
@@ -12,8 +12,8 @@
- Improve xoops_version.php (voltan)
- Add tag support in submit page for users (voltan)
- Improve templates (voltan)
-- Add local Style sheet support in print page (voltan)
-- Add two new fild photo info and sub title (voltan)
+- Add local Stylesheet support in print page (voltan)
+- Add two new fields photoinfo and subtitle (voltan)
*******
v1.66
Modified: XoopsModules/news/branches/mamba/news/docs/lang.diff
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/lang.diff 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/docs/lang.diff 2012-06-17 20:21:31 UTC (rev 9665)
@@ -32,9 +32,9 @@
+ _NW_BOOKMARK_TO_MYSPACE
+ _NW_BOOKMARK_TO_DESIGNFLOAT
+ _NW_BOOKMARK_TO_BALATARIN
-+ _NW_BOOKMARK_TO_GOOLGEBUZZ
-+ _NW_BOOKMARK_TO_GOOLGEREADER
-+ _NW_BOOKMARK_TO_GOOLGEBOOKMARKS
++ _NW_BOOKMARK_TO_GOOGLEPLUS
++ _NW_BOOKMARK_TO_GOOGLEREADER
++ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
+ _NW_DELETE
+ _NW_EDIT
Modified: XoopsModules/news/branches/mamba/news/include/storyform.inc.php
===================================================================
--- XoopsModules/news/branches/mamba/news/include/storyform.inc.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/include/storyform.inc.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -37,6 +37,8 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
include_once XOOPS_ROOT_PATH.'/modules/news/config.php';
+if (!isset($subtitle)) $subtitle='';
+
$sform = new XoopsThemeForm(_NW_SUBMITNEWS, "storyform", XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/submit.php');
$sform->setExtra('enctype="multipart/form-data"');
$sform->addElement(new XoopsFormText(_NW_TITLE, 'title', 50, 255, $title), true);
@@ -164,7 +166,7 @@
$sform->addElement($pictureTray);
}
}
- $pictureinfo = '';
+ if (!isset($pictureinfo)) $pictureinfo = '';
$sform->addElement(new XoopsFormFile(_NW_SELECT_IMAGE, 'attachedimage', $xoopsModuleConfig['maxuploadsize']), false);
$sform->addElement(new XoopsFormText(_NW_SELECT_IMAGE_DESC, 'pictureinfo', 50, 255, $pictureinfo), false);
}
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
-// Added in verisn 1.50
+// Added in version 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
@@ -192,7 +192,7 @@
define('_AM_NEWS_META_KEYWORDS_FREQ1',"Words frequency's order");
define('_AM_NEWS_META_KEYWORDS_FREQ2',"Reverse order of words frequency");
-// Added in verisn 1.67
+// Added in version 1.67
// About.php
define('_AM_NEWS_ABOUT_RELEASEDATE', "Released: ");
define('_AM_NEWS_ABOUT_UPDATEDATE', "Updated: ");
Modified: XoopsModules/news/branches/mamba/news/language/english/main.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/main.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/english/main.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -126,9 +126,9 @@
define('_NW_BOOKMARK_TO_MYSPACE', "Bookmark to Myspace");
define('_NW_BOOKMARK_TO_DESIGNFLOAT', "Bookmark to Designfloat");
define('_NW_BOOKMARK_TO_BALATARIN', "Bookmark to Balatarin");
-define('_NW_BOOKMARK_TO_GOOLGEBUZZ', "Bookmark to Google Buzz");
-define('_NW_BOOKMARK_TO_GOOLGEREADER', "Bookmark to Google Reader");
-define('_NW_BOOKMARK_TO_GOOLGEBOOKMARKS', "Bookmark to Google Bookmarks");
+define('_NW_BOOKMARK_TO_GOOGLEPLUS', "Bookmark to Google Plus");
+define('_NW_BOOKMARK_TO_GOOGLEREADER', "Bookmark to Google Reader");
+define('_NW_BOOKMARK_TO_GOOGLEBOOKMARKS', "Bookmark to Google Bookmarks");
define('_NW_DELETE', "Delete");
define('_NW_EDIT', "Edit");
Modified: XoopsModules/news/branches/mamba/news/language/englishUTF8/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/englishUTF8/admin.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/englishUTF8/admin.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
-// Added in verisn 1.50
+// Added in version 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
Modified: XoopsModules/news/branches/mamba/news/language/german/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/german/admin.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/german/admin.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -190,7 +190,7 @@
// Added in 1.3 RC2
define("_AM_NEWS_PLEASE_UPGRADE","<a href='upgrade.php'><font color='#FF0000'>Bitte das Modul updaten!</font></a>");
-// Added in verisn 1.50
+// Added in version 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Html Tags entfernen?");
Modified: XoopsModules/news/branches/mamba/news/language/italian/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/italian/admin.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/italian/admin.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define("_AM_NEWS_PLEASE_UPGRADE", "<font color='#FF0000'><a href='upgrade.php'>Si prega di aggiornare il modulo!</a></font>");
-// Added in verisn 1.50
+// Added in version 1.50
define("_AM_NEWS_NEWSLETTER_HEADER", "intestazione");
define("_AM_NEWS_NEWSLETTER_FOOTER", "piè di pagina");
define("_AM_NEWS_NEWSLETTER_HTML_TAGS", "Rimuovere i tag html?");
@@ -192,7 +192,7 @@
define("_AM_NEWS_META_KEYWORDS_FREQ1", "Frequenza le parole di ordine");
define("_AM_NEWS_META_KEYWORDS_FREQ2", "Ordine inverso della frequenza di parole");
-// Added in verisn 1.67
+// Added in version 1.67
// About.php
define('_AM_NEWS_ABOUT_RELEASEDATE', "Released: ");
define('_AM_NEWS_ABOUT_UPDATEDATE', "Updated: ");
Modified: XoopsModules/news/branches/mamba/news/language/italian/main.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/italian/main.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/language/italian/main.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -126,9 +126,9 @@
define("_NW_BOOKMARK_TO_MYSPACE", "Segnalibro a Myspace");
define("_NW_BOOKMARK_TO_DESIGNFLOAT", "Segnalibro per Designfloat");
define("_NW_BOOKMARK_TO_BALATARIN", "Segnalibro per Balatarin");
-define("_NW_BOOKMARK_TO_GOOLGEBUZZ", "Segnalibro per Google Buzz");
-define("_NW_BOOKMARK_TO_GOOLGEREADER", "Segnalibro per Google Reader");
-define("_NW_BOOKMARK_TO_GOOLGEBOOKMARKS", "Segnalibro a Google Bookmarks");
+define("_NW_BOOKMARK_TO_GOOGLEPLUS", "Segnalibro per Google Plus");
+define("_NW_BOOKMARK_TO_GOOGLEREADER", "Segnalibro per Google Reader");
+define("_NW_BOOKMARK_TO_GOOGLEBOOKMARKS", "Segnalibro a Google Bookmarks");
define("_NW_DELETE", "Elimina");
define("_NW_EDIT", "Modifica");
Modified: XoopsModules/news/branches/mamba/news/submit.php
===================================================================
--- XoopsModules/news/branches/mamba/news/submit.php 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/submit.php 2012-06-17 20:21:31 UTC (rev 9665)
@@ -238,7 +238,7 @@
$story->setBodytext($_POST['bodytext']);
if(news_getmoduleoption('metadata')) {
$story->Setkeywords($_POST['keywords']);
- $story->Setdescription($_POST['description']);
+ $story->setDescription($_POST['description']);
$story->setIhome(intval($_POST['ihome']));
}
} else {
@@ -269,6 +269,7 @@
}
$title = $story->title('InForm');
+ $subtitle = $story->subtitle('InForm');
$hometext = $story->hometext('InForm');
if ($approveprivilege) {
$bodytext = $story->bodytext('InForm');
@@ -276,6 +277,7 @@
$description = $story->description('E');
$keywords = $story->keywords('E');
}
+ $pictureinfo = $story->pictureinfo('InForm');
//Display post preview
$newsauthor=$story->uid();
@@ -357,7 +359,7 @@
if ($approveprivilege) {
if(news_getmoduleoption('metadata')) {
- $story->Setdescription($_POST['description']);
+ $story->setDescription($_POST['description']);
$story->Setkeywords($_POST['keywords']);
}
$story->setTopicdisplay($_POST['topicdisplay']); // Display Topic Image ? (Yes or No)
@@ -444,8 +446,8 @@
}
}
}
- $story->Setpicture('');
- $story->Setpictureinfo('');
+ $story->setPicture('');
+ $story->setPictureinfo('');
}
if($allowupload) { // L'image
@@ -467,7 +469,7 @@
@unlink($fullPictureName);
rename($newName, $fullPictureName);
}
- $story->Setpicture(basename($destname));
+ $story->setPicture(basename($destname));
} else {
echo _AM_UPLOAD_ERROR. ' ' . $uploader->getErrors();
@@ -476,7 +478,7 @@
echo $uploader->getErrors();
}
}
- $story->Setpictureinfo($_POST['pictureinfo']);
+ $story->setPictureinfo($_POST['pictureinfo']);
}
}
$destname = '';
Modified: XoopsModules/news/branches/mamba/news/templates/news_article.html
===================================================================
--- XoopsModules/news/branches/mamba/news/templates/news_article.html 2012-06-17 20:08:09 UTC (rev 9664)
+++ XoopsModules/news/branches/mamba/news/templates/news_article.html 2012-06-17 20:21:31 UTC (rev 9665)
@@ -76,9 +76,9 @@
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_MIXX}>" href="http://www.mixx.com/submit?page_url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_MIXX}>" src="<{xoModuleIconsBookmarks mixx.png}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_MYSPACE}>" href="http://www.myspace.com/Modules/PostTo/Pages/?u=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_MYSPACE}>" src="<{xoModuleIconsBookmarks myspace.jpg}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_DESIGNFLOAT}>" href="http://www.designfloat.com/submit.php?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_DESIGNFLOAT}>" src="<{xoModuleIconsBookmarks designfloat.png}>" /></a>
- <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEBUZZ}>" href="http://www.google.com/buzz/post?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEBUZZ}>" src="<{xoModuleIconsBookmarks google_buzz_icon.png}>" /></a>
- <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEREADER}>" href="http://www.google.com/reader/link?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEREADER}>" src="<{xoModuleIconsBookmarks google-reader-icon.png}>" /></a>
- <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEBOOKMARKS}>" href="https://www.google.com/bookmarks/mark?op=add&bkmk=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOLGEBOOKMARKS}>" src="<{xoModuleIconsBookmarks google-icon.png}>" /></a>
+ <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" href="http://www.google.com/buzz/post?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" src="<{xoModuleIconsBookmarks google_plus.png}>" /></a>
+ <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEREADER}>" href="http://www.google.com/reader/link?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEREADER}>" src="<{xoModuleIconsBookmarks google-reader-icon.png}>" /></a>
+ <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEBOOKMARKS}>" href="https://www.google.com/bookmarks/mark?op=add&bkmk=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEBOOKMARKS}>" src="<{xoModuleIconsBookmarks google-icon.png}>" /></a>
</div>
</div>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-18 15:32:45
|
Revision: 9669
http://xoops.svn.sourceforge.net/xoops/?rev=9669&view=rev
Author: beckmi
Date: 2012-06-18 15:32:39 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Adding Subtitle to template
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/article.php
XoopsModules/news/branches/mamba/news/templates/news_item.html
Modified: XoopsModules/news/branches/mamba/news/article.php
===================================================================
--- XoopsModules/news/branches/mamba/news/article.php 2012-06-18 07:52:39 UTC (rev 9668)
+++ XoopsModules/news/branches/mamba/news/article.php 2012-06-18 15:32:39 UTC (rev 9669)
@@ -183,6 +183,7 @@
$story['posttime'] = formatTimestamp($article->published(),$dateformat);
$story['news_title'] = $article->title();
$story['title'] = $article->textlink().' : '.$article->title();
+$story['subtitle'] = $article->subtitle();
$story['topic_title'] = $article->textlink();
Modified: XoopsModules/news/branches/mamba/news/templates/news_item.html
===================================================================
--- XoopsModules/news/branches/mamba/news/templates/news_item.html 2012-06-18 07:52:39 UTC (rev 9668)
+++ XoopsModules/news/branches/mamba/news/templates/news_item.html 2012-06-18 15:32:39 UTC (rev 9669)
@@ -4,6 +4,7 @@
<h2><{$story.news_title}></h2>
</span>
</div>
+ <h6> <i><{$story.subtitle}></i></h6>
<div class="itemInfo">
<{if $story.files_attached}><{$story.attached_link}> <{/if}>
<{if $story.poster != ''}><span class="itemPoster"><{$lang_postedby}> <{$story.poster}></span><{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-02 05:38:13
|
Revision: 9765
http://xoops.svn.sourceforge.net/xoops/?rev=9765&view=rev
Author: beckmi
Date: 2012-07-02 05:38:02 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Updating to Version 1.67 Final
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/class/class.newsstory.php
XoopsModules/news/branches/mamba/news/css/style.css
XoopsModules/news/branches/mamba/news/docs/changelog.txt
XoopsModules/news/branches/mamba/news/include/update_function.php
XoopsModules/news/branches/mamba/news/language/english/modinfo.php
XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php
XoopsModules/news/branches/mamba/news/language/french/modinfo.php
XoopsModules/news/branches/mamba/news/language/frenchUTF8/modinfo.php
XoopsModules/news/branches/mamba/news/language/german/modinfo.php
XoopsModules/news/branches/mamba/news/language/italian/modinfo.php
XoopsModules/news/branches/mamba/news/templates/news_article.html
XoopsModules/news/branches/mamba/news/xoops_version.php
Modified: XoopsModules/news/branches/mamba/news/class/class.newsstory.php
===================================================================
--- XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/class/class.newsstory.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -558,13 +558,13 @@
function adminlink()
{
-global $xoopsModule;
-$module_handler =& xoops_gethandler('module');
+ global $xoopsModule;
+ $dirname = basename(dirname(dirname(__FILE__)));
+ $module_handler = xoops_gethandler('module');
+ $module = $module_handler->getByDirname($dirname);
+ $pathIcon16 = $module->getInfo('icons16');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = $moduleInfo->getInfo('icons16');
-
$ret = " <a href=".XOOPS_URL."/modules/news/submit.php?op=edit&storyid=".$this->storyid()."><img src=" . $pathIcon16 .'/edit.png'. ' '.'title='._NW_EDIT."></a>"
."<a href=".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=".$this->storyid()."><img src=" . $pathIcon16."/delete.png". ' '."title="._NW_DELETE."></a> "
;
@@ -645,9 +645,10 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
global $xoopsUser, $xoopsConfig, $xoopsModuleConfig , $xoopsModule;
- $module_handler =& xoops_gethandler('module');
- $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
- $pathIcon16 = $moduleInfo->getInfo('icons16');
+ $dirname = basename(dirname(dirname(__FILE__)));
+ $module_handler = xoops_gethandler('module');
+ $module = $module_handler->getByDirname($dirname);
+ $pathIcon16 = $module->getInfo('icons16');
$myts =& MyTextSanitizer::getInstance();
$infotips = news_getmoduleoption('infotips');
Modified: XoopsModules/news/branches/mamba/news/css/style.css
===================================================================
--- XoopsModules/news/branches/mamba/news/css/style.css 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/css/style.css 2012-07-02 05:38:02 UTC (rev 9765)
@@ -17,7 +17,7 @@
.item-bookmarkme-twitter {}
-.item-bookmarkme-buzz {}
+.item-bookmarkme-googleplus {}
.item-bookmarkme {
margin-top: 35px;
Modified: XoopsModules/news/branches/mamba/news/docs/changelog.txt
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/changelog.txt 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/docs/changelog.txt 2012-07-02 05:38:02 UTC (rev 9765)
@@ -1,36 +1,37 @@
-Changelog
-*******
-v1.67
-*******
+======================
+v1.67 2012-07-01
+======================
+
- Add option for using Facebook Comments (mamba)
- converted table views (mamba)
- changed edit/delete links to icons (mamba)
- Changed to standardized XOOPS Module GUI (mamba)
-- Add option for show / hide facebook like and twitter and google buzz (voltan)
+- Add option for show / hide facebook like and twitter and google plus (voltan)
- Add option for show / hide print , pdf and mail icons (voltan)
- Improve xoops_version.php (voltan)
- Add tag support in submit page for users (voltan)
- Improve templates (voltan)
- Add local Stylesheet support in print page (voltan)
- Add two new fields photoinfo and subtitle (voltan)
+- bunch of small fixes, reported by Cesag, Mazarin, Renetjuh, and others
-*******
+======================
v1.66
-*******
+======================
- Removing double encoding with htmlspecialchars
- Removing pdf folder (dhsoft)
Changelog
-*******
+======================
v1.65
-*******
+======================
- Adding prefix to adminmenu function for 2.4.2 compatibility
- Correcting method for loading Editors in xoops_version.php
-*******
+======================
v1.63
-*******
+======================
- The Xoops 2.3 editors are fully supported (tested with Xoops 2.3.1 RC)
- The support for the Spaw editor is abandoned
- The support of Xoops 2.2.x is abandoned
@@ -39,23 +40,23 @@
- Changes in translations (see lang.diff)
- Correction of a bug in the "By Topic" presentation of the articles (on index.php)
-*******
+======================
v1.62
-*******
+======================
- The module is now Xoops 2.3 compatible
- Many corrections in the use of the deprecated TextSanitizer functions
- Modification of tcpdf to be able to see pictures inside PDFs (thanks colossus)
- TCPDF was updated to its version 4.0.017 (don't forget to create a file for your language in /xoops/modules/news/pdf/config/lang)
-*******
+======================
v1.61
-*******
+======================
- Correction of a bug in the link to the previous article (in article.php)
- Update of TCPDF to its version 4.0.004
-*******
+======================
v1.60
-*******
+======================
- It was possible to give any ranking to an article
- After you have vote for an article, you are redirected to the article (and not to the module's index page)
- TCPDF was updated to its version 4.0.001
@@ -67,9 +68,9 @@
- Now you can display html in the blocks
-*******
+======================
v1.56
-*******
+======================
- In article.php and when you was using a site with multilinguals, there was a problem with the previous and next titles
- It was possible to see the form used to post a comment even when anonymous users had not the right
- Bug correction in the file /xoops/modules/news/include/notification.inc.php (thank you colossus)
@@ -78,18 +79,18 @@
- The library used to generate PDFs was changed.
It supports UTF8 and local pictures (pictures must not be GIF and must not be interlaced (it's running with PNG and JPEG))
The html entities, usually visible in PDFs should not cause anymore problems (except in the PDF's title)
- **************************************************************************
+ ============================================================================================================================================================================================================================****
** This version of the News module is the last which will run with Php4 **
- **************************************************************************
+ ============================================================================================================================================================================================================================****
-*******
+======================
v1.55
-*******
+======================
> Correction of a bug in the files upload
-*******
+======================
v1.54
-*******
+======================
> Added a missing picture in the Dojo toolkit used to create fun menus in the module's administration
> Added some tests so that the module does not reveals its path
> In the "Top news" block you can now see the avatar of the user who's story is at the spotlight
@@ -102,9 +103,9 @@
global_newstory_notify.tpl)
-*******
+======================
v1.53
-*******
+======================
> Bug correction in the module's upgrade
> Bugs corrections in the module's preferences (thank you nobunobu)
> Bug corrected in the topics RSS
@@ -117,9 +118,9 @@
$cfg['use_fun_menu'] = true;
> We have added the French documentation inside the module
-*******
+======================
v1.51
-*******
+======================
> I have corrected the backend.php and backendt.php (they were saved in UTF8)
> I have added ALT and TITLES to the "Bookmark this article at these sites" pictures
used on this "block"
@@ -127,9 +128,9 @@
> The expired articles were visible in the archives (thanks blueteen)
-*******
+======================
v1.50
-*******
+======================
> I have renamed some functions in /xoops/modules/include/functions.php
to prefix them with news_ (because of some conflicts with some other modules)
> I have added a block to show archives (and two new files /xoops/modules/news/blocks/news_archives.php
@@ -248,9 +249,9 @@
the [pagebreak] "tag".
-*******
+======================
v1.44
-*******
+======================
Some corrections available in this version was made by Marcan and 5vision, thank you both !
> backendt.php, the "channel_category" tag now contains the topic's title (5vision)
> When an article was submited, the author was not alarmed of the article's approbation (marcan)
@@ -261,9 +262,9 @@
> The template name "news_archive.html" was corrected (a border propertie was missing to the pictures tags and a "</a>" tag) (5vision)
-*******
+======================
v1.43
-*******
+======================
> Code corrected because of the bug "Call to a member function getConfigsByCat() on a non-object in include/functions.php on line 328"
This bug was appearing under some rare circumstances.
> A better Php 5.0.5 compatibility
@@ -273,15 +274,15 @@
> I have modified backend.php and pda.php to run with Php 5.0.5
> The option "Enable authors to edit their posts" is now checked by default
-*******
+======================
v1.42
-*******
+======================
> Corrected a bug in the infotips
> Corrected a bug due to Php 5.0.5
-*******
+======================
v1.41
-*******
+======================
Additions, modifications & bugs corrections :
> For security reasons, I have removed the Xoops version from the printed version of an article
> I have corrected an error in the block called "Navigate thru topics", the number of news was false, it was counting expired articles (thank you Solo71)
@@ -294,9 +295,9 @@
> I have reduced the count of sql queries in the module's index page
> I have corrected a bug in the option "Enable authors to edit their posts"
-*******
+======================
v1.4
-*******
+======================
Additions, modifications & bugs corrections :
> I have added the code recommanded in Xoops 2.0.13.1 for security reasons
> Some templates were corrected to be a little more (but not completly) w3c compliants
@@ -322,16 +323,16 @@
The imported article is always the last version in Ams
-*******
+======================
v1.312
-*******
+======================
Modifications :
> The module is now capable to use the editors provided with Xoops 2.2 (The module is also runing with older Xoops versions)
> I have modified the templates so that the news printable version, the pdf version and the rating pages are not indexed by robots (thanks to tl for the tip)
-*******
+======================
v1.311
-*******
+======================
Corrections :
> A bug was corrected in the PDF's titles
> A fatal error in the script used to print an article
@@ -339,9 +340,9 @@
> A constant was visible in the PDF's footer
-**************************
+==================================================================*****
v1.31 Definitive version
-**************************
+==================================================================*****
Corrections :
> A correction in the automatic generation of keywords and description has been made.
> The generation of PDFs was updated with the CBB's code.
@@ -353,9 +354,9 @@
Many tests were made with phpcoverage and xdebug to be sure that early all the code was treated by Php that's why I can affirm that the module is Php 5 compatible.
-************
+======================*****
v1.31 RC2
-************
+======================*****
Corrections :
> There was a bug int the "randon news" block when you was selecting to use only one or zero stories (thank you domifara)
> I have, again, corrected a bug in the comments links (thank you mczolton)
@@ -385,9 +386,9 @@
> In the topics manager, by default the topics was created as a submenu of the "News" item, that's not the case anymore
-************
+======================*****
v1.31 RC1
-************
+======================*****
Corrections :
> News by this author, it was possible to call this page even if the module's option was desactivated
> It was not possible to join zip files to the news
@@ -429,9 +430,9 @@
same number of news that the module's option called "Select the number of news items to display on top page"
-****************
+============================================**
v1.3 Definitive
-****************
+============================================**
> Relative paths was changed to absolute paths inside the scripts
> I have added a lang.diff file for the translators
> The spotlight available in the "recent articles" and "top news" blocks can now use up to 8 different skins :
@@ -451,9 +452,9 @@
> A bug has been corrected for the htmlarea editor
-************
+======================*****
v1.3 RC2
-************
+======================*****
Bugs corrections in :
- The form used to submit news
The article's title was limited to 80 characters whereas the db define 255 characters
@@ -479,9 +480,9 @@
- The spotlight look and feel has been modified (looks like "better").
-************
+======================*****
v1.3 RC1
-************
+======================*****
> New module's options :
- New page and link and option "News by the same author"
- Two new options are availables for the article's page, "Show Previous and Next link ?" and "Show summary table ?"
@@ -554,9 +555,9 @@
> For the Top articles and Recent News blocks, you can select between a classical view and a tabbed view. You can also use a Spotlight.
-*********
+======================**
v1.2.1
-*********
+======================**
> Some important security holes have been corrected. That's why this version exists. Thanks goes to onokazu
> The possibility to upload excel and word files have been removed.
If you still need this "option", edit the file named :
@@ -580,23 +581,23 @@
http://www.xoops.org/modules/newbb/viewtopic.php?topic_id=22849&forum=11
-************
+======================*****
v1.2 Final
-************
+======================*****
> Added Spotlight Feature to Recent/Top News block
> Added an icon below the article's title to show articles with attached files
-************
+======================*****
v1.2 RC2
-************
+======================*****
> Fixed topic image alignment not saving
> Fixed NewsStory::getAllPublished to work with backend.php
> Fixed new topics navigation block to work properly with restricting topics
-************
+======================*****
v1.2 RC1
-************
+======================*****
> Added ALT+S as submit option (include/storyform.inc.php, admin/storyform.inc.php)
> Fixed warning about invalid index "anonpost" in submit form (include/storyform.inc.php)
> Changed $_GET to $_GET and $_POST to $_POST
Modified: XoopsModules/news/branches/mamba/news/include/update_function.php
===================================================================
--- XoopsModules/news/branches/mamba/news/include/update_function.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/include/update_function.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -114,20 +114,29 @@
$result=$xoopsDB->queryF($sql);
// 6) Make files and folders
- $dir = XOOPS_ROOT_PATH."/uploads/news";
- if(!is_dir($dir))
- mkdir($dir, 0777);
- chmod($dir, 0777);
+ $dir = XOOPS_ROOT_PATH . "/uploads/news";
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
$dir = XOOPS_ROOT_PATH."/uploads/news/file";
- if(!is_dir($dir))
- mkdir($dir, 0777);
- chmod($dir, 0777);
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
$dir = XOOPS_ROOT_PATH."/uploads/news/image";
- if(!is_dir($dir))
- mkdir($dir, 0777);
- chmod($dir, 0777);
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
// Copy index.html files on uploads folders
$indexFile = XOOPS_ROOT_PATH."/modules/news/include/index.html";
@@ -135,7 +144,7 @@
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/file/index.html");
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/image/index.html");
- return true;
+ return TRUE;
}
?>
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/language/english/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/english/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -192,7 +192,7 @@
With a very powerful permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME","Display share icons?");
-define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
+define("_MI_NEWS_SHARE_ME_DSC","Share icons to Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS","Display item icons?");
define("_MI_NEWS_SHOWICONS_DSC","Display icons for Print, PDF and Email at the bottom of each article");
//1.67
Modified: XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -192,7 +192,7 @@
With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME","Display share icons ?");
-define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
+define("_MI_NEWS_SHARE_ME_DSC","Share icons to Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS","Display item icons ?");
define("_MI_NEWS_SHOWICONS_DSC","Display print , PDF and email icons in buttom of each article");
//1.67
Modified: XoopsModules/news/branches/mamba/news/language/french/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/french/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/french/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -194,7 +194,7 @@
With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME","Display share icons ?");
-define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
+define("_MI_NEWS_SHARE_ME_DSC","Share icons to Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS","Display item icons ?");
define("_MI_NEWS_SHOWICONS_DSC","Display print , PDF and email icons in buttom of each article");
Modified: XoopsModules/news/branches/mamba/news/language/frenchUTF8/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/frenchUTF8/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/frenchUTF8/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -194,7 +194,7 @@
With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME","Display share icons ?");
-define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
+define("_MI_NEWS_SHARE_ME_DSC","Share icons to Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS","Display item icons ?");
define("_MI_NEWS_SHOWICONS_DSC","Display print , PDF and email icons in buttom of each article");
Modified: XoopsModules/news/branches/mamba/news/language/german/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/german/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/german/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -193,7 +193,7 @@
With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME","Display share icons ?");
-define("_MI_NEWS_SHARE_ME_DSC","Share icons to facebook ,twitter , google buzz");
+define("_MI_NEWS_SHARE_ME_DSC","Share icons to Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS","Display item icons ?");
define("_MI_NEWS_SHOWICONS_DSC","Display print , PDF and email icons in buttom of each article");
Modified: XoopsModules/news/branches/mamba/news/language/italian/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/italian/modinfo.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/language/italian/modinfo.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -192,7 +192,7 @@
With a very powerfull permissions management, you can create groups authorized to submit articles and a group authorized to approve them and decide who can see what.");
define("_MI_NEWS_SHARE_ME", "Visualizzare le icone condividere?");
-define("_MI_NEWS_SHARE_ME_DSC", "Condividi le icone di Facebook, Twitter, Google Buzz");
+define("_MI_NEWS_SHARE_ME_DSC", "Condividi le icone di Facebook, Twitter, Google Plus");
define("_MI_NEWS_SHOWICONS", "Visualizzare le icone articolo?");
define("_MI_NEWS_SHOWICONS_DSC", "Visualizzazione di stampa, le icone in formato PDF ed e-mail in buttom di ogni articolo");
//1.67
Modified: XoopsModules/news/branches/mamba/news/templates/news_article.html
===================================================================
--- XoopsModules/news/branches/mamba/news/templates/news_article.html 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/templates/news_article.html 2012-07-02 05:38:02 UTC (rev 9765)
@@ -76,7 +76,7 @@
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_MIXX}>" href="http://www.mixx.com/submit?page_url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_MIXX}>" src="<{xoModuleIconsBookmarks mixx.png}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_MYSPACE}>" href="http://www.myspace.com/Modules/PostTo/Pages/?u=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_MYSPACE}>" src="<{xoModuleIconsBookmarks myspace.jpg}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_DESIGNFLOAT}>" href="http://www.designfloat.com/submit.php?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_DESIGNFLOAT}>" src="<{xoModuleIconsBookmarks designfloat.png}>" /></a>
- <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" href="http://www.google.com/buzz/post?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" src="<{xoModuleIconsBookmarks google_plus.png}>" /></a>
+ <a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" href="https://plusone.google.com/_/+1/confirm?hl=en&url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEPLUS}>" src="<{xoModuleIconsBookmarks google_plus.png}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEREADER}>" href="http://www.google.com/reader/link?url=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEREADER}>" src="<{xoModuleIconsBookmarks google-reader-icon.png}>" /></a>
<a rel="external nofollow" target="_blank" title="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEBOOKMARKS}>" href="https://www.google.com/bookmarks/mark?op=add&bkmk=<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>&title=<{$story.news_title}>" ><img alt="<{$smarty.const._NW_BOOKMARK_TO_GOOGLEBOOKMARKS}>" src="<{xoModuleIconsBookmarks google-icon.png}>" /></a>
</div>
Modified: XoopsModules/news/branches/mamba/news/xoops_version.php
===================================================================
--- XoopsModules/news/branches/mamba/news/xoops_version.php 2012-07-02 00:25:53 UTC (rev 9764)
+++ XoopsModules/news/branches/mamba/news/xoops_version.php 2012-07-02 05:38:02 UTC (rev 9765)
@@ -48,10 +48,10 @@
$modversion['onUpdate'] = 'include/update_function.php';
//about
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/02/16";
-$modversion["module_status"] = "RC 3";
+$modversion["release_date"] = "2012/07/01";
+$modversion["module_status"] = "Final";
$modversion["author_website_url"] = "http://www.xoops.org/";
$modversion["author_website_name"] = "XOOPS";
$modversion['min_php']='5.2';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X