Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9842] XoopsModules/TDMPicture/trunk/TDMPicture
|
From: <lor...@us...> - 2012-07-10 13:23:10
|
Revision: 9842
http://xoops.svn.sourceforge.net/xoops/?rev=9842&view=rev
Author: lord_venom
Date: 2012-07-10 13:22:59 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
more...
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -152,6 +152,35 @@
$form->display();
break;
+ case "edit_file":
+
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset($_REQUEST['file_id'])) {
+ $obj =& $file_handler->get($_REQUEST['file_id']);
+ } else {
+ $obj =& $file_handler->create();
+ }
+
+ //fichier commun
+ $obj->setVar('file_title', $_REQUEST['file_title']);
+ $obj->setVar('file_display', $_REQUEST['file_display']);
+ $obj->setVar('file_cat', $_REQUEST['file_cat']);
+ $obj->setVar('file_indate', time());
+ $obj->setVar('file_text', $_REQUEST['file_text']);
+ $obj->setVar('file_size', $_REQUEST['file_size']);
+ $obj->setVar('file_res_x', $_REQUEST['file_res_x']);
+ $obj->setVar('file_res_y', $_REQUEST['file_res_y']);
+
+ $erreur = $file_handler->insert($obj);
+
+ if ($erreur) {
+ redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
+ } else {
+ redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
+ }
+ break;
case "save_img":
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -91,6 +91,26 @@
$button_file = new XoopsFormText(_MD_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file'));
$button_file->setExtra("disabled");
$form->addElement($button_file);
+
+ //categorie
+ $cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
+
+ $criteriaDisplay = new CriteriaCompo();
+ $criteriaDisplay->add(new Criteria('cat_display', 1));
+ $criteriaDisplay->add(new Criteria('cat_index', 1));
+
+ $criteriaUser = new CriteriaCompo();
+ $criteriaUser->add($criteriaDisplay);
+ $criteriaUser->add(new Criteria('cat_display', 1), 'OR');
+ $criteriaUser->add(new Criteria('cat_uid', $uid));
+
+ $arr = $cat_handler->getall($criteriaUser);
+ $mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT,
+ $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('file_cat'), '', 0, '', 'tdmpicture_catview')));
+
+ //
+
//editor
$editor_configs=array();
$editor_configs["name"] ="file_text";
@@ -129,7 +149,7 @@
}
}
-$form->addElement(new XoopsFormHidden('op', 'save_file'));
+$form->addElement(new XoopsFormHidden('op', 'edit_file'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
}
@@ -149,9 +169,13 @@
$criteriaUser->add(new Criteria('cat_uid', $uid));
$arr = $cat_handler->getall($criteriaUser);
- $mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
- $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+ //$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
+ //$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+ $mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT,
+ $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), '', 0, '', 'tdmpicture_catview')));
+
//
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -103,7 +103,8 @@
if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
-
+
+
$ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
}
@@ -130,15 +131,60 @@
global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+ //perm
$gperm_handler =& xoops_gethandler('groupperm');
+ if (is_object($xoopsUser)) {
+ $groups = $xoopsUser->getGroups();
+ $uid = $xoopsUser->getVar('uid');
+ } else {
+ $groups = XOOPS_GROUP_ANONYMOUS;
+ $uid = 0;
+ }
+ //
if ( $key > 0 ) {
$value = $this->_tree[$key]['obj']->getVar( $this->_myId );
+ //$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
+ //$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
+
+ if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
+
+ $ret .= '<option value="' . $value . '"';
+
+ if ( $value == $selected ) {
+ $ret .= ' selected="selected"';
+ }
+ $ret .= '>' . $prefix_curr . $this->_tree[$key]['obj']->getVar( $fieldName ) . '</option>';
+ }
+ $prefix_curr .= $prefix_orig;
+ }
+ if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
+ foreach ( $this->_tree[$key]['child'] as $childkey ) {
+ $this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+ }
+ }
+ }
+
+ function _makeSelBoxOptions2( $fieldName, $selected, $key, &$ret, $perm, $prefix_orig, $prefix_curr = '' ) {
+
+ global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+
+ //perm
+ $gperm_handler =& xoops_gethandler('groupperm');
+ if (is_object($xoopsUser)) {
+ $groups = $xoopsUser->getGroups();
+ $uid = $xoopsUser->getVar('uid');
+ } else {
+ $groups = XOOPS_GROUP_ANONYMOUS;
+ $uid = 0;
+ }
+ //
+ if ( $key > 0 ) {
+ $value = $this->_tree[$key]['obj']->getVar( $this->_myId );
$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
//$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
- if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $this->_tree[$key]['obj']->getVar('id'), $groups, $xoopsModule->getVar('mid'))) {
+ if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
-
$ret .= '<option value="' . $url . '"';
if ( $value == $selected ) {
@@ -150,7 +196,7 @@
}
if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
foreach ( $this->_tree[$key]['child'] as $childkey ) {
- $this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+ $this->_makeSelBoxOptions2( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
}
}
}
@@ -197,7 +243,11 @@
if ( false != $addEmptyOption ) {
$ret .= '<option value="0">'.$addEmptyOption.'</option>';
}
+ if(!$extra){
$this->_makeSelBoxOptions( $fieldName, $selected, $key, $ret, $perm, $prefix );
+ } else {
+ $this->_makeSelBoxOptions2( $fieldName, $selected, $key, $ret, $perm, $prefix );
+ }
return $ret . '</select>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -141,7 +141,7 @@
//define( "_MD_TDMPICTURE_ALBUM", "Album");
//define( "_MD_TDMPICTURE_CAT", "Category");
define( "_MD_TDMPICTURE_DISPLAYUSER", "Show in the user");
-//define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
+define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
//define( "_MD_TDMPICTURE_BASEERROR", "Error: Your changes are not recorded");
define( "_MD_TDMPICTURE_GENREDELALL", "ATTENTION all folder and subfolder it will delete");
define( "_MD_TDMPICTURE_NOPERM", "You do not have permission for this action");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -150,7 +150,7 @@
define("_MD_TDMPICTURE_DISPLAYUSER","Afficher dans la partie user");
//define("_AM_TDMPICTURE_DISPLAYINDEX","Catégorie principale");
-//define("_AM_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succé");
+define("_MD_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succé");
//define("_AM_TDMPICTURE_BASEERROR","Erreur: Vos Modifications ne sont pas enregistrer");
define("_MD_TDMPICTURE_GENREDELALL","ATTENTION tous le dossier et c'est sous dossier serons supprimer");
define("_MD_TDMPICTURE_NOPERM","Vous n'avez pas les permissions pour cette action");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -53,7 +53,7 @@
}
break;
- case "save_file":
+ case "edit_file":
//perm
if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
@@ -75,6 +75,7 @@
//fichier commun
$obj->setVar('file_title', $_REQUEST['file_title']);
$obj->setVar('file_display', $_REQUEST['file_display']);
+ $obj->setVar('file_cat', $_REQUEST['file_cat']);
$obj->setVar('file_indate', time());
$obj->setVar('file_text', $_REQUEST['file_text']);
$obj->setVar('file_size', $_REQUEST['file_size']);
@@ -84,11 +85,11 @@
$erreur = $file_handler->insert($obj);
}
- if ($erreur) {
- redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
- }
+ if ($erreur) {
+ redirect_header('index.php', 2, _MD_TDMPICTURE_BASE);
+ } else {
+ redirect_header('index.php', 2, _MD_TDMPICTURE_BASEERROR);
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 13:22:59 UTC (rev 9842)
@@ -25,10 +25,10 @@
</div>
- </div>
-<div class="switch_desc"><{$file.text}><br class="clear"/></div>
+<div id="tdmpicture_text" class="switch_desc"><{$file.text}><br class="clear"/></div>
+<br class="clear"/> </div>
<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 13:22:59 UTC (rev 9842)
@@ -56,10 +56,14 @@
<span id="tdmpicture_num" class="switch_fav"><{$file.favourite}></span></div>
-</div>
+<{if $file.text}>
+<div id="tdmpicture_text" class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
+<{/if}>
+<br class="clear"/></div>
+
<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
@@ -73,11 +77,8 @@
<{/if}>
</div>
-<br class="clear"/>
-<{if $file.text}>
-<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
-<{/if}>
+
<br class="clear"/>
<!-- tableau masquer -->
<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
