From: <lor...@us...> - 2012-07-07 14:11:55
|
Revision: 9794 http://xoops.svn.sourceforge.net/xoops/?rev=9794&view=rev Author: lord_venom Date: 2012-07-07 14:11:46 +0000 (Sat, 07 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php XoopsModules/TDMPicture/trunk/TDMPicture/language/english/admin.php XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php XoopsModules/TDMPicture/trunk/TDMPicture/search.php XoopsModules/TDMPicture/trunk/TDMPicture/submit.php XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php Added Paths: ----------- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php XoopsModules/TDMPicture/trunk/TDMPicture/docs/ XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt XoopsModules/TDMPicture/trunk/TDMPicture/images/picture_edit.png XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/help.html XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/index.html XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/help.html XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/index.html XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/no_picture.png Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -17,17 +17,13 @@ * **************************************************************************** */ -include 'admin_header.php'; +include_once dirname(__FILE__) . '/admin_header.php'; + xoops_cp_header(); +$aboutAdmin = new ModuleAdmin(); -$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) ); +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE); - $about_admin = new ModuleAdmin(); - echo $about_admin->addNavigation('about.php'); - echo $about_admin->renderabout('9MYQB7GUK5MCS', true); - - - -xoops_cp_footer(); -?> \ No newline at end of file +include 'admin_footer.php'; \ No newline at end of file Added: XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,6 @@ +<?php +echo"<br /><br /><div class='adminfooter'>\n" . " <div style='text-align: center;'>\n" + . " <a href='http://www.xoops.org' rel='external'><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/TDMPicture/trunk/TDMPicture/admin/admin_header.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -33,9 +33,12 @@ //return false; } -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); -$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +//$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); +//$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); +//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +$pathIcon16 = '../' . $xoopsModule->getInfo('icons16'); +$pathIcon32 = '../' . $xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); $myts =& MyTextSanitizer::getInstance(); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -77,6 +77,7 @@ $obj->setVar('cat_weight', $_REQUEST['cat_weight']); $obj->setVar('cat_display', $_REQUEST['cat_display']); $obj->setVar('cat_index', $_REQUEST['cat_index']); + $obj->setVar('cat_uid', $xoopsUser->getVar('uid')); if ($cat_handler->insert($obj)) { @@ -164,8 +165,10 @@ //menu admin $category_admin = new ModuleAdmin(); echo $category_admin->addNavigation('cat.php'); - if ($cat_waiting != 0 && !isset($_REQUEST['cat_display'])){ - $category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting), 'cat.php?op=list&cat_display=0', 'update'); + if ($cat_waiting != 0 && !isset($_REQUEST['cat_display'])){ + $waitString = _AM_TDMPICTURE_BUTTON_CAT_WAITING.$cat_waiting; + echo $waitString; + $category_admin->addItemButton($waitString, 'cat.php?op=list&cat_display=0', 'update'); } if (isset($_REQUEST['cat_display'])) { $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list'); @@ -223,8 +226,8 @@ $cat_pid = $assoc_cat[$i]->getVar('cat_pid'); $cat_title = $myts->displayTarea($assoc_cat[$i]->getVar('cat_title')); - $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<a href='cat.php?op=update&cat_id=".$cat_id."'><img src='./../images/on.gif' border='0'></a>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>"; - $principal = $assoc_cat[$i]->getVar('cat_index') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<img src='./../images/off.gif' border='0'>"; + $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<a href='cat.php?op=update&cat_id=".$cat_id."'><img src='" . $pathIcon16."/1.png' border='0'></a>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='" . $pathIcon16."/0.png' border='0'></a>"; + $principal = $assoc_cat[$i]->getVar('cat_index') == 1 ? "<img src='" . $pathIcon16."/1.png' border='0'>" : "<img src='" . $pathIcon16."/0.png' border='0'>"; //on test l'existance de l'image $imgpath = TDMPICTURE_CAT_PATH.$assoc_cat[$i]->getVar("cat_img"); if (file_exists($imgpath)) { @@ -241,13 +244,13 @@ echo '<td align="center" width="5%" style="vertical-align:middle;">'.$display.'</td>'; echo '<td align="center" width="5%" style="vertical-align:middle;">'.$principal.'</td>'; echo '<td align="center" width="10%" style="vertical-align:middle;">'; - echo '<a href="cat.php?op=edit&cat_id='.$cat_id.'"><img src="./../images/edit_mini.gif" border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>'; - echo '<a href="cat.php?op=delete&cat_id='.$cat_id.'"><img src="./../images/delete_mini.gif" border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>'; + echo '<a href="cat.php?op=edit&cat_id='.$cat_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>'; + echo '<a href="cat.php?op=delete&cat_id='.$cat_id.'"><img src=' . $pathIcon16.'/delete.png border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>'; echo '</td>'; echo '</tr>'; } echo '</table><br /><br />'; - echo '<div align=right>'.$pagenav.'</div><br />'; + echo '<div align=right>'.$pagenav.'</div>'; } else{ echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_CAT,0) . '</div>'; } @@ -269,5 +272,4 @@ break; } -xoops_cp_footer(); -?> \ No newline at end of file +include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -365,7 +365,9 @@ $category_admin = new ModuleAdmin(); echo $category_admin->addNavigation('files.php'); if ($file_waiting != 0 && !isset($_REQUEST['file_display'])){ - $category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting), 'files.php?op=list&file_display=0', 'update'); + $waitString = _AM_TDMPICTURE_BUTTON_FILES_WAITING.$file_waiting; + //$category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting), 'files.php?op=list&file_display=0', 'update'); + $category_admin->addItemButton($waitString, 'files.php?op=list&file_display=0', 'update'); } if (isset($_REQUEST['file_display'])) { $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list'); @@ -409,7 +411,7 @@ echo '<th align="center" width="10%">'._AM_TDMPICTURE_IMG.'</th>'; echo '<th align="center" width="20%">'._AM_TDMPICTURE_CAT.'</th>'; echo '<th align="center" width="25%">'._AM_TDMPICTURE_TITLE.'</th>'; - echo '<th align="center" width="10%">'._AM_TDMPICTURE_WITH.'</th>'; + echo '<th align="center" width="10%">'._AM_TDMPICTURE_WIDTH.'</th>'; echo '<th align="center" width="10%">'._AM_TDMPICTURE_HEIGHT.'</th>'; echo '<th align="center" width="5%">'._AM_TDMPICTURE_THUMB.'</th>'; echo '<th align="center" width="5%">'._AM_TDMPICTURE_DISPLAY.'</th>'; @@ -425,7 +427,7 @@ $file_id = $arr[$i]->getVar('file_id'); $file_title = $myts->displayTarea($arr[$i]->getVar('file_title')); - $display = $arr[$i]->getVar('file_display') == 1 ? "<a href='files.php?op=update&file_id=".$file_id."'><img src='./../images/on.gif' border='0'></a>" : "<a href='files.php?op=update&file_id=".$file_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>"; + $display = $arr[$i]->getVar('file_display') == 1 ? "<a href='files.php?op=update&file_id=".$file_id."'><img src='" . $pathIcon16."/1.png' border='0'></a>" : "<a href='files.php?op=update&file_id=".$file_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='" . $pathIcon16."/0.png' border='0'></a>"; //on test l'existance de l'image $img = $arr[$i]->getVar("file_file") ? $arr[$i]->getVar("file_file") : 'blank.gif'; @@ -439,9 +441,9 @@ $imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/thumb/".$img; $thumb_img = "<a href='files.php?op=thumb&file_id=".$file_id."'>"; if (file_exists($imgpath)) { - $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='./../images/on.gif' border='0'>"; + $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='" . $pathIcon16."/1.png' border='0'>"; } else { - $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='./../images/off.gif' border='0'>"; + $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='" . $pathIcon16."/0.png' border='0'>"; } $thumb_img .= "</a>"; @@ -455,13 +457,13 @@ echo '<td align="center" style="vertical-align:middle;">'.$thumb_img.'</td>'; echo '<td align="center" style="vertical-align:middle;">'.$display.'</td>'; echo '<td align="center" style="vertical-align:middle;">'; - echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src="./../images/edit_mini.gif" border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>'; - echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src="./../images/delete_mini.gif" border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>'; - echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/renew_mini.gif" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>'; + echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>'; + echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src=' . $pathIcon16.'/delete.png border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>'; + echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>'; echo '</td>'; echo '</tr>'; } - echo '</table><input type="submit" name="op" value="'._DELETE.'" /></form><br /><br />'; + echo '</table><input type="submit" name="op" value="'._AM_TDMPICTURE_DELETE_SELECTED.'" /></form><br /><br />'; echo '<div align=right>'.$pagenav.'</div><br />'; } else{ echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_FILE,0) . '</div>'; @@ -471,5 +473,4 @@ } -xoops_cp_footer(); -?> \ No newline at end of file +include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -17,25 +17,79 @@ * **************************************************************************** */ + +defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; + +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); +$pathLanguage = $path . $pathModuleAdmin; + + +if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; +} + +include_once $fileinc; + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME; +$adminmenu[$i]["link"] = "admin/index.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png'; + +//$i++; +//$adminmenu[$i]["title"] = _MI_ISTATS_INDEX; +//$adminmenu[$i]["link"] = "admin/main.php"; +//$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUCAT; +$adminmenu[$i]["link"] = "admin/cat.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUFILE; +$adminmenu[$i]["link"] = "admin/files.php"; +$adminmenu[$i]["icon"] = 'images/decos/min_file.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUPERMISSIONS; +$adminmenu[$i]["link"] = "admin/permissions.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png'; + +$i++; +$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT; +$adminmenu[$i]["link"] = "admin/about.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png'; + + + -$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX; -$adminmenu[0]['link'] = "admin/index.php"; -$adminmenu[0]['icon'] = 'images/decos/min_index.png'; - -$adminmenu[1]['title'] = _MI_TDMPICTURE_ADMENUCAT; -$adminmenu[1]['link'] = "admin/cat.php"; -$adminmenu[1]['icon'] = 'images/decos/min_cat.png'; +//$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX; +//$adminmenu[0]['link'] = "admin/index.php"; +//$adminmenu[0]['icon'] = 'images/decos/min_index.png'; +// +//$adminmenu[1]['title'] = _MI_TDMPICTURE_ADMENUCAT; +//$adminmenu[1]['link'] = "admin/cat.php"; +//$adminmenu[1]['icon'] = 'images/decos/min_cat.png'; -$adminmenu[2]['title'] = _MI_TDMPICTURE_ADMENUFILE; -$adminmenu[2]['link'] = "admin/files.php"; -$adminmenu[2]['icon'] = 'images/decos/min_file.png'; +//$adminmenu[2]['title'] = _MI_TDMPICTURE_ADMENUFILE; +//$adminmenu[2]['link'] = "admin/files.php"; +//$adminmenu[2]['icon'] = 'images/decos/min_file.png'; -$adminmenu[3]['title'] = _MI_TDMPICTURE_ADMENUPERMISSIONS; -$adminmenu[3]['link'] = "admin/permissions.php"; -$adminmenu[3]['icon'] = 'images/decos/min_permissions.png'; +//$adminmenu[3]['title'] = _MI_TDMPICTURE_ADMENUPERMISSIONS; +//$adminmenu[3]['link'] = "admin/permissions.php"; +//$adminmenu[3]['icon'] = 'images/decos/min_permissions.png'; +// +//$adminmenu[4]['title'] = _MI_TDMPICTURE_ADMENUABOUT; +//$adminmenu[4]['link'] = "admin/about.php"; +//$adminmenu[4]['icon'] = 'images/decos/min_about.png'; -$adminmenu[4]['title'] = _MI_TDMPICTURE_ADMENUABOUT; -$adminmenu[4]['link'] = "admin/about.php"; -$adminmenu[4]['icon'] = 'images/decos/min_about.png'; - ?> \ No newline at end of file Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -84,6 +84,4 @@ echo '<div class="tips">' . _AM_TDMPICTURE_MANAGE_PERM . '</div><br />'; echo $permform->render(); -xoops_cp_footer() ; - -?> \ No newline at end of file +include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -62,14 +62,14 @@ if ($action === false) { $action = $_SERVER['REQUEST_URI']; } - $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT); + $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT); include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); $form = new XoopsThemeForm($title, 'form', $action, 'post', true); $form->setExtra('enctype="multipart/form-data"'); - $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title'))); + $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title'))); if (!$this->isNew()) { //Load groups @@ -90,7 +90,7 @@ $arr = $cat_handler->getall($criteriaUser); $mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid'); - $form->addElement(new XoopsFormLabel(_AM_TDMPICTURE_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','-', $this->getVar('cat_pid'), true))); + $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','-', $this->getVar('cat_pid'), true))); //editor $editor_configs=array(); @@ -101,13 +101,13 @@ $editor_configs["width"] = "100%"; $editor_configs["height"] = "400px"; $editor_configs["editor"] = $xoopsModuleConfig["tdmpicture_editor"]; - $form->addElement( new XoopsFormEditor(_AM_TDMPICTURE_TEXT, "cat_text", $editor_configs), false ); + $form->addElement( new XoopsFormEditor(_MD_TDMPICTURE_TEXT, "cat_text", $editor_configs), false ); - //upload +//upload $img = $this->getVar('cat_img') ? $this->getVar('cat_img') : 'blank.gif'; $uploadirectory = "modules/".$xoopsModule->dirname()."/upload/cat/"; - $imgtray = new XoopsFormElementTray(_AM_TDMPICTURE_IMG,'<br />'); - $imgpath=sprintf(_AM_TDMPICTURE_PATH, $uploadirectory ); + $imgtray = new XoopsFormElementTray(_MD_TDMPICTURE_IMG,'<br />'); + $imgpath=sprintf(_MD_TDMPICTURE_PATH, $uploadirectory ); $imageselect= new XoopsFormSelect($imgpath, 'img',$img); $topics_array = XoopsLists :: getImgListAsArray(XOOPS_ROOT_PATH."/".$uploadirectory); foreach( $topics_array as $image ) { @@ -118,14 +118,14 @@ $imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . $uploadirectory . "/" . $img . "' name='image3' id='image3' alt='' />" ) ); $fileseltray= new XoopsFormElementTray('','<br />'); - $fileseltray->addElement(new XoopsFormFile(_AM_TDMPICTURE_UPLOAD , 'attachedfile', $xoopsModuleConfig['tdmpicture_mimemax']),false); + $fileseltray->addElement(new XoopsFormFile(_MD_TDMPICTURE_UPLOAD , 'attachedfile', $xoopsModuleConfig['tdmpicture_mimemax']),false); $fileseltray->addElement(new XoopsFormLabel(''), false); $imgtray->addElement($fileseltray); $form->addElement($imgtray); // //poit - $form->addElement(new XoopsFormText(_AM_TDMPICTURE_WEIGHT, 'cat_weight', 10, 11, $this->getVar('cat_weight'))); + $form->addElement(new XoopsFormText(_MD_TDMPICTURE_WEIGHT, 'cat_weight', 10, 11, $this->getVar('cat_weight'))); // Permissions $gperm_handler =& xoops_gethandler('groupperm'); @@ -144,9 +144,9 @@ if(!$this->isNew()) { // Edit mode $groups_ids = $gperm_handler->getGroupIds('tdmpicture_catview', $this->getVar('cat_id'), $xoopsModule->getVar('mid')); $groups_ids = array_values($groups_ids); - $groups_news_can_view_checkbox = new XoopsFormCheckBox(_AM_TDMPICTURE_PERM_2, 'groups_view[]', $groups_ids); + $groups_news_can_view_checkbox = new XoopsFormCheckBox(_MD_TDMPICTURE_PERM_2, 'groups_view[]', $groups_ids); } else { // Creation mode - $groups_news_can_view_checkbox = new XoopsFormCheckBox(_AM_TDMPICTURE_PERM_2, 'groups_view[]', $full_list); + $groups_news_can_view_checkbox = new XoopsFormCheckBox(_MD_TDMPICTURE_PERM_2, 'groups_view[]', $full_list); } $groups_news_can_view_checkbox->addOptionArray($group_list); $form->addElement($groups_news_can_view_checkbox); @@ -155,13 +155,21 @@ // if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) { - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO)); - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO)); + + //$form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO)); + + $aff_index = new XoopsFormElementTray(_MD_TDMPICTURE_DISPLAYINDEX,''); + $aff_index->setDescription(_MD_TDMPICTURE_DISPLAYINDEXDESC); + $aff_index->addElement(new XoopsFormRadioYN('', 'cat_index', $this->getVar('cat_index'), _YES, _NO)); + $form->addElement($aff_index); + + }else { if ($gperm_handler->checkRight('tdmpicture_view', 1048, $groups, $xoopsModule->getVar('mid'))) { - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO)); - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO)); }else { $form->addElement(new XoopsFormHidden('cat_display', 0)); } Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -56,12 +56,11 @@ function getForm($action = false) { - global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig; + global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig; - if ($action === false) { - $action = $_SERVER['REQUEST_URI']; + if ($action === false) { $action = $_SERVER['REQUEST_URI']; } - $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT); + $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT); include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); @@ -79,17 +78,17 @@ $form = new XoopsThemeForm($title, 'form', $action, 'post', true); $form->setExtra('enctype="multipart/form-data"'); - // $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'filecat_title', 100, 255, $this->getVar('filecat_title')), true); + // $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'filecat_title', 100, 255, $this->getVar('filecat_title')), true); if (!$this->isNew()) { //Load groups $form->addElement(new XoopsFormHidden('id', $this->getVar('file_id'))); - $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'file_title', 100, 255, $this->getVar('file_title')), true); + $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'file_title', 100, 255, $this->getVar('file_title')), true); } // if (!$this->isNew()) { -$button_file = new XoopsFormText(_AM_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file')); +$button_file = new XoopsFormText(_MD_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file')); $button_file->setExtra("disabled"); $form->addElement($button_file); //editor @@ -101,18 +100,18 @@ $editor_configs["width"] = "100%"; $editor_configs["height"] = "400px"; $editor_configs["editor"] = $xoopsModuleConfig["tdmpicture_editor"]; - $form->addElement( new XoopsFormEditor(_AM_TDMPICTURE_TEXT, "file_text", $editor_configs), false ); + $form->addElement( new XoopsFormEditor(_MD_TDMPICTURE_TEXT, "file_text", $editor_configs), false ); // -$form->addElement(new XoopsFormText(_AM_TDMPICTURE_SIZE, 'file_size', 10, 11, $this->getVar('file_size'))); +$form->addElement(new XoopsFormText(_MD_TDMPICTURE_SIZE, 'file_size', 10, 11, $this->getVar('file_size'))); -$form->addElement(new XoopsFormText(_AM_TDMPICTURE_WITH, 'file_res_x', 10, 11, $this->getVar('file_res_x'))); +$form->addElement(new XoopsFormText(_MD_TDMPICTURE_WIDTH, 'file_res_x', 10, 11, $this->getVar('file_res_x'))); -$form->addElement(new XoopsFormText(_AM_TDMPICTURE_HEIGHT, 'file_res_y', 10, 11, $this->getVar('file_res_y'))); +$form->addElement(new XoopsFormText(_MD_TDMPICTURE_HEIGHT, 'file_res_y', 10, 11, $this->getVar('file_res_y'))); //display if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) { - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); }else { $gperm_handler =& xoops_gethandler('groupperm'); @@ -151,7 +150,7 @@ $arr = $cat_handler->getall($criteriaUser); $mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid'); - $form->addElement(new XoopsFormLabel(_AM_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true); + $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true); // @@ -160,7 +159,7 @@ if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) { - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); }else { $gperm_handler =& xoops_gethandler('groupperm'); @@ -174,7 +173,7 @@ if ($gperm_handler->checkRight('tdmpicture_view', 16, $groups, $xoopsModule->getVar('mid'))) { $form->addElement(new XoopsFormHidden('file_display', 1)); }else { - $form->insertBreak('<div align="center">'._AM_TDMPICTURE_UPLOAD_LIMIT.'</div>', 'odd'); + $form->insertBreak('<div align="center">'._MD_TDMPICTURE_UPLOAD_LIMIT.'</div>', 'odd'); $form->addElement(new XoopsFormHidden('file_display', 0)); } } @@ -198,7 +197,7 @@ //</script>'; //note -$form->insertBreak('<div align="center">'._AM_TDMPICTURE_UPLOAD_DESC.'</div>', 'odd'); +$form->insertBreak('<div align="center">'._MD_TDMPICTURE_UPLOAD_DESC.'</div>', 'odd'); //$form->insertBreak(' @@ -237,7 +236,7 @@ //pour multi upload $form->addElement(new XoopsFormHidden('MAX_FILE_SIZE', $xoopsModuleConfig['tdmpicture_mimemax'])); -$fileseltray= new XoopsFormElementTray(_AM_TDMPICTURE_UPLOAD,'<br />'); +$fileseltray= new XoopsFormElementTray(_MD_TDMPICTURE_UPLOAD,'<br />'); $fileseltray->addElement(new XoopsFormLabel('<div id="tdmfiletext" maxlength="'.$xoopsModuleConfig["tdmpicture_upmax"].'"> <b>'.sprintf(_MD_TDMPICTURE_MULTIUPLOAD, $xoopsModuleConfig["tdmpicture_upmax"]).'</b><br /> @@ -274,14 +273,14 @@ if ($action === false) { $action = $_SERVER['REQUEST_URI']; } - $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT); + $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT); include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); $form = new XoopsThemeForm($title, 'form', $action, 'post', true); $form->setExtra('enctype="multipart/form-data" onsubmit="return checkCoords();"'); - //$form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title'))); + //$form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title'))); if (!$this->isNew()) { //Load groups $form->addElement(new XoopsFormHidden('id', $this->getVar('cat_id'))); @@ -331,8 +330,8 @@ <br />'; - $form->insertBreak('<div align="center">'._AM_TDMPICTURE_NEWTHUMB.'</div>', 'odd'); -$img = new XoopsFormElementTray(_AM_TDMPICTURE_RECAD,''); + $form->insertBreak('<div align="center">'._MD_TDMPICTURE_NEWTHUMB.'</div>', 'odd'); +$img = new XoopsFormElementTray(_MD_TDMPICTURE_RECAD,''); $img->addElement(new XoopsFormText('X1', 'x', 4, 4, '')); $img->addElement(new XoopsFormText('Y1', 'y', 4, 4, '')); $img->addElement(new XoopsFormText('X2', 'x2', 4, 4, '')); @@ -343,7 +342,7 @@ //visible if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) { - $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); + $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO)); }else { $gperm_handler =& xoops_gethandler('groupperm'); Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-07 14:10:39 UTC (rev 9793) +++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-07 14:11:46 UTC (rev 9794) @@ -68,11 +68,11 @@ //$cat_link = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris ); $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit; //recherche image - $imgpath = TDM_CAT_PATH .'/'. $this->_tree[$key]['obj']->getVar('cat_img'); + $imgpath = TDM_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img'); if (file_exists($imgpath) && $this->_tree[$key]['obj']->getVar('cat_img') != "blank.gif") { - $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . '/'. $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; + $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; } else { - $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . '/no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; + $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>'; } //echo $selected; Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,61 @@ +************************************************************ +Version 1.06 | 30-June-2012 +Dev: Xoops 2.0.16 / 2.2.3 +************************************************************ +- 2012-06-30 : more Admin GUI standardization (mamba) +- 2012-06-30 : adding /docs folder (mamba) +- 2012-06-30 : fixing English translations (mamba) +- 2012-06-30 : updating icon URL links to ModuleAdmin (mamba) +- 2012-06-30 : adding admin_footer.php (mamba) +- 2012-06-30 : adding Help file (mamba) +- 2012-06-29 : Conversion to XOOPS 2.5.x Admin GUI (Venom) +************************************************************ +Version 1.05 | 12-AVR-2010 +Dev: 2.4.4 +************************************************************ +- 12/04/10 : modifier permission bug +- 11/12/10 : multiupload +************************************************************ +Version 1.04 | 31-MAR-2010 +Dev: 2.4.4 +************************************************************ +- 31/03/10 : modifier xoops_version.php bug affichage +************************************************************ +Version 1.03 | 14-MAR-2010 +Dev: 2.4.2 +************************************************************ +- 14/03/10 : modifier all ajout multi upload +- 14/03/10 : modifier tdmpicture.css changement dans le theme +- 14/03/10 : modifier xoops_version ajout d'option. +- 14/03/10 : modifier jquery mode noConflict +- 14/03/10 : modifier search.inc.php bug info user +- 14/03/10 : modifier rss.php, bug IE. +- 14/03/10 : modifier viewcat style d'affichage cat\xE9gorie. +************************************************************ +Version 1.02 | 17-NOV-2009 +Dev: Xoops 2.4.2 +************************************************************ +- 21/12/09 : modifier xoops_version.php bug +- 21/12/09 : modifier all.php bug xoops 2.4 +- 21/12/09 : modifier all.html ajout de variable smarty +************************************************************ +Version 1.01 | 17-NOV-2009 +Dev: Xoops 2.0.16 / 2.2.3 +************************************************************ +- 17/11/09 : modifier admin/index.php ajout permission dossier upload +- 17/11/09 : modifier tdmpicture.css changement dans le theme +- 17/11/09 : modifier tpfile.html, viewfile.html changement dans le template +- 17/11/09 : modifier viewfile.php, functions.php bug de redimention +- 17/11/09 : modifier include.php jquery bug alert +- 18/11/09 : modifier xoops_version.php, tpcat.html, index.php, viewcat.php redimension image cat\xE9gories. +- 18/11/09 : modifier meta automatique +************************************************************ +Version 1.00 | 03-OCT-2009 +Dev: Xoops 2.0.16 / 2.2.3 +************************************************************ +- 10/10/09 : Ajout de l'anglais +- 10/10/09 : Suppression du .htaccess bug +************************************************************ + + + Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,4 @@ +Credits +=============== +Author: TDM + Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,19 @@ +LANGUAGE DIFFERENCES +===================== + +Below are language differences from a version to next version. + +Version 1.06 +---------------- + +main.php +---------- +define("_MD_TDMPICTURE_NBFILE","# of Pictures"); +define("_MD_TDMPICTURE_MEGABYTES"," MB"); +define("_MD_TDMPICTURE_KILOBYTES"," KB"); + +admin.php +---------- +define("_AM_TDMPICTURE_DELETE_SELECTED", "Delete Selected"); +define("_AM_TDMPICTURE_BUTTON_CAT_WAITING", "Categories to Approve: "); +define("_AM_TDMPICTURE_BUTTON_FILES_WAITING", "Files to Approve: "); \ No newline at end of file Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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. + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,21 @@ +************************************************** ********** +TDMPicture +Version 1.06 | 2012-06-30 +************************************************** ********** + +************************************************** ********** +UPDATE +************************************************** ********** + +- Overwrite the file TDMPicture, to update the module from the site administration. +- When using a custom template set, remove the module's templates for regeneration. +- Appointments in the administration module to create permissions. + + +************************************************** ********** +INSTALLATION +************************************************** ********** + +- Upload the entire folder 'TDMPicture' folder to / modules / +- Go to Admin of your site to install the module. +- Set permissions. \ No newline at end of file Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt =================================================================== --- XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt (rev 0) +++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt 2012-07-07 14:11:46 UTC (rev 9794) @@ -0,0 +1,21 @@ +************************************************************ +TDMPicture +Version 1.06 | 2012-06-30 +************************************************************ + +************************************************************ +MISE A JOUR +************************************************************ + +- Ecraser le dossier TDMPicture, mettre jour le module depuis l'administration du site. +- En cas d'utilisation d'un jeu de templates personnalis�, supprimer les templates du module pour les reg�n�rer. +- Rendez-vous dans l'administration du module pour cr�er les permissions. + + +***********************************... [truncated message content] |