Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10543] XoopsModules/TDMDownloads/trunk/TDMDownloads
|
From: <be...@us...> - 2012-12-25 00:13:50
|
Revision: 10543
http://sourceforge.net/p/xoops/svn/10543
Author: beckmi
Date: 2012-12-25 00:13:48 +0000 (Tue, 25 Dec 2012)
Log Message:
-----------
Updating to version 1.63 Beta 1 (fixing bugs in search.php)
Modified Paths:
--------------
XoopsModules/TDMDownloads/trunk/TDMDownloads/docs/changelog.txt
XoopsModules/TDMDownloads/trunk/TDMDownloads/extra/plugins/whatsnew/TDMDownloads/data.inc.php
XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/admin.php
XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/blocks.php
XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php
XoopsModules/TDMDownloads/trunk/TDMDownloads/search.php
XoopsModules/TDMDownloads/trunk/TDMDownloads/templates/tdmdownloads_download.html
XoopsModules/TDMDownloads/trunk/TDMDownloads/xoops_version.php
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/docs/changelog.txt
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/docs/changelog.txt 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/docs/changelog.txt 2012-12-25 00:13:48 UTC (rev 10543)
@@ -1,5 +1,12 @@
-------------------------------------------------
-Version: 1.62
+Version: 1.63 Beta 1
+Date: 2012/12/23
+-------------------------------------------------
+- fix: no need anymore for trans_size in showing file size in search.php (hipoonios/mamba)
+- fix: clearing "download" Smarty variable before appending values to it in search.php (hipoonios/mamba)
+
+-------------------------------------------------
+Version: 1.62 Final
Date: 2012/06/30
-------------------------------------------------
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/extra/plugins/whatsnew/TDMDownloads/data.inc.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/extra/plugins/whatsnew/TDMDownloads/data.inc.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/extra/plugins/whatsnew/TDMDownloads/data.inc.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -1,95 +1,95 @@
-<?php
-/**
- * TDMDownload
- *
- * 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 Gregory Mage (Aka Mage)
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Gregory Mage (Aka Mage)
- */
-
-function tdmdownloads_new($limit=0, $offset=0)
-{
- global $xoopsDB;
-
- $myts =& MyTextSanitizer::getInstance();
-
- $URL_MOD = XOOPS_URL."/modules/TDMDownloads";
- $sql = "SELECT lid, title, date, cid, submitter, hits, description FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY date";
-
- $result = $xoopsDB->query($sql, $limit, $offset);
-
-
-
- $i = 0;
- $ret = array();
-
- while( $row = $xoopsDB->fetchArray($result) )
- {
- $lid = $row['lid'];
- $ret[$i]['link'] = $URL_MOD."/singlefile.php?lid=".$lid;
- $ret[$i]['cat_link'] = $URL_MOD."/viewcat.php?cid=".$row['cid'];
-
- $ret[$i]['title'] = $row['title'];
- $ret[$i]['time'] = $row['date'];
-
-// atom feed
- $ret[$i]['id'] = $lid;
- $ret[$i]['description'] = $myts->makeTareaData4Show( $row['description'], 0 ); //no html
-
-// category
- //$ret[$i]['cat_name'] = $row['ctitle'];
-
-// counter
- $ret[$i]['hits'] = $row['hits'];
-
-// this module dont show user name
- $ret[$i]['uid'] = $row['submitter'];
-
- $i++;
- }
-
- return $ret;
-}
-
-function tdmdownloads_num()
-{
- global $xoopsDB;
-
- $sql = "SELECT count(*) FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY lid";
- $array = $xoopsDB->fetchRow( $xoopsDB->query($sql) );
- $num = $array[0];
- if (empty($num)) $num = 0;
-
- return $num;
-}
-
-function tdmdownloads_data($limit=0, $offset=0)
-{
- global $xoopsDB;
-
- $sql = "SELECT lid, title, date FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY lid";
- $result = $xoopsDB->query($sql,$limit,$offset);
-
- $i = 0;
- $ret = array();
-
- while($myrow = $xoopsDB->fetchArray($result))
- {
- $id = $myrow['lid'];
- $ret[$i]['id'] = $id;
- $ret[$i]['link'] = XOOPS_URL."/modules/TDMDownloads/singlefile.php?lid=".$id."";
- $ret[$i]['title'] = $myrow['title'];
- $ret[$i]['time'] = $myrow['date'];
- $i++;
- }
-
- return $ret;
-}
-?>
+<?php
+/**
+ * TDMDownload
+ *
+ * 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 Gregory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Gregory Mage (Aka Mage)
+ */
+
+function tdmdownloads_new($limit=0, $offset=0)
+{
+ global $xoopsDB;
+
+ $myts =& MyTextSanitizer::getInstance();
+
+ $URL_MOD = XOOPS_URL."/modules/TDMDownloads";
+ $sql = "SELECT lid, title, date, cid, submitter, hits, description FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY date";
+
+ $result = $xoopsDB->query($sql, $limit, $offset);
+
+
+
+ $i = 0;
+ $ret = array();
+
+ while( $row = $xoopsDB->fetchArray($result) )
+ {
+ $lid = $row['lid'];
+ $ret[$i]['link'] = $URL_MOD."/singlefile.php?lid=".$lid;
+ $ret[$i]['cat_link'] = $URL_MOD."/viewcat.php?cid=".$row['cid'];
+
+ $ret[$i]['title'] = $row['title'];
+ $ret[$i]['time'] = $row['date'];
+
+// atom feed
+ $ret[$i]['id'] = $lid;
+ $ret[$i]['description'] = $myts->displayTarea( $row['description'], 0 ); //no html
+
+// category
+ //$ret[$i]['cat_name'] = $row['ctitle'];
+
+// counter
+ $ret[$i]['hits'] = $row['hits'];
+
+// this module dont show user name
+ $ret[$i]['uid'] = $row['submitter'];
+
+ $i++;
+ }
+
+ return $ret;
+}
+
+function tdmdownloads_num()
+{
+ global $xoopsDB;
+
+ $sql = "SELECT count(*) FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY lid";
+ $array = $xoopsDB->fetchRow( $xoopsDB->query($sql) );
+ $num = $array[0];
+ if (empty($num)) $num = 0;
+
+ return $num;
+}
+
+function tdmdownloads_data($limit=0, $offset=0)
+{
+ global $xoopsDB;
+
+ $sql = "SELECT lid, title, date FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status>0 ORDER BY lid";
+ $result = $xoopsDB->query($sql,$limit,$offset);
+
+ $i = 0;
+ $ret = array();
+
+ while($myrow = $xoopsDB->fetchArray($result))
+ {
+ $id = $myrow['lid'];
+ $ret[$i]['id'] = $id;
+ $ret[$i]['link'] = XOOPS_URL."/modules/TDMDownloads/singlefile.php?lid=".$id."";
+ $ret[$i]['title'] = $myrow['title'];
+ $ret[$i]['time'] = $myrow['date'];
+ $i++;
+ }
+
+ return $ret;
+}
+?>
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/admin.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/admin.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/admin.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -169,6 +169,4 @@
define('_AM_TDMDOWNLOADS_KBYTES','KB');
define('_AM_TDMDOWNLOADS_MBYTES','MB');
define('_AM_TDMDOWNLOADS_GBYTES','GB');
-define('_AM_TDMDOWNLOADS_TBYTES','TB');
-
-?>
\ No newline at end of file
+define('_AM_TDMDOWNLOADS_TBYTES','TB');
\ No newline at end of file
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/blocks.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/blocks.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/blocks.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -30,5 +30,4 @@
define("_MB_TDMDOWNLOADS_FLOAT","Image float: ");
define("_MB_TDMDOWNLOADS_FLOAT_LEFT","Left");
define("_MB_TDMDOWNLOADS_FLOAT_RIGHT","Right");
-define("_MB_TDMDOWNLOADS_WHITE","Image white");
-?>
+define("_MB_TDMDOWNLOADS_WHITE","Image white");
\ No newline at end of file
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -151,6 +151,4 @@
define("_MD_TDMDOWNLOADS_BOOKMARK_TO_BALATARIN","Bookmark to Balatarin");
define("_MD_TDMDOWNLOADS_BOOKMARK_TO_GOOGLEPLUS","Bookmark to Google Plus");
define("_MD_TDMDOWNLOADS_BOOKMARK_TO_GOOGLEREADER","Bookmark to Google Reader");
-define("_MD_TDMDOWNLOADS_BOOKMARK_TO_GOOGLEBOOKMARKS","Bookmark to Google Bookmarks");
-
-?>
\ No newline at end of file
+define("_MD_TDMDOWNLOADS_BOOKMARK_TO_GOOGLEBOOKMARKS","Bookmark to Google Bookmarks");
\ No newline at end of file
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/search.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/search.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/search.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -1,279 +1,285 @@
-<?php
-/**
- * TDMDownload
- *
- * 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 Gregory Mage (Aka Mage)
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Gregory Mage (Aka Mage)
- */
-
-include_once 'header.php';
-// template d'affichage
-$xoopsOption['template_main'] = 'tdmdownloads_liste.html';
-include_once XOOPS_ROOT_PATH.'/header.php';
-$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/css/styles.css', null );
-
-$categories = TDMDownloads_MygetItemIds('tdmdownloads_view', 'TDMDownloads');
-
-if (isset($_REQUEST['title'])){
- $_REQUEST['title'] != '' ? $title = $_REQUEST['title'] : $title = '';
-}else{
- $title = '';
-}
-
-if (isset($_REQUEST['cat'])){
- $_REQUEST['cat'] != 0 ? $cat = $_REQUEST['cat'] : $cat = 0;
-}else{
- $cat = 0;
-}
-// tableau ------
-$criteria_2 = new CriteriaCompo();
-$criteria_2->add(new Criteria('status', 0, '!='));
-$criteria_2->add(new Criteria('cid', '(' . implode(',', $categories) . ')','IN'));
-// ------
-//formulaire de recherche
-$form = new XoopsThemeForm(_MD_TDMDOWNLOADS_SEARCH, "search", "search.php", 'post');
-$form->setExtra('enctype="multipart/form-data"');
-//recherche par titre
-$form->addElement(new XoopsFormText(_MD_TDMDOWNLOADS_SEARCH_TITLE, 'title', 25, 255, $title));
-//recherche par cat\xE9gorie
-$criteria = new CriteriaCompo();
-$criteria->setSort('cat_weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$criteria->add(new Criteria('cat_cid', '(' . implode(',', $categories) . ')','IN'));
-/*$cat_select = new XoopsFormSelect(_MD_TDMDOWNLOADS_SEARCH_CATEGORIES . ' ', 'cat', $cat);
-$cat_select->addOption(0,_MD_TDMDOWNLOADS_SEARCH_ALL2);
-$cat_select->addOptionArray($downloadscat_Handler->getList($criteria ));
-$form->addElement($cat_select);*/
-$downloadscat_arr = $downloadscat_Handler->getall($criteria);
-$mytree = new XoopsObjectTree($downloadscat_arr, 'cat_cid', 'cat_pid');
-$form->addElement(new XoopsFormLabel(_AM_TDMDOWNLOADS_FORMINCAT, $mytree->makeSelBox('cat', 'cat_title','--',$cat, true)));
-
-//recherche champ sup.
-$downloadsfield_Handler =& xoops_getModuleHandler('tdmdownloads_field', 'TDMDownloads');
-$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('search', 1));
-$criteria->add(new Criteria('status', 1));
-$criteria->setSort('weight ASC, title');
-$criteria->setOrder('ASC');
-$downloads_field = $downloadsfield_Handler->getall($criteria);
-
-$arguments = '';
-foreach (array_keys($downloads_field) as $i) {
- $title_sup = '';
- $contenu_arr = array();
- $lid_arr = array();
- $nom_champ = 'champ' . $downloads_field[$i]->getVar('fid');
- $criteria = new CriteriaCompo();
- if (isset($_REQUEST[$nom_champ])){
- $_REQUEST[$nom_champ] != 999 ? $champ_contenu[$downloads_field[$i]->getVar('fid')] = $_REQUEST[$nom_champ] : $champ_contenu[$downloads_field[$i]->getVar('fid')] = 999;
- $arguments .= $nom_champ . '=' . $_REQUEST[$nom_champ].'&';
- }else{
- $champ_contenu[$downloads_field[$i]->getVar('fid')] = 999;
- $arguments .= $nom_champ . '=&';
- }
- if ($downloads_field[$i]->getVar('status_def') == 1){
- $criteria->add(new Criteria('status', 0, '!='));
- if ($downloads_field[$i]->getVar('fid') == 1){
- //page d'accueil
- $title_sup = _AM_TDMDOWNLOADS_FORMHOMEPAGE;
- $criteria->setSort('homepage');
- $nom_champ_base = 'homepage';
- }
- if ($downloads_field[$i]->getVar('fid') == 2){
- //version
- $title_sup = _AM_TDMDOWNLOADS_FORMVERSION;
- $criteria->setSort('version');
- $nom_champ_base = 'version';
- }
- if ($downloads_field[$i]->getVar('fid') == 3){
- //taille du fichier
- $title_sup = _AM_TDMDOWNLOADS_FORMSIZE;
- $criteria->setSort('size');
- $nom_champ_base = 'size';
- }
- if ($downloads_field[$i]->getVar('fid') == 4){
- //platform
- $title_sup = _AM_TDMDOWNLOADS_FORMPLATFORM;
- $platform_array = explode('|',$xoopsModuleConfig['plateform']);
- foreach( $platform_array as $platform ) {
- $contenu_arr[$platform] = $platform;
- }
- if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != 999){
- $criteria_2->add(new Criteria('platform', '%' . $champ_contenu[$downloads_field[$i]->getVar('fid')] . '%', 'LIKE'));
- }
- }else{
- $criteria->setOrder('ASC');
- $tdmdownloads_arr = $downloads_Handler->getall( $criteria );
- foreach (array_keys($tdmdownloads_arr) as $j) {
- $contenu_arr[$tdmdownloads_arr[$j]->getVar($nom_champ_base)] = $tdmdownloads_arr[$j]->getVar($nom_champ_base);
- }
- if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != 999){
- $criteria_2->add(new Criteria($nom_champ_base, $champ_contenu[$downloads_field[$i]->getVar('fid')]));
- }
- }
-
- }else{
- $title_sup = $downloads_field[$i]->getVar('title');
- $criteria->add(new Criteria('fid', $downloads_field[$i]->getVar('fid')));
- $criteria->setSort('data');
- $criteria->setOrder('ASC');
- $tdmdownloads_arr = $downloadsfielddata_Handler->getall( $criteria );
- foreach (array_keys($tdmdownloads_arr) as $j) {
- $contenu_arr[$tdmdownloads_arr[$j]->getVar('data', 'n')] = $tdmdownloads_arr[$j]->getVar('data');
- }
- if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != ''){
- $criteria_1 = new CriteriaCompo();
- $criteria_1->add(new Criteria('data', $champ_contenu[$downloads_field[$i]->getVar('fid')]));
- $data_arr = $downloadsfielddata_Handler->getall($criteria_1);
- foreach (array_keys($data_arr) as $k) {
- $lid_arr[] = $data_arr[$k]->getVar('lid');
- }
-
- }
- $form->addElement($select_sup);
- }
- if (count($lid_arr)>0){
- $criteria_2->add(new Criteria('lid', '(' . implode(',', $lid_arr) . ')','IN'));
- }
- $select_sup = new XoopsFormSelect($title_sup, $nom_champ, $champ_contenu[$downloads_field[$i]->getVar('fid')]);
- $select_sup->addOption(999,_MD_TDMDOWNLOADS_SEARCH_ALL1);
- $select_sup->addOptionArray($contenu_arr);
- $form->addElement($select_sup);
- unset ($select_sup);
- $xoopsTpl->append('field', $downloads_field[$i]->getVar('title'));
-}
-
-//bouton validation
-$button_tray = new XoopsFormElementTray('' ,'');
-$button_tray->addElement(new XoopsFormButton('', 'submit', _MD_TDMDOWNLOADS_SEARCH_BT, 'submit'));
-$form->addElement($button_tray);
-
-if ($title != ''){
- $criteria_2->add(new Criteria('title', '%' . $title . '%', 'LIKE'));
+<?php
+/**
+ * TDMDownload
+ *
+ * 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 Gregory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Gregory Mage (Aka Mage)
+ */
+
+include_once 'header.php';
+// template d'affichage
+$xoopsOption['template_main'] = 'tdmdownloads_liste.html';
+include_once XOOPS_ROOT_PATH . '/header.php';
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/css/styles.css', null);
+
+$categories = TDMDownloads_MygetItemIds('tdmdownloads_view', 'TDMDownloads');
+
+if (isset($_REQUEST['title'])) {
+ $_REQUEST['title'] != '' ? $title = $_REQUEST['title'] : $title = '';
+} else {
+ $title = '';
+}
+
+if (isset($_REQUEST['cat'])) {
+ $_REQUEST['cat'] != 0 ? $cat = $_REQUEST['cat'] : $cat = 0;
+} else {
+ $cat = 0;
+}
+// tableau ------
+$criteria_2 = new CriteriaCompo();
+$criteria_2->add(new Criteria('status', 0, '!='));
+$criteria_2->add(new Criteria('cid', '(' . implode(',', $categories) . ')', 'IN'));
+// ------
+//formulaire de recherche
+$form = new XoopsThemeForm(_MD_TDMDOWNLOADS_SEARCH, "search", "search.php", 'post');
+$form->setExtra('enctype="multipart/form-data"');
+//recherche par titre
+$form->addElement(new XoopsFormText(_MD_TDMDOWNLOADS_SEARCH_TITLE, 'title', 25, 255, $title));
+//recherche par cat\xE9gorie
+$criteria = new CriteriaCompo();
+$criteria->setSort('cat_weight ASC, cat_title');
+$criteria->setOrder('ASC');
+$criteria->add(new Criteria('cat_cid', '(' . implode(',', $categories) . ')', 'IN'));
+/*$cat_select = new XoopsFormSelect(_MD_TDMDOWNLOADS_SEARCH_CATEGORIES . ' ', 'cat', $cat);
+$cat_select->addOption(0,_MD_TDMDOWNLOADS_SEARCH_ALL2);
+$cat_select->addOptionArray($downloadscat_Handler->getList($criteria ));
+$form->addElement($cat_select);*/
+$downloadscat_arr = $downloadscat_Handler->getall($criteria);
+$mytree = new XoopsObjectTree($downloadscat_arr, 'cat_cid', 'cat_pid');
+$form->addElement(new XoopsFormLabel(_AM_TDMDOWNLOADS_FORMINCAT, $mytree->makeSelBox('cat', 'cat_title', '--', $cat, true)));
+
+//recherche champ sup.
+$downloadsfield_Handler =& xoops_getModuleHandler('tdmdownloads_field', 'TDMDownloads');
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('search', 1));
+$criteria->add(new Criteria('status', 1));
+$criteria->setSort('weight ASC, title');
+$criteria->setOrder('ASC');
+$downloads_field = $downloadsfield_Handler->getall($criteria);
+
+$arguments = '';
+foreach (array_keys($downloads_field) as $i) {
+ $title_sup = '';
+ $contenu_arr = array();
+ $lid_arr = array();
+ $nom_champ = 'champ' . $downloads_field[$i]->getVar('fid');
+ $criteria = new CriteriaCompo();
+ if (isset($_REQUEST[$nom_champ])) {
+ $_REQUEST[$nom_champ]
+ != 999 ? $champ_contenu[$downloads_field[$i]->getVar('fid')] = $_REQUEST[$nom_champ] : $champ_contenu[$downloads_field[$i]->getVar('fid')] = 999;
+ $arguments .= $nom_champ . '=' . $_REQUEST[$nom_champ] . '&';
+ } else {
+ $champ_contenu[$downloads_field[$i]->getVar('fid')] = 999;
+ $arguments .= $nom_champ . '=&';
+ }
+ if ($downloads_field[$i]->getVar('status_def') == 1) {
+ $criteria->add(new Criteria('status', 0, '!='));
+ if ($downloads_field[$i]->getVar('fid') == 1) {
+ //page d'accueil
+ $title_sup = _AM_TDMDOWNLOADS_FORMHOMEPAGE;
+ $criteria->setSort('homepage');
+ $nom_champ_base = 'homepage';
+ }
+ if ($downloads_field[$i]->getVar('fid') == 2) {
+ //version
+ $title_sup = _AM_TDMDOWNLOADS_FORMVERSION;
+ $criteria->setSort('version');
+ $nom_champ_base = 'version';
+ }
+ if ($downloads_field[$i]->getVar('fid') == 3) {
+ //taille du fichier
+ $title_sup = _AM_TDMDOWNLOADS_FORMSIZE;
+ $criteria->setSort('size');
+ $nom_champ_base = 'size';
+ }
+ if ($downloads_field[$i]->getVar('fid') == 4) {
+ //platform
+ $title_sup = _AM_TDMDOWNLOADS_FORMPLATFORM;
+ $platform_array = explode('|', $xoopsModuleConfig['plateform']);
+ foreach ($platform_array as $platform) {
+ $contenu_arr[$platform] = $platform;
+ }
+ if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != 999) {
+ $criteria_2->add(
+ new Criteria('platform', '%' . $champ_contenu[$downloads_field[$i]->getVar('fid')] . '%', 'LIKE')
+ );
+ }
+ } else {
+ $criteria->setOrder('ASC');
+ $tdmdownloads_arr = $downloads_Handler->getall($criteria);
+ foreach (array_keys($tdmdownloads_arr) as $j) {
+ $contenu_arr[$tdmdownloads_arr[$j]->getVar($nom_champ_base)] = $tdmdownloads_arr[$j]->getVar($nom_champ_base);
+ }
+ if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != 999) {
+ $criteria_2->add(new Criteria($nom_champ_base, $champ_contenu[$downloads_field[$i]->getVar('fid')]));
+ }
+ }
+
+ } else {
+ $title_sup = $downloads_field[$i]->getVar('title');
+ $criteria->add(new Criteria('fid', $downloads_field[$i]->getVar('fid')));
+ $criteria->setSort('data');
+ $criteria->setOrder('ASC');
+ $tdmdownloads_arr = $downloadsfielddata_Handler->getall($criteria);
+ foreach (array_keys($tdmdownloads_arr) as $j) {
+ $contenu_arr[$tdmdownloads_arr[$j]->getVar('data', 'n')] = $tdmdownloads_arr[$j]->getVar('data');
+ }
+ if ($champ_contenu[$downloads_field[$i]->getVar('fid')] != '') {
+ $criteria_1 = new CriteriaCompo();
+ $criteria_1->add(new Criteria('data', $champ_contenu[$downloads_field[$i]->getVar('fid')]));
+ $data_arr = $downloadsfielddata_Handler->getall($criteria_1);
+ foreach (array_keys($data_arr) as $k) {
+ $lid_arr[] = $data_arr[$k]->getVar('lid');
+ }
+
+ }
+ $form->addElement($select_sup);
+ }
+ if (count($lid_arr) > 0) {
+ $criteria_2->add(new Criteria('lid', '(' . implode(',', $lid_arr) . ')', 'IN'));
+ }
+ $select_sup = new XoopsFormSelect($title_sup, $nom_champ, $champ_contenu[$downloads_field[$i]->getVar('fid')]);
+ $select_sup->addOption(999, _MD_TDMDOWNLOADS_SEARCH_ALL1);
+ $select_sup->addOptionArray($contenu_arr);
+ $form->addElement($select_sup);
+ unset ($select_sup);
+ $xoopsTpl->append('field', $downloads_field[$i]->getVar('title'));
+}
+
+//bouton validation
+$button_tray = new XoopsFormElementTray('', '');
+$button_tray->addElement(new XoopsFormButton('', 'submit', _MD_TDMDOWNLOADS_SEARCH_BT, 'submit'));
+$form->addElement($button_tray);
+
+if ($title != '') {
+ $criteria_2->add(new Criteria('title', '%' . $title . '%', 'LIKE'));
$arguments .= 'title=' . $title . '&';
-}
-if ($cat != 0){
- $criteria_2->add(new Criteria('cid', $cat));
- $arguments .= 'cat=' . $cat . '&';
-}
-$tblsort = array();
-$tblsort[1]='date';
-$tblsort[2]='date';
-$tblsort[3]='hits';
-$tblsort[4]='hits';
-$tblsort[5]='rating';
-$tblsort[6]='rating';
-$tblsort[7]='title';
-$tblsort[8]='title';
-$tblorder = array();
-$tblorder[1]='DESC';
-$tblorder[2]='ASC';
-$tblorder[3]='DESC';
-$tblorder[4]='ASC';
-$tblorder[5]='DESC';
-$tblorder[6]='ASC';
-$tblorder[7]='DESC';
-$tblorder[8]='ASC';
-$sort = isset($xoopsModuleConfig['searchorder']) ? $xoopsModuleConfig['searchorder'] : 1;
-$order = isset($xoopsModuleConfig['searchorder']) ? $xoopsModuleConfig['searchorder'] : 1;
-$criteria_2->setSort($tblsort[$sort]);
-$criteria_2->setOrder($tblorder[$order]);
-$numrows = $downloads_Handler->getCount($criteria_2);
-if (isset($_REQUEST['limit'])) {
- $criteria_2->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
-} else {
- $criteria_2->setLimit($xoopsModuleConfig['perpageliste']);
- $limit = $xoopsModuleConfig['perpageliste'];
-}
-if (isset($_REQUEST['start'])) {
- $criteria_2->setStart($_REQUEST['start']);
- $start = $_REQUEST['start'];
-} else {
- $criteria_2->setStart(0);
- $start = 0;
-}
-//pour faire une jointure de table
-$downloads_Handler->table_link = $downloads_Handler->db->prefix("tdmdownloads_cat"); // Nom de la table en jointure
-$downloads_Handler->field_link = "cat_cid"; // champ de la table en jointure
-$downloads_Handler->field_object = "cid"; // champ de la table courante
-$tdmdownloads_arr = $downloads_Handler->getByLink($criteria_2);
-if ( $numrows > $limit ) {
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', $arguments);
- $pagenav = $pagenav->renderNav(4);
-} else {
- $pagenav = '';
-}
-$xoopsTpl->assign('lang_thereare', sprintf(_MD_TDMDOWNLOADS_SEARCH_THEREARE,$downloads_Handler->getCount($criteria_2)));
-$xoopsTpl->assign('pagenav', $pagenav);
-$keywords = '';
-foreach (array_keys($tdmdownloads_arr) as $i) {
- $tdmdownloads_tab['lid'] = $tdmdownloads_arr[$i]->getVar('lid');
- $tdmdownloads_tab['cid'] = $tdmdownloads_arr[$i]->getVar('cid');
- $tdmdownloads_tab['title'] = $tdmdownloads_arr[$i]->getVar('title');
- $tdmdownloads_tab['cat'] = $tdmdownloads_arr[$i]->getVar('cat_title');
- $tdmdownloads_tab['imgurl'] = $uploadurl . $tdmdownloads_arr[$i]->getVar('cat_imgurl');
- $tdmdownloads_tab['date'] = formatTimeStamp($tdmdownloads_arr[$i]->getVar('date'),'d/m/Y');
- $tdmdownloads_tab['rating'] = number_format($tdmdownloads_arr[$i]->getVar('rating'), 0);
- $tdmdownloads_tab['hits'] = $tdmdownloads_arr[$i]->getVar('hits');
- $contenu = '';
- foreach (array_keys($downloads_field) as $j) {
- if ($downloads_field[$j]->getVar('status_def') == 1){
- if ($downloads_field[$j]->getVar('fid') == 1){
- //page d'accueil
- $contenu = $tdmdownloads_arr[$i]->getVar('homepage');
- }
- if ($downloads_field[$j]->getVar('fid') == 2){
- //version
- $contenu = $tdmdownloads_arr[$i]->getVar('version');
- }
- if ($downloads_field[$j]->getVar('fid') == 3){
- //taille du fichier
- $contenu = trans_size($tdmdownloads_arr[$i]->getVar('size'));
- }
- if ($downloads_field[$j]->getVar('fid') == 4){
- //plateforme
- $contenu = $tdmdownloads_arr[$i]->getVar('platform');
- }
- }else{
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $tdmdownloads_arr[$i]->getVar('lid')));
- $criteria->add(new Criteria('fid', $downloads_field[$j]->getVar('fid')));
- $downloadsfielddata = $downloadsfielddata_Handler->getall($criteria);
- if (count($downloadsfielddata) > 0){
- foreach (array_keys($downloadsfielddata) as $k) {
- $contenu = $downloadsfielddata[$k]->getVar('data', 'n');
- }
- }else{
- $contenu = '';
- }
- }
- $tdmdownloads_tab['fielddata'][$j] = $contenu;
- unset($contenu);
-
- }
- $xoopsTpl->append('downloads', $tdmdownloads_tab);
- $keywords .= $tdmdownloads_arr[$i]->getVar('title') . ',';
-}
-
-$xoopsTpl->assign('searchForm', $form->render());
-// r\xE9f\xE9rencement
-// titre de la page
-$titre = _MD_TDMDOWNLOADS_SEARCH_PAGETITLE . ' - ' . $xoopsModule->name();
-$xoopsTpl->assign('xoops_pagetitle', $titre);
-//description
-$xoTheme->addMeta('meta', 'description', strip_tags($xoopsModule->name()));
-//keywords
-$keywords = substr($keywords,0,-1);
-$xoTheme->addMeta('meta', 'keywords', strip_tags($keywords));
-
-include XOOPS_ROOT_PATH.'/footer.php';
+}
+if ($cat != 0) {
+ $criteria_2->add(new Criteria('cid', $cat));
+ $arguments .= 'cat=' . $cat . '&';
+}
+$tblsort = array();
+$tblsort[1] = 'date';
+$tblsort[2] = 'date';
+$tblsort[3] = 'hits';
+$tblsort[4] = 'hits';
+$tblsort[5] = 'rating';
+$tblsort[6] = 'rating';
+$tblsort[7] = 'title';
+$tblsort[8] = 'title';
+$tblorder = array();
+$tblorder[1] = 'DESC';
+$tblorder[2] = 'ASC';
+$tblorder[3] = 'DESC';
+$tblorder[4] = 'ASC';
+$tblorder[5] = 'DESC';
+$tblorder[6] = 'ASC';
+$tblorder[7] = 'DESC';
+$tblorder[8] = 'ASC';
+$sort = isset($xoopsModuleConfig['searchorder']) ? $xoopsModuleConfig['searchorder'] : 1;
+$order = isset($xoopsModuleConfig['searchorder']) ? $xoopsModuleConfig['searchorder'] : 1;
+$criteria_2->setSort($tblsort[$sort]);
+$criteria_2->setOrder($tblorder[$order]);
+$numrows = $downloads_Handler->getCount($criteria_2);
+if (isset($_REQUEST['limit'])) {
+ $criteria_2->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+} else {
+ $criteria_2->setLimit($xoopsModuleConfig['perpageliste']);
+ $limit = $xoopsModuleConfig['perpageliste'];
+}
+if (isset($_REQUEST['start'])) {
+ $criteria_2->setStart($_REQUEST['start']);
+ $start = $_REQUEST['start'];
+} else {
+ $criteria_2->setStart(0);
+ $start = 0;
+}
+//pour faire une jointure de table
+$downloads_Handler->table_link = $downloads_Handler->db->prefix("tdmdownloads_cat"); // Nom de la table en jointure
+$downloads_Handler->field_link = "cat_cid"; // champ de la table en jointure
+$downloads_Handler->field_object = "cid"; // champ de la table courante
+$tdmdownloads_arr = $downloads_Handler->getByLink($criteria_2);
+if ($numrows > $limit) {
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', $arguments);
+ $pagenav = $pagenav->renderNav(4);
+} else {
+ $pagenav = '';
+}
+$xoopsTpl->assign('lang_thereare', sprintf(_MD_TDMDOWNLOADS_SEARCH_THEREARE, $downloads_Handler->getCount($criteria_2)));
+$xoopsTpl->assign('pagenav', $pagenav);
+$keywords = '';
+foreach (array_keys($tdmdownloads_arr) as $i) {
+ $tdmdownloads_tab['lid'] = $tdmdownloads_arr[$i]->getVar('lid');
+ $tdmdownloads_tab['cid'] = $tdmdownloads_arr[$i]->getVar('cid');
+ $tdmdownloads_tab['title'] = $tdmdownloads_arr[$i]->getVar('title');
+ $tdmdownloads_tab['cat'] = $tdmdownloads_arr[$i]->getVar('cat_title');
+ $tdmdownloads_tab['imgurl'] = $uploadurl . $tdmdownloads_arr[$i]->getVar('cat_imgurl');
+ $tdmdownloads_tab['date'] = formatTimeStamp($tdmdownloads_arr[$i]->getVar('date'), 'd/m/Y');
+ $tdmdownloads_tab['rating'] = number_format($tdmdownloads_arr[$i]->getVar('rating'), 0);
+ $tdmdownloads_tab['hits'] = $tdmdownloads_arr[$i]->getVar('hits');
+ $contenu = '';
+ foreach (array_keys($downloads_field) as $j) {
+ if ($downloads_field[$j]->getVar('status_def') == 1) {
+ if ($downloads_field[$j]->getVar('fid') == 1) {
+ //page d'accueil
+ $contenu = $tdmdownloads_arr[$i]->getVar('homepage');
+ }
+ if ($downloads_field[$j]->getVar('fid') == 2) {
+ //version
+ $contenu = $tdmdownloads_arr[$i]->getVar('version');
+ }
+ if ($downloads_field[$j]->getVar('fid') == 3) {
+ //taille du fichier
+ //mb $contenu = trans_size($tdmdownloads_arr[$i]->getVar('size'));
+ $contenu = $tdmdownloads_arr[$i]->getVar('size');
+ }
+ if ($downloads_field[$j]->getVar('fid') == 4) {
+ //plateforme
+ $contenu = $tdmdownloads_arr[$i]->getVar('platform');
+ }
+ } else {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('lid', $tdmdownloads_arr[$i]->getVar('lid')));
+ $criteria->add(new Criteria('fid', $downloads_field[$j]->getVar('fid')));
+ $downloadsfielddata = $downloadsfielddata_Handler->getall($criteria);
+ if (count($downloadsfielddata) > 0) {
+ foreach (array_keys($downloadsfielddata) as $k) {
+ $contenu = $downloadsfielddata[$k]->getVar('data', 'n');
+ }
+ } else {
+ $contenu = '';
+ }
+ }
+ $tdmdownloads_tab['fielddata'][$j] = $contenu;
+ unset($contenu);
+
+ }
+ $xoopsTpl->clear_assign('downloads');
+ $xoopsTpl->append('downloads', $tdmdownloads_tab);
+
+ $keywords .= $tdmdownloads_arr[$i]->getVar('title') . ',';
+}
+
+$xoopsTpl->assign('searchForm', $form->render());
+// r\xE9f\xE9rencement
+// titre de la page
+$titre = _MD_TDMDOWNLOADS_SEARCH_PAGETITLE . ' - ' . $xoopsModule->name();
+$xoopsTpl->assign('xoops_pagetitle', $titre);
+//description
+$xoTheme->addMeta('meta', 'description', strip_tags($xoopsModule->name()));
+//keywords
+$keywords = substr($keywords, 0, -1);
+$xoTheme->addMeta('meta', 'keywords', strip_tags($keywords));
+
+include XOOPS_ROOT_PATH . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/templates/tdmdownloads_download.html
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/templates/tdmdownloads_download.html 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/templates/tdmdownloads_download.html 2012-12-25 00:13:48 UTC (rev 10543)
@@ -1,38 +1,39 @@
<div class="item tdmdownloads-item">
- <div class="itemHead">
+ <div class="itemHead">
<span class="itemTitle">
- <strong><a title="<{$down.title}>" href="<{$xoops_url}>/modules/TDMDownloads/singlefile.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory" ><{$down.title}></a></strong>
+ <strong><a title="<{$down.title}>" href="<{$xoops_url}>/modules/TDMDownloads/singlefile.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory"><{$down.title}></a></strong>
</span>
<br/>
- </div>
- <div class="itemInfo">
+ </div>
+ <div class="itemInfo">
- </div>
- <div class="itemBody">
+ </div>
+ <div class="itemBody">
<{if $down.new}>
- <span class="itemNew"><{$down.new}></span>
- <{/if}>
- <{if $down.pop}>
- <span class="itemPop"><{$down.pop}></span>
- <{/if}>
- <{if $down.perm_download != ""}>
- <span class="itemDownload"><a title="<{$smarty.const._MD_TDMDOWNLOADS_INDEX_DLNOW}>" href="visit.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory external"><img src="<{$xoops_url}>/modules/TDMDownloads/images/icon/download-now.png" alt="<{$smarty.const._MD_TDMDOWNLOADS_INDEX_DLNOW}>" /></a></span>
- <{/if}>
+ <span class="itemNew"><{$down.new}></span>
+ <{/if}>
+ <{if $down.pop}>
+ <span class="itemPop"><{$down.pop}></span>
+ <{/if}>
+ <{if $down.perm_download != ""}>
+ <span class="itemDownload"><a title="<{$smarty.const._MD_TDMDOWNLOADS_INDEX_DLNOW}>" href="visit.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory external"><img src="<{$xoops_url}>/modules/TDMDownloads/images/icon/download-now.png" alt="<{$smarty.const._MD_TDMDOWNLOADS_INDEX_DLNOW}>"/></a></span>
+ <{/if}>
<span class="itemPoster"><{$smarty.const._MD_TDMDOWNLOADS_INDEX_SUBMITDATE}><{$down.updated}></span>
- <span class="itemPostDate"><{$smarty.const._MD_TDMDOWNLOADS_INDEX_SUBMITTER}><{$down.submitter}></span>
- <{$down.description_short}>
- <div class="itemText justify">
- <{if $show_screenshot == true}>
- <{if $down.logourl != ''}>
- <img class="<{$img_float}>" width="<{$shotwidth}>" src="<{$down.logourl}>" alt="<{$down.title}>" />
- <{/if}>
- <{/if}>
- </div>
- <div class="endline"></div>
- </div>
- <div class="itemFoot">
- <span class="itemAdminLink"><{$down.adminlink}></span>
- <span class="itemPermaLink"><a title="<{$down.title}>" href="<{$xoops_url}>/modules/TDMDownloads/singlefile.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory"><{$smarty.const._MD_TDMDOWNLOADS_MOREDETAILS}></a></span>
+ <span class="itemPostDate"><{$smarty.const._MD_TDMDOWNLOADS_INDEX_SUBMITTER}><{$down.submitter}></span>
+ <{$down.description_short}>
+ <div class="itemText justify">
+ <{if $show_screenshot == true}>
+ <{if $down.logourl != ''}>
+ <img class="<{$img_float}>" width="<{$shotwidth}>" src="<{$down.logourl}>" alt="<{$down.title}>"/>
+ <{/if}>
+ <{/if}>
+ </div>
+ <div class="endline"></div>
+ </div>
+ <div class="itemFoot">
+ <span class="itemAdminLink"><{$down.adminlink}></span>
+ <span class="itemPermaLink"><a title="<{$down.title}>" href="<{$xoops_url}>/modules/TDMDownloads/singlefile.php?cid=<{$down.cid}>&lid=<{$down.id}>" rel="directory"><{$smarty.const._MD_TDMDOWNLOADS_MOREDETAILS}></a></span>
+
<div class="tdmdownloads-linetitle"></div>
- </div>
+ </div>
</div>
\ No newline at end of file
Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/xoops_version.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/xoops_version.php 2012-12-24 18:30:49 UTC (rev 10542)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/xoops_version.php 2012-12-25 00:13:48 UTC (rev 10543)
@@ -19,7 +19,7 @@
}
$modversion['name'] = _MI_TDMDOWNLOADS_NAME;
-$modversion['version'] = '1.62';
+$modversion['version'] = '1.63';
$modversion['description'] = _MI_TDMDOWNLOADS_DESC;
$modversion['credits'] = 'G. Mage';
$modversion['author'] = 'G. Mage';
@@ -31,7 +31,7 @@
$modversion['official'] = 1;
$modversion['image'] = 'images/tdmdownloads_logo.png';
$modversion['dirname'] = 'TDMDownloads';
-$modversion['module_status'] = 'Final';
+$modversion['module_status'] = 'Beta 1';
$modversion['release_date'] = '2012/06/30';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
$modversion['onInstall'] = 'include/install.php';
|
