Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[5152] XoopsModules/xnews/trunk/modules/xnews
|
From: <dav...@us...> - 2010-08-29 12:15:21
|
Revision: 5152
http://xoops.svn.sourceforge.net/xoops/?rev=5152&view=rev
Author: davidenprossi
Date: 2010-08-29 12:15:15 +0000 (Sun, 29 Aug 2010)
Log Message:
-----------
1.68 Final
Modified Paths:
--------------
XoopsModules/xnews/trunk/modules/xnews/admin/cloner.php
XoopsModules/xnews/trunk/modules/xnews/admin/groupperms.php
XoopsModules/xnews/trunk/modules/xnews/admin/index.php
XoopsModules/xnews/trunk/modules/xnews/admin/upgrade.php
XoopsModules/xnews/trunk/modules/xnews/docs/changelog.txt
XoopsModules/xnews/trunk/modules/xnews/images/export.png
XoopsModules/xnews/trunk/modules/xnews/images/export32.png
XoopsModules/xnews/trunk/modules/xnews/include/functions.php
XoopsModules/xnews/trunk/modules/xnews/include/update.php
XoopsModules/xnews/trunk/modules/xnews/xoops_version.php
Modified: XoopsModules/xnews/trunk/modules/xnews/admin/cloner.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/admin/cloner.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/admin/cloner.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -88,7 +88,7 @@
$path_ext = $path_info['extension'];
//trigger_error($path . " -------- " . $path_ext, E_USER_WARNING);
- trigger_error($path , E_USER_WARNING);
+ //trigger_error($path , E_USER_WARNING);
$content = file_get_contents($path);
if ( $path_ext != 'txt' )
{
Modified: XoopsModules/xnews/trunk/modules/xnews/admin/groupperms.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/admin/groupperms.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/admin/groupperms.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -33,8 +33,8 @@
xoops_cp_header();
-adminmenu(2);
-echo '<br /><br /><br />';
+adminmenu(2, _AM_NW_GROUPPERM);
+echo '<h2>' . _AM_NW_GROUPPERM . '</h2>';
$permtoset= isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
$selected=array('','','');
$selected[$permtoset-1]=' selected';
Modified: XoopsModules/xnews/trunk/modules/xnews/admin/index.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/admin/index.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/admin/index.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -265,9 +265,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(3);
- echo '<br /><br /><br />';
- echo '<br /><br /><br />';
+ adminmenu(3, _AM_NW_PRUNENEWS);
+ echo '<h2>' . _AM_NW_PRUNENEWS . '</h2><br />';
$sform = new XoopsThemeForm(_AM_NW_PRUNENEWS, 'pruneform', NW_MODULE_URL . '/admin/index.php', 'post');
$sform->addElement(new XoopsFormTextDateSelect(_AM_NW_PRUNE_BEFORE, 'prune_date',15,time()), true);
$onlyexpired=new xoopsFormCheckBox('', 'onlyexpired');
@@ -304,7 +303,7 @@
if(isset($_POST['pruned_topics'])) {
$topiclist=implode(',',$_POST['pruned_topics']);
}
- echo '<h4>' . _AM_NW_PRUNENEWS . '</h4>';
+ echo '<h2>' . _AM_NW_PRUNENEWS . '</h2>';
$expired=0;
if(isset($_POST['onlyexpired'])) {
$expired = intval($_POST['onlyexpired']);
@@ -359,9 +358,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(5);
- echo '<br /><br /><br />';
- echo '<br /><br /><br />';
+ adminmenu(5, _AM_NW_NEWSLETTER);
+ echo '<h2>' . _AM_NW_NEWSLETTER . '</h2><br />';
$sform = new XoopsThemeForm(_AM_NW_NEWSLETTER, 'newsletterform', NW_MODULE_URL . '/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NW_NEWSLETTER_BETWEEN);
$date1 = new XoopsFormTextDateSelect('', 'date1',15,time());
@@ -475,9 +473,8 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(4);
- echo '<br /><br /><br />';
- echo '<br /><br /><br />';
+ adminmenu(4, _AM_NW_EXPORT_NEWS);
+ echo '<h2>' . _AM_NW_EXPORT_NEWS . '</h2><br />';
$sform = new XoopsThemeForm(_AM_NW_EXPORT_NEWS, 'exportform', NW_MODULE_URL . '/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NW_EXPORT_BETWEEN);
$date1 = new XoopsFormTextDateSelect('', 'date1',15,time());
@@ -625,7 +622,7 @@
global $xoopsDB, $xoopsConfig, $xoopsModule, $myts;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(0);
+ adminmenu(0, _AM_NW_TOPICSMNGR);
$uploadfolder=sprintf(_AM_NW_UPLOAD_WARNING, NW_TOPICS_FILES_URL);
$uploadirectory='/uploads/' . $xoopsModule -> dirname().'/images/topics';
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
@@ -635,9 +632,9 @@
$totaltopics = count($topics_arr);
$class='';
- echo '<h4>' . _AM_NW_CONFIG . '</h4>';
+ echo '<h2>' . _AM_NW_TOPICSMNGR . '</h2>';
nw_collapsableBar('topicsmanager', 'toptopicsmanager');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='toptopicsmanager' name='toptopicsmanager' src='" . NW_MODULE_URL . "/images/close12.gif' alt='' /></a> "._AM_NW_TOPICSMNGR . ' (' . $totaltopics . ')'."</h4>";
+ echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='toptopicsmanager' name='toptopicsmanager' src='" . NW_MODULE_URL . "/images/close12.gif' alt='' /></a> "._AM_NW_TOPICS . ' (' . $totaltopics . ')'."</h4>";
echo "<div id='topicsmanager'>";
echo '<br />';
echo "<div style='text-align: center;'>";
@@ -937,7 +934,7 @@
global $xoopsDB, $xoopsModule;
if (!isset($_POST['ok'])) {
xoops_cp_header();
- echo '<h4>' . _AM_NW_CONFIG . '</h4>';
+ echo '<h2>' . _AM_NW_TOPICSMNGR . '</h2>';
$xt = new XoopsTopic( $xoopsDB->prefix('nw_topics'), intval($_GET['topic_id']));
xoops_confirm(array( 'op' => 'delTopic', 'topic_id' => intval($_GET['topic_id']), 'ok' => 1), 'index.php', _AM_NW_WAYSYWTDTTAL . '<br />' . $xt->topic_title('S'));
} else {
@@ -1090,12 +1087,12 @@
} else {
include_once NW_MODULE_PATH . '/language/english/main.php';
}
- adminmenu(6);
+ adminmenu(6, _AM_NW_STATS);
$news = new nw_NewsStory();
$stats = array();
$stats=$news->GetStats(nw_getmoduleoption('storycountadmin', NW_MODULE_DIR_NAME));
$totals=array(0,0,0,0,0);
- printf("<h1>%s</h1>\n",_AM_NW_STATS);
+ printf("<h2>%s</h2>\n",_AM_NW_STATS);
// First part of the stats, everything about topics
$storiespertopic=$stats['storiespertopic'];
@@ -1234,8 +1231,8 @@
} else {
include_once NW_MODULE_PATH . '/language/english/main.php';
}
- adminmenu(7);
- echo "<h1>"._AM_NW_METAGEN."</h1>";
+ adminmenu(7, _AM_NW_METAGEN);
+ echo "<h2>"._AM_NW_METAGEN."</h2>";
echo _AM_NW_METAGEN_DESC."<br /><br />";
// Metagen Options
@@ -1345,7 +1342,7 @@
global $xoopsDB, $xoopsConfig, $xoopsModule, $myts;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(8);
+ adminmenu(8, _AM_NW_CLONER);
$clone_modulename = '';
@@ -1374,7 +1371,7 @@
$totalclones = count($clone_arr);
$class='';
- echo '<h4>' . _AM_NW_CLONER . '</h4>';
+ echo '<h2>' . _AM_NW_CLONER . '</h2>';
nw_collapsableBar('NewsCloner', 'topNewsCloner');
echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='topNewsCloner' name='topNewsCloner' src='" . NW_MODULE_URL . "/images/close12.gif' alt='' /></a> " . _AM_NW_CLONER_CLONES . ' (' . $totalclones . ')'."</h4>";
echo "<div id='NewsCloner'>";
@@ -1491,7 +1488,7 @@
$tmpmodule_handler =& xoops_gethandler('module');
//Draw Import News Form
- $sform = new XoopsThemeForm(_AM_NW_CLONER_IMPORTNEWS, "clonerimportform", NW_MODULE_URL . "/admin/index.php", "post");
+ /*$sform = new XoopsThemeForm(_AM_NW_CLONER_IMPORTNEWS, "clonerimportform", NW_MODULE_URL . "/admin/index.php", "post");
if ( $tmpmodule_handler->getByDirname('news') && nw_TableExists($xoopsDB->prefix('stories')) && $count >= 0) {
$sform->addElement(new XoopsFormLabel("", _AM_NW_CLONER_IMPORTNEWSDESC2), false);
@@ -1504,7 +1501,7 @@
$button_tray->addElement($submit_btn);
$sform->addElement($button_tray);
}
- $sform->display();
+ $sform->display();*/
}
/**
@@ -1641,57 +1638,6 @@
}
/**
- * Cloner News Import - DNPROSSI
- */
-function CloneNewsImport()
-{
- include_once "cloner.php";
- global $xoopsDB, $xoopsConfig, $xoopsModule;
-
- $result = $xoopsDB->query("SELECT * FROM " . $xoopsDB->prefix('news_clonerdata'));
- $ix = 0;
- while ( $clone = $xoopsDB->fetchArray($result) ) {
- $clone_arr[$ix] = $clone;
- $ix++;
- }
-
- $module_name = $clone_arr[0]['clone_name'];
- $module_dirname = $clone_arr[0]['clone_dir'];
- $module_version = $clone_arr[0]['clone_version'];
- $module_subprefix = $clone_arr[0]['clone_subprefix'];
-
- //DNPROSSI - Import data from old news database files
- $result1=$xoopsDB->queryF("INSERT INTO ". $xoopsDB->prefix($module_subprefix.'_stories') ." SELECT * FROM ". $xoopsDB->prefix('stories'));
- $result1=$xoopsDB->queryF("INSERT INTO ". $xoopsDB->prefix($module_subprefix.'_stories_files') ." SELECT * FROM ". $xoopsDB->prefix('stories_files'));
- $result1=$xoopsDB->queryF("DELETE FROM ". $xoopsDB->prefix($module_subprefix.'_topics') ." WHERE topic_id = 1");
- $result1=$xoopsDB->queryF("ALTER TABLE ". $xoopsDB->prefix($module_subprefix.'_topics') ." AUTO_INCREMENT = 1");
- $result1=$xoopsDB->queryF("INSERT INTO ". $xoopsDB->prefix($module_subprefix.'_topics') ." SELECT * FROM ". $xoopsDB->prefix('topics'));
- $result1=$xoopsDB->queryF("INSERT INTO ". $xoopsDB->prefix($module_subprefix.'_stories_votedata') ." SELECT * FROM ". $xoopsDB->prefix('stories_votedata'));
-
- //Copy all images, attachments, topic icons to new uploads/modulename dir
- //Topic icons
- $sourcepath = XOOPS_ROOT_PATH . '/modules/news/images/topics/';
- $destinationpath = NW_TOPICS_FILES_PATH . '/';
-
- nw_clonecopyfile($sourcepath, $destinationpath, '');
-
- $sourcepath = XOOPS_ROOT_PATH . '/uploads/';
- $destinationpath = NW_ATTACHED_FILES_PATH . '/';
-
- //Attached files
- $result2 = $xoopsDB->query("SELECT * FROM " . $xoopsDB->prefix('stories_files'));
- $ix = 0;
- while ( $file = $xoopsDB->fetchArray($result2) ) {
- $file_arr[$ix] = $file;
- nw_clonecopyfile($sourcepath, $destinationpath, $file_arr[$ix]['downloadname']);
- //trigger_error($file_arr[$ix]['downloadname'], E_USER_WARNING);
- $ix++;
- }
-
- redirect_header('index.php?op=cloner', 5, _AM_NW_CLONER_NEWSIMPORTED);
-}
-
-/**
* Delete Clone - DNPROSSI - 1.68 RC1
*/
function CloneDelete()
@@ -1738,9 +1684,22 @@
$del_dirname = $_POST['module_name'];
- $delPath = XOOPS_ROOT_PATH . "/modules/" . $del_dirname;
+ $delPath1 = XOOPS_ROOT_PATH . "/modules/" . $del_dirname;
+ $delPath2 = XOOPS_ROOT_PATH . "/uploads/" . $del_dirname;
- if ( nw_removewholeclone($delPath) == TRUE ) {
+ if ( file_exists($delPath2) && is_dir($delPath2) )
+ {
+ if ( nw_removewholeclone($delPath1) == TRUE && nw_removewholeclone($delPath2) == TRUE )
+ {
+ $label = sprintf(_AM_NW_CLONER_CLONEDELETED, $del_dirname);
+ redirect_header('index.php?op=cloner', 5, $label);
+ } else {
+ $label = sprintf(_AM_NW_CLONER_CLONEDELETEERR, $del_dirname);
+ redirect_header('index.php?op=cloner', 5, $label);
+ }
+ }
+ elseif ( nw_removewholeclone($delPath1) == TRUE )
+ {
$label = sprintf(_AM_NW_CLONER_CLONEDELETED, $del_dirname);
redirect_header('index.php?op=cloner', 5, $label);
} else {
@@ -1784,8 +1743,8 @@
case 'newarticle':
xoops_cp_header();
- adminmenu(1);
- echo '<h4>' . _AM_NW_CONFIG . '</h4>';
+ adminmenu(1, _AM_NW_CONFIG);
+ echo '<h2>' . _AM_NW_CONFIG . '</h2>';
include_once XOOPS_ROOT_PATH . '/class/module.textsanitizer.php';
newSubmissions();
autoStories();
@@ -1930,10 +1889,6 @@
CloneUpgrade();
break;
- case 'clonenewsimport':
- CloneNewsImport();
- break;
-
case 'clonedelete':
CloneDelete();
break;
Modified: XoopsModules/xnews/trunk/modules/xnews/admin/upgrade.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/admin/upgrade.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/admin/upgrade.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -95,6 +95,9 @@
if (!nw_FieldExists('topic_color',$xoopsDB->prefix('nw_topics'))) {
nw_AddField("topic_color varchar( 6 ) NOT NULL default '000000'",$xoopsDB->prefix('nw_topics'));
}
+ if (!nw_FieldExists('topic_weight',$xoopsDB->prefix('nw_topics'))) {
+ nw_AddField("topic_weight int( 11 ) NOT NULL default '0'",$xoopsDB->prefix('nw_topics'));
+ }
// 3) If it does not exists, create the table nw_stories_votedata
if(!nw_TableExists($xoopsDB->prefix('nw_stories_votedata')))
@@ -133,6 +136,9 @@
if (!nw_FieldExists('dobr',$xoopsDB->prefix('nw_stories'))) {
nw_AddField("dobr TINYINT( 1 ) NOT NULL DEFAULT '1'",$xoopsDB->prefix('nw_stories'));
}
+ if (!nw_FieldExists('tags',$xoopsDB->prefix('nw_stories'))) {
+ nw_AddField("tags VARCHAR( 255 ) DEFAULT ''",$xoopsDB->prefix('nw_stories'));
+ }
// 5) Add some indexes to the topics table
$sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('nw_topics') . " ADD INDEX ( `topic_title` );");
Modified: XoopsModules/xnews/trunk/modules/xnews/docs/changelog.txt
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/docs/changelog.txt 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/docs/changelog.txt 2010-08-29 12:15:15 UTC (rev 5152)
@@ -1,5 +1,12 @@
Changelog
+v1.68 (FINAL) UTF-8 SEO
+*******
+-Removed import button from within xnews and made a xnews importer new module.
+-Fixed update function part included by wishcraft to update database with tag field - this would zero data in tags on new release updates.
+-Added in database and update topic_weight field for next 1.69 topic sorting
+-changed tags name file to xnews_news.php so when cloned also clones will have correct tag file name.
+
v1.68 (RC3) UTF-8 SEO
*******
-Merged wishcraft additions in his 1.69 Wrong numbering Next 1.68 Final
Modified: XoopsModules/xnews/trunk/modules/xnews/images/export.png
===================================================================
(Binary files differ)
Modified: XoopsModules/xnews/trunk/modules/xnews/images/export32.png
===================================================================
(Binary files differ)
Modified: XoopsModules/xnews/trunk/modules/xnews/include/functions.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/include/functions.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/include/functions.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -119,8 +119,6 @@
$xoopsDB->queryF($sql);
}
-
-
/**
* Internal function for permissions
*
@@ -204,6 +202,18 @@
return $x23;
}
+/**
+ * version of xoops
+ *
+ * @return string
+ */
+function nw_xoops_version()
+{
+ $xv = '';
+ $xv = str_replace('XOOPS ','',XOOPS_VERSION);
+ $xv = substr($xv,0,3);
+ return $xv;
+}
/**
* Retreive an editor according to the module's option "form_options"
Modified: XoopsModules/xnews/trunk/modules/xnews/include/update.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/include/update.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/include/update.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -50,7 +50,9 @@
if (!nw_FieldExists('tags',$xoopsDB->prefix('nw_stories'))) {
nw_AddField("tags VARCHAR( 255 ) DEFAULT ''",$xoopsDB->prefix('nw_stories'));
}
-
+ if (!nw_FieldExists('topic_weight',$xoopsDB->prefix('nw_topics'))) {
+ nw_AddField("topic_weight int(11) NOT NULL default '0'",$xoopsDB->prefix('nw_topics'));
+ }
return true;
}
?>
Modified: XoopsModules/xnews/trunk/modules/xnews/xoops_version.php
===================================================================
--- XoopsModules/xnews/trunk/modules/xnews/xoops_version.php 2010-08-29 12:13:54 UTC (rev 5151)
+++ XoopsModules/xnews/trunk/modules/xnews/xoops_version.php 2010-08-29 12:15:15 UTC (rev 5152)
@@ -43,7 +43,7 @@
$modversion["name"] = "xNews";
$modversion['version'] = 1.68;
-$modversion['description'] = 'x'.'News 1.68 RC3 '._MI_NW_DESC;
+$modversion['description'] = 'x'.'News 1.68 FINAL '._MI_NW_DESC;
$modversion['credits'] = "The XOOPS Project, Christian, Pilou, Marco, ALL the members of the Newbb Team, GIJOE, Zoullou, Mithrandir, Setec Astronomy, Marcan, 5vision, Anne and Dnprossi";
$modversion['author'] = "The XOOPS Project Module Dev Team & Instant Zero";
$modversion['help'] = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|