Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-06-30 20:09:24
|
Revision: 9752
http://xoops.svn.sourceforge.net/xoops/?rev=9752&view=rev
Author: beckmi
Date: 2012-06-30 20:09:17 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
- converting to dynamic Editor selection
- Updating to 1.71 Final
Modified Paths:
--------------
XoopsModules/boox/trunk/boox/admin/admin_footer.php
XoopsModules/boox/trunk/boox/docs/changelog.txt
XoopsModules/boox/trunk/boox/language/english/modinfo.php
XoopsModules/boox/trunk/boox/language/englishUTF8/modinfo.php
XoopsModules/boox/trunk/boox/language/french/modinfo.php
XoopsModules/boox/trunk/boox/language/frenchUTF8/modinfo.php
XoopsModules/boox/trunk/boox/language/portuguesebr/modinfo.php
XoopsModules/boox/trunk/boox/xoops_version.php
Modified: XoopsModules/boox/trunk/boox/admin/admin_footer.php
===================================================================
--- XoopsModules/boox/trunk/boox/admin/admin_footer.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/admin/admin_footer.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -24,7 +24,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <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>";
Modified: XoopsModules/boox/trunk/boox/docs/changelog.txt
===================================================================
--- XoopsModules/boox/trunk/boox/docs/changelog.txt 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/docs/changelog.txt 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,7 +1,8 @@
============================
-Version 1.71 2011/04/02:
+Version 1.71 2011/06/30:
============================
- Conversion to XOOPS 2.5.0 GUI (mamba)
+- converting to dynamic Editor selection
============================
Version 1.70 2011/12/12:
Modified: XoopsModules/boox/trunk/boox/language/english/modinfo.php
===================================================================
--- XoopsModules/boox/trunk/boox/language/english/modinfo.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/language/english/modinfo.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,42 +1,36 @@
-<?php
-/**
- * ****************************************************************************
- * boox - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package boox
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-define('_MI_BOOX_NAME',"boox");
-define('_MI_BOOX_DESC',"Create blocks out of Xoops");
-define('_MI_BOOX_OPT0',"Select the place where you want to store your files");
-define('_MI_BOOX_OPT0_DSC',"Every file you will create will be stored in this place.");
-define("_MI_BOOX_FORM_OPTIONS","Form Option");
-define("_MI_BOOX_FORM_COMPACT","Compact");
-define("_MI_BOOX_FORM_DHTML","DHTML");
-define("_MI_BOOX_FORM_SPAW","Spaw Editor");
-define("_MI_BOOX_FORM_HTMLAREA","HtmlArea Editor");
-define("_MI_BOOX_FORM_FCK","FCK Editor");
-define("_MI_BOOX_FORM_KOIVI","Koivi Editor");
-define("_MI_BOOX_FORM_TINYEDITOR","TinyEditor");
-// Added in version 1.1
-define('_MI_BOOX_OPT1',"Trim content before to save ?");
-define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
-//1.71
-
-define('_MI_BOOX_MENU_00',"Home");
-define('_MI_BOOX_MENU_01',"Boox Manager");
+<?php
+/**
+ * ****************************************************************************
+ * boox - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package boox
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+define('_MI_BOOX_NAME',"boox");
+define('_MI_BOOX_DESC',"Create blocks out of Xoops");
+define('_MI_BOOX_OPT0',"Select the place where you want to store your files");
+define('_MI_BOOX_OPT0_DSC',"Every file you will create will be stored in this place.");
+define("_MI_BOOX_FORM_OPTIONS","Form Option");
+define("_MI_BOOX_FORM_COMPACT","Compact");
+// Added in version 1.1
+define('_MI_BOOX_OPT1',"Trim content before to save ?");
+define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
+//1.71
+
+define('_MI_BOOX_MENU_00',"Home");
+define('_MI_BOOX_MENU_01',"Boox Manager");
define('_MI_BOOX_ADMIN_ABOUT',"About");
\ No newline at end of file
Modified: XoopsModules/boox/trunk/boox/language/englishUTF8/modinfo.php
===================================================================
--- XoopsModules/boox/trunk/boox/language/englishUTF8/modinfo.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/language/englishUTF8/modinfo.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,43 +1,38 @@
-<?php
-/**
- * ****************************************************************************
- * boox - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package boox
- * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-define('_MI_BOOX_NAME',"boox");
-define('_MI_BOOX_DESC',"Create blocks out of Xoops");
-define('_MI_BOOX_OPT0',"Select the place where you want to store your files");
-define('_MI_BOOX_OPT0_DSC',"Every file you will create will be stored in this place.");
-define("_MI_BOOX_FORM_OPTIONS","Form Option");
-define("_MI_BOOX_FORM_COMPACT","Compact");
-define("_MI_BOOX_FORM_DHTML","DHTML");
-define("_MI_BOOX_FORM_SPAW","Spaw Editor");
-define("_MI_BOOX_FORM_HTMLAREA","HtmlArea Editor");
-define("_MI_BOOX_FORM_FCK","FCK Editor");
-define("_MI_BOOX_FORM_KOIVI","Koivi Editor");
-define("_MI_BOOX_FORM_TINYEDITOR","TinyEditor");
-// Added in version 1.1
-define('_MI_BOOX_OPT1',"Trim content before to save ?");
-define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
-
-//1.71
-
-define('_MI_BOOX_MENU_00',"Home");
-define('_MI_BOOX_MENU_01',"Boox Manager");
+<?php
+/**
+ * ****************************************************************************
+ * boox - MODULE FOR XOOPS
+ * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ *
+ * 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 Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package boox
+ * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+define('_MI_BOOX_NAME',"boox");
+define('_MI_BOOX_DESC',"Create blocks out of Xoops");
+define('_MI_BOOX_OPT0',"Select the place where you want to store your files");
+define('_MI_BOOX_OPT0_DSC',"Every file you will create will be stored in this place.");
+define("_MI_BOOX_FORM_OPTIONS","Form Option");
+define("_MI_BOOX_FORM_COMPACT","Compact");
+
+// Added in version 1.1
+define('_MI_BOOX_OPT1',"Trim content before to save ?");
+define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
+
+//1.71
+
+define('_MI_BOOX_MENU_00',"Home");
+define('_MI_BOOX_MENU_01',"Boox Manager");
define('_MI_BOOX_ADMIN_ABOUT',"About");
\ No newline at end of file
Modified: XoopsModules/boox/trunk/boox/language/french/modinfo.php
===================================================================
--- XoopsModules/boox/trunk/boox/language/french/modinfo.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/language/french/modinfo.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,43 +1,38 @@
-<?php
-/**
- * ****************************************************************************
- * boox - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package boox
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-define('_MI_BOOX_NAME',"boox");
-define('_MI_BOOX_DESC',"Cr\xE9er des blocs en dehors de Xoops");
-define('_MI_BOOX_OPT0',"Choisissez l'emplacement o\xF9 sauvegarder les fichiers");
-define('_MI_BOOX_OPT0_DSC',"Chaque fichier cr\xE9e sera enregistr\xE9 \xE0 cet endroit.");
-define("_MI_BOOX_FORM_OPTIONS","Option d'\xE9diteur");
-define("_MI_BOOX_FORM_COMPACT","Compact");
-define("_MI_BOOX_FORM_DHTML","DHTML");
-define("_MI_BOOX_FORM_SPAW","Spaw Editor");
-define("_MI_BOOX_FORM_HTMLAREA","HtmlArea Editor");
-define("_MI_BOOX_FORM_FCK","FCK Editor");
-define("_MI_BOOX_FORM_KOIVI","Koivi Editor");
-define("_MI_BOOX_FORM_TINYEDITOR","TinyEditor");
-// Added in version 1.1
-define('_MI_BOOX_OPT1',"Supprimer les espaces inutiles avant de sauvegarder ?");
-define('_MI_BOOX_OP1_DSC',"Les espaces de d\xE9but et de fin seront supprim\xE9s avant la sauvegarde des fichiers");
-
-//1.71
-
-define('_MI_BOOX_MENU_00',"Home");
-define('_MI_BOOX_MENU_01',"Boox Manager");
+<?php
+/**
+ * ****************************************************************************
+ * boox - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package boox
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+define('_MI_BOOX_NAME',"boox");
+define('_MI_BOOX_DESC',"Cr\xE9er des blocs en dehors de Xoops");
+define('_MI_BOOX_OPT0',"Choisissez l'emplacement o\xF9 sauvegarder les fichiers");
+define('_MI_BOOX_OPT0_DSC',"Chaque fichier cr\xE9e sera enregistr\xE9 \xE0 cet endroit.");
+define("_MI_BOOX_FORM_OPTIONS","Option d'\xE9diteur");
+define("_MI_BOOX_FORM_COMPACT","Compact");
+
+// Added in version 1.1
+define('_MI_BOOX_OPT1',"Supprimer les espaces inutiles avant de sauvegarder ?");
+define('_MI_BOOX_OP1_DSC',"Les espaces de d\xE9but et de fin seront supprim\xE9s avant la sauvegarde des fichiers");
+
+//1.71
+
+define('_MI_BOOX_MENU_00',"Home");
+define('_MI_BOOX_MENU_01',"Boox Manager");
define('_MI_BOOX_ADMIN_ABOUT',"About");
\ No newline at end of file
Modified: XoopsModules/boox/trunk/boox/language/frenchUTF8/modinfo.php
===================================================================
--- XoopsModules/boox/trunk/boox/language/frenchUTF8/modinfo.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/language/frenchUTF8/modinfo.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,43 +1,38 @@
-<?php
-/**
- * ****************************************************************************
- * boox - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package boox
- * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-define('_MI_BOOX_NAME',"boox");
-define('_MI_BOOX_DESC',"Créer des blocs en dehors de Xoops");
-define('_MI_BOOX_OPT0',"Choisissez l'emplacement où sauvegarder les fichiers");
-define('_MI_BOOX_OPT0_DSC',"Chaque fichier crée sera enregistré à cet endroit.");
-define("_MI_BOOX_FORM_OPTIONS","Option d'éditeur");
-define("_MI_BOOX_FORM_COMPACT","Compact");
-define("_MI_BOOX_FORM_DHTML","DHTML");
-define("_MI_BOOX_FORM_SPAW","Spaw Editor");
-define("_MI_BOOX_FORM_HTMLAREA","HtmlArea Editor");
-define("_MI_BOOX_FORM_FCK","FCK Editor");
-define("_MI_BOOX_FORM_KOIVI","Koivi Editor");
-define("_MI_BOOX_FORM_TINYEDITOR","TinyEditor");
-// Added in version 1.1
-define('_MI_BOOX_OPT1',"Supprimer les espaces inutiles avant de sauvegarder ?");
-define('_MI_BOOX_OP1_DSC',"Les espaces de début et de fin seront supprimés avant la sauvegarde des fichiers");
-
-//1.71
-
-define('_MI_BOOX_MENU_00',"Home");
-define('_MI_BOOX_MENU_01',"Boox Manager");
+<?php
+/**
+ * ****************************************************************************
+ * boox - MODULE FOR XOOPS
+ * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ *
+ * 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 Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package boox
+ * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+define('_MI_BOOX_NAME',"boox");
+define('_MI_BOOX_DESC',"Créer des blocs en dehors de Xoops");
+define('_MI_BOOX_OPT0',"Choisissez l'emplacement où sauvegarder les fichiers");
+define('_MI_BOOX_OPT0_DSC',"Chaque fichier crée sera enregistré à cet endroit.");
+define("_MI_BOOX_FORM_OPTIONS","Option d'éditeur");
+define("_MI_BOOX_FORM_COMPACT","Compact");
+
+// Added in version 1.1
+define('_MI_BOOX_OPT1',"Supprimer les espaces inutiles avant de sauvegarder ?");
+define('_MI_BOOX_OP1_DSC',"Les espaces de début et de fin seront supprimés avant la sauvegarde des fichiers");
+
+//1.71
+
+define('_MI_BOOX_MENU_00',"Home");
+define('_MI_BOOX_MENU_01',"Boox Manager");
define('_MI_BOOX_ADMIN_ABOUT',"About");
\ No newline at end of file
Modified: XoopsModules/boox/trunk/boox/language/portuguesebr/modinfo.php
===================================================================
--- XoopsModules/boox/trunk/boox/language/portuguesebr/modinfo.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/language/portuguesebr/modinfo.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,29 +1,24 @@
-<?php
-/**
- * ****************************************************************************
- * BOOX - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * ****************************************************************************
- */
-
-define('_MI_BOOX_NAME',"boox");
-define('_MI_BOOX_DESC',"Cria blocos externos ao XOOPS");
-define('_MI_BOOX_OPT0',"Selecione o local onde quer armazenar seus arquivos");
-define('_MI_BOOX_OPT0_DSC',"Todo e qualquer arquivo que voc\xEA criar ser\xE1 armazendo neste local.");
-define("_MI_BOOX_FORM_OPTIONS","Formul\xE1rio: Op\xE7\xF5es");
-define("_MI_BOOX_FORM_COMPACT","Compacto");
-define("_MI_BOOX_FORM_DHTML","DHTML");
-define("_MI_BOOX_FORM_SPAW","Spaw Editor");
-define("_MI_BOOX_FORM_HTMLAREA","HtmlArea Editor");
-define("_MI_BOOX_FORM_FCK","FCK Editor");
-define("_MI_BOOX_FORM_KOIVI","Koivi Editor");
-define("_MI_BOOX_FORM_TINYEDITOR","TinyEditor");
-// Added in version 1.1
-define('_MI_BOOX_OPT1',"Trim content before to save ?");
-define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
-
-//1.71
-
-define('_MI_BOOX_MENU_00',"Home");
-define('_MI_BOOX_MENU_01',"Boox Manager");
-define('_MI_BOOX_ADMIN_ABOUT',"About");
+<?php
+/**
+ * ****************************************************************************
+ * BOOX - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * ****************************************************************************
+ */
+
+define('_MI_BOOX_NAME',"boox");
+define('_MI_BOOX_DESC',"Cria blocos externos ao XOOPS");
+define('_MI_BOOX_OPT0',"Selecione o local onde quer armazenar seus arquivos");
+define('_MI_BOOX_OPT0_DSC',"Todo e qualquer arquivo que voc\xEA criar ser\xE1 armazendo neste local.");
+define("_MI_BOOX_FORM_OPTIONS","Formul\xE1rio: Op\xE7\xF5es");
+define("_MI_BOOX_FORM_COMPACT","Compacto");
+
+// Added in version 1.1
+define('_MI_BOOX_OPT1',"Trim content before to save ?");
+define('_MI_BOOX_OPT1_DSC',"Spaces will be removed before the file is saved");
+
+//1.71
+
+define('_MI_BOOX_MENU_00',"Home");
+define('_MI_BOOX_MENU_01',"Boox Manager");
+define('_MI_BOOX_ADMIN_ABOUT',"About");
Modified: XoopsModules/boox/trunk/boox/xoops_version.php
===================================================================
--- XoopsModules/boox/trunk/boox/xoops_version.php 2012-06-30 18:54:47 UTC (rev 9751)
+++ XoopsModules/boox/trunk/boox/xoops_version.php 2012-06-30 20:09:17 UTC (rev 9752)
@@ -1,120 +1,120 @@
-<?php
-/**
- * ****************************************************************************
- * boox - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Hervé Thouzard (http://www.herve-thouzard.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package boox
- * @author Hervé Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-if (!defined('XOOPS_ROOT_PATH')) {
- die("XOOPS root path not defined");
-}
-
-$modversion['name'] = _MI_BOOX_NAME;
-$modversion['version'] = 1.71;
-$modversion['description'] = _MI_BOOX_DESC;
-$modversion['credits'] = 'wilson';
-$modversion['author'] = 'Hervé Thouzard (http://www.herve-thouzard.com)';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['help'] = 'page=help';
-$modversion['official'] = 0;
-$modversion['image'] = 'images/boox_logo.png';
-$modversion['dirname'] = 'boox';
-
-$modversion['official'] = 0;
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
-
-//about
-$modversion["demo_site_url"] = '';
-$modversion["demo_site_name"] = '';
-$modversion["module_website_url"] = 'http://xoops.org';
-$modversion["module_website_name"] = 'XOOPS';
-$modversion["release"] = '0';
-$modversion["module_status"] = 'RC2';
-$modversion['release_date'] = '2012/04/02';
-$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = '2.5.0';
-$modversion['min_admin']='1.1';
-//$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-
-$modversion['sqlfile']['mysql'] = '';
-
-
-// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = 'admin/index.php';
-$modversion['adminmenu'] = 'admin/menu.php';
-$modversion['system_menu'] = 1;
-
-// Templates
-
-// Blocks
-
-// Menu
-$modversion['hasMain'] = 0;
-
-// Search
-$modversion['hasSearch'] = 0;
-
-// Comments
-$modversion['hasComments'] = 0;
-
-
-/**
- * Where do you want to save your files ?
- */
-$i=0;
-$modversion['config'][$i]['name'] = 'foldertosave';
-$modversion['config'][$i]['title'] = '_MI_BOOX_OPT0';
-$modversion['config'][$i]['description'] = '_MI_BOOX_OPT0_DSC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = XOOPS_UPLOAD_PATH;
-
-/**
- * Which editor to use ?
- */
-$i++;
-$modversion['config'][$i]['name'] = 'form_options';
-$modversion['config'][$i]['title'] = "_MI_BOOX_FORM_OPTIONS";
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtml';
-xoops_load('xoopseditorhandler');
-$editor_handler = XoopsEditorHandler::getInstance();
-$modversion['config'][$i]['options'] = array_flip($editor_handler->getList());
-
-
-/**
- * Trim file's content before to save it ?
- */
-$i++;
-$modversion['config'][$i]['name'] = 'trimcontent';
-$modversion['config'][$i]['title'] = '_MI_BOOX_OPT1';
-$modversion['config'][$i]['description'] = '_MI_BOOX_OP1_DSC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
-
-
-// Notifications
-$modversion['hasNotification'] = 0;
+<?php
+/**
+ * ****************************************************************************
+ * boox - MODULE FOR XOOPS
+ * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Hervé Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package boox
+ * @author Hervé Thouzard (http://www.herve-thouzard.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ die("XOOPS root path not defined");
+}
+
+$modversion['name'] = _MI_BOOX_NAME;
+$modversion['version'] = 1.71;
+$modversion['description'] = _MI_BOOX_DESC;
+$modversion['credits'] = 'wilson';
+$modversion['author'] = 'Hervé Thouzard (http://www.herve-thouzard.com)';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['help'] = 'page=help';
+$modversion['official'] = 0;
+$modversion['image'] = 'images/boox_logo.png';
+$modversion['dirname'] = 'boox';
+
+$modversion['official'] = 0;
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+
+//about
+$modversion["demo_site_url"] = '';
+$modversion["demo_site_name"] = '';
+$modversion["module_website_url"] = 'http://xoops.org';
+$modversion["module_website_name"] = 'XOOPS';
+$modversion["release"] = '0';
+$modversion["module_status"] = 'Final';
+$modversion['release_date'] = '2012/06/27';
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = '2.5.0';
+$modversion['min_admin']='1.1';
+//$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+
+$modversion['sqlfile']['mysql'] = '';
+
+
+// Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = 'admin/index.php';
+$modversion['adminmenu'] = 'admin/menu.php';
+$modversion['system_menu'] = 1;
+
+// Templates
+
+// Blocks
+
+// Menu
+$modversion['hasMain'] = 0;
+
+// Search
+$modversion['hasSearch'] = 0;
+
+// Comments
+$modversion['hasComments'] = 0;
+
+
+/**
+ * Where do you want to save your files ?
+ */
+$i=0;
+$modversion['config'][$i]['name'] = 'foldertosave';
+$modversion['config'][$i]['title'] = '_MI_BOOX_OPT0';
+$modversion['config'][$i]['description'] = '_MI_BOOX_OPT0_DSC';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = XOOPS_UPLOAD_PATH;
+
+/**
+ * Which editor to use ?
+ */
+$i++;
+$modversion['config'][$i]['name'] = 'form_options';
+$modversion['config'][$i]['title'] = "_MI_BOOX_FORM_OPTIONS";
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'dhtml';
+xoops_load('xoopseditorhandler');
+$editor_handler = XoopsEditorHandler::getInstance();
+$modversion['config'][$i]['options'] = array_flip($editor_handler->getList());
+
+
+/**
+ * Trim file's content before to save it ?
+ */
+$i++;
+$modversion['config'][$i]['name'] = 'trimcontent';
+$modversion['config'][$i]['title'] = '_MI_BOOX_OPT1';
+$modversion['config'][$i]['description'] = '_MI_BOOX_OP1_DSC';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+
+
+// Notifications
+$modversion['hasNotification'] = 0;
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-30 18:54:56
|
Revision: 9751
http://xoops.svn.sourceforge.net/xoops/?rev=9751&view=rev
Author: beckmi
Date: 2012-06-30 18:54:47 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
- more Admin GUI standardization
- adding /docs folder
- fixing English translations
- updating icon URL links to ModuleAdmin
- adding admin_footer.php
- adding Help file
Modified Paths:
--------------
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/about.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_header.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/cat.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/files.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/menu.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/permissions.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_cat.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tree.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/include/functions.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/admin.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/main.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/search.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/submit.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_footer.php
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/changelog.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/credits.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/index.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/lang_diff.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/licence.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/readme.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/readme_fr.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/images/picture_edit.png
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/help/
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/help/help.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/help/index.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/french/help/
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/french/help/help.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/french/help/index.html
XoopsModules/TDMPicture/branches/mamba/TDMPicture/upload/cat/no_picture.png
Removed Paths:
-------------
XoopsModules/TDMPicture/branches/mamba/TDMPicture/changelog.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/images/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/images/colorbox/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/images/colorbox/internet_explorer/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/images/decos/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/language/english/changelog.txt
XoopsModules/TDMPicture/branches/mamba/TDMPicture/upload/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/upload/cat/Thumbs.db
XoopsModules/TDMPicture/branches/mamba/TDMPicture/upload/thumb/Thumbs.db
Modified: XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/about.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/about.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/about.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_footer.php (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_footer.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -0,0 +1,6 @@
+<?php
+echo"<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/branches/mamba/TDMPicture/admin/admin_header.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_header.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/admin_header.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/cat.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/cat.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -164,8 +164,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 +225,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,8 +243,8 @@
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>';
}
@@ -269,5 +271,4 @@
break;
}
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/files.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/files.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/admin/menu.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/menu.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/menu.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/admin/permissions.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/permissions.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/admin/permissions.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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
Deleted: XoopsModules/TDMPicture/branches/mamba/TDMPicture/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/changelog.txt 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/changelog.txt 2012-06-30 18:54:47 UTC (rev 9751)
@@ -1,47 +0,0 @@
-************************************************************
-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
-************************************************************
-************************************************************
-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.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.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.04 | 31-MAR-2010
-Dev: 2.4.4
-************************************************************
-- 31/03/10 : modifier xoops_version.php bug affichage
-************************************************************
-Version 1.05 | 12-AVR-2010
-Dev: 2.4.4
-************************************************************
-- 12/04/10 : modifier permission bug
-- 11/12/10 : multiupload
\ No newline at end of file
Modified: XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_cat.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_cat.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_cat.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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,13 @@
//
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));
}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/branches/mamba/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_file.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tdmpicture_file.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tree.php 2012-06-30 18:49:27 UTC (rev 9750)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/class/tree.php 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/docs/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/changelog.txt 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/docs/credits.txt
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/credits.txt (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/credits.txt 2012-06-30 18:54:47 UTC (rev 9751)
@@ -0,0 +1,4 @@
+Credits
+===============
+Author: TDM
+
Added: XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/index.html
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/index.html (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/index.html 2012-06-30 18:54:47 UTC (rev 9751)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/lang_diff.txt
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/lang_diff.txt (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/lang_diff.txt 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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/branches/mamba/TDMPicture/docs/licence.txt
===================================================================
--- XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/licence.txt (rev 0)
+++ XoopsModules/TDMPicture/branches/mamba/TDMPicture/docs/licence.txt 2012-06-30 18:54:47 UTC (rev 9751)
@@ -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)...
[truncated message content] |
|
From: <be...@us...> - 2012-06-30 18:49:32
|
Revision: 9750
http://xoops.svn.sourceforge.net/xoops/?rev=9750&view=rev
Author: beckmi
Date: 2012-06-30 18:49:27 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Adding TDMPicture to /mamba branch
Added Paths:
-----------
XoopsModules/TDMPicture/branches/mamba/TDMPicture/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-30 18:46:24
|
Revision: 9749
http://xoops.svn.sourceforge.net/xoops/?rev=9749&view=rev
Author: beckmi
Date: 2012-06-30 18:46:18 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Creating /mamba branch
Added Paths:
-----------
XoopsModules/TDMPicture/branches/mamba/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-30 18:41:43
|
Revision: 9748
http://xoops.svn.sourceforge.net/xoops/?rev=9748&view=rev
Author: beckmi
Date: 2012-06-30 18:41:37 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Removing thumbs.db files
Removed Paths:
-------------
XoopsModules/TDMPicture/trunk/TDMPicture/images/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
XoopsModules/TDMPicture/trunk/TDMPicture/upload/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/upload/thumb/Thumbs.db
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-30 15:41:52 UTC (rev 9747)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-30 18:41:37 UTC (rev 9748)
@@ -1,47 +0,0 @@
-************************************************************
-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
-************************************************************
-************************************************************
-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.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.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.04 | 31-MAR-2010
-Dev: 2.4.4
-************************************************************
-- 31/03/10 : modifier xoops_version.php bug affichage
-************************************************************
-Version 1.05 | 12-AVR-2010
-Dev: 2.4.4
-************************************************************
-- 12/04/10 : modifier permission bug
-- 11/12/10 : multiupload
\ No newline at end of file
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/thumb/Thumbs.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 15:41:58
|
Revision: 9747
http://xoops.svn.sourceforge.net/xoops/?rev=9747&view=rev
Author: txmodxoops
Date: 2012-06-30 15:41:52 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Changed language config in _LANGCODE
Modified Paths:
--------------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
Modified: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 14:57:00 UTC (rev 9746)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 15:41:52 UTC (rev 9747)
@@ -62,7 +62,7 @@
$(function() {
$.datepicker.setDefaults( $.datepicker.regional[ "en" ] );
$( ".datepicker" ).datepicker(
- $.datepicker.regional[ "'.$GLOBALS["xoopsConfig"]["language"].'" ] = {
+ $.datepicker.regional[ "'._LANGCODE.'" ] = {
clearText: 'Clear',
clearStatus: '',
closeText: \''._CLOSE.'\',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 14:57:06
|
Revision: 9746
http://xoops.svn.sourceforge.net/xoops/?rev=9746&view=rev
Author: txmodxoops
Date: 2012-06-30 14:57:00 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
Modified: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 14:11:08 UTC (rev 9745)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 14:57:00 UTC (rev 9746)
@@ -65,7 +65,7 @@
$.datepicker.regional[ "'.$GLOBALS["xoopsConfig"]["language"].'" ] = {
clearText: 'Clear',
clearStatus: '',
- closeText: 'Close',
+ closeText: \''._CLOSE.'\',
closeStatus: 'Close without modify',
prevText: \''._CAL_PREVYR.'\',
prevStatus: \''._CAL_PREVMNTH.'\',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 14:11:14
|
Revision: 9745
http://xoops.svn.sourceforge.net/xoops/?rev=9745&view=rev
Author: txmodxoops
Date: 2012-06-30 14:11:08 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Added more defines traslation
Added Paths:
-----------
XoopsCore/tags/2.6 timgno/htdocs/language/italian/
XoopsCore/tags/2.6 timgno/htdocs/language/italian/calendar.php
Added: XoopsCore/tags/2.6 timgno/htdocs/language/italian/calendar.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/language/italian/calendar.php (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/language/italian/calendar.php 2012-06-30 14:11:08 UTC (rev 9745)
@@ -0,0 +1,77 @@
+<?php
+// $Id: calendar.php 4856 2010-06-16 02:20:10Z phppp $
+// _LANGCODE: it
+// _CHARSET : UTF-8
+// Translator: Xoops Italia Team - www.xoopsitalia.org
+// Last translation update: 08/03/2011
+// more examples: http://php.net/manual/en/function.date.php
+//
+// Revision by TXMod Xoops - Added shot text: 30/06/2012
+//
+//%%%%% Time Zone %%%%
+define("_CAL_FORMAT","d-m-Y");
+//%%%%% JQuery Calendar Time Zone %%%%
+define("_CAL_JQUERY_FORMAT","dd/mm/yy");
+// Week Mini Text
+define("_CAL_MIN_SUNDAY", "Do");
+define("_CAL_MIN_MONDAY", "Lu");
+define("_CAL_MIN_TUESDAY", "Ma");
+define("_CAL_MIN_WEDNESDAY", "Me");
+define("_CAL_MIN_THURSDAY", "Gi");
+define("_CAL_MIN_FRIDAY", "Ve");
+define("_CAL_MIN_SATURDAY", "Sa");
+// Week Short Text
+define("_CAL_SHORT_SUNDAY", "Dom");
+define("_CAL_SHORT_MONDAY", "Lun");
+define("_CAL_SHORT_TUESDAY", "Mar");
+define("_CAL_SHORT_WEDNESDAY", "Mer");
+define("_CAL_SHORT_THURSDAY", "Gio");
+define("_CAL_SHORT_FRIDAY", "Ven");
+define("_CAL_SHORT_SATURDAY", "Sab");
+// Mounths
+define("_CAL_SHORT_JANUARY", "Gen");
+define("_CAL_SHORT_FEBRUARY", "Feb");
+define("_CAL_SHORT_MARCH", "Mar");
+define("_CAL_SHORT_APRIL", "Apr");
+define("_CAL_SHORT_MAY", "Mag");
+define("_CAL_SHORT_JUNE", "Giu");
+define("_CAL_SHORT_JULY", "Lug");
+define("_CAL_SHORT_AUGUST", "Ago");
+define("_CAL_SHORT_SEPTEMBER", "Set");
+define("_CAL_SHORT_OCTOBER", "Ott");
+define("_CAL_SHORT_NOVEMBER", "Nov");
+define("_CAL_SHORT_DECEMBER", "Dic");
+// Normal Text
+define("_CAL_SUNDAY", "Domenica");
+define("_CAL_MONDAY", "Lunedì");
+define("_CAL_TUESDAY", "Martedì");
+define("_CAL_WEDNESDAY", "Mercoledì");
+define("_CAL_THURSDAY", "Giovedì");
+define("_CAL_FRIDAY", "Venerdì");
+define("_CAL_SATURDAY", "Sabato");
+// Mounths
+define("_CAL_JANUARY", "Gennaio");
+define("_CAL_FEBRUARY", "Febbraio");
+define("_CAL_MARCH", "Marzo");
+define("_CAL_APRIL", "Aprile");
+define("_CAL_MAY", "Maggio");
+define("_CAL_JUNE", "Giugno");
+define("_CAL_JULY", "Luglio");
+define("_CAL_AUGUST", "Agosto");
+define("_CAL_SEPTEMBER", "Settembre");
+define("_CAL_OCTOBER", "Ottobre");
+define("_CAL_NOVEMBER", "Novembre");
+define("_CAL_DECEMBER", "Dicembre");
+// Others
+define("_CAL_TGL1STD", "Cambia il primo giorno della settimana");
+define("_CAL_PREVYR", "Anno precedente (tenere premuto per l'elenco)");
+define("_CAL_PREVMNTH", "Mese precedente (tenere premuto per l'elenco)");
+define("_CAL_GOTODAY", "Seleziona data di oggi");
+define("_CAL_NXTMNTH", "Mese successivo (tenere premuto per l'elenco)");
+define("_CAL_NEXTYR", "Anno successivo (tenere premuto per l'elenco)");
+define("_CAL_SELDATE", "Seleziona data");
+define("_CAL_DRAGMOVE", "Trascina per spostare");
+define("_CAL_TODAY", "Oggi");
+define("_CAL_DISPM1ST", "Lunedi primo giorno settimanale");
+define("_CAL_DISPS1ST", "Domenica primo giorno settimanale");
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 14:10:32
|
Revision: 9744
http://xoops.svn.sourceforge.net/xoops/?rev=9744&view=rev
Author: txmodxoops
Date: 2012-06-30 14:10:25 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Added more defines
Added Paths:
-----------
XoopsCore/tags/2.6 timgno/htdocs/language/english/calendar.php
Added: XoopsCore/tags/2.6 timgno/htdocs/language/english/calendar.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/language/english/calendar.php (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/language/english/calendar.php 2012-06-30 14:10:25 UTC (rev 9744)
@@ -0,0 +1,75 @@
+<?php
+// $Id: calendar.php 8995 2012-02-15 13:21:30Z forxoops $
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+// more examples: http://php.net/manual/en/function.date.php
+//
+// Revision by TXMod Xoops - Added shot text: 30/06/2012
+//
+//%%%%% Time Zone %%%%
+define("_CAL_FORMAT","Y-m-d");
+//%%%%% JQuery Calendar Time Zone %%%%
+define("_CAL_JQUERY_FORMAT","yy/mm/dd");
+// Week Mini Text
+define("_CAL_MIN_SUNDAY", "Su");
+define("_CAL_MIN_MONDAY", "Mo");
+define("_CAL_MIN_TUESDAY", "Tu");
+define("_CAL_MIN_WEDNESDAY", "We");
+define("_CAL_MIN_THURSDAY", "Th");
+define("_CAL_MIN_FRIDAY", "Fr");
+define("_CAL_MIN_SATURDAY", "Sa");
+// Week Short Text
+define("_CAL_SHORT_SUNDAY", "Sun");
+define("_CAL_SHORT_MONDAY", "Mon");
+define("_CAL_SHORT_TUESDAY", "Tue");
+define("_CAL_SHORT_WEDNESDAY", "Wed");
+define("_CAL_SHORT_THURSDAY", "Thu");
+define("_CAL_SHORT_FRIDAY", "Fri");
+define("_CAL_SHORT_SATURDAY", "Sat");
+
+define("_CAL_SHORT_JANUARY", "January");
+define("_CAL_SHORT_FEBRUARY", "February");
+define("_CAL_SHORT_MARCH", "March");
+define("_CAL_SHORT_APRIL", "April");
+define("_CAL_SHORT_MAY", "May");
+define("_CAL_SHORT_JUNE", "June");
+define("_CAL_SHORT_JULY", "July");
+define("_CAL_SHORT_AUGUST", "August");
+define("_CAL_SHORT_SEPTEMBER", "September");
+define("_CAL_SHORT_OCTOBER", "October");
+define("_CAL_SHORT_NOVEMBER", "November");
+define("_CAL_SHORT_DECEMBER", "December");
+// Normal Text
+define("_CAL_SUNDAY", "Sunday");
+define("_CAL_MONDAY", "Monday");
+define("_CAL_TUESDAY", "Tuesday");
+define("_CAL_WEDNESDAY", "Wednesday");
+define("_CAL_THURSDAY", "Thursday");
+define("_CAL_FRIDAY", "Friday");
+define("_CAL_SATURDAY", "Saturday");
+define("_CAL_JANUARY", "January");
+define("_CAL_FEBRUARY", "February");
+define("_CAL_MARCH", "March");
+define("_CAL_APRIL", "April");
+define("_CAL_MAY", "May");
+define("_CAL_JUNE", "June");
+define("_CAL_JULY", "July");
+define("_CAL_AUGUST", "August");
+define("_CAL_SEPTEMBER", "September");
+define("_CAL_OCTOBER", "October");
+define("_CAL_NOVEMBER", "November");
+define("_CAL_DECEMBER", "December");
+// Others
+define("_CAL_TGL1STD", "Toggle first day of week");
+define("_CAL_PREVYR", "Prev. year (hold for menu)");
+define("_CAL_PREVMNTH", "Prev. month (hold for menu)");
+define("_CAL_GOTODAY", "Go Today");
+define("_CAL_NXTMNTH", "Next month (hold for menu)");
+define("_CAL_NEXTYR", "Next year (hold for menu)");
+define("_CAL_SELDATE", "Select date");
+define("_CAL_DRAGMOVE", "Drag to move");
+define("_CAL_TODAY", "Today");
+define("_CAL_DISPM1ST", "Display Monday first");
+define("_CAL_DISPS1ST", "Display Sunday first");
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 14:09:18
|
Revision: 9743
http://xoops.svn.sourceforge.net/xoops/?rev=9743&view=rev
Author: txmodxoops
Date: 2012-06-30 14:09:11 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
Modified: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 12:02:08 UTC (rev 9742)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 14:09:11 UTC (rev 9743)
@@ -26,12 +26,16 @@
class XoopsFormDatePicker extends XoopsFormText
{
-
- function XoopsFormDatePicker($caption, $name, $size = 15, $value = 0)
+ var $showIcon = false;
+ var $type = '';
+
+ function XoopsFormDatePicker($caption, $name, $size = 15, $value = 0, $showIcon = true, $type = 'normal')
{
$value = !is_numeric($value) ? time() : intval($value);
$value = ($value == 0) ? time() : $value;
$this->XoopsFormText($caption, $name, $size, 25, $value);
+ $this->showIcon = $showIcon;
+ $this->type = $type;
}
function render()
@@ -54,13 +58,52 @@
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
if (!$included) {
$included = true;
- $GLOBALS['xoTheme']->addScript('','', '
- $(function() {
- $( ".datepicker" ).datepicker({
- showOn: "button",
+ $GLOBALS['xoTheme']->addScript( '', '', '
+ $(function() {
+ $.datepicker.setDefaults( $.datepicker.regional[ "en" ] );
+ $( ".datepicker" ).datepicker(
+ $.datepicker.regional[ "'.$GLOBALS["xoopsConfig"]["language"].'" ] = {
+ clearText: 'Clear',
+ clearStatus: '',
+ closeText: 'Close',
+ closeStatus: 'Close without modify',
+ prevText: \''._CAL_PREVYR.'\',
+ prevStatus: \''._CAL_PREVMNTH.'\',
+ nextText: \''._CAL_NEXTYR.'\',
+ nextStatus: \''._CAL_NXTMNTH.'\',
+ currentText: \''._CAL_TODAY.'\',
+ currentStatus: 'Voir le mois courant',
+ monthNames: [\''._CAL_JANUARY.'\', \''._CAL_FEBRUARY.'\', \''._CAL_MARCH.'\',
+ \''._CAL_APRIL.'\', \''._CAL_MAY.'\', \''._CAL_JUNE.'\',
+ \''._CAL_JULY.'\', \''._CAL_AUGUST.'\', \''._CAL_SEPTEMBER.'\',
+ \''._CAL_OCTOBER.'\', \''._CAL_NOVEMBER.'\', \''._CAL_DECEMBER.'\'],
+ monthNamesShort: [\''._CAL_SHORT_JANUARY.'\', \''._CAL_SHORT_FEBRUARY.'\', \''._CAL_SHORT_MARCH.'\',
+ \''._CAL_SHORT_APRIL.'\', \''._CAL_SHORT_MAY.'\', \''._CAL_SHORT_JUNE.'\',
+ \''._CAL_SHORT_JULY.'\', \''._CAL_SHORT_AUGUST.'\', \''._CAL_SHORT_SEPTEMBER.'\',
+ \''._CAL_SHORT_OCTOBER.'\', \''._CAL_SHORT_NOVEMBER.'\', \''._CAL_SHORT_DECEMBER.'\'],
+ monthStatus: 'View another mounth',
+ yearStatus: 'View another year',
+ weekHeader: 'Sm',
+ weekStatus: '',
+ dayNames: [\''._CAL_SUNDAY.'\', \''._CAL_MONDAY.'\', \''._CAL_TUESDAY.'\',
+ \''._CAL_WEDNESDAY.'\', \''._CAL_THURSDAY.'\', \''._CAL_FRIDAY.'\',
+ \''._CAL_SATURDAY.'\'],
+ dayNamesShort: [\''._CAL_SHORT_SUNDAY.'\', \''._CAL_SHORT_MONDAY.'\', \''._CAL_SHORT_TUESDAY.'\',
+ \''._CAL_SHORT_WEDNESDAY.'\', \''._CAL_SHORT_THURSDAY.'\', \''._CAL_SHORT_FRIDAY.'\',
+ \''._CAL_SHORT_SATURDAY.'\'],
+ dayNamesMin: [\''._CAL_MIN_JANUARY.'\', \''._CAL_MIN_FEBRUARY.'\', \''._CAL_MIN_MARCH.'\',
+ \''._CAL_MIN_APRIL.'\', \''._CAL_MIN_MAY.'\', \''._CAL_MIN_JUNE.'\',
+ \''._CAL_MIN_SATURDAY.'\'],
+ dayStatus: \'.'_CAL_DISPM1ST.'\',
+ dateStatus: 'Choose format DD, MM d',
+ dateFormat: \''._CAL_JQUERY_FORMAT.'\',
+ firstDay: 0,
+ initStatus: \.'._CAL_SELDATE.'\',
+ isRTL: false }'; if ($this->showIcon){',
+ { showOn: "button",
buttonImage: ' . XOOPS_URL . '"images/calendar.gif",
buttonImageOnly: true
- });
+ }'}');
});
');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 12:02:14
|
Revision: 9742
http://xoops.svn.sourceforge.net/xoops/?rev=9742&view=rev
Author: txmodxoops
Date: 2012-06-30 12:02:08 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Added image calendar.gif
Added Paths:
-----------
XoopsCore/tags/2.6 timgno/htdocs/images/
XoopsCore/tags/2.6 timgno/htdocs/images/calendar.gif
Added: XoopsCore/tags/2.6 timgno/htdocs/images/calendar.gif
===================================================================
(Binary files differ)
Property changes on: XoopsCore/tags/2.6 timgno/htdocs/images/calendar.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-30 10:40:40
|
Revision: 9741
http://xoops.svn.sourceforge.net/xoops/?rev=9741&view=rev
Author: txmodxoops
Date: 2012-06-30 10:40:34 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
Added Paths:
-----------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsformloader.php
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsload.php
Modified: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 07:17:53 UTC (rev 9740)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-30 10:40:34 UTC (rev 9741)
@@ -56,7 +56,11 @@
$included = true;
$GLOBALS['xoTheme']->addScript('','', '
$(function() {
- $( ".datepicker" ).datepicker();
+ $( ".datepicker" ).datepicker({
+ showOn: "button",
+ buttonImage: ' . XOOPS_URL . '"images/calendar.gif",
+ buttonImageOnly: true
+ });
});
');
}
Added: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsformloader.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsformloader.php (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsformloader.php 2012-06-30 10:40:34 UTC (rev 9741)
@@ -0,0 +1,55 @@
+<?php
+/**
+ * XOOPS form class loader
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @since 2.0.0
+ * @version $Id: xoopsformloader.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+
+xoops_load('XoopsForm');
+xoops_load('XoopsThemeForm');
+xoops_load('XoopsSimpleForm');
+xoops_load('XoopsFormElement');
+xoops_load('XoopsFormElementTray');
+xoops_load('XoopsFormLabel');
+xoops_load('XoopsFormCheckBox');
+xoops_load('XoopsFormPassword');
+xoops_load('XoopsFormButton');
+xoops_load('XoopsFormButtonTray'); // To be cleaned
+xoops_load('XoopsFormHidden');
+xoops_load('XoopsFormFile');
+xoops_load('XoopsFormRadio');
+xoops_load('XoopsFormRadioYN');
+xoops_load('XoopsFormSelect');
+xoops_load('XoopsFormSelectGroup');
+xoops_load('XoopsFormSelectCheckGroup'); // To be cleaned
+xoops_load('XoopsFormSelectUser');
+xoops_load('XoopsFormSelectTheme');
+xoops_load('XoopsFormSelectMatchOption');
+xoops_load('XoopsFormSelectCountry');
+xoops_load('XoopsFormSelectTimeZone');
+xoops_load('XoopsFormSelectLang');
+xoops_load('XoopsFormSelectEditor');
+xoops_load('XoopsFormText');
+xoops_load('XoopsFormTextArea');
+xoops_load('XoopsFormTextDateSelect');
+xoops_load('XoopsFormDatePicker'); // New 19/06/2012 (Timgno)
+xoops_load('XoopsFormDhtmlTextArea');
+xoops_load('XoopsFormDateTime');
+xoops_load('XoopsFormHiddenToken');
+xoops_load('XoopsFormColorPicker');
+xoops_load('XoopsFormCaptcha');
+xoops_load('XoopsFormEditor');
+
+?>
\ No newline at end of file
Added: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsload.php (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsload.php 2012-06-30 10:40:34 UTC (rev 9741)
@@ -0,0 +1,242 @@
+<?php
+/**
+ * Xoops Autoload class
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: xoopsload.php 8066 2011-11-06 05:09:33Z beckmi $
+ * @todo For PHP 5 compliant
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XoopsLoad
+{
+ //static $loaded;
+ //static $configs;
+
+ function load($name, $type = "core")
+ {
+ static $loaded;
+ static $deprecated;
+
+ if (!isset($deprecated)) {
+ $deprecated = array(
+ 'uploader' => 'xoopsmediauploader',
+ 'utility' => 'xoopsutility',
+ 'captcha' => 'xoopscaptcha',
+ 'cache' => 'xoopscache',
+ 'file' => 'xoopsfile',
+ 'model' => 'xoopsmodelfactory',
+ 'calendar' => 'xoopscalendar',
+ 'userutility' => 'xoopsuserutility',
+ );
+ }
+ $name = strtolower($name);
+ if (array_key_exists($name, $deprecated)) {
+ if (isset($GLOBALS['xoopsLogger'])) {
+ $GLOBALS['xoopsLogger']->addDeprecated("xoops_load('{$name}') is deprecated, use xoops_load('{$deprecated[$name]}')");
+ } else {
+ trigger_error("xoops_load('{$name}') is deprecated, use xoops_load('{$deprecated[$name]}')", E_USER_WARNING);
+ }
+ $name = $deprecated[$name];
+ }
+
+ $type = empty($type) ? 'core' : $type;
+ if (isset($loaded[$type][$name])) {
+ return $loaded[$type][$name];
+ }
+
+ if (class_exists($name)) {
+ $loaded[$type][$name] = true;
+ return true;
+ }
+ $isloaded = false;
+ switch ($type) {
+ case 'framework':
+ $isloaded = XoopsLoad::loadFramework($name);
+ break;
+ case 'class':
+ case 'core':
+ $type = 'core';
+ $isloaded = XoopsLoad::loadCore($name);
+ break;
+ default:
+ $isloaded = XoopsLoad::loadModule($name, $type);
+ break;
+ }
+ $loaded[$type][$name] = $isloaded;
+ return $loaded[$type][$name];
+ }
+
+ /**
+ * Load core class
+ *
+ * @access private
+ */
+ function loadCore($name)
+ {
+ static $configs;
+
+ if (!isset($configs)) {
+ $configs = XoopsLoad::loadCoreConfig();
+ }
+ if (isset($configs[$name])) {
+ require $configs[$name];
+ if (class_exists($name) && method_exists($name, '__autoload')) {
+ call_user_func(array($name , '__autoload'));
+ }
+ return true;
+ } elseif (file_exists($file = XOOPS_ROOT_PATH . '/class/' . $name . '.php')) {
+ include_once $file;
+ $class = 'Xoops' . ucfirst($name);
+ if (class_exists($class)) {
+ return $class;
+ } else {
+ trigger_error('Class ' . $name . ' not found in file ' . __FILE__ . 'at line ' . __LINE__, E_USER_WARNING);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Load Framework class
+ *
+ * @access private
+ */
+ function loadFramework($name)
+ {
+ if (!file_exists($file = XOOPS_ROOT_PATH . '/Frameworks/' . $name . '/xoops' . $name . '.php')) {
+ trigger_error('File ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' not found in file ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+ return false;
+ }
+ include $file;
+ $class = 'Xoops' . ucfirst($name);
+ if (class_exists($class)) {
+ return $class;
+ }
+ }
+ /**
+ * Load module class
+ *
+ * @access private
+ */
+ function loadModule($name, $dirname = null)
+ {
+ if (empty($dirname)) {
+ return false;
+ }
+ if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/class/' . $name . '.php')) {
+ include $file;
+ if (class_exists(ucfirst($dirname) . ucfirst($name))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * XoopsLoad::loadCoreConfig()
+ *
+ * @return
+ */
+ function loadCoreConfig()
+ {
+ return $configs = array(
+ 'xoopsuserutility' => XOOPS_ROOT_PATH . '/class/userutility.php',
+ 'xoopsmediauploader' => XOOPS_ROOT_PATH . '/class/uploader.php',
+ 'xoopsutility' => XOOPS_ROOT_PATH . '/class/utility/xoopsutility.php',
+ 'xoopscaptcha' => XOOPS_ROOT_PATH . '/class/captcha/xoopscaptcha.php',
+ 'xoopscache' => XOOPS_ROOT_PATH . '/class/cache/xoopscache.php',
+ 'xoopsfile' => XOOPS_ROOT_PATH . '/class/file/xoopsfile.php',
+ 'xoopsmodelfactory' => XOOPS_ROOT_PATH . '/class/model/xoopsmodel.php',
+ 'xoopscalendar' => XOOPS_ROOT_PATH . '/class/calendar/xoopscalendar.php',
+ 'xoopskernel' => XOOPS_ROOT_PATH . '/class/xoopskernel.php',
+ 'xoopssecurity' => XOOPS_ROOT_PATH . '/class/xoopssecurity.php',
+ 'xoopslogger' => XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php',
+ 'xoopspagenav' => XOOPS_ROOT_PATH . '/class/pagenav.php',
+ 'xoopslists' => XOOPS_ROOT_PATH . '/class/xoopslists.php',
+ 'xoopslocal' => XOOPS_ROOT_PATH . '/include/xoopslocal.php',
+ 'xoopslocalabstract' => XOOPS_ROOT_PATH . '/class/xoopslocal.php',
+ 'xoopseditor' => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
+ 'xoopseditorhandler' => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
+ 'xoopsformloader' => XOOPS_ROOT_PATH . '/class/xoopsformloader.php',
+ 'xoopsformelement' => XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php',
+ 'xoopsform' => XOOPS_ROOT_PATH . '/class/xoopsform/form.php',
+ 'xoopsformlabel' => XOOPS_ROOT_PATH . '/class/xoopsform/formlabel.php',
+ 'xoopsformselect' => XOOPS_ROOT_PATH . '/class/xoopsform/formselect.php',
+ 'xoopsformpassword' => XOOPS_ROOT_PATH . '/class/xoopsform/formpassword.php',
+ 'xoopsformbutton' => XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php',
+ 'xoopsformbuttontray' => XOOPS_ROOT_PATH . '/class/xoopsform/formbuttontray.php',
+ 'xoopsformcheckbox' => XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php',
+ 'xoopsformselectcheckgroup' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcheckgroup.php',
+ 'xoopsformhidden' => XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php',
+ 'xoopsformfile' => XOOPS_ROOT_PATH . '/class/xoopsform/formfile.php',
+ 'xoopsformradio' => XOOPS_ROOT_PATH . '/class/xoopsform/formradio.php',
+ 'xoopsformradioyn' => XOOPS_ROOT_PATH . '/class/xoopsform/formradioyn.php',
+ 'xoopsformselectcountry' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcountry.php',
+ 'xoopsformselecttimezone' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttimezone.php',
+ 'xoopsformselectlang' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectlang.php',
+ 'xoopsformselectgroup' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectgroup.php',
+ 'xoopsformselectuser' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectuser.php',
+ 'xoopsformselecttheme' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttheme.php',
+ 'xoopsformselectmatchoption' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectmatchoption.php',
+ 'xoopsformtext' => XOOPS_ROOT_PATH . '/class/xoopsform/formtext.php',
+ 'xoopsformtextarea' => XOOPS_ROOT_PATH . '/class/xoopsform/formtextarea.php',
+ 'xoopsformdhtmltextarea' => XOOPS_ROOT_PATH . '/class/xoopsform/formdhtmltextarea.php',
+ 'xoopsformelementtray' => XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php',
+ 'xoopsthemeform' => XOOPS_ROOT_PATH . '/class/xoopsform/themeform.php',
+ 'xoopssimpleform' => XOOPS_ROOT_PATH . '/class/xoopsform/simpleform.php',
+ 'xoopsformtextdateselect' => XOOPS_ROOT_PATH . '/class/xoopsform/formtextdateselect.php',
+ 'xoopsformdatepicker' => XOOPS_ROOT_PATH . '/class/xoopsform/formdatepicker.php', // New 19/06/2012 (Timgno)
+ 'xoopsformdatetime' => XOOPS_ROOT_PATH . '/class/xoopsform/formdatetime.php',
+ 'xoopsformhiddentoken' => XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php',
+ 'xoopsformcolorpicker' => XOOPS_ROOT_PATH . '/class/xoopsform/formcolorpicker.php',
+ 'xoopsformcaptcha' => XOOPS_ROOT_PATH . '/class/xoopsform/formcaptcha.php',
+ 'xoopsformeditor' => XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php',
+ 'xoopsformselecteditor' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecteditor.php',
+ 'xoopsformcalendar' => XOOPS_ROOT_PATH . '/class/xoopsform/formcalendar.php',
+ );
+ }
+
+ /**
+ * XoopsLoad::loadConfig()
+ *
+ * @param mixed $data
+ * @return
+ */
+ function loadConfig($data = null)
+ {
+ if (is_array($data)) {
+ $configs = $data;
+ } else {
+ if (! empty($data)) {
+ $dirname = $data;
+ } elseif (is_object($GLOBALS['xoopsModule'])) {
+ $dirname = $GLOBALS['xoopsModule']->getVar('dirname', 'n');
+ } else {
+ return false;
+ }
+ if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/include/autoload.php')) {
+ if (! $configs = include $file) {
+ return false;
+ }
+ }
+ }
+ return $configs = array_merge(XoopsLoad::loadCoreConfig(), $configs);
+ }
+}
+// To be enabled in XOOPS 3.0
+// spl_autoload_register(array('XoopsLoad', 'load'));
+
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-30 07:18:03
|
Revision: 9740
http://xoops.svn.sourceforge.net/xoops/?rev=9740&view=rev
Author: dhcst
Date: 2012-06-30 07:17:53 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
change p_bann.png
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/templates/images/language/english/p_bann.png
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/images/language/english/p_bann.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-29 19:01:52
|
Revision: 9739
http://xoops.svn.sourceforge.net/xoops/?rev=9739&view=rev
Author: beckmi
Date: 2012-06-29 19:01:46 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
adding file extension
Added Paths:
-----------
ThirdParty/mysqli/README.txt
Removed Paths:
-------------
ThirdParty/mysqli/README
Deleted: ThirdParty/mysqli/README
===================================================================
--- ThirdParty/mysqli/README 2012-06-29 16:48:30 UTC (rev 9738)
+++ ThirdParty/mysqli/README 2012-06-29 19:01:46 UTC (rev 9739)
@@ -1,4 +0,0 @@
-Put the mysqlidatabase.php file in your class/database folder
-and change the XOOPS_DB_TYPE to mysqli.
-
-This database is NOT supported by the core team at this time.
\ No newline at end of file
Added: ThirdParty/mysqli/README.txt
===================================================================
--- ThirdParty/mysqli/README.txt (rev 0)
+++ ThirdParty/mysqli/README.txt 2012-06-29 19:01:46 UTC (rev 9739)
@@ -0,0 +1,4 @@
+Put the mysqlidatabase.php file in your class/database folder
+and change the XOOPS_DB_TYPE to mysqli.
+
+This database is NOT supported by the core team at this time.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-29 16:48:40
|
Revision: 9738
http://xoops.svn.sourceforge.net/xoops/?rev=9738&view=rev
Author: txmodxoops
Date: 2012-06-29 16:48:30 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Added Class formdatepicker.php
Added Paths:
-----------
XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
Added: XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/class/xoopsform/formdatepicker.php 2012-06-29 16:48:30 UTC (rev 9738)
@@ -0,0 +1,68 @@
+<?php
+/**
+ * XOOPS form datepicker
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @subpackage form
+ * @since 2.5.0
+ * @author TXMod Xoops (AKA timgno) http://www.txmodxoops.org/
+ * @version $Id: formdatepicker.php 9679 2012-06-19 01:18:38Z timgno $
+ */
+
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+/**
+ * A text field with jquery ui calendar popup
+ */
+
+class XoopsFormDatePicker extends XoopsFormText
+{
+
+ function XoopsFormDatePicker($caption, $name, $size = 15, $value = 0)
+ {
+ $value = !is_numeric($value) ? time() : intval($value);
+ $value = ($value == 0) ? time() : $value;
+ $this->XoopsFormText($caption, $name, $size, 25, $value);
+ }
+
+ function render()
+ {
+ static $included = false;
+
+ $ele_name = $this->getName();
+ $ele_value = $this->getValue(false);
+ if (is_string($ele_value)) {
+ $display_value = $ele_value;
+ $ele_value = time();
+ } else {
+ $display_value = '';
+ }
+
+ //$jqtime = formatTimestamp($ele_value, _CAL_FORMAT);
+ if (is_object($GLOBALS['xoTheme'])) {
+ $GLOBALS['xoTheme']->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ if (!$included) {
+ $included = true;
+ $GLOBALS['xoTheme']->addScript('','', '
+ $(function() {
+ $( ".datepicker" ).datepicker();
+ });
+ ');
+ }
+ }
+ return "<input type='text' name='" . $ele_name . "' id='" . $ele_name . "' class='datepicker' size='" . $this->getSize() . "' maxlength='" . $this->getMaxlength() . "' value='" . $display_value . "'" . $this->getExtra() . " />
+ <input type='reset' name='" . $ele_name . "' value='" . _RESET . "'>";
+ }
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-29 11:22:47
|
Revision: 9737
http://xoops.svn.sourceforge.net/xoops/?rev=9737&view=rev
Author: dhcst
Date: 2012-06-29 11:22:41 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
fix topicmanager.php
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -53,7 +53,7 @@
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
if ( !$forum ) {
- $topic_obj =& $topic_handler->get($topic_id);
+ $topic_obj =& $topic_handler->get(intval($topic_id));
$forum = $topic_obj->getVar("forum_id");
unset($topic_obj);
}
@@ -63,7 +63,6 @@
$online_handler->init($forum);
}
-
$action_array = array('merge', 'delete','move','lock','unlock','sticky','unsticky','digest','undigest');
foreach ($action_array as $_action) {
$action[$_action] = array(
@@ -86,6 +85,7 @@
if ( isset($_POST['submit']) ) {
$mode = $_POST['mode'];
+
if ('delete' == $mode) {
foreach ($topic_id as $tid) {
$topic_obj =& $topic_handler->get($tid);
@@ -219,11 +219,16 @@
exit();
}
- $sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
- if ( !$r = $xoopsDB->query($sql) ) {
- redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&order=$order&viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
- exit();
- }
+ if (!empty($action[$mode]['sql'])) {
+ $sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
+ if ( !$r = $xoopsDB->query($sql) ) {
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&order=$order&viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id", 2, _MD_ERROR_BACK);
+ exit();
+ }
if ('digest' == $mode && $xoopsDB->getAffectedRows()) {
$topic_obj =& $topic_handler->get($topic_id);
$stats_handler =& xoops_getmodulehandler('stats', 'newbb');
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -261,7 +261,6 @@
$page_query_nav = implode("&", array_values($query_nav));
unset($query_nav);
$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", $page_query_nav);
- //if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -27,7 +27,7 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/06/17';
+$modversion['release_date'] = '2012/06/29';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
$modversion["module_status"] = "RC 1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-06-29 10:48:23
|
Revision: 9736
http://xoops.svn.sourceforge.net/xoops/?rev=9736&view=rev
Author: lord_venom
Date: 2012-06-29 10:48:16 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Menu admin 2.5
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -17,93 +17,17 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once("../include/functions.php");
-
+include 'admin_header.php';
xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-Adminmenu(6, _AM_TDMPICTURE_MANAGE_ABOUT);
-echo "<style>
-.CPbigTitle{
- font-size: 20px;
- color: #1E90FF;
- background: no-repeat left top;
- font-weight: bold;
- height: 40px;
- vertical-align: middle;
- padding: 10px 0 0 50px;
- border-bottom: 3px solid #1E90FF;
-}
-</style>";
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (6, _AM_TDMPICTURE_MANAGE_ABOUT);
-}
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/about.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_ABOUT.'</strong></h3>';
-echo '</div><br />';
$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) );
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n";
-echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n";
-echo "<label>" ._AM_ABOUT_RELEASEDATE. ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_AUTHOR. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_CREDITS. ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_LICENSE. ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
+ $about_admin = new ModuleAdmin();
+ echo $about_admin->addNavigation('about.php');
+ echo $about_admin->renderabout('9MYQB7GUK5MCS', true);
+
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_MODULE_INFO. "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" ._AM_ABOUT_MODULE_STATUS. ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_AUTHOR_INFO. "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" ._AM_ABOUT_AUTHOR_NAME. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-
-$file = XOOPS_ROOT_PATH. "/modules/".$xoopsModule->getVar("dirname")."/changelog.txt";
-if ( is_readable( $file ) ){
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_CHANGELOG. "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>". implode("<br />", file( $file )) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -220,12 +220,26 @@
break;
case "edit":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $file_handler->get($_REQUEST['file_id']);
$form = $obj->getForm();
$form->display();
break;
case "edit_img":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $file_handler->get($_REQUEST['file_id']);
$form = $obj->getImg();
$form->display();
@@ -249,6 +263,10 @@
echo $obj->getHtmlErrors();
}
} else {
+
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+
xoops_confirm(array('ok' => 1, 'file_id' => $_REQUEST['file_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDEL, $obj->getVar('file_title')));
}
break;
@@ -281,7 +299,9 @@
}
} else {
- xoops_cp_header();
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+
$title = print_r( $_REQUEST['id'], TRUE );
xoops_confirm(array('ok' => 1, 'deletes' => 1, 'op' => $_REQUEST['op'], 'id'=> serialize(array_map("intval", $_REQUEST['id']))), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDEL, $title));
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -17,11 +17,8 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once("../include/functions.php");
+include 'admin_header.php';
+xoops_cp_header();
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -34,18 +31,9 @@
redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/permissions.php" , 1 , _AM_XD_GPERMUPDATED);
}
- xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(5, _AM_TDMPICTURE_MANAGE_PERM);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (5, _AM_TDMPICTURE_MANAGE_PERM);
-}
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('permissions.php');
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/permissions.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_PERM.'</strong></h3>';
-echo '</div><br />';
-
$module_id = $xoopsModule->getVar('mid');
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-29 10:48:16 UTC (rev 9736)
@@ -0,0 +1,47 @@
+************************************************************
+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
+************************************************************
+************************************************************
+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.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.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.04 | 31-MAR-2010
+Dev: 2.4.4
+************************************************************
+- 31/03/10 : modifier xoops_version.php bug affichage
+************************************************************
+Version 1.05 | 12-AVR-2010
+Dev: 2.4.4
+************************************************************
+- 12/04/10 : modifier permission bug
+- 11/12/10 : multiupload
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt 2012-06-29 10:48:16 UTC (rev 9736)
@@ -0,0 +1,47 @@
+************************************************************
+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
+************************************************************
+************************************************************
+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.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.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.04 | 31-MAR-2010
+Dev: 2.4.4
+************************************************************
+- 31/03/10 : modifier xoops_version.php bug affichage
+************************************************************
+Version 1.05 | 12-AVR-2010
+Dev: 2.4.4
+************************************************************
+- 12/04/10 : modifier permission bug
+- 11/12/10 : multiupload
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -24,27 +24,24 @@
$modversion['name'] = "TDMPicture";
$modversion['version'] = 1.06;
$modversion['description'] = 'Image manager';
-$modversion['author'] = 'TDM';
-$modversion['author_website_url'] = "http://www.tdmxoops.net/";
-$modversion['author_website_name'] = "Team Dev Module";
$modversion['credits'] = "none";
+$modversion['author'] = 'TDM';
+$modversion['pseudo'] = 'Venom';
+$modversion['website'] = '';
+$modversion['name_website'] = '';
$modversion['license'] = "GPL see LICENSE";
-$modversion["release_info"] = "README";
-//$modversion["release_file"] = XOOPS_URL."/modules/pronoboulistenaute/readme.txt";
-$modversion["manual"] = "MANUAL";
-//$modversion["manual_file"] = XOOPS_URL."/modules/pronoboulistenaute/manual.txt";
$modversion['official'] = 1;
$modversion['image'] = "images/TDMPicture_logo.png";
$modversion['dirname'] = "TDMPicture";
+$modversion['status_version'] = 'Final';
+$modversion['release_date'] = '2012';
+$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
+$modversion['onInstall'] = 'include/install.php';
+$modversion['onUpdate'] = 'include/update.php';
+$modversion['help'] = 'page=help';
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = '2.5';
-$modversion['demo_site_url'] = "http://www.tdmxoops.net/";
-$modversion['demo_site_name'] = "TDM";
-$modversion["module_website_url"] = "http://www.tdmxoops.net/";
-$modversion["module_website_name"] = "TDM";
-
-$modversion["release"] = "09-06-2009";
-$modversion["module_status"] = "Release";
-
// Sql file
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
@@ -424,28 +421,5 @@
$modversion['blocks'][$i]['options'] = "RAND()|5|25|0|0";
$modversion['blocks'][$i]['template'] = "tdmpicture_minitable.html";
$i++;
-//moduleadmin
-$modversion['min_php']='5.3';
-$modversion['min_xoops']="2.5";
-$modversion['min_admin']= "1.1";
-$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-$modversion['image'] = "images/logo.png";
-$modversion['dirname'] = "{$dirname}";
-$modversion['dirmoduleadmin'] = "Frameworks/moduleclasses";
-$modversion['icons16'] = "Frameworks/moduleclasses/icons/16";
-$modversion['icons32'] = "Frameworks/moduleclasses/icons/32";
-
-$modversion['targetdir'] = XOOPS_ROOT_PATH."/modules/{$dirname}/modules/";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU General Public License 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-
-$modversion['release_info'] = "Final 12/04/2012";
-$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
-$modversion['release_date'] = "10/3/2012";
-
-$modversion['manual'] = "MANUAL";
-$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
-$modversion['module_status'] = "Final";
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-06-29 08:24:03
|
Revision: 9735
http://xoops.svn.sourceforge.net/xoops/?rev=9735&view=rev
Author: lord_venom
Date: 2012-06-29 08:23:52 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
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/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -104,6 +104,13 @@
break;
case "edit":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $cat_handler->get($_REQUEST['cat_id']);
$form = $obj->getForm();
$form->display();
@@ -135,6 +142,10 @@
echo $obj->getHtmlErrors();
}
} else {
+
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+
xoops_confirm(array('ok' => 1, 'cat_id' => $_REQUEST['cat_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDELCAT, $obj->getVar('cat_title')));
}
break;
@@ -153,9 +164,12 @@
//menu admin
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('cat.php');
- if ($cat_waiting != 0){
+ 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 (isset($_REQUEST['cat_display'])) {
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ }
$category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
echo $category_admin->renderButton();
@@ -220,13 +234,13 @@
}
echo '<tr class="'.$class.'">';
- echo '<td align="center" width="10%"><img src="'.$cat_img.'" alt="" title="" height="60"></td>';
- echo '<td align="left" width="55%">'.$category_ArrayTree[$i].$cat_title.'</td>';
- echo '<td align="center" width="10%">'.$cat_uid.'</td>';
- echo '<td align="center" width="5%">'.$assoc_cat[$i]->getVar('cat_weight').'</td>';
- echo '<td align="center" width="5%">'.$display.'</td>';
- echo '<td align="center" width="5%">'.$principal.'</td>';
- echo '<td align="center" width="10%">';
+ echo '<td align="center" width="10%" style="vertical-align:middle;"><img src="'.$cat_img.'" alt="" title="" height="40"></td>';
+ echo '<td align="left" width="55%" style="vertical-align:middle;">'.$category_ArrayTree[$i].$cat_title.'</td>';
+ echo '<td align="center" width="10%" style="vertical-align:middle;">'.$cat_uid.'</td>';
+ echo '<td align="center" width="5%" style="vertical-align:middle;">'.$assoc_cat[$i]->getVar('cat_weight').'</td>';
+ 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 '</td>';
@@ -234,7 +248,9 @@
}
echo '</table><br /><br />';
echo '<div align=right>'.$pagenav.'</div><br />';
- }
+ } else{
+ echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_CAT,0) . '</div>';
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -17,23 +17,13 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+include 'admin_header.php';
+xoops_cp_header();
-
- xoops_cp_header();
+tdmpicture_adminheader();
-include_once(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/common.php');
- tdmpicture_adminheader();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(4, _AM_TDMPICTURE_MANAGE_FILE);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (4, _AM_TDMPICTURE_MANAGE_FILE);
-}
-
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
@@ -47,19 +37,18 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('file_display', 0));
$file_waiting = $file_handler->getCount($criteria);
-
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/file.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_FILE.'</strong></h3>';
-echo '</div><br /><div class="head" align="center">';
-echo !isset($_REQUEST['file_display']) || $_REQUEST['file_display'] == 1 ? '<a href="files.php?op=list&file_display=0">'.sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting).'</a>' : '<a href="files.php?op=list&file_display=1">'.sprintf(_AM_TDMPICTURE_THEREARE_FILE,$numfile).'</a>';
-echo ' | ';
-echo '<a href="files.php?op=upload">'._AM_TDMPICTURE_FILE_UPLOAD.'</a>';
-echo '</div><br>';
switch($op) {
//upload
case "upload":
+
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
// Affichage du formulaire de cr?ation de cat?gories
$obj =& $file_handler->create();
$form = $obj->getForm();
@@ -300,7 +289,8 @@
case "update":
$obj = $file_handler->get($_REQUEST['file_id']);
- $obj->setVar('file_display', 1);
+ $obj->getVar('file_display') == 1 ? $obj->setVar('file_display', 0) : $obj->setVar('file_display', 1);
+ //$obj->setVar('file_display', 1);
if ($file_handler->insert($obj)) {
redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
}
@@ -350,6 +340,18 @@
if (!$numcat) {
redirect_header('cat.php', 2, _AM_TDMPICTURE_CATERROR);
}
+
+ //menu admin
+ $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');
+ }
+ if (isset($_REQUEST['file_display'])) {
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ }
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ echo $category_admin->renderButton();
//Parameters
$criteria = new CriteriaCompo();
@@ -403,7 +405,7 @@
$file_id = $arr[$i]->getVar('file_id');
$file_title = $myts->displayTarea($arr[$i]->getVar('file_title'));
- $display = $arr[$i]->getVar('file_display') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<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='./../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>";
//on test l'existance de l'image
$img = $arr[$i]->getVar("file_file") ? $arr[$i]->getVar("file_file") : 'blank.gif';
@@ -424,15 +426,15 @@
$thumb_img .= "</a>";
echo '<tr class="'.$class.'">';
- echo '<td align="center"><input type="checkbox" name="id[]" id="id[]" value="'.$arr[$i]->getVar("file_id") .'" /></td>';
- echo '<td align="center"><img src="'.$file_img.'" alt="" title="" height="60"></td>';
- echo '<td align="center">'.$file_cattitle.'</td>';
- echo '<td align="center">'.$file_title.'</td>';
- echo '<td align="center">'.$arr[$i]->getVar('file_res_x').'</td>';
- echo '<td align="center">'.$arr[$i]->getVar('file_res_y').'</td>';
- echo '<td align="center">'.$thumb_img.'</td>';
- echo '<td align="center">'.$display.'</td>';
- echo '<td align="center">';
+ echo '<td align="center" style="vertical-align:middle;"><input type="checkbox" name="id[]" id="id[]" value="'.$arr[$i]->getVar("file_id") .'" /></td>';
+ echo '<td align="center" style="vertical-align:middle;"><img src="'.$file_img.'" alt="" title="" height="60"></td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$file_cattitle.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$file_title.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$arr[$i]->getVar('file_res_x').'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$arr[$i]->getVar('file_res_y').'</td>';
+ 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>';
@@ -441,7 +443,9 @@
}
echo '</table><input type="submit" name="op" value="'._DELETE.'" /></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>';
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -16,6 +16,7 @@
*
* ****************************************************************************
*/
+
$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX;
$adminmenu[0]['link'] = "admin/index.php";
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -42,6 +42,8 @@
define("_AM_TDMPICTURE_MANAGE_FILE","Gestion des Fichiers");
define("_AM_TDMPICTURE_THEREARE_FILE","Il y a %s Fichiers dans la Base de donnée");
define("_AM_TDMPICTURE_THEREARE_FILE_WAITING","Il y a %s Fichiers en attente de validation");
+//admin menu
+define("_AM_TDMPICTURE_LIST_FILE","Liste des Fichiers");
define("_AM_TDMPICTURE_MANAGE_GD","Librairie GD");
define("_AM_TDMPICTURE_MANAGE_GDERROR","Certaine option du module peuvent ne pas fonctionner sans la librairie GD");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -19,9 +19,9 @@
//Admin menu
define("_MI_TDMPICTURE_ADMENUINDEX","Index");
-define("_MI_TDMPICTURE_ADMENUCAT","Catégories");
-define("_MI_TDMPICTURE_ADMENUFILE","Fichiers");
-define("_MI_TDMPICTURE_ADMENUPERMISSIONS","Permissions");
+define("_MI_TDMPICTURE_ADMENUCAT","Gestion des Catégories");
+define("_MI_TDMPICTURE_ADMENUFILE","Gestion des Fichiers");
+define("_MI_TDMPICTURE_ADMENUPERMISSIONS","Gestion des Permissions");
define("_MI_TDMPICTURE_ADMENUABOUT","About");
define("_MI_TDMPICTURE_ADMENUPREF","Prérences");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-06-29 07:21:03
|
Revision: 9734
http://xoops.svn.sourceforge.net/xoops/?rev=9734&view=rev
Author: lord_venom
Date: 2012-06-29 07:20:51 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
add menu admin 2.5
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
Added: XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -0,0 +1,56 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.xoops.org)
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
+ * ****************************************************************************
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+include_once("../include/common.php");
+include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+include_once(XOOPS_ROOT_PATH."/class/tree.php");
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+
+
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+}else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ //return false;
+}
+
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -17,19 +17,11 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar("dirname").'/include/common.php';
-include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/tree.php";
+include 'admin_header.php';
+xoops_cp_header();
- xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(1, _AM_TDMPICTURE_MANAGE_CAT);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (1, _AM_TDMPICTURE_MANAGE_CAT);
-}
+//load class
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
@@ -43,11 +35,9 @@
$criteria->add(new Criteria('cat_display', 0));
$cat_waiting = $cat_handler->getCount($criteria);
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/cat.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_CAT.'</strong></h3>';
-echo '</div><br /><div class="head" align="center">';
-echo !isset($_REQUEST['cat_display']) || $_REQUEST['cat_display'] == 1 ? '<a href="cat.php?op=list&cat_display=0">'.sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting).'</a>' : '<a href="cat.php?op=list&cat_display=1">'.sprintf(_AM_TDMPICTURE_THEREARE_CAT,$numcat).'</a>';
-echo '</div><br>';
+
+
+//code list
switch($op) {
//sauv
@@ -151,7 +141,7 @@
case "update":
$obj = $cat_handler->get($_REQUEST['cat_id']);
- $obj->setVar('cat_display', 1);
+ $obj->getVar('cat_display') == 1 ? $obj->setVar('cat_display', 0) : $obj->setVar('cat_display', 1);
if ($cat_handler->insert($obj)) {
redirect_header('cat.php', 2, _AM_TDMPICTURE_BASE);
}
@@ -160,6 +150,15 @@
case "list":
default:
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ if ($cat_waiting != 0){
+ $category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting), 'cat.php?op=list&cat_display=0', 'update');
+ }
+ $category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
+ echo $category_admin->renderButton();
+
//Parameters
$criteria = new CriteriaCompo();
$limit = 10;
@@ -190,7 +189,7 @@
}
//Affichage du tableau des cat\xE9gories
if ($numrows>0) {
- echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<table width="100%" cellspacing="1" class="outer" >';
echo '<tr>';
echo '<th align="center">'._AM_TDMPICTURE_IMG.'</th>';
echo '<th align="center">'._AM_TDMPICTURE_TITLE.'</th>';
@@ -210,7 +209,7 @@
$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 ? "<img src='./../images/on.gif' border='0'>" : "<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>";
+ $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'>";
//on test l'existance de l'image
$imgpath = TDMPICTURE_CAT_PATH.$assoc_cat[$i]->getVar("cat_img");
@@ -236,7 +235,18 @@
echo '</table><br /><br />';
echo '<div align=right>'.$pagenav.'</div><br />';
}
- // Affichage du formulaire de cr?ation de cat?gories
+
+ break;
+
+ // vue cr\xE9ation
+ case "new_cat":
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
+ // Affichage du formulaire de cr?ation de cat?gories
$obj =& $cat_handler->create();
$form = $obj->getForm();
$form->display();
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -17,19 +17,10 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+
+include 'admin_header.php';
xoops_cp_header();
-//apelle du menu admin
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(0, _AM_TDMPICTURE_INDEXDESC);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (0, _AM_TDMPICTURE_INDEXDESC);
-}
//load class
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
@@ -47,6 +38,11 @@
$criteria->add(new Criteria('file_display', 0));
$file_waiting = $file_handler->getCount($criteria);
+///////////////////////////////////////////////////////////
+//apelle du menu admin
+//test dossier
+// dossier dans uploads
+$folder = array(TDMPICTURE_UPLOADS_PATH, TDMPICTURE_THUMB_PATH, TDMPICTURE_CAT_PATH);
//test GD
if (!extension_loaded('gd')) {
if (!dl('gd.so')) {
@@ -55,67 +51,38 @@
}else {
$veriffile = '<span style="color: green;"><img src="./../images/on.gif" >'._AM_TDMPICTURE_MANAGE_GDOK.'</span>';
}
-include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/class/menu.php';
- //showIndex();
- $menu = new TDMPictureMenu();
- $menu->addItem('cat', 'cat.php', '../images/decos/cat.png', _AM_TDMPICTURE_MANAGE_CAT);
- $menu->addItem('file', 'files.php', '../images/decos/file.png', _AM_TDMPICTURE_MANAGE_FILE);
- $menu->addItem('about', 'about.php', '../images/decos/about.png', _AM_TDMPICTURE_MANAGE_ABOUT);
- $menu->addItem('block', '../../system/admin.php?fct=blocksadmin&selvis=-1&selmod=-2&selgrp=-1&selgen=' . $xoopsModule->getVar('mid'), '../images/decos/block.png', _AM_TDMPICTURE_MANAGE_BLOCK);
- $menu->addItem('comment', '../../system/admin.php?fct=comments&module=' . $xoopsModule->getVar('mid'), '../images/decos/comment.png', _AM_TDMPICTURE_MANAGE_COMMENT);
- $menu->addItem('update', '../../system/admin.php?fct=modulesadmin&op=update&module='.$xoopsModule ->getVar('name')
- , '../images/decos/update.png', _AM_TDMPICTURE_MANAGE_UPDATE);
- $menu->addItem('permissions', 'permissions.php', '../images/decos/permissions.png', _AM_TDMPICTURE_NAVPERMISSIONS);
- $menu->addItem('Preference', '../../system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule ->getVar('mid').
- '&&confcat_id=1', '../images/decos/pref.png', _AM_TDMPICTURE_NAVPREFERENCES);
-
- echo $menu->getCSS();
-
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/index.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;">
- <h3><strong>'._AM_TDMPICTURE_INDEXDESC.'</strong></h3>
- </div><br /><table width="100%" border="0" cellspacing="10" cellpadding="4">
- <tr>
- <td valign="top">
- '.$menu->render().'</td>
- <td valign="top" width="60%">
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_CAT.'</legend>
- <br/>';
- printf(_AM_TDMPICTURE_THEREARE_CAT,$numcat);
- echo '<br/><br/>';
- printf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting);
- echo '<br/>
- </fieldset><br /><br />
+ $index_admin = new ModuleAdmin();
+ $index_admin->addInfoBox(_AM_TDMPICTURE_MANAGE_CAT);
+ $index_admin->addInfoBox(_AM_TDMPICTURE_MANAGE_FILE);
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT, $numcat);
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE, $numfile);
+ if ($cat_waiting == 0){
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Green');
+ }else{
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Red');
+ }
+ if ($numfile == 0){
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Green');
+ }else{
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Red');
+ }
-
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_FILE.'</legend>
- <br/>';
- printf(_AM_TDMPICTURE_THEREARE_FILE,$numfile);
- echo '<br/><br/>';
- printf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting);
- echo '<br/>
- </fieldset><br /> <br />
-
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_GD.'</legend>
- <br/>';
- echo $veriffile;
- echo '<br/>
- </fieldset><br /> <br />
-
- <fieldset><legend class="CPmediumTitle">CHMOD 777</legend>
- <br/>';
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
- $uploadcat = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/cat/";
- $uploadthumb = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/thumb/";
-
- echo @chmod ($uploaddir, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploaddir.' : '.substr(decoct(fileperms($uploaddir)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploaddir.' : '.substr(decoct(fileperms($uploaddir)),2).'</a>';
- echo '<br/>';
- echo @chmod ($uploadcat, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploadcat.' : '.substr(decoct(fileperms($uploadcat)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploadcat.' : '.substr(decoct(fileperms($uploadcat)),2).'</a>';
- echo '<br/>';
- echo @chmod ($uploadthumb, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploadthumb.' : '.substr(decoct(fileperms($uploadthumb)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploadthumb.' : '.substr(decoct(fileperms($uploadthumb)),2).'</a>';
-
- echo '</fieldset><br /> <br />';
-
- echo '</td></tr></table>';
+ foreach (array_keys( $folder) as $i) {
+ $index_admin->addConfigBoxLine($folder[$i], 'folder');
+ $index_admin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
+ }
+ $index_admin->addConfigBoxLine($veriffile);
+ echo $index_admin->addNavigation('index.php');
+ echo $index_admin->renderIndex();
+
+
+//if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
+//TDMPicture_adminmenu(0, _AM_TDMPICTURE_INDEXDESC);
+//} else {
+//include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
+//loadModuleAdminMenu (0, _AM_TDMPICTURE_INDEXDESC);
+//}
+
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -33,12 +33,15 @@
//index.php
define("_AM_TDMPICTURE_MANAGE_CAT","Gestion des Catégories");
-define("_AM_TDMPICTURE_THEREARE_CAT","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Catégories dans la Base de donnée");
-define("_AM_TDMPICTURE_THEREARE_CAT_WAITING","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Catégories en attente de validation");
+define("_AM_TDMPICTURE_THEREARE_CAT","Il y a %s Catégories dans la Base de donnée");
+define("_AM_TDMPICTURE_THEREARE_CAT_WAITING","Il y a %s Catégories en attente de validation");
+//admin menu
+define("_AM_TDMPICTURE_ADD_CAT","Ajouter des Catégories");
+define("_AM_TDMPICTURE_LIST_CAT","Liste des Catégories");
define("_AM_TDMPICTURE_MANAGE_FILE","Gestion des Fichiers");
-define("_AM_TDMPICTURE_THEREARE_FILE","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Fichiers dans la Base de donnée");
-define("_AM_TDMPICTURE_THEREARE_FILE_WAITING","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Fichiers en attente de validation");
+define("_AM_TDMPICTURE_THEREARE_FILE","Il y a %s Fichiers dans la Base de donnée");
+define("_AM_TDMPICTURE_THEREARE_FILE_WAITING","Il y a %s Fichiers en attente de validation");
define("_AM_TDMPICTURE_MANAGE_GD","Librairie GD");
define("_AM_TDMPICTURE_MANAGE_GDERROR","Certaine option du module peuvent ne pas fonctionner sans la librairie GD");
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -0,0 +1,98 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMPicture By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence PRO Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 1. Vous devez posséder une permission d'exécuter le logiciel, pour n'importe quel usage.
+ * 2. Vous ne devez pas l' étudier,
+ * 3. Vous ne devez pas le redistribuer ni en faire des copies,
+ * 4. Vous n'avez pas la liberté de l'améliorer et de rendre publiques les modifications
+ *
+ * @license TDMFR PRO license
+ * @author TDMFR ; TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+//Admin menu
+define("_MI_TDMPICTURE_ADMENUINDEX","Index");
+define("_MI_TDMPICTURE_ADMENUCAT","Gestion des Catégories");
+define("_MI_TDMPICTURE_ADMENUFILE","Gestion des Fichiers");
+define("_MI_TDMPICTURE_ADMENUPERMISSIONS","Gestion des Permissions");
+define("_MI_TDMPICTURE_ADMENUABOUT","About");
+define("_MI_TDMPICTURE_ADMENUPREF","Prérences");
+
+
+//Preferences
+define("_MI_TDMPICTURE_MIMEMAX","Taille maxi des fichiers pour l'upload");
+define("_MI_TDMPICTURE_MIMETYPE","Extension autoriser séparer par | ");
+define("_MI_TDMPICTURE_EDITOR","Editeur");
+define("_MI_TDMPICTURE_FAVOURITE","Nombre de point pour être Favoris");
+define("_MI_TDMPICTURE_UPMAX","Nombre maximum d'upload simultanés");
+define("_MI_TDMPICTURE_LAST","Nombre maximum de nouveaux fichier ? afficher sur l'index");
+define("_MI_TDMPICTURE_WIDTH","Largeur maximum de l'image dans le detail");
+define("_MI_TDMPICTURE_HEIGTH","Hauteur maximum de l'image dans le detail");
+define("_MI_TDMPICTURE_THUMB_WIDTH","Miniature : Largeur maximum de l'image");
+define("_MI_TDMPICTURE_THUMB_HEIGTH","Miniature : Hauteur maximum de l'image");
+define("_MI_TDMPICTURE_THUMB_QUALITY","Miniature : Qualité de l'image");
+define("_MI_TDMPICTURE_PAGE","Nombre maximum de fichier par page ?");
+define("_MI_TDMPICTURE_DESCRIPTION","META : Description des pages sans information, pour le reste des pages cela seras automatique");
+define("_MI_TDMPICTURE_KEYWORDS","META : Mots clef des pages sans information, séparer les mots par un espace, pour le reste des pages cela seras automatique");
+define("_MI_TDMPICTURE_SLIDE_WIDTH","Slideshow : Largeur du slide");
+define("_MI_TDMPICTURE_SLIDE_HEIGTH","Slideshow : Hauteur du slide");
+define("_MI_TDMPICTURE_CAT_WIDTH","Catégorie : Largeur de l'image");
+define("_MI_TDMPICTURE_CAT_HEIGTH","Catégorie : Hauteur de l'image");
+define("_MI_TDMPICTURE_DISPLAY","Visualisation par defaut");
+//block
+define("_AM_TDMPICTURE_BLOCK_DATE","Fichier récents");
+define("_AM_TDMPICTURE_BLOCK_HITS","Fichier les plus affichés");
+define("_AM_TDMPICTURE_BLOCK_COUNTS","Fichier populaire");
+define("_AM_TDMPICTURE_BLOCK_DL","Fichiers les plus téléchargés");
+define("_AM_TDMPICTURE_BLOCK_COMMENTS","Fichiers les plus commentés");
+define("_AM_TDMPICTURE_BLOCK_RANDS","Fichier aléatoire");
+//
+define("_AM_TDMPICTURE_SELECT_STYLE","Style du block");
+define("_AM_TDMPICTURE_SELECT_TEXT","Texte");
+define("_AM_TDMPICTURE_SELECT_IMAGE","Image");
+define("_AM_TDMPICTURE_SELECT_IMAGE_DESC","Image / Info");
+define("_AM_TDMPICTURE_SELECT_SLIDE","Animé");
+//version 1.3
+define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
+define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
+define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
+define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_CAT_CEL","Catégorie : Nombre de colonne");
+//define("_MI_TDMPICTURE_CAT_DISPLAY","Catégorie : Style des catégories");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","texte");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL","Catégorie : Nombre de sous-catégorie");
+define("_MI_TDMPICTURE_VIEWMYALBUM","Voir mon album");
+define("_MI_TDMPICTURE_VIEWALBUM","Liste des albums");
+define("_MI_TDMPICTURE_UPLOAD","Uploader");
+define("_MI_TDMPICTURE_SOCIAL","Afficher social bar?");
+define("_MI_TDMPICTURE_RSS","Afficher RSS?");
+define("_MI_TDMPICTURE_PDF","Afficher PDF?");
+define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
+
+//version 1.5
+define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
+define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
+define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
+define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
+
+define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb");
+define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur");
+define("_MI_TDMPICTURE_THUMB_STYLE_HW","Limite sur largeur*Hauteur");
+define("_MI_TDMPICTURE_THUMB_STYLE_H","Limite sur Hauteur");
+define("_MI_TDMPICTURE_THUMB_STYLE_W","Limite sur largeur");
+
+define("_MI_TDMPICTURE_CAT","Proposer album");
+?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -59,6 +59,9 @@
+// Set to 1 if you want to display menu generated by system module
+$modversion['system_menu'] = 1;
+
// Admin things
$modversion['hasAdmin'] = 1;
$modversion['adminindex'] = "admin/index.php";
@@ -421,4 +424,28 @@
$modversion['blocks'][$i]['options'] = "RAND()|5|25|0|0";
$modversion['blocks'][$i]['template'] = "tdmpicture_minitable.html";
$i++;
+//moduleadmin
+$modversion['min_php']='5.3';
+$modversion['min_xoops']="2.5";
+$modversion['min_admin']= "1.1";
+$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+$modversion['image'] = "images/logo.png";
+$modversion['dirname'] = "{$dirname}";
+
+$modversion['dirmoduleadmin'] = "Frameworks/moduleclasses";
+$modversion['icons16'] = "Frameworks/moduleclasses/icons/16";
+$modversion['icons32'] = "Frameworks/moduleclasses/icons/32";
+
+$modversion['targetdir'] = XOOPS_ROOT_PATH."/modules/{$dirname}/modules/";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU General Public License 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+
+$modversion['release_info'] = "Final 12/04/2012";
+$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
+$modversion['release_date'] = "10/3/2012";
+
+$modversion['manual'] = "MANUAL";
+$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
+$modversion['module_status'] = "Final";
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-27 22:46:21
|
Revision: 9733
http://xoops.svn.sourceforge.net/xoops/?rev=9733&view=rev
Author: beckmi
Date: 2012-06-27 22:46:13 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
fixing bugs reported by Cesag
updating to 1.08 RC
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php
XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt
XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt
XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php 2012-06-27 20:16:21 UTC (rev 9732)
+++ XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php 2012-06-27 22:46:13 UTC (rev 9733)
@@ -1,6 +1,6 @@
<?php
echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
- . " <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ . " <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/TDMStats/trunk/TDMStats/docs/changelog.txt
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-06-27 20:16:21 UTC (rev 9732)
+++ XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-06-27 22:46:13 UTC (rev 9733)
@@ -1,5 +1,10 @@
************************************************************
TDM : TDMStats
+Version 1.08 | 2012-06-27
+************************************************************
+- fixing bugs reported by Cesag (mamba)
+************************************************************
+TDM : TDMStats
Version 1.07 | 12-05-2012
Dev: 2.2.4
************************************************************
Modified: XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt 2012-06-27 20:16:21 UTC (rev 9732)
+++ XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt 2012-06-27 22:46:13 UTC (rev 9733)
@@ -9,7 +9,7 @@
************************************************** **********
- Overwrite the file TDMStats, to update the module from the site administration.
-- When using a custom template set, remove the module's templates for regnrer.
+- When using a custom template set, remove the module's templates for regeneration.
- Use the tab admin / plugin for copying the plugin or refer you to the "manual copy"
- Appointments in the administration module To create permissions.
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-06-27 20:16:21 UTC (rev 9732)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-06-27 22:46:13 UTC (rev 9733)
@@ -108,6 +108,7 @@
///mont///
$mth = array();
global $xoopsDB;
+$year = formatTimeStamp(time(), 'Y');
$mth_info = getResult("select distinct mth, year, count from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year' order by id desc");
//$mth_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'");
$mth_sum = getREsult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'");
@@ -140,7 +141,7 @@
//////WEEK/////////////
$last = array();
global $xoopsDB;
- $year = formatTimeStamp(time(), 'Y');
+ //$year = formatTimeStamp(time(), 'Y');
$last_info = getResult("select distinct week, year, count from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year' order by id desc");
//$week_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year'");
$last_sum = getResult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year'");
Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-06-27 20:16:21 UTC (rev 9732)
+++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-06-27 22:46:13 UTC (rev 9733)
@@ -20,7 +20,7 @@
*/
$modversion['name'] = "TDMStats";
-$modversion['version'] = "1.07";
+$modversion['version'] = "1.08";
$modversion['description'] = _MI_ISTATS_DESC;
$modversion['author'] = 'Original module: Paul Cooke (alias Scripter)<br /><b>Adaptation/rewrite: TDM.</b>';
@@ -47,7 +47,7 @@
$modversion['release_date'] = '2012/05/12';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "RC";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = '1.1';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-27 20:16:28
|
Revision: 9732
http://xoops.svn.sourceforge.net/xoops/?rev=9732&view=rev
Author: mageg
Date: 2012-06-27 20:16:21 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
update profile
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userinfo.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -21,78 +21,105 @@
*/
include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Call header
+$xoops->header('categorylist.html');
+// Get category handler
+$category_Handler = $xoops->getModuleHandler("category");
-$xoops = Xoops::getInstance();
-$xoops->header();
-$indexAdmin = new XoopsModuleAdmin();
-$indexAdmin->renderNavigation('category.php');
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('category.php');
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
-
-/* @var $handler ProfileCategoryHandler */
-/* @var $obj ProfileCategory */
-$handler = $xoops->getModuleHandler('category');
switch ($op) {
+ case "list":
default:
- case "list":
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+ $admin_page->renderButton();
$criteria = new CriteriaCompo();
$criteria->setSort('cat_weight');
$criteria->setOrder('ASC');
- $xoops->tpl->assign('categories', $handler->getObjects($criteria, true, false));
- $template_main = "categorylist.html";
+ $xoops->tpl->assign('categories', $category_Handler->getObjects($criteria, true, false));
+ $xoops->tpl->assign('category', true);
break;
case "new":
- $obj = $handler->create();
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $obj = $category_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'category');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "edit":
- $handler->get($_REQUEST['id']);
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $category_Handler->get($id);
+ $form = $xoops->getModuleForm($obj, 'category');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ } else {
+ $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
+ }
break;
case "save":
if (!$xoops->security->check()) {
$xoops->redirect('category.php', 3, implode(',', $xoops->security->getErrors()));
}
- if (isset($_REQUEST['id'])) {
- $obj = $handler->get($_REQUEST['id']);
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $category_Handler->get($id);
} else {
- $obj = $handler->create();
+ $obj = $category_Handler->create();
}
- $obj->setVar('cat_title', $_REQUEST['cat_title']);
- $obj->setVar('cat_description', $_REQUEST['cat_description']);
- $obj->setVar('cat_weight', $_REQUEST['cat_weight']);
- if ($handler->insert($obj)) {
+ $obj->setVar('cat_title', $_POST['cat_title']);
+ $obj->setVar('cat_description', $_POST['cat_description']);
+ $obj->setVar('cat_weight',$_POST['cat_weight']);
+ if ($category_Handler->insert($obj)) {
$xoops->redirect('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY));
}
- echo $obj->getHtmlErrors();
- $form = $obj->getForm();
- $form->display();
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'category');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "delete":
- $obj = $handler->get($_REQUEST['id']);
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$xoops->security->check()) {
- $xoops->redirect('category.php', 3, implode(',', $xoops->security->getErrors()));
- }
- if ($handler->delete($obj)) {
- $xoops->redirect('category.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $category_Handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security->check()) {
+ $xoops->redirect("category.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ if ($category_Handler->delete($obj)) {
+ $xoops->redirect("category.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
} else {
- echo $obj->getHtmlErrors();
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ $xoops->tpl->assign('form', false);
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'category.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />');
}
} else {
- $xoops->confirm(array(
- 'ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'
- ), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')));
+ $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
}
break;
}
-if (isset($template_main)) {
- $xoops->tpl->display("admin:profile|{$template_main}");
-}
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -21,7 +21,6 @@
*/
include dirname(__FILE__) . '/header.php';
-$xoops = Xoops::getInstance();
$xoops->header();
if (!isset($_REQUEST['uid'])) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -20,29 +20,33 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Call header
+$xoops->header('fieldlist.html');
+// Get handler
+$field_handler = $xoops->getModuleHandler('field');
+$cat_handler = $xoops->getModuleHandler('category');
-$xoops = Xoops::getInstance();
-$xoops->header();
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('field.php');
-$indexAdmin = new XoopsModuleAdmin();
-$indexAdmin->renderNavigation('field.php');
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
-
-/* @var $profilefield_handler ProfileFieldHandler */
-$profilefield_handler = $xoops->getModuleHandler('field');
-
-/* @var $obj ProfileField */
-
switch ($op) {
default:
case "list":
- $fields = $profilefield_handler->getObjects(null, true, false);
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+ $admin_page->renderButton();
+ $fields = $field_handler->getObjects(null, true, false);
$modules = $xoops->getHandlerModule()->getObjectsArray(null, true);
- $cat_handler = $xoops->getModuleHandler('category');
$criteria = new CriteriaCompo();
$criteria->setSort('cat_weight');
$cats = $cat_handler->getObjects($criteria, true);
@@ -88,22 +92,31 @@
ksort($categories);
$xoops->tpl->assign('fieldcategories', $categories);
$xoops->tpl->assign('token', $xoops->security->getTokenHTML());
- $template_main = "fieldlist.html";
+ $xoops->tpl->assign('fieldlist', true);
break;
case "new":
- $obj = $profilefield_handler->create();
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $obj = $field_handler->create();
+ $form = $xoops->getModuleForm($obj, 'field');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "edit":
- $obj = $profilefield_handler->get($_REQUEST['id']);
- if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
- $xoops->redirect('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $field_handler->get($id);
+ $form = $xoops->getModuleForm($obj, 'field');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ } else {
+ $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
}
- $form = $obj->getForm();
- $form->display();
break;
case "reorder":
@@ -125,12 +138,11 @@
if (count($ids) > 0) {
$errors = array();
//if there are changed fields, fetch the fieldcategory objects
- $field_handler = $xoops->getModuleHandler('field');
$fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
foreach ($ids as $i) {
$fields[$i]->setVar('field_weight', intval($weight[$i]));
$fields[$i]->setVar('cat_id', intval($category[$i]));
- if (!$field_handler->insert($fields[$i])) {
+ if (!$field_handler->insertFields($fields[$i])) {
$errors = array_merge($errors, $fields[$i]->getErrors());
}
}
@@ -149,13 +161,14 @@
$xoops->redirect('field.php', 3, implode(',', $xoops->security->getErrors()));
}
$redirect_to_edit = false;
- if (isset($_REQUEST['id'])) {
- $obj = $profilefield_handler->get($_REQUEST['id']);
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $field_handler->get($id);
if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
$xoops->redirect('admin.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
} else {
- $obj = $profilefield_handler->create();
+ $obj = $field_handler->create();
$obj->setVar('field_name', $_REQUEST['field_name']);
$obj->setVar('field_moduleid', $xoops->module->getVar('mid'));
$obj->setVar('field_show', 1);
@@ -216,7 +229,8 @@
) {
$obj->setVar('step_id', $_REQUEST['step_id']);
}
- if ($profilefield_handler->insert($obj)) {
+
+ if ($field_handler->insertFields($obj)) {
$groupperm_handler = $xoops->getHandlerGroupperm();
$perm_arr = array();
@@ -271,34 +285,37 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
$xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- echo $obj->getHtmlErrors();
- $form = $obj->getForm();
- $form->display();
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'regstep');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "delete":
- $obj = $profilefield_handler->get($_REQUEST['id']);
- if (!$obj->getVar('field_config')) {
- $xoops->redirect('index.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
- }
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$xoops->security->check()) {
- $xoops->redirect('field.php', 3, implode(',', $xoops->security->getErrors()));
- }
- if ($profilefield_handler->delete($obj)) {
- $xoops->redirect('field.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_FIELD));
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $field_handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security->check()) {
+ $xoops->redirect("field.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ if ($field_handler->deleteFields($obj)) {
+ $xoops->redirect("field.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
} else {
- echo $obj->getHtmlErrors();
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ $xoops->tpl->assign('form', false);
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'field.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />');
}
} else {
- $xoops->confirm(array(
- 'ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'
- ), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')));
+ $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
}
break;
}
-
-if (isset($template_main)) {
- $xoops->tpl->display("admin:profile|{$template_main}");
-}
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -21,6 +21,5 @@
*/
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-
-$xoops = Xoops::getInstance();
+XoopsLoad::load('system', 'system');
$xoops->loadLanguage('user');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -21,23 +21,28 @@
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
-
-$xoops = Xoops::getInstance();
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'edit', 'string');
+// Call header
$xoops->header();
-$indexAdmin = new XoopsModuleAdmin();
-$indexAdmin->renderNavigation('permissions.php');
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('permissions.php');
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "edit";
-
$perm_desc = "";
switch ($op ) {
case "visibility":
- //$xoops->redirect("visibility.php", 0, _PROFILE_AM_PROF_VISIBLE);
header("Location: visibility.php");
break;
case "edit":
+ default:
$title_of_form = _PROFILE_AM_PROF_EDITABLE;
$perm_name = "profile_edit";
$restriction = "field_edit";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -20,74 +20,119 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
include dirname(__FILE__) . '/header.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Call header
+$xoops->header('steplist.html');
+// Get handler
+$regstep_Handler = $xoops->getModuleHandler("regstep");
-$xoops = Xoops::getInstance();
-$xoops->header();
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('step.php');
-$indexAdmin = new XoopsModuleAdmin();
-$indexAdmin->renderNavigation('step.php');
-
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
-
-/* @var $handler ProfileRegstepHandler */
-$handler = $xoops->getModuleHandler('regstep');
-/* @var $obj ProfileRegstep */
switch ($op) {
case "list":
- $xoops->tpl->assign('steps', $handler->getObjects(null, true, false));
- $template_main = "steplist.html";
+ default:
+ // Add Scripts
+ $xoops->theme->addScript('media/xoops/xoops.js');
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+ $admin_page->renderButton();
+ $xoops->tpl->assign('steps', $regstep_Handler->getObjects(null, true, false));
+ $xoops->tpl->assign('step', true);
break;
-
+
case "new":
- $obj = $handler->create();
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $obj = $regstep_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'regstep');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "edit":
- $obj = $handler->get($_REQUEST['id']);
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $regstep_Handler->get($id);
+ $form = $xoops->getModuleForm($obj, 'regstep');
+ $form->render();
+ $xoops->tpl->assign('form', true);
+ } else {
+ $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
+ }
break;
case "save":
- if (isset($_REQUEST['id'])) {
- $obj = $handler->get($_REQUEST['id']);
+ if (!$xoops->security->check()) {
+ $xoops->redirect('step.php', 3, implode(',', $xoops->security->getErrors()));
+ }
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $regstep_Handler->get($id);
} else {
- $obj = $handler->create();
+ $obj = $regstep_Handler->create();
}
- $obj->setVar('step_name', $_REQUEST['step_name']);
- $obj->setVar('step_order', $_REQUEST['step_order']);
- $obj->setVar('step_desc', $_REQUEST['step_desc']);
- $obj->setVar('step_save', $_REQUEST['step_save']);
- if ($handler->insert($obj)) {
+ $obj->setVar('step_name', $_POST['step_name']);
+ $obj->setVar('step_order', $_POST['step_order']);
+ $obj->setVar('step_desc', $_POST['step_desc']);
+ $obj->setVar('step_save', $_POST['step_save']);
+ if ($regstep_Handler->insert($obj)) {
$xoops->redirect('step.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_STEP));
}
- echo $obj->getHtmlErrors();
- $form = $obj->getForm();
- $form->display();
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'regstep');
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case "delete":
- $obj = $handler->get($_REQUEST['id']);
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if ($handler->delete($obj)) {
- $xoops->redirect('step.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_STEP));
+ $admin_page->addItemButton(_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+ $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
+ $admin_page->renderButton();
+ $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $regstep_Handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security->check()) {
+ $xoops->redirect("step.php", 3, implode(",", $xoops->security->getErrors()));
+ }
+ if ($regstep_Handler->deleteRegstep($obj)) {
+ $xoops->redirect("step.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
} else {
- echo $obj->getHtmlErrors();
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ $xoops->tpl->assign('form', false);
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'step.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')) . '<br />');
}
} else {
- $xoops->confirm(array(
- 'ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'
- ), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')));
+ $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
}
break;
-}
-if (!empty($template_main)) {
- $xoops->tpl->display("admin:profile|{$template_main}");
+ case "step_update":
+ $id = $system->cleanVars($_POST, 'id', 0, 'int');
+ if ($id > 0) {
+ $obj = $regstep_Handler->get($id);
+ $old = $obj->getVar('step_save');
+ $obj->setVar('step_save', !$old);
+ if ($regstep_Handler->insert($obj)) {
+ exit;
+ }
+ echo $obj->getHtmlErrors();
+ }
+ break;
}
-
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -20,18 +20,25 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
include dirname(__FILE__) . '/header.php';
-
-$xoops = Xoops::getInstance();
-
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
//there is no way to override current tabs when using system menu
//this dirty hack will have to do it
$_SERVER['REQUEST_URI'] = "admin/permissions.php";
+// Get Action type
+$op = $system->cleanVars($_REQUEST, 'op', 'visibility', 'string');
+
+// Call header
$xoops->header();
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "visibility";
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('permissions.php');
$visibility_handler = $xoops->getModuleHandler('visibility');
$field_handler = $xoops->getModuleHandler('field');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/category.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/category.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -35,24 +35,6 @@
$this->initVar('cat_description', XOBJ_DTYPE_TXTAREA);
$this->initVar('cat_weight', XOBJ_DTYPE_INT);
}
-
- /**
- * Get {@link XoopsThemeForm} for adding/editing categories
- *
- * @param mixed $action URL to submit to or false for $_SERVER['REQUEST_URI']
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- $xoops = Xoops::getInstance();
- $form = $xoops->getModuleForm($this, 'category', 'profile');
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
- }
- $form->setAction($action);
- return $form;
- }
}
class ProfileCategoryHandler extends XoopsPersistableObjectHandler
@@ -62,6 +44,6 @@
*/
public function __construct(XoopsDatabase $db = null)
{
- parent::__construct($db, "profile_category", "profilecategory", "cat_id", 'cat_title');
+ parent::__construct($db, 'profile_category', 'profilecategory', 'cat_id', 'cat_title');
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -54,24 +54,6 @@
}
/**
- * Get {@link XoopsThemeForm} for adding/editing fields
- *
- * @param mixed $action URL to submit to or false for $_SERVER['REQUEST_URI']
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- $xoops = Xoops::getInstance();
- $form = $xoops->getModuleForm($this, 'field', 'profile');
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
- }
- $form->setAction($action);
- return $form;
- }
-
- /**
* Extra treatment dealing with non latin encoding
* Tricky solution
*
@@ -477,7 +459,7 @@
* @param bool $force whether to force the query execution despite security settings
* @return bool FALSE if failed, TRUE if already present and unchanged or successful
*/
- public function insert(XoopsObject $obj, $force = false)
+ public function insertFields(XoopsObject $obj, $force = false)
{
$xoops = Xoops::getInstance();
$profile_handler = $xoops->getModuleHandler('profile', 'profile');
@@ -605,7 +587,7 @@
* @param bool $force
* @return bool FALSE if failed.
**/
- public function delete(XoopsObject $obj, $force = false)
+ public function deleteFields(XoopsObject $obj, $force = false)
{
$xoops = Xoops::getInstance();
$profile_handler = $xoops->getModuleHandler('profile', 'profile');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -16,12 +16,14 @@
* @version $Id$
*/
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
class ProfileCategoryForm extends XoopsThemeForm
{
/**
* @param ProfileCategory|XoopsObject $obj
*/
- public function __construct(ProfileCategory $obj)
+ public function __construct(ProfileCategory &$obj)
{
$title = $obj->isNew() ? sprintf(_PROFILE_AM_ADD, _PROFILE_AM_CATEGORY) : sprintf(_PROFILE_AM_EDIT, _PROFILE_AM_CATEGORY);
@@ -36,7 +38,5 @@
$this->addElement(new XoopsFormHidden('op', 'save') );
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit', 'btn primary formButton'));
-
- return $this;
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/regstep.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/regstep.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/regstep.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -33,24 +33,6 @@
$this->initVar('step_order', XOBJ_DTYPE_INT, 1);
$this->initVar('step_save', XOBJ_DTYPE_INT, 0);
}
-
- /**
- * Get {@link XoopsThemeForm} for adding/editing steps
- *
- * @param mixed $action URL to submit to or false for $_SERVER['REQUEST_URI']
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- $xoops = Xoops::getInstance();
- $form = $xoops->getModuleForm($this, 'regstep', 'profile');
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
- }
- $form->setAction($action);
- return $form;
- }
}
class ProfileRegstepHandler extends XoopsPersistableObjectHandler
@@ -72,7 +54,7 @@
*
* @return bool
*/
- public function delete(XoopsObject $obj, $force = false)
+ public function deleteRegstep(XoopsObject $obj, $force = false)
{
if (parent::delete($obj, $force)) {
$xoops = Xoops::getInstance();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -238,7 +238,9 @@
array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
$title = isset($categories[$k]) ? $categories[$k]['cat_title'] : _PROFILE_MA_DEFAULT;
$desc = isset($categories[$k]) ? $categories[$k]['cat_description'] : "";
- $form->addElement(new XoopsFormLabel("<h3>{$title}</h3>", $desc), false);
+ //$form->addElement(new XoopsFormLabel("<div class='break'>{$title}</div>", $desc), false);
+ $desc = ($desc != '' ? ' - ' . $desc : '');
+ $form->insertBreak($title . $desc);
foreach (array_keys($elements[$k]) as $i) {
$form->addElement($elements[$k][$i]['element'], $elements[$k][$i]['required']);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-06-27 20:16:21 UTC (rev 9732)
@@ -115,4 +115,7 @@
define('_PROFILE_AM_ACTION', 'Action');
//Since 2.6
-define("_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS", "Deactivating an administrator account is not allowed");
\ No newline at end of file
+define("_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS", "Deactivating an administrator account is not allowed");
+define("_PROFILE_AM_CATEGORY_LIST", "List of categories");
+define("_PROFILE_AM_STEP_LIST", "List of registration step");
+define("_PROFILE_AM_FIELD_LIST", "List of fields");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html 2012-06-27 20:16:21 UTC (rev 9732)
@@ -1,9 +1,6 @@
-<div class="pull-right spacer">
- <a class="btn primary tooltip" href="category.php?op=new" title="<{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_CATEGORY}>">
- <span class="icon icon-folder-add"></span>
- <{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_CATEGORY}>
- </a>
-</div>
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
+<{if $category}>
<table class="outer">
<thead>
<tr>
@@ -20,7 +17,7 @@
<td class="txtleft"><{$category.cat_description}></td>
<td class="txtcenter width5"><{$category.cat_weight}></td>
<td class="xo-actions txtcenter width5">
- <a href="category.php?id=<{$category.cat_id}>" title="<{$smarty.const._EDIT}>">
+ <a href="category.php?op=edit&id=<{$category.cat_id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
</a>
<a href="category.php?op=delete&id=<{$category.cat_id}>" title="<{$smarty.const._DELETE}>">
@@ -30,4 +27,9 @@
</tr>
<{/foreach}>
</tbody>
-</table>
\ No newline at end of file
+</table>
+<{/if}>
+<!-- Display form (add,edit) -->
+<{if $form}>
+<{includeq file="module:system|system_form.html"}>
+<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html 2012-06-27 20:16:21 UTC (rev 9732)
@@ -1,10 +1,6 @@
-<div class="pull-right spacer">
- <a class="btn primary tooltip" href="field.php?op=new" title="<{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_FIELD}>">
- <span class="icon icon-textfield-add"></span>
- <{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_FIELD}>
- </a>
-</div>
-<div class="clear"></div>
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
+<{if $fieldlist}>
<form action="field.php" method="post" id="fieldform">
<table class="outer">
<thead>
@@ -41,7 +37,7 @@
<input type="hidden" name="oldweight[<{$field.field_id}>]" value="<{$field.field_weight}>" />
<input type="hidden" name="oldcat[<{$field.field_id}>]" value="<{$field.cat_id}>" />
<input type="hidden" name="field_ids[]" value="<{$field.field_id}>" />
- <a href="field.php?id=<{$field.field_id}>" title="<{$smarty.const._EDIT}>">
+ <a href="field.php?op=edit&id=<{$field.field_id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
</a>
<{/if}>
@@ -59,14 +55,17 @@
<tr class="<{cycle values='odd, even'}>">
<td colspan="5">
</td>
- <td>
+ <td colspan="2">
<{$token}>
<input type="hidden" name="op" value="reorder" />
<input class="btn primary" type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" />
</td>
- <td colspan="2">
- </td>
</tr>
</tfoot>
</table>
-</form>
\ No newline at end of file
+</form>
+<{/if}>
+<!-- Display form (add,edit) -->
+<{if $form}>
+<{includeq file="module:system|system_form.html"}>
+<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html 2012-06-27 20:16:21 UTC (rev 9732)
@@ -1,14 +1,17 @@
-<div class="pull-right spacer">
- <a class="btn primary tooltip" href="step.php?op=new" title="<{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_STEP}>">
- <span class="icon icon-chart-bar-add"></span>
- <{$smarty.const._ADD}> <{$smarty.const._PROFILE_AM_STEP}>
- </a>
-</div>
-<div class="clear"></div>
+<script type="text/javascript">
+ Xoops.setStatusImg('accept', '<{xoAdminIcons success.png}>');
+ Xoops.setStatusImg('cancel', '<{xoAdminIcons cancel.png}>');
+ Xoops.setStatusText('accept', '<{$smarty.const._NO}>');
+ Xoops.setStatusText('cancel', '<{$smarty.const._YES}>');
+</script>
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
+<{if $step}>
<table class="outer">
<thead>
<tr>
<th><{$smarty.const._PROFILE_AM_STEPNAME}></th>
+ <th class="txtleft"><{$smarty.const._PROFILE_AM_DESCRIPTION}></th>
<th><{$smarty.const._PROFILE_AM_STEPORDER}></th>
<th><{$smarty.const._PROFILE_AM_STEPSAVE}></th>
<th></th>
@@ -17,11 +20,15 @@
<tbody>
<{foreach item=step from=$steps}>
<tr class="<{cycle values='odd, even'}>">
- <td><{$step.step_name}></td>
+ <td class="txtcenter width20"><{$step.step_name}></td>
+ <td class="txtleft"><{$step.step_desc}></td>
<td class="txtcenter width10"><{$step.step_order}></td>
- <td class="txtcenter width10"><{if $step.step_save == 1}><img src="<{xoAppUrl modules/profile/images/yes.png}>" alt="<{$smarty.const._YES}>" /><{else}><img src="<{xoAppUrl modules/profile/images/no.png}>" alt="<{$smarty.const._NO}>" /><{/if}></td>
+ <td class="xo-actions txtcenter width10">
+ <img id="loading_sml<{$step.step_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img class="cursorpointer" id="sml<{$step.step_id}>" onclick="Xoops.changeStatus( 'step.php', { op: 'step_update', id: <{$step.step_id}> }, 'sml<{$step.step_id}>', 'step.php' )" src="<{if $step.step_save}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $step.step_save}><{$smarty.const._NO}><{else}><{$smarty.const._YES}><{/if}>" title="<{if $step.step_save}><{$smarty.const._NO}><{else}><{$smarty.const._YES}><{/if}>" />
+ </td>
<td class="xo-actions txtcenter width5">
- <a href="step.php?id=<{$step.step_id}>" title="<{$smarty.const._EDIT}>">
+ <a href="step.php?op=edit&id=<{$step.step_id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
</a>
<a href="step.php?op=delete&id=<{$step.step_id}>" title="<{$smarty.const._DELETE}>">
@@ -31,4 +38,9 @@
</tr>
<{/foreach}>
</tbody>
-</table>
\ No newline at end of file
+</table>
+<{/if}>
+<!-- Display form (add,edit) -->
+<{if $form}>
+<{includeq file="module:system|system_form.html"}>
+<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userinfo.html 2012-06-26 21:56:24 UTC (rev 9731)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userinfo.html 2012-06-27 20:16:21 UTC (rev 9732)
@@ -13,7 +13,7 @@
<{/if}>
<{if !$user_ownpage && $xoops_isuser == true}>
<form name="usernav" action="user.php" method="post">
- <input type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>" onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?send2=1&to_userid=<{$user_uid}>', 'pmlite', 450, 380);" />
+ <input class="btn" type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>" onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?send2=1&to_userid=<{$user_uid}>', 'pmlite', 450, 380);" />
</form>
<{/if}>
</div>
@@ -23,10 +23,10 @@
<{if $user_ownpage == true}>
<div class="floatleft pad5">
<form name="usernav" action="user.php" method="post">
- <input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/edituser.php'" />
- <input type="button" value="<{$lang_changepassword}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changepass.php'" />
+ <input class="btn" type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/edituser.php'" />
+ <input class="btn" type="button" value="<{$lang_changepassword}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changepass.php'" />
<{if $user_changeemail}>
- <input type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changemail.php'" />
+ <input class="btn" type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changemail.php'" />
<{/if}>
<{if $user_candelete == true}>
@@ -37,10 +37,10 @@
</form>
<{/if}>
<{if $avatars == true}>
- <input type="button" value="<{$lang_avatar}>" onclick="location='edituser.php?op=avatarform'" />
+ <input class="btn" type="button" value="<{$lang_avatar}>" onclick="location='edituser.php?op=avatarform'" />
<{/if}>
- <input type="button" value="<{$lang_inbox}>" onclick="location='<{$xoops_url}>/viewpmsg.php'" />
- <input type="button" value="<{$lang_logout}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php?op=logout'" />
+ <input class="btn" type="button" value="<{$lang_inbox}>" onclick="location='<{$xoops_url}>/viewpmsg.php'" />
+ <input class="btn" type="button" value="<{$lang_logout}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php?op=logout'" />
</form>
</div>
<{elseif $xoops_isadmin != false}>
@@ -64,7 +64,7 @@
<{foreach item=category from=$categories}>
<{if isset($category.fields)}>
<div class="profile-list-category" id="profile-category-<{$category.cat_id}>">
- <table class="outer" cellpadding="4" cellspacing="1">
+ <table class="outer">
<tr>
<th class="txtcenter" colspan="2"><{$category.cat_title}></th>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 21:56:30
|
Revision: 9731
http://xoops.svn.sourceforge.net/xoops/?rev=9731&view=rev
Author: beckmi
Date: 2012-06-26 21:56:24 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Improving bug fix (Philou)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/include/form_render.php
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 21:56:24 UTC (rev 9731)
@@ -3,7 +3,7 @@
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
- adding default strings for localization (cesag/mamba)
-- fixing bug in form_render.php with empty checkbox (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/philou)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 21:56:24 UTC (rev 9731)
@@ -45,7 +45,9 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
+ if ( isset($obj[0])){
+ $id = str_replace('ele_', '', $obj[0]->getName());
+ }
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 21:56:24 UTC (rev 9731)
@@ -3,7 +3,7 @@
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
- adding default strings for localization (cesag/mamba)
-- fixing bug in form_render.php with empty checkbox (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/philou)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 21:56:24 UTC (rev 9731)
@@ -45,7 +45,9 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
+ if ( isset($obj[0])){
+ $id = str_replace('ele_', '', $obj[0]->getName());
+ }
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 20:56:19
|
Revision: 9730
http://xoops.svn.sourceforge.net/xoops/?rev=9730&view=rev
Author: beckmi
Date: 2012-06-26 20:56:13 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
fixing bug in form_render.php with empty checkbox (cesag/mamba)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/include/form_render.php
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
@@ -1,8 +1,9 @@
-1.21 Mamba (2011-07-18)
+1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
-- adding default strings for localization (cesag)
+- adding default strings for localization (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/mamba)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
@@ -45,7 +45,7 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', $obj[0]->getName());
+ $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
@@ -1,8 +1,9 @@
-1.21 Mamba (2011-07-18)
+1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
-- adding default strings for localization (cesag)
+- adding default strings for localization (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/mamba)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
@@ -45,7 +45,7 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', $obj[0]->getName());
+ $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ce...@us...> - 2012-06-26 19:56:14
|
Revision: 9729
http://xoops.svn.sourceforge.net/xoops/?rev=9729&view=rev
Author: cesag
Date: 2012-06-26 19:56:07 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
xforms 1.21 admin.php french correction
Modified Paths:
--------------
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php
Modified: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php 2012-06-26 19:34:35 UTC (rev 9728)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php 2012-06-26 19:56:07 UTC (rev 9729)
@@ -14,7 +14,7 @@
define("_AM_ELE_DISPLAY","Afficher");
define("_AM_ELE_TEXT","Champs texte");
-define("_AM_ELE_TEXT_DESC","{UNAME} imprime le pseudo d'utilisateur;<br />{EMAIL} imprime l'adress mail;<br />{NAME} imprime le nom réel de l'utilisateur;<br />{FROM} imprime la localisation de l'utilisateur;<br />{INFO} imprime les infos;<br />{ICQ} imprime l'adresse ICQ;<br />{AIM} imprime l'adresse AIM;<br />{YIM} imprime l'adresse YIM;<br />{MSNM} imprime l'adresse MSN;<br />{OCCUP} imprime la profession");
+define("_AM_ELE_TEXT_DESC","{UNAME} affichera le pseudoyme de l'utilisateur ;<br />{EMAIL} affichera l'adresse électronique ;<br />{NAME} affichera le nom de famille de l'utilisateur ;<br />{FROM} affichera la localisation de l'utilisateur ;<br />{INFO} affichera les informations ;<br />{ICQ} affichera l'adresse ICQ ;<br />{AIM} affichera l'adresse AIM ;<br />{YIM} affichera l'adresse YIM ;<br />{MSNM} affichera l'adresse MSN ;<br />{OCCUP} affichera la profession.");
define("_AM_ELE_TAREA","Zone de texte");
define("_AM_ELE_SELECT","Sélectionner boîte");
define("_AM_ELE_CHECK","Cocher élément");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ce...@us...> - 2012-06-26 19:34:42
|
Revision: 9728
http://xoops.svn.sourceforge.net/xoops/?rev=9728&view=rev
Author: cesag
Date: 2012-06-26 19:34:35 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
xforms 1.21 french translation
Added Paths:
-----------
XoopsLanguages/french/modules/xforms/
XoopsLanguages/french/modules/xforms/xforms 1.21/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/help.html
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/index.html
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/index.html
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/index.html
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/xforms.tpl
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/main.php
XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/modinfo.php
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/admin.php 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1,117 @@
+<?php
+######### (liaise) version 1.0 additions #########
+define("_AM_SAVE","Sauver");
+define("_AM_COPIED","%s copié");
+define("_AM_DBUPDATED","Base de donnée mise à jour !");
+define("_AM_ELE_CREATE","Ajouter un élément au formulaire");
+define("_AM_ELE_EDIT","Modifier les éléments du formulaire : %s");
+
+define("_AM_ELE_CAPTION","Légende");
+define("_AM_ELE_DEFAULT","Valeur par défaut");
+define("_AM_ELE_DETAIL","Détail");
+define("_AM_ELE_REQ","Requis");
+define("_AM_ELE_ORDER","Ordre");
+define("_AM_ELE_DISPLAY","Afficher");
+
+define("_AM_ELE_TEXT","Champs texte");
+define("_AM_ELE_TEXT_DESC","{UNAME} imprime le pseudo d'utilisateur;<br />{EMAIL} imprime l'adress mail;<br />{NAME} imprime le nom réel de l'utilisateur;<br />{FROM} imprime la localisation de l'utilisateur;<br />{INFO} imprime les infos;<br />{ICQ} imprime l'adresse ICQ;<br />{AIM} imprime l'adresse AIM;<br />{YIM} imprime l'adresse YIM;<br />{MSNM} imprime l'adresse MSN;<br />{OCCUP} imprime la profession");
+define("_AM_ELE_TAREA","Zone de texte");
+define("_AM_ELE_SELECT","Sélectionner boîte");
+define("_AM_ELE_CHECK","Cocher élément");
+define("_AM_ELE_RADIO","Boutons radio");
+define("_AM_ELE_YN","Simple bouton radio - oui/non ");
+
+define("_AM_ELE_SIZE","Taille");
+define("_AM_ELE_MAX_LENGTH","Longueur maximum");
+define("_AM_ELE_ROWS","Lignes");
+define("_AM_ELE_COLS","Colonnes");
+define("_AM_ELE_OPT","Options");
+define("_AM_ELE_OPT_DESC","Cochez les boutons pour sélectionner les valeurs par défaut.");
+define("_AM_ELE_OPT_DESC1","<br />Seul le premier bouton est validé si les sélections multiples ne sont pas autorisées");
+define("_AM_ELE_OPT_DESC2","Sélectionnez la valeur par défaut en cochant le bouton radio");
+define("_AM_ELE_ADD_OPT","Ajoute %s options");
+define("_AM_ELE_ADD_OPT_SUBMIT","Ajouter");
+define("_AM_ELE_SELECTED","Sélectionner");
+define("_AM_ELE_CHECKED","Coché");
+define("_AM_ELE_MULTIPLE","Autoriser les sélections multiples");
+
+define("_AM_ELE_CONFIRM_DELETE","Etes-vous certain de vouloir supprimer cet élément du formulaire ?");
+
+######### (liaise) version 1.1 #########
+define("_AM_ELE_OTHER", 'Pour une option "Autre", indiquez {OTHER|*nombre*} dans une des zones de texte. Ex. {OTHER|30} génère une zone de texte de 30 caractères.');
+
+######### (liaise) version 1.2 additions #########
+define("_AM_FORM_LISTING", "Liste des formulaires de contact");
+define("_AM_FORM_ORDER","Ordre d'affichage");
+define("_AM_FORM_ORDER_DESC","0 = masquer ce formulaire");
+define("_AM_FORM_TITLE", "Titre du formulaire");
+define("_AM_FORM_PERM", "Permission d'utilisation des formulaires par les groupes");
+define("_AM_FORM_SENDTO", "Envoyer à");
+define("_AM_FORM_SENDTO_ADMIN", "Courrier éléctronique de l'administrateur du site");
+define("_AM_FORM_SEND_METHOD", "Méthode d'envoi");
+define("_AM_FORM_SEND_METHOD_DESC", "L'information ne peut être envoyée par message privé lorsque le formulaire est envoyé par "._AM_FORM_SENDTO_ADMIN." ou envoyé par des utilisateurs anonymes");
+define("_AM_FORM_SEND_METHOD_MAIL", "Courrier éléctronique");
+define("_AM_FORM_SEND_METHOD_PM", "Message privé");
+define("_AM_FORM_DELIMETER", "Séparateur pour les cases à cocher et les boutons radio");
+define("_AM_FORM_DELIMETER_SPACE", "Espace blanc");
+define("_AM_FORM_DELIMETER_BR", "Ligne de séparation");
+define("_AM_FORM_SUBMIT_TEXT", "Texte du bouton d'envoi");
+define("_AM_FORM_DESC", "Description du formulaire");
+define("_AM_FORM_DESC_DESC", "Texte à afficher dans la page principale s'il y a plus d'un formulaire");
+define("_AM_FORM_INTRO", "Introduction du formulaire");
+define("_AM_FORM_INTRO_DESC", "Texte à afficher sur le formulaire");
+define("_AM_FORM_WHERETO", "URL de destination après envoi du formulaire");
+define("_AM_FORM_WHERETO_DESC", "Laisser en blanc pour renvoyer à la page d'accueil de ce site; {SITE_URL} affichera ".XOOPS_URL);
+
+define("_AM_FORM_ACTION_EDITFORM", "Editer les paramètres");
+define("_AM_FORM_ACTION_EDITELEMENT", "Editer les éléments");
+define("_AM_FORM_ACTION_CLONE", "Cloner");
+
+define("_AM_FORM_NEW", "Créer un nouveau formulaire");
+define("_AM_FORM_EDIT", "Modifier ce formulaire: %s");
+define("_AM_FORM_CONFIRM_DELETE", "Etes-vous certain de vouloir supprimer ce formulaire et tous ses éléments ?");
+
+define("_AM_ID", "ID");
+define("_AM_ACTION", "Action");
+define("_AM_RESET_ORDER", "Enregistrer");
+define("_AM_SAVE_THEN_ELEMENTS", "Sauvegarder puis éditer les éléments");
+define("_AM_SAVE_THEN_FORM", "Sauvegarder puis éditer les paramètres");
+define("_AM_NOTHING_SELECTED", "Aucune sélection.");
+define("_AM_GO_CREATE_FORM", "Vous devez d'abord créer un formulaire.");
+
+define("_AM_ELEMENTS_OF_FORM", "Eléments du formulaire %s");
+define("_AM_ELE_APPLY_TO_FORM", "Appliquer au formulaire");
+define("_AM_ELE_HTML", "Format texte / HTML");
+
+######### (liaise) version 1.23 additions #########
+define("_AM_XOOPS_VERSION_WRONG", "La version de XOOPS ne répond pas aux exigences du module.");
+define("_AM_ELE_UPLOADFILE","Fichier attaché");
+define("_AM_ELE_UPLOADIMG","Image attachée");
+define("_AM_ELE_UPLOADIMG_MAXWIDTH","Largeur maximale (pixels)");
+define("_AM_ELE_UPLOADIMG_MAXHEIGHT","Hauteur maximale (pixels)");
+define("_AM_ELE_UPLOAD_MAXSIZE","Taille maximale des fichiers (bytes)");
+define("_AM_ELE_UPLOAD_MAXSIZE_DESC","1k = 1024 bytes");
+define("_AM_ELE_UPLOAD_DESC_SIZE_NOLIMIT","0 = pas de limite");
+define("_AM_ELE_UPLOAD_ALLOWED_EXT","Extensions autorisées des fichiers");
+define("_AM_ELE_UPLOAD_ALLOWED_EXT_DESC","Séparez les extensions des fichiers avec un |, respectez la casse. ex: 'jpg|jpeg|gif|png|tif|tiff'");
+define("_AM_ELE_UPLOAD_ALLOWED_MIME","Types MIME autorisés");
+define("_AM_ELE_UPLOAD_ALLOWED_MIME_DESC","Séparez les types MIME avec un |, respectez la casse. ex: 'image/jpeg|image/pjpeg|image/png|image/x-png|image/gif|image/tiff'");
+define("_AM_ELE_UPLOAD_DESC_NOLIMIT","Laissez vide pour aucune limite (non recommandé pour des raisons de sécurité)");
+define("_AM_ELE_UPLOAD_SAVEAS","Sauvegarder les fichiers envoyés vers");
+define("_AM_ELE_UPLOAD_SAVEAS_MAIL","Fichiers joints au courrier éléctronique");
+define("_AM_ELE_UPLOAD_SAVEAS_FILE","Répertoire des envois");
+
+######### (xforms) version 1.0 additions ##########
+define("_AM_IMPORT_SUCCES", "xForms a réussi à importer tous les formulaires du module Liaise.");
+define("_AM_IMPORT_FAILED", "xForms n'a pas réussi à importer tous les formulaires du module Liaise.");
+define("_AM_IMPORT_NFND", "Le module liaise ne se trouve pas sur votre système !");
+
+//ModuleAdmin
+define('_AM_XFORMS_MODULEADMIN_MISSING','Erreur : La classe ModuleAdmin est manquante. Veuillez installer la classe ModuleAdmin dans /Frameworks (voir /docs/readme.txt)');
+
+// Text for Admin footer
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms est maintenue par la <a class='tooltip' rel='external' href='http://xoops.org/' title='Visitez la communauté XOOPS'>Communauté XOOPS</a></div>");
+//xForms 1.21 Defaults
+define("_AM_ELE_YOUR_NAME",'Votre nom');
+define("_AM_ELE_YOUR_EMAIL",'Adresse électronique');
+define("_AM_ELE_YOUR_COMMENTS",'Vos commentaires');
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/help.html
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/help.html (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/help.html 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1,36 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Aide :
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/xforms/admin/index.php"
+ title="Retour à l'administration de xForms"> xForms <img src="<{xoAdminIcons home.png}>"
+ alt="Retour à l'administration de xForms"/>
+ </a></h1>
+ <!-- -----Help Content ---------- -->
+
+ <h4 class="odd">Description</h4>
+
+ <p class="even">
+ xForms est un module qui propose des formulaires de contact largement personnalisables pour Xoops. Pour les webmestres qui désirent créer leur formulaire « Contactez-nous », xForms génère un type différent d'éléments de formulaire, par exemple les zones de texte, les cases à cocher etc... Les renseignements soumis peuvent être envoyés par courrier éléctronique ou par le système de message privé de XOOPS et sont reçus par les groupes d'utilisateurs sélectionnés.
+ <h4 class="odd">Installer / Désinstaller</h4>
+
+ Aucune mesure particulière n'est nécessaire, suivez la procédure d'installation standard – envoyez le dossier /xforms dans le
+ répertoire ../modules. Installez le module par l'Admin -> Système -> Modules. <br/><br/>
+ Des instructions détaillées sur l'installation des modules sont disponibles dans le <a href="http://goo.gl/adT2i">Manuel de Opérations
+ de Xoops</a> </p>
+
+ <p class="even">
+ <h4 class="odd">Instructions d'exploitation</h4>
+ Pour utiliser ce module, vous devez :<br/><br/>
+ i) Créer un nouveau formulaire,<br/><br/>
+ ii) Ajouter les éléments souhaités dans le formulaire et les enregistrer,<br/><br/>
+ iii) Vérifier que vous avez configuré les groupes d'utilisateurs du module nécessaires et bloquez les droits d'accès d'utilisation du module.
+ Les autorisations de groupe sont définies par le Menu Administration -> Système -> Groupes. <br/><br/>Des instructions détaillées sur la
+ configuration des droits d'accès des groupes d'utilisateurs sont disponibles dans le <a href="http://goo.gl/adT2i">Manuel des Opérations
+ de Xoops</a></p>
+ <h4 class="odd">Tutoriel</h4>
+
+ <p class="even">
+ Il n'y a pas de tutoriel pour le moment.
+
+ <!-- -----Help Content ---------- -->
+
+</div>
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/index.html
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/index.html (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/help/index.html 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/index.html
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/index.html (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/index.html 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/index.html
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/index.html (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/index.html 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/xforms.tpl
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/xforms.tpl (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/mail_template/xforms.tpl 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1,6 @@
+{MSG}
+
+{UNAME} {ULINK}
+{IP}
+{AGENT}
+{FORMURL}
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/main.php
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/main.php (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/main.php 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1,30 @@
+<?php
+######### (liaise) version 1.0 additions #########
+define("_xforms_MSG_SUBJECT", '%s'); // Site name removed since verion 1.22
+define("_xforms_MSG_SENT", "Votre message a été envoyé.");
+
+######### (liaise) version 1.1 #########
+// "Other" option for check boxes/radio buttons/selections
+define("_xforms_OPT_OTHER", "Autre : ");
+define("_xforms_PROXY", " (Proxy: %s)");
+
+// error messages
+define("_xforms_ERR_HEADING", "Veuillez patienter...");
+define("_xforms_ERR_INVALIDMAIL", "Adresse e-mail invalide.");
+define("_xforms_ERR_REQ", 'Veuillez compléter les champs requis "%s"');
+
+######### (liaise) version 1.2 additions #########
+define("_xforms_FORM_IS_HIDDEN", "Ce formulaire est caché des visiteurs.");
+define("_xforms_MSG_UNAME", "Envoyé par: %s");
+define("_xforms_MSG_UINFO", "\nURL pour voir la page d'info:\n%s");
+define("_xforms_MSG_IP", "Adresse IP: %s");
+define("_xforms_MSG_AGENT", "Navigateur : %s");
+define("_xforms_MSG_FORMURL", "Ce message est envoyé par :\n%s");
+
+######### (liaise) version 1.23 additions #########
+define("_xforms_ATTACHED_FILE", "Fichier joint: %s");
+define("_xforms_UPLOADED_FILE", "Fichier envoyé: %s");
+
+######### (xforms) version 1.0 additions ##########
+// No additions yet :-D
+?>
\ No newline at end of file
Added: XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/modinfo.php (rev 0)
+++ XoopsLanguages/french/modules/xforms/xforms 1.21/xforms/language/french/modinfo.php 2012-06-26 19:34:35 UTC (rev 9728)
@@ -0,0 +1,66 @@
+<?php
+######### (liaise) version 1.0 additions #########
+// The name of this module
+define("_MI_xforms_NAME","Liaise");
+
+// A brief description of this module
+define("_MI_xforms_DESC","Générateur de Formulaire de Contact");
+
+// admin/menu.php
+define("_MI_xforms_ADMENU1","Liste des Formulaires");
+define("_MI_xforms_ADMENU2","Créer un nouveau Formulaire");
+
+// preferences
+define("_MI_xforms_TEXT_WIDTH","Largeur des zones de texte par défaut.");
+define("_MI_xforms_TEXT_MAX","Largeur maximum des zones de texte par défaut.");
+define("_MI_xforms_TAREA_ROWS","Nombre de lignes par défaut des zones de texte.");
+define("_MI_xforms_TAREA_COLS","Nombre de colonnes par défaut des zones de texte.");
+
+######### (liaise) version 1.1 additions #########
+// preferences
+define("_MI_xforms_MAIL_CHARSET","Texte encodé pour les e-mails envoyés");
+
+// template descriptions
+define("_MI_xforms_TMPL_MAIN_DESC","Page d'accueil de Liaise");
+define("_MI_xforms_TMPL_ERROR_DESC","Page à afficher lors d'erreurs");
+
+######### (liaise) version 1.2 additions #########
+// template descriptions
+define("_MI_xforms_TMPL_FORM_DESC","Template des formulaires");
+
+// preferences
+define("_MI_xforms_MOREINFO","Envoyer des informations supplémentaires avec les informations soumises.");
+define("_MI_xforms_MOREINFO_USER","Nom d'utilisateur et lien vers sa page d'information.");
+define("_MI_xforms_MOREINFO_IP","Adresse IP du contact");
+define("_MI_xforms_MOREINFO_AGENT","Fournisseur d'accès du contact (infos du navigateur)");
+define("_MI_xforms_MOREINFO_FORM","URL du formulaire de contact");
+define("_MI_xforms_MAIL_CHARSET_DESC","Leave blank for "._CHARSET);
+define("_MI_xforms_PREFIX","Preffix du texte pour les champs requis");
+define("_MI_xforms_SUFFIX","Suffix du texte pour les champs requis");
+define("_MI_xforms_INTRO","Texte d'introduction pour la page d'accueil");
+define("_MI_xforms_GLOBAL","Texte à afficher dans chaque formulaire");
+
+// admin/menu.php
+define("_MI_xforms_ADMENU3","Modifier les éléments du formulaire");
+define("_MI_xforms_ADMENU5","À propos");
+
+######### (liaise) version 1.21 additions #########
+// preferences default values
+define("_MI_xforms_INTRO_DEFAULT","Contactez nous librement au moyen du formulaire suivant:");
+define("_MI_xforms_GLOBAL_DEFAULT","* Requis");
+
+######### (liaise) version 1.23 additions #########
+define("_MI_xforms_UPLOADDIR","Chemin physique de votre répertoire SANS le slash / de fin.");
+define("_MI_xforms_UPLOADDIR_DESC","Tous les fichiers envoyés seront stockés ici quand un formulaire est envoyé par l'intermédiaire de message privé");
+
+######### (xforms) version 1.0 additions ##########
+define( "_MI_xforms_CAPTCHA", "Usiliser la sécurité anti-spam ?" );
+define( "_MI_xforms_CAPTCHADSC", "Sélectionner Oui pour activer la sécurité au pied des formulaires formulaires.<br />Par défaut : Oui" );
+define("_MI_xforms_ADMENU4","Importer les formulaires créés dans Liaise");
+
+######### (xforms) version 1.0.0.1 additions ##########
+define("_MI_xforms_NOFORM","Texte montré lorsqu'il n'y a aucun formulaire visible pour l'utilisateur actuel.");
+define("_MI_xforms_NOFORM_DEFAULT","Désolé, il n'y a actuellement aucun formulaire (visible pour vous).");
+
+define("_MI_xforms_ADMENU0","Accueil");
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
