xoops-svn — All SVN commits will be posted to this ML

[xoops-svn] SF.net SVN: xoops:[9852] XoopsModules/news/trunk/news

[<be...@us...>]

Revision: 9852
          http://xoops.svn.sourceforge.net/xoops/?rev=9852&view=rev
Author:   beckmi
Date:     2012-07-11 19:53:33 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Removing Dojo related files

Removed Paths:
-------------
    XoopsModules/news/trunk/news/images/dojo/
    XoopsModules/news/trunk/news/js/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9851] XoopsModules/news/trunk/news/language

[<be...@us...>]

Revision: 9851
          http://xoops.svn.sourceforge.net/xoops/?rev=9851&view=rev
Author:   beckmi
Date:     2012-07-11 19:31:02 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Updating French files

Added Paths:
-----------
    XoopsModules/news/trunk/news/language/french/
    XoopsModules/news/trunk/news/language/french/admin.php
    XoopsModules/news/trunk/news/language/french/blocks.php
    XoopsModules/news/trunk/news/language/french/help/
    XoopsModules/news/trunk/news/language/french/help/help.html
    XoopsModules/news/trunk/news/language/french/help/index.html
    XoopsModules/news/trunk/news/language/french/index.html
    XoopsModules/news/trunk/news/language/french/mail_template/
    XoopsModules/news/trunk/news/language/french/mail_template/category_newstory_notify.tpl
    XoopsModules/news/trunk/news/language/french/mail_template/global_newcategory_notify.tpl
    XoopsModules/news/trunk/news/language/french/mail_template/global_newstory_notify.tpl
    XoopsModules/news/trunk/news/language/french/mail_template/global_storysubmit_notify.tpl
    XoopsModules/news/trunk/news/language/french/mail_template/index.html
    XoopsModules/news/trunk/news/language/french/mail_template/story_approve_notify.tpl
    XoopsModules/news/trunk/news/language/french/mail_template/topic_newstory_notify.tpl
    XoopsModules/news/trunk/news/language/french/main.php
    XoopsModules/news/trunk/news/language/french/modinfo.php
    XoopsModules/news/trunk/news/language/french/newsletter.php

Added: XoopsModules/news/trunk/news/language/french/admin.php
===================================================================
--- XoopsModules/news/trunk/news/language/french/admin.php	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/admin.php	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,237 @@
+<?php
+// $Id$
+// Support Francophone de Xoops (www.frxoops.org)
+//%%%%%%        Admin Module Name  Articles         %%%%%
+define("_AM_DBUPDATED","Base de données mise à jour avec succès !");
+define("_AM_CONFIG","Configuration des articles");
+define("_AM_AUTOARTICLES","Articles automatisés");
+define("_AM_STORYID","ID de l'article");
+define("_AM_TITLE","Titre");
+define("_AM_TOPIC","Sujet");
+define("_AM_POSTER","Auteur");
+define("_AM_PROGRAMMED","Date et heure programmée");
+define("_AM_ACTION","Action");
+define("_AM_EDIT","Editer");
+define("_AM_DELETE","Effacer");
+define("_AM_LAST10ARTS","Les %d derniers articles");
+define("_AM_PUBLISHED","Publié le"); // Published Date
+define("_AM_GO","Ok");
+define("_AM_EDITARTICLE","Editer l'article");
+define("_AM_POSTNEWARTICLE","Poster un nouvel article");
+define("_AM_ARTPUBLISHED","Votre article a été publié !"); // mail
+define("_AM_HELLO","Bonjour %s,"); // mail
+define("_AM_YOURARTPUB","Votre article soumis sur notre site a été publié."); // mail
+define("_AM_TITLEC","Titre : "); // mail
+define("_AM_URLC","URL : "); // mail
+define("_AM_PUBLISHEDC","Publié le : "); // mail
+define("_AM_RUSUREDEL","Etes-vous sûr de vouloir supprimer cet article et tous ses commentaires ?");
+define("_AM_YES","Oui");
+define("_AM_NO","Non");
+define("_AM_INTROTEXT","Texte de l'introduction");
+define("_AM_EXTEXT","Suite du texte");
+define("_AM_ALLOWEDHTML","HTML autorisé :");
+define("_AM_DISAMILEY","Désactiver les émoticônes");
+define("_AM_DISHTML","Désactiver le HTML");
+define("_AM_APPROVE","Approuver");
+define("_AM_MOVETOTOP","Déplacer cet article au Top");
+define("_AM_CHANGEDATETIME","Changer la date et l'heure de publication");
+define("_AM_NOWSETTIME","L'heure est maintenant définie à : %s"); // %s is datetime of publish
+define("_AM_CURRENTTIME","Actuellement il est : %s");  // %s is the current datetime
+define("_AM_SETDATETIME","Paramétrer la date et l'heure de publication");
+define("_AM_MONTHC","Mois :");
+define("_AM_DAYC","Jour :");
+define("_AM_YEARC","Année :");
+define("_AM_TIMEC","Heure :");
+define("_AM_PREVIEW","Prévisualiser");
+define("_AM_SAVE","Sauvegarder");
+define("_AM_PUBINHOME","Publier en page d'accueil ?");
+define("_AM_ADD","Ajouter");
+
+//%%%%%%        Admin Module Name  Topics         %%%%%
+
+define("_AM_ADDMTOPIC","Ajouter un sujet PRINCIPAL");
+define("_AM_TOPICNAME","Nom du sujet");
+// Attention, modifié de 40 à 255 caractères.
+define("_AM_MAX40CHAR","(maxi : 255 caractères)");
+define("_AM_TOPICIMG","Image du sujet");
+define("_AM_IMGNAEXLOC","nom de l'image + extension placé dans %s");
+define("_AM_FEXAMPLE","par exemple : games.gif");
+define("_AM_ADDSUBTOPIC","Ajouter un sous-sujet");
+define("_AM_IN","dans");
+define("_AM_MODIFYTOPIC","Modifier le sujet");
+define("_AM_MODIFY","Modifier");
+define("_AM_PARENTTOPIC","Sujet parent");
+define("_AM_SAVECHANGE","Sauvegarder les changements");
+define("_AM_DEL","Effacer");
+define("_AM_CANCEL","Annuler");
+define("_AM_WAYSYWTDTTAL","ATTENTION : Etes-vous sûr de vouloir supprimer ce sujet et tous ses articles et commentaires ?");
+
+
+// Added in Beta6
+define("_AM_TOPICSMNGR","Gestionnaire de sujets");
+define("_AM_PEARTICLES","Gestion des articles");
+define("_AM_NEWSUB","Nouvelles propositions");
+define("_AM_POSTED","Posté le");
+define("_AM_GENERALCONF","Configuration générale");
+
+
+// Added in RC2
+define("_AM_TOPICDISPLAY","Afficher l'image du sujet ?");
+define("_AM_TOPICALIGN","Position");
+define("_AM_RIGHT","Droite");
+define("_AM_LEFT","Gauche");
+
+define("_AM_EXPARTS","Articles expirés");
+define("_AM_EXPIRED","Expiré");
+define("_AM_CHANGEEXPDATETIME","Changer la date et l'heure d'expiration");
+define("_AM_SETEXPDATETIME","Paramétrer la date et l'heure d'expiration");
+define("_AM_NOWSETEXPTIME","L'heure est maintenant définie à : %s");
+
+// Added in RC3
+define("_AM_ERRORTOPICNAME", "Vous devez entrer un nom de sujet !");
+define("_AM_EMPTYNODELETE", "Rien à supprimer !");
+
+// Added 240304 (Mithrandir)
+define('_AM_GROUPPERM', "Permissions des groupes");
+define('_AM_SELFILE','Sélectionnez un fichier');
+
+// Added by Hervé
+define('_AM_UPLOAD_DBERROR_SAVE',"Erreur pendant le rattachement d'un fichier à un article");
+define('_AM_UPLOAD_ERROR',"Erreur pendant le téléchargement du fichier vers le serveur");
+define('_AM_UPLOAD_ATTACHFILE',"Fichier(s) attaché(s)");
+define('_AM_APPROVEFORM', "Permission d'approuver");
+define('_AM_SUBMITFORM', "Permission de soumettre");
+define('_AM_VIEWFORM', "Permission de consulter");
+define('_AM_APPROVEFORM_DESC', "Choisissez les groupes qui peuvent approuver les articles pour les sujets affichés");
+define('_AM_SUBMITFORM_DESC', "Choisissez les groupes qui peuvent soumettre des articles pour les sujets affichés");
+define('_AM_VIEWFORM_DESC', "Choisissez les groupes qui peuvent visualiser les sujets affichés");
+define('_AM_DELETE_SELFILES', "Supprimer les fichiers sélectionnés");
+define('_AM_TOPIC_PICTURE', "Télécharger l'image du sujet");
+define('_AM_UPLOAD_WARNING', "<b>Attention, n'oubliez pas d'appliquer les permissions d'écriture au répertoire suivant : %s </b>");
+
+define('_AM_NEWS_UPGRADECOMPLETE', "Mise à jour terminée");
+define('_AM_NEWS_UPDATEMODULE', "Mise à jour des thèmes des modules et des blocs");
+define('_AM_NEWS_UPGRADEFAILED', "La mise à jour a échouée");
+define('_AM_NEWS_UPGRADE', "Mise à jour");
+define('_AM_ADD_TOPIC', "Ajouter un sujet");
+define('_AM_ADD_TOPIC_ERROR',"Erreur, ce sujet existe déja !");
+define('_AM_ADD_TOPIC_ERROR1',"ERREUR : Impossible de selectionner ce sujet comme sujet parent !");
+define('_AM_SUB_MENU',"Publier ce sujet comme un sous-menu");
+define('_AM_SUB_MENU_YESNO',"Sous-menu ?");
+define('_AM_HITS', "Hits");
+define('_AM_CREATED', "Créé");
+
+define('_AM_TOPIC_DESCR', "Description du sujet");
+define('_AM_USERS_LIST', "Liste des utilisateurs");
+define('_AM_PUBLISH_FRONTPAGE', "Publier en première page ?");
+define('_AM_NEWS_UPGRADEFAILED1', "Impossible de créer la table 'stories_files'");
+define('_AM_NEWS_UPGRADEFAILED2', "Impossible de modifier la longueur du titre du sujet");
+define('_AM_NEWS_UPGRADEFAILED21', "Impossible d'ajouter les nouveaux champs dans la table 'topics'");
+define('_AM_NEWS_UPGRADEFAILED3', "Impossible de créer la table 'stories_votedata'");
+define('_AM_NEWS_UPGRADEFAILED4', "Impossible de créer les deux champs 'rating' and 'votes' dans la table 'story'");
+define('_AM_NEWS_UPGRADEFAILED0', "Veuillez noter les messages et tenter de corriger les problèmes avec phpMyadmin et le fichier de définition de sql disponible dans le dossier « sql » du module news");
+define('_AM_NEWS_UPGR_ACCESS_ERROR',"Erreur pour utiliser le script de mise à jour, vous devez être administrateur du module");
+define('_AM_NEWS_PRUNE_BEFORE',"Purger les articles qui ont été publiés avant le");
+define('_AM_NEWS_PRUNE_EXPIREDONLY',"Supprimer seulement les articles qui sont expirés");
+define('_AM_NEWS_PRUNE_CONFIRM',"Attention, vous êtes sur le point de supprimer définitivement les articles qui ont été publiés avant le %s (cette action ne peut être annulée). Cela représente %s articles.<br />En êtes-vous certain(e) ?");
+define('_AM_NEWS_PRUNE_TOPICS',"Se limiter aux sujets suivants");
+define('_AM_NEWS_PRUNENEWS', "Purger les articles");
+define('_AM_NEWS_EXPORT_NEWS', "Exporter les articles en XML");
+define('_AM_NEWS_EXPORT_NOTHING', "Désolé, il n'y a rien à exporter, merci de vérifier vos critères");
+define('_AM_NEWS_PRUNE_DELETED', "%d articles ont été supprimés");
+define('_AM_NEWS_PERM_WARNING', "<h2>Attention, il y a 3 formulaires, donc vous devez valider trois boutons</h2>");
+define('_AM_NEWS_EXPORT_BETWEEN', "Exporter les articles publiés entre le");
+define('_AM_NEWS_EXPORT_AND', " et ");
+define('_AM_NEWS_EXPORT_PRUNE_DSC', "Si vous ne sélectionnez rien, alors tous les sujets seront utilisés<br/> sinon, seuls les sujets selectionnés seront utilisés");
+define('_AM_NEWS_EXPORT_INCTOPICS', "Inclure la description des sujets ?");
+define('_AM_NEWS_EXPORT_ERROR', "Erreur pendant la création du fichier %s. Opération annulée.");
+define('_AM_NEWS_EXPORT_READY', "L'export du fichier au format xml est disponible pour téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas <a href='%s'>de le supprimer </a> une fois que vous avez terminé.");
+define('_AM_NEWS_RSS_URL', "URL du flux RSS");
+define('_AM_NEWS_NEWSLETTER', "Bulletin d'information");
+define('_AM_NEWS_NEWSLETTER_BETWEEN', "Sélectionner les articles publiés entre le");
+define('_AM_NEWS_NEWSLETTER_READY', "Votre Bulletin d'information est disponible au téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas de <a href='%s'>le supprimer</a> une fois que vous avez terminé.");
+define('_AM_NEWS_DELETED_OK',"Fichier supprimé avec succès");
+define('_AM_NEWS_DELETED_PB',"Un problème a été rencontré pendant la suppression du fichier");
+define('_AM_NEWS_STATS0',"Statistiques des sujets");
+define('_AM_NEWS_STATS',"Statistiques");
+define('_AM_NEWS_STATS1',"Auteurs");
+define('_AM_NEWS_STATS2',"Total");
+define('_AM_NEWS_STATS3',"Statistiques des articles");
+define('_AM_NEWS_STATS4',"Articles les plus lus");
+define('_AM_NEWS_STATS5',"Articles les moins lus");
+define('_AM_NEWS_STATS6',"Articles les mieux cotés");
+define('_AM_NEWS_STATS7',"Auteurs les plus lus");
+define('_AM_NEWS_STATS8',"Auteurs les mieux cotés");
+define('_AM_NEWS_STATS9',"Meilleurs contributeurs");
+define('_AM_NEWS_STATS10',"Statistiques par Auteurs");
+define('_AM_NEWS_STATS11',"Nombre d'articles");
+define('_AM_NEWS_HELP',"Aide");
+define("_AM_NEWS_MODULEADMIN"," - Administration");
+define("_AM_NEWS_GENERALSET", "Options du module" );
+define('_AM_NEWS_GOTOMOD','Aller au module');
+define('_AM_NEWS_NOTHING',"Désolé mais il n'y a rien à télécharger, vérifiez vos critères");
+define('_AM_NEWS_NOTHING_PRUNE',"Désolé, mais il n'y a rien à purger, vérifiez vos critères");
+define('_AM_NEWS_TOPIC_COLOR',"Couleur du sujet");
+define('_AM_NEWS_COLOR',"Couleur");
+define('_AM_NEWS_REMOVE_BR',"Convertir les balises html &lt;br /&gt; en un retour à la ligne ?");
+// Added in 1.3 RC2
+define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Veuillez mettre à jour le module s'il vous plait</font></a>");
+
+// Added in version 1.50
+define('_AM_NEWS_NEWSLETTER_HEADER', "Entête");
+define('_AM_NEWS_NEWSLETTER_FOOTER', "Pied de page");
+define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Supprimer les balises html ?");
+define('_AM_NEWS_VERIFY_TABLES',"Maintenir les tables");
+define('_AM_NEWS_METAGEN',"Metagen");
+define('_AM_NEWS_METAGEN_DESC',"Le Metagen est un système qui peut vous aider à avoir des pages mieux indexées par les moteurs de recherche.<br />Sauf si vous entrez vous-même les meta keywords et meta desriptions, le module les génèrera automatiquement pour chaque article.");
+define('_AM_NEWS_BLACKLIST',"Liste noire");
+define('_AM_NEWS_BLACKLIST_DESC',"Les mots contenus dans cette liste<br />ne seront pas utilisés lors de la création des meta keywords");
+define('_AM_NEWS_BLACKLIST_ADD',"Ajouter");
+define('_AM_NEWS_BLACKLIST_ADD_DSC',"Entrez des mots à ajouter dans la liste<br />(un mot par ligne)");
+define('_AM_NEWS_META_KEYWORDS_CNT',"Nombre maximal de meta mots clés à générer");
+define('_AM_NEWS_META_KEYWORDS_ORDER',"Ordre des mots clés");
+define('_AM_NEWS_META_KEYWORDS_INTEXT',"Ordre d'apparition dans le texte");
+define('_AM_NEWS_META_KEYWORDS_FREQ1',"Ordre de fréquence des mots");
+define('_AM_NEWS_META_KEYWORDS_FREQ2',"Ordre inverse de la fréquence des mots");
+
+// Added in version 1.67
+// About.php
+define('_AM_NEWS_ABOUT_RELEASEDATE',"Sorti : ");
+define('_AM_NEWS_ABOUT_UPDATEDATE',"Mise à jour : ");
+define('_AM_NEWS_ABOUT_AUTHOR',"Auteur : ");
+define('_AM_NEWS_ABOUT_CREDITS',"Remerciements : ");
+define('_AM_NEWS_ABOUT_LICENSE',"Licence : ");
+define('_AM_NEWS_ABOUT_MODULE_STATUS',"Statut : ");
+define('_AM_NEWS_ABOUT_WEBSITE',"Site internet : ");
+define('_AM_NEWS_ABOUT_AUTHOR_NAME',"Nom de l'auteur: ");
+define('_AM_NEWS_ABOUT_CHANGELOG',"Journal des modifications");
+define('_AM_NEWS_ABOUT_MODULE_INFO',"Informations sur le module");
+define('_AM_NEWS_ABOUT_AUTHOR_INFO',"Informations sur l'auteur");
+define('_AM_NEWS_ABOUT_DESCRIPTION',"Description : ");
+// Configuration check
+define("_AM_NEWS_CONFIG_CHECK","Vérification de la configuration");
+define("_AM_NEWS_CONFIG_PHP","Version minimum de PHP requise: %s (votre version actuelle est la %s)");
+define("_AM_NEWS_CONFIG_XOOPS","Version minimum de XOOPS requise:  %s (votre version actuelle est la %s)"); 
+
+
+define ("_AM_NEWS_STATISTICS", "Statistiques des articles");
+define ("_AM_NEWS_THEREARE_STORIES", "Il y a <span class='red bold'>%s</span> Articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "Il y a <span class='red bold'>%s</span> Articles publiés à l'accueil");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "Il y a  <span class='red bold'>%s</span> Fichiers d'articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "Il y a <span class='red bold'>%s</span> Fichiers d'articles en ligne");
+define ("_AM_NEWS_THEREARE_TOPICS", "Il y a <span class='red bold'>%s</span> Catégories dans la base de données");
+define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "Il y a <span class='red bold'>%s</span> Catégories visibles dans le Menu");
+define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Il y a <span class='red bold'>%s</span> Articles visionnés");
+define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Il y a <span class='red bold'>%s</span> Articles importés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Il y a <span class='red bold'>%s</span> Articles exportés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "Il y a <span class='red bold'>%s</span> Articles expirés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "Il y a <span class='red bold'>%s</span> Articles qui vont expirer bientôt");
+define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "Il y a <span class='red bold'>%s</span> Articles approuvées");
+define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "Il y a <span class='red bold'>%s</span> Articles qui sont en attente d'approbation");
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 17 juin 2012
+ * @version         $Id $
+**/
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/blocks.php
===================================================================
--- XoopsModules/news/trunk/news/language/french/blocks.php	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/blocks.php	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,58 @@
+<?php
+// $Id$
+define("_MB_NEWS_NOTYET","Il n'y a pas encore d'article du jour.");
+define("_MB_NEWS_TMRSI","Aujourd'hui l'article le plus lu est :");
+define("_MB_NEWS_ORDER","Ordre");
+define("_MB_NEWS_DATE","Date de publication");
+define("_MB_NEWS_HITS","Nombre de lectures");
+define("_MB_NEWS_DISP","Affichage");
+define("_MB_NEWS_ARTCLS","articles");
+define("_MB_NEWS_CHARS","Longueur du titre");
+define("_MB_NEWS_LENGTH"," caractères");
+define("_MB_TITLE","Titre");
+define("_MB_POSTED","Posté le");
+define("_MB_POSTER","Expéditeur");
+define("_MB_ACTION","Action");
+define("_MB_TOPIC","Sujet");
+define("_MB_DELETE","Effacer");
+define("_MB_NEWS_RESTRICTTOPICS", "Restreindre les sujets visibles par utilisateur ?");
+define("_MB_NEWS_TEASER", "Longueur du texte de l'article (0 pour ne pas avoir de texte)");
+define("_MB_NEWS_SPOTLIGHT", "Utiliser l'option Spotlight ");
+define("_MB_NEWS_FIRST", "--Premier élément--");
+define("_MB_NEWS_IMAGE", "Image pour Spotlight");
+define("_MB_SPOTLIGHT_TOPIC", "Sélectioner le(s) sujet(s) à utiliser");
+define("_MB_SPOTLIGHT_ALL_TOPICS", "Tous les sujets");
+define("_MB_NEWS_SPOTLIGHT_ARTICLE", "Sélectionnez les articles:");
+define("_MB_READMORE","En savoir plus...");
+define("_MB_NEWS_RATE","Cotation");
+define("_MB_NEWS_SHOW_NEWS_COUNT","Montrer le compteur d'articles ?");
+define("_MB_NEWS_SPOTLIGHT_TITLE", "A la une");
+define("_MB_NEWS_VIEW_TYPE1", "Classique");
+define("_MB_NEWS_VIEW_TYPE2", "Par onglets");
+define("_MB_NEWS_TAB_COLOR1", "Couleur de la barre du haut (c'est la ligne qui est juste sous le nom de l'onglet)");
+define("_MB_NEWS_TAB_COLOR2", "Couleur de fond du contenu de l'onglet courant");
+define("_MB_NEWS_TAB_COLOR3", "Couleur de l'entête de l'onglet en cours");
+define("_MB_NEWS_TAB_COLOR4", "Couleur des entêtes des onglets non sélectionnés");
+define("_MB_NEWS_TAB_COLOR5", "Couleur de survol des onglets");
+define("_MB_NEWS_WHAT_PUBLISH", "Que souhaitez vous publier<br />pour l'article à la une ?");
+define("_MB_NEWS_RECENT_NEWS", "Les articles récents (n'utilisez pas la liste ci-dessous)");
+define("_MB_NEWS_RECENT_SPECIFIC", "Un article spécifique (voir en dessous)");
+define("_MB_NEWS_DEFAULT_COLORS", "Laissez les zones vides pour utiliser les couleurs par défaut");
+
+// Added in version 1.50
+define("_MB_NEWS_CAL_YEAR", "Année");
+define("_MB_NEWS_CAL_MONTH", "Mois");
+define("_MB_NEWS_STARTING_DATE", "Date de début");
+define("_MB_NEWS_ENDING_DATE", "Date de fin");
+define("_MB_NEWS_UNTIL_TODAY", "ou jusqu'à aujourd'hui");
+define("_MB_NEWS_RECENT_FIRST", "Les plus récents en premier");
+define("_MB_NEWS_OLDER_FIRST", "Les plus anciens en premier");
+
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version         $Id $
+**/
+?>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/help/help.html
===================================================================
--- XoopsModules/news/trunk/news/language/french/help/help.html	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/help/help.html	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,68 @@
+<div id="help-template" class="outer">
+    <h1 class="head">Aide :
+        <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/news/admin/index.php"
+           title="Back to the administration of News"> News
+            <img src="<{xoAdminIcons home.png}>"
+                 alt="Back to the Administration of News"/>
+        </a></h1>
+
+    <h4 class="odd">Description</h4><br />
+    <p class="even">
+
+        <b>Possibilit&eacute;s du module :</b><br /><br />
+        . G&eacute;rer les sujets et sous-sujets<br />
+        . Cr&eacute;er des autorisations strictes (qui peut lire, qui peut publier, qui peut
+        approuver)<br />
+        . Possibilit&eacute; de valider les articles par certains groupes d'utilisateurs<br />
+        . Vous pouvez mettre l'accent sur votre contenu avec quelques blocs<br />
+        . Possibilit&eacute; de lire les articles avec le fil RSS<br />
+        . Utiliser des articles automatis&eacute;s et des articles p&eacute;rim&eacute;s<br />
+        . Recherche int&eacute;gr&eacute;e<br />
+        . Diff&eacute;rentes statistiques pour l'administrateur du module<br />
+        . Possibilit&eacute; d'ajouter la publicit&eacute; &agrave; vos articles<br />
+        . Documentation (en fran&ccedil;ais pour le moment)<br />
+        . Articles &agrave; pages multiples, avec un titre personnalis&eacute; pour chaque page<br />
+        . Possibilit&eacute; d'utiliser les m&eacute;tadonn&eacute;es du Dublin Core<br />
+        . Possibilit&eacute; d'utiliser FireFox 2 "micror&eacute;sum&eacute;"<br />
+        . Favoris sociaux de type Web 2 tels que del.icio.us, newsvine.com,
+        yahoo<br />
+        . Liens vers l'article pr&eacute;c&eacute;dent et suivant (et un tableau r&eacute;capitulatif)<br />
+        . Utilise un syst&egrave;me int&eacute;gr&eacute; d'alerte (par exemple lorsqu'un article est
+        publi&eacute;)<br />
+        . Plusieurs blocs<br />
+        . etc<br /><br />
+
+        Le module vous aidera &eacute;galement &agrave; avoir des pages aim&eacute;es des moteurs de recherche
+        en utilisant des titres de pages significatifs (cr&eacute;&eacute;s &agrave; partir de votre contenu) et d'avoir
+        meta mots cl&eacute;s et description meta cr&eacute;&eacute;es aussi &agrave; partir de votre contenu.
+
+        Le module peut &eacute;galement &ecirc;tre utilis&eacute;, comme c'est le cas sur certains sites, pour cr&eacute;er un
+        blog<br /><br /></p>
+
+    <h4 class="odd">Comment installer le module "News"</h4><br />
+    <p class="even">
+
+        "News" est install&eacute; comme un module Xoops habituel, ce qui signifie que vous devez copier
+        le
+        dossier complet /news dans le r&eacute;pertoire /modules de votre site Web. Puis
+        Connectez-vous &agrave; votre site en tant qu'administrateur, allez dans syst&egrave;me d'Administration > Modules, recherchez
+        l'ic&ocirc;ne de "News" dans la liste des modules d&eacute;sinstall&eacute;s, puis cliquez sur l'ic&ocirc;ne
+        d'installation. Suivez les instructions &agrave; l'&eacute;cran et vous serez pr&ecirc;t &agrave;
+        commencer.<br /><br />
+        Des instructions d&eacute;taill&eacute;es sur l'installation de modules sont disponibles dans le
+        <a href="http://goo.gl/adT2i">Manuel des op&eacute;rations de XOOPS</a> <br /><br />
+
+        V&eacute;rifiez que le r&eacute;pertoire modules\news\images\topics est accessible en &eacute;criture
+        sur le
+        serveur (chmod=777).<br /><br />
+
+        Apr&egrave;s avoir cr&eacute;&eacute; votre premier sujet (cat&eacute;gorie) et avant de cr&eacute;er
+        votre premier
+        article, vous devez cliquer sur l'onglet des Permissions pour d&eacute;finir les permissions
+        des groupes.<br /><br /></p>
+
+    <h4 class="odd">Tutoriel</h4><br />
+    <p class="even">
+        Pas disponible pour le moment.<br /></p>
+
+</div>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/help/index.html
===================================================================
--- XoopsModules/news/trunk/news/language/french/help/index.html	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/help/index.html	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/index.html
===================================================================
--- XoopsModules/news/trunk/news/language/french/index.html	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/index.html	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/mail_template/category_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/category_newstory_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/category_newstory_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 l'adresse suivante :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuille mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/mail_template/global_newcategory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/global_newcategory_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/global_newcategory_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouveau sujet d'articles "{TOPIC_NAME}" a \xE9t\xE9 cr\xE9\xE9 sur {X_SITENAME}.
+
+Suivez ce lien pour voir la page d'index des articles :
+{X_MODULE_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux sujets d'articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/mail_template/global_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/global_newstory_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/global_newstory_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 l'adresse suivante :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuille mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/mail_template/global_storysubmit_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/global_storysubmit_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/global_storysubmit_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 propos\xE9 sur {X_SITENAME} et est en attente d'\xEAtre approuv\xE9.
+
+Vous pouvez voir cette proposition d'article ici :
+{WAITINGSTORIES_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont propos\xE9s sur notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/mail_template/index.html
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/index.html	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/index.html	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/mail_template/story_approve_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/story_approve_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/story_approve_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Votre proposition d'article "{STORY_NAME}" a \xE9t\xE9 approuv\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 cette adresse :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand votre article aura \xE9t\xE9 approuv\xE9.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/mail_template/topic_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/french/mail_template/topic_newstory_notify.tpl	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/mail_template/topic_newstory_notify.tpl	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 \xE0 {X_SITENAME} dans {TOPIC_NAME}.
+
+Vous pouvez visualiser cet article \xE0 cette adresse :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message car vous avez souhait\xE9 \xEAtre notifi\xE9 lorsque de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne souhaitez plus recevoir de notifications, veuillez mettre \xE0 jours vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}

Added: XoopsModules/news/trunk/news/language/french/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/french/main.php	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/main.php	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,144 @@
+<?php
+// $Id$
+//%%%%%%		File Name index.php 		%%%%%
+define('_NW_PRINTER',"Version imprimable");
+define('_NW_SENDSTORY',"Envoyer cet article à un ami");
+define('_NW_READMORE',"Lire la suite...");
+define('_NW_COMMENTS',"Commentaires ?");
+define('_NW_ONECOMMENT',"1 commentaire");
+define('_NW_BYTESMORE',"%s octets en plus");
+define('_NW_NUMCOMMENTS',"%s commentaires");
+define('_NW_MORERELEASES', "Plus d'articles dans le sujet ");
+
+
+//%%%%%%		File Name submit.php		%%%%%
+define('_NW_SUBMITNEWS',"Proposer un article");
+define('_NW_TITLE',"Titre");
+define('_NW_TOPIC',"Sujet");
+define('_NW_THESCOOP',"Le Scoop");
+define('_NW_NOTIFYPUBLISH',"Notifier par mail lors de la publication");
+define('_NW_POST',"Publier");
+define('_NW_GO',"Ok");
+define('_NW_THANKS',"Merci pour votre participation."); //submission of news article
+
+define('_NW_NOTIFYSBJCT',"Des articles à publier sur le site"); // Notification mail subject
+define('_NW_NOTIFYMSG',"Hé! Vous avez de nouvelles propositions d'articles pour votre site."); // Notification mail message
+
+//%%%%%%		File Name archive.php		%%%%%
+define('_NW_NEWSARCHIVES',"Archives");
+define('_NW_ARTICLES',"Articles");
+define('_NW_VIEWS',"Lectures");
+define('_NW_DATE',"Date");
+define('_NW_ACTIONS',"Actions");
+define('_NW_PRINTERFRIENDLY',"Format imprimable");
+
+define('_NW_THEREAREINTOTAL',"Il y a %s article(s) au total");
+
+// %s is your site name
+define('_NW_INTARTICLE',"Article intéressant sur %s");
+define('_NW_INTARTFOUND',"Voici un article intéressant trouvé sur %s");
+
+define('_NW_TOPICC',"Sujet :");
+define('_NW_URL',"Site :");
+define('_NW_NOSTORY',"Désolé, l'article sélectionné n'existe pas.");
+
+//%%%%%%	File Name print.php 	%%%%%
+
+define('_NW_URLFORSTORY',"L'adresse de cet article est :");
+
+// %s represents your site name
+define('_NW_THISCOMESFROM',"Cet article provient de %s");
+
+// Added by Hervé
+define('_NW_ATTACHEDFILES',"Fichiers attachés : ");
+define('_NW_ATTACHEDLIB',"Cet article a des fichiers attachés");
+define('_NW_NEWSSAMEAUTHORLINK',"Articles du même auteur");
+define('_NW_NEWS_NO_TOPICS',"Désolé, mais il n'y actuellement aucun sujet, merci de le créer avant de soumettre un article");
+define('_NW_PREVIOUS_ARTICLE',"Article précédent");
+define('_NW_NEXT_ARTICLE',"Article suivant");
+define('_NW_OTHER_ARTICLES',"Autres articles");
+
+// Added by Hervé in version 1.3 for rating
+define('_NW_RATETHISNEWS',"Noter cet article");
+define('_NW_RATEIT',"Notez-le !");
+define('_NW_TOTALRATE',"Total des votes");
+define('_NW_RATINGLTOH',"Notation (du score le plus bas au score le plus haut)");
+define('_NW_RATINGHTOL',"Notation (du score le plus haut au score le plus bas)");
+define('_NW_RATINGC',"Note: ");
+define('_NW_RATINGSCALE',"L'échelle va de 1 à 10, 1 étant Pas Terrible quand 10 est Excellent.");
+define('_NW_BEOBJECTIVE',"Merci de rester objectif, si tout le monde reçoit une note de 1 ou 10, la notation n'est pas très utile.");
+define('_NW_DONOTVOTE',"Merci de ne pas voter pour vos propres participations.");
+define('_NW_RATING',"Notation");
+define('_NW_VOTE',"Vote");
+define('_NW_NORATING',"Aucune note sélectionnée.");
+define('_NW_USERAVG',"Note moyenne");
+define('_NW_DLRATINGS',"Note des articles (nombre total de vote: %s)");
+define('_NW_ONEVOTE',"1 vote");
+define('_NW_NUMVOTES',"%u votes");		// Warning
+define('_NW_CANTVOTEOWN',"Vous ne pouvez pas  voter pour une ressource que vous avez proposé.<br />All votes are logged and reviewed.");
+define('_NW_VOTEDELETED',"Données de vote supprimées.");
+define('_NW_VOTEONCE',"Merci de ne pas  voter pour une même ressource plus d'une fois.");
+define('_NW_VOTEAPPRE',"Merci pour votre vote.");
+define('_NW_THANKYOU',"Merci d'avoir pris le temps de voter ici sur %s"); // %s is your site name
+define('_NW_RSSFEED',"Flux RSS");	// Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes
+define('_NW_AUTHOR',"Auteur");
+define('_NW_META_DESCRIPTION',"Description Meta");
+define('_NW_META_KEYWORDS',"Meta mots clés");
+define('_NW_MAKEPDF',"Créer un fichier PDF à partir de cet article");
+define('_MD_POSTEDON',"Publié le  ");
+define('_NW_AUTHOR_ID',"ID de l'auteur");
+define('_NW_POST_SORRY',"Désolé mais soit il n'y a pas de sujets soit vous n'avez pas le droit de créer des articles dans les sujets existants. Si vous êtes les webmaster, allez dans les permissions et définissez les permissions de 'Soumettre'.");
+
+// Added in v 1.50
+define('_NW_LINKS',"Liens");
+define('_NW_PAGE',"Page");
+define('_NW_BOOKMARK_ME',"Signets Sociaux");
+define('_AM_NEWS_TOTAL',"Total de %u articles");
+define('_AM_NEWS_WHOS_WHO',"Annuaire des Auteurs");
+define('_NW_NEWS_LIST_OF_AUTHORS',"Voici une liste des auteurs de ce site, cliquez sur leur nom pour voir leurs articles");
+define('_AM_NEWS_TOPICS_DIRECTORY',"Répertoire des sujets");
+define('_NW_PAGE_AUTO_SUMMARY',"Page %d  %s");
+// Added in version 1.51
+define('_NW_BOOKMARK_TO_BLINKLIST',"Mettre en favoris dans Blinklist");
+define('_NW_BOOKMARK_TO_DELICIOUS',"Mettre en favoris dans del.icio.us");
+define('_NW_BOOKMARK_TO_DIGG',"Mettre en favoris dans Digg");
+define('_NW_BOOKMARK_TO_FARK',"Mettre en favoris dans Fark");
+define('_NW_BOOKMARK_TO_FURL',"Mettre en favoris dans Furl");
+define('_NW_BOOKMARK_TO_NEWSVINE',"Mettre en favoris dans Newsvine");
+define('_NW_BOOKMARK_TO_REDDIT',"Mettre en favoris dans Reddit");
+define('_NW_BOOKMARK_TO_SIMPY',"Mettre en favoris dans Simpy");
+define('_NW_BOOKMARK_TO_SPURL',"Mettre en favoris dans Spurl");
+define('_NW_BOOKMARK_TO_YAHOO',"Mettre en favoris dans Yahoo");
+
+// Added in version 1.56
+define('_NW_NOTYETSTORY',"Désolé, l'artcile sélectionné n'a pas encore été publié. Veuillez revenir plus tard.");
+define('_NW_SELECT_IMAGE', "Choisissez une image à joindre à l'article");
+define('_NW_CURENT_PICTURE', "Image actuelle");
+// Added in version 1.67
+define('_NW_BOOKMARK_TO_FACEBOOK', "Mettre en favoris dans Faceboom");
+define('_NW_BOOKMARK_TO_TWITTER', "Mettre en favoris dans Twitter");
+define('_NW_BOOKMARK_TO_SCRIPSTYLE', "Mettre en favoris dans Scripstyle");
+define('_NW_BOOKMARK_TO_STUMBLE', "Mettre en favoris dans Stumble");
+define('_NW_BOOKMARK_TO_TECHNORATI', "Mettre en favoris dans Technorati");
+define('_NW_BOOKMARK_TO_MIXX', "Mettre en favoris dans Mixx");
+define('_NW_BOOKMARK_TO_MYSPACE', "Mettre en favoris dans Myspace");
+define('_NW_BOOKMARK_TO_DESIGNFLOAT', "Mettre en favoris dans Designfloat");
+define('_NW_BOOKMARK_TO_BALATARIN', "Mettre en favoris dans Balatarin");
+define('_NW_BOOKMARK_TO_GOOGLEPLUS', "Mettre en favoris dans Google Plus");
+define('_NW_BOOKMARK_TO_GOOGLEREADER', "Mettre en favoris dans Google Reader");
+define('_NW_BOOKMARK_TO_GOOGLEBOOKMARKS', "Mettre en favoris dans Google Bookmarks");
+
+define('_NW_DELETE', "Supprimer");
+define('_NW_EDIT', "Editer");
+define('_NW_SUBTITLE', "Sous-titre : ");
+define('_NW_SELECT_IMAGE_DESC', "Description de l'image sélectionnée : ");
+
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version         $Id $
+**/
+
+?>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/french/modinfo.php	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/modinfo.php	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,210 @@
+<?php
+// $Id$
+// Module Info
+
+// The name of this module
+define('_MI_NEWS_NAME','Articles');
+
+// A brief description of this module
+define('_MI_NEWS_DESC',"Crée une section d'articles, où les utilisateurs peuvent poster des articles/commentaires.");
+
+// Names of blocks for this module (Not all module has blocks)
+define('_MI_NEWS_BNAME1',"Sujets d'articles");
+define('_MI_NEWS_BNAME3','Article du jour');
+define('_MI_NEWS_BNAME4','Top articles');
+define('_MI_NEWS_BNAME5','Articles récents');
+define('_MI_NEWS_BNAME6','Modération des articles');
+define('_MI_NEWS_BNAME7','Navigation dans les sujets');
+
+// Sub menus in main menu block
+define('_MI_NEWS_SMNAME1','Proposer un article');
+define('_MI_NEWS_SMNAME2','Archives');
+
+// Names of admin menu items
+define('_MI_NEWS_ADMENU2', 'Sujets');
+define('_MI_NEWS_ADMENU3', 'Articles');
+define('_MI_NEWS_GROUPPERMS', 'Permissions');
+// Added by Hervé for prune option
+define('_MI_NEWS_PRUNENEWS', 'Purge');
+// Added by Hervé
+define('_MI_NEWS_EXPORT', 'Export');
+
+// Title of config items
+define('_MI_STORYHOME', "Combien d'article(s) sur la page principale ?");
+define('_MI_NOTIFYSUBMIT', "Notifier par mail d'une nouvelle proposition ?");
+define('_MI_DISPLAYNAV', "Afficher la boîte de navigation en haut de chaque page ?");
+
+define('_MI_AUTOAPPROVE',"Approuver automatiquement les nouveaux articles sans l'intervention d'un administrateur ?");
+define("_MI_ALLOWEDSUBMITGROUPS", "Groupes pouvant soumettre des articles");
+define("_MI_ALLOWEDAPPROVEGROUPS", "Groupes pouvant approuver des articles");
+define("_MI_NEWSDISPLAY", "Mise en page des articles");
+define("_MI_NAMEDISPLAY","Nom d'auteur à utiliser");
+define("_MI_COLUMNMODE","Colonnes");
+define("_MI_STORYCOUNTADMIN","Nombre d'articles à afficher dans l'administration : ");
+define('_MI_UPLOADFILESIZE', "Taille maximale des fichiers joints en Ko (1048576 = 1 Méga)");
+define("_MI_UPLOADGROUPS","Groupes autorisés à joindre des fichiers aux articles");
+
+// Description of each config items
+define('_MI_STORYHOMEDSC', '');
+define('_MI_NOTIFYSUBMITDSC', '');
+define('_MI_DISPLAYNAVDSC', '');
+define('_MI_AUTOAPPROVEDSC', '');
+define("_MI_ALLOWEDSUBMITGROUPSDESC", "Les groupes sélectionnés seront autorisés à soumettre des articles");
+define("_MI_ALLOWEDAPPROVEGROUPSDESC", "Les groupes sélectionnés seront autorisés à approuver les nouveaux articles");
+define("_MI_NEWSDISPLAYDESC", "Le mode classique affiche tous les nouveaux articles triés par date de publication. Le mode Articles par sujets groupera les articles par sujet avec le dernier article développé et les autres avec juste le titre");
+define('_MI_ADISPLAYNAMEDSC', "Permet de choisir sous quelle forme le nom de l'auteur doit être affiché");
+define("_MI_COLUMNMODE_DESC","Choisissez le nombre de colonnes à utiliser pour afficher les articles (cette option n'est utilisable qu'avec le mode d'affichage 'classique')");
+define("_MI_STORYCOUNTADMIN_DESC","");
+define("_MI_UPLOADFILESIZE_DESC","");
+define("_MI_UPLOADGROUPS_DESC","Choisissez les groupes qui peuvent télécharger vers le serveur");
+
+
+// Name of config item values
+define("_MI_NEWSCLASSIC", "Classique");
+define("_MI_NEWSBYTOPIC", "Articles par sujets");
+define("_MI_DISPLAYNAME1", 'Pseudo');
+define("_MI_DISPLAYNAME2", 'Nom complet');
+define("_MI_DISPLAYNAME3", 'Aucun');
+define("_MI_UPLOAD_GROUP1","Editeurs et Approbateurs");
+define("_MI_UPLOAD_GROUP2","Approbateurs uniquement");
+define("_MI_UPLOAD_GROUP3","Téléchargement désactivé");
+
+
+// Text for notifications
+
+define('_MI_NEWS_GLOBAL_NOTIFY', 'Globale');
+define('_MI_NEWS_GLOBAL_NOTIFYDSC', 'Options de notification globale des articles.');
+
+define('_MI_NEWS_STORY_NOTIFY', 'Articles');
+define('_MI_NEWS_STORY_NOTIFYDSC', 'Options de notification s\'appliquant à l\'article actuel.');
+
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFY', 'Nouveau sujet');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYCAP', 'Notifiez-moi quand un nouveau sujet est créé.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYDSC', 'Recevoir une notification quand un nouveau sujet est créé.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFY', 'Nouvel article proposé');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYCAP', 'Notifiez-moi lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYDSC', 'Recevoir une notification lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article proposé');
+
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFY', 'Nouvel article');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYCAP', 'Notifiez-moi quand un nouvel article est posté.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYDSC', 'Recevoir une notification quand un nouvel article est posté.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+define('_MI_NEWS_STORY_APPROVE_NOTIFY', 'Article approuvé');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYCAP', 'Notifiez-moi quand cet article est approuvé.');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYDSC', 'Recevoir une notification quand cet article est approuvé.');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Article approuvé');
+
+define('_MI_RESTRICTINDEX', "Restreindre les sujets sur la page d'index ?");
+define('_MI_RESTRICTINDEXDSC', "Si l'option est à Oui, les utilisateurs ne verront que les articles pour lesquels ils ont les permissions de lecture");
+
+define('_MI_NEWSBYTHISAUTHOR', 'Articles du même auteur');
+define('_MI_NEWSBYTHISAUTHORDSC', "Si vous mettez cette option à OUI, alors un lien 'Articles du même auteur' sera affiché");
+
+define('_MI_NEWS_PREVNEX_LINK','Afficher les liens vers les articles précédents et suivants ?');
+define('_MI_NEWS_PREVNEX_LINK_DESC',"Si cette option est activée, deux nouveaux liens seront visibles en bas de chaque article. Ces liens seront utiles pour lire l'article précédent et suivant en fonction de la date de publication");
+define('_MI_NEWS_SUMMARY_SHOW','Afficher la table de sommaire ?');
+define('_MI_NEWS_SUMMARY_SHOW_DESC','Quand vous utilisez cette option, une table sommaire contenant les liens vers tous les articles récents publiés sur le même thème sera visible en bas de chaque article');
+define('_MI_NEWS_AUTHOR_EDIT',"Permettre aux auteurs d'éditer leurs articles ?");
+define('_MI_NEWS_AUTHOR_EDIT_DESC','Avec cette option, les auteurs pourront eux-même éditer leurs contributions.');
+define('_MI_NEWS_RATE_NEWS','Permettre aux utilisateurs de noter les articles ?');
+define('_MI_NEWS_TOPICS_RSS','Activer le flux RSS par sujet?');
+define('_MI_NEWS_TOPICS_RSS_DESC',"Si vous positionnez cette option sur 'Oui', alors les articles pour ce sujet seront disponibles sous la forme d'un flux RSS");
+define('_MI_NEWS_DATEFORMAT', "Format de Date");
+define('_MI_NEWS_DATEFORMAT_DESC',"S'il vous plaît se référer à la documentation de PHP (http://fr.php.net/manual/en/function.date.php) pour plus d'informations sur la façon de sélectionner le format. Notez que si vous ne tapez rien le format de date par défaut sera utilisé");
+define('_MI_NEWS_META_DATA', "Permettre la saisie des données meta (keywords et description) ?");
+define('_MI_NEWS_META_DATA_DESC', "Si vous positionnez cette option sur 'Oui', alors les approbateurs pourront entrer les données meta suivantes : keywords et description");
+define('_MI_NEWS_BNAME8','Articles Aléatoires');
+define('_MI_NEWS_NEWSLETTER',"Bulletin d'information");
+define('_MI_NEWS_STATS','Statistiques');
+define("_MI_NEWS_FORM_OPTIONS","Option de formulaire");
+define("_MI_NEWS_FORM_COMPACT","Compact");
+define("_MI_NEWS_FORM_DHTML","DHTML");
+define("_MI_NEWS_FORM_SPAW","Éditeur Spaw");
+define("_MI_NEWS_FORM_HTMLAREA","Éditeur HtmlArea");
+define("_MI_NEWS_FORM_FCK","Éditeur FCK");
+define("_MI_NEWS_FORM_KOIVI","Éditeur Koivi");
+define("_MI_NEWS_FORM_OPTIONS_DESC","Sélectionnez l'éditeur à utiliser. Si vous avez une installation 'simple' (i.e vous utilisez seulement l'éditeur xoops fourni en standard), alors vous ne pouvez que sélectionner DHTML et Compact");
+define("_MI_NEWS_KEYWORDS_HIGH","Activer le surlignage des mots clefs de recherche ?");
+define("_MI_NEWS_KEYWORDS_HIGH_DESC","Si vous utilisez cette option, alors les mots clefs saisis dans le champ de Recherche seront surlignés dans les articles");
+define("_MI_NEWS_HIGH_COLOR","Couleur utilisée pour le surlignage des mots de recherche ?");
+define("_MI_NEWS_HIGH_COLOR_DES","Utilisez cette option seulement si vous avez choisi Oui à l'option précédente");
+define("_MI_NEWS_INFOTIPS","Nombre de caractères pris en compte dans les infobulles");
+define("_MI_NEWS_INFOTIPS_DES","Si vous utilisez cette option, les liens relatifs à des articles contiendront une infobulle reprennant les premiers (n) caractères de chaque article. Si vous paramétrez cette valeur à 0, alors l'infobulle sera vide");
+define("_MI_NEWS_SITE_NAVBAR","Utiliser la barre de navigation Mozilla et Opera ?");
+define("_MI_NEWS_SITE_NAVBAR_DESC","Si vous positionnez cette option à Oui, alors les visiteurs de votre site pourront utiliser la barre de navigation de site pour se déplacer entre vos articles.");
+define("_MI_NEWS_TABS_SKIN","Sélectionnez l'apparence à utiliser dans les onglets");
+define("_MI_NEWS_TABS_SKIN_DESC","Cet habillage sera utilisé dans tous les blocs qui utilisent des onglets");
+define("_MI_NEWS_SKIN_1","Style barre");
+define("_MI_NEWS_SKIN_2","Incliné");
+define("_MI_NEWS_SKIN_3","Classique");
+define("_MI_NEWS_SKIN_4","Dossiers");
+define("_MI_NEWS_SKIN_5","MacOs");
+define("_MI_NEWS_SKIN_6","Plat");
+define("_MI_NEWS_SKIN_7","Arrondi");
+define("_MI_NEWS_SKIN_8","Style ZDnet");
+
+// Added in version 1.50
+define('_MI_NEWS_BNAME9','Archives');
+define("_MI_NEWS_FORM_TINYEDITOR","Éditeur TinyEditor");
+define("_MI_NEWS_FOOTNOTES","Voir les liens sur les versions imprimables ?");
+define("_MI_NEWS_DUBLINCORE","Activer les métadonnées Dublin Core ?");
+define("_MI_NEWS_DUBLINCORE_DSC","Pour plus d'informations, <a href='http://fr.wikipedia.org/wiki/Dublin_Core' rel='external'>consultez ce lien</a>");
+define("_MI_NEWS_BOOKMARK_ME","Afficher un bloc 'Ajouter cette page sur ces sites' ?");
+define("_MI_NEWS_BOOKMARK_ME_DSC","Ce bloc sera visible sur la page des articles");
+define("_MI_NEWS_FF_MICROFORMAT","Activer les 'microrésumés' de Firefox 2 ?");
+define("_MI_NEWS_FF_MICROFORMAT_DSC","Pour plus d'informations, voir <a href='https://developer.mozilla.org/fr/Création_d'un_générateur_de_microrésumé' rel='external'>cette page</a>");
+define("_MI_NEWS_WHOS_WHO","Annuaire des auteurs");
+define("_MI_NEWS_METAGEN","Metagen");
+define("_MI_NEWS_TOPICS_DIRECTORY","Répertoire des sujets");
+define("_MI_NEWS_ADVERTISEMENT","Publicité");
+define("_MI_NEWS_ADV_DESCR","Entrez un texte ou du code javascript à afficher dans vos articles");
+define("_MI_NEWS_MIME_TYPES","Entrez les types mime autorisés pour le téléchargement des pièces jointes dans les articles (séparez les par un retour à la ligne)");
+define("_MI_NEWS_ENHANCED_PAGENAV","Utiliser le séparateur de pages amélioré ?");
+define("_MI_NEWS_ENHANCED_PAGENAV_DSC","Avec cette option vous pouvez séparer vos pages avec quelque chose comme cela [pagrebreak:Titre page], les liens vers les pages sont remplacés par une liste déroulante et vous pouvez utiliser [summary] pour créer un sommaire automatique des pages");
+
+// Added in version 1.54
+define('_MI_NEWS_CATEGORY_NOTIFY','Catégorie');
+define('_MI_NEWS_CATEGORY_NOTIFYDSC',"Options de notification pour la catégorie en cours");
+
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY', "Nouvel article publié");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP', "Notifiez-moi lorsqu'un nouvel article est publié dans cette catégorie.");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC', "Recevoir une notification lorsqu'un article est publié dans cette catégorie.");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+// Added in version 1.63
+define('_MI_NEWS_TAGS', "Utiliser le système de tags ?");
+define('_MI_NEWS_TAGS_DSC', "Ceci est basé sur le module Xoops 'Tag' de phppp");
+define("_MI_NEWS_BNAME10", "Nuage de Tags");
+define("_MI_NEWS_BNAME11", "Top Tags");
+define("_MI_NEWS_INTRO_TEXT", "Texte d'introduction à afficher sur la page de soumission d'un article");
+define("_MI_NEWS_IMAGE_MAX_WIDTH", "Largeur maximale de l'image lorsqu'elle est redimensionnée");
+define("_MI_NEWS_IMAGE_MAX_HEIGHT", "Hauteur maximale de l'image lorsqu'elle est redimensionnée");
+
+//Added in 1.67
+define("_MI_NEWS_HELP","Aide");
+define("_MI_NEWS_ABOUT","À propos");
+define("_MI_NEWS_HOME","Accueil");
+define("_MI_NEWS_UPGRADE","Mise à jour");
+define("_MI_NEWS_DESCRIPTION","Avec ce module Xoops, vous pouvez créer un nombre illimité d'articles sur votre site. <br /> <br />
+Vous pouvez créer tous les articles que vous voulez et les organiser dans les sujets. <br /> <br />Avec une gestion des autorisations très puissant, vous pouvez créer des groupes autorisés à soumettre des articles et un groupe autorisé à les approuver et de décider qui peut voir quoi. ");
+
+define("_MI_NEWS_SHARE_ME","Afficher les icônes partagées ?");
+define("_MI_NEWS_SHARE_ME_DSC","Partager les icônes sur Facebook, Twitter, Google Buzz");
+define("_MI_NEWS_SHOWICONS","Afficher les icônes des articles ?");
+define("_MI_NEWS_SHOWICONS_DSC","Afficher les icônes d'impression, du PDF et du courrier électronique en bas de chaque article");
+//1.67
+define("_MI_NEWS_FACEBOOKCOMMENTS","Utiliser les commentaires Facebook ?");
+define("_MI_NEWS_FACEBOOKCOMMENTS_DSC","Laisser vos utilisateurs utiliser Facebook pour ajouter des commentaires à vos articles");
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version         $Id $
+**/
+
+?>
\ No newline at end of file

Added: XoopsModules/news/trunk/news/language/french/newsletter.php
===================================================================
--- XoopsModules/news/trunk/news/language/french/newsletter.php	                        (rev 0)
+++ XoopsModules/news/trunk/news/language/french/newsletter.php	2012-07-11 19:31:02 UTC (rev 9851)
@@ -0,0 +1,26 @@
+<?php
+$newslettertemplate=<<<contentend
+
+Titre : %title%
+Sujet : %topic_title%
+Auteur : %publisher%
+Date de Publication : %published%
+Note : %rating%
+Nombre de lectures : %reads%
+
+Contenu :
+%hometext%
+
+En savoir plus : %link%
+ ----------------------------------------------------------------------------
+
+contentend;
+
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ *
+ * @version         $Id $
+**/
+?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9850] XoopsModules/news/trunk/news/language

[<be...@us...>]

Revision: 9850
          http://xoops.svn.sourceforge.net/xoops/?rev=9850&view=rev
Author:   beckmi
Date:     2012-07-11 19:30:24 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Updating French files

Removed Paths:
-------------
    XoopsModules/news/trunk/news/language/french/
    XoopsModules/news/trunk/news/language/frenchUTF8/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9849] XoopsLanguages/french/modules/news

[<ce...@us...>]

Revision: 9849
          http://xoops.svn.sourceforge.net/xoops/?rev=9849&view=rev
Author:   cesag
Date:     2012-07-11 19:28:48 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
News 1.67 final french translation.

Modified Paths:
--------------
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/help/help.html

Added Paths:
-----------
    XoopsLanguages/french/modules/news/news 1.67/
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/modinfo.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/newsletter.php

Removed Paths:
-------------
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/modinfo.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french/newsletter.php
    XoopsLanguages/french/modules/news/news 1.67/news/language/french_iso/
    XoopsLanguages/french/modules/news/news 1.67 RC3/

Deleted: XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php	2012-05-31 03:54:11 UTC (rev 9603)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php	2012-07-11 19:28:48 UTC (rev 9849)
@@ -1,238 +0,0 @@
-<?php
-// $Id$
-// Support Francophone de Xoops (www.frxoops.org)
-//%%%%%%        Admin Module Name  Articles         %%%%%
-define("_AM_DBUPDATED","Base de données mise à jour avec succès !");
-define("_AM_CONFIG","Configuration des articles");
-define("_AM_AUTOARTICLES","Articles automatisés");
-define("_AM_STORYID","ID de l'article");
-define("_AM_TITLE","Titre");
-define("_AM_TOPIC","Sujet");
-define("_AM_POSTER","Auteur");
-define("_AM_PROGRAMMED","Date et heure programmée");
-define("_AM_ACTION","Action");
-define("_AM_EDIT","Editer");
-define("_AM_DELETE","Effacer");
-define("_AM_LAST10ARTS","Les %d derniers articles");
-define("_AM_PUBLISHED","Publié le"); // Published Date
-define("_AM_GO","Ok");
-define("_AM_EDITARTICLE","Editer l'article");
-define("_AM_POSTNEWARTICLE","Poster un nouvel article");
-define("_AM_ARTPUBLISHED","Votre article a été publié !"); // mail
-define("_AM_HELLO","Bonjour %s,"); // mail
-define("_AM_YOURARTPUB","Votre article soumis sur notre site a été publié."); // mail
-define("_AM_TITLEC","Titre : "); // mail
-define("_AM_URLC","URL : "); // mail
-define("_AM_PUBLISHEDC","Publié le : "); // mail
-define("_AM_RUSUREDEL","Etes-vous sûr de vouloir supprimer cet article et tous ses commentaires ?");
-define("_AM_YES","Oui");
-define("_AM_NO","Non");
-define("_AM_INTROTEXT","Texte de l'introduction");
-define("_AM_EXTEXT","Suite du texte");
-define("_AM_ALLOWEDHTML","HTML autorisé :");
-define("_AM_DISAMILEY","Désactiver les émoticônes");
-define("_AM_DISHTML","Désactiver le HTML");
-define("_AM_APPROVE","Approuver");
-define("_AM_MOVETOTOP","Déplacer cet article au Top");
-define("_AM_CHANGEDATETIME","Changer la date et l'heure de publication");
-define("_AM_NOWSETTIME","L'heure est maintenant définie à : %s"); // %s is datetime of publish
-define("_AM_CURRENTTIME","Actuellement il est : %s");  // %s is the current datetime
-define("_AM_SETDATETIME","Paramétrer la date et l'heure de publication");
-define("_AM_MONTHC","Mois :");
-define("_AM_DAYC","Jour :");
-define("_AM_YEARC","Année :");
-define("_AM_TIMEC","Heure :");
-define("_AM_PREVIEW","Prévisualiser");
-define("_AM_SAVE","Sauvegarder");
-define("_AM_PUBINHOME","Publier en page d'accueil ?");
-define("_AM_ADD","Ajouter");
-
-//%%%%%%        Admin Module Name  Topics         %%%%%
-
-define("_AM_ADDMTOPIC","Ajouter un sujet PRINCIPAL");
-define("_AM_TOPICNAME","Nom du sujet");
-// Attention, modifié de 40 à 255 caractères.
-define("_AM_MAX40CHAR","(maxi : 255 caractères)");
-define("_AM_TOPICIMG","Image du sujet");
-define("_AM_IMGNAEXLOC","nom de l'image + extension placé dans %s");
-define("_AM_FEXAMPLE","par exemple : games.gif");
-define("_AM_ADDSUBTOPIC","Ajouter un sous-sujet");
-define("_AM_IN","dans");
-define("_AM_MODIFYTOPIC","Modifier le sujet");
-define("_AM_MODIFY","Modifier");
-define("_AM_PARENTTOPIC","Sujet parent");
-define("_AM_SAVECHANGE","Sauvegarder les changements");
-define("_AM_DEL","Effacer");
-define("_AM_CANCEL","Annuler");
-define("_AM_WAYSYWTDTTAL","ATTENTION : Etes-vous sûr de vouloir supprimer ce sujet et tous ses articles et commentaires ?");
-
-
-// Added in Beta6
-define("_AM_TOPICSMNGR","Gestionnaire de sujets");
-define("_AM_PEARTICLES","Gestion des articles");
-define("_AM_NEWSUB","Nouvelles propositions");
-define("_AM_POSTED","Posté le");
-define("_AM_GENERALCONF","Configuration générale");
-
-
-// Added in RC2
-define("_AM_TOPICDISPLAY","Afficher l'image du sujet ?");
-define("_AM_TOPICALIGN","Position");
-define("_AM_RIGHT","Droite");
-define("_AM_LEFT","Gauche");
-
-define("_AM_EXPARTS","Articles expirés");
-define("_AM_EXPIRED","Expiré");
-define("_AM_CHANGEEXPDATETIME","Changer la date et l'heure d'expiration");
-define("_AM_SETEXPDATETIME","Paramétrer la date et l'heure d'expiration");
-define("_AM_NOWSETEXPTIME","L'heure est maintenant définie à : %s");
-
-// Added in RC3
-define("_AM_ERRORTOPICNAME", "Vous devez entrer un nom de sujet !");
-define("_AM_EMPTYNODELETE", "Rien à supprimer !");
-
-// Added 240304 (Mithrandir)
-define('_AM_GROUPPERM', "Permissions des groupes");
-define('_AM_SELFILE','Sélectionnez un fichier');
-
-// Added by Hervé
-define('_AM_UPLOAD_DBERROR_SAVE',"Erreur pendant le rattachement d'un fichier à un article");
-define('_AM_UPLOAD_ERROR',"Erreur pendant le téléchargement du fichier vers le serveur");
-define('_AM_UPLOAD_ATTACHFILE',"Fichier(s) attaché(s)");
-define('_AM_APPROVEFORM', "Permission d'approuver");
-define('_AM_SUBMITFORM', "Permission de soumettre");
-define('_AM_VIEWFORM', "Permission de consulter");
-define('_AM_APPROVEFORM_DESC', "Choisissez les groupes qui peuvent approuver les articles pour les sujets affichés");
-define('_AM_SUBMITFORM_DESC', "Choisissez les groupes qui peuvent soumettre des articles pour les sujets affichés");
-define('_AM_VIEWFORM_DESC', "Choisissez les groupes qui peuvent visualiser les sujets affichés");
-define('_AM_DELETE_SELFILES', "Supprimer les fichiers sélectionnés");
-define('_AM_TOPIC_PICTURE', "Télécharger l'image du sujet");
-define('_AM_UPLOAD_WARNING', "<b>Attention, n'oubliez pas d'appliquer les permissions d'écriture au répertoire suivant : %s </b>");
-
-define('_AM_NEWS_UPGRADECOMPLETE', "Mise à jour terminée");
-define('_AM_NEWS_UPDATEMODULE', "Mise à jour des thèmes des modules et des blocs");
-define('_AM_NEWS_UPGRADEFAILED', "La mise à jour a échouée");
-define('_AM_NEWS_UPGRADE', "Mise à jour");
-define('_AM_ADD_TOPIC', "Ajouter un sujet");
-define('_AM_ADD_TOPIC_ERROR',"Erreur, ce sujet existe déja !");
-define('_AM_ADD_TOPIC_ERROR1',"ERREUR : Impossible de selectionner ce sujet comme sujet parent !");
-define('_AM_SUB_MENU',"Publier ce sujet comme un sous-menu");
-define('_AM_SUB_MENU_YESNO',"Sous-menu ?");
-define('_AM_HITS', "Hits");
-define('_AM_CREATED', "Créé");
-
-define('_AM_TOPIC_DESCR', "Description du sujet");
-define('_AM_USERS_LIST', "Liste des utilisateurs");
-define('_AM_PUBLISH_FRONTPAGE', "Publier en première page ?");
-define('_AM_NEWS_UPGRADEFAILED1', "Impossible de créer la table 'stories_files'");
-define('_AM_NEWS_UPGRADEFAILED2', "Impossible de modifier la longueur du titre du sujet");
-define('_AM_NEWS_UPGRADEFAILED21', "Impossible d'ajouter les nouveaux champs dans la table 'topics'");
-define('_AM_NEWS_UPGRADEFAILED3', "Impossible de créer la table 'stories_votedata'");
-define('_AM_NEWS_UPGRADEFAILED4', "Impossible de créer les deux champs 'rating' and 'votes' dans la table 'story'");
-define('_AM_NEWS_UPGRADEFAILED0', "Veuillez noter les messages et tenter de corriger les problèmes avec phpMyadmin et le fichier de définition de sql disponible dans le dossier « sql » du module news");
-define('_AM_NEWS_UPGR_ACCESS_ERROR',"Erreur pour utiliser le script de mise à jour, vous devez être administrateur du module");
-define('_AM_NEWS_PRUNE_BEFORE',"Purger les articles qui ont été publiés avant le");
-define('_AM_NEWS_PRUNE_EXPIREDONLY',"Supprimer seulement les articles qui sont expirés");
-define('_AM_NEWS_PRUNE_CONFIRM',"Attention, vous êtes sur le point de supprimer définitivement les articles qui ont été publiés avant le %s (cette action ne peut être annulée). Cela représente %s articles.<br />En êtes-vous certain(e) ?");
-define('_AM_NEWS_PRUNE_TOPICS',"Se limiter aux sujets suivants");
-define('_AM_NEWS_PRUNENEWS', "Purger les articles");
-define('_AM_NEWS_EXPORT_NEWS', "Exporter les articles en XML");
-define('_AM_NEWS_EXPORT_NOTHING', "Désolé, il n'y a rien à exporter, merci de vérifier vos critères");
-define('_AM_NEWS_PRUNE_DELETED', "%d articles ont été supprimés");
-define('_AM_NEWS_PERM_WARNING', "<h2>Attention, il y a 3 formulaires, donc vous devez valider trois boutons</h2>");
-define('_AM_NEWS_EXPORT_BETWEEN', "Exporter les articles publiés entre le");
-define('_AM_NEWS_EXPORT_AND', " et ");
-define('_AM_NEWS_EXPORT_PRUNE_DSC', "Si vous ne sélectionnez rien, alors tous les sujets seront utilisés<br/> sinon, seuls les sujets selectionnés seront utilisés");
-define('_AM_NEWS_EXPORT_INCTOPICS', "Inclure la description des sujets ?");
-define('_AM_NEWS_EXPORT_ERROR', "Erreur pendant la création du fichier %s. Opération annulée.");
-define('_AM_NEWS_EXPORT_READY', "L'export du fichier au format xml est disponible pour téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas <a href='%s'>de le supprimer </a> une fois que vous avez terminé.");
-define('_AM_NEWS_RSS_URL', "URL du flux RSS");
-define('_AM_NEWS_NEWSLETTER', "Bulletin d'information");
-define('_AM_NEWS_NEWSLETTER_BETWEEN', "Sélectionner les articles publiés entre le");
-define('_AM_NEWS_NEWSLETTER_READY', "Votre Bulletin d'information est disponible au téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas de <a href='%s'>le supprimer</a> une fois que vous avez terminé.");
-define('_AM_NEWS_DELETED_OK',"Fichier supprimé avec succès");
-define('_AM_NEWS_DELETED_PB',"Un problème a été rencontré pendant la suppression du fichier");
-define('_AM_NEWS_STATS0',"Statistiques des sujets");
-define('_AM_NEWS_STATS',"Statistiques");
-define('_AM_NEWS_STATS1',"Auteurs");
-define('_AM_NEWS_STATS2',"Total");
-define('_AM_NEWS_STATS3',"Statistiques des articles");
-define('_AM_NEWS_STATS4',"Articles les plus lus");
-define('_AM_NEWS_STATS5',"Articles les moins lus");
-define('_AM_NEWS_STATS6',"Articles les mieux cotés");
-define('_AM_NEWS_STATS7',"Auteurs les plus lus");
-define('_AM_NEWS_STATS8',"Auteurs les mieux cotés");
-define('_AM_NEWS_STATS9',"Meilleurs contributeurs");
-define('_AM_NEWS_STATS10',"Statistiques par Auteurs");
-define('_AM_NEWS_STATS11',"Nombre d'articles");
-define('_AM_NEWS_HELP',"Aide");
-define("_AM_NEWS_MODULEADMIN"," - Administration");
-define("_AM_NEWS_GENERALSET", "Options du module" );
-define('_AM_NEWS_GOTOMOD','Aller au module');
-define('_AM_NEWS_NOTHING',"Désolé mais il n'y a rien à télécharger, vérifiez vos critères");
-define('_AM_NEWS_NOTHING_PRUNE',"Désolé, mais il n'y a rien à purger, vérifiez vos critères");
-define('_AM_NEWS_TOPIC_COLOR',"Couleur du sujet");
-define('_AM_NEWS_COLOR',"Couleur");
-define('_AM_NEWS_REMOVE_BR',"Convertir les balises html &lt;br /&gt; en un retour à la ligne ?");
-// Added in 1.3 RC2
-define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Veuillez mettre à jour le module s'il vous plait</font></a>");
-
-// Added in version 1.50
-define('_AM_NEWS_NEWSLETTER_HEADER', "Entête");
-define('_AM_NEWS_NEWSLETTER_FOOTER', "Pied de page");
-define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Supprimer les balises html ?");
-define('_AM_NEWS_VERIFY_TABLES',"Maintenir les tables");
-define('_AM_NEWS_METAGEN',"Metagen");
-define('_AM_NEWS_METAGEN_DESC',"Le Metagen est un système qui peut vous aider à avoir des pages mieux indexées par les moteurs de recherche.<br />Sauf si vous entrez vous-même les meta keywords et meta desriptions, le module les génèrera automatiquement pour chaque article.");
-define('_AM_NEWS_BLACKLIST',"Liste noire");
-define('_AM_NEWS_BLACKLIST_DESC',"Les mots contenus dans cette liste<br />ne seront pas utilisés lors de la création des meta keywords");
-define('_AM_NEWS_BLACKLIST_ADD',"Ajouter");
-define('_AM_NEWS_BLACKLIST_ADD_DSC',"Entrez des mots à ajouter dans la liste<br />(un mot par ligne)");
-define('_AM_NEWS_META_KEYWORDS_CNT',"Nombre maximal de meta mots clés à générer");
-define('_AM_NEWS_META_KEYWORDS_ORDER',"Ordre des mots clés");
-define('_AM_NEWS_META_KEYWORDS_INTEXT',"Ordre d'apparition dans le texte");
-define('_AM_NEWS_META_KEYWORDS_FREQ1',"Ordre de fréquence des mots");
-define('_AM_NEWS_META_KEYWORDS_FREQ2',"Ordre inverse de la fréquence des mots");
-
-// Added in version 1.67
-// About.php
-define('_AM_NEWS_ABOUT_RELEASEDATE',"Sorti : ");
-define('_AM_NEWS_ABOUT_UPDATEDATE',"Mise à jour : ");
-define('_AM_NEWS_ABOUT_AUTHOR',"Auteur : ");
-define('_AM_NEWS_ABOUT_CREDITS',"Remerciements : ");
-define('_AM_NEWS_ABOUT_LICENSE',"Licence : ");
-define('_AM_NEWS_ABOUT_MODULE_STATUS',"Statut : ");
-define('_AM_NEWS_ABOUT_WEBSITE',"Site internet : ");
-define('_AM_NEWS_ABOUT_AUTHOR_NAME',"Nom de l'auteur: ");
-define('_AM_NEWS_ABOUT_CHANGELOG',"Journal des modifications");
-define('_AM_NEWS_ABOUT_MODULE_INFO',"Informations sur le module");
-define('_AM_NEWS_ABOUT_AUTHOR_INFO',"Informations sur l'auteur");
-define('_AM_NEWS_ABOUT_DESCRIPTION',"Description : ");
-// Configuration check
-define("_AM_NEWS_CONFIG_CHECK","Vérification de la configuration");
-define("_AM_NEWS_CONFIG_PHP","Version minimum de PHP requise: %s (votre version actuelle est la %s)");
-define("_AM_NEWS_CONFIG_XOOPS","Version minimum de XOOPS requise:  %s (votre version actuelle est la %s)"); 
-
-
-define ("_AM_NEWS_STATISTICS", "Statistiques des articles");
-define ("_AM_NEWS_THEREARE_STORIES", "Il y a <span class='red bold'>%s</span> Articles dans la base de données");
-define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "Il y a <span class='red bold'>%s</span> Articles en ligne");
-define ("_AM_NEWS_THEREARE_STORIES_FILES", "Il y a  <span class='red bold'>%s</span> Fichiers d'articles dans la base de données");
-define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "Il y a <span class='red bold'>%s</span> Fichiers d'articles en ligne");
-define ("_AM_NEWS_THEREARE_TOPICS", "Il y a <span class='red bold'>%s</span> Catégories dans la base de données");
-define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "Il y a <span class='red bold'>%s</span> Catégories en ligne");
-define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Il y a <span class='red bold'>%s</span> Articles visionnés");
-define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Il y a <span class='red bold'>%s</span> Articles importés");
-define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Il y a <span class='red bold'>%s</span> Articles exportés");
-
-define("_AM_NEWS_NOPERMSSET","L'autorisation ne peut être donnée : il n'y a aucun sujet créé encore! Veuillez d'abord créer un sujet.");
-
-/**
- * @translation     Communauté Francophone des Utilisateurs de Xoops
- * @specification   _LANGCODE: fr
- * @specification   _CHARSET: UTF-8 sans Bom
- * Mis à jour par Cesag le 16 Mai 2012
- * @version         $Id $
-**/
-
-?>
\ No newline at end of file

Copied: XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php (from rev 9693, XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php)
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php	                        (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/admin.php	2012-07-11 19:28:48 UTC (rev 9849)
@@ -0,0 +1,237 @@
+<?php
+// $Id$
+// Support Francophone de Xoops (www.frxoops.org)
+//%%%%%%        Admin Module Name  Articles         %%%%%
+define("_AM_DBUPDATED","Base de données mise à jour avec succès !");
+define("_AM_CONFIG","Configuration des articles");
+define("_AM_AUTOARTICLES","Articles automatisés");
+define("_AM_STORYID","ID de l'article");
+define("_AM_TITLE","Titre");
+define("_AM_TOPIC","Sujet");
+define("_AM_POSTER","Auteur");
+define("_AM_PROGRAMMED","Date et heure programmée");
+define("_AM_ACTION","Action");
+define("_AM_EDIT","Editer");
+define("_AM_DELETE","Effacer");
+define("_AM_LAST10ARTS","Les %d derniers articles");
+define("_AM_PUBLISHED","Publié le"); // Published Date
+define("_AM_GO","Ok");
+define("_AM_EDITARTICLE","Editer l'article");
+define("_AM_POSTNEWARTICLE","Poster un nouvel article");
+define("_AM_ARTPUBLISHED","Votre article a été publié !"); // mail
+define("_AM_HELLO","Bonjour %s,"); // mail
+define("_AM_YOURARTPUB","Votre article soumis sur notre site a été publié."); // mail
+define("_AM_TITLEC","Titre : "); // mail
+define("_AM_URLC","URL : "); // mail
+define("_AM_PUBLISHEDC","Publié le : "); // mail
+define("_AM_RUSUREDEL","Etes-vous sûr de vouloir supprimer cet article et tous ses commentaires ?");
+define("_AM_YES","Oui");
+define("_AM_NO","Non");
+define("_AM_INTROTEXT","Texte de l'introduction");
+define("_AM_EXTEXT","Suite du texte");
+define("_AM_ALLOWEDHTML","HTML autorisé :");
+define("_AM_DISAMILEY","Désactiver les émoticônes");
+define("_AM_DISHTML","Désactiver le HTML");
+define("_AM_APPROVE","Approuver");
+define("_AM_MOVETOTOP","Déplacer cet article au Top");
+define("_AM_CHANGEDATETIME","Changer la date et l'heure de publication");
+define("_AM_NOWSETTIME","L'heure est maintenant définie à : %s"); // %s is datetime of publish
+define("_AM_CURRENTTIME","Actuellement il est : %s");  // %s is the current datetime
+define("_AM_SETDATETIME","Paramétrer la date et l'heure de publication");
+define("_AM_MONTHC","Mois :");
+define("_AM_DAYC","Jour :");
+define("_AM_YEARC","Année :");
+define("_AM_TIMEC","Heure :");
+define("_AM_PREVIEW","Prévisualiser");
+define("_AM_SAVE","Sauvegarder");
+define("_AM_PUBINHOME","Publier en page d'accueil ?");
+define("_AM_ADD","Ajouter");
+
+//%%%%%%        Admin Module Name  Topics         %%%%%
+
+define("_AM_ADDMTOPIC","Ajouter un sujet PRINCIPAL");
+define("_AM_TOPICNAME","Nom du sujet");
+// Attention, modifié de 40 à 255 caractères.
+define("_AM_MAX40CHAR","(maxi : 255 caractères)");
+define("_AM_TOPICIMG","Image du sujet");
+define("_AM_IMGNAEXLOC","nom de l'image + extension placé dans %s");
+define("_AM_FEXAMPLE","par exemple : games.gif");
+define("_AM_ADDSUBTOPIC","Ajouter un sous-sujet");
+define("_AM_IN","dans");
+define("_AM_MODIFYTOPIC","Modifier le sujet");
+define("_AM_MODIFY","Modifier");
+define("_AM_PARENTTOPIC","Sujet parent");
+define("_AM_SAVECHANGE","Sauvegarder les changements");
+define("_AM_DEL","Effacer");
+define("_AM_CANCEL","Annuler");
+define("_AM_WAYSYWTDTTAL","ATTENTION : Etes-vous sûr de vouloir supprimer ce sujet et tous ses articles et commentaires ?");
+
+
+// Added in Beta6
+define("_AM_TOPICSMNGR","Gestionnaire de sujets");
+define("_AM_PEARTICLES","Gestion des articles");
+define("_AM_NEWSUB","Nouvelles propositions");
+define("_AM_POSTED","Posté le");
+define("_AM_GENERALCONF","Configuration générale");
+
+
+// Added in RC2
+define("_AM_TOPICDISPLAY","Afficher l'image du sujet ?");
+define("_AM_TOPICALIGN","Position");
+define("_AM_RIGHT","Droite");
+define("_AM_LEFT","Gauche");
+
+define("_AM_EXPARTS","Articles expirés");
+define("_AM_EXPIRED","Expiré");
+define("_AM_CHANGEEXPDATETIME","Changer la date et l'heure d'expiration");
+define("_AM_SETEXPDATETIME","Paramétrer la date et l'heure d'expiration");
+define("_AM_NOWSETEXPTIME","L'heure est maintenant définie à : %s");
+
+// Added in RC3
+define("_AM_ERRORTOPICNAME", "Vous devez entrer un nom de sujet !");
+define("_AM_EMPTYNODELETE", "Rien à supprimer !");
+
+// Added 240304 (Mithrandir)
+define('_AM_GROUPPERM', "Permissions des groupes");
+define('_AM_SELFILE','Sélectionnez un fichier');
+
+// Added by Hervé
+define('_AM_UPLOAD_DBERROR_SAVE',"Erreur pendant le rattachement d'un fichier à un article");
+define('_AM_UPLOAD_ERROR',"Erreur pendant le téléchargement du fichier vers le serveur");
+define('_AM_UPLOAD_ATTACHFILE',"Fichier(s) attaché(s)");
+define('_AM_APPROVEFORM', "Permission d'approuver");
+define('_AM_SUBMITFORM', "Permission de soumettre");
+define('_AM_VIEWFORM', "Permission de consulter");
+define('_AM_APPROVEFORM_DESC', "Choisissez les groupes qui peuvent approuver les articles pour les sujets affichés");
+define('_AM_SUBMITFORM_DESC', "Choisissez les groupes qui peuvent soumettre des articles pour les sujets affichés");
+define('_AM_VIEWFORM_DESC', "Choisissez les groupes qui peuvent visualiser les sujets affichés");
+define('_AM_DELETE_SELFILES', "Supprimer les fichiers sélectionnés");
+define('_AM_TOPIC_PICTURE', "Télécharger l'image du sujet");
+define('_AM_UPLOAD_WARNING', "<b>Attention, n'oubliez pas d'appliquer les permissions d'écriture au répertoire suivant : %s </b>");
+
+define('_AM_NEWS_UPGRADECOMPLETE', "Mise à jour terminée");
+define('_AM_NEWS_UPDATEMODULE', "Mise à jour des thèmes des modules et des blocs");
+define('_AM_NEWS_UPGRADEFAILED', "La mise à jour a échouée");
+define('_AM_NEWS_UPGRADE', "Mise à jour");
+define('_AM_ADD_TOPIC', "Ajouter un sujet");
+define('_AM_ADD_TOPIC_ERROR',"Erreur, ce sujet existe déja !");
+define('_AM_ADD_TOPIC_ERROR1',"ERREUR : Impossible de selectionner ce sujet comme sujet parent !");
+define('_AM_SUB_MENU',"Publier ce sujet comme un sous-menu");
+define('_AM_SUB_MENU_YESNO',"Sous-menu ?");
+define('_AM_HITS', "Hits");
+define('_AM_CREATED', "Créé");
+
+define('_AM_TOPIC_DESCR', "Description du sujet");
+define('_AM_USERS_LIST', "Liste des utilisateurs");
+define('_AM_PUBLISH_FRONTPAGE', "Publier en première page ?");
+define('_AM_NEWS_UPGRADEFAILED1', "Impossible de créer la table 'stories_files'");
+define('_AM_NEWS_UPGRADEFAILED2', "Impossible de modifier la longueur du titre du sujet");
+define('_AM_NEWS_UPGRADEFAILED21', "Impossible d'ajouter les nouveaux champs dans la table 'topics'");
+define('_AM_NEWS_UPGRADEFAILED3', "Impossible de créer la table 'stories_votedata'");
+define('_AM_NEWS_UPGRADEFAILED4', "Impossible de créer les deux champs 'rating' and 'votes' dans la table 'story'");
+define('_AM_NEWS_UPGRADEFAILED0', "Veuillez noter les messages et tenter de corriger les problèmes avec phpMyadmin et le fichier de définition de sql disponible dans le dossier « sql » du module news");
+define('_AM_NEWS_UPGR_ACCESS_ERROR',"Erreur pour utiliser le script de mise à jour, vous devez être administrateur du module");
+define('_AM_NEWS_PRUNE_BEFORE',"Purger les articles qui ont été publiés avant le");
+define('_AM_NEWS_PRUNE_EXPIREDONLY',"Supprimer seulement les articles qui sont expirés");
+define('_AM_NEWS_PRUNE_CONFIRM',"Attention, vous êtes sur le point de supprimer définitivement les articles qui ont été publiés avant le %s (cette action ne peut être annulée). Cela représente %s articles.<br />En êtes-vous certain(e) ?");
+define('_AM_NEWS_PRUNE_TOPICS',"Se limiter aux sujets suivants");
+define('_AM_NEWS_PRUNENEWS', "Purger les articles");
+define('_AM_NEWS_EXPORT_NEWS', "Exporter les articles en XML");
+define('_AM_NEWS_EXPORT_NOTHING', "Désolé, il n'y a rien à exporter, merci de vérifier vos critères");
+define('_AM_NEWS_PRUNE_DELETED', "%d articles ont été supprimés");
+define('_AM_NEWS_PERM_WARNING', "<h2>Attention, il y a 3 formulaires, donc vous devez valider trois boutons</h2>");
+define('_AM_NEWS_EXPORT_BETWEEN', "Exporter les articles publiés entre le");
+define('_AM_NEWS_EXPORT_AND', " et ");
+define('_AM_NEWS_EXPORT_PRUNE_DSC', "Si vous ne sélectionnez rien, alors tous les sujets seront utilisés<br/> sinon, seuls les sujets selectionnés seront utilisés");
+define('_AM_NEWS_EXPORT_INCTOPICS', "Inclure la description des sujets ?");
+define('_AM_NEWS_EXPORT_ERROR', "Erreur pendant la création du fichier %s. Opération annulée.");
+define('_AM_NEWS_EXPORT_READY', "L'export du fichier au format xml est disponible pour téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas <a href='%s'>de le supprimer </a> une fois que vous avez terminé.");
+define('_AM_NEWS_RSS_URL', "URL du flux RSS");
+define('_AM_NEWS_NEWSLETTER', "Bulletin d'information");
+define('_AM_NEWS_NEWSLETTER_BETWEEN', "Sélectionner les articles publiés entre le");
+define('_AM_NEWS_NEWSLETTER_READY', "Votre Bulletin d'information est disponible au téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas de <a href='%s'>le supprimer</a> une fois que vous avez terminé.");
+define('_AM_NEWS_DELETED_OK',"Fichier supprimé avec succès");
+define('_AM_NEWS_DELETED_PB',"Un problème a été rencontré pendant la suppression du fichier");
+define('_AM_NEWS_STATS0',"Statistiques des sujets");
+define('_AM_NEWS_STATS',"Statistiques");
+define('_AM_NEWS_STATS1',"Auteurs");
+define('_AM_NEWS_STATS2',"Total");
+define('_AM_NEWS_STATS3',"Statistiques des articles");
+define('_AM_NEWS_STATS4',"Articles les plus lus");
+define('_AM_NEWS_STATS5',"Articles les moins lus");
+define('_AM_NEWS_STATS6',"Articles les mieux cotés");
+define('_AM_NEWS_STATS7',"Auteurs les plus lus");
+define('_AM_NEWS_STATS8',"Auteurs les mieux cotés");
+define('_AM_NEWS_STATS9',"Meilleurs contributeurs");
+define('_AM_NEWS_STATS10',"Statistiques par Auteurs");
+define('_AM_NEWS_STATS11',"Nombre d'articles");
+define('_AM_NEWS_HELP',"Aide");
+define("_AM_NEWS_MODULEADMIN"," - Administration");
+define("_AM_NEWS_GENERALSET", "Options du module" );
+define('_AM_NEWS_GOTOMOD','Aller au module');
+define('_AM_NEWS_NOTHING',"Désolé mais il n'y a rien à télécharger, vérifiez vos critères");
+define('_AM_NEWS_NOTHING_PRUNE',"Désolé, mais il n'y a rien à purger, vérifiez vos critères");
+define('_AM_NEWS_TOPIC_COLOR',"Couleur du sujet");
+define('_AM_NEWS_COLOR',"Couleur");
+define('_AM_NEWS_REMOVE_BR',"Convertir les balises html &lt;br /&gt; en un retour à la ligne ?");
+// Added in 1.3 RC2
+define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Veuillez mettre à jour le module s'il vous plait</font></a>");
+
+// Added in version 1.50
+define('_AM_NEWS_NEWSLETTER_HEADER', "Entête");
+define('_AM_NEWS_NEWSLETTER_FOOTER', "Pied de page");
+define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Supprimer les balises html ?");
+define('_AM_NEWS_VERIFY_TABLES',"Maintenir les tables");
+define('_AM_NEWS_METAGEN',"Metagen");
+define('_AM_NEWS_METAGEN_DESC',"Le Metagen est un système qui peut vous aider à avoir des pages mieux indexées par les moteurs de recherche.<br />Sauf si vous entrez vous-même les meta keywords et meta desriptions, le module les génèrera automatiquement pour chaque article.");
+define('_AM_NEWS_BLACKLIST',"Liste noire");
+define('_AM_NEWS_BLACKLIST_DESC',"Les mots contenus dans cette liste<br />ne seront pas utilisés lors de la création des meta keywords");
+define('_AM_NEWS_BLACKLIST_ADD',"Ajouter");
+define('_AM_NEWS_BLACKLIST_ADD_DSC',"Entrez des mots à ajouter dans la liste<br />(un mot par ligne)");
+define('_AM_NEWS_META_KEYWORDS_CNT',"Nombre maximal de meta mots clés à générer");
+define('_AM_NEWS_META_KEYWORDS_ORDER',"Ordre des mots clés");
+define('_AM_NEWS_META_KEYWORDS_INTEXT',"Ordre d'apparition dans le texte");
+define('_AM_NEWS_META_KEYWORDS_FREQ1',"Ordre de fréquence des mots");
+define('_AM_NEWS_META_KEYWORDS_FREQ2',"Ordre inverse de la fréquence des mots");
+
+// Added in version 1.67
+// About.php
+define('_AM_NEWS_ABOUT_RELEASEDATE',"Sorti : ");
+define('_AM_NEWS_ABOUT_UPDATEDATE',"Mise à jour : ");
+define('_AM_NEWS_ABOUT_AUTHOR',"Auteur : ");
+define('_AM_NEWS_ABOUT_CREDITS',"Remerciements : ");
+define('_AM_NEWS_ABOUT_LICENSE',"Licence : ");
+define('_AM_NEWS_ABOUT_MODULE_STATUS',"Statut : ");
+define('_AM_NEWS_ABOUT_WEBSITE',"Site internet : ");
+define('_AM_NEWS_ABOUT_AUTHOR_NAME',"Nom de l'auteur: ");
+define('_AM_NEWS_ABOUT_CHANGELOG',"Journal des modifications");
+define('_AM_NEWS_ABOUT_MODULE_INFO',"Informations sur le module");
+define('_AM_NEWS_ABOUT_AUTHOR_INFO',"Informations sur l'auteur");
+define('_AM_NEWS_ABOUT_DESCRIPTION',"Description : ");
+// Configuration check
+define("_AM_NEWS_CONFIG_CHECK","Vérification de la configuration");
+define("_AM_NEWS_CONFIG_PHP","Version minimum de PHP requise: %s (votre version actuelle est la %s)");
+define("_AM_NEWS_CONFIG_XOOPS","Version minimum de XOOPS requise:  %s (votre version actuelle est la %s)"); 
+
+
+define ("_AM_NEWS_STATISTICS", "Statistiques des articles");
+define ("_AM_NEWS_THEREARE_STORIES", "Il y a <span class='red bold'>%s</span> Articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "Il y a <span class='red bold'>%s</span> Articles publiés à l'accueil");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "Il y a  <span class='red bold'>%s</span> Fichiers d'articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "Il y a <span class='red bold'>%s</span> Fichiers d'articles en ligne");
+define ("_AM_NEWS_THEREARE_TOPICS", "Il y a <span class='red bold'>%s</span> Catégories dans la base de données");
+define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "Il y a <span class='red bold'>%s</span> Catégories visibles dans le Menu");
+define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Il y a <span class='red bold'>%s</span> Articles visionnés");
+define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Il y a <span class='red bold'>%s</span> Articles importés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Il y a <span class='red bold'>%s</span> Articles exportés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "Il y a <span class='red bold'>%s</span> Articles expirés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "Il y a <span class='red bold'>%s</span> Articles qui vont expirer bientôt");
+define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "Il y a <span class='red bold'>%s</span> Articles approuvées");
+define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "Il y a <span class='red bold'>%s</span> Articles qui sont en attente d'approbation");
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 17 juin 2012
+ * @version         $Id $
+**/
\ No newline at end of file

Modified: XoopsLanguages/french/modules/news/news 1.67/news/language/french/help/help.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html	2012-05-31 03:54:11 UTC (rev 9603)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/help/help.html	2012-07-11 19:28:48 UTC (rev 9849)
@@ -1,5 +1,5 @@
 <div id="help-template" class="outer">
-    <h1 class="head">Aide:
+    <h1 class="head">Aide :
         <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/news/admin/index.php"
            title="Back to the administration of News"> News
             <img src="<{xoAdminIcons home.png}>"

Deleted: XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php	2012-05-31 03:54:11 UTC (rev 9603)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php	2012-07-11 19:28:48 UTC (rev 9849)
@@ -1,144 +0,0 @@
-<?php
-// $Id$
-//%%%%%%		File Name index.php 		%%%%%
-define('_NW_PRINTER',"Version imprimable");
-define('_NW_SENDSTORY',"Envoyer cet article à un ami");
-define('_NW_READMORE',"Lire la suite...");
-define('_NW_COMMENTS',"Commentaires ?");
-define('_NW_ONECOMMENT',"1 commentaire");
-define('_NW_BYTESMORE',"%s octets en plus");
-define('_NW_NUMCOMMENTS',"%s commentaires");
-define('_NW_MORERELEASES', "Plus d'articles dans le sujet ");
-
-
-//%%%%%%		File Name submit.php		%%%%%
-define('_NW_SUBMITNEWS',"Proposer un article");
-define('_NW_TITLE',"Titre");
-define('_NW_TOPIC',"Sujet");
-define('_NW_THESCOOP',"Le Scoop");
-define('_NW_NOTIFYPUBLISH',"Notifier par mail lors de la publication");
-define('_NW_POST',"Publier");
-define('_NW_GO',"Ok");
-define('_NW_THANKS',"Merci pour votre participation."); //submission of news article
-
-define('_NW_NOTIFYSBJCT',"Des articles à publier sur le site"); // Notification mail subject
-define('_NW_NOTIFYMSG',"Hé! Vous avez de nouvelles propositions d'articles pour votre site."); // Notification mail message
-
-//%%%%%%		File Name archive.php		%%%%%
-define('_NW_NEWSARCHIVES',"Archives");
-define('_NW_ARTICLES',"Articles");
-define('_NW_VIEWS',"Lectures");
-define('_NW_DATE',"Date");
-define('_NW_ACTIONS',"Actions");
-define('_NW_PRINTERFRIENDLY',"Format imprimable");
-
-define('_NW_THEREAREINTOTAL',"Il y a %s article(s) au total");
-
-// %s is your site name
-define('_NW_INTARTICLE',"Article intéressant sur %s");
-define('_NW_INTARTFOUND',"Voici un article intéressant trouvé sur %s");
-
-define('_NW_TOPICC',"Sujet :");
-define('_NW_URL',"Site :");
-define('_NW_NOSTORY',"Désolé, l'article sélectionné n'existe pas.");
-
-//%%%%%%	File Name print.php 	%%%%%
-
-define('_NW_URLFORSTORY',"L'adresse de cet article est :");
-
-// %s represents your site name
-define('_NW_THISCOMESFROM',"Cet article provient de %s");
-
-// Added by Hervé
-define('_NW_ATTACHEDFILES',"Fichiers attachés : ");
-define('_NW_ATTACHEDLIB',"Cet article a des fichiers attachés");
-define('_NW_NEWSSAMEAUTHORLINK',"Articles du même auteur");
-define('_NW_NEWS_NO_TOPICS',"Désolé, mais il n'y actuellement aucun sujet, merci de le créer avant de soumettre un article");
-define('_NW_PREVIOUS_ARTICLE',"Article précédent");
-define('_NW_NEXT_ARTICLE',"Article suivant");
-define('_NW_OTHER_ARTICLES',"Autres articles");
-
-// Added by Hervé in version 1.3 for rating
-define('_NW_RATETHISNEWS',"Noter cet article");
-define('_NW_RATEIT',"Notez-le !");
-define('_NW_TOTALRATE',"Total des votes");
-define('_NW_RATINGLTOH',"Notation (du score le plus bas au score le plus haut)");
-define('_NW_RATINGHTOL',"Notation (du score le plus haut au score le plus bas)");
-define('_NW_RATINGC',"Note: ");
-define('_NW_RATINGSCALE',"L'échelle va de 1 à 10, 1 étant Pas Terrible quand 10 est Excellent.");
-define('_NW_BEOBJECTIVE',"Merci de rester objectif, si tout le monde reçoit une note de 1 ou 10, la notation n'est pas très utile.");
-define('_NW_DONOTVOTE',"Merci de ne pas voter pour vos propres participations.");
-define('_NW_RATING',"Notation");
-define('_NW_VOTE',"Vote");
-define('_NW_NORATING',"Aucune note sélectionnée.");
-define('_NW_USERAVG',"Note moyenne");
-define('_NW_DLRATINGS',"Note des articles (nombre total de vote: %s)");
-define('_NW_ONEVOTE',"1 vote");
-define('_NW_NUMVOTES',"%s votes");
-define('_NW_CANTVOTEOWN',"Vous ne pouvez pas  voter pour une ressource que vous avez proposé.<br />All votes are logged and reviewed.");
-define('_NW_VOTEDELETED',"Données de vote supprimées.");
-define('_NW_VOTEONCE',"Merci de ne pas  voter pour une même ressource plus d'une fois.");
-define('_NW_VOTEAPPRE',"Merci pour votre vote.");
-define('_NW_THANKYOU',"Merci d'avoir pris le temps de voter ici sur %s"); // %s is your site name
-define('_NW_RSSFEED',"Flux RSS");	// Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes
-define('_NW_AUTHOR',"Auteur");
-define('_NW_META_DESCRIPTION',"Description Meta");
-define('_NW_META_KEYWORDS',"Meta mots clés");
-define('_NW_MAKEPDF',"Créer un fichier PDF à partir de cet article");
-define('_MD_POSTEDON',"Publiée le : ");
-define('_NW_AUTHOR_ID',"ID de l'auteur");
-define('_NW_POST_SORRY',"Désolé mais soit il n'y a pas de sujets soit vous n'avez pas le droit de créer des articles dans les sujets existants. Si vous êtes les webmaster, allez dans les permissions et définissez les permissions de 'Soumettre'.");
-
-// Added in v 1.50
-define('_NW_LINKS',"Liens");
-define('_NW_PAGE',"Page");
-define('_NW_BOOKMARK_ME',"Signets Sociaux");
-define('_AM_NEWS_TOTAL',"Total de %u articles");
-define('_AM_NEWS_WHOS_WHO',"Annuaire des Auteurs");
-define('_NW_NEWS_LIST_OF_AUTHORS',"Voici une liste des auteurs de ce site, cliquez sur leur nom pour voir leurs articles");
-define('_AM_NEWS_TOPICS_DIRECTORY',"Répertoire des sujets");
-define('_NW_PAGE_AUTO_SUMMARY',"Page %d  %s");
-// Added in version 1.51
-define('_NW_BOOKMARK_TO_BLINKLIST',"Mettre en favoris dans Blinklist");
-define('_NW_BOOKMARK_TO_DELICIOUS',"Mettre en favoris dans del.icio.us");
-define('_NW_BOOKMARK_TO_DIGG',"Mettre en favoris dans Digg");
-define('_NW_BOOKMARK_TO_FARK',"Mettre en favoris dans Fark");
-define('_NW_BOOKMARK_TO_FURL',"Mettre en favoris dans Furl");
-define('_NW_BOOKMARK_TO_NEWSVINE',"Mettre en favoris dans Newsvine");
-define('_NW_BOOKMARK_TO_REDDIT',"Mettre en favoris dans Reddit");
-define('_NW_BOOKMARK_TO_SIMPY',"Mettre en favoris dans Simpy");
-define('_NW_BOOKMARK_TO_SPURL',"Mettre en favoris dans Spurl");
-define('_NW_BOOKMARK_TO_YAHOO',"Mettre en favoris dans Yahoo");
-
-// Added in version 1.56
-define('_NW_NOTYETSTORY',"Désolé, l'artcile sélectionné n'a pas encore été publié. Veuillez revenir plus tard.");
-define('_NW_SELECT_IMAGE', "Choisissez une image à joindre à l'article");
-define('_NW_CURENT_PICTURE', "Image actuelle");
-// Added in version 1.67
-define('_NW_BOOKMARK_TO_FACEBOOK', "Mettre en favoris dans Faceboom");
-define('_NW_BOOKMARK_TO_TWITTER', "Mettre en favoris dans Twitter");
-define('_NW_BOOKMARK_TO_SCRIPSTYLE', "Mettre en favoris dans Scripstyle");
-define('_NW_BOOKMARK_TO_STUMBLE', "Mettre en favoris dans Stumble");
-define('_NW_BOOKMARK_TO_TECHNORATI', "Mettre en favoris dans Technorati");
-define('_NW_BOOKMARK_TO_MIXX', "Mettre en favoris dans Mixx");
-define('_NW_BOOKMARK_TO_MYSPACE', "Mettre en favoris dans Myspace");
-define('_NW_BOOKMARK_TO_DESIGNFLOAT', "Mettre en favoris dans Designfloat");
-define('_NW_BOOKMARK_TO_BALATARIN', "Mettre en favoris dans Balatarin");
-define('_NW_BOOKMARK_TO_GOOLGEBUZZ', "Mettre en favoris dans Google Buzz");
-define('_NW_BOOKMARK_TO_GOOLGEREADER', "Mettre en favoris dans Google Reader");
-define('_NW_BOOKMARK_TO_GOOLGEBOOKMARKS', "Mettre en favoris dans Google Bookmarks");
-
-define('_NW_DELETE', "Supprimer");
-define('_NW_EDIT', "Editer");
-define('_NW_SUBTITLE', "Sous-titre : ");
-define('_NW_SELECT_IMAGE_DESC', "Description de l'image sélectionnée : ");
-
-/**
- * @translation     Communauté Francophone des Utilisateurs de Xoops
- * @specification   _LANGCODE: fr
- * @specification   _CHARSET: UTF-8 sans Bom
- * Mis à jour par Cesag le 16 Mai 2012
- * @version         $Id $
-**/
-
-?>
\ No newline at end of file

Copied: XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php (from rev 9693, XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php)
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php	                        (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/main.php	2012-07-11 19:28:48 UTC (rev 9849)
@@ -0,0 +1,144 @@
+<?php
+// $Id$
+//%%%%%%		File Name index.php 		%%%%%
+define('_NW_PRINTER',"Version imprimable");
+define('_NW_SENDSTORY',"Envoyer cet article à un ami");
+define('_NW_READMORE',"Lire la suite...");
+define('_NW_COMMENTS',"Commentaires ?");
+define('_NW_ONECOMMENT',"1 commentaire");
+define('_NW_BYTESMORE',"%s octets en plus");
+define('_NW_NUMCOMMENTS',"%s commentaires");
+define('_NW_MORERELEASES', "Plus d'articles dans le sujet ");
+
+
+//%%%%%%		File Name submit.php		%%%%%
+define('_NW_SUBMITNEWS',"Proposer un article");
+define('_NW_TITLE',"Titre");
+define('_NW_TOPIC',"Sujet");
+define('_NW_THESCOOP',"Le Scoop");
+define('_NW_NOTIFYPUBLISH',"Notifier par mail lors de la publication");
+define('_NW_POST',"Publier");
+define('_NW_GO',"Ok");
+define('_NW_THANKS',"Merci pour votre participation."); //submission of news article
+
+define('_NW_NOTIFYSBJCT',"Des articles à publier sur le site"); // Notification mail subject
+define('_NW_NOTIFYMSG',"Hé! Vous avez de nouvelles propositions d'articles pour votre site."); // Notification mail message
+
+//%%%%%%		File Name archive.php		%%%%%
+define('_NW_NEWSARCHIVES',"Archives");
+define('_NW_ARTICLES',"Articles");
+define('_NW_VIEWS',"Lectures");
+define('_NW_DATE',"Date");
+define('_NW_ACTIONS',"Actions");
+define('_NW_PRINTERFRIENDLY',"Format imprimable");
+
+define('_NW_THEREAREINTOTAL',"Il y a %s article(s) au total");
+
+// %s is your site name
+define('_NW_INTARTICLE',"Article intéressant sur %s");
+define('_NW_INTARTFOUND',"Voici un article intéressant trouvé sur %s");
+
+define('_NW_TOPICC',"Sujet :");
+define('_NW_URL',"Site :");
+define('_NW_NOSTORY',"Désolé, l'article sélectionné n'existe pas.");
+
+//%%%%%%	File Name print.php 	%%%%%
+
+define('_NW_URLFORSTORY',"L'adresse de cet article est :");
+
+// %s represents your site name
+define('_NW_THISCOMESFROM',"Cet article provient de %s");
+
+// Added by Hervé
+define('_NW_ATTACHEDFILES',"Fichiers attachés : ");
+define('_NW_ATTACHEDLIB',"Cet article a des fichiers attachés");
+define('_NW_NEWSSAMEAUTHORLINK',"Articles du même auteur");
+define('_NW_NEWS_NO_TOPICS',"Désolé, mais il n'y actuellement aucun sujet, merci de le créer avant de soumettre un article");
+define('_NW_PREVIOUS_ARTICLE',"Article précédent");
+define('_NW_NEXT_ARTICLE',"Article suivant");
+define('_NW_OTHER_ARTICLES',"Autres articles");
+
+// Added by Hervé in version 1.3 for rating
+define('_NW_RATETHISNEWS',"Noter cet article");
+define('_NW_RATEIT',"Notez-le !");
+define('_NW_TOTALRATE',"Total des votes");
+define('_NW_RATINGLTOH',"Notation (du score le plus bas au score le plus haut)");
+define('_NW_RATINGHTOL',"Notation (du score le plus haut au score le plus bas)");
+define('_NW_RATINGC',"Note: ");
+define('_NW_RATINGSCALE',"L'échelle va de 1 à 10, 1 étant Pas Terrible quand 10 est Excellent.");
+define('_NW_BEOBJECTIVE',"Merci de rester objectif, si tout le monde reçoit une note de 1 ou 10, la notation n'est pas très utile.");
+define('_NW_DONOTVOTE',"Merci de ne pas voter pour vos propres participations.");
+define('_NW_RATING',"Notation");
+define('_NW_VOTE',"Vote");
+define('_NW_NORATING',"Aucune note sélectionnée.");
+define('_NW_USERAVG',"Note moyenne");
+define('_NW_DLRATINGS',"Note des articles (nombre total de vote: %s)");
+define('_NW_ONEVOTE',"1 vote");
+define('_NW_NUMVOTES',"%u votes");		// Warning
+define('_NW_CANTVOTEOWN',"Vous ne pouvez pas  voter pour une ressource que vous avez proposé.<br />All votes are logged and reviewed.");
+define('_NW_VOTEDELETED',"Données de vote supprimées.");
+define('_NW_VOTEONCE',"Merci de ne pas  voter pour une même ressource plus d'une fois.");
+define('_NW_VOTEAPPRE',"Merci pour votre vote.");
+define('_NW_THANKYOU',"Merci d'avoir pris le temps de voter ici sur %s"); // %s is your site name
+define('_NW_RSSFEED',"Flux RSS");	// Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes
+define('_NW_AUTHOR',"Auteur");
+define('_NW_META_DESCRIPTION',"Description Meta");
+define('_NW_META_KEYWORDS',"Meta mots clés");
+define('_NW_MAKEPDF',"Créer un fichier PDF à partir de cet article");
+define('_MD_POSTEDON',"Publié le  ");
+define('_NW_AUTHOR_ID',"ID de l'auteur");
+define('_NW_POST_SORRY',"Désolé mais soit il n'y a pas de sujets soit vous n'avez pas le droit de créer des articles dans les sujets existants. Si vous êtes les webmaster, allez dans les permissions et définissez les permissions de 'Soumettre'.");
+
+// Added in v 1.50
+define('_NW_LINKS',"Liens");
+define('_NW_PAGE',"Page");
+define('_NW_BOOKMARK_ME',"Signets Sociaux");
+define('_AM_NEWS_TOTAL',"Total de %u articles");
+define('_AM_NEWS_WHOS_WHO',"Annuaire des Auteurs");
+define('_NW_NEWS_LIST_OF_AUTHORS',"Voici une liste des auteurs de ce site, cliquez sur leur nom pour voir leurs articles");
+define('_AM_NEWS_TOPICS_DIRECTORY',"Répertoire des sujets");
+define('_NW_PAGE_AUTO_SUMMARY',"Page %d  %s");
+// Added in version 1.51
+define('_NW_BOOKMARK_TO_BLINKLIST',"Mettre en favoris dans Blinklist");
+define('_NW_BOOKMARK_TO_DELICIOUS',"Mettre en favoris dans del.icio.us");
+define('_NW_BOOKMARK_TO_DIGG',"Mettre en favoris dans Digg");
+define('_NW_BOOKMARK_TO_FARK',"Mettre en favoris dans Fark");
+define('_NW_BOOKMARK_TO_FURL',"Mettre en favoris dans Furl");
+define('_NW_BOOKMARK_TO_NEWSVINE',"Mettre en favoris dans Newsvine");
+define('_NW_BOOKMARK_TO_REDDIT',"Mettre en favoris dans Reddit");
+define('_NW_BOOKMARK_TO_SIMPY',"Mettre en favoris dans Simpy");
+define('_NW_BOOKMARK_TO_SPURL',"Mettre en favoris dans Spurl");
+define('_NW_BOOKMARK_TO_YAHOO',"Mettre en favoris dans Yahoo");
+
+// Added in version 1.56
+define('_NW_NOTYETSTORY',"Désolé, l'artcile sélectionné n'a pas encore été publié. Veuillez revenir plus tard.");
+define('_NW_SELECT_IMAGE', "Choisissez une image à joindre à l'article");
+define('_NW_CURENT_PICTURE', "Image actuelle");
+// Added in version 1.67
+define('_NW_BOOKMARK_TO_FACEBOOK', "Mettre en favoris dans Faceboom");
+define('_NW_BOOKMARK_TO_TWITTER', "Mettre en favoris dans Twitter");
+define('_NW_BOOKMARK_TO_SCRIPSTYLE', "Mettre en favoris dans Scripstyle");
+define('_NW_BOOKMARK_TO_STUMBLE', "Mettre en favoris dans Stumble");
+define('_NW_BOOKMARK_TO_TECHNORATI', "Mettre en favoris dans Technorati");
+define('_NW_BOOKMARK_TO_MIXX', "Mettre en favoris dans Mixx");
+define('_NW_BOOKMARK_TO_MYSPACE', "Mettre en favoris dans Myspace");
+define('_NW_BOOKMARK_TO_DESIGNFLOAT', "Mettre en favoris dans Designfloat");
+define('_NW_BOOKMARK_TO_BALATARIN', "Mettre en favoris dans Balatarin");
+define('_NW_BOOKMARK_TO_GOOGLEPLUS', "Mettre en favoris dans Google Plus");
+define('_NW_BOOKMARK_TO_GOOGLEREADER', "Mettre en favoris dans Google Reader");
+define('_NW_BOOKMARK_TO_GOOGLEBOOKMARKS', "Mettre en favoris dans Google Bookmarks");
+
+define('_NW_DELETE', "Supprimer");
+define('_NW_EDIT', "Editer");
+define('_NW_SUBTITLE', "Sous-titre : ");
+define('_NW_SELECT_IMAGE_DESC', "Description de l'image sélectionnée : ");
+
+/**
+ * @translation     Communauté Francophone des Utilisateurs de Xoops
+ * @specification   _LANGCODE: fr
+ * @specification   _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version         $Id $
+**/
+
+?>
\ No newline at end of file

Deleted: XoopsLanguages/french/modules/news/news 1.67/news/language/french/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php	2012-05-31 03:54:11 UTC (rev 9603)
+++ XoopsLanguages/french/modules/news/news 1.67/news/language/french/modinfo.php	2012-07-11 19:28:48 UTC (rev 9849)
@@ -1,210 +0,0 @@
-<?php
-// $Id: modinfo.php 1687 2012-05-17 13:20:50Z cesag $
-// Module Info
-
-// The name of this module
-define('_MI_NEWS_NAME','Articles');
-
-// A brief description of this module
-define('_MI_NEWS_DESC',"Crée une section d'articles, où les utilisateurs peuvent poster des articles/commentaires.");
-
-// Names of blocks for this module (Not all module has blocks)
-define('_MI_NEWS_BNAME1',"Sujets d'articles");
-define('_MI_NEWS_BNAME3','Article du jour');
-define('_MI_NEWS_BNAME4','Top articles');
-define('_MI_NEWS_BNAME5','Articles récents');
-define('_MI_NEWS_BNAME6','Modération des articles');
-define('_MI_NEWS_BNAME7','Navigation dans les sujets');
-
-// Sub menus in main menu block
-define('_MI_NEWS_SMNAME1','Proposer un article');
-define('_MI_NEWS_SMNAME2','Archives');
-
-// Names of admin menu items
-define('_MI_NEWS_ADMENU2', 'Sujets');
-define('_MI_NEWS_ADMENU3', 'Articles');
-define('_MI_NEWS_GROUPPERMS', 'Permissions');
-// Added by Hervé for prune option
-define('_MI_NEWS_PRUNENEWS', 'Purge');
-// Added by Hervé
-define('_MI_NEWS_EXPORT', 'Export');
-
-// Title of config items
-define('_MI_STORYHOME', "Combien d'article(s) sur la page principale ?");
-define('_MI_NOTIFYSUBMIT', "Notifier par mail d'une nouvelle proposition ?");
-define('_MI_DISPLAYNAV', "Afficher la boîte de navigation en haut de chaque page ?");
-
-define('_MI_AUTOAPPROVE',"Approuver automatiquement les nouveaux articles sans l'intervention d'un administrateur ?");
-define("_MI_ALLOWEDSUBMITGROUPS", "Groupes pouvant soumettre des articles");
-define("_MI_ALLOWEDAPPROVEGROUPS", "Groupes pouvant approuver des articles");
-define("_MI_NEWSDISPLAY", "Mise en page des articles");
-define("_MI_NAMEDISPLAY","Nom d'auteur à utiliser");
-define("_MI_COLUMNMODE","Colonnes");
-define("_MI_STORYCOUNTADMIN","Nombre d'articles à afficher dans l'administration : ");
-define("_MI_UPLOADFILESIZE", "Taille maximale des fichiers joints en Ko (1048576 = 1 Méga)");
-define("_MI_UPLOADGROUPS","Groupes autorisés à joindre des fichiers aux articles");
-
-// Description of each config items
-define('_MI_STORYHOMEDSC', '');
-define('_MI_NOTIFYSUBMITDSC', '');
-define('_MI_DISPLAYNAVDSC', '');
-define('_MI_AUTOAPPROVEDSC', '');
-define("_MI_ALLOWEDSUBMITGROUPSDESC", "Les groupes sélectionnés seront autorisés à soumettre des articles");
-define("_MI_ALLOWEDAPPROVEGROUPSDESC", "Les groupes sélectionnés seront autorisés à approuver les nouveaux articles");
-define("_MI_NEWSDISPLAYDESC", "Le mode classique affiche tous les nouveaux articles triés par date de publication. Le mode Articles par sujets groupera les articles par sujet avec le dernier article développé et les autres avec juste le titre");
-define('_MI_ADISPLAYNAMEDSC', "Permet de choisir sous quelle forme le nom de l'auteur doit être affiché");
-define("_MI_COLUMNMODE_DESC","Choisissez le nombre de colonnes à utiliser pour afficher les articles (cette option n'est utilisable qu'avec le mode d'affichage 'classique')");
-define("_MI_STORYCOUNTADMIN_DESC","");
-define("_MI_UPLOADFILESIZE_DESC","");
-define("_MI_UPLOADGROUPS_DESC","Choisissez les groupes qui peuvent télécharger vers le serveur");
-
-
-// Name of config item values
-define("_MI_NEWSCLASSIC", "Classique");
-define("_MI_NEWSBYTOPIC", "Articles par sujets");
-define("_MI_DISPLAYNAME1", 'Pseudo');
-define("_MI_DISPLAYNAME2", 'Nom complet');
-define("_MI_DISPLAYNAME3", 'Aucun');
-define("_MI_UPLOAD_GROUP1","Editeurs et Approbateurs");
-define("_MI_UPLOAD_GROUP2","Approbateurs uniquement");
-define("_MI_UPLOAD_GROUP3","Téléchargement désactivé");
-
-
-// Text for notifications
-
-define('_MI_NEWS_GLOBAL_NOTIFY', 'Globale');
-define('_MI_NEWS_GLOBAL_NOTIFYDSC', 'Options de notification globale des articles.');
-
-define('_MI_NEWS_STORY_NOTIFY', 'Articles');
-define('_MI_NEWS_STORY_NOTIFYDSC', 'Options de notification s\'appliquant à l\'article actuel.');
-
-define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFY', 'Nouveau sujet');
-define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYCAP', 'Notifiez-moi quand un nouveau sujet est créé.');
-define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYDSC', 'Recevoir une notification quand un nouveau sujet est créé.');
-define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
-
-define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFY', 'Nouvel article proposé');
-define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYCAP', 'Notifiez-moi lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
-define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYDSC', 'Recevoir une notification lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
-define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article proposé');
-
-define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFY', 'Nouvel article');
-define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYCAP', 'Notifiez-moi quand un nouvel article est posté.');
-define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYDSC', 'Recevoir une notification quand un nouvel article est posté.');
-define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
-
-define('_MI_NEWS_STORY_APPROVE_NOTIFY', 'Article approuvé');
-define('_MI_NEWS_STORY_APPROVE_NOTIFYCAP', 'Notifiez-moi quand cet article est approuvé.');
-define('_MI_NEWS_STORY_APPROVE_NOTIFYDSC', 'Recevoir une notification quand cet article est approuvé.');
-define('_MI_NEWS_STORY_APPROVE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Article approuvé');
-
-define('_MI_RESTRICTINDEX', "Restreindre les sujets sur la page d'index ?");
-define('_MI_RESTRICTINDEXDSC', "Si l'option est à Oui, les utilisateurs ne verront que les articles pour lesquels ils ont les permissions de lecture");
-
-define('_MI_NEWSBYTHISAUTHOR', 'Articles du même auteur');
-define('_MI_NEWSBYTHISAUTHORDSC', "Si vous mettez cette option à OUI, alors un lien 'Articles du même auteur' sera affiché");
-
-define('_MI_NEWS_PREVNEX_LINK','Afficher les liens vers les articles précédents et suivants ?');
-define("_MI_NEWS_PREVNEX_LINK_DESC","Si cette option est activée, deux nouveaux liens seront visibles en bas de chaque article. Ces liens seront utiles pour lire l'article précédent et suivant en fonction de la date de publication");
-define('_MI_NEWS_SUMMARY_SHOW','Afficher la table de sommaire ?');
-define('_MI_NEWS_SUMMARY_SHOW_DESC','Quand vous utilisez cette option, une table sommaire contenant les liens vers tous les articles récents publiés sur le même thème sera visible en bas de chaque article');
-define('_MI_NEWS_AUTHOR_EDIT',"Permettre aux auteurs d'éditer leurs articles ?");
-define('_MI_NEWS_AUTHOR_EDIT_DESC','Avec cette option, les auteurs pourront eux-même éditer leurs contributions.');
-define('_MI_NEWS_RATE_NEWS','Permettre aux utilisateurs de noter les articles ?');
-define('_MI_NEWS_TOPICS_RSS','Activer le flux RSS par sujet?');
-define('_MI_NEWS_TOPICS_RSS_DESC',"Si vous positionnez cette option sur 'Oui', alors les articles pour ce sujet seront disponibles sous la forme d'un flux RSS");
-define('_MI_NEWS_DATEFORMAT', "Format de Date");
-define('_MI_NEWS_DATEFORMAT_DESC',"S'il vous plaît se référer à la documentation de PHP (http://fr.php.net/manual/en/function.date.php) pour plus d'informations sur la façon de sélectionner le format. Notez que si vous ne tapez rien le format de date par défaut sera utilisé");
-define('_MI_NEWS_META_DATA', "Permettre la saisie des données meta (keywords et description) ?");
-define('_MI_NEWS_META_DATA_DESC', "Si vous positionnez cette option sur 'Oui', alors les approbateurs pourront entrer les données meta suivantes : keywords et description");
-define('_MI_NEWS_BNAME8','Articles Aléatoires');
-define('_MI_NEWS_NEWSLETTER',"Bulletin d'information");
-define('_MI_NEWS_STATS','Statistiques');
-define("_MI_NEWS_FORM_OPTIONS","Option de formulaire");
-define("_MI_NEWS_FORM_COMPACT","Compact");
-define("_MI_NEWS_FORM_DHTML","DHTML");
-define("_MI_NEWS_FORM_SPAW","Éditeur Spaw");
-define("_MI_NEWS_FORM_HTMLAREA","Éditeur HtmlArea");
-define("_MI_NEWS_FORM_FCK","Éditeur FCK");
-define("_MI_NEWS_FORM_KOIVI","Éditeur Koivi");
-define("_MI_NEWS_FORM_OPTIONS_DESC","Sélectionnez l'éditeur à utiliser. Si vous avez une installation 'simple' (i.e vous utilisez seulement l'éditeur xoops fourni en standard), alors vous ne pouvez que sélectionner DHTML et Compact");
-define("_MI_NEWS_KEYWORDS_HIGH","Activer le surlignage des mots clefs de recherche ?");
-define("_MI_NEWS_KEYWORDS_HIGH_DESC","Si vous utilisez cette option, alors les mots clefs saisis dans le champ de Recherche seront surlignés dans les articles");
-define("_MI_NEWS_HIGH_COLOR","Couleur utilisée pour le surlignage des mots de recherche ?");
-define("_MI_NEWS_HIGH_COLOR_DES","Utilisez cette option seulement si vous avez choisi Oui à l'option précédente");
-define("_MI_NEWS_INFOTIPS","Nombre de caractères pris en compte dans les infobulles");
-define("_MI_NEWS_INFOTIPS_DES","Si vous utilisez cette option, les liens relatifs à des articles contiendront une infobulle reprennant les premiers (n) caractères de chaque article. Si vous paramétrez cette valeur à 0, alors l'infobulle sera vide");
-define("_MI_NEWS_SITE_NAVBAR","Utiliser la barre de navigation Mozilla et Opera ?");
-define("_MI_NEWS_SITE_NAVBAR_DESC","Si vous positionnez cette option à Oui, alors les visiteurs de votre site pourront utiliser la barre de navigation de site pour se déplacer entre vos articles.");
-define("_MI_NEWS_TABS_SKIN","Sélectionnez l'apparence à utiliser dans les onglets");
-define("_MI_NEWS_TABS_SKIN_DESC","Cet habillage sera utilisé dans tous les blocs qui utilisent des onglets");
-define("_MI_NEWS_SKIN_1","Style barre");
-define("_MI_NEWS_SKIN_2","Incliné");
-define("_MI_NEWS_SKIN_3","Classique");
-define("_MI_NEWS_SKIN_4","Dossiers");
-define("_MI_NEWS_SKIN_5","MacOs");
-define("_MI_NEWS_SKIN_6","Plat");
-define("_MI_NEWS_SKIN_7","Arrondi");
-define("_MI_NEWS_SKIN_8","Style ZDnet");
-
-// Added in version 1.50
-define('_MI_NEWS_BNAME9','Archives');
-define("_MI_NEWS_FORM_TINYEDITOR","Éditeur TinyEditor");
-define("_MI_NEWS_FOOTNOTES","Voir les liens sur les versions imprimables ?");
-define("_MI_NEWS_DUBLINCORE","Activer les métadonnées Dublin Core ?");
-define("_MI_NEWS_DUBLINCORE_DSC","Pour plus d'informations, <a href='http://fr.wikipedia.org/wiki/Dublin_Core' rel='external'>consultez ce lien</a>");
-define("_MI_NEWS_BOOKMARK_ME","Afficher un bloc 'Ajouter cette page sur ces sites' ?");
-define("_MI_NEWS_BOOKMARK_ME_DSC","Ce bloc sera visible sur la page des articles");
-define("_MI_NEWS_FF_MICROFORMAT","Activer les 'microrésumés' de Firefox 2 ?");
-define("_MI_NEWS_FF_MICROFORMAT_DSC","Pour plus d'informations, voir <a href='https://developer.mozilla.org/fr/Création_d'un_générateur_de_microrésumé' rel='external'>cette page</a>");
-define("_MI_NEWS_WHOS_WHO","Annuaire des auteurs");
-define("_MI_NEWS_METAGEN","Metagen");
-define("_MI_NEWS_TOPICS_DIRECTORY","Répertoire des sujets");
-define("_MI_NEWS_ADVERTISEMENT","Publicité");
-define("_MI_NEWS_ADV_DESCR","Entrez un texte ou du code javascript à afficher dans vos articles");
-define("_MI_NEWS_MIME_TYPES","Entrez les types mime autorisés pour le téléchargement des pièces jointes dans les articles (séparez les par un retour à la ligne)");
-define("_MI_NEWS_ENHANCED_PAGENAV","Utiliser le séparateur de pages amélioré ?");
-define("_MI_NEWS_ENHANCED_PAGENAV_DSC","Avec cette option vous pouvez séparer vos pages avec quelque chose comme cela [pagrebreak:Titre page], les liens vers les pages sont remplacés par une liste déroulante et vous pouvez utiliser [summary] pour créer un sommaire automatique des pages");
-
-// Added in version 1.54
-define('_MI_NEWS_CATEGORY_NOTIFY','Catégorie');
-define('_MI_NEWS_CATEGORY_NOTIFYDSC',"Options de notification pour la catégorie en cours");
-
-define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY', "Nouvel article publié");
-define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP', "Notifiez-moi lorsqu'un nouvel article est publié dans cette catégorie.");
-define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC', "Recevoir une notification lorsqu'un article est publié dans cette catégorie.");
-define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
-
-// Added in version 1.63
-define('_MI_NEWS_TAGS', "Utiliser le système de tags ?");
-define('_MI_NEWS_TAGS_DSC', "Ceci est basé sur le module Xoops 'Tag' de phppp");
-define("_MI_NEWS_BNAME10", "Nuage de Tags");
-define("_MI_NEWS_BNAME11", "Top Tags");
-define("_MI_NEWS_INTRO_TEXT", "Texte d'introduction à afficher sur la page de soumission d'un article");
-define("_MI_NEWS_IMAGE_MAX_WIDTH", "Largeur maximale de l'image lorsqu'elle est redimensionnée");
-define("_MI_NEWS_IMAGE_MAX_HEIGHT", "Hauteur maximale de l'image lorsqu'elle est redimensionnée");
-
-//Added in 1.67
-define("_MI_NEWS_HELP","Aide");
-define("_MI_NEWS_ABOUT","A propos");
-define("_MI_NEWS_HOME","Accueil");
-define("_MI_NEWS_UPGRADE","Mise à jour");
-define("_MI_NEWS_DESCRIPTION","Avec ce module Xoops, vous pouvez créer un nombre illimité d'articles sur votre site. <br /> <br />
-Vous pouvez créer tous les articles q...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops:[9848] XoopsCore/tags/2.6 timgno/htdocs/media

[<txm...@us...>]

Revision: 9848
          http://xoops.svn.sourceforge.net/xoops/?rev=9848&view=rev
Author:   txmodxoops
Date:     2012-07-11 18:04:10 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Added datetimepicker.js and timepicker.js files

Added Paths:
-----------
    XoopsCore/tags/2.6 timgno/htdocs/media/jquery/
    XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/
    XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.js
    XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.min.js
    XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.timepicker.mini.js

Added: XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.js
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.js	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.js	2012-07-11 18:04:10 UTC (rev 9848)
@@ -0,0 +1,135 @@
+/**
+ *   JQuery - DateTimePicker - GPL License
+ *
+ **/
+(function ($) {
+	$.extend($.ui, { DateTimepicker: {} });
+
+
+	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+	$.datepicker._updateDatepicker = function (inst) {
+		$.datepicker._base_updateDatepicker(inst);
+
+		var val = inst.input.val();
+
+		if (inst.input.hasClass("datetimepicker") == false) return;
+
+		var bottomLayer = $(".ui-datepicker").append("<div class='.datetimepicker' />");
+		bottomLayer.append(html1);
+		bottomLayer.append("시 ");
+		bottomLayer.append(html2);
+		bottomLayer.append("분 ");
+		bottomLayer.append(html3);
+		bottomLayer.append("초 ");
+
+		$.datetimepicker.setTime(val, inst.input);
+	};
+
+
+	function DateTimePicker(options) {
+
+		this.defaultDateTimePicker =
+			{
+				showTimePicker: false,
+				time_format: 'hh:mm:ss'
+			};
+
+		hourHTML = $("<select class='dateimepicker-hour' onchange='$.datetimepicker.isDirty = true;'></select>");
+		minutsHTML = $("<select class='dateimepicker-minuts' onchange='$.datetimepicker.isDirty = true;'></select>");
+		secondHTML = $("<select class='dateimepicker-second' onchange='$.datetimepicker.isDirty = true;'></select>");
+
+		for (i = 1; i <= 24; i++) html1 = hourHTML.append("<option>" + i + "</option");
+		for (i = 0; i < 60; i = i + 5) html2 = minutsHTML.append("<option>" + i + "</option");
+		for (i = 0; i < 60; i = i + 5) html3 = secondHTML.append("<option>" + i + "</option");
+	}
+
+	$.fn.extend({
+		datetimepicker: function (options) {
+
+			$.datetimepicker._attach(this, options);
+		}
+	});
+
+	DateTimePicker.prototype = {
+		_initTimePicker: function () {
+		},
+
+		isDirty: false,
+
+		innerOption: function ($this) {
+
+			return {
+				showOn: "button",
+				buttonImage: "css/images/calendar.gif",
+				buttonImageOnly: true,
+				changeMonth: true,
+				changeYear: true,
+				autoSize: true,
+				onSelect: function (a, b) {
+					var hour = $('.ui-datepicker .dateimepicker-hour').val();
+					var minuts = $('.ui-datepicker .dateimepicker-minuts').val();
+					var second = $('.ui-datepicker .dateimepicker-second').val();
+
+					var time = hour + ":" + minuts + ":" + second;
+					$this.val($this.val() + " " + time);
+
+					$.datetimepicker.setTime($this.val(), $this);
+
+					$.datetimepicker.reset();
+				},
+				onClose: function (a, b) {
+					if ($.datetimepicker.isDirty) {
+						$this.val($.datepicker._formatDate(b));
+
+						var hour = $('.ui-datepicker .dateimepicker-hour').val();
+						var minuts = $('.ui-datepicker .dateimepicker-minuts').val();
+						var second = $('.ui-datepicker .dateimepicker-second').val();
+
+						var time = hour + ":" + minuts + ":" + second;
+						$this.val($this.val() + " " + time);
+
+					}
+				}
+			};
+		},
+
+		_attach: function ($this, options) {
+			$this.datepicker($.fn.extend(this.innerOption($this), options))
+				.addClass("datetimepicker");
+
+			this.setTime($this.val(), $this);
+
+		},
+
+		reset: function () {
+			this.isDirty = false;
+		},
+
+		setTime: function (format, $this) {
+			var arrStr = format.split(' ');
+
+			var hour = 12;
+			var minuts = 0;
+			var second = 0;
+
+			if (arrStr.length > 1) {
+				var strTime = arrStr[1];
+				var arr = strTime.split(':');
+				if (arr.length > 0) {
+					hour = arr[0];
+					if (arr.length > 1) minuts = arr[1];
+					if (arr.length > 2) second = arr[2];
+				}
+			}
+
+			$('.ui-datepicker .dateimepicker-hour').val(hour);
+			$('.ui-datepicker .dateimepicker-minuts').val(minuts);
+			$('.ui-datepicker .dateimepicker-second').val(second);
+		}
+	};
+
+
+	$.datetimepicker = new DateTimePicker();
+	$.datetimepicker._initTimePicker();
+
+} (jQuery));
\ No newline at end of file

Added: XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.min.js
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.min.js	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.datetimepicker.min.js	2012-07-11 18:04:10 UTC (rev 9848)
@@ -0,0 +1,6 @@
+/**
+ *   JQuery - DateTimePicker - GPL License
+ *
+ **/
+
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(g($){$.C($.d,{1l:{}});$.6.P=$.6.E;$.6.E=g(r){$.6.P(r);7 3=r.B.3();o(r.B.1g("8")==t)D;7 l=$(".d-6").h("<1h s=\'.8\' />");l.h(F);l.h("시 ");l.h(L);l.h("분 ");l.h(T);l.h("초 ");$.8.w(3,r.B)};g y(q){4.1i={1k:t,18:\'1a:1b:1f\'};R=$("<m s=\'9-f\' z=\'$.8.n = j;\'></m>");M=$("<m s=\'9-e\' z=\'$.8.n = j;\'></m>");U=$("<m s=\'9-c\' z=\'$.8.n = j;\'></m>");x(i=1;i<=19;i++)F=R.h("<p>"+i+"</p");x(i=0;i<G;i=i+5)L=M.h("<p>"+i+"</p");x(i=0;i<G;i=i+5)T=U.h("<p>"+i+"</p")}$.H.C({8:g(q){$.8.I(4,q)}});y.1j={J:g(){},n:t,K:g($4){D{V:"W",X:"Y/Z/10.11",13:j,14:j,15:j,16:j,17:g(a,b){7 f=$(\'.d-6 .9-f\').3();7 e=$(\'.d-6 .9-e\').3();7 c=$(\'.d-6 .9-c\').3();7 v=f+":"+e+":"+c;$4.3($4.3()+" "+v);$.8.w($4.3(),$4);$.8.N()},1c:g(a,b){o($.8.n){$4.3($.6.1d(b));7 f=$(\'.d-6 .9-f\').3();7 e=$(\'.d-6 .9-e\').3();7 c=$(\'.d-6 .9-c\').3();7 v=f+":"+e+":"+c;$4.3($4.3()+" "+v)}}}},I:g($4,q){$4.6($.H.C(4.K($4),q)).1e("8");4.w($4.3(),$4)},N:g(){4.n=t},w:g(O,$4){7 A=O.Q(\' \');7 f=12;7 e=0;7 c=0;o(A.u>1){7 S=A[1];7 k=S.Q(\':\');o(k.u>0){f=k[0];o(k.u>1)e=k[1];o(k.u>2)c=k[2]}}$(\'.d-6 .9-f\').3(f);$(\'.d-6 .9-e\').3(e);$(\'.d-6 .9-c\').3(c)}};$.8=1m y();$.8.J()}(1n));',62,86,'|||val|this||datepicker|var|datetimepicker|dateimepicker|||second|ui|minuts|hour|function|append||true|arr|bottomLayer|select|isDirty|if|option|options|inst|class|false|length|time|setTime|for|DateTimePicker|onchange|arrStr|input|extend|return|_updateDatepicker|html1|60|fn|_attach|_initTimePicker|innerOption|html2|minutsHTML|reset|format|_base_updateDatepicker|split|hourHTML|strTime|html3|secondHTML|showOn|button|buttonImage|css|images|calendar|gif||buttonImageOnly|changeMonth|changeYear|autoSize|onSelect|time_format|24|hh|mm|onClose|_formatDate|addClass|ss|hasClass|div|defaultDateTimePicker|prototype|showTimePicker|DateTimepicker|new|jQuery'.split('|'),0,{}))
\ No newline at end of file

Added: XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.timepicker.mini.js
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.timepicker.mini.js	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/media/jquery/plugins/jquery.timepicker.mini.js	2012-07-11 18:04:10 UTC (rev 9848)
@@ -0,0 +1,43 @@
+(function(e){function q(){this.regional=[];this.regional[""]={currentText:"Now",closeText:"Done",ampm:false,timeFormat:"hh:mm tt",timeSuffix:"",timeOnlyTitle:"Choose Time",timeText:"Time",hourText:"Hour",minuteText:"Minute",secondText:"Second",timezoneText:"Time Zone"};this._defaults={showButtonPanel:true,timeOnly:false,showHour:true,showMinute:true,showSecond:false,showTimezone:false,showTime:true,stepHour:0.05,stepMinute:0.05,stepSecond:0.05,hour:0,minute:0,second:0,timezone:"+0000",hourMin:0,minuteMin:0,
+secondMin:0,hourMax:23,minuteMax:59,secondMax:59,minDateTime:null,maxDateTime:null,hourGrid:0,minuteGrid:0,secondGrid:0,alwaysSetTime:true,separator:" ",altFieldTimeOnly:true,showTimepicker:true,timezoneList:["-1100","-1000","-0900","-0800","-0700","-0600","-0500","-0400","-0300","-0200","-0100","+0000","+0100","+0200","+0300","+0400","+0500","+0600","+0700","+0800","+0900","+1000","+1100","+1200"]};e.extend(this._defaults,this.regional[""])}e.extend(e.ui,{timepicker:{version:"0.9.6"}});e.extend(q.prototype,
+{$input:null,$altInput:null,$timeObj:null,inst:null,hour_slider:null,minute_slider:null,second_slider:null,timezone_select:null,hour:0,minute:0,second:0,timezone:"+0000",hourMinOriginal:null,minuteMinOriginal:null,secondMinOriginal:null,hourMaxOriginal:null,minuteMaxOriginal:null,secondMaxOriginal:null,ampm:"",formattedDate:"",formattedTime:"",formattedDateTime:"",timezoneList:["-1100","-1000","-0900","-0800","-0700","-0600","-0500","-0400","-0300","-0200","-0100","+0000","+0100","+0200","+0300",
+"+0400","+0500","+0600","+0700","+0800","+0900","+1000","+1100","+1200"],setDefaults:function(c){var a=this._defaults;c=c||{};e.extend(a,c);for(var b in c)if(c[b]===null||c[b]===undefined)a[b]=c[b];return this},_newInst:function(c,a){var b=new q,d={},f;for(f in this._defaults){var i=c.attr("time:"+f);if(i)try{d[f]=eval(i)}catch(g){d[f]=i}}b._defaults=e.extend({},this._defaults,d,a,{beforeShow:function(h,l){e.isFunction(a.beforeShow)&&a.beforeShow(h,l,b)},onChangeMonthYear:function(h,l,n){b._updateDateTime(n);
+e.isFunction(a.onChangeMonthYear)&&a.onChangeMonthYear.call(c[0],h,l,n,b)},onClose:function(h,l){b.timeDefined===true&&c.val()!=""&&b._updateDateTime(l);e.isFunction(a.onClose)&&a.onClose.call(c[0],h,l,b)},timepicker:b});b.hour=b._defaults.hour;b.minute=b._defaults.minute;b.second=b._defaults.second;b.ampm="";b.$input=c;if(a.altField)b.$altInput=e(a.altField).css({cursor:"pointer"}).focus(function(){c.trigger("focus")});if(b._defaults.minDate!==undefined&&b._defaults.minDate instanceof Date)b._defaults.minDateTime=
+new Date(b._defaults.minDate.getTime());if(b._defaults.minDateTime!==undefined&&b._defaults.minDateTime instanceof Date)b._defaults.minDate=new Date(b._defaults.minDateTime.getTime());if(b._defaults.maxDate!==undefined&&b._defaults.maxDate instanceof Date)b._defaults.maxDateTime=new Date(b._defaults.maxDate.getTime());if(b._defaults.maxDateTime!==undefined&&b._defaults.maxDateTime instanceof Date)b._defaults.maxDate=new Date(b._defaults.maxDateTime.getTime());return b},_addTimePicker:function(c){this.timeDefined=
+this._parseTime(this.$altInput&&this._defaults.altFieldTimeOnly?this.$input.val()+" "+this.$altInput.val():this.$input.val());this._limitMinMaxDateTime(c,false);this._injectTimePicker()},_parseTime:function(c,a){var b=this._defaults.timeFormat.toString().replace(/h{1,2}/ig,"(\\d?\\d)").replace(/m{1,2}/ig,"(\\d?\\d)").replace(/s{1,2}/ig,"(\\d?\\d)").replace(/t{1,2}/ig,"(am|pm|a|p)?").replace(/z{1}/ig,"((\\+|-)\\d\\d\\d\\d)?").replace(/\s/g,"\\s?")+this._defaults.timeSuffix+"$",d=this._getFormatPositions();
+if(!this.inst)this.inst=e.datepicker._getInst(this.$input[0]);if(a||!this._defaults.timeOnly)b=".{"+e.datepicker._get(this.inst,"dateFormat").length+",}"+this._defaults.separator.replace(RegExp("[.*+?|()\\[\\]{}\\\\]","g"),"\\$&")+b;if(b=c.match(RegExp(b,"i"))){if(d.t!==-1)this.ampm=(b[d.t]===undefined||b[d.t].length===0?"":b[d.t].charAt(0).toUpperCase()=="A"?"AM":"PM").toUpperCase();if(d.h!==-1)this.hour=this.ampm=="AM"&&b[d.h]=="12"?0:this.ampm=="PM"&&b[d.h]!="12"?(parseFloat(b[d.h])+12).toFixed(0):
+Number(b[d.h]);if(d.m!==-1)this.minute=Number(b[d.m]);if(d.s!==-1)this.second=Number(b[d.s]);if(d.z!==-1)this.timezone=b[d.z];return true}return false},_getFormatPositions:function(){var c=this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2}|z)/g),a={h:-1,m:-1,s:-1,t:-1,z:-1};if(c)for(var b=0;b<c.length;b++)if(a[c[b].toString().charAt(0)]==-1)a[c[b].toString().charAt(0)]=b+1;return a},_injectTimePicker:function(){var c=this.inst.dpDiv,a=this._defaults,b=this,d=(a.hourMax-a.hourMax%
+a.stepHour).toFixed(0),f=(a.minuteMax-a.minuteMax%a.stepMinute).toFixed(0),i=(a.secondMax-a.secondMax%a.stepSecond).toFixed(0),g=this.inst.id.toString().replace(/([^A-Za-z0-9_])/g,"");if(c.find("div#ui-timepicker-div-"+g).length===0&&a.showTimepicker){var h='<div class="ui-timepicker-div" id="ui-timepicker-div-'+g+'"><dl><dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_'+g+'"'+(a.showTime?"":' style="display:none;"')+">"+a.timeText+'</dt><dd class="ui_tpicker_time" id="ui_tpicker_time_'+
+g+'"'+(a.showTime?"":' style="display:none;"')+'></dd><dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_'+g+'"'+(a.showHour?"":' style="display:none;"')+">"+a.hourText+"</dt>",l=0,n=0,r=0,m;if(a.showHour&&a.hourGrid>0){h+='<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_'+g+'"'+(a.showHour?"":' style="display:none;"')+'></div><div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';for(var k=a.hourMin;k<=d;k+=a.hourGrid){l++;var p=a.ampm&&k>12?k-12:k;if(p<10)p="0"+
+p;if(a.ampm)if(k==0)p="12a";else p+=k<12?"a":"p";h+="<td>"+p+"</td>"}h+="</tr></table></div></dd>"}else h+='<dd class="ui_tpicker_hour" id="ui_tpicker_hour_'+g+'"'+(a.showHour?"":' style="display:none;"')+"></dd>";h+='<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_'+g+'"'+(a.showMinute?"":' style="display:none;"')+">"+a.minuteText+"</dt>";if(a.showMinute&&a.minuteGrid>0){h+='<dd class="ui_tpicker_minute ui_tpicker_minute_'+a.minuteGrid+'"><div id="ui_tpicker_minute_'+g+'"'+(a.showMinute?
+"":' style="display:none;"')+'></div><div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';for(k=a.minuteMin;k<=f;k+=a.minuteGrid){n++;h+="<td>"+(k<10?"0":"")+k+"</td>"}h+="</tr></table></div></dd>"}else h+='<dd class="ui_tpicker_minute" id="ui_tpicker_minute_'+g+'"'+(a.showMinute?"":' style="display:none;"')+"></dd>";h+='<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_'+g+'"'+(a.showSecond?"":' style="display:none;"')+">"+a.secondText+"</dt>";if(a.showSecond&&
+a.secondGrid>0){h+='<dd class="ui_tpicker_second ui_tpicker_second_'+a.secondGrid+'"><div id="ui_tpicker_second_'+g+'"'+(a.showSecond?"":' style="display:none;"')+'></div><div style="padding-left: 1px"><table><tr>';for(k=a.secondMin;k<=i;k+=a.secondGrid){r++;h+="<td>"+(k<10?"0":"")+k+"</td>"}h+="</tr></table></div></dd>"}else h+='<dd class="ui_tpicker_second" id="ui_tpicker_second_'+g+'"'+(a.showSecond?"":' style="display:none;"')+"></dd>";h+='<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_'+
+g+'"'+(a.showTimezone?"":' style="display:none;"')+">"+a.timezoneText+"</dt>";h+='<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_'+g+'"'+(a.showTimezone?"":' style="display:none;"')+"></dd>";h+="</dl></div>";$tp=e(h);if(a.timeOnly===true){$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all"><div class="ui-datepicker-title">'+a.timeOnlyTitle+"</div></div>");c.find(".ui-datepicker-header, .ui-datepicker-calendar").hide()}this.hour_slider=$tp.find("#ui_tpicker_hour_"+
+g).slider({orientation:"horizontal",value:this.hour,min:a.hourMin,max:d,step:a.stepHour,slide:function(j,o){b.hour_slider.slider("option","value",o.value);b._onTimeChange()}});this.minute_slider=$tp.find("#ui_tpicker_minute_"+g).slider({orientation:"horizontal",value:this.minute,min:a.minuteMin,max:f,step:a.stepMinute,slide:function(j,o){b.minute_slider.slider("option","value",o.value);b._onTimeChange()}});this.second_slider=$tp.find("#ui_tpicker_second_"+g).slider({orientation:"horizontal",value:this.second,
+min:a.secondMin,max:i,step:a.stepSecond,slide:function(j,o){b.second_slider.slider("option","value",o.value);b._onTimeChange()}});this.timezone_select=$tp.find("#ui_tpicker_timezone_"+g).append("<select></select>").find("select");e.fn.append.apply(this.timezone_select,e.map(a.timezoneList,function(j){return e("<option />").val(typeof j=="object"?j.value:j).text(typeof j=="object"?j.label:j)}));this.timezone_select.val(typeof this.timezone!="undefined"&&this.timezone!=null&&this.timezone!=""?this.timezone:
+a.timezone);this.timezone_select.change(function(){b._onTimeChange()});if(a.showHour&&a.hourGrid>0){m=100*l*a.hourGrid/(d-a.hourMin);$tp.find(".ui_tpicker_hour table").css({width:m+"%",marginLeft:m/(-2*l)+"%",borderCollapse:"collapse"}).find("td").each(function(){e(this).click(function(){var j=e(this).html();if(a.ampm){var o=j.substring(2).toLowerCase();j=parseInt(j.substring(0,2),10);j=o=="a"?j==12?0:j:j==12?12:j+12}b.hour_slider.slider("option","value",j);b._onTimeChange();b._onSelectHandler()}).css({cursor:"pointer",
+width:100/l+"%",textAlign:"center",overflow:"hidden"})})}if(a.showMinute&&a.minuteGrid>0){m=100*n*a.minuteGrid/(f-a.minuteMin);$tp.find(".ui_tpicker_minute table").css({width:m+"%",marginLeft:m/(-2*n)+"%",borderCollapse:"collapse"}).find("td").each(function(){e(this).click(function(){b.minute_slider.slider("option","value",e(this).html());b._onTimeChange();b._onSelectHandler()}).css({cursor:"pointer",width:100/n+"%",textAlign:"center",overflow:"hidden"})})}a.showSecond&&a.secondGrid>0&&$tp.find(".ui_tpicker_second table").css({width:m+
+"%",marginLeft:m/(-2*r)+"%",borderCollapse:"collapse"}).find("td").each(function(){e(this).click(function(){b.second_slider.slider("option","value",e(this).html());b._onTimeChange();b._onSelectHandler()}).css({cursor:"pointer",width:100/r+"%",textAlign:"center",overflow:"hidden"})});d=c.find(".ui-datepicker-buttonpane");d.length?d.before($tp):c.append($tp);this.$timeObj=$tp.find("#ui_tpicker_time_"+g);if(this.inst!==null){c=this.timeDefined;this._onTimeChange();this.timeDefined=c}c=function(){b._onSelectHandler()};
+this.hour_slider.bind("slidestop",c);this.minute_slider.bind("slidestop",c);this.second_slider.bind("slidestop",c)}},_limitMinMaxDateTime:function(c,a){var b=this._defaults,d=new Date(c.selectedYear,c.selectedMonth,c.selectedDay);if(this._defaults.showTimepicker){if(e.datepicker._get(c,"minDateTime")!==null&&d){var f=e.datepicker._get(c,"minDateTime"),i=new Date(f.getFullYear(),f.getMonth(),f.getDate(),0,0,0,0);if(this.hourMinOriginal===null||this.minuteMinOriginal===null||this.secondMinOriginal===
+null){this.hourMinOriginal=b.hourMin;this.minuteMinOriginal=b.minuteMin;this.secondMinOriginal=b.secondMin}if(c.settings.timeOnly||i.getTime()==d.getTime()){this._defaults.hourMin=f.getHours();if(this.hour<=this._defaults.hourMin){this.hour=this._defaults.hourMin;this._defaults.minuteMin=f.getMinutes();if(this.minute<=this._defaults.minuteMin){this.minute=this._defaults.minuteMin;this._defaults.secondMin=f.getSeconds()}else{if(this.second<this._defaults.secondMin)this.second=this._defaults.secondMin;
+this._defaults.secondMin=this.secondMinOriginal}}else{this._defaults.minuteMin=this.minuteMinOriginal;this._defaults.secondMin=this.secondMinOriginal}}else{this._defaults.hourMin=this.hourMinOriginal;this._defaults.minuteMin=this.minuteMinOriginal;this._defaults.secondMin=this.secondMinOriginal}}if(e.datepicker._get(c,"maxDateTime")!==null&&d){f=e.datepicker._get(c,"maxDateTime");i=new Date(f.getFullYear(),f.getMonth(),f.getDate(),0,0,0,0);if(this.hourMaxOriginal===null||this.minuteMaxOriginal===
+null||this.secondMaxOriginal===null){this.hourMaxOriginal=b.hourMax;this.minuteMaxOriginal=b.minuteMax;this.secondMaxOriginal=b.secondMax}if(c.settings.timeOnly||i.getTime()==d.getTime()){this._defaults.hourMax=f.getHours();if(this.hour>=this._defaults.hourMax){this.hour=this._defaults.hourMax;this._defaults.minuteMax=f.getMinutes();if(this.minute>=this._defaults.minuteMax){this.minute=this._defaults.minuteMax;this._defaults.secondMax=f.getSeconds()}else{if(this.second>this._defaults.secondMax)this.second=
+this._defaults.secondMax;this._defaults.secondMax=this.secondMaxOriginal}}else{this._defaults.minuteMax=this.minuteMaxOriginal;this._defaults.secondMax=this.secondMaxOriginal}}else{this._defaults.hourMax=this.hourMaxOriginal;this._defaults.minuteMax=this.minuteMaxOriginal;this._defaults.secondMax=this.secondMaxOriginal}}if(a!==undefined&&a===true){b=(this._defaults.hourMax-this._defaults.hourMax%this._defaults.stepHour).toFixed(0);d=(this._defaults.minuteMax-this._defaults.minuteMax%this._defaults.stepMinute).toFixed(0);
+f=(this._defaults.secondMax-this._defaults.secondMax%this._defaults.stepSecond).toFixed(0);this.hour_slider&&this.hour_slider.slider("option",{min:this._defaults.hourMin,max:b}).slider("value",this.hour);this.minute_slider&&this.minute_slider.slider("option",{min:this._defaults.minuteMin,max:d}).slider("value",this.minute);this.second_slider&&this.second_slider.slider("option",{min:this._defaults.secondMin,max:f}).slider("value",this.second)}}},_onTimeChange:function(){var c=this.hour_slider?this.hour_slider.slider("value"):
+false,a=this.minute_slider?this.minute_slider.slider("value"):false,b=this.second_slider?this.second_slider.slider("value"):false,d=this.timezone_select?this.timezone_select.val():false;if(typeof c=="object")c=false;if(typeof a=="object")a=false;if(typeof b=="object")b=false;if(typeof d=="object")d=false;if(c!==false)c=parseInt(c,10);if(a!==false)a=parseInt(a,10);if(b!==false)b=parseInt(b,10);var f=c<12?"AM":"PM",i=c!=this.hour||a!=this.minute||b!=this.second||this.ampm.length>0&&this.ampm!=f||d!=
+this.timezone;if(i){if(c!==false)this.hour=c;if(a!==false)this.minute=a;if(b!==false)this.second=b;if(d!==false)this.timezone=d;if(!this.inst)this.inst=e.datepicker._getInst(this.$input[0]);this._limitMinMaxDateTime(this.inst,true)}if(this._defaults.ampm)this.ampm=f;this._formatTime();this.$timeObj&&this.$timeObj.text(this.formattedTime+this._defaults.timeSuffix);this.timeDefined=true;i&&this._updateDateTime()},_onSelectHandler:function(){var c=this._defaults.onSelect,a=this.$input?this.$input[0]:
+null;c&&a&&c.apply(a,[this.formattedDateTime,this])},_formatTime:function(c,a,b){if(b==undefined)b=this._defaults.ampm;c=c||{hour:this.hour,minute:this.minute,second:this.second,ampm:this.ampm,timezone:this.timezone};var d=a||this._defaults.timeFormat.toString();if(b){var f=c.ampm=="AM"?c.hour:c.hour%12;f=Number(f)===0?12:f;d=d.toString().replace(/hh/g,(f<10?"0":"")+f).replace(/h/g,f).replace(/mm/g,(c.minute<10?"0":"")+c.minute).replace(/m/g,c.minute).replace(/ss/g,(c.second<10?"0":"")+c.second).replace(/s/g,
+c.second).replace(/TT/g,c.ampm.toUpperCase()).replace(/Tt/g,c.ampm.toUpperCase()).replace(/tT/g,c.ampm.toLowerCase()).replace(/tt/g,c.ampm.toLowerCase()).replace(/T/g,c.ampm.charAt(0).toUpperCase()).replace(/t/g,c.ampm.charAt(0).toLowerCase()).replace(/z/g,c.timezone)}else{d=d.toString().replace(/hh/g,(c.hour<10?"0":"")+c.hour).replace(/h/g,c.hour).replace(/mm/g,(c.minute<10?"0":"")+c.minute).replace(/m/g,c.minute).replace(/ss/g,(c.second<10?"0":"")+c.second).replace(/s/g,c.second).replace(/z/g,c.timezone);
+d=e.trim(d.replace(/t/gi,""))}if(arguments.length)return d;else this.formattedTime=d},_updateDateTime:function(c){c=this.inst||c;dt=new Date(c.selectedYear,c.selectedMonth,c.selectedDay);dateFmt=e.datepicker._get(c,"dateFormat");formatCfg=e.datepicker._getFormatConfig(c);timeAvailable=dt!==null&&this.timeDefined;var a=this.formattedDate=e.datepicker.formatDate(dateFmt,dt===null?new Date:dt,formatCfg);if(!(c.lastVal!==undefined&&c.lastVal.length>0&&this.$input.val().length===0)){if(this._defaults.timeOnly===
+true)a=this.formattedTime;else if(this._defaults.timeOnly!==true&&(this._defaults.alwaysSetTime||timeAvailable))a+=this._defaults.separator+this.formattedTime+this._defaults.timeSuffix;this.formattedDateTime=a;if(this._defaults.showTimepicker)if(this.$altInput&&this._defaults.altFieldTimeOnly===true){this.$altInput.val(this.formattedTime);this.$input.val(this.formattedDate)}else{this.$altInput&&this.$altInput.val(a);this.$input.val(a)}else this.$input.val(this.formattedDate);this.$input.trigger("change")}}});
+e.fn.extend({timepicker:function(c){c=c||{};var a=arguments;if(typeof c=="object")a[0]=e.extend(c,{timeOnly:true});return e(this).each(function(){e.fn.datetimepicker.apply(e(this),a)})},datetimepicker:function(c){c=c||{};var a=arguments;return typeof c=="string"?c=="getDate"?e.fn.datepicker.apply(e(this[0]),a):this.each(function(){var b=e(this);b.datepicker.apply(b,a)}):this.each(function(){var b=e(this);b.datepicker(e.timepicker._newInst(b,c)._defaults)})}});e.datepicker._base_selectDate=e.datepicker._selectDate;
+e.datepicker._selectDate=function(c,a){var b=this._getInst(e(c)[0]),d=this._get(b,"timepicker");if(d){d._limitMinMaxDateTime(b,true);b.inline=b.stay_open=true;this._base_selectDate(c,a+d._defaults.separator+d.formattedTime+d._defaults.timeSuffix);b.inline=b.stay_open=false;this._notifyChange(b);this._updateDatepicker(b)}else this._base_selectDate(c,a)};e.datepicker._base_updateDatepicker=e.datepicker._updateDatepicker;e.datepicker._updateDatepicker=function(c){var a=c.input[0];if(!(e.datepicker._curInst&&
+e.datepicker._curInst!=c&&e.datepicker._datepickerShowing&&e.datepicker._lastInput!=a))if(typeof c.stay_open!=="boolean"||c.stay_open===false){this._base_updateDatepicker(c);(a=this._get(c,"timepicker"))&&a._addTimePicker(c)}};e.datepicker._base_doKeyPress=e.datepicker._doKeyPress;e.datepicker._doKeyPress=function(c){var a=e.datepicker._getInst(c.target),b=e.datepicker._get(a,"timepicker");if(b)if(e.datepicker._get(a,"constrainInput")){var d=b._defaults.ampm;a=e.datepicker._possibleChars(e.datepicker._get(a,
+"dateFormat"));b=b._defaults.timeFormat.toString().replace(/[hms]/g,"").replace(/TT/g,d?"APM":"").replace(/Tt/g,d?"AaPpMm":"").replace(/tT/g,d?"AaPpMm":"").replace(/T/g,d?"AP":"").replace(/tt/g,d?"apm":"").replace(/t/g,d?"ap":"")+" "+b._defaults.separator+b._defaults.timeSuffix+(b._defaults.showTimezone?b._defaults.timezoneList.join(""):"")+a;d=String.fromCharCode(c.charCode===undefined?c.keyCode:c.charCode);return c.ctrlKey||d<" "||!a||b.indexOf(d)>-1}return e.datepicker._base_doKeyPress(c)};e.datepicker._base_doKeyUp=
+e.datepicker._doKeyUp;e.datepicker._doKeyUp=function(c){var a=e.datepicker._getInst(c.target),b=e.datepicker._get(a,"timepicker");if(b)if(b._defaults.timeOnly&&a.input.val()!=a.lastVal)try{e.datepicker._updateDatepicker(a)}catch(d){e.datepicker.log(d)}return e.datepicker._base_doKeyUp(c)};e.datepicker._base_gotoToday=e.datepicker._gotoToday;e.datepicker._gotoToday=function(c){this._base_gotoToday(c);this._setTime(this._getInst(e(c)[0]),new Date)};e.datepicker._disableTimepickerDatepicker=function(c){var a=
+this._getInst(c),b=this._get(a,"timepicker");e(c).datepicker("getDate");if(b){b._defaults.showTimepicker=false;b._updateDateTime(a)}};e.datepicker._enableTimepickerDatepicker=function(c){var a=this._getInst(c),b=this._get(a,"timepicker");e(c).datepicker("getDate");if(b){b._defaults.showTimepicker=true;b._addTimePicker(a);b._updateDateTime(a)}};e.datepicker._setTime=function(c,a){var b=this._get(c,"timepicker");if(b){var d=b._defaults,f=a?a.getHours():d.hour,i=a?a.getMinutes():d.minute,g=a?a.getSeconds():
+d.second;if(f<d.hourMin||f>d.hourMax||i<d.minuteMin||i>d.minuteMax||g<d.secondMin||g>d.secondMax){f=d.hourMin;i=d.minuteMin;g=d.secondMin}b.hour=f;b.minute=i;b.second=g;b.hour_slider&&b.hour_slider.slider("value",f);b.minute_slider&&b.minute_slider.slider("value",i);b.second_slider&&b.second_slider.slider("value",g);b._onTimeChange();b._updateDateTime(c)}};e.datepicker._setTimeDatepicker=function(c,a,b){c=this._getInst(c);var d=this._get(c,"timepicker");if(d){this._setDateFromField(c);if(a){if(typeof a==
+"string"){d._parseTime(a,b);a=new Date;a.setHours(d.hour,d.minute,d.second)}else a=new Date(a.getTime());if(a.toString()=="Invalid Date")a=undefined;this._setTime(c,a)}}};e.datepicker._base_setDateDatepicker=e.datepicker._setDateDatepicker;e.datepicker._setDateDatepicker=function(c,a){var b=this._getInst(c),d=a instanceof Date?new Date(a.getTime()):a;this._updateDatepicker(b);this._base_setDateDatepicker.apply(this,arguments);this._setTimeDatepicker(c,d,true)};e.datepicker._base_getDateDatepicker=
+e.datepicker._getDateDatepicker;e.datepicker._getDateDatepicker=function(c,a){var b=this._getInst(c),d=this._get(b,"timepicker");if(d){this._setDateFromField(b,a);(b=this._getDate(b))&&d._parseTime(e(c).val(),d.timeOnly)&&b.setHours(d.hour,d.minute,d.second);return b}return this._base_getDateDatepicker(c,a)};e.datepicker._base_parseDate=e.datepicker.parseDate;e.datepicker.parseDate=function(c,a,b){var d;try{d=this._base_parseDate(c,a,b)}catch(f){d=this._base_parseDate(c,a.substring(0,a.length-(f.length-
+f.indexOf(":")-2)),b)}return d};e.datepicker._base_optionDatepicker=e.datepicker._optionDatepicker;e.datepicker._optionDatepicker=function(c,a,b){this._base_optionDatepicker(c,a,b);c=this._getInst(c);var d=this._get(c,"timepicker");if(d){if(a==="minDate"){if(d._defaults.minDate!==undefined&&d._defaults.minDate instanceof Date)d._defaults.minDateTime=new Date(b);if(d._defaults.minDateTime!==undefined&&d._defaults.minDateTime instanceof Date)d._defaults.minDate=new Date(d._defaults.minDateTime.getTime());
+d._limitMinMaxDateTime(c,true)}if(a==="maxDate"){if(d._defaults.maxDate!==undefined&&d._defaults.maxDate instanceof Date)d._defaults.maxDateTime=new Date(b);if(d._defaults.maxDateTime!==undefined&&d._defaults.maxDateTime instanceof Date)d._defaults.maxDate=new Date(d._defaults.maxDateTime.getTime());d._limitMinMaxDateTime(c,true)}}};e.timepicker=new q;e.timepicker.version="0.9.6"})(jQuery);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9847] XoopsModules/news

[<be...@us...>]

Revision: 9847
          http://xoops.svn.sourceforge.net/xoops/?rev=9847&view=rev
Author:   beckmi
Date:     2012-07-11 17:58:36 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
- fixing makepdf.php for UTF-9 (black_beard)

Modified Paths:
--------------
    XoopsModules/news/branches/mamba/news/docs/credits.txt
    XoopsModules/news/branches/mamba/news/docs/install.txt
    XoopsModules/news/branches/mamba/news/language/english/modinfo.php
    XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php
    XoopsModules/news/branches/mamba/news/language/italian/modinfo.php
    XoopsModules/news/trunk/news/docs/changelog.txt
    XoopsModules/news/trunk/news/makepdf.php
    XoopsModules/news/trunk/news/xoops_version.php

Added Paths:
-----------
    XoopsModules/news/branches/mamba/news/docs/lang_diff.txt

Modified: XoopsModules/news/branches/mamba/news/docs/credits.txt
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/credits.txt	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/branches/mamba/news/docs/credits.txt	2012-07-11 17:58:36 UTC (rev 9847)
@@ -1,8 +1,4 @@
-//  ----------------------------------------------------------- //
-//                         mylinks-w 3.0    	 	            //
-//                    Just enjoy! Internet for everyone!!	    //
-//                      wanikoo <http://www.wanisys.net/>       //
-//  ----------------------------------------------------------- //
-//                Original Module: mylinks 1.10                 //
-//             The XOOPS Project ( http://www.xoops.org/ )      //
-//  ----------------------------------------------------------- //
+Credits
+===============
+
+Converted to XOOPS 2.5.5 by Michael Beck (Mamba)
\ No newline at end of file

Modified: XoopsModules/news/branches/mamba/news/docs/install.txt
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/install.txt	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/branches/mamba/news/docs/install.txt	2012-07-11 17:58:36 UTC (rev 9847)
@@ -1,4 +1,6 @@
 INSTALL/UNISTALL
 =================
 
-In order to install the module please do following:
\ No newline at end of file
+In order to install the module please do following:
+
+Install News just like another module
\ No newline at end of file

Added: XoopsModules/news/branches/mamba/news/docs/lang_diff.txt
===================================================================
--- XoopsModules/news/branches/mamba/news/docs/lang_diff.txt	                        (rev 0)
+++ XoopsModules/news/branches/mamba/news/docs/lang_diff.txt	2012-07-11 17:58:36 UTC (rev 9847)
@@ -0,0 +1,354 @@
+Legend :
++ Added
+- Removed
+* Modified
+
+*******
+v1.67
+*******
+New file :
+help.php
+
+modinfo.php
++ _MI_NEWS_HELP
++ _MI_NEWS_ABOUT
++ _MI_NEWS_HOME
++ _MI_NEWS_UPGRADE
++ _MI_NEWS_DESCRIPTION
++ _MI_NEWS_SHARE_ME
++ _MI_NEWS_SHARE_ME_DSC
++ _MI_NEWS_SHOWICONS
++ _MI_NEWS_SHOWICONS_DSC
++ _MI_NEWS_FACEBOOKCOMMENTS
++ _MI_NEWS_FACEBOOKCOMMENTS_DSC
+
+main.php
++ _NW_BOOKMARK_TO_FACEBOOK
++ _NW_BOOKMARK_TO_TWITTER
++ _NW_BOOKMARK_TO_SCRIPSTYLE
++ _NW_BOOKMARK_TO_STUMBLE
++ _NW_BOOKMARK_TO_TECHNORATI
++ _NW_BOOKMARK_TO_MIXX
++ _NW_BOOKMARK_TO_MYSPACE
++ _NW_BOOKMARK_TO_DESIGNFLOAT
++ _NW_BOOKMARK_TO_BALATARIN
++ _NW_BOOKMARK_TO_GOOGLEPLUS
++ _NW_BOOKMARK_TO_GOOGLEREADER
++ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
++ _NW_DELETE
++ _NW_EDIT
+
+admin.php
++ _AM_NEWS_ABOUT_RELEASEDATE
++ _AM_NEWS_ABOUT_UPDATEDATE
++ _AM_NEWS_ABOUT_AUTHOR
++ _AM_NEWS_ABOUT_CREDITS
++ _AM_NEWS_ABOUT_LICENSE
++ _AM_NEWS_ABOUT_MODULE_STATUS
++ _AM_NEWS_ABOUT_WEBSITE
++ _AM_NEWS_ABOUT_AUTHOR_NAME
++ _AM_NEWS_ABOUT_CHANGELOG
++ _AM_NEWS_ABOUT_MODULE_INFO
++ _AM_NEWS_ABOUT_AUTHOR_INFO
++ _AM_NEWS_ABOUT_DESCRIPTION
++ _AM_NEWS_CONFIG_CHECK
++ _AM_NEWS_CONFIG_PHP
++ _AM_NEWS_CONFIG_XOOPS 
+
+*******
+v1.63
+*******
+modinfo.php
++ _MI_NEWS_TAGS
++ _MI_NEWS_TAGS_DSC
++ _MI_NEWS_BNAME10
++ _MI_NEWS_BNAME11
+
+
+*******
+v1.56
+*******
+main.php
++ _NW_NOTYETSTORY
+
+*******
+v1.54
+*******
+modinfo.php
++ _MI_NEWS_CATEGORY_NOTIFY
++ _MI_NEWS_CATEGORY_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ
+
+
+*******
+v1.51
+*******
+main.php
+
++ _NW_BOOKMARK_TO_BLINKLIST
++ _NW_BOOKMARK_TO_DELICIOUS
++ _NW_BOOKMARK_TO_DIGG
++ _NW_BOOKMARK_TO_FARK
++ _NW_BOOKMARK_TO_FURL
++ _NW_BOOKMARK_TO_NEWSVINE
++ _NW_BOOKMARK_TO_REDDIT
++ _NW_BOOKMARK_TO_SIMPY
++ _NW_BOOKMARK_TO_SPURL
++ _NW_BOOKMARK_TO_YAHOO
+
+
+*******
+v1.50
+*******
+admin.php
+* _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_NEWSLETTER_HEADER
++ _AM_NEWS_NEWSLETTER_FOOTER
++ _AM_NEWS_NEWSLETTER_HTML_TAGS
++ _AM_NEWS_VERIFY_TABLES
++ _AM_NEWS_METAGEN
++ _AM_NEWS_METAGEN_DESC
++ _AM_NEWS_BLACKLIST
++ _AM_NEWS_BLACKLIST_DESC
++ _AM_NEWS_BLACKLIST_ADD
++ _AM_NEWS_BLACKLIST_ADD_DSC
++ _AM_NEWS_META_KEYWORDS_CNT
++ _AM_NEWS_META_KEYWORDS_ORDER
++ _AM_NEWS_META_KEYWORDS_INTEXT
++ _AM_NEWS_META_KEYWORDS_FREQ1
++ _AM_NEWS_META_KEYWORDS_FREQ2
+
+blocks.php
++ _MB_NEWS_CAL_YEAR
++ _MB_NEWS_CAL_MONTH
++ _MB_NEWS_STARTING_DATE
++ _MB_NEWS_ENDING_DATE
++ _MB_NEWS_UNTIL_TODAY
++ _MB_NEWS_RECENT_FIRST
++ _MB_NEWS_OLDER_FIRST
+
+main.php
++ _NW_LINKS
++ _NW_PAGE
++ _NW_BOOKMARK_ME
++ _AM_NEWS_TOTAL
++ _AM_NEWS_WHOS_WHO
++ _NW_NEWS_LIST_OF_AUTHORS
++ _AM_NEWS_TOPICS_DIRECTORY
++ _NW_PAGE_AUTO_SUMMARY
+
+modinfo.php
++ _MI_NEWS_BNAME9
++ _MI_NEWS_FORM_TINYEDITOR
++ _MI_NEWS_FOOTNOTES
++ _MI_NEWS_DUBLINCORE
++ _MI_NEWS_DUBLINCORE_DSC
++ _MI_NEWS_BOOKMARK_ME
++ _MI_NEWS_BOOKMARK_ME_DSC
++ _MI_NEWS_FF_MICROFORMAT
++ _MI_NEWS_FF_MICROFORMAT_DSC
++ _MI_NEWS_WHOS_WHO
++ _MI_NEWS_METAGEN
++ _MI_NEWS_TOPICS_DIRECTORY
++ _MI_NEWS_ADVERTISEMENT
++ _MI_NEWS_ADV_DESCR
++ _MI_NEWS_MIME_TYPES
++ _MI_NEWS_ENHANCED_PAGENAV
++ _MI_NEWS_ENHANCED_PAGENAV_DSC
+
+
+*******
+v1.44
+*******
+New file :
+newsletter.php
+
+admin.php :
+* _AM_MAX40CHAR
+* _AM_GROUPPERM
+* _AM_SELFILE
+* _AM_UPDATEMODULE (name changed)
++ _AM_ADD_TOPIC
++ _AM_ADD_TOPIC_ERROR
++ _AM_ADD_TOPIC_ERROR1
++ _AM_SUB_MENU
++ _AM_SUB_MENU_YESNO
++ _AM_HITS
++ _AM_CREATED
++ _AM_TOPIC_DESCR
++ _AM_USERS_LIST
++ _AM_PUBLISH_FRONTPAGE
++ _AM_NEWS_UPGRADEFAILED1
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED3
++ _AM_NEWS_UPGRADEFAILED4
++ _AM_NEWS_UPGRADEFAILED0
++ _AM_NEWS_UPGR_ACCESS_ERROR
++ _AM_NEWS_PRUNE_BEFORE
++ _AM_NEWS_PRUNE_EXPIREDONLY
++ _AM_NEWS_PRUNE_CONFIRM
++ _AM_NEWS_PRUNE_TOPICS
++ _AM_NEWS_PRUNENEWS
++ _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_EXPORT_NOTHING
++ _AM_NEWS_PRUNE_DELETED
++ _AM_NEWS_PERM_WARNING
++ _AM_NEWS_EXPORT_BETWEEN
++ _AM_NEWS_EXPORT_AND
++ _AM_NEWS_EXPORT_PRUNE_DSC
++ _AM_NEWS_EXPORT_INCTOPICS
++ _AM_NEWS_EXPORT_ERROR
++ _AM_NEWS_EXPORT_READY
++ _AM_NEWS_RSS_URL
++ _AM_NEWS_NEWSLETTER
++ _AM_NEWS_NEWSLETTER_BETWEEN
++ _AM_NEWS_NEWSLETTER_READY
++ _AM_NEWS_DELETED_OK
++ _AM_NEWS_DELETED_PB
++ _AM_NEWS_STATS0
++ _AM_NEWS_STATS
++ _AM_NEWS_STATS1
++ _AM_NEWS_STATS2
++ _AM_NEWS_STATS3
++ _AM_NEWS_STATS4
++ _AM_NEWS_STATS5
++ _AM_NEWS_STATS6
++ _AM_NEWS_STATS7
++ _AM_NEWS_STATS8
++ _AM_NEWS_STATS9
++ _AM_NEWS_STATS10
++ _AM_NEWS_STATS11
++ _AM_NEWS_HELP
++ _AM_NEWS_MODULEADMIN
++ _AM_NEWS_GENERALSET
++ _AM_NEWS_GOTOMOD
++ _AM_NEWS_NOTHING
++ _AM_NEWS_NOTHING_PRUNE
++ _AM_NEWS_TOPIC_COLOR
++ _AM_NEWS_COLOR
++ _AM_NEWS_REMOVE_BR
++ _AM_NEWS_PLEASE_UPGRADE
+
+blocks.php :
+* _MB_NEWS_ORDER
++ _MB_NEWS_TEASER
++ _MB_NEWS_SPOTLIGHT
++ _MB_NEWS_FIRST
++ _MB_NEWS_IMAGE
++ _MB_SPOTLIGHT_TOPIC
++ _MB_SPOTLIGHT_ALL_TOPICS
++ _MB_NEWS_SPOTLIGHT_ARTICLE
++ _MB_READMORE
++ _MB_NEWS_RATE
++ _MB_NEWS_SHOW_NEWS_COUNT
++ _MB_NEWS_SPOTLIGHT_TITLE
++ _MB_NEWS_VIEW_TYPE1
++ _MB_NEWS_VIEW_TYPE2
++ _MB_NEWS_TAB_COLOR1
++ _MB_NEWS_TAB_COLOR2
++ _MB_NEWS_TAB_COLOR3
++ _MB_NEWS_TAB_COLOR4
++ _MB_NEWS_TAB_COLOR5
++ _MB_NEWS_WHAT_PUBLISH
++ _MB_NEWS_RECENT_NEWS
++ _MB_NEWS_RECENT_SPECIFIC
++ _MB_NEWS_DEFAULT_COLORS
+
+main.php :
+- _AM_EXPARTS
+- _AM_EXPIRED
+- _AM_CHANGEEXPDATETIME
+- _AM_SETEXPDATETIME
+- _AM_NOWSETEXPTIME
++ _NW_ATTACHEDLIB
++ _NW_NEWSSAMEAUTHORLINK
++ _NW_NEWS_NO_TOPICS
++ _NW_PREVIOUS_ARTICLE
++ _NW_NEXT_ARTICLE
++ _NW_OTHER_ARTICLES
++ _NW_RATETHISNEWS
++ _NW_RATEIT
++ _NW_TOTALRATE
++ _NW_RATINGLTOH
++ _NW_RATINGHTOL
++ _NW_RATINGC
++ _NW_RATINGSCALE
++ _NW_BEOBJECTIVE
++ _NW_DONOTVOTE
++ _NW_RATING
++ _NW_VOTE
++ _NW_NORATING
++ _NW_USERAVG
++ _NW_DLRATINGS
++ _NW_ONEVOTE
++ _NW_NUMVOTES
++ _NW_CANTVOTEOWN
++ _NW_VOTEDELETED
++ _NW_VOTEONCE
++ _NW_VOTEAPPRE
++ _NW_THANKYOU
++ _NW_RSSFEED
++ _NW_AUTHOR
++ _NW_META_DESCRIPTION
++ _NW_META_KEYWORDS
++ _NW_MAKEPDF
++ _MD_POSTEDON
++ _NW_AUTHOR_ID
++ _NW_POST_SORRY
+
+modinfo.php :
+* _MI_NEWS_BNAME8
+* _MI_NEWS_GROUPPERMS
++ _MI_NEWS_PRUNENEWS
+- _MI_ANONPOST
++ _MI_NEWS_EXPORT
+- _MI_ANONPOST
+* _MI_STORYCOUNTADMIN
++ _MI_NEWSBYTHISAUTHOR
++ _MI_NEWSBYTHISAUTHORDSC
++ _MI_NEWS_PREVNEX_LINK
++ _MI_NEWS_PREVNEX_LINK_DESC
++ _MI_NEWS_SUMMARY_SHOW
++ _MI_NEWS_SUMMARY_SHOW_DESC
++ _MI_NEWS_AUTHOR_EDIT
++ _MI_NEWS_AUTHOR_EDIT_DESC
++ _MI_NEWS_RATE_NEWS
++ _MI_NEWS_TOPICS_RSS
++ _MI_NEWS_TOPICS_RSS_DESC
++ _MI_NEWS_DATEFORMAT
++ _MI_NEWS_DATEFORMAT_DESC
++ _MI_NEWS_META_DATA
++ _MI_NEWS_META_DATA_DESC
++ _MI_NEWS_BNAME8
++ _MI_NEWS_NEWSLETTER
++ _MI_NEWS_STATS
++ _MI_NEWS_FORM_OPTIONS
++ _MI_NEWS_FORM_COMPACT
++ _MI_NEWS_FORM_DHTML
++ _MI_NEWS_FORM_SPAW
++ _MI_NEWS_FORM_HTMLAREA
++ _MI_NEWS_FORM_FCK
++ _MI_NEWS_FORM_KOIVI
++ _MI_NEWS_FORM_OPTIONS_DESC
++ _MI_NEWS_KEYWORDS_HIGH
++ _MI_NEWS_KEYWORDS_HIGH_DESC
++ _MI_NEWS_HIGH_COLOR
++ _MI_NEWS_HIGH_COLOR_DES
++ _MI_NEWS_INFOTIPS
++ _MI_NEWS_INFOTIPS_DES
++ _MI_NEWS_SITE_NAVBAR
++ _MI_NEWS_SITE_NAVBAR_DESC
++ _MI_NEWS_TABS_SKIN
++ _MI_NEWS_TABS_SKIN_DESC
++ _MI_NEWS_SKIN_1
++ _MI_NEWS_SKIN_2
++ _MI_NEWS_SKIN_3
++ _MI_NEWS_SKIN_4
++ _MI_NEWS_SKIN_5
++ _MI_NEWS_SKIN_6
++ _MI_NEWS_SKIN_7
++ _MI_NEWS_SKIN_8

Modified: XoopsModules/news/branches/mamba/news/language/english/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/branches/mamba/news/language/english/modinfo.php	2012-07-11 17:58:36 UTC (rev 9847)
@@ -149,7 +149,7 @@
 define('_MI_NEWS_BNAME9','Archives');
 define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
 define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
 define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
 define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
 define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");

Modified: XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/branches/mamba/news/language/englishUTF8/modinfo.php	2012-07-11 17:58:36 UTC (rev 9847)
@@ -149,7 +149,7 @@
 define('_MI_NEWS_BNAME9','Archives');
 define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
 define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
 define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
 define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
 define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");

Modified: XoopsModules/news/branches/mamba/news/language/italian/modinfo.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/italian/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/branches/mamba/news/language/italian/modinfo.php	2012-07-11 17:58:36 UTC (rev 9847)
@@ -149,7 +149,7 @@
 define("_MI_NEWS_BNAME9", "Archivi");
 define("_MI_NEWS_FORM_TINYEDITOR", "TinyEditor");
 define("_MI_NEWS_FOOTNOTES", "Mostra i collegamenti nelle versioni stampabili dei tuoi articoli?");
-define("_MI_NEWS_DUBLINCORE", "Ativate Dublin Core Metadata?");
+define("_MI_NEWS_DUBLINCORE", "Activate Dublin Core Metadata?");
 define("_MI_NEWS_DUBLINCORE_DSC", "Per ulteriori informazioni, <a href='http://dublincore.org/'>visita questo link</a>");
 define("_MI_NEWS_BOOKMARK_ME", "Visualizzare un &#39;Bookmark questo articolo su questi siti&#39; blocco?");
 define("_MI_NEWS_BOOKMARK_ME_DSC", "Questo blocco sar&#224; visibile nella pagina dell&#39;articolo,");

Modified: XoopsModules/news/trunk/news/docs/changelog.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/changelog.txt	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/trunk/news/docs/changelog.txt	2012-07-11 17:58:36 UTC (rev 9847)
@@ -1,5 +1,11 @@
 
 ======================
+v1.68 2012-07-xx
+======================
+
+- fix of UTF-8 in makePDF (black_beard)
+
+======================
 v1.67 2012-07-01
 ======================
 

Modified: XoopsModules/news/trunk/news/makepdf.php
===================================================================
--- XoopsModules/news/trunk/news/makepdf.php	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/trunk/news/makepdf.php	2012-07-11 17:58:36 UTC (rev 9847)
@@ -117,7 +117,11 @@
 $pdf->SetXY(24,25);
 $pdf->SetTextColor(10,60,160);
 $pdf->SetFont($pdf_config['font']['slogan']['family'],$pdf_config['font']['slogan']['style'],$pdf_config['font']['slogan']['size']);
-$pdf->WriteHTML($pdf_config['slogan'], $pdf_config['scale']);
+if ( _CHARSET == 'UTF-8') {
+    $pdf->WriteHTML(utf8_decode($pdf_config['slogan']), $pdf_config['scale']);
+} else {
+    $pdf->WriteHTML($pdf_config['slogan'], $pdf_config['scale']);
+}
 //$pdf->Image($pdf_config['logo']['path'],$pdf_config['logo']['left'],$pdf_config['logo']['top'],$pdf_config['logo']['width'],$pdf_config['logo']['height'],'',$pdf_config['url']);
 $pdf->Line(25,30,190,30);
 $pdf->SetXY(25,35);
@@ -137,7 +141,11 @@
 
 $pdf->WriteHTML($puff,$pdf_config['scale']);
 $pdf->SetFont($pdf_config['font']['author']['family'],$pdf_config['font']['author']['style'],$pdf_config['font']['author']['size']);
-$out=NEWS_PDF_AUTHOR.': ';
+if ( _CHARSET == 'UTF-8') {
+    $out=utf8_decode(NEWS_PDF_AUTHOR).': ';
+} else {
+    $out=NEWS_PDF_AUTHOR.': ';
+}
 $out.=$pdf_data['author'];
 $pdf->WriteHTML($out,$pdf_config['scale']);
 $pdf->WriteHTML($puff,$pdf_config['scale']);

Modified: XoopsModules/news/trunk/news/xoops_version.php
===================================================================
--- XoopsModules/news/trunk/news/xoops_version.php	2012-07-11 17:36:32 UTC (rev 9846)
+++ XoopsModules/news/trunk/news/xoops_version.php	2012-07-11 17:58:36 UTC (rev 9847)
@@ -30,7 +30,7 @@
 $moduleDirName = basename( dirname( __FILE__ ) ) ;
 
 $modversion['name'] = _MI_NEWS_NAME;
-$modversion['version'] = 1.67;
+$modversion['version'] = 1.68;
 $modversion['description'] = _MI_NEWS_DESC;
 $modversion['credits'] = "The XOOPS Project, Christian, Pilou, Marco, <br />ALL the members of the Newbb Team, GIJOE, Zoullou, Mithrandir, <br />Setec Astronomy, Marcan, 5vision, Anne, Trabis, dhsoft, Mamba, Mage, Timgno";
 $modversion['author'] = "The XOOPS Project Module Dev Team & Hervé Thouzard";
@@ -51,7 +51,7 @@
 $modversion["module_website_url"] = "www.xoops.org/";
 $modversion["module_website_name"] = "XOOPS";
 $modversion["release_date"] = "2012/07/01";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
 $modversion["author_website_url"] = "http://www.xoops.org/";
 $modversion["author_website_name"] = "XOOPS";
 $modversion['min_php']='5.2';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9846] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9846
          http://xoops.svn.sourceforge.net/xoops/?rev=9846&view=rev
Author:   lord_venom
Date:     2012-07-11 17:36:32 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
file_ext

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
    XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
    XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php
    XoopsModules/TDMPicture/trunk/TDMPicture/index.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
    XoopsModules/TDMPicture/trunk/TDMPicture/user.php
    XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
    XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
    XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -82,7 +82,7 @@
 		$obj->setVar('file_display', $_REQUEST['file_display']);
 		$obj->setVar('file_indate', time());
 		$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
-		$obj->setVar('file_ext', $_REQUEST['file_ext']);
+		//$obj->setVar('file_ext', $_REQUEST['file_ext']);
 		
 	
 	//upload	

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -41,7 +41,7 @@
 define("TDMPICTURE_RSS", $xoopsModuleConfig['tdmpicture_rss']);
 define("TDMPICTURE_SOCIAL", $xoopsModuleConfig['tdmpicture_social']);
 define("TDMPICTURE_PDF", $xoopsModuleConfig['tdmpicture_pdf']);
-define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']);
+//define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']);
 //define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']);
 define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']);
 define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']);

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -143,7 +143,7 @@
 		$obj->setVar('file_display', $_REQUEST['file_display']);
 		$obj->setVar('file_indate', time());
 		$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
-		$obj->setVar('file_ext', $_REQUEST['file_ext']);
+		//$obj->setVar('file_ext', $_REQUEST['file_ext']);
 	
 foreach ($_FILES as $file => $fileArray) {
 		
@@ -310,11 +310,11 @@
 	$file['file_track'] = 'track_p_'.$f;
 	//$file['file_trackurl'] = $ret->getVar("file_img");
 	
-	if ($ret->getVar("file_ext") == 0) {
-	$file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img");
-	} else {
-	$file['file_trackurl'] = $ret->getVar("file_img");
-	}
+	//if ($ret->getVar("file_ext") == 0) {
+	//$file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img");
+	//} else {
+	//$file['file_trackurl'] = $ret->getVar("file_img");
+	//}
 	
 	//creer le path fichier
 	$filename = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar('file_img');

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -75,8 +75,8 @@
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
 		define("TDM_CAT_LINK", "viewcat.php");
-		$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
-		$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+		//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+		//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
 		$xoopsTpl->assign('display_cat', $display_cat);
 		

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -65,11 +65,11 @@
 //define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
 define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
 define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
-define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
-define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text");
-define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image");
-define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category");
+//define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
+//define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category");
 define("_MI_TDMPICTURE_VIEWMYALBUM", "See my album");
 define("_MI_TDMPICTURE_VIEWALBUM", "Album List");
 define("_MI_TDMPICTURE_UPLOAD", "Upload");
@@ -84,11 +84,11 @@
 
 // Version 1.5
 
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) ");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) ");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) ");
 
-define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No ");
 
 define("_MI_TDMPICTURE_THUMB_STYLE", "Miniature: centering thumb");
 define("_MI_TDMPICTURE_THUMB_STYLE_CENTER", "Center (on Carrer center width");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -78,15 +78,15 @@
 //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_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");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -78,15 +78,15 @@
 //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_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");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -141,7 +141,7 @@
 		$obj->setVar('file_display', $_REQUEST['file_display']);
 		$obj->setVar('file_indate', time());
 		$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
-		$obj->setVar('file_ext', $_REQUEST['file_ext']);
+		//$obj->setVar('file_ext', $_REQUEST['file_ext']);
 //upload	
 
 foreach ($_FILES['tdmfile']['error'] as $key => $value) 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/user.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -82,8 +82,8 @@
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
 		define("TDM_CAT_LINK", "viewcat.php");
-		$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
-		$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+		//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+		//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
 		$xoopsTpl->assign('display_cat', $display_cat);
 		

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -93,8 +93,8 @@
 		//asigne les URL
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
-		$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
-		$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+		//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+		//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
 		$xoopsTpl->assign('display_cat', $display_cat);
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -92,8 +92,8 @@
 		//asigne les URL
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
-		$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
-		$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+		//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+		//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
 		$xoopsTpl->assign('display_cat', $display_cat);
 		$xoopsTpl->assign('numfile', $GLOBALS['cat_count']);

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-11 17:36:32 UTC (rev 9846)
@@ -272,14 +272,14 @@
 $modversion['config'][$i]['default'] = 400;
 $i++;
 //version 1.5
-$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'text';
-$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB  => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG  => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT  => 'text',  _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG  => 'textimg',  _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
-$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'text';
+//$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB  => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG  => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT  => 'text',  _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG  => 'textimg',  _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
+//$i++;
 $modversion['config'][$i]['name'] = 'tdmpicture_cat_cel';
 $modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL';
 $modversion['config'][$i]['description'] = '';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9845] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9845
          http://xoops.svn.sourceforge.net/xoops/?rev=9845&view=rev
Author:   lord_venom
Date:     2012-07-11 09:45:31 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
    XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
    XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
    XoopsModules/TDMPicture/trunk/TDMPicture/index.php
    XoopsModules/TDMPicture/trunk/TDMPicture/user.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-11 09:45:31 UTC (rev 9845)
@@ -222,7 +222,7 @@
     }
     break;
 	
-	case _DELETE :
+	case _AM_TDMPICTURE_DELETE_SELECTED :
 	
      if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
         if (!$GLOBALS['xoopsSecurity']->check()) {

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php	2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php	2012-07-11 09:45:31 UTC (rev 9845)
@@ -58,14 +58,14 @@
     $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');
+        $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, 0, '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');
+    if ($file_waiting == 0){
+        $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, 0, 'Green');
     }else{
-        $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Red');
+        $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $file_waiting, 'Red');
     }
 
     foreach (array_keys( $folder) as $i) {

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php	2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php	2012-07-11 09:45:31 UTC (rev 9845)
@@ -49,26 +49,6 @@
 
 }
 
-function TDMDownloads_NumbersOfEntries($mytree, $categories, $entries,$cid)
-{
-    $count = 0;
-    $child_arr = array();
-    if(in_array($cid, $categories)) {
-        $child = $mytree->getAllChild($cid);
-        foreach (array_keys($entries) as $i) {
-            if ($entries[$i]->getVar('cid') == $cid){
-                $count++;
-            }
-            foreach (array_keys($child) as $j) {
-                if ($entries[$i]->getVar('cid') == $j){
-                    $count++;
-                }
-            } 
-        }
-    } 
-    return $count;
-}
-
 function tdmpicture_adminheader()
 {
 global $xoopsConfig, $xoopsModule, $xoTheme, $xoopsTpl;

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-11 09:45:31 UTC (rev 9845)
@@ -65,10 +65,10 @@
  
 		$criteria = new CriteriaCompo();
 		$criteria->add(new Criteria('cat_display', 1));
-		$criteria->add(new Criteria('cat_index', 1));
+		//$criteria->add(new Criteria('cat_index', 1));
 		$criteria->setSort('cat_weight');
 		$criteria->setOrder('DESC');
-		$criteria->add(new Criteria('cat_display', 1));
+		//$criteria->add(new Criteria('cat_display', 1));
 		$cat_arr = $cat_handler->getall($criteria);
 		$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
 		//asigne les URL

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/user.php	2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php	2012-07-11 09:45:31 UTC (rev 9845)
@@ -69,30 +69,32 @@
  // ************************************************************
  // Liste des Categories
  // ************************************************************
- 
+		
 		$criteria = new CriteriaCompo();
 		$criteria->add(new Criteria('cat_display', 1));
-		$criteria->add(new Criteria('cat_uid', $ut));
+		//$criteria->add(new Criteria('cat_index', 1));
 		$criteria->setSort('cat_weight');
 		$criteria->setOrder('DESC');
+		//$criteria->add(new Criteria('cat_display', 1));
 		$cat_arr = $cat_handler->getall($criteria);
 		$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
 		//asigne les URL
 		define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
 		define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+		define("TDM_CAT_LINK", "viewcat.php");
 		$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
 		$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
 		$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
 		$xoopsTpl->assign('display_cat', $display_cat);
 		
 		$numcat = $cat_handler->getCount($criteria);
-		$xoopsTpl->assign('numcat', $numcat);
+		$xoopsTpl->assign('numcat', $numcat);	
 		 
 	
 		
 unset($criteria);
 
-$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false));
+//$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false));
 
  // ************************************************************
  // Liste des derniers fichier

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9844] XoopsCore/tags/2.6 timgno/htdocs

[<txm...@us...>]

Revision: 9844
          http://xoops.svn.sourceforge.net/xoops/?rev=9844&view=rev
Author:   txmodxoops
Date:     2012-07-10 19:44:32 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Added errorpage and laguage files

Added Paths:
-----------
    XoopsCore/tags/2.6 timgno/htdocs/errorpage.php
    XoopsCore/tags/2.6 timgno/htdocs/language/english/errors.php
    XoopsCore/tags/2.6 timgno/htdocs/language/italian/errors.php

Added: XoopsCore/tags/2.6 timgno/htdocs/errorpage.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/errorpage.php	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/errorpage.php	2012-07-10 19:44:32 UTC (rev 9844)
@@ -0,0 +1,100 @@
+<?php
+/*
+ * 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.
+ *
+ * HOW TO INSTALL THE SCRIPT:
+ *
+ * Copy and paste this whole script into your root.
+ * Add the following lines to your .htaccess file (change the location of your error page, if needed):
+ * ErrorDocument 400 /errorpage.php?error=400
+ * ErrorDocument 401 /errorpage.php?error=401
+ * ErrorDocument 403 /errorpage.php?error=403
+ * ErrorDocument 404 /errorpage.php?error=404
+ * ErrorDocument 500 /errorpage.php?error=500
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright       The TXNod XOOPS Project http://sourceforge.net/projects/txmodxoops/
+ * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package         core
+ * @since           0.1.2
+ * @author          TXMod Xoops <web...@tx...>
+ * @version         $Id: errorpage.php 0005 2011-08-04 10:25:28Z timgno $
+ */
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
+include "header.php";
+// Error code
+$error = '';
+if(isset($_GET['error']))
+   $error = $_GET['error'];
+// $errortitle = in language pack (errors.php)
+// $errordesc = in language pack (errors.php)
+// switch different error messages
+switch ($error) {
+    // Error 400 - Bad Request
+    case 400:
+       $errortitle = _XO_ER_TITLE400;
+       $errordesc = _XO_ER_DESC400;
+    break;
+
+    // Error 401 - Authorization Required
+    case 401:
+       $errortitle = _XO_ER_TITLE401;
+       $errordesc = _XO_ER_DESC401;
+    break;
+    // Error 403 - Access Forbidden
+    case 403:
+       $errortitle = _XO_ER_TITLE403;
+       $errordesc = _XO_ER_DESC403;
+    break;
+    // Error 404 - Page Not Found
+    case 404:
+       $errortitle = _XO_ER_TITLE404;
+       $errordesc = _XO_ER_DESC404;
+    break;
+    // Error 500 - Server Configuration Error
+    case 500:
+       $errortitle = _XO_ER_TITLE500;
+       $errordesc = _XO_ER_DESC500;
+    break;
+    // Unknown error
+    default:
+       $errortitle = _XO_ER_TITLE;
+       $errordesc = _XO_ER_DESC;
+    break;
+}
+
+$array_keys = explode(" ", $errortitle);
+$keywords = implode(",", $array_keys);
+$xoTheme->addMeta('meta', 'keywords', $keywords);
+$xoTheme->addMeta('meta', 'description', $errordesc);
+
+// Display error
+echo "<div class='ui-widget'>
+        <div class='ui-state-error ui-corner-all' style='padding: 0 1.7em;'>
+        <p style='padding: 2.0em;'><span class='ui-icon ui-icon-alert' style='float: left; margin-right: .5em;'></span>
+        <strong>"._XO_ER_ALERT."</strong>: ".$errortitle."</p>
+        </div>
+      </div>";
+//echo "<div class=''>".$errortitle."</div>";
+echo "<div class='errorContent'>".$errordesc."</div>";
+echo "<a href='javascript:history.go(-1)'>"._BACK."</a></div>";
+echo "<div style=\"text-align: center; line-height: 60px;\">
+<script type=\"text/javascript\"><!--
+google_ad_client = \"pub-3352884075259517\";
+/* 468x60, creato 01/06/10 */
+google_ad_slot = \"2796255493\";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
+</script> 
+<script type=\"text/javascript\"
+src=\"http://pagead2.googlesyndication.com/pagead/show_ads.js\">
+</script></div>"; 
+include "footer.php";
+?>
\ No newline at end of file

Added: XoopsCore/tags/2.6 timgno/htdocs/language/english/errors.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/language/english/errors.php	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/language/english/errors.php	2012-07-10 19:44:32 UTC (rev 9844)
@@ -0,0 +1,26 @@
+<?php
+
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+define('_XO_ER_FILENOTFOUND', 'Requested file: <b>%s</b> was not found ');
+define('_XO_ER_CLASSNOTFOUND', 'Requested class %s was not found');
+// Error Pages TXMod Xoops
+define ('_XO_ER_TITLE', 'Error unclassified (Not Classified)');
+define ('_XO_ER_DESC', 'Sorry, but this error was not classified.');
+define ('_XO_ER_TITLE400', 'Error 400 - Bad request (Bad Request)');
+define ('_XO_ER_DESC400', 'Sorry, but a request was made wrong.');
+define ('_XO_ER_TITLE401', 'Error 401 - Authorization Required (Authorization required)');
+define ('_XO_ER_DESC401', 'We\'re sorry, but access to the requested page is forbidden, necessary authorization.');
+define ('_XO_ER_TITLE403', 'Error 403 - Access denied (Forbidden)');
+define ('_XO_ER_DESC403', 'We\'re sorry, but access was denied to this page.');
+define ('_XO_ER_TITLE404', 'Error 404 - Page Not Found (Not found)');
+define ('_XO_ER_DESC404', 'Sorry, but the page you are looking for does not exist, has been moved or been removed. <br /><br /> To be sure you do a search on the site.');
+define ('_XO_ER_TITLE500', 'Error 500 - Internal Server Error (Internal Server Error)');
+define ('_XO_ER_DESC500', 'Sorry, but the server does not respond at this time due to an internal error.');
+// Last update: 04/08/2011
+define('_XO_ER_ALERT', 'Alert');
+define('_XO_ER_ERROR', 'Error');
+
+?>
\ No newline at end of file

Added: XoopsCore/tags/2.6 timgno/htdocs/language/italian/errors.php
===================================================================
--- XoopsCore/tags/2.6 timgno/htdocs/language/italian/errors.php	                        (rev 0)
+++ XoopsCore/tags/2.6 timgno/htdocs/language/italian/errors.php	2012-07-10 19:44:32 UTC (rev 9844)
@@ -0,0 +1,29 @@
+<?php
+// _LANGCODE: it
+// _CHARSET : UTF-8
+// Translator: Xoops Italia Team - www.xoopsitalia.org
+// Last translation update: 08/03/2011
+
+define('_XO_ER_FILENOTFOUND', 'Il file richiesto: <b>%s</b> non &egrave; stato trovato ');
+define('_XO_ER_CLASSNOTFOUND', 'La classe richiesta %s non &egrave; stata trovata');
+
+// Translator: TXMod Xoops Team - www.txmodxoops.org
+// Last translation update: 20/03/2011
+// Error Pages by TXMod Xoops
+define('_XO_ER_TITLE', 'Errore non classificato (Not Classified)');
+define('_XO_ER_DESC', 'Siamo spiacenti, ma questo errore non &#232; stato classificato.');
+define('_XO_ER_TITLE400', 'Errore 400 - Richiesta errata (Bad Request)');
+define('_XO_ER_DESC400', 'Siamo spiacenti, ma &#232; stata fatta una richiesta errata.');
+define('_XO_ER_TITLE401', 'Errore 401 - Necessaria autorizzazione (Authorization required)');
+define('_XO_ER_DESC401', 'Siamo spiacenti, ma l&#39;accesso alla pagina richiesta &#232; proibito, necessaria autorizzazione.');
+define('_XO_ER_TITLE403', 'Errore 403 - Accesso negato (Forbidden)');
+define('_XO_ER_DESC403', 'Siamo spiacenti, ma l&#39;accesso a questa pagina &#232; stato negato.');
+define('_XO_ER_TITLE404', 'Errore 404 - Pagina non trovata (Not found)');
+define('_XO_ER_DESC404', 'Siamo spiacenti, ma la pagina cercata &#232; inesistente, &#232; stata spostata oppure &#232; stata rimossa.<br /><br />Per sicurezza fai una ricerca nel sito.');
+define('_XO_ER_TITLE500', 'Errore 500 - Errore interno del server (Internal server error)');
+define('_XO_ER_DESC500', 'Siamo spiacenti, ma il server in questo momento non risponde a causa di un errore interno.');
+// Last translation update: 04/08/2011
+define('_XO_ER_ALERT', 'Attenzione');
+define('_XO_ER_ERROR', 'Errore');
+
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9843] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9843
          http://xoops.svn.sourceforge.net/xoops/?rev=9843&view=rev
Author:   lord_venom
Date:     2012-07-10 16:16:12 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
remove edit_img

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
    XoopsModules/TDMPicture/trunk/TDMPicture/download.php
    XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-10 16:16:12 UTC (rev 9843)
@@ -182,72 +182,7 @@
 	}
     break;
 	
-	case "save_img": 
 	
-		if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		if (isset($_REQUEST['file_id'])) {
-        $obj =& $file_handler->get($_REQUEST['file_id']);
-		} else {
-        $obj =& $file_handler->create();
-		}  
-
-	if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
-	{
-	$targ_w = $targ_h = 150;
-	$jpeg_quality = 90;
-	$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-		
-	$src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
-	$img_r = imagecreatefromjpeg($src);
-	$dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
-	imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
-	$_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
-	$erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
-	
-	//insert
-	$obj->setVar('file_size', @filesize($src));
-	$obj->setVar('file_indate', time());
-	$obj->setVar('file_display', $_REQUEST['file_display']);
-	$obj->setVar('file_type', 'image/jpeg');
-	$obj->setVar('file_res_x', $_REQUEST['w']);
-	$obj->setVar('file_res_y', $_REQUEST['h']);	
-	//thumb
-	$thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
-	switch($xoopsModuleConfig['tdmpicture_thumb_style']) {
-	 
-	 case "center":
-	   default:
-	$thumb->cropFromCenter($xoopsModuleConfig['tdmpicture_thumb_width']);
-	 break;
-	 
-	 case "limit-width-height":
-	$thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
-	 break;
-	 
-	 case "limit-width":
-	$thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'], "");
-	 break;
-	 
-	 case "limit-height":
-	$thumb->resize("",$xoopsModuleConfig['tdmpicture_thumb_heigth']);
-	 break;
-	 }
-	$thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
-	$erreur .= $file_handler->insert($obj);
-	}
-	
-	if ($erreur) {
-     redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
-      } else {
-	redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
-	}
-
-    break;
-	
  case "edit": 
  	        //admin menu
 			$category_admin = new ModuleAdmin();
@@ -261,19 +196,6 @@
     $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();
-    break;
-	
  case "delete":
 	$obj =& $file_handler->get($_REQUEST['file_id']);	
     if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
@@ -488,7 +410,7 @@
 				echo '<td align="center" style="vertical-align:middle;">';
 				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 '<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>';
 			 }

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php	2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php	2012-07-10 16:16:12 UTC (rev 9843)
@@ -289,107 +289,7 @@
 		
 	}
 	
-	   function getImg($action = false)
-    {
-	
- global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
- 
-        if ($action === false) {
-            $action = $_SERVER['REQUEST_URI'];
-        }
-        $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(_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')));
-		}
-
-  			//on test l'existance de l'image
-			$img = $this->getVar("file_file") ? $this->getVar("file_file") : 'blank.gif';
-			$imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/".$img;
-			if (file_exists($imgpath)) {
-			$file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/".$this->getVar("file_file");
-			} else {
-			$file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/blank.gif";
-			}
-			
-			echo '<script language="Javascript">
-				    var $tdmpicture = jQuery.noConflict(); 
-				$tdmpicture(document).ready(function(){
-
-				$tdmpicture("#cropbox").Jcrop({
-					onChange: showCoords,
-					onSelect: showCoords,
-					aspectRatio: 0
-				});
-
-			});
-
-function showCoords(c)
-{
-  var $tdmpicture = jQuery.noConflict();
-	$tdmpicture("#x").val(c.x);
-	$tdmpicture("#y").val(c.y);
-	$tdmpicture("#x2").val(c.x2);
-	$tdmpicture("#y2").val(c.y2);
-	$tdmpicture("#w").val(c.w);
-	$tdmpicture("#h").val(c.h);
-};
-
-function checkCoords()
-      {
-        if (parseInt($("#x").val())) return true;
-        alert("Please select a crop region then press submit.");
-        return false;
-      };
-</script>';
-
-			echo '<div style="border:1px solid #ccc;" align="center"><img src="'.$file_img.'" alt="" title="" id="cropbox" >
-			<br />';
-		
-
-	$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, ''));
-$img->addElement(new XoopsFormText('Y2', 'y2', 4, 4, ''));
-$img->addElement(new XoopsFormText('W', 'w', 4, 4, ''));
-$img->addElement(new XoopsFormText('H', 'h', 4, 4, ''));
-$form->addElement($img);
-
-//visible
-if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
-    $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
-	}else {
-	
-	$gperm_handler =& xoops_gethandler('groupperm');
-	
-	if (is_object($xoopsUser)) {
-    $groups = $xoopsUser->getGroups();
-	} else {
-	$groups = XOOPS_GROUP_ANONYMOUS;
-	}
-
-	if ($gperm_handler->checkRight('tdmpicture_view', 256, $groups, $xoopsModule->getVar('mid'))) {
-	$form->addElement(new XoopsFormHidden('file_display', 1));
-	}else {
-	$form->addElement(new XoopsFormHidden('file_display', 0));
-	}
-	}	
-	
-		$form->addElement(new XoopsFormHidden('op', 'save_img'));
-        $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
-        return $form;
-	}
-
 }
 
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/download.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/download.php	2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/download.php	2012-07-10 16:16:12 UTC (rev 9843)
@@ -59,5 +59,10 @@
 //header('Content-Type: application/force-download');
 //header ('Content-Disposition: attachment; filename='.$document_file.'');
 //header('Content-length: '.$document->getVar("file_size"));
-echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
+  header('Content-Type: application/force-download');
+  header('Content-Disposition: attachment; filename='.basename($document_file));
+  readfile($document_file);
+		
+		
+//echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
 ?>
\ No newline at end of file

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 16:16:12 UTC (rev 9843)
@@ -92,79 +92,8 @@
 	}
     break;
 	
-
-	//modifier image	
-	 case "edit_img": 
-	 
-	 //perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}
-
-	$obj = $file_handler->get($_REQUEST['file_id']);
-	if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
-	{
-    $form = $obj->getImg();
-    $form->display();
-	} else {
-	redirect_header(TDMPICTURE_URL, 2, _MD_TDMPICTURE_NOPERM);
-	}
-    break;
 	
-	case "save_img": 
-
-//perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}	
-		if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		if (isset($_REQUEST['file_id'])) {
-        $obj =& $file_handler->get($_REQUEST['file_id']);
-		} else {
-        $obj =& $file_handler->create();
-		}  
-
-	if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
-	{
-	$targ_w = $targ_h = 150;
-	$jpeg_quality = 90;
-	$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-		
-	$src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
-	$img_r = imagecreatefromjpeg($src);
-	$dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
-	imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
-	$_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
-	$erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
 	
-	//insert
-	$obj->setVar('file_size', @filesize($src));
-	$obj->setVar('file_indate', time());
-	$obj->setVar('file_display', $_REQUEST['file_display']);
-	$obj->setVar('file_type', 'image/jpeg');
-	$obj->setVar('file_res_x', $_REQUEST['w']);
-	$obj->setVar('file_res_y', $_REQUEST['h']);	
-	//thumb
-	$thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
-	$thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
-	$thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
-	$erreur .= $file_handler->insert($obj);
-	}
-	
-	if ($erreur) {
-     redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
-      } else {
-	redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
-	}
-
-    break;
-	
 	 case "delete":
 	 
 	 //perm

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 16:16:12 UTC (rev 9843)
@@ -106,7 +106,6 @@
 <div align="center">
 <{if $file.edit}>
 <a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit_img&file_id=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/picture_edit.png"></a>
 <{/if}>
 <{if $file.del}>
 <a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=delete&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 delete.png}>"></a>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9842] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9842
          http://xoops.svn.sourceforge.net/xoops/?rev=9842&view=rev
Author:   lord_venom
Date:     2012-07-10 13:22:59 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
more...

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -152,6 +152,35 @@
 		$form->display();
     break;
 	
+		case "edit_file":
+
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+        redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		if (isset($_REQUEST['file_id'])) {
+        $obj =& $file_handler->get($_REQUEST['file_id']);
+		} else {
+        $obj =& $file_handler->create();
+		}
+		
+	//fichier commun
+	$obj->setVar('file_title', $_REQUEST['file_title']);
+	$obj->setVar('file_display', $_REQUEST['file_display']);
+	$obj->setVar('file_cat', $_REQUEST['file_cat']);
+	$obj->setVar('file_indate', time());
+	$obj->setVar('file_text', $_REQUEST['file_text']);
+	$obj->setVar('file_size', $_REQUEST['file_size']);
+	$obj->setVar('file_res_x', $_REQUEST['file_res_x']);
+	$obj->setVar('file_res_y', $_REQUEST['file_res_y']);		
+		
+	$erreur = $file_handler->insert($obj);
+
+	if ($erreur) {
+     redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
+      } else {
+	redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
+	}
+    break;
 	
 	case "save_img": 
 	

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -91,6 +91,26 @@
 $button_file = new XoopsFormText(_MD_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file'));
 $button_file->setExtra("disabled");
 $form->addElement($button_file);
+
+	//categorie
+		$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
+		
+		$criteriaDisplay = new CriteriaCompo();
+		$criteriaDisplay->add(new Criteria('cat_display', 1));
+		$criteriaDisplay->add(new Criteria('cat_index', 1));
+
+		$criteriaUser = new CriteriaCompo();
+		$criteriaUser->add($criteriaDisplay);
+		$criteriaUser->add(new Criteria('cat_display', 1), 'OR');
+		$criteriaUser->add(new Criteria('cat_uid', $uid));
+
+		$arr = $cat_handler->getall($criteriaUser);
+		$mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+		$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, 
+		$mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('file_cat'), '', 0, '', 'tdmpicture_catview')));
+		
+		//
+		
 //editor
 	    $editor_configs=array();
     	$editor_configs["name"] ="file_text";
@@ -129,7 +149,7 @@
 	}
 	}
 
-$form->addElement(new XoopsFormHidden('op', 'save_file'));
+$form->addElement(new XoopsFormHidden('op', 'edit_file'));
 $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 		
 }
@@ -149,9 +169,13 @@
 		$criteriaUser->add(new Criteria('cat_uid', $uid));
 
 		$arr = $cat_handler->getall($criteriaUser);
-		$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
-		$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+		//$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
+		//$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
 
+		$mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+		$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, 
+		$mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), '', 0, '', 'tdmpicture_catview')));
+		
 		//
 	
 	

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -103,7 +103,8 @@
 		if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
 		
 		$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
-		
+			
+			
 		$ret .=  '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
 		
 			}
@@ -130,15 +131,60 @@
 		
 		 global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
 		 
+		 //perm
 		 $gperm_handler =& xoops_gethandler('groupperm');
+		 	if (is_object($xoopsUser)) {
+			$groups = $xoopsUser->getGroups();
+			$uid = $xoopsUser->getVar('uid');
+			} else {
+			$groups = XOOPS_GROUP_ANONYMOUS;
+			$uid = 0;
+			}
+			//
 		if ( $key > 0 ) {
 			$value = $this->_tree[$key]['obj']->getVar( $this->_myId );
+			//$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
+			//$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
+
+			if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
+			
+			$ret .= '<option value="' . $value . '"';
+		
+			if ( $value == $selected ) {
+				$ret .= ' selected="selected"';
+			}
+			$ret .= '>' . $prefix_curr . $this->_tree[$key]['obj']->getVar( $fieldName ) . '</option>';
+			}
+			$prefix_curr .= $prefix_orig;
+		}
+		if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
+			foreach ( $this->_tree[$key]['child'] as $childkey ) {
+				$this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+			}
+		}
+	}
+	
+		function _makeSelBoxOptions2( $fieldName, $selected, $key, &$ret, $perm, $prefix_orig, $prefix_curr = '' ) {
+		
+		 global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+		 
+		 //perm
+		 $gperm_handler =& xoops_gethandler('groupperm');
+		 	if (is_object($xoopsUser)) {
+			$groups = $xoopsUser->getGroups();
+			$uid = $xoopsUser->getVar('uid');
+			} else {
+			$groups = XOOPS_GROUP_ANONYMOUS;
+			$uid = 0;
+			}
+			//
+		if ( $key > 0 ) {
+			$value = $this->_tree[$key]['obj']->getVar( $this->_myId );
 			$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
 			//$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
 
-			if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $this->_tree[$key]['obj']->getVar('id'), $groups, $xoopsModule->getVar('mid'))) {
+			if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
 			
-			
 			$ret .= '<option value="' . $url . '"';
 		
 			if ( $value == $selected ) {
@@ -150,7 +196,7 @@
 		}
 		if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
 			foreach ( $this->_tree[$key]['child'] as $childkey ) {
-				$this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+				$this->_makeSelBoxOptions2( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
 			}
 		}
 	}
@@ -197,7 +243,11 @@
 		if ( false != $addEmptyOption ) {
 			$ret .= '<option value="0">'.$addEmptyOption.'</option>';
 		}
+		if(!$extra){
 		$this->_makeSelBoxOptions( $fieldName, $selected, $key, $ret, $perm, $prefix  );
+		} else {
+		$this->_makeSelBoxOptions2( $fieldName, $selected, $key, $ret, $perm, $prefix  );
+		}
 		return $ret . '</select>';
 	}
 	

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -141,7 +141,7 @@
 //define( "_MD_TDMPICTURE_ALBUM", "Album");
 //define( "_MD_TDMPICTURE_CAT", "Category");
 define( "_MD_TDMPICTURE_DISPLAYUSER", "Show in the user");
-//define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
+define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
 //define( "_MD_TDMPICTURE_BASEERROR", "Error: Your changes are not recorded");
 define( "_MD_TDMPICTURE_GENREDELALL", "ATTENTION all folder and subfolder it will delete"); 
 define( "_MD_TDMPICTURE_NOPERM", "You do not have permission for this action"); 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -150,7 +150,7 @@
 define("_MD_TDMPICTURE_DISPLAYUSER","Afficher dans la partie user");
 //define("_AM_TDMPICTURE_DISPLAYINDEX","Catégorie principale");
 
-//define("_AM_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succ&#233;");
+define("_MD_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succ&#233;");
 //define("_AM_TDMPICTURE_BASEERROR","Erreur: Vos Modifications ne sont pas enregistrer");
 define("_MD_TDMPICTURE_GENREDELALL","ATTENTION tous le dossier et c'est sous dossier serons supprimer");
 define("_MD_TDMPICTURE_NOPERM","Vous n'avez pas les permissions pour cette action");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 13:22:59 UTC (rev 9842)
@@ -53,7 +53,7 @@
 	}
     break;
 	
-	case "save_file":
+	case "edit_file":
 
 	//perm
 if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
@@ -75,6 +75,7 @@
 	//fichier commun
 	$obj->setVar('file_title', $_REQUEST['file_title']);
 	$obj->setVar('file_display', $_REQUEST['file_display']);
+	$obj->setVar('file_cat', $_REQUEST['file_cat']);
 	$obj->setVar('file_indate', time());
 	$obj->setVar('file_text', $_REQUEST['file_text']);
 	$obj->setVar('file_size', $_REQUEST['file_size']);
@@ -84,11 +85,11 @@
 	$erreur = $file_handler->insert($obj);
 	}
 
-		if ($erreur) {
-        redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
-		} else {
-		redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
-		}
+	if ($erreur) {
+     redirect_header('index.php', 2, _MD_TDMPICTURE_BASE);
+      } else {
+	redirect_header('index.php', 2, _MD_TDMPICTURE_BASEERROR);
+	}
     break;
 	
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 13:22:59 UTC (rev 9842)
@@ -25,10 +25,10 @@
 	
 	</div>
 
-	</div>
 
-<div class="switch_desc"><{$file.text}><br class="clear"/></div>
 
+<div id="tdmpicture_text" class="switch_desc"><{$file.text}><br class="clear"/></div>
+<br class="clear"/>	</div>
 
 <div id="tdmpicture_num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 13:22:59 UTC (rev 9842)
@@ -56,10 +56,14 @@
 	
 	<span id="tdmpicture_num" class="switch_fav"><{$file.favourite}></span></div>
 
-</div>
 
 
 
+<{if $file.text}>
+<div id="tdmpicture_text" class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
+<{/if}>
+<br class="clear"/></div>
+
 <div id="tdmpicture_num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
@@ -73,11 +77,8 @@
 <{/if}>
 </div>	
 
-<br class="clear"/>
-<{if $file.text}>
-<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
-<{/if}>
 
+
 <br class="clear"/>
 <!-- tableau masquer -->
 <div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9841] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9841
          http://xoops.svn.sourceforge.net/xoops/?rev=9841&view=rev
Author:   lord_venom
Date:     2012-07-10 10:25:24 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
rename css

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
    XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-10 10:25:24 UTC (rev 9841)
@@ -95,7 +95,7 @@
 		$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
 		$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
 
-		$ret .=  '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+		$ret .=  '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
 
 		}	
 		
@@ -104,7 +104,7 @@
 		
 		$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
 		
-		$ret .=  '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
+		$ret .=  '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
 		
 			}
 			
@@ -181,7 +181,7 @@
 	Global $cat_display;
 		
 		$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
-		$ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="menu">';		
+		$ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">';		
 		$chcount = 1;
 		$GLOBALS['class'] = "odd";
 		$this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-10 10:25:24 UTC (rev 9841)
@@ -16,14 +16,14 @@
  * ****************************************************************************
  */
 
-  ul#menu {
+  ul#tree_menu {
     margin: 0 auto;
 	padding:0 auto;
     text-align: center;
 	width:100%;
     
   }
-  ul#menu li {
+  ul#tree_menu li {
     list-style: none;
 	float:left;
 	width:97%;
@@ -36,25 +36,25 @@
 	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
 	overflow: auto;
   }
-  ul#menu img {
+  ul#tree_menu img {
   float:left;
   padding-left:20px;
   padding-right:20px;
   padding-top:10px;
   }
   
-    ul#menu h2{
+    ul#tree_menu h2{
 	left:0;
 	text-align:left;
 padding-top:10px;
 padding-bottom:5px;
   }
   
-   ul#menu div{
+   ul#tree_menu div{
   float:left;
  
   }
-  #text, ul#menu #text {
+  #tdmpicture_text, ul#tree_menu #tree_text {
   font-size: 13px;
   font-weight: normal;
 color: #728DA9;
@@ -62,7 +62,7 @@
 line-height: 20px;
 }
   
-  #num, #num a,  ul#menu #num{
+  #tdmpicture_num, #tdmpicture_num a,  ul#tree_menu #tree_num{
   text-align: center;
    font-weight: normal;
 font-size: 11px;
@@ -70,13 +70,13 @@
 text-shadow: 0 1px 0 white;
  
   }
-  #num a{
+  #tdmpicture_num a{
    font-weight: bold;
   }
 
-      ul#menu #form, #form{
-	  float:right;
-	  padding-top:100px;
+    ul#tree_menu #tree_form{
+	float:right;
+	padding-top:100px;
 	  padding-right:20px;
   text-align: center;
 font-size: 11px;

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php	2012-07-10 10:25:24 UTC (rev 9841)
@@ -22,7 +22,6 @@
 
 include_once XOOPS_ROOT_PATH.'/header.php';
 include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar("dirname").'/include/common.php';
- tdmpicture_adminheader();
 
 $xoopsTpl->assign('dirname', $mydirname);
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 10:25:24 UTC (rev 9841)
@@ -17,7 +17,7 @@
 	<div class="switch_title">
 	<h2><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a></h2><span class="switch_fav"><{$file.favourite}></span>
 	<br /> 
-	<span id="num" class="switch_in">
+	<span id="tdmpicture_num" class="switch_in">
 	<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
 	<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a>,
 	<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}>
@@ -30,11 +30,11 @@
 <div class="switch_desc"><{$file.text}><br class="clear"/></div>
 
 
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
 
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
 <{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
 <{if $perm_vote}>
 <br />

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 10:25:24 UTC (rev 9841)
@@ -49,22 +49,22 @@
 <li style="list-style: none;">
 <div style="float:left; text-align:left;">
 <div class="switch_title"><h2><{$file.title}></h2>
-	<span id="num" class="switch_in">
+	<span id="tdmpicture_num" class="switch_in">
 	<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
 	<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a>,
 	<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}></span>
 	
-	<span id="num" class="switch_fav"><{$file.favourite}></span></div>
+	<span id="tdmpicture_num" class="switch_fav"><{$file.favourite}></span></div>
 
 </div>
 
 
 
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
 
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
 <{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
 <{if $perm_vote}>
 <br />
@@ -83,17 +83,17 @@
 <div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
 <table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
 
-<div id="num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
 	
-<div id="num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
 
-<div id="num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
 
-<div id="num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
 
-<div id="num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
 
-<div id="num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
 	
 </td></tr></table>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9840] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9840
          http://xoops.svn.sourceforge.net/xoops/?rev=9840&view=rev
Author:   lord_venom
Date:     2012-07-10 10:04:33 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
new style and bug screen

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
    XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/controls.png
    XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/loading.gif
    XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
    XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php

Removed Paths:
-------------
    XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/border.png
    XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/
    XoopsModules/TDMPicture/trunk/TDMPicture/js/themes/

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-10 10:04:33 UTC (rev 9840)
@@ -266,14 +266,15 @@
 	list-style: none;
 	margin: 10px;
 	left:0;
-	border: 1px solid #ccc;
-	background: #fff;
-			-moz-border-radius: 4px; -webkit-border-radius: 4px;
 }
 
 ul.display li .content_block {
 	list-style-type: none;
+
 }
+.display li {	
+border-bottom: 1px solid #F4F4F4;
+}
 
 
 .switch_img{
@@ -286,10 +287,9 @@
 	margin-right: 10px;
 	margin-bottom:10px;
 	text-align:center;
-	border-top: 1px solid #111;
-	border-right: 1px solid #111;
-	border-bottom: 1px solid #333;
-	border-left: 1px solid #333;
+	border: 1px solid #FFF;
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
 } 
 
 
@@ -298,6 +298,7 @@
 text-align:center;
 margin-left: auto;
 margin-right: auto;
+
 }
  
 a.switch_thumb {
@@ -306,7 +307,7 @@
 
 .switch_title, .switch_title a {
 	margin-top:10px;	
-	padding: 2px;
+
 }
 
 
@@ -368,7 +369,7 @@
 }
 
 .switch_fav {
-	padding-left: 10px;
+	padding: 10px;
 	margin: 0;
 }
 
@@ -418,7 +419,11 @@
 	margin: 10px;
 }
 
+.thumb_view li {	
+border:none;
+}
 
+
 /* + -----------------------------------------------------
 	DETAIL
 + ----------------------------------------------------- */
@@ -428,10 +433,9 @@
 	background: #fff;
 	margin: 0 15px 0 0;
 	text-align:center;
-	border-top: 1px solid #111;
-	border-right: 1px solid #111;
-	border-bottom: 1px solid #333;
-	border-left: 1px solid #333;
+	border: 1px solid #FFF;
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
 }
 
 .detail_info {
@@ -469,8 +473,7 @@
 + ----------------------------------------------------- */
 
 .boxgrid {  
-    overflow: hidden;
-    position: relative;
+ 
 }  
  
 
@@ -497,8 +500,6 @@
 display: block;
 float: right;
 text-align:right;
-margin-top: 0pt;
-margin-right: 10px;
 background-color: #e9e9e9;
 border: 1px solid #cccccc;
 text-decoration: none;
@@ -716,65 +717,45 @@
 
 
 /*
-    ColorBox Core Style
-    The following rules are the styles that are consistant between themes.
-    Avoid changing this area to maintain compatability with future versions of ColorBox.
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
 */
 #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
 #cboxOverlay{position:fixed; width:100%; height:100%;}
 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative; overflow:hidden;}
+#cboxContent{position:relative;}
 #cboxLoadedContent{overflow:auto;}
-#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;}
 #cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
 #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
 
 /* 
-    Example user style
-    The following rules are ordered and tabbed in a way that represents the
-    order/nesting of the generated HTML, so that the structure easier to understand.
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:url(../images/colorbox/overlay.png) repeat 0 0;}
+#cboxOverlay{background:#fff;}
 #colorbox{}
-    #cboxTopLeft{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -100px 0;}
-    #cboxTopRight{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -129px 0;}
-    #cboxBottomLeft{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -100px -29px;}
-    #cboxBottomRight{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -129px -29px;}
-    #cboxMiddleLeft{width:21px; background:url(../images/colorbox/controls.png) left top repeat-y;}
-    #cboxMiddleRight{width:21px; background:url(../images/colorbox/controls.png) right top repeat-y;}
-    #cboxTopCenter{height:21px; background:url(../images/colorbox/border.png) 0 0 repeat-x;}
-    #cboxBottomCenter{height:21px; background:url(../images/colorbox/border.png) 0 -29px repeat-x;}
-    #cboxContent{background:#fff;}
-        #cboxLoadedContent{margin-bottom:28px;}
-        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
-        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
-        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
-        #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(../images/colorbox/controls.png) no-repeat -75px 0px; width:25px; height:25px; text-indent:-9999px;}
-        #cboxPrevious.hover{background-position:-75px -25px;}
-        #cboxNext{position:absolute; bottom:0; left:27px; background:url(../images/colorbox/controls.png) no-repeat -50px 0px; width:25px; height:25px; text-indent:-9999px;}
-        #cboxNext.hover{background-position:-50px -25px;}
-        #cboxLoadingOverlay{background:url(../images/colorbox/loading_background.png) no-repeat center center;}
+    #cboxContent{margin-top:32px; overflow:visible;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{background:#000; padding:1px;}
         #cboxLoadingGraphic{background:url(../images/colorbox/loading.gif) no-repeat center center;}
-        #cboxClose{position:absolute; bottom:0; right:0; background:url(../images/colorbox/controls.png) no-repeat -25px 0px; width:25px; height:25px; text-indent:-9999px;}
-        #cboxClose.hover{background-position:-25px -25px;}
-
-/*
-    The following fixes png-transparency for IE6.  
-    It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition
-    
-    Since this method does not support CSS background-positioning, it is incompatible with CSS sprites.
-    Colorbox preloads navigation hover classes to account for this.
-    
-    !! Important Note: AlphaImageLoader src paths are relative to the HTML document,
-    while regular CSS background images are relative to the CSS document.
-*/
-.cboxIE #cboxTopLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopLeft.png, sizingMethod='scale');}
-.cboxIE #cboxTopCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopCenter.png, sizingMethod='scale');}
-.cboxIE #cboxTopRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopRight.png, sizingMethod='scale');}
-.cboxIE #cboxBottomLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomLeft.png, sizingMethod='scale');}
-.cboxIE #cboxBottomCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomCenter.png, sizingMethod='scale');}
-.cboxIE #cboxBottomRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomRight.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleLeft.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleRight.png, sizingMethod='scale');}
-
+        #cboxLoadingOverlay{background:#000;}
+        #cboxTitle{position:absolute; top:-22px; left:0; color:#000;}
+        #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}
+        #cboxSlideshow, #cboxPrevious, #cboxNext, #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(../images/colorbox/controls.png) no-repeat 0 0;}
+        #cboxPrevious{background-position:0px 0px; right:44px;}
+        #cboxPrevious:hover{background-position:0px -25px;}
+        #cboxNext{background-position:-25px 0px; right:22px;}
+        #cboxNext:hover{background-position:-25px -25px;}
+        #cboxClose{background-position:-50px 0px; right:0;}
+        #cboxClose:hover{background-position:-50px -25px;}
+        .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
+        .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
+        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-100px -25px;}
+        .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
+        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-75px -25px;}
\ No newline at end of file

Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/border.png
===================================================================
(Binary files differ)

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/controls.png
===================================================================
(Binary files differ)

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/loading.gif
===================================================================
(Binary files differ)

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php	2012-07-10 10:04:33 UTC (rev 9840)
@@ -36,7 +36,7 @@
 define( "_MD_TDMPICTURE_CAT", "Category"); 
 define( "_MD_TDMPICTURE_TYPE", "type"); 
 define( "_MD_TDMPICTURE_SIZE", "File Size");
-define( "_MD_TDMPICTURE_WIDTH", "Dimensions");
+//define( "_MD_TDMPICTURE_WIDTH", "Dimensions");
 define( "_MD_TDMPICTURE_MORE", "About"); 
 define( "_MD_TDMPICTURE_SCREEN", "Full Screen");
 
@@ -48,7 +48,7 @@
 define( "_MD_TDMPICTURE_DESC", "Presentation");
 define( "_MD_TDMPICTURE_VOTEADD", "Add one vote"); 
 define( "_MD_TDMPICTURE_VOTEREMOVE", "Remove a vote"); 
-define( "_MD_TDMPICTURE_IN", "the"); 
+define( "_MD_TDMPICTURE_LE", "the"); 
 define( "_MD_TDMPICTURE_NONEALBUM", "No album seems to be registered"); 
 define( "_MD_TDMPICTURE_NONEARTISTE", "No artist appears to be saved"); 
 define( "_MD_TDMPICTURE_NONEGENRE", "No genre seems to be registered"); 
@@ -127,7 +127,7 @@
 define( "_MD_TDMPICTURE_URL", "URL file");
 //define( "_MD_TDMPICTURE_TYPE", "Type");
 //define( "_MD_TDMPICTURE_SIZE", "Size (in byte)");
-//define( "_MD_TDMPICTURE_WIDTH", "Width");
+define( "_MD_TDMPICTURE_WIDTH", "Width");
 define( "_MD_TDMPICTURE_HEIGHT", "Height");
 //
 //define( "_MD_TDMPICTURE_EDITOR", "Publisher");
@@ -158,7 +158,7 @@
 // Version 1.5
 define("_MD_TDMPICTURE_MULTIUPLOAD", "You can load %s file(s).");
 define("_MD_TDMPICTURE_BY", "By");
-//define("_MD_TDMPICTURE_IN", "In");
+define("_MD_TDMPICTURE_IN", "In");
 //define("_MD_TDMPICTURE_FOR", "To");
 //define("_MD_TDMPICTURE_ANTI", "Counter");
 define('_MD_TDMPICTURE_PERM_2', 'Permissions to display');
@@ -167,3 +167,4 @@
 define("_MD_TDMPICTURE_NBFILE","# of Pictures");
 define("_MD_TDMPICTURE_MEGABYTES"," MB");
 define("_MD_TDMPICTURE_KILOBYTES"," KB");
+define("_MD_TDMPICTURE_ADMIN"," Admin");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php	2012-07-10 10:04:33 UTC (rev 9840)
@@ -61,8 +61,8 @@
 define("_AM_TDMPICTURE_SELECT_SLIDE", "Slideshow"); 
 
 // version 1.3
-define("_MI_TDMPICTURE_FULL_WIDTH", "Maximum width of the image true");
-define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
+//define("_MI_TDMPICTURE_FULL_WIDTH", "Maximum width of the image true");
+//define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
 define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
 define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
 define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-10 10:04:33 UTC (rev 9840)
@@ -51,7 +51,7 @@
 define("_MD_TDMPICTURE_DESC","Présentation:");
 define("_MD_TDMPICTURE_VOTEADD","Ajouter un vote");
 define("_MD_TDMPICTURE_VOTEREMOVE","Enlever un vote");
-define("_MD_TDMPICTURE_IN","le");
+define("_MD_TDMPICTURE_LE","le");
 
 define( "_MD_TDMPICTURE_NONEALBUM", "Aucun album ne semble être enregistré"); 
 define( "_MD_TDMPICTURE_NONEARTISTE", "Aucun artiste ne semble être enregistré"); 
@@ -167,7 +167,7 @@
 //version 1.5
 define("_MD_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
 define("_MD_TDMPICTURE_BY","Par");
-//define("_MD_TDMPICTURE_IN","Dans");
+define("_MD_TDMPICTURE_IN","Dans");
 //define("_MD_TDMPICTURE_FOR","Pour");
 //define("_MD_TDMPICTURE_ANTI","Contre");
 define('_MD_TDMPICTURE_PERM_2','Permissions d\'afficher');
@@ -178,3 +178,4 @@
 define("_MD_TDMPICTURE_NBFILE","# of Pictures");
 define("_MD_TDMPICTURE_MEGABYTES"," Mo");
 define("_MD_TDMPICTURE_KILOBYTES"," Ko");
+define("_MD_TDMPICTURE_ADMIN"," Admin");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-10 10:04:33 UTC (rev 9840)
@@ -60,8 +60,8 @@
 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_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");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-10 10:04:33 UTC (rev 9840)
@@ -1,6 +1,6 @@
 
-<table class="tdmp_table"><tr>
-<td>
+<table class="outer"><tr>
+<td class="even">
 <{if $numfile != 0}>
 <ul id="display" class="<{$display}>">
 <{foreach item=file from=$file}>	
@@ -15,11 +15,13 @@
 	
 	<div style="float:left; text-align:left;">
 	<div class="switch_title">
-	<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a><span class="switch_fav"><{$file.favourite}></span>
+	<h2><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a></h2><span class="switch_fav"><{$file.favourite}></span>
 	<br /> 
-	<span class="switch_date"><{$file.indate}></span>
-	-
-	<span class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>:<a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a></span>
+	<span id="num" class="switch_in">
+	<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
+	<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a>,
+	<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}>
+	</span>
 	
 	</div>
 
@@ -28,11 +30,11 @@
 <div class="switch_desc"><{$file.text}><br class="clear"/></div>
 
 
-<div class="switch_info">
+<div id="num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
 
-<div class="switch_info">
+<div id="num" class="switch_info">
 <{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
 <{if $perm_vote}>
 <br />
@@ -40,22 +42,10 @@
 <a href="javascript:;" onclick="RemoveVote(<{$file.id}>);return false;" title="<{$smarty.const._MD_TDMPICTURE_VOTEREMOVE}>">-</a>
 <{/if}>
 </div>
-
-<{if $file.menu}>
 <br class="clear"/>
-<div class="switch_info">
-<div align="center">
-<{if $file.edit}>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit_img&file_id=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/picture_edit.png"></a>
-<{/if}>
-<{if $file.del}>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=delete&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 delete.png}>"></a>
-<{/if}>
-</div>
-</div>
-<{/if}>
+<div class="switch_title" style="text-align:right"><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}></div><{/if}>
 
+
 </li>
 <{/foreach}>
 </ul>

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-10 10:04:33 UTC (rev 9840)
@@ -2,18 +2,14 @@
       var $tdmpicture = jQuery.noConflict();
 	
 	$tdmpicture(document).ready(function(){
+	
+			$tdmpicture("a[rel='group1']").colorbox({ 
+				rel:"group1", 
+			maxWidth:"<{$smarty.const.TDMPICTURE_SLIDE_WIDTH}>px", 
+			maxHeight:"<{$smarty.const.TDMPICTURE_SLIDE_HEIGHT}>px"
+			});
 
-	$tdmpicture("a[rel='group1']").colorbox({});
-			
 
-  $tdmpicture('.boxgrid').hover(function() {
-        $tdmpicture(".cover", this).stop().animate({bottom:'0px'},{queue:false,duration:160});
-    }, function() {
-        $tdmpicture(".cover", this).stop().animate({bottom:'-120px'},{queue:false,duration:160});
-    });
-
-
-
 });
 	</script>
 
@@ -40,24 +36,30 @@
   <br class="clear"/>
   
   
-<table class="tdmp_table"><tr>
-<th align="center"><span class="switch_title"><{$file.title}></span> <span class="switch_fav"><{$file.favourite}></span></th></tr>
+<table><tr>
+<th align="center"><span class="switch_title"><h2><{$file.title}></h2></span></th></tr>
 <tr><td class="even" align="center">
 
 <div class="boxgrid">
-    <{$file.img}>
- </div>
+ <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><{$file.img}>
+ </a></div>
 
 </td></tr><tr><td class="odd">
 <ul id="display">
 <li style="list-style: none;">
 <div style="float:left; text-align:left;">
 <div class="switch_title"><h2><{$file.title}></h2>
-	<span id="num" class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>: <{$file.indate}></span>
-	</div>
+	<span id="num" class="switch_in">
+	<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
+	<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a>,
+	<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}></span>
+	
+	<span id="num" class="switch_fav"><{$file.favourite}></span></div>
 
 </div>
 
+
+
 <div id="num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
@@ -76,7 +78,7 @@
 <div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
 <{/if}>
 
-
+<br class="clear"/>
 <!-- tableau masquer -->
 <div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
 <table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
@@ -114,7 +116,7 @@
 <{/foreach}>	
 </td></tr>
 <{if $smarty.const.TDMPICTURE_PDF}>
-<tr><td> 
+<tr><td class="odd"> 
 <div style="float: left;">
 <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> 
 <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-10 10:04:33 UTC (rev 9840)
@@ -206,20 +206,6 @@
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '10';
 $i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_full_width';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_FULL_WIDTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 800;
-$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_full_heigth';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_FULL_HEIGTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 800;
-$i++;
 $modversion['config'][$i]['name'] = 'tdmpicture_width';
 $modversion['config'][$i]['title'] = '_MI_TDMPICTURE_WIDTH';
 $modversion['config'][$i]['description'] = '';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9839] XoopsModules/TDMDownloads/trunk/TDMDownloads/ language/english/main.php

[<be...@us...>]

Revision: 9839
          http://xoops.svn.sourceforge.net/xoops/?rev=9839&view=rev
Author:   beckmi
Date:     2012-07-10 08:21:40 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Fixing English text (Cesag)

Modified Paths:
--------------
    XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php

Modified: XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php
===================================================================
--- XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php	2012-07-10 08:06:46 UTC (rev 9838)
+++ XoopsModules/TDMDownloads/trunk/TDMDownloads/language/english/main.php	2012-07-10 08:21:40 UTC (rev 9839)
@@ -63,7 +63,7 @@
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NBTELECH","Downloads: %s");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NONEXISTENT","this download does not exist in our database");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NOPERMDOWNLOAD","You don't have the right to download this file");
-define("_MD_TDMDOWNLOADS_SINGLEFILE_RATING","Rating");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_RATING","Rating: ");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_RATHFILE","Rate this file");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_REPORTBROKEN","Report a broken file");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_TELLAFRIEND","Send to a Friend");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9838] XoopsLanguages/french/modules/tdmdownloads/ TDMDownloads 1.62/language/french

[<ce...@us...>]

Revision: 9838
          http://xoops.svn.sourceforge.net/xoops/?rev=9838&view=rev
Author:   cesag
Date:     2012-07-10 08:06:46 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Correction french translation TDMDownloads 1.62 final.

Modified Paths:
--------------
    XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php
    XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php

Modified: XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php	2012-07-10 07:51:44 UTC (rev 9837)
+++ XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php	2012-07-10 08:06:46 UTC (rev 9838)
@@ -126,7 +126,7 @@
 define('_AM_TDMDOWNLOADS_FORMPAYPAL',"Adresse de PayPal pour les dons");
 define('_AM_TDMDOWNLOADS_FORMPATH',"Les fichiers existent dans : %s");
 define('_AM_TDMDOWNLOADS_FORMPERMDOWNLOAD',"Sélectionnez les groupes qui peuvent télécharger ce fichier");
-define('_AM_TDMDOWNLOADS_FORMPLATFORM',"Version de XOOPS");
+define('_AM_TDMDOWNLOADS_FORMPLATFORM',"Plateforme : ");
 define('_AM_TDMDOWNLOADS_FORMPOSTER',"Posté par ");
 define('_AM_TDMDOWNLOADS_FORMRATING',"Note");
 define('_AM_TDMDOWNLOADS_FORMSIZE',"Taille des fichiers(en bytes)");

Modified: XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php
===================================================================
--- XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php	2012-07-10 07:51:44 UTC (rev 9837)
+++ XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php	2012-07-10 08:06:46 UTC (rev 9838)
@@ -52,9 +52,9 @@
 define("_MD_TDMDOWNLOADS_CAT_VOTE","Votes");
 
 // singlefile.php:
-define("_MD_TDMDOWNLOADS_SINGLEFILE_AUTHOR","Soumis par");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_AUTHOR","Soumis par : ");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_COMMENTS","(%s) Commentaires");
-define("_MD_TDMDOWNLOADS_SINGLEFILE_DATEPROP","Date de soumission");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_DATEPROP","Date de soumission : ");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_ICI","Ici");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_INTFILEFOUND","Voici un fichier important %s");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_LIMITGLOBAL","Vous avez téléchargé les fichiers de %s de ce site et la limite est de s % en 24 h ");
@@ -63,7 +63,7 @@
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NBTELECH","Téléchargé %s fois");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NONEXISTENT","Ce téléchargement n'existe pas dans notre base de données");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NOPERMDOWNLOAD","Vous n'avez pas le droit de télécharger ce fichier");
-define("_MD_TDMDOWNLOADS_SINGLEFILE_RATING","Cote");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_RATING","Cote : ");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_RATHFILE","Noter cette image");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_REPORTBROKEN","Signaler un fichier brisé");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_TELLAFRIEND","Envoyer à un ami");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9837] XoopsModules/news/trunk/news

[<be...@us...>]

Revision: 9837
          http://xoops.svn.sourceforge.net/xoops/?rev=9837&view=rev
Author:   beckmi
Date:     2012-07-10 07:51:44 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Fixing Permission error notices, if there is no topic (reported by Cesag)

Modified Paths:
--------------
    XoopsModules/news/trunk/news/admin/groupperms.php
    XoopsModules/news/trunk/news/docs/credits.txt
    XoopsModules/news/trunk/news/docs/install.txt
    XoopsModules/news/trunk/news/language/english/main.php
    XoopsModules/news/trunk/news/language/english/modinfo.php
    XoopsModules/news/trunk/news/language/englishUTF8/main.php
    XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php
    XoopsModules/news/trunk/news/language/italian/modinfo.php

Added Paths:
-----------
    XoopsModules/news/trunk/news/docs/lang_diff.txt

Removed Paths:
-------------
    XoopsModules/news/trunk/news/docs/lang.diff

Modified: XoopsModules/news/trunk/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/trunk/news/admin/groupperms.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/admin/groupperms.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -63,10 +63,23 @@
 $permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc,'admin/groupperms.php');
 $xt = new XoopsTopic($xoopsDB -> prefix('topics'));
 $alltopics =& $xt->getTopicsList();
-foreach ($alltopics as $topic_id => $topic) {
-    $permform->addItem($topic_id, $topic['title'], $topic['pid']);
+
+
+
+if ($alltopics) {
+    foreach ($alltopics as $topic_id => $topic) {
+        $permform->addItem($topic_id, $topic['title'], $topic['pid']);
+    }
+    echo $permform->render();
+    echo "<br /><br /><br /><br />\n";
+    unset($permform);
+} else {
+
+redirect_header("index.php?op=topicsmanager", 5,_NW_NEWS_NO_TOPICS, false);
 }
-echo $permform->render();
-echo "<br /><br /><br /><br />\n";
-unset($permform);
+
+
+
+
+
 include 'admin_footer.php';
\ No newline at end of file

Modified: XoopsModules/news/trunk/news/docs/credits.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/credits.txt	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/credits.txt	2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,8 +1,4 @@
-//  ----------------------------------------------------------- //
-//                         mylinks-w 3.0    	 	            //
-//                    Just enjoy! Internet for everyone!!	    //
-//                      wanikoo <http://www.wanisys.net/>       //
-//  ----------------------------------------------------------- //
-//                Original Module: mylinks 1.10                 //
-//             The XOOPS Project ( http://www.xoops.org/ )      //
-//  ----------------------------------------------------------- //
+Credits
+===============
+
+Originally developed by various XOOPS developers, with the latest contributions by Hervet, Trabis, and Mamba.

Modified: XoopsModules/news/trunk/news/docs/install.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/install.txt	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/install.txt	2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,4 +1,4 @@
 INSTALL/UNISTALL
 =================
 
-In order to install the module please do following:
\ No newline at end of file
+Install News just like another module
\ No newline at end of file

Deleted: XoopsModules/news/trunk/news/docs/lang.diff
===================================================================
--- XoopsModules/news/trunk/news/docs/lang.diff	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/lang.diff	2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,354 +0,0 @@
-Legend :
-+ Added
-- Removed
-* Modified
-
-*******
-v1.67
-*******
-New file :
-help.php
-
-modinfo.php
-+ _MI_NEWS_HELP
-+ _MI_NEWS_ABOUT
-+ _MI_NEWS_HOME
-+ _MI_NEWS_UPGRADE
-+ _MI_NEWS_DESCRIPTION
-+ _MI_NEWS_SHARE_ME
-+ _MI_NEWS_SHARE_ME_DSC
-+ _MI_NEWS_SHOWICONS
-+ _MI_NEWS_SHOWICONS_DSC
-+ _MI_NEWS_FACEBOOKCOMMENTS
-+ _MI_NEWS_FACEBOOKCOMMENTS_DSC
-
-main.php
-+ _NW_BOOKMARK_TO_FACEBOOK
-+ _NW_BOOKMARK_TO_TWITTER
-+ _NW_BOOKMARK_TO_SCRIPSTYLE
-+ _NW_BOOKMARK_TO_STUMBLE
-+ _NW_BOOKMARK_TO_TECHNORATI
-+ _NW_BOOKMARK_TO_MIXX
-+ _NW_BOOKMARK_TO_MYSPACE
-+ _NW_BOOKMARK_TO_DESIGNFLOAT
-+ _NW_BOOKMARK_TO_BALATARIN
-+ _NW_BOOKMARK_TO_GOOGLEPLUS
-+ _NW_BOOKMARK_TO_GOOGLEREADER
-+ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
-+ _NW_DELETE
-+ _NW_EDIT
-
-admin.php
-+ _AM_NEWS_ABOUT_RELEASEDATE
-+ _AM_NEWS_ABOUT_UPDATEDATE
-+ _AM_NEWS_ABOUT_AUTHOR
-+ _AM_NEWS_ABOUT_CREDITS
-+ _AM_NEWS_ABOUT_LICENSE
-+ _AM_NEWS_ABOUT_MODULE_STATUS
-+ _AM_NEWS_ABOUT_WEBSITE
-+ _AM_NEWS_ABOUT_AUTHOR_NAME
-+ _AM_NEWS_ABOUT_CHANGELOG
-+ _AM_NEWS_ABOUT_MODULE_INFO
-+ _AM_NEWS_ABOUT_AUTHOR_INFO
-+ _AM_NEWS_ABOUT_DESCRIPTION
-+ _AM_NEWS_CONFIG_CHECK
-+ _AM_NEWS_CONFIG_PHP
-+ _AM_NEWS_CONFIG_XOOPS 
-
-*******
-v1.63
-*******
-modinfo.php
-+ _MI_NEWS_TAGS
-+ _MI_NEWS_TAGS_DSC
-+ _MI_NEWS_BNAME10
-+ _MI_NEWS_BNAME11
-
-
-*******
-v1.56
-*******
-main.php
-+ _NW_NOTYETSTORY
-
-*******
-v1.54
-*******
-modinfo.php
-+ _MI_NEWS_CATEGORY_NOTIFY
-+ _MI_NEWS_CATEGORY_NOTIFYDSC
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ
-
-
-*******
-v1.51
-*******
-main.php
-
-+ _NW_BOOKMARK_TO_BLINKLIST
-+ _NW_BOOKMARK_TO_DELICIOUS
-+ _NW_BOOKMARK_TO_DIGG
-+ _NW_BOOKMARK_TO_FARK
-+ _NW_BOOKMARK_TO_FURL
-+ _NW_BOOKMARK_TO_NEWSVINE
-+ _NW_BOOKMARK_TO_REDDIT
-+ _NW_BOOKMARK_TO_SIMPY
-+ _NW_BOOKMARK_TO_SPURL
-+ _NW_BOOKMARK_TO_YAHOO
-
-
-*******
-v1.50
-*******
-admin.php
-* _AM_NEWS_EXPORT_NEWS
-+ _AM_NEWS_NEWSLETTER_HEADER
-+ _AM_NEWS_NEWSLETTER_FOOTER
-+ _AM_NEWS_NEWSLETTER_HTML_TAGS
-+ _AM_NEWS_VERIFY_TABLES
-+ _AM_NEWS_METAGEN
-+ _AM_NEWS_METAGEN_DESC
-+ _AM_NEWS_BLACKLIST
-+ _AM_NEWS_BLACKLIST_DESC
-+ _AM_NEWS_BLACKLIST_ADD
-+ _AM_NEWS_BLACKLIST_ADD_DSC
-+ _AM_NEWS_META_KEYWORDS_CNT
-+ _AM_NEWS_META_KEYWORDS_ORDER
-+ _AM_NEWS_META_KEYWORDS_INTEXT
-+ _AM_NEWS_META_KEYWORDS_FREQ1
-+ _AM_NEWS_META_KEYWORDS_FREQ2
-
-blocks.php
-+ _MB_NEWS_CAL_YEAR
-+ _MB_NEWS_CAL_MONTH
-+ _MB_NEWS_STARTING_DATE
-+ _MB_NEWS_ENDING_DATE
-+ _MB_NEWS_UNTIL_TODAY
-+ _MB_NEWS_RECENT_FIRST
-+ _MB_NEWS_OLDER_FIRST
-
-main.php
-+ _NW_LINKS
-+ _NW_PAGE
-+ _NW_BOOKMARK_ME
-+ _AM_NEWS_TOTAL
-+ _AM_NEWS_WHOS_WHO
-+ _NW_NEWS_LIST_OF_AUTHORS
-+ _AM_NEWS_TOPICS_DIRECTORY
-+ _NW_PAGE_AUTO_SUMMARY
-
-modinfo.php
-+ _MI_NEWS_BNAME9
-+ _MI_NEWS_FORM_TINYEDITOR
-+ _MI_NEWS_FOOTNOTES
-+ _MI_NEWS_DUBLINCORE
-+ _MI_NEWS_DUBLINCORE_DSC
-+ _MI_NEWS_BOOKMARK_ME
-+ _MI_NEWS_BOOKMARK_ME_DSC
-+ _MI_NEWS_FF_MICROFORMAT
-+ _MI_NEWS_FF_MICROFORMAT_DSC
-+ _MI_NEWS_WHOS_WHO
-+ _MI_NEWS_METAGEN
-+ _MI_NEWS_TOPICS_DIRECTORY
-+ _MI_NEWS_ADVERTISEMENT
-+ _MI_NEWS_ADV_DESCR
-+ _MI_NEWS_MIME_TYPES
-+ _MI_NEWS_ENHANCED_PAGENAV
-+ _MI_NEWS_ENHANCED_PAGENAV_DSC
-
-
-*******
-v1.44
-*******
-New file :
-newsletter.php
-
-admin.php :
-* _AM_MAX40CHAR
-* _AM_GROUPPERM
-* _AM_SELFILE
-* _AM_UPDATEMODULE (name changed)
-+ _AM_ADD_TOPIC
-+ _AM_ADD_TOPIC_ERROR
-+ _AM_ADD_TOPIC_ERROR1
-+ _AM_SUB_MENU
-+ _AM_SUB_MENU_YESNO
-+ _AM_HITS
-+ _AM_CREATED
-+ _AM_TOPIC_DESCR
-+ _AM_USERS_LIST
-+ _AM_PUBLISH_FRONTPAGE
-+ _AM_NEWS_UPGRADEFAILED1
-+ _AM_NEWS_UPGRADEFAILED2
-+ _AM_NEWS_UPGRADEFAILED2
-+ _AM_NEWS_UPGRADEFAILED3
-+ _AM_NEWS_UPGRADEFAILED4
-+ _AM_NEWS_UPGRADEFAILED0
-+ _AM_NEWS_UPGR_ACCESS_ERROR
-+ _AM_NEWS_PRUNE_BEFORE
-+ _AM_NEWS_PRUNE_EXPIREDONLY
-+ _AM_NEWS_PRUNE_CONFIRM
-+ _AM_NEWS_PRUNE_TOPICS
-+ _AM_NEWS_PRUNENEWS
-+ _AM_NEWS_EXPORT_NEWS
-+ _AM_NEWS_EXPORT_NOTHING
-+ _AM_NEWS_PRUNE_DELETED
-+ _AM_NEWS_PERM_WARNING
-+ _AM_NEWS_EXPORT_BETWEEN
-+ _AM_NEWS_EXPORT_AND
-+ _AM_NEWS_EXPORT_PRUNE_DSC
-+ _AM_NEWS_EXPORT_INCTOPICS
-+ _AM_NEWS_EXPORT_ERROR
-+ _AM_NEWS_EXPORT_READY
-+ _AM_NEWS_RSS_URL
-+ _AM_NEWS_NEWSLETTER
-+ _AM_NEWS_NEWSLETTER_BETWEEN
-+ _AM_NEWS_NEWSLETTER_READY
-+ _AM_NEWS_DELETED_OK
-+ _AM_NEWS_DELETED_PB
-+ _AM_NEWS_STATS0
-+ _AM_NEWS_STATS
-+ _AM_NEWS_STATS1
-+ _AM_NEWS_STATS2
-+ _AM_NEWS_STATS3
-+ _AM_NEWS_STATS4
-+ _AM_NEWS_STATS5
-+ _AM_NEWS_STATS6
-+ _AM_NEWS_STATS7
-+ _AM_NEWS_STATS8
-+ _AM_NEWS_STATS9
-+ _AM_NEWS_STATS10
-+ _AM_NEWS_STATS11
-+ _AM_NEWS_HELP
-+ _AM_NEWS_MODULEADMIN
-+ _AM_NEWS_GENERALSET
-+ _AM_NEWS_GOTOMOD
-+ _AM_NEWS_NOTHING
-+ _AM_NEWS_NOTHING_PRUNE
-+ _AM_NEWS_TOPIC_COLOR
-+ _AM_NEWS_COLOR
-+ _AM_NEWS_REMOVE_BR
-+ _AM_NEWS_PLEASE_UPGRADE
-
-blocks.php :
-* _MB_NEWS_ORDER
-+ _MB_NEWS_TEASER
-+ _MB_NEWS_SPOTLIGHT
-+ _MB_NEWS_FIRST
-+ _MB_NEWS_IMAGE
-+ _MB_SPOTLIGHT_TOPIC
-+ _MB_SPOTLIGHT_ALL_TOPICS
-+ _MB_NEWS_SPOTLIGHT_ARTICLE
-+ _MB_READMORE
-+ _MB_NEWS_RATE
-+ _MB_NEWS_SHOW_NEWS_COUNT
-+ _MB_NEWS_SPOTLIGHT_TITLE
-+ _MB_NEWS_VIEW_TYPE1
-+ _MB_NEWS_VIEW_TYPE2
-+ _MB_NEWS_TAB_COLOR1
-+ _MB_NEWS_TAB_COLOR2
-+ _MB_NEWS_TAB_COLOR3
-+ _MB_NEWS_TAB_COLOR4
-+ _MB_NEWS_TAB_COLOR5
-+ _MB_NEWS_WHAT_PUBLISH
-+ _MB_NEWS_RECENT_NEWS
-+ _MB_NEWS_RECENT_SPECIFIC
-+ _MB_NEWS_DEFAULT_COLORS
-
-main.php :
-- _AM_EXPARTS
-- _AM_EXPIRED
-- _AM_CHANGEEXPDATETIME
-- _AM_SETEXPDATETIME
-- _AM_NOWSETEXPTIME
-+ _NW_ATTACHEDLIB
-+ _NW_NEWSSAMEAUTHORLINK
-+ _NW_NEWS_NO_TOPICS
-+ _NW_PREVIOUS_ARTICLE
-+ _NW_NEXT_ARTICLE
-+ _NW_OTHER_ARTICLES
-+ _NW_RATETHISNEWS
-+ _NW_RATEIT
-+ _NW_TOTALRATE
-+ _NW_RATINGLTOH
-+ _NW_RATINGHTOL
-+ _NW_RATINGC
-+ _NW_RATINGSCALE
-+ _NW_BEOBJECTIVE
-+ _NW_DONOTVOTE
-+ _NW_RATING
-+ _NW_VOTE
-+ _NW_NORATING
-+ _NW_USERAVG
-+ _NW_DLRATINGS
-+ _NW_ONEVOTE
-+ _NW_NUMVOTES
-+ _NW_CANTVOTEOWN
-+ _NW_VOTEDELETED
-+ _NW_VOTEONCE
-+ _NW_VOTEAPPRE
-+ _NW_THANKYOU
-+ _NW_RSSFEED
-+ _NW_AUTHOR
-+ _NW_META_DESCRIPTION
-+ _NW_META_KEYWORDS
-+ _NW_MAKEPDF
-+ _MD_POSTEDON
-+ _NW_AUTHOR_ID
-+ _NW_POST_SORRY
-
-modinfo.php :
-* _MI_NEWS_BNAME8
-* _MI_NEWS_GROUPPERMS
-+ _MI_NEWS_PRUNENEWS
-- _MI_ANONPOST
-+ _MI_NEWS_EXPORT
-- _MI_ANONPOST
-* _MI_STORYCOUNTADMIN
-+ _MI_NEWSBYTHISAUTHOR
-+ _MI_NEWSBYTHISAUTHORDSC
-+ _MI_NEWS_PREVNEX_LINK
-+ _MI_NEWS_PREVNEX_LINK_DESC
-+ _MI_NEWS_SUMMARY_SHOW
-+ _MI_NEWS_SUMMARY_SHOW_DESC
-+ _MI_NEWS_AUTHOR_EDIT
-+ _MI_NEWS_AUTHOR_EDIT_DESC
-+ _MI_NEWS_RATE_NEWS
-+ _MI_NEWS_TOPICS_RSS
-+ _MI_NEWS_TOPICS_RSS_DESC
-+ _MI_NEWS_DATEFORMAT
-+ _MI_NEWS_DATEFORMAT_DESC
-+ _MI_NEWS_META_DATA
-+ _MI_NEWS_META_DATA_DESC
-+ _MI_NEWS_BNAME8
-+ _MI_NEWS_NEWSLETTER
-+ _MI_NEWS_STATS
-+ _MI_NEWS_FORM_OPTIONS
-+ _MI_NEWS_FORM_COMPACT
-+ _MI_NEWS_FORM_DHTML
-+ _MI_NEWS_FORM_SPAW
-+ _MI_NEWS_FORM_HTMLAREA
-+ _MI_NEWS_FORM_FCK
-+ _MI_NEWS_FORM_KOIVI
-+ _MI_NEWS_FORM_OPTIONS_DESC
-+ _MI_NEWS_KEYWORDS_HIGH
-+ _MI_NEWS_KEYWORDS_HIGH_DESC
-+ _MI_NEWS_HIGH_COLOR
-+ _MI_NEWS_HIGH_COLOR_DES
-+ _MI_NEWS_INFOTIPS
-+ _MI_NEWS_INFOTIPS_DES
-+ _MI_NEWS_SITE_NAVBAR
-+ _MI_NEWS_SITE_NAVBAR_DESC
-+ _MI_NEWS_TABS_SKIN
-+ _MI_NEWS_TABS_SKIN_DESC
-+ _MI_NEWS_SKIN_1
-+ _MI_NEWS_SKIN_2
-+ _MI_NEWS_SKIN_3
-+ _MI_NEWS_SKIN_4
-+ _MI_NEWS_SKIN_5
-+ _MI_NEWS_SKIN_6
-+ _MI_NEWS_SKIN_7
-+ _MI_NEWS_SKIN_8

Added: XoopsModules/news/trunk/news/docs/lang_diff.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/lang_diff.txt	                        (rev 0)
+++ XoopsModules/news/trunk/news/docs/lang_diff.txt	2012-07-10 07:51:44 UTC (rev 9837)
@@ -0,0 +1,354 @@
+Legend :
++ Added
+- Removed
+* Modified
+
+*******
+v1.67
+*******
+New file :
+help.php
+
+modinfo.php
++ _MI_NEWS_HELP
++ _MI_NEWS_ABOUT
++ _MI_NEWS_HOME
++ _MI_NEWS_UPGRADE
++ _MI_NEWS_DESCRIPTION
++ _MI_NEWS_SHARE_ME
++ _MI_NEWS_SHARE_ME_DSC
++ _MI_NEWS_SHOWICONS
++ _MI_NEWS_SHOWICONS_DSC
++ _MI_NEWS_FACEBOOKCOMMENTS
++ _MI_NEWS_FACEBOOKCOMMENTS_DSC
+
+main.php
++ _NW_BOOKMARK_TO_FACEBOOK
++ _NW_BOOKMARK_TO_TWITTER
++ _NW_BOOKMARK_TO_SCRIPSTYLE
++ _NW_BOOKMARK_TO_STUMBLE
++ _NW_BOOKMARK_TO_TECHNORATI
++ _NW_BOOKMARK_TO_MIXX
++ _NW_BOOKMARK_TO_MYSPACE
++ _NW_BOOKMARK_TO_DESIGNFLOAT
++ _NW_BOOKMARK_TO_BALATARIN
++ _NW_BOOKMARK_TO_GOOGLEPLUS
++ _NW_BOOKMARK_TO_GOOGLEREADER
++ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
++ _NW_DELETE
++ _NW_EDIT
+
+admin.php
++ _AM_NEWS_ABOUT_RELEASEDATE
++ _AM_NEWS_ABOUT_UPDATEDATE
++ _AM_NEWS_ABOUT_AUTHOR
++ _AM_NEWS_ABOUT_CREDITS
++ _AM_NEWS_ABOUT_LICENSE
++ _AM_NEWS_ABOUT_MODULE_STATUS
++ _AM_NEWS_ABOUT_WEBSITE
++ _AM_NEWS_ABOUT_AUTHOR_NAME
++ _AM_NEWS_ABOUT_CHANGELOG
++ _AM_NEWS_ABOUT_MODULE_INFO
++ _AM_NEWS_ABOUT_AUTHOR_INFO
++ _AM_NEWS_ABOUT_DESCRIPTION
++ _AM_NEWS_CONFIG_CHECK
++ _AM_NEWS_CONFIG_PHP
++ _AM_NEWS_CONFIG_XOOPS 
+
+*******
+v1.63
+*******
+modinfo.php
++ _MI_NEWS_TAGS
++ _MI_NEWS_TAGS_DSC
++ _MI_NEWS_BNAME10
++ _MI_NEWS_BNAME11
+
+
+*******
+v1.56
+*******
+main.php
++ _NW_NOTYETSTORY
+
+*******
+v1.54
+*******
+modinfo.php
++ _MI_NEWS_CATEGORY_NOTIFY
++ _MI_NEWS_CATEGORY_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ
+
+
+*******
+v1.51
+*******
+main.php
+
++ _NW_BOOKMARK_TO_BLINKLIST
++ _NW_BOOKMARK_TO_DELICIOUS
++ _NW_BOOKMARK_TO_DIGG
++ _NW_BOOKMARK_TO_FARK
++ _NW_BOOKMARK_TO_FURL
++ _NW_BOOKMARK_TO_NEWSVINE
++ _NW_BOOKMARK_TO_REDDIT
++ _NW_BOOKMARK_TO_SIMPY
++ _NW_BOOKMARK_TO_SPURL
++ _NW_BOOKMARK_TO_YAHOO
+
+
+*******
+v1.50
+*******
+admin.php
+* _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_NEWSLETTER_HEADER
++ _AM_NEWS_NEWSLETTER_FOOTER
++ _AM_NEWS_NEWSLETTER_HTML_TAGS
++ _AM_NEWS_VERIFY_TABLES
++ _AM_NEWS_METAGEN
++ _AM_NEWS_METAGEN_DESC
++ _AM_NEWS_BLACKLIST
++ _AM_NEWS_BLACKLIST_DESC
++ _AM_NEWS_BLACKLIST_ADD
++ _AM_NEWS_BLACKLIST_ADD_DSC
++ _AM_NEWS_META_KEYWORDS_CNT
++ _AM_NEWS_META_KEYWORDS_ORDER
++ _AM_NEWS_META_KEYWORDS_INTEXT
++ _AM_NEWS_META_KEYWORDS_FREQ1
++ _AM_NEWS_META_KEYWORDS_FREQ2
+
+blocks.php
++ _MB_NEWS_CAL_YEAR
++ _MB_NEWS_CAL_MONTH
++ _MB_NEWS_STARTING_DATE
++ _MB_NEWS_ENDING_DATE
++ _MB_NEWS_UNTIL_TODAY
++ _MB_NEWS_RECENT_FIRST
++ _MB_NEWS_OLDER_FIRST
+
+main.php
++ _NW_LINKS
++ _NW_PAGE
++ _NW_BOOKMARK_ME
++ _AM_NEWS_TOTAL
++ _AM_NEWS_WHOS_WHO
++ _NW_NEWS_LIST_OF_AUTHORS
++ _AM_NEWS_TOPICS_DIRECTORY
++ _NW_PAGE_AUTO_SUMMARY
+
+modinfo.php
++ _MI_NEWS_BNAME9
++ _MI_NEWS_FORM_TINYEDITOR
++ _MI_NEWS_FOOTNOTES
++ _MI_NEWS_DUBLINCORE
++ _MI_NEWS_DUBLINCORE_DSC
++ _MI_NEWS_BOOKMARK_ME
++ _MI_NEWS_BOOKMARK_ME_DSC
++ _MI_NEWS_FF_MICROFORMAT
++ _MI_NEWS_FF_MICROFORMAT_DSC
++ _MI_NEWS_WHOS_WHO
++ _MI_NEWS_METAGEN
++ _MI_NEWS_TOPICS_DIRECTORY
++ _MI_NEWS_ADVERTISEMENT
++ _MI_NEWS_ADV_DESCR
++ _MI_NEWS_MIME_TYPES
++ _MI_NEWS_ENHANCED_PAGENAV
++ _MI_NEWS_ENHANCED_PAGENAV_DSC
+
+
+*******
+v1.44
+*******
+New file :
+newsletter.php
+
+admin.php :
+* _AM_MAX40CHAR
+* _AM_GROUPPERM
+* _AM_SELFILE
+* _AM_UPDATEMODULE (name changed)
++ _AM_ADD_TOPIC
++ _AM_ADD_TOPIC_ERROR
++ _AM_ADD_TOPIC_ERROR1
++ _AM_SUB_MENU
++ _AM_SUB_MENU_YESNO
++ _AM_HITS
++ _AM_CREATED
++ _AM_TOPIC_DESCR
++ _AM_USERS_LIST
++ _AM_PUBLISH_FRONTPAGE
++ _AM_NEWS_UPGRADEFAILED1
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED3
++ _AM_NEWS_UPGRADEFAILED4
++ _AM_NEWS_UPGRADEFAILED0
++ _AM_NEWS_UPGR_ACCESS_ERROR
++ _AM_NEWS_PRUNE_BEFORE
++ _AM_NEWS_PRUNE_EXPIREDONLY
++ _AM_NEWS_PRUNE_CONFIRM
++ _AM_NEWS_PRUNE_TOPICS
++ _AM_NEWS_PRUNENEWS
++ _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_EXPORT_NOTHING
++ _AM_NEWS_PRUNE_DELETED
++ _AM_NEWS_PERM_WARNING
++ _AM_NEWS_EXPORT_BETWEEN
++ _AM_NEWS_EXPORT_AND
++ _AM_NEWS_EXPORT_PRUNE_DSC
++ _AM_NEWS_EXPORT_INCTOPICS
++ _AM_NEWS_EXPORT_ERROR
++ _AM_NEWS_EXPORT_READY
++ _AM_NEWS_RSS_URL
++ _AM_NEWS_NEWSLETTER
++ _AM_NEWS_NEWSLETTER_BETWEEN
++ _AM_NEWS_NEWSLETTER_READY
++ _AM_NEWS_DELETED_OK
++ _AM_NEWS_DELETED_PB
++ _AM_NEWS_STATS0
++ _AM_NEWS_STATS
++ _AM_NEWS_STATS1
++ _AM_NEWS_STATS2
++ _AM_NEWS_STATS3
++ _AM_NEWS_STATS4
++ _AM_NEWS_STATS5
++ _AM_NEWS_STATS6
++ _AM_NEWS_STATS7
++ _AM_NEWS_STATS8
++ _AM_NEWS_STATS9
++ _AM_NEWS_STATS10
++ _AM_NEWS_STATS11
++ _AM_NEWS_HELP
++ _AM_NEWS_MODULEADMIN
++ _AM_NEWS_GENERALSET
++ _AM_NEWS_GOTOMOD
++ _AM_NEWS_NOTHING
++ _AM_NEWS_NOTHING_PRUNE
++ _AM_NEWS_TOPIC_COLOR
++ _AM_NEWS_COLOR
++ _AM_NEWS_REMOVE_BR
++ _AM_NEWS_PLEASE_UPGRADE
+
+blocks.php :
+* _MB_NEWS_ORDER
++ _MB_NEWS_TEASER
++ _MB_NEWS_SPOTLIGHT
++ _MB_NEWS_FIRST
++ _MB_NEWS_IMAGE
++ _MB_SPOTLIGHT_TOPIC
++ _MB_SPOTLIGHT_ALL_TOPICS
++ _MB_NEWS_SPOTLIGHT_ARTICLE
++ _MB_READMORE
++ _MB_NEWS_RATE
++ _MB_NEWS_SHOW_NEWS_COUNT
++ _MB_NEWS_SPOTLIGHT_TITLE
++ _MB_NEWS_VIEW_TYPE1
++ _MB_NEWS_VIEW_TYPE2
++ _MB_NEWS_TAB_COLOR1
++ _MB_NEWS_TAB_COLOR2
++ _MB_NEWS_TAB_COLOR3
++ _MB_NEWS_TAB_COLOR4
++ _MB_NEWS_TAB_COLOR5
++ _MB_NEWS_WHAT_PUBLISH
++ _MB_NEWS_RECENT_NEWS
++ _MB_NEWS_RECENT_SPECIFIC
++ _MB_NEWS_DEFAULT_COLORS
+
+main.php :
+- _AM_EXPARTS
+- _AM_EXPIRED
+- _AM_CHANGEEXPDATETIME
+- _AM_SETEXPDATETIME
+- _AM_NOWSETEXPTIME
++ _NW_ATTACHEDLIB
++ _NW_NEWSSAMEAUTHORLINK
++ _NW_NEWS_NO_TOPICS
++ _NW_PREVIOUS_ARTICLE
++ _NW_NEXT_ARTICLE
++ _NW_OTHER_ARTICLES
++ _NW_RATETHISNEWS
++ _NW_RATEIT
++ _NW_TOTALRATE
++ _NW_RATINGLTOH
++ _NW_RATINGHTOL
++ _NW_RATINGC
++ _NW_RATINGSCALE
++ _NW_BEOBJECTIVE
++ _NW_DONOTVOTE
++ _NW_RATING
++ _NW_VOTE
++ _NW_NORATING
++ _NW_USERAVG
++ _NW_DLRATINGS
++ _NW_ONEVOTE
++ _NW_NUMVOTES
++ _NW_CANTVOTEOWN
++ _NW_VOTEDELETED
++ _NW_VOTEONCE
++ _NW_VOTEAPPRE
++ _NW_THANKYOU
++ _NW_RSSFEED
++ _NW_AUTHOR
++ _NW_META_DESCRIPTION
++ _NW_META_KEYWORDS
++ _NW_MAKEPDF
++ _MD_POSTEDON
++ _NW_AUTHOR_ID
++ _NW_POST_SORRY
+
+modinfo.php :
+* _MI_NEWS_BNAME8
+* _MI_NEWS_GROUPPERMS
++ _MI_NEWS_PRUNENEWS
+- _MI_ANONPOST
++ _MI_NEWS_EXPORT
+- _MI_ANONPOST
+* _MI_STORYCOUNTADMIN
++ _MI_NEWSBYTHISAUTHOR
++ _MI_NEWSBYTHISAUTHORDSC
++ _MI_NEWS_PREVNEX_LINK
++ _MI_NEWS_PREVNEX_LINK_DESC
++ _MI_NEWS_SUMMARY_SHOW
++ _MI_NEWS_SUMMARY_SHOW_DESC
++ _MI_NEWS_AUTHOR_EDIT
++ _MI_NEWS_AUTHOR_EDIT_DESC
++ _MI_NEWS_RATE_NEWS
++ _MI_NEWS_TOPICS_RSS
++ _MI_NEWS_TOPICS_RSS_DESC
++ _MI_NEWS_DATEFORMAT
++ _MI_NEWS_DATEFORMAT_DESC
++ _MI_NEWS_META_DATA
++ _MI_NEWS_META_DATA_DESC
++ _MI_NEWS_BNAME8
++ _MI_NEWS_NEWSLETTER
++ _MI_NEWS_STATS
++ _MI_NEWS_FORM_OPTIONS
++ _MI_NEWS_FORM_COMPACT
++ _MI_NEWS_FORM_DHTML
++ _MI_NEWS_FORM_SPAW
++ _MI_NEWS_FORM_HTMLAREA
++ _MI_NEWS_FORM_FCK
++ _MI_NEWS_FORM_KOIVI
++ _MI_NEWS_FORM_OPTIONS_DESC
++ _MI_NEWS_KEYWORDS_HIGH
++ _MI_NEWS_KEYWORDS_HIGH_DESC
++ _MI_NEWS_HIGH_COLOR
++ _MI_NEWS_HIGH_COLOR_DES
++ _MI_NEWS_INFOTIPS
++ _MI_NEWS_INFOTIPS_DES
++ _MI_NEWS_SITE_NAVBAR
++ _MI_NEWS_SITE_NAVBAR_DESC
++ _MI_NEWS_TABS_SKIN
++ _MI_NEWS_TABS_SKIN_DESC
++ _MI_NEWS_SKIN_1
++ _MI_NEWS_SKIN_2
++ _MI_NEWS_SKIN_3
++ _MI_NEWS_SKIN_4
++ _MI_NEWS_SKIN_5
++ _MI_NEWS_SKIN_6
++ _MI_NEWS_SKIN_7
++ _MI_NEWS_SKIN_8

Modified: XoopsModules/news/trunk/news/language/english/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/english/main.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/english/main.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -53,7 +53,7 @@
 define('_NW_ATTACHEDFILES',"Attached Files:");
 define('_NW_ATTACHEDLIB',"This article have some attached files");
 define('_NW_NEWSSAMEAUTHORLINK',"News by the same author");
-define('_NW_NEWS_NO_TOPICS',"Sorry but actually there's no topics, please create one before to submit a news");
+define("_NW_NEWS_NO_TOPICS","Sorry but there are no topics yet, please create one first");
 define('_NW_PREVIOUS_ARTICLE',"Previous article");
 define('_NW_NEXT_ARTICLE',"Next article");
 define('_NW_OTHER_ARTICLES',"Other articles");
@@ -133,8 +133,4 @@
 define('_NW_DELETE', "Delete");
 define('_NW_EDIT', "Edit");
 define('_NW_SUBTITLE', "Subtitle: ");
-define('_NW_SELECT_IMAGE_DESC', "Description of selected image: ");
-
-
-
-?>
\ No newline at end of file
+define('_NW_SELECT_IMAGE_DESC', "Description of selected image: ");
\ No newline at end of file

Modified: XoopsModules/news/trunk/news/language/english/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/english/modinfo.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/english/modinfo.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
 define('_MI_NEWS_BNAME9','Archives');
 define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
 define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
 define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
 define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
 define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");

Modified: XoopsModules/news/trunk/news/language/englishUTF8/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/englishUTF8/main.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/englishUTF8/main.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -53,7 +53,7 @@
 define("_NW_ATTACHEDFILES","Attached Files:");
 define("_NW_ATTACHEDLIB","This article have some attached files");
 define("_NW_NEWSSAMEAUTHORLINK","News by the same author");
-define("_NW_NEWS_NO_TOPICS","Sorry but actually there's no topics, please create one before to submit a news");
+define("_NW_NEWS_NO_TOPICS","Sorry but there are no topics yet, please create one first");
 define("_NW_PREVIOUS_ARTICLE","Previous article");
 define("_NW_NEXT_ARTICLE","Next article");
 define("_NW_OTHER_ARTICLES","Other articles");

Modified: XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
 define('_MI_NEWS_BNAME9','Archives');
 define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
 define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
 define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
 define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
 define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");

Modified: XoopsModules/news/trunk/news/language/italian/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/italian/modinfo.php	2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/italian/modinfo.php	2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
 define("_MI_NEWS_BNAME9", "Archivi");
 define("_MI_NEWS_FORM_TINYEDITOR", "TinyEditor");
 define("_MI_NEWS_FOOTNOTES", "Mostra i collegamenti nelle versioni stampabili dei tuoi articoli?");
-define("_MI_NEWS_DUBLINCORE", "Ativate Dublin Core Metadata?");
+define("_MI_NEWS_DUBLINCORE", "Activate Dublin Core Metadata?");
 define("_MI_NEWS_DUBLINCORE_DSC", "Per ulteriori informazioni, <a href='http://dublincore.org/'>visita questo link</a>");
 define("_MI_NEWS_BOOKMARK_ME", "Visualizzare un &#39;Bookmark questo articolo su questi siti&#39; blocco?");
 define("_MI_NEWS_BOOKMARK_ME_DSC", "Questo blocco sar&#224; visibile nella pagina dell&#39;articolo,");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9836] XoopsLanguages/french/modules/tdmdownloads/ TDMDownloads 1.62/language/french

[<ce...@us...>]

Revision: 9836
          http://xoops.svn.sourceforge.net/xoops/?rev=9836&view=rev
Author:   cesag
Date:     2012-07-10 07:31:08 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
TDMDownloads 1.62 final french translation update.

Modified Paths:
--------------
    XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php
    XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php
    XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/modinfo.php

Modified: XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php	2012-07-10 04:25:10 UTC (rev 9835)
+++ XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/admin.php	2012-07-10 07:31:08 UTC (rev 9836)
@@ -126,7 +126,7 @@
 define('_AM_TDMDOWNLOADS_FORMPAYPAL',"Adresse de PayPal pour les dons");
 define('_AM_TDMDOWNLOADS_FORMPATH',"Les fichiers existent dans : %s");
 define('_AM_TDMDOWNLOADS_FORMPERMDOWNLOAD',"Sélectionnez les groupes qui peuvent télécharger ce fichier");
-define('_AM_TDMDOWNLOADS_FORMPLATFORM',"Plate-forme");
+define('_AM_TDMDOWNLOADS_FORMPLATFORM',"Version de XOOPS");
 define('_AM_TDMDOWNLOADS_FORMPOSTER',"Posté par ");
 define('_AM_TDMDOWNLOADS_FORMRATING',"Note");
 define('_AM_TDMDOWNLOADS_FORMSIZE',"Taille des fichiers(en bytes)");
@@ -148,7 +148,7 @@
 //Message d'erreur
 define('_AM_TDMDOWNLOADS_ERREUR_CAT',"Vous ne pouvez pas utiliser cette catégorie (en boucle sur elle-même)");
 define('_AM_TDMDOWNLOADS_ERREUR_NOBMODDOWNLOADS',"Il n'y a aucune modification des téléchargements");
-define('_AM_TDMDOWNLOADS_ERREUR_NOBROKENDOWNLOADS',"Il n'y a aucun liens de téléchargements brisés");
+define('_AM_TDMDOWNLOADS_ERREUR_NOBROKENDOWNLOADS',"Il n'y a aucun lien de téléchargement brisé");
 define('_AM_TDMDOWNLOADS_ERREUR_NOCAT',"Vous devez choisir une catégorie !");
 define('_AM_TDMDOWNLOADS_ERREUR_NODESCRIPTION',"Vous devez écrire une description");
 define('_AM_TDMDOWNLOADS_ERREUR_NODOWNLOADS',"Il n'y a aucun fichier à télécharger");

Modified: XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php
===================================================================
--- XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php	2012-07-10 04:25:10 UTC (rev 9835)
+++ XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/main.php	2012-07-10 07:31:08 UTC (rev 9836)
@@ -52,15 +52,15 @@
 define("_MD_TDMDOWNLOADS_CAT_VOTE","Votes");
 
 // singlefile.php:
-define("_MD_TDMDOWNLOADS_SINGLEFILE_AUTHOR","Soumis par : ");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_AUTHOR","Soumis par");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_COMMENTS","(%s) Commentaires");
-define("_MD_TDMDOWNLOADS_SINGLEFILE_DATEPROP","Date de soumission : ");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_DATEPROP","Date de soumission");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_ICI","Ici");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_INTFILEFOUND","Voici un fichier important %s");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_LIMITGLOBAL","Vous avez téléchargé les fichiers de %s de ce site et la limite est de s % en 24 h ");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_LIMITLID","Vous avez téléchargé cette fois de s fichier % et la limite est de s % en 24 h");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_MODIFY","Modifier");
-define("_MD_TDMDOWNLOADS_SINGLEFILE_NBTELECH","Téléchargements : %s");
+define("_MD_TDMDOWNLOADS_SINGLEFILE_NBTELECH","Téléchargé %s fois");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NONEXISTENT","Ce téléchargement n'existe pas dans notre base de données");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_NOPERMDOWNLOAD","Vous n'avez pas le droit de télécharger ce fichier");
 define("_MD_TDMDOWNLOADS_SINGLEFILE_RATING","Cote");

Modified: XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/modinfo.php	2012-07-10 04:25:10 UTC (rev 9835)
+++ XoopsLanguages/french/modules/tdmdownloads/TDMDownloads 1.62/language/french/modinfo.php	2012-07-10 07:31:08 UTC (rev 9836)
@@ -167,8 +167,9 @@
 define("_MI_TDMDOWNLOADS_FILE_APPROVE_NOTIFYCAP", "M'avertir quand ce fichier est approuvé.");
 define("_MI_TDMDOWNLOADS_FILE_APPROVE_NOTIFYDSC", "Recevoir une notification lorsque ce fichier est approuvé.");
 define("_MI_TDMDOWNLOADS_FILE_APPROVE_NOTIFYSBJ", "[{X_SITENAME}] {X_MODULE} notification automatique : fichier approuvé");
-// Traduction par Cesag pour frxoops.org le 1er Juin 2012
 
 //1.62
 define("_MI_TDMDOWNLOADS_SHOW_LATEST_FILES", "Afficher les fichiers les plus récents");
-define("_MI_TDMDOWNLOADS_SHOW_LATEST_FILES_DSC", "Cela montrera les fichiers les plus récents, côté utilisateur");
\ No newline at end of file
+define("_MI_TDMDOWNLOADS_SHOW_LATEST_FILES_DSC", "Cela montrera les fichiers les plus récents, côté utilisateur");
+// Traduction par Cesag pour frxoops.org le 10 Juillet 2012
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9835] XoopsModules/backup/trunk/backup

[<be...@us...>]

Revision: 9835
          http://xoops.svn.sourceforge.net/xoops/?rev=9835&view=rev
Author:   beckmi
Date:     2012-07-10 04:25:10 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Adding Help, removing languages and other files

Modified Paths:
--------------
    XoopsModules/backup/trunk/backup/docs/readme.txt

Added Paths:
-----------
    XoopsModules/backup/trunk/backup/docs/changelog.txt
    XoopsModules/backup/trunk/backup/docs/credits.txt
    XoopsModules/backup/trunk/backup/docs/lang_diff.txt
    XoopsModules/backup/trunk/backup/docs/licence.txt
    XoopsModules/backup/trunk/backup/language/english/help/
    XoopsModules/backup/trunk/backup/language/english/help/help.html
    XoopsModules/backup/trunk/backup/language/english/help/index.html

Removed Paths:
-------------
    XoopsModules/backup/trunk/backup/admin/cache.php
    XoopsModules/backup/trunk/backup/admin/restore.php
    XoopsModules/backup/trunk/backup/language/english/changelog.txt
    XoopsModules/backup/trunk/backup/language/french/
    XoopsModules/backup/trunk/backup/language/schinese/
    XoopsModules/backup/trunk/backup/readme.txt

Deleted: XoopsModules/backup/trunk/backup/admin/cache.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/cache.php	2012-07-10 04:00:35 UTC (rev 9834)
+++ XoopsModules/backup/trunk/backup/admin/cache.php	2012-07-10 04:25:10 UTC (rev 9835)
@@ -1,7 +0,0 @@
-<?php
-include ('admin_header.php');
-require_once(XOOPS_ROOT_PATH.'/modules/backup/include/functions.php');
-$res = backup_export();
-redirect_header('index.php', 2, empty($res)?"configs backup error":"configs backup over!" );
-exit();
-?>
\ No newline at end of file

Deleted: XoopsModules/backup/trunk/backup/admin/restore.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/restore.php	2012-07-10 04:00:35 UTC (rev 9834)
+++ XoopsModules/backup/trunk/backup/admin/restore.php	2012-07-10 04:25:10 UTC (rev 9835)
@@ -1,287 +0,0 @@
-<?php
-
-// BigDump ver. 0.21b from 2005-02-08
-// Staggered import of an large MySQL Dump (like phpMyAdmin 2.x Dump)
-// Even through the webservers with hard runtime limit and those in safe mode
-// Works fine with Internet Explorer 6.0 SP1, Mozilla 1.x and even Netscape 4.8
-
-// Author:       Alexey Ozerov (alexey at ozerov dot de) 
-// Copyright:    GPL (C) 2003-2005
-// More Infos:   http://www.ozerov.de/bigdump
-
-
-//  ------------------------------------------------------------------------ //
-// Author: D.J.(phppp) ph...@ho...                                    //
-// URL: http://xoops.org.cn                                                  //
-// ------------------------------------------------------------------------- //
-
-ini_set("auto_detect_line_endings", true);
-
-$linespersession = 5000;   // Lines to be executed per one import session
-$delaypersession = 2000;      // You can specify a sleep time in milliseconds after each session
-                           // Works only if JavaScript is activated. Use to reduce server overrun
-
-// Allowed comment delimiters: lines starting with these strings will be dropped by BigDump
-
-$comment[0]="#";           // Standard comment lines are dropped by default
-$comment[1]="-- ";
-// $comment[2]="---";      // Uncomment this line if using proprietary dump created by outdated mysqldump
-// $comment[3]="";         // Or add your own string to leave out other proprietary things
-	
-define ("MAX_LINE_LENGTH",65536);
-define ("MAX_QUERY_LINES",300);
-include('admin_header.php');
-require_once(XOOPS_ROOT_PATH . "/include/cp_functions.php");
-require_once(XOOPS_ROOT_PATH . "/modules/backup/include/functions.php");
-require_once(XOOPS_ROOT_PATH.'/class/xoopslists.php'); // Merci, christian 
-
-	$xoopsModuleConfig = & backup_import();
-
-xoops_cp_header();
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation('restore.php');
-$dirname = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig["dbfiles_path"];
-$db_name=(empty($_POST['db_name']))?XOOPS_DB_NAME:$_POST['db_name'];
-
-if(empty($_REQUEST["fn"])){
-	$db_files =& XoopsLists::getFileListAsArray($dirname);
-	echo "<form method=\"post\">\n";
-	echo _DB_INSERT.": <input type=\"text\" name=\"db_name\" value=\"".XOOPS_DB_NAME."\">\n";
-	echo _DB_SELECTFILE.": <select name=\"fn\" id=\"fn\">\n";
-	foreach($db_files as $_file => $_filename){
-		if (preg_match("/\.sql$/i",$_file) || (preg_match("/\.gz$/i",$_file) && function_exists("gzopen"))){
-			echo "<option value=\"".$_file."\">".$_file."</option>\n";
-		} 
-	}
-	echo "</select>\n";
-	echo "<input type=\"submit\" value=\""._GO."\">\n";
-	echo "</form>\n";
-}else{
-	
-	$error=false;
-	// Recognize GZip filename
-	
-	  if (preg_match("/\.gz$/i",$_REQUEST["fn"])) 
-	    $gzipmode=true;
-	  else
-	    $gzipmode=false;
-	
-	  if ((!$gzipmode && !$file=fopen($dirname."/".$_REQUEST["fn"],"rt")) || ($gzipmode && !$file=gzopen($dirname."/".$_REQUEST["fn"],"rt")))
-	  { 
-		  echo ("<p class=\"error\">Can't open ".$_REQUEST["fn"]." for import</p>\n");
-	    $error=true;
-	  }
-	
-	// Get the file size (can't do it fast on gzipped files, no idea how)
-	
-	  else if ((!$gzipmode && fseek($file, 0, SEEK_END)==0) || ($gzipmode && gzseek($file, 0, SEEK_SET)==0))
-	  { if (!$gzipmode) $filesize = ftell($file);
-	    else $filesize = gztell($file); // Always zero, ignore
-	  }
-	  else
-	  { echo ("<p class=\"error\">I can't get the filesize of ".$_REQUEST["fn"]."</p>\n");
-	    $error=true;
-	  }
-	
-	
-	$dbconnection=$xoopsDB->conn;
-	if (!mysql_select_db($db_name)) {
-	redirect_header('index.php', 3, 'Database not exist');
-	exit;
-	}
-	@mysql_select_db($db_name, $dbconnection); 
-
-	// ****************************************************
-	// START IMPORT SESSION HERE
-	// ****************************************************
-	
-	$_REQUEST["start"] = isset($_REQUEST["start"])?intval($_REQUEST["start"]):1; 
-	$_REQUEST["foffset"] = isset($_REQUEST["foffset"])?intval($_REQUEST["foffset"]):0; 
-	$_REQUEST["totalqueries"] = isset($_REQUEST["totalqueries"])?intval($_REQUEST["totalqueries"]):0; 
-	
-	if (!$error)
-	{
-	  echo ("<p>Processing file: ".$_REQUEST["fn"]."</p>\n");
-	  echo ("<p>Starting at the line: ".$_REQUEST["start"]."</p>\n");
-	
-	// Check $_REQUEST["foffset"] upon $filesize (can't do it on gzipped files)
-	
-	  if (!$gzipmode && $_REQUEST["foffset"]>$filesize)
-	  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer behind the end of file</p>\n");
-	    $error=true;
-	  }
-	
-	// Set file pointer to $_REQUEST["foffset"]
-	
-	if(empty($xoopsModuleConfig["pos_line"])){
-	  if (!$error && ((!$gzipmode && fseek($file, $_REQUEST["foffset"])!=0) || ($gzipmode && gzseek($file, $_REQUEST["foffset"])!=0)))
-	  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: ".$_REQUEST["foffset"]."</p>\n");
-	    $error=true;
-	  }
-	    $linenumber=$_REQUEST["start"];
-	}else{	
-	  if (!$error && ((!$gzipmode && fseek($file, 0)!=0) || ($gzipmode && gzseek($file, 0)!=0)))
-	  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: ".$_REQUEST["foffset"]."</p>\n");
-	    $error=true;
-	  }
-	  $linenumber = 1;
-	}
-	
-	  
-	// Start processing queries from $file
-	
-	  if (!$error)
-	  { 
-		  $query="";
-	    $queries=0;
-	    $totalqueries=$_REQUEST["totalqueries"];
-	    //$linenumber=$_REQUEST["start"];
-	    $querylines=0;
-	    $inparents=false;
-	
-	      	//echo "<br />ln: ".$linenumber."; totalqueries: ".$_REQUEST["totalqueries"];
-	    while (($linenumber<$_REQUEST["start"]+$linespersession || $query!="") 
-	       && ((!$gzipmode && $dumpline=fgets($file, MAX_LINE_LENGTH)) || ($gzipmode && $dumpline=gzgets($file, MAX_LINE_LENGTH))))
-	    { 
-			if(!empty($xoopsModuleConfig["pos_line"]) && $linenumber<$_REQUEST["start"]){
-	      		$linenumber++;
-	      		continue;
-      		}
-	      	//echo "<br />ln: ".$linenumber."; start: ".$_REQUEST["start"];
-	      
-	// Handle DOS and Mac encoded linebreaks (I don't know if it will work on Win32 or Mac Servers)
-	
-	      $dumpline=preg_replace("/\r\n$/", "\n", $dumpline);
-	      $dumpline=preg_replace("/\r$/", "\n", $dumpline);
-	      
-	// DIAGNOSTIC
-	// echo ("<p>Line $linenumber: $dumpline</p>\n");
-	
-	// Skip comments and blank lines only if NOT in parents
-	
-	      if (!$inparents)
-	      { $skipline=false;
-	        reset($comment);
-	        foreach ($comment as $comment_value)
-	        { if (!$inparents && (trim($dumpline)=="" || strpos ($dumpline, $comment_value) === 0))
-	          { $skipline=true;
-	            break;
-	          }
-	        }
-	        if ($skipline)
-	        { $linenumber++;
-	          continue;
-	        }
-	      }
-	
-	// Remove double back-slashes from the dumpline prior to count the quotes ('\\' can only be within strings)
-	      
-	      $dumpline_deslashed = str_replace ("\\\\","",$dumpline);
-	
-	// Count ' and \' in the dumpline to avoid query break within a text field ending by ;
-	// Please don't use double quotes ('"')to surround strings, it wont work
-	
-	      $parents=substr_count ($dumpline_deslashed, "'")-substr_count ($dumpline_deslashed, "\\'");
-	      if ($parents % 2 != 0)
-	        $inparents=!$inparents;
-	
-	// Add the line to query
-	
-	      $query .= $dumpline;
-	
-	// Don't count the line if in parents (text fields may include unlimited linebreaks)
-	      
-	      if (!$inparents)
-	        $querylines++;
-	      
-	// Stop if query contains more lines as defined by MAX_QUERY_LINES
-	
-	      if ($querylines>MAX_QUERY_LINES)
-	      {
-	        echo ("<p class=\"error\">Stopped at the line $linenumber. </p>");
-	        echo ("<p>At this place the current query includes more than ".MAX_QUERY_LINES." dump lines. That can happen if your dump file was ");
-	        echo ("created by some tool which doesn't place a semicolon followed by a linebreak at the end of each query, or if your dump contains ");
-	        echo ("extended inserts. Please read the BigDump FAQs for more infos.</p>\n");
-	        $error=true;
-	        break;
-	      }
-	
-	// Execute query if end of query detected (; as last character) AND NOT in parents
-	
-	      if (preg_match("/;$/",trim($dumpline)) && !$inparents)
-	      { 
-		      if (!mysql_query(trim($query), $dbconnection))
-		      //if (false)
-	        { 
-		        echo ("<p>Error at the line $linenumber: ". trim($dumpline)."</p>\n");
-	          echo ("<p>Query: ".trim($query)."</p>\n");
-	          echo ("<p>MySQL: ".mysql_error()."</p>\n");
-	          $error=true;
-	          break;
-	        }else{
-	          //echo ("<p>line #".$linenumber.": ".trim($query)."<br />dumpline: ".$dumpline."</p>\n");
-	        }
-	        //echo "<br />query: ".$query;
-	        $totalqueries++;
-	        $queries++;
-	        $query="";
-	        $querylines=0;
-	      }
-	      $linenumber++;
-	    }
-	  }
-	
-	// Get the current file position
-	
-	  if (!$error)
-	  { if (!$gzipmode) 
-	      $foffset = ftell($file);
-	    else
-	      $foffset = gztell($file);
-	    if (!$foffset)
-	    { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
-	      $error=true;
-	    }
-	  }
-	
-	// Finish message and restart the script
-	
-	  if (!$error)
-	  { echo ("<p>Stopping at the line: ".($linenumber-1)."</p>\n");
-	    echo ("<p>Queries performed (this session/total): $queries/$totalqueries</p>\n");
-	    echo ("<p>Total bytes processed: $foffset (".round($foffset/1024)." KB)</p>\n");
-	    if ($linenumber<$_REQUEST["start"]+$linespersession)
-	    { 
-		    echo ("<p class=\"success\">Congratulations: End of file reached, assuming OK</p>\n");
-	      $over=true;
-	    }
-	    else
-	    { 
-		    if ($delaypersession!=0){
-	        	echo ("<p>Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
-	    	}
-	      echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".$_REQUEST["fn"]."&foffset=$foffset&totalqueries=$totalqueries&NA=".$_REQUEST["NA"]."\";',500+$delaypersession);</script>\n");
-	      echo ("<noscript>\n");
-	      echo ("<p><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".$_REQUEST["fn"]."&foffset=$foffset&totalqueries=$totalqueries\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
-	      echo ("</noscript>\n");
-	      echo ("<p>Press <a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a> to abort the import <b>OR WAIT!</b></p>\n");
-	    }
-	  }
-	  else 
-	    echo ("<p class=\"error\">Stopped on error</p>\n");
-	}
-	
-	if ($error){
-		echo ("<p><a href=\"".$_SERVER["PHP_SELF"]."\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
-	//}elseif(!empty($over)){
-		//echo ("<p><a href=\"".$_SERVER["PHP_SELF"]."\">Start another file</a></p>\n");
-		//echo ("<p><a href=\"".XOOPS_URL."/modules/backup/admin/index.php\">Back to index page</a></p>\n");
-		//unlink($dirname."/".$_REQUEST["fn"]);
-	}
-	
-	if ($file && !$gzipmode) fclose($file);
-	else if ($file && $gzipmode) gzclose($file);
-    
-}
-include 'admin_footer.php';
-?>

Added: XoopsModules/backup/trunk/backup/docs/changelog.txt
===================================================================
--- XoopsModules/backup/trunk/backup/docs/changelog.txt	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/docs/changelog.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1,10 @@
+Version 3.2 2012-04-02:  (Roby73)
+===================================
+- integrated bigdump script
+
+Version 3.1 2012-04-02:  (Roby73)
+===================================
+- Conversion to XOOPS 2.5.5 Admin GUI
+- other modifications
+
+

Added: XoopsModules/backup/trunk/backup/docs/credits.txt
===================================================================
--- XoopsModules/backup/trunk/backup/docs/credits.txt	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/docs/credits.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1,13 @@
+Credits
+===============
+
+Authors/Contributors:
+--------
+backup 2.0 -- web...@na... ( http://www.nagl.ch )
+restore (bigdump) -- Alexey Ozerov (alexey at ozerov dot de)
+backup 3.0 -- D.J. (phppp, http://xoops.org.cn)
+backup 3.3 -- Roby73
+
+Testing:
+-----------
+Cesag
\ No newline at end of file

Added: XoopsModules/backup/trunk/backup/docs/lang_diff.txt
===================================================================
--- XoopsModules/backup/trunk/backup/docs/lang_diff.txt	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/docs/lang_diff.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1,4 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
\ No newline at end of file

Added: XoopsModules/backup/trunk/backup/docs/licence.txt
===================================================================
--- XoopsModules/backup/trunk/backup/docs/licence.txt	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/docs/licence.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Modified: XoopsModules/backup/trunk/backup/docs/readme.txt
===================================================================
--- XoopsModules/backup/trunk/backup/docs/readme.txt	2012-07-10 04:00:35 UTC (rev 9834)
+++ XoopsModules/backup/trunk/backup/docs/readme.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -19,34 +19,4 @@
 5 restore XOOPS data from db files exported the module or by any db management script like phpmyadmin
 6 capable for large file import by multiple sessions
 7 restore can be done by non-webmaster, useful for XOOPS user related date restore.
-8 timeout issues have been efficiently solved
-
-
-Authors: 
-backup 2.0 -- web...@na... ( http://www.nagl.ch )
-restore (bigdump) -- Alexey Ozerov (alexey at ozerov dot de)
-backup & restore 3.0 -- D.J. (phppp, http://xoops.org.cn)
-
-
-XOOPS\xCA\xFD\xBEݿⱸ\xB7ݡ\xA2\xB5\xBC\xC8\xEB
-
-\xB0\xB2װ:
-=============
-
-\xBD\xA8\xC1\xA2Ŀ¼\xD3\xC3\xD3ڱ\xA3\xB4\xE6\xC9\xFA\xB3ɵı\xB8\xB7\xDD\xCEļ\xFE(\xBD\xA8\xD2\xE9 uploads/backup)
-\xC9\xE8\xD6\xC3Ŀ¼Ȩ\xCF\xDEΪ777
-\xB0\xB4ͨ\xB3\xA3\xB2\xBD\xD6谲װ\xB4\xCBģ\xBF\xE9
-\xC4\xE3\xBF\xC9\xD2\xD4ʹ\xD3\xC3CRON JOB\xC9\xE8\xD6\xC3ϵͳÿ\xB8\xF4һ\xB6\xA8ʱ\xBC\xE4\xB1\xC8\xC8\xE71\xCC\xEC\xD7Զ\xAF\xB1\xB8\xB7\xDD\xC4\xE3\xB5\xC4XOOPS\xCA\xFD\xBEݿ\xE2
-\xB1\xB8\xB7ݵ\xC4\xCEļ\xFE\xBF\xC9\xD2Ա\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xC9ϣ\xACҲ\xBF\xC9\xD2\xD4ͨ\xB9\xFD\xB8\xBD\xBC\xFE\xB5ķ\xBDʽ\xB7\xA2\xCB͵\xBD\xC4\xE3\xB5\xC4EMAIL
-
-
-\xB9\xA6\xC4\xDC\xCC\xD8\xD5\xF7:
-=============
-1 \xB1\xB8\xB7\xDDXOOPS\xCA\xFD\xBEݲ\xA2\xD2\xD4\xC8\xFD\xD6ַ\xBDʽ\xB1\xA3\xB4\xE6: \xB1\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xA1\xA2\xC1\xA2\xBC\xB4\xCF\xC2\xD4\xD8(\xB9\xDC\xC0\xEDԱר\xD3\xC3)\xA1\xA2email\xB7\xA2\xCB\xCD(ͨ\xB9\xFD\xB8\xBD\xBC\xFE\xBB\xF2\xCA\xC7\xC1\xB4\xBD\xD3)
-2 \xB4\xF3\xCA\xFD\xBEݱ\xED\xBF\xC9\xD2Ե\xA5\xB6\xC0\xC9\xFA\xB3\xC9\xCEļ\xFE
-3 \xB1\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xC9ϵ\xC4\xCEļ\xFE\xCA\xFD\xBEݿ\xC9\xD2\xD4\xC9趨
-4 \xB1\xB8\xB7ݿ\xC9\xD2\xD4\xD3ɹ\xDC\xC0\xEDԱ\xCAֶ\xAF\xCD\xEA\xB3ɻ\xF2\xCA\xC7\xD7Զ\xAF\xCD\xEA\xB3\xC9
-5 \xBF\xC9\xD2Ե\xBC\xC8뱾ģ\xBF鱸\xB7ݵ\xC4\xCA\xFD\xBEݻ\xF2\xCA\xC7\xC6\xE4\xCB\xFC\xC8\xCE\xD2\xE2\xB3\xCC\xD0\xF2\xC9\xFA\xB3ɵ\xC4\xCEļ\xFE\xB1\xC8\xC8\xE7phpmyadmin
-6 \xBF\xC9\xD2\xD4ͨ\xB9\xFD\xD7Զ\xAF\xB7ִ\xCEִ\xD0еķ\xBDʽ\xB5\xBC\xC8볬\xB4\xF3\xCA\xFD\xBE\xDD\xCEļ\xFE
-7 \xBF\xC9\xD2\xD4\xC1\xD9ʱ\xD3÷ǹ\xDC\xC0\xEDԱ\xC9\xED\xB7ݵ\xBC\xC8\xEB\xCA\xFD\xBEݣ\xAC\xB6Ե\xBC\xC8\xEB\xD3\xEB\xD3û\xA7\xD7\xCA\xC1\xCF\xCF\xE0\xB9ص\xC4\xCA\xFD\xBE\xDD\xCADZ\xD8\xD0\xEB\xB5\xC4
-7 \xB3\xACʱ\xCE\xCA\xCC\xE2\xD2Ѿ\xAD\xD3\xD0Ч\xBD\xE2\xBE\xF6
\ No newline at end of file
+8 timeout issues have been efficiently solved
\ No newline at end of file

Deleted: XoopsModules/backup/trunk/backup/language/english/changelog.txt
===================================================================
--- XoopsModules/backup/trunk/backup/language/english/changelog.txt	2012-07-10 04:00:35 UTC (rev 9834)
+++ XoopsModules/backup/trunk/backup/language/english/changelog.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -1,5 +0,0 @@
-BACKUP DATABASE
-
-Changelog 3.01
-
-

Added: XoopsModules/backup/trunk/backup/language/english/help/help.html
===================================================================
--- XoopsModules/backup/trunk/backup/language/english/help/help.html	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/language/english/help/help.html	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1,43 @@
+<div id="help-template" class="outer">
+    <h1 class="head">Help:
+        <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/backup/admin/index.php"
+           title="Back to the administration of Backup"> Backup
+            <img src="<{xoAdminIcons home.png}>"
+                 alt="Back to the Administration of Backup"/>
+        </a></h1>
+
+    <h4 class="odd">Description</h4>
+
+    <p class="even">A module to allow you to easily backup and/or restore your MySQL database.<br/> <br/>
+
+
+    Features:<br>
+    =============<br>
+        1 backup XOOPS data and store in three ways: on
+        the server, download immediately(admin only) or sent by email(URL or attachments)<br>
+        2 tables can be select to be exported separately. useful for large tables<br>3 file
+        number stored on local server can be configured<br>4 backup can be made by admin
+        or via cronjob<br>5 restore XOOPS data from db files exported the module or by any
+        db management script like phpmyadmin<br>6 capable for large file import by multiple
+        sessions<br>7 restore can be done by non-webmaster, useful for XOOPS user related
+        date restore.<br>8 timeout issues have been efficiently solved</p>
+
+    <h4 class="odd">Install/uninstall</h4> <br/>
+
+    create a folder (upload/backup is suggested) for storing backup files<br/> <br/>
+    chmod the folder to 777<br/> <br/>
+    Install the module as usual in xoops  (system admin - modules)<br/> <br/>
+    If you would create a cron job so that the database can be automatically backup, the URL shall be: YourXoopsUrl/modules/backup/admin/backup.php
+    <br/> <br/>
+
+     <h4 class="odd">Operations</h4> <br/>
+
+    Detailed instructions on configuring the access rights for user groups are available in the
+    <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a><br/> <br/>
+
+
+    <h4 class="odd">Tutorial</h4>
+
+    <p class="even">There is no tutorial available at this time.</p>
+
+</div>
\ No newline at end of file

Added: XoopsModules/backup/trunk/backup/language/english/help/index.html
===================================================================
--- XoopsModules/backup/trunk/backup/language/english/help/index.html	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/language/english/help/index.html	2012-07-10 04:25:10 UTC (rev 9835)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Deleted: XoopsModules/backup/trunk/backup/readme.txt
===================================================================
--- XoopsModules/backup/trunk/backup/readme.txt	2012-07-10 04:00:35 UTC (rev 9834)
+++ XoopsModules/backup/trunk/backup/readme.txt	2012-07-10 04:25:10 UTC (rev 9835)
@@ -1,52 +0,0 @@
-XOOPS Backup & Restore
-===================
-
-A module to allow you to easily backup and/or restore your mysql database
-
-installation:
-=============
-create a folder (upload/backup is suggested) for storing backup files
-chmod the folder to 777
-Install the module as usual in xoops  (system admin - modules)
-If you would create a cron job so that the database can be automatically backup, the URL shall be: YourXoopsUrl/modules/backup/admin/backup.php
-
-Features:
-=============
-1 backup XOOPS data and store in three ways: on the server, download immediately(admin only) or sent by email(URL or attachments)
-2 tables can be select to be exported separately. useful for large tables
-3 file number stored on local server can be configured
-4 backup can be made by admin or via cronjob
-5 restore XOOPS data from db files exported the module or by any db management script like phpmyadmin
-6 capable for large file import by multiple sessions
-7 restore can be done by non-webmaster, useful for XOOPS user related date restore.
-8 timeout issues have been efficiently solved
-
-
-Authors: 
-backup 2.0 -- web...@na... ( http://www.nagl.ch )
-restore (bigdump) -- Alexey Ozerov (alexey at ozerov dot de)
-backup & restore 3.0 -- D.J. (phppp, http://xoops.org.cn)
-
-
-XOOPS\xCA\xFD\xBEݿⱸ\xB7ݡ\xA2\xB5\xBC\xC8\xEB
-
-\xB0\xB2װ:
-=============
-
-\xBD\xA8\xC1\xA2Ŀ¼\xD3\xC3\xD3ڱ\xA3\xB4\xE6\xC9\xFA\xB3ɵı\xB8\xB7\xDD\xCEļ\xFE(\xBD\xA8\xD2\xE9 uploads/backup)
-\xC9\xE8\xD6\xC3Ŀ¼Ȩ\xCF\xDEΪ777
-\xB0\xB4ͨ\xB3\xA3\xB2\xBD\xD6谲װ\xB4\xCBģ\xBF\xE9
-\xC4\xE3\xBF\xC9\xD2\xD4ʹ\xD3\xC3CRON JOB\xC9\xE8\xD6\xC3ϵͳÿ\xB8\xF4һ\xB6\xA8ʱ\xBC\xE4\xB1\xC8\xC8\xE71\xCC\xEC\xD7Զ\xAF\xB1\xB8\xB7\xDD\xC4\xE3\xB5\xC4XOOPS\xCA\xFD\xBEݿ\xE2
-\xB1\xB8\xB7ݵ\xC4\xCEļ\xFE\xBF\xC9\xD2Ա\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xC9ϣ\xACҲ\xBF\xC9\xD2\xD4ͨ\xB9\xFD\xB8\xBD\xBC\xFE\xB5ķ\xBDʽ\xB7\xA2\xCB͵\xBD\xC4\xE3\xB5\xC4EMAIL
-
-
-\xB9\xA6\xC4\xDC\xCC\xD8\xD5\xF7:
-=============
-1 \xB1\xB8\xB7\xDDXOOPS\xCA\xFD\xBEݲ\xA2\xD2\xD4\xC8\xFD\xD6ַ\xBDʽ\xB1\xA3\xB4\xE6: \xB1\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xA1\xA2\xC1\xA2\xBC\xB4\xCF\xC2\xD4\xD8(\xB9\xDC\xC0\xEDԱר\xD3\xC3)\xA1\xA2email\xB7\xA2\xCB\xCD(ͨ\xB9\xFD\xB8\xBD\xBC\xFE\xBB\xF2\xCA\xC7\xC1\xB4\xBD\xD3)
-2 \xB4\xF3\xCA\xFD\xBEݱ\xED\xBF\xC9\xD2Ե\xA5\xB6\xC0\xC9\xFA\xB3\xC9\xCEļ\xFE
-3 \xB1\xA3\xB4\xE6\xD4ڷ\xFE\xCE\xF1\xC6\xF7\xC9ϵ\xC4\xCEļ\xFE\xCA\xFD\xBEݿ\xC9\xD2\xD4\xC9趨
-4 \xB1\xB8\xB7ݿ\xC9\xD2\xD4\xD3ɹ\xDC\xC0\xEDԱ\xCAֶ\xAF\xCD\xEA\xB3ɻ\xF2\xCA\xC7\xD7Զ\xAF\xCD\xEA\xB3\xC9
-5 \xBF\xC9\xD2Ե\xBC\xC8뱾ģ\xBF鱸\xB7ݵ\xC4\xCA\xFD\xBEݻ\xF2\xCA\xC7\xC6\xE4\xCB\xFC\xC8\xCE\xD2\xE2\xB3\xCC\xD0\xF2\xC9\xFA\xB3ɵ\xC4\xCEļ\xFE\xB1\xC8\xC8\xE7phpmyadmin
-6 \xBF\xC9\xD2\xD4ͨ\xB9\xFD\xD7Զ\xAF\xB7ִ\xCEִ\xD0еķ\xBDʽ\xB5\xBC\xC8볬\xB4\xF3\xCA\xFD\xBE\xDD\xCEļ\xFE
-7 \xBF\xC9\xD2\xD4\xC1\xD9ʱ\xD3÷ǹ\xDC\xC0\xEDԱ\xC9\xED\xB7ݵ\xBC\xC8\xEB\xCA\xFD\xBEݣ\xAC\xB6Ե\xBC\xC8\xEB\xD3\xEB\xD3û\xA7\xD7\xCA\xC1\xCF\xCF\xE0\xB9ص\xC4\xCA\xFD\xBE\xDD\xCADZ\xD8\xD0\xEB\xB5\xC4
-7 \xB3\xACʱ\xCE\xCA\xCC\xE2\xD2Ѿ\xAD\xD3\xD0Ч\xBD\xE2\xBE\xF6
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9834] XoopsModules/backup/trunk/backup

[<be...@us...>]

Revision: 9834
          http://xoops.svn.sourceforge.net/xoops/?rev=9834&view=rev
Author:   beckmi
Date:     2012-07-10 04:00:35 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Updating to Backup 3.3 (Roby73)

Modified Paths:
--------------
    XoopsModules/backup/trunk/backup/admin/admin_footer.php
    XoopsModules/backup/trunk/backup/admin/backup.php
    XoopsModules/backup/trunk/backup/admin/index.php
    XoopsModules/backup/trunk/backup/admin/main.php
    XoopsModules/backup/trunk/backup/admin/menu.php
    XoopsModules/backup/trunk/backup/admin/other.php
    XoopsModules/backup/trunk/backup/include/build_dump.lib.php
    XoopsModules/backup/trunk/backup/include/defines.lib.php
    XoopsModules/backup/trunk/backup/include/functions.php
    XoopsModules/backup/trunk/backup/language/english/modinfo.php
    XoopsModules/backup/trunk/backup/xoops_version.php

Added Paths:
-----------
    XoopsModules/backup/trunk/backup/admin/bigdump.php
    XoopsModules/backup/trunk/backup/admin/view.php
    XoopsModules/backup/trunk/backup/images/admin/convert.png
    XoopsModules/backup/trunk/backup/images/admin/del.png
    XoopsModules/backup/trunk/backup/images/admin/show.png
    XoopsModules/backup/trunk/backup/include/build_dump.lib.php_
    XoopsModules/backup/trunk/backup/include/defines.lib.php_
    XoopsModules/backup/trunk/backup/readme.txt

Modified: XoopsModules/backup/trunk/backup/admin/admin_footer.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/admin_footer.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/admin_footer.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -17,7 +17,7 @@
  * @author::     Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
  * @version::	 $Id $
 **/
-global $moduleInfo;
+global $moduleInfo, $xoopsModule;
 echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
 echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
 

Modified: XoopsModules/backup/trunk/backup/admin/backup.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/backup.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/backup.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -3,7 +3,7 @@
 // Author: D.J.(phppp) ph...@ho...                                    //
 // URL: http://xoops.org.cn                                                  //
 // ------------------------------------------------------------------------- //
-
+include_once '../../../include/cp_header.php';
 include 'admin_header.php';
 $module_handler =& xoops_gethandler('module');
 $xoopsModule =& $module_handler->getByDirname('backup');
@@ -15,6 +15,8 @@
 include_once(XOOPS_ROOT_PATH.'/modules/backup/include/zip.lib.php');
 include_once(XOOPS_ROOT_PATH."/class/xoopslists.php");
 
+
+ini_set("memory_limit", "512M");
 $cfgBackupTarget = $xoopsModuleConfig['cfgBackupTarget'];
 $drop = $xoopsModuleConfig['drop'];
 $cfgZipType = $xoopsModuleConfig['cfgZipType'];
@@ -22,7 +24,7 @@
 $use_backquotes = $xoopsModuleConfig['use_backquotes'];
 
 $other_tables = (!isset($_POST['tables']))?false:$_POST['tables'];
-$db_name = (!isset($_GET['db_name']))?XOOPS_DB_NAME:$_GET['db_name'];
+$db_name = (isset($_GET['db_name']))?$_GET['db_name']:XOOPS_DB_NAME;
 
 if ($db_name) {
 $db_selected = mysql_select_db($db_name);
@@ -145,8 +147,9 @@
         $dump_buffer .= $tmp_buffer;
     }
     $dump_buffer .= $crlf;
+	$dump_buffer=str_replace(' DEFAULT CHARSET=latin1', '', $dump_buffer);
+	$dump_buffer=str_replace(' DEFAULT CHARSET=utf8', '', $dump_buffer);
 
-    
 	if ($cfgZipType == 'zip') {
 	    if (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress')) {
 	        $extbis = '.sql';
@@ -168,6 +171,7 @@
 	}
 	
 	$fp = fopen($dirname.'/'. $filename . '.' . $ext,'w');
+	//$dump_buffer=str_replace(' DEFAULT CHARSET=latin1','',$dump_buffer);
 	fwrite($fp, $dump_buffer);
 	fclose($fp);
 	

Added: XoopsModules/backup/trunk/backup/admin/bigdump.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/bigdump.php	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/admin/bigdump.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -0,0 +1,1111 @@
+<?php
+
+// BigDump ver. 0.34b from 2011-09-04
+// Staggered import of an large MySQL Dump (like phpMyAdmin 2.x Dump)
+// Even through the webservers with hard runtime limit and those in safe mode
+// Works fine with Internet Explorer 7.0 and Firefox 2.x
+
+// Author:       Alexey Ozerov (alexey at ozerov dot de) 
+//               AJAX & CSV functionalities: Krzysiek Herod (kr81uni at wp dot pl) 
+// Copyright:    GPL (C) 2003-2011
+// More Infos:   http://www.ozerov.de/bigdump
+
+// 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 SCRIPT IS PROVIDED AS IS, WITHOUT ANY WARRANTY OR GUARANTEE OF ANY KIND
+
+// USAGE
+
+// 1. Adjust the database configuration in this file
+// 2. Remove the old tables on the target database if your dump doesn't contain "DROP TABLE"
+// 3. Create the working directory (e.g. dump) on your web server
+// 4. Upload bigdump.php and your dump files (.sql, .gz) via FTP to the working directory
+// 5. Run the bigdump.php from your browser via URL like http://www.yourdomain.com/dump/bigdump.php
+// 6. BigDump can start the next import session automatically if you enable the JavaScript
+// 7. Wait for the script to finish, do not close the browser window
+// 8. IMPORTANT: Remove bigdump.php and your dump files from the web server
+
+// If Timeout errors still occure you may need to adjust the $linepersession setting in this file
+
+// LAST CHANGES
+
+// *** Fix ajax error on some OS
+// *** Fix ajax bug on Google Chrome and Safari
+// *** Query delimiter treatment added
+// *** Only list SQL, GZ and CSV files
+// *** Sort the file listing A-Z
+// *** Add string quotes setting
+
+
+// Database configuration
+include_once '../../../include/cp_header.php';
+include_once 'admin_header.php';
+require_once(XOOPS_ROOT_PATH . "/modules/backup/include/functions.php");
+if ( isset($_COOKIE['db_name']) && isset($_COOKIE['c_set'])) {
+$c_set = $_COOKIE['c_set'];
+$db_name=$_COOKIE['db_name'];
+$charset=($c_set=='utf8')?'latin1':''; 
+} else {
+redirect_header('index.php', 3, _NOPERM);
+exit;
+}
+
+//if($db_name=="") redirect_header('index.php',5 ,_NOPERM);
+
+// Other settings (optional)
+
+$filename           = '';     // Specify the dump filename to suppress the file selection dialog
+$ajax               = true;   // AJAX mode: import will be done without refreshing the website
+$linespersession    = 30000;   // Lines to be executed per one import session
+$delaypersession    = 0;      // You can specify a sleep time in milliseconds after each session
+                              // Works only if JavaScript is activated. Use to reduce server overrun
+
+// CSV related settings (only if you use a CSV dump)
+
+$csv_insert_table   = '';     // Destination table for CSV files
+$csv_preempty_table = false;  // true: delete all entries from table specified in $csv_insert_table before processing
+$csv_delimiter      = ',';    // Field delimiter in CSV file
+$csv_add_quotes     = true;   // If your CSV data already have quotes around each field set it to false
+$csv_add_slashes    = true;   // If your CSV data already have slashes in front of ' and " set it to false
+
+// Allowed comment markers: lines starting with these strings will be ignored by BigDump
+
+$comment[]='#';                       // Standard comment lines are dropped by default
+$comment[]='-- ';
+$comment[]='DELIMITER';               // Ignore DELIMITER switch as it's not a valid SQL statement
+// $comment[]='---';                  // Uncomment this line if using proprietary dump created by outdated mysqldump
+// $comment[]='CREATE DATABASE';      // Uncomment this line if your dump contains create database queries in order to ignore them
+$comment[]='/*!';                     // Or add your own string to leave out other proprietary things
+
+// Pre-queries: SQL queries to be executed at the beginning of each import session
+
+// $pre_query[]='SET foreign_key_checks = 0';
+// $pre_query[]='Add additional queries if you want here';
+
+// Connection charset should be the same as the dump file charset (utf8, latin1, cp1251, koi8r etc.)
+// See http://dev.mysql.com/doc/refman/5.0/en/charset-charsets.html for the full list
+// Change this if you have problems with non-latin letters
+
+$db_connection_charset = $charset;
+
+// Default query delimiter: this character at the line end tells Bigdump where a SQL statement ends
+// Can be changed by DELIMITER statement in the dump file (normally used when defining procedures/functions)
+
+$delimiter = ';';
+
+// String quotes character
+
+$string_quotes = '\'';                  // Change to '"' if your dump file uses double qoutes for strings
+
+
+// *******************************************************************************************
+// If not familiar with PHP please don't change anything below this line
+// *******************************************************************************************
+
+if ($ajax)
+  ob_start();
+
+define ('VERSION','0.34b');
+define ('DATA_CHUNK_LENGTH',16384);  // How many chars are read per time
+define ('MAX_QUERY_LINES',300);      // How many lines may be considered to be one query (except text lines)
+define ('TESTMODE',false);           // Set to true to process the file without actually accessing the database
+
+header("Expires: Mon, 1 Dec 2003 01:00:00 GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+@ini_set('auto_detect_line_endings', true);
+@set_time_limit(0);
+
+if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+  @date_default_timezone_set(@date_default_timezone_get());
+
+// Clean and strip anything we don't want from user's input [0.27b]
+
+foreach ($_REQUEST as $key => $val) 
+{
+  $val = preg_replace("/[^_A-Za-z0-9-\.&= ;\$]/i",'', $val);
+  $_REQUEST[$key] = $val;
+}
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('bigdump.php');
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>BigDump ver. <?php echo (VERSION); ?></title>
+<meta http-equiv="CONTENT-TYPE" content="text/html; charset=iso-8859-1"/>
+<meta http-equiv="CONTENT-LANGUAGE" content="EN"/>
+
+<meta http-equiv="Cache-Control" content="no-cache/"/>
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="Expires" content="-1"/>
+<meta name="robots" content="noindex, nofollow">
+
+<style type="text/css">
+<!--
+
+body
+{ background-color:#FFFFF0;
+}
+
+h1 
+{ font-size:20px;
+  line-height:24px;
+  font-family:Arial,Helvetica,sans-serif;
+  margin-top:5px;
+  margin-bottom:5px;
+}
+
+p,td,th
+{ font-size:14px;
+  line-height:18px;
+  font-family:Arial,Helvetica,sans-serif;
+  margin-top:5px;
+  margin-bottom:5px;
+  text-align:justify;
+  vertical-align:top;
+}
+
+p.centr
+{ 
+  text-align:center;
+}
+
+p.smlcentr
+{ font-size:10px;
+  line-height:14px;
+  text-align:center;
+}
+
+p.error
+{ color:#FF0000;
+  font-weight:bold;
+}
+
+p.success
+{ color:#00DD00;
+  font-weight:bold;
+}
+
+p.successcentr
+{ color:#00DD00;
+  background-color:#DDDDFF;
+  font-weight:bold;
+  text-align:center;
+}
+
+td
+{ background-color:#F8F8F8;
+  text-align:left;
+}
+
+td.transparent
+{ background-color:#FFFFF0;
+}
+
+th
+{ font-weight:bold;
+  color:#FFFFFF;
+  background-color:#AAAAEE;
+  text-align:left;
+}
+
+td.right
+{ text-align:right;
+}
+
+form
+{ margin-top:5px;
+  margin-bottom:5px;
+}
+
+div.skin1
+{
+  border-color:#3333EE;
+  border-width:5px;
+  border-style:solid;
+  background-color:#AAAAEE;
+  text-align:center;
+  vertical-align:middle;
+  padding:3px;
+  margin:1px;
+}
+
+td.bg3
+{ background-color:#EEEE99;
+  text-align:left;
+  vertical-align:top;
+  width:20%;
+}
+
+th.bg4
+{ background-color:#EEAA55;
+  text-align:left;
+  vertical-align:top;
+  width:20%;
+}
+
+td.bgpctbar
+{ background-color:#EEEEAA;
+  text-align:left;
+  vertical-align:middle;
+  width:80%;
+}
+
+-->
+</style>
+
+</head>
+
+<body>
+
+<center>
+
+<table width="780" cellspacing="0" cellpadding="0">
+<tr><td class="transparent">
+
+<!-- <h1>BigDump: Staggered MySQL Dump Importer ver. <?php echo (VERSION); ?></h1> -->
+
+<?php
+
+function skin_open() {
+echo ('<div class="skin1">');
+}
+
+function skin_close() {
+echo ('</div>');
+}
+
+skin_open();
+echo ('<h1>BigDump: Staggered MySQL Dump Importer v'.VERSION.'</h1>');
+skin_close();
+
+$error = false;
+$file  = false;
+
+// Check PHP version
+
+if (!$error && !function_exists('version_compare'))
+{ echo ("<p class=\"error\">PHP version 4.1.0 is required for BigDump to proceed. You have PHP ".phpversion()." installed. Sorry!</p>\n");
+  $error=true;
+}
+
+// Check if mysql extension is available
+
+if (!$error && !function_exists('mysql_connect'))
+{ echo ("<p class=\"error\">There is no mySQL extension available in your PHP installation. Sorry!</p>\n");
+  $error=true;
+}
+
+// Calculate PHP max upload size (handle settings like 10M or 100K)
+
+if (!$error)
+{ $upload_max_filesize=ini_get("upload_max_filesize");
+  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024;
+  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024;
+  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024*1024;
+}
+
+// Get the current directory
+
+
+  $upload_dir=XOOPS_ROOT_PATH.'/uploads/backup';
+ chdir($upload_dir);
+
+// Handle file upload
+
+if (!$error && isset($_REQUEST["uploadbutton"]))
+{ if (is_uploaded_file($_FILES["dumpfile"]["tmp_name"]) && ($_FILES["dumpfile"]["error"])==0)
+  { 
+    $uploaded_filename=str_replace(" ","_",$_FILES["dumpfile"]["name"]);
+    $uploaded_filename=preg_replace("/[^_A-Za-z0-9-\.]/i",'',$uploaded_filename);
+    $uploaded_filepath=str_replace("\\","/",$upload_dir."/".$uploaded_filename);
+
+    if (file_exists($uploaded_filename))
+    { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
+    }
+    else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
+    { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
+    }
+    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
+    { echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
+      echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
+    }
+    else
+    { echo ("<p class=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
+    }
+  }
+  else
+  { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
+  }
+}
+
+
+// Handle file deletion (delete only in the current directory for security reasons)
+
+if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))
+{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
+    echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
+  else
+    echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
+}
+
+// Connect to the database, set charset and execute pre-queries
+
+if (!$error && !TESTMODE)
+{ $dbconnection = $xoopsDB->conn;
+  if ($dbconnection) 
+    $db = mysql_select_db($db_name);
+@mysql_query("SET character_set_results = '$c_set', character_set_client = '$c_set', character_set_connection = '$c_set', character_set_database = '$c_set', character_set_server = '$c_set'");
+  if (!$dbconnection || !$db) 
+  { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
+    echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
+    $error=true;
+  }
+  if (!$error && $db_connection_charset!=='')
+    @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+
+  if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)
+  { reset($pre_query);
+    foreach ($pre_query as $pre_query_value)
+    {	if (!@mysql_query($pre_query_value, $dbconnection))
+    	{ echo ("<p class=\"error\">Error with pre-query.</p>\n");
+      	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");
+      	echo ("<p>MySQL: ".mysql_error()."</p>\n");
+      	$error=true;
+      	break;
+     }
+    }
+  }
+}
+else
+{ $dbconnection = false;
+}
+
+
+// DIAGNOSTIC
+// echo("<h1>Checkpoint!</h1>");
+
+// List uploaded files in multifile mode
+
+if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
+{ if ($dirhandle = opendir($upload_dir)) 
+  { 
+    $files=array();
+    while (false !== ($files[] = readdir($dirhandle)));
+    closedir($dirhandle);
+    $dirhead=false;
+
+    if (sizeof($files)>0)
+    { 
+      sort($files);
+      foreach ($files as $dirfile)
+      { 
+        if ($dirfile != "." && $dirfile != ".." && $dirfile!=basename($_SERVER["SCRIPT_FILENAME"]) && preg_match("/\.(sql|gz|csv)$/i",$dirfile))
+        { if (!$dirhead)
+          { echo ("<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\">\n");
+            echo ("<tr><th>Filename</th><th>Size</th><th>Date&amp;Time</th><th>Type</th><th>&nbsp;</th><th>&nbsp;</th>\n");
+            $dirhead=true;
+          }
+          echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
+
+          if (preg_match("/\.sql$/i",$dirfile))
+            echo ("<td>SQL</td>");
+          elseif (preg_match("/\.gz$/i",$dirfile))
+            echo ("<td>GZip</td>");
+          elseif (preg_match("/\.csv$/i",$dirfile))
+            echo ("<td>CSV</td>");
+          else
+            echo ("<td>Misc</td>");
+
+          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
+            echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
+          else
+            echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+        }
+      }
+    }
+
+    if ($dirhead) 
+      echo ("</table>\n");
+    else 
+      echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
+  }
+  else
+  { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
+    $error=true;
+  }
+}
+
+
+// Single file mode
+
+if (!$error && !isset ($_REQUEST["fn"]) && $filename!="")
+{ echo ("<p><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($filename)."&amp;foffset=0&amp;totalqueries=0\">Start Import</a> from $filename into $db_name</p>\n");
+}
+
+
+// File Upload Form
+
+if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
+{ 
+
+// Test permissions on working directory
+
+  do { $tempfilename=time().".tmp"; } while (file_exists($tempfilename));
+  if (!($tempfile=@fopen($tempfilename,"w")))
+  { echo ("<p>Upload form disabled. Permissions for the working directory <i>$upload_dir</i> <b>must be set writable for the webserver</b> in order ");
+    echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
+  }
+  else
+  { fclose($tempfile);
+    unlink ($tempfilename);
+ 
+    echo ("<p>You can now upload your dump file up to $upload_max_filesize bytes (".round ($upload_max_filesize/1024/1024)." Mbytes)  ");
+    echo ("directly from your browser to the server. Alternatively you can upload your dump files of any size via FTP.</p>\n");
+?>
+<form method="POST" action="<?php echo ($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+<input type="hidden" name="MAX_FILE_SIZE" value="$upload_max_filesize">
+<p>Dump file: <input type="file" name="dumpfile" accept="*/*" size=60"></p>
+<p><input type="submit" name="uploadbutton" value="Upload"></p>
+</form>
+<?php
+  }
+}
+
+// Print the current mySQL connection charset
+
+if (!$error && !TESTMODE && !isset($_REQUEST["fn"]))
+{ 
+  $result = mysql_query("SHOW VARIABLES LIKE 'character_set_connection';");
+  $row = mysql_fetch_assoc($result);
+  if ($row) 
+  { $charset = $row['Value'];
+    echo ("<p>Note: The current mySQL connection charset is <i>$charset</i>. Your dump file must be encoded in <i>$charset</i> in order to avoid problems with non-latin characters. You can change the connection charset using the \$db_connection_charset variable in bigdump.php</p>\n");
+  }
+}
+
+// Open the file
+
+if (!$error && isset($_REQUEST["start"]))
+{ 
+
+// Set current filename ($filename overrides $_REQUEST["fn"] if set)
+
+  if ($filename!="")
+    $curfilename=$filename;
+  else if (isset($_REQUEST["fn"]))
+    $curfilename=urldecode($_REQUEST["fn"]);
+  else
+    $curfilename="";
+
+// Recognize GZip filename
+
+  if (preg_match("/\.gz$/i",$curfilename)) 
+    $gzipmode=true;
+  else
+    $gzipmode=false;
+
+  if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r")))
+  { echo ("<p class=\"error\">Can't open ".$curfilename." for import</p>\n");
+    echo ("<p>Please, check that your dump file name contains only alphanumerical characters, and rename it accordingly, for example: $curfilename.".
+           "<br>Or, specify \$filename in bigdump.php with the full filename. ".
+           "<br>Or, you have to upload the $curfilename to the server first.</p>\n");
+    $error=true;
+  }
+
+// Get the file size (can't do it fast on gzipped files, no idea how)
+
+  else if ((!$gzipmode && @fseek($file, 0, SEEK_END)==0) || ($gzipmode && @gzseek($file, 0)==0))
+  { if (!$gzipmode) $filesize = ftell($file);
+    else $filesize = gztell($file);                   // Always zero, ignore
+  }
+  else
+  { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
+    $error=true;
+  }
+}
+
+// Stop if csv file is used, but $csv_insert_table is not set
+
+if (($csv_insert_table == "") && (preg_match("/(\.csv)$/i",$curfilename)))
+{ echo ("<p class=\"error\">You have to specify \$csv_insert_table when using a CSV file. </p>\n");
+  $error=true;
+}
+
+
+// *******************************************************************************************
+// START IMPORT SESSION HERE
+// *******************************************************************************************
+
+if (!$error && isset($_REQUEST["start"]) && isset($_REQUEST["foffset"]) && preg_match("/(\.(sql|gz|csv))$/i",$curfilename))
+{
+
+// Check start and foffset are numeric values
+
+  if (!is_numeric($_REQUEST["start"]) || !is_numeric($_REQUEST["foffset"]))
+  { echo ("<p class=\"error\">UNEXPECTED: Non-numeric values for start and foffset</p>\n");
+    $error=true;
+  }
+  else
+  {	$_REQUEST["start"]   = floor($_REQUEST["start"]);
+    $_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
+  }
+
+// Set the current delimiter if defined
+
+  if (isset($_REQUEST["delimiter"]))
+    $delimiter = $_REQUEST["delimiter"];
+
+// Empty CSV table if requested
+
+  if (!$error && $_REQUEST["start"]==1 && $csv_insert_table != "" && $csv_preempty_table)
+  { 
+    $query = "DELETE FROM $csv_insert_table";
+    if (!TESTMODE && !mysql_query(trim($query), $dbconnection))
+    { echo ("<p class=\"error\">Error when deleting entries from $csv_insert_table.</p>\n");
+      echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
+      echo ("<p>MySQL: ".mysql_error()."</p>\n");
+      $error=true;
+    }
+  }
+  
+// Print start message
+
+  if (!$error)
+  { skin_open();
+    if (TESTMODE) 
+      echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+    echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
+    echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
+    skin_close();
+  }
+
+// Check $_REQUEST["foffset"] upon $filesize (can't do it on gzipped files)
+
+  if (!$error && !$gzipmode && $_REQUEST["foffset"]>$filesize)
+  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer behind the end of file</p>\n");
+    $error=true;
+  }
+
+// Set file pointer to $_REQUEST["foffset"]
+
+  if (!$error && ((!$gzipmode && fseek($file, $_REQUEST["foffset"])!=0) || ($gzipmode && gzseek($file, $_REQUEST["foffset"])!=0)))
+  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: ".$_REQUEST["foffset"]."</p>\n");
+    $error=true;
+  }
+
+// Start processing queries from $file
+
+  if (!$error)
+  { $query="";
+    $queries=0;
+    $totalqueries=$_REQUEST["totalqueries"];
+    $linenumber=$_REQUEST["start"];
+    $querylines=0;
+    $inparents=false;
+
+// Stay processing as long as the $linespersession is not reached or the query is still incomplete
+
+    while ($linenumber<$_REQUEST["start"]+$linespersession || $query!="")
+    {
+
+// Read the whole next line
+
+      $dumpline = "";
+      while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
+      { if (!$gzipmode)
+          $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
+        else
+          $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+      }
+      if ($dumpline==="") break;
+
+// Remove UTF8 Byte Order Mark at the file beginning if any
+
+      if ($_REQUEST["foffset"]==0)
+        $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+
+// Create an SQL query from CSV line
+
+      if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
+      {
+        if ($csv_add_slashes)
+          $dumpline = addslashes($dumpline);
+        $dumpline = explode($csv_delimiter,$dumpline);
+        if ($csv_add_quotes)
+          $dumpline = "'".implode("','",$dumpline)."'";
+        else
+          $dumpline = implode(",",$dumpline);
+        $dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
+      }
+
+// Handle DOS and Mac encoded linebreaks (I don't know if it really works on Win32 or Mac Servers)
+
+      $dumpline=str_replace("\r\n", "\n", $dumpline);
+      $dumpline=str_replace("\r", "\n", $dumpline);
+            
+// DIAGNOSTIC
+// echo ("<p>Line $linenumber: $dumpline</p>\n");
+
+// Recognize delimiter statement
+
+      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
+        $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+
+// Skip comments and blank lines only if NOT in parents
+
+      if (!$inparents)
+      { $skipline=false;
+        reset($comment);
+        foreach ($comment as $comment_value)
+        { 
+
+// DIAGNOSTIC
+//          echo ($comment_value);
+          if (trim($dumpline)=="" || strpos (trim($dumpline), $comment_value) === 0)
+          { $skipline=true;
+            break;
+          }
+        }
+        if ($skipline)
+        { $linenumber++;
+
+// DIAGNOSTIC
+// echo ("<p>Comment line skipped</p>\n");
+
+          continue;
+        }
+      }
+
+// Remove double back-slashes from the dumpline prior to count the quotes ('\\' can only be within strings)
+      
+      $dumpline_deslashed = str_replace ("\\\\","",$dumpline);
+
+// Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
+
+      $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
+      if ($parents % 2 != 0)
+        $inparents=!$inparents;
+
+// Add the line to query
+
+      $query .= $dumpline;
+
+// Don't count the line if in parents (text fields may include unlimited linebreaks)
+      
+      if (!$inparents)
+        $querylines++;
+      
+// Stop if query contains more lines as defined by MAX_QUERY_LINES
+
+      if ($querylines>MAX_QUERY_LINES)
+      {
+        echo ("<p class=\"error\">Stopped at the line $linenumber. </p>");
+        echo ("<p>At this place the current query includes more than ".MAX_QUERY_LINES." dump lines. That can happen if your dump file was ");
+        echo ("created by some tool which doesn't place a semicolon followed by a linebreak at the end of each query, or if your dump contains ");
+        echo ("extended inserts or very long procedure definitions. Please read the <a href=\"http://www.ozerov.de/bigdump/usage/\">BigDump usage notes</a> ");
+        echo ("for more infos. Ask for our support services ");
+        echo ("in order to handle dump files containing extended inserts.</p>\n");
+        $error=true;
+        break;
+      }
+
+// Execute query if end of query detected ($delimiter as last character) AND NOT in parents
+
+// DIAGNOSTIC
+// echo ("<p>Regex: ".'/'.preg_quote($delimiter).'$/'."</p>\n");
+// echo ("<p>In Parents: ".($inparents?"true":"false")."</p>\n");
+// echo ("<p>Line: $dumpline</p>\n");
+
+      if (preg_match('/'.preg_quote($delimiter).'$/',trim($dumpline)) && !$inparents)
+      { 
+
+// Cut off delimiter of the end of the query
+
+        $query = substr(trim($query),0,-1*strlen($delimiter));
+
+// DIAGNOSTIC
+// echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
+
+        if (!TESTMODE && !mysql_query($query, $dbconnection))
+        { echo ("<p class=\"error\">Error at the line $linenumber: ". trim($dumpline)."</p>\n");
+          echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
+          echo ("<p>MySQL: ".mysql_error()."</p>\n");
+          $error=true;
+          break;
+        }
+        $totalqueries++;
+        $queries++;
+        $query="";
+        $querylines=0;
+      }
+      $linenumber++;
+    }
+  }
+
+// Get the current file position
+
+  if (!$error)
+  { if (!$gzipmode) 
+      $foffset = ftell($file);
+    else
+      $foffset = gztell($file);
+    if (!$foffset)
+    { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
+      $error=true;
+    }
+  }
+
+// Print statistics
+
+skin_open();
+
+// echo ("<p class=\"centr\"><b>Statistics</b></p>\n");
+
+  if (!$error)
+  { 
+    $lines_this   = $linenumber-$_REQUEST["start"];
+    $lines_done   = $linenumber-1;
+    $lines_togo   = ' ? ';
+    $lines_tota   = ' ? ';
+    
+    $queries_this = $queries;
+    $queries_done = $totalqueries;
+    $queries_togo = ' ? ';
+    $queries_tota = ' ? ';
+
+    $bytes_this   = $foffset-$_REQUEST["foffset"];
+    $bytes_done   = $foffset;
+    $kbytes_this  = round($bytes_this/1024,2);
+    $kbytes_done  = round($bytes_done/1024,2);
+    $mbytes_this  = round($kbytes_this/1024,2);
+    $mbytes_done  = round($kbytes_done/1024,2);
+   
+    if (!$gzipmode)
+    {
+      $bytes_togo  = $filesize-$foffset;
+      $bytes_tota  = $filesize;
+      $kbytes_togo = round($bytes_togo/1024,2);
+      $kbytes_tota = round($bytes_tota/1024,2);
+      $mbytes_togo = round($kbytes_togo/1024,2);
+      $mbytes_tota = round($kbytes_tota/1024,2);
+      
+      $pct_this   = ceil($bytes_this/$filesize*100);
+      $pct_done   = ceil($foffset/$filesize*100);
+      $pct_togo   = 100 - $pct_done;
+      $pct_tota   = 100;
+
+      if ($bytes_togo==0) 
+      { $lines_togo   = '0'; 
+        $lines_tota   = $linenumber-1; 
+        $queries_togo = '0'; 
+        $queries_tota = $totalqueries; 
+      }
+
+      $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
+    }
+    else
+    {
+      $bytes_togo  = ' ? ';
+      $bytes_tota  = ' ? ';
+      $kbytes_togo = ' ? ';
+      $kbytes_tota = ' ? ';
+      $mbytes_togo = ' ? ';
+      $mbytes_tota = ' ? ';
+      
+      $pct_this    = ' ? ';
+      $pct_done    = ' ? ';
+      $pct_togo    = ' ? ';
+      $pct_tota    = 100;
+      $pct_bar     = str_replace(' ','&nbsp;','<tt>[         Not available for gzipped files          ]</tt>');
+    }
+    
+    echo ("
+    <center>
+    <table width=\"520\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">
+    <tr><th class=\"bg4\"> </th><th class=\"bg4\">Session</th><th class=\"bg4\">Done</th><th class=\"bg4\">To go</th><th class=\"bg4\">Total</th></tr>
+    <tr><th class=\"bg4\">Lines</th><td class=\"bg3\">$lines_this</td><td class=\"bg3\">$lines_done</td><td class=\"bg3\">$lines_togo</td><td class=\"bg3\">$lines_tota</td></tr>
+    <tr><th class=\"bg4\">Queries</th><td class=\"bg3\">$queries_this</td><td class=\"bg3\">$queries_done</td><td class=\"bg3\">$queries_togo</td><td class=\"bg3\">$queries_tota</td></tr>
+    <tr><th class=\"bg4\">Bytes</th><td class=\"bg3\">$bytes_this</td><td class=\"bg3\">$bytes_done</td><td class=\"bg3\">$bytes_togo</td><td class=\"bg3\">$bytes_tota</td></tr>
+    <tr><th class=\"bg4\">KB</th><td class=\"bg3\">$kbytes_this</td><td class=\"bg3\">$kbytes_done</td><td class=\"bg3\">$kbytes_togo</td><td class=\"bg3\">$kbytes_tota</td></tr>
+    <tr><th class=\"bg4\">MB</th><td class=\"bg3\">$mbytes_this</td><td class=\"bg3\">$mbytes_done</td><td class=\"bg3\">$mbytes_togo</td><td class=\"bg3\">$mbytes_tota</td></tr>
+    <tr><th class=\"bg4\">%</th><td class=\"bg3\">$pct_this</td><td class=\"bg3\">$pct_done</td><td class=\"bg3\">$pct_togo</td><td class=\"bg3\">$pct_tota</td></tr>
+    <tr><th class=\"bg4\">% bar</th><td class=\"bgpctbar\" colspan=\"4\">$pct_bar</td></tr>
+    </table>
+    </center>
+    \n");
+
+// Finish message and restart the script
+
+    if ($linenumber<$_REQUEST["start"]+$linespersession)
+    { echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</p>\n");
+      echo ("<p class=\"centr\">Thank you for using this tool! Please rate <a href=\"http://www.hotscripts.com/listing/bigdump/?RID=403\" target=\"_blank\">Bigdump at Hotscripts.com</a></p>\n");
+      echo ("<p class=\"centr\">You can send me some bucks or euros as appreciation via PayPal. Thank you!</p>\n");
+?>
+
+<!-- Start Paypal donation code -->
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick" />
+<input type="hidden" name="business" value="al...@oz..." />
+<input type="hidden" name="item_name" value="BigDump Donation" />
+<input type="hidden" name="no_shipping" value="1" />
+<input type="hidden" name="no_note" value="0" />
+<input type="hidden" name="tax" value="0" />
+<input type="hidden" name="bn" value="PP-DonationsBF" />
+<input type="hidden" name="lc" value="US" />
+<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" />
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+</form>
+<!-- End Paypal donation code -->
+
+<?php      
+
+      $error=true; // This is a semi-error telling the script is finished
+    }
+    else
+    { if ($delaypersession!=0)
+        echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
+      if (!$ajax) 
+        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+
+      echo ("<noscript>\n");
+      echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
+      echo ("</noscript>\n");
+   
+      echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
+    }
+  }
+  else 
+    echo ("<p class=\"error\">Stopped on error</p>\n");
+
+skin_close();
+
+}
+
+if ($error)
+  echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
+
+if ($dbconnection) mysql_close($dbconnection);
+if ($file && !$gzipmode) fclose($file);
+else if ($file && $gzipmode) gzclose($file);
+
+?>
+
+<p class="centr">&copy; 2003-2011 <a href="mailto:al...@oz...">Alexey Ozerov</a></p>
+
+</td></tr></table>
+
+</center>
+
+</body>
+</html>
+
+<?php
+include 'admin_footer.php';
+// If error or finished put out the whole output from above and stop
+
+if ($error) 
+{
+  $out1 = ob_get_contents();
+  ob_end_clean();
+  echo $out1;
+  die;
+}
+
+// If Ajax enabled and in import progress creates responses  (XML response or script for the initial page)
+
+if ($ajax && isset($_REQUEST['start']))
+{
+  if (isset($_REQUEST['ajaxrequest'])) 
+  {	ob_end_clean();
+	create_xml_response();
+	die;
+  } 
+  else 
+    create_ajax_script();	  
+}
+
+// Anyway put out the output from above
+
+ob_flush();
+
+// THE MAIN SCRIPT ENDS HERE
+
+
+// *******************************************************************************************
+// 				AJAX utilities
+// *******************************************************************************************
+
+function create_xml_response() 
+{
+  global $linenumber, $foffset, $totalqueries, $curfilename, $delimiter,
+				 $lines_this, $lines_done, $lines_togo, $lines_tota,
+				 $queries_this, $queries_done, $queries_togo, $queries_tota,
+				 $bytes_this, $bytes_done, $bytes_togo, $bytes_tota,
+				 $kbytes_this, $kbytes_done, $kbytes_togo, $kbytes_tota,
+				 $mbytes_this, $mbytes_done, $mbytes_togo, $mbytes_tota,
+				 $pct_this, $pct_done, $pct_togo, $pct_tota,$pct_bar;
+
+	header('Content-Type: application/xml');
+	header('Cache-Control: no-cache');
+	
+	echo '<?xml version="1.0" encoding="ISO-8859-1"?>';
+	echo "<root>";
+
+// data - for calculations
+
+	echo "<linenumber>$linenumber</linenumber>";
+	echo "<foffset>$foffset</foffset>";
+	echo "<fn>$curfilename</fn>";
+	echo "<totalqueries>$totalqueries</totalqueries>";
+	echo "<delimiter>$delimiter</delimiter>";
+
+// results - for page update
+
+	echo "<elem1>$lines_this</elem1>";
+	echo "<elem2>$lines_done</elem2>";
+	echo "<elem3>$lines_togo</elem3>";
+	echo "<elem4>$lines_tota</elem4>";
+	
+	echo "<elem5>$queries_this</elem5>";
+	echo "<elem6>$queries_done</elem6>";
+	echo "<elem7>$queries_togo</elem7>";
+	echo "<elem8>$queries_tota</elem8>";
+	
+	echo "<elem9>$bytes_this</elem9>";
+	echo "<elem10>$bytes_done</elem10>";
+	echo "<elem11>$bytes_togo</elem11>";
+	echo "<elem12>$bytes_tota</elem12>";
+			
+	echo "<elem13>$kbytes_this</elem13>";
+	echo "<elem14>$kbytes_done</elem14>";
+	echo "<elem15>$kbytes_togo</elem15>";
+	echo "<elem16>$kbytes_tota</elem16>";
+	
+	echo "<elem17>$mbytes_this</elem17>";
+	echo "<elem18>$mbytes_done</elem18>";
+	echo "<elem19>$mbytes_togo</elem19>";
+	echo "<elem20>$mbytes_tota</elem20>";
+	
+	echo "<elem21>$pct_this</elem21>";
+	echo "<elem22>$pct_done</elem22>";
+	echo "<elem23>$pct_togo</elem23>";
+	echo "<elem24>$pct_tota</elem24>";
+	echo "<elem_bar>".htmlentities($pct_bar)."</elem_bar>";
+				
+	echo "</root>";		
+}
+
+
+function create_ajax_script() 
+{
+  global $linenumber, $foffset, $totalqueries, $delaypersession, $curfilename, $delimiter;
+?>
+
+	<script type="text/javascript" language="javascript">			
+
+	// creates next action url (upload page, or XML response)
+	function get_url(linenumber,fn,foffset,totalqueries,delimiter) {
+		return "<?php echo $_SERVER['PHP_SELF'] ?>?start="+linenumber+"&fn="+fn+"&foffset="+foffset+"&totalqueries="+totalqueries+"&delimiter="+delimiter+"&ajaxrequest=true";
+	}
+	
+	// extracts text from XML element (itemname must be unique)
+	function get_xml_data(itemname,xmld) {
+		return xmld.getElementsByTagName(itemname).item(0).firstChild.data;
+	}
+	
+	function makeRequest(url) {
+		http_request = false;
+		if (window.XMLHttpRequest) { 
+		// Mozilla etc.
+			http_request = new XMLHttpRequest();
+			if (http_request.overrideMimeType) {
+				http_request.overrideMimeType("text/xml");
+			}
+		} else if (window.ActiveXObject) { 
+		// IE
+			try {
+				http_request = new ActiveXObject("Msxml2.XMLHTTP");
+			} catch(e) {
+				try {
+					http_request = new ActiveXObject("Microsoft.XMLHTTP");
+				} catch(e) {}
+			}
+		}
+		if (!http_request) {
+				alert("Cannot create an XMLHTTP instance");
+				return false;
+		}
+		http_request.onreadystatechange = server_response;
+		http_request.open("GET", url, true);
+		http_request.send(null);
+	}
+	
+	function server_response() 
+	{
+
+	  // waiting for correct response
+	  if (http_request.readyState != 4)
+		return;
+
+	  if (http_request.status != 200) 
+	  {
+	    alert("Page unavailable, or wrong url!")
+	    return;
+	  }
+		
+		// r = xml response
+		var r = http_request.responseXML;
+		
+		//if received not XML but HTML with new page to show
+		if (!r || r.getElementsByTagName('root').length == 0) 
+		{	var text = http_request.responseText;
+			document.open();
+			document.write(text);		
+			document.close();	
+			return;		
+		}
+		
+		// update "Starting from line: "
+		document.getElementsByTagName('p').item(1).innerHTML = 
+			"Starting from line: " + 
+			   r.getElementsByTagName('linenumber').item(0).firstChild.nodeValue;
+		
+		// update table with new values
+		for(i = 1; i <= 24; i++)
+			document.getElementsByTagName('td').item(i).firstChild.data = get_xml_data('elem'+i,r);
+		
+		// update color bar
+		document.getElementsByTagName('td').item(25).innerHTML = 
+			r.getElementsByTagName('elem_bar').item(0).firstChild.nodeValue;
+			 
+		// action url (XML response)	 
+		url_request =  get_url(
+			get_xml_data('linenumber',r),
+			get_xml_data('fn',r),
+			get_xml_data('foffset',r),
+			get_xml_data('totalqueries',r),
+			get_xml_data('delimiter',r));
+		
+		// ask for XML response	
+		window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
+	}
+
+	// First Ajax request from initial page
+
+	var http_request = false;
+	var url_request =  get_url(<?php echo ($linenumber.',"'.urlencode($curfilename).'",'.$foffset.','.$totalqueries.',"'.urlencode($delimiter).'"') ;?>);
+	window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
+	</script>
+
+<?php
+}
+
+?>

Modified: XoopsModules/backup/trunk/backup/admin/index.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/index.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/index.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -25,11 +25,14 @@
 $tot_file=0;
    if ($handle = opendir(XOOPS_ROOT_PATH.'/uploads/backup/')) {
    while (false !== ($file = readdir($handle))) { 
-       if ( $file == ".." || $file == "." || substr($file,0,1)=='.' ) continue; 
+       if ( $file == ".." || $file == "." || substr($file,0,1)=='.' || $file=="convert") continue; 
    $tot_file++;
    }
    closedir($handle); 
 } 
+
+$val=mysql_query("SHOW VARIABLES LIKE 'character%'");
+$val2=mysql_query("SHOW VARIABLES LIKE 'collation%'");
  $sql = "SHOW TABLES";
  $result = mysql_query($sql);
  $tot_tables = mysql_num_rows($result);  
@@ -39,13 +42,28 @@
 	} else {
     	$indexadmin->addInfoBoxLine(_DB_BACKUP_BOX1, _MD_BACKUP_TOTALFILES, $tot_file, 'Green');
 	}
-	
 	$indexadmin->addInfoBox(_DB_BACKUP_BOX2);
 	if ( 0 == $tot_tables ) {
     	$indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Red');
 	} else {
     	$indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Green');
 	}
+	$a=0;
+	while($re=mysql_fetch_array($val)) {
+	$value[]=$re['Value'];
+	$var_name[]=$re['Variable_name'];
+	$indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
+	$a++;
+	}
+	$a=0;
+	unset($value);
+	unset($var_name);
+	while($re=mysql_fetch_array($val2)) {
+	$value[]=$re['Value'];
+	$var_name[]=$re['Variable_name'];
+	$indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
+	$a++;
+	}
 	echo $indexadmin->addNavigation('index.php') ;
     	echo $indexadmin->renderIndex();
 	

Modified: XoopsModules/backup/trunk/backup/admin/main.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/main.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/main.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -7,7 +7,7 @@
 } else  {
 include_once "../language/english/admin.php";
 }
-
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
 $op  = !empty( $_GET[ 'op' ] ) ? $_GET['op'] :"index";
 
 switch ($op)
@@ -24,6 +24,41 @@
 		xoops_confirm(array( 'backup' => "confirm_backup" ), 'main.php?op=backup', _AM_DBASE_BACKUP); 
 		break;
 	
+
+	case "restore":
+		xoops_cp_header(); 
+		$index_admin = new ModuleAdmin();
+		echo $index_admin->addNavigation('main.php?op=restore');
+		if (!isset($_POST['db_name'])) {
+
+			$sform = new XoopsThemeForm(_MI_BACKUP_ADMENU4, 'name', '', 'post'); 
+			$sform->addElement(new XoopsFormText(_DB_DBASE, 'db_name', 50, 255, ""), true);
+			//$sform->addElement(new XoopsFormText(_DB_DBASE, 'testmode', 50, 155, "false"), true);
+			//$file_select = new XoopsFormSelect(_DB_TABLES, 'file');
+			//$file_select->addOptionArray($file_a);
+   			//$sform->addElement($file_select, true);
+			$tab_select = new XoopsFormSelect(_DB_CHARSET, 'c_set');
+    			$tab_select->addOption('utf8','Utf8');
+			$tab_select->addOption('latin1','Latin1');
+   			$sform->addElement($tab_select, true);
+			$button_tray = new XoopsFormElementTray('' ,'');
+			$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+			$button_tray->addElement($submit_btn);
+			$sform->addElement($button_tray);
+			$sform->display();
+			} else {
+			$db_name=$_POST['db_name'];
+			$c_set=$_POST['c_set'];
+			setcookie('db_name',$db_name,time()+3600,"/");
+			setcookie('c_set',$c_set,time()+3600,"/");
+			drop_table($db_name,$c_set);
+			header ('location: bigdump.php');
+			exit;
+			}
+		break;
+
+
+
 	case "delete":
 		xoops_cp_header(); 
 		$index_admin = new ModuleAdmin();
@@ -43,10 +78,97 @@
 		xoops_confirm(array( 'delete' => "confirm_delete" ), 'main.php?op=delete', _AM_DBASE_DELETE); 
 		break;
 
+	case "del_db":
+		xoops_cp_header(); 
+		$index_admin = new ModuleAdmin();
+		echo $index_admin->addNavigation('main.php?op=del_db');
+		if(!empty($_POST['db_name_del'])) {
+		$db_del_name = $_POST['db_name_del'];
+		$charset = $_POST['charset'];
+		if($db_del_name==XOOPS_DB_NAME)
+			{
+			redirect_header('index.php', 3, _NOPERM);
+			exit;
+			} else {
+			$db_selected = mysql_select_db($db_del_name);
+			if (!$db_selected) {
+  			redirect_header('main.php?op=del_db', 3, 'Database not exist');
+			}
+			@drop_table($db_del_name,$charset);
+			redirect_header('index.php', 3, 'Database was deleted');
+			exit;
+			}
+		} else {
+		$sform = new XoopsThemeForm(_MI_BACKUP_ADMENU7, 'name', 'main.php?op=del_db', 'post'); 
+		$sform->addElement(new XoopsFormText(_DB_DBASE, 'db_name_del', 50, 255, ""), true);
+		$tab_select = new XoopsFormSelect(_DB_CHARSET, 'charset');
+		$tab_select->addOption('utf8','Utf8');
+		$tab_select->addOption('latin1','Latin1');
+   		$sform->addElement($tab_select, true);
+		$button_tray = new XoopsFormElementTray('' ,'');
+		$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+		$sform->display();
+		}
+		break;
+
 	case "index":
 		header ('location: index.php');
 		exit();	 
 		break;
+
+	case "show":
+		xoops_cp_header();
+    		$indexAdmin = new ModuleAdmin();
+    		echo $indexAdmin->addNavigation('main.php?op=show');
+		if (!empty($_POST['db_name'])) {
+		$db 		= $_POST['db_name'];
+
+		$db_selected = mysql_select_db($db);
+		if (!$db_selected) {
+  		redirect_header('main.php?op=show', 3, 'Database not exist');
+		}
+
+	$sql 		= "SHOW TABLES FROM $db";
+	$tables 	= mysql_query($sql);
+	$num_tables = @mysql_numrows($tables);
+	$value = $db."<br />";	
+
+	for($i=0; $i<$num_tables; $i++){
+		$name = mysql_tablename($tables, $i);
+		$options[$name] = $name;
+	}
+
+	$val=mysql_query("show variables like 'character%'");
+	while($re=mysql_fetch_array($val)) {
+	$value.=$re['Variable_name']." ".$re['Value']."<br />";
+	}
+	$sform = new XoopsThemeForm(_DB_VIEW_TABLE, 'name', 'view.php?db='.$db, 'post');
+    	$tab_select = new XoopsFormSelect(_DB_TABLES, 'tables', null, 6,false);
+    	$tab_select->addOptionArray($options);
+   	$sform->addElement($tab_select, true);
+	$button_tray = new XoopsFormElementTray('' ,'');
+	$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+	$button_tray->addElement($submit_btn);
+	$sform->addElement($button_tray);
+	$sform->display();
+	} else {
+
+	$sform = new XoopsThemeForm(_DB_VIEW_TABLE, 'name', '', 'post');
+	$sform->addElement(new XoopsFormText(_DB_DBASE, 'db_name', 50, 255, ""), true);
+	$button_tray = new XoopsFormElementTray('' ,'');
+	$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+	$button_tray->addElement($submit_btn);
+	$sform->addElement($button_tray);
+	$sform->display();
+	}
+	//$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+	//$button_tray->addElement($submit_btn);
+	//$sform->addElement($button_tray);
+	//$sform->display();
+		break;
+
 }
 
 include "admin_footer.php";

Modified: XoopsModules/backup/trunk/backup/admin/menu.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/menu.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/menu.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('profile');
+$xoopsModule =& XoopsModule::getByDirname('backup');
 $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
 $pathIcon32 = $moduleInfo->getInfo('icons32');
 
@@ -45,13 +45,21 @@
 $adminmenu[$i]['icon']  = 'images/admin/database_add.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_BACKUP_ADMENU4;
-$adminmenu[$i]['link'] = "admin/restore.php"; 
+$adminmenu[$i]['link'] = "admin/main.php?op=restore"; 
 $adminmenu[$i]['icon']  = 'images/admin/restore.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_BACKUP_ADMENU5;
 $adminmenu[$i]['link'] = "admin/main.php?op=delete"; 
 $adminmenu[$i]['icon']  = 'images/admin/delete.png';
 $i++;
+$adminmenu[$i]['title'] = _MI_BACKUP_ADMENU6;
+$adminmenu[$i]['link'] = "admin/main.php?op=show"; 
+$adminmenu[$i]['icon']  = 'images/admin/show.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_BACKUP_ADMENU7;
+$adminmenu[$i]['link'] = "admin/main.php?op=del_db"; 
+$adminmenu[$i]['icon']  = 'images/admin/del.png';
+$i++;
 $adminmenu[$i]['title'] = _MI_BACKUP_ADMIN_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
 $adminmenu[$i]['desc']  = _MI_BACKUP_ADMIN_ABOUT_DESC;

Modified: XoopsModules/backup/trunk/backup/admin/other.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/other.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/admin/other.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -42,6 +42,7 @@
 	$sql 		= "SHOW TABLES FROM $db";
 	$tables 	= mysql_query($sql);
 	$num_tables = @mysql_numrows($tables);
+	$value = $db."<br />";	
 
 	$options = array(0=>_NONE, 1=>_ALL);
 	for($i=0; $i<$num_tables; $i++){
@@ -49,16 +50,21 @@
 		$options[$name] = $name;
 	}
 
+	$val=mysql_query("show variables like 'character%'");
+	while($re=mysql_fetch_array($val)) {
+	$value.=$re['Variable_name']." ".$re['Value']."<br />";
+	}
 	$sform = new XoopsThemeForm(_DB_BACKUP_TITLE, 'name', 'backup.php?oldurl='.$_SERVER['PHP_SELF'].'&db_name='.$db, 'post');
     	$tab_select = new XoopsFormSelect(_DB_TABLES, 'tables', null, 6,true);
     	$tab_select->addOptionArray($options);
    	$sform->addElement($tab_select, true);
+	$tarea = new XoopsFormLabel($value);
+	$sform->addElement($tarea);
 	$button_tray = new XoopsFormElementTray('' ,'');
 	$submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
 	$button_tray->addElement($submit_btn);
 	$sform->addElement($button_tray);
 	$sform->display();
-        
 	} else {
 
 	$sform = new XoopsThemeForm(_DB_BACKUP_TITLE, 'name', 'other.php', 'post');

Added: XoopsModules/backup/trunk/backup/admin/view.php
===================================================================
--- XoopsModules/backup/trunk/backup/admin/view.php	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/admin/view.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -0,0 +1,55 @@
+<?php
+include_once '../../../include/cp_header.php';
+include_once 'admin_header.php';
+include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/include/functions.php";
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php' ;
+
+$pos = empty($_GET['pos']) ? 0 : intval( $_GET['pos']);
+$num = empty($_GET['num']) ? 20 : intval( $_GET['num']);
+if (!empty($_GET['table'])) $table=$_GET['table'];
+if (!empty($_POST['tables'])) $table=$_POST['tables'];
+if (!empty($_GET['db'])) $db=$_GET['db'];
+if (!empty($_POST['db'])) $db=$_POST['db'];
+
+if($db=="" || $table=="") redirect_header('index.php', 3, _NOPERM);
+
+
+		xoops_cp_header(); 
+		$index_admin = new ModuleAdmin();
+		echo $index_admin->addNavigation('main.php?op=view');
+		$tot=$xoopsDB->query("SELECT COUNT(*) FROM $db.$table");
+		list($numrows)=$xoopsDB->fetchRow( $tot );
+		$sql=$xoopsDB->query("SELECT * FROM $db.$table LIMIT $pos,$num");
+     		$nav = new XoopsPageNav( $numrows , $num , $pos , 'pos' , "op=view&num=$num&db=$db&table=$table" ) ;
+     		$nav_html = $nav->renderNav( 10 ) ;
+		echo "<br /><div align=\"center\"><h2>$table</h2></div><br />";
+		echo "<div style=\"overflow: auto;\">
+		<br /><div align=\"right\">$nav_html</div><br />
+		<table class='outer' cellpadding='4' cellspacing='1'>
+		<tr valign='middle'>";
+		$result = mysql_query("SHOW COLUMNS FROM $db.$table");
+		if (!$result) {
+    		echo 'Could not run query: ' . mysql_error();
+    		exit;
+		}
+		if (mysql_num_rows($result) > 0) {
+		$rows=mysql_num_rows($result);
+    		while ($row = mysql_fetch_assoc($result)) {
+		$fields[]=$row['Field'];
+        	echo "<th>".$row['Field']."</th>";
+    		}
+		}
+		echo "</tr><tr>";
+	$oddeven = 'odd' ;
+	echo "<tr>";
+	while($result=$xoopsDB->fetchArray($sql)) {
+	$oddeven=($oddeven=='odd'?'even':'odd') ;
+		for ($i=0; $i<$rows; $i++) {
+		echo "<td class='$oddeven'>".$result[$fields[$i]]."</td>";
+		}
+	echo "</tr>";
+	}
+	echo "</table>";
+	echo "<br /><div align=\"right\">$nav_html</div><br />";
+
+include "admin_footer.php";

Added: XoopsModules/backup/trunk/backup/images/admin/convert.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/backup/trunk/backup/images/admin/convert.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/backup/trunk/backup/images/admin/del.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/backup/trunk/backup/images/admin/del.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/backup/trunk/backup/images/admin/show.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/backup/trunk/backup/images/admin/show.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: XoopsModules/backup/trunk/backup/include/build_dump.lib.php
===================================================================
--- XoopsModules/backup/trunk/backup/include/build_dump.lib.php	2012-07-09 22:13:12 UTC (rev 9833)
+++ XoopsModules/backup/trunk/backup/include/build_dump.lib.php	2012-07-10 04:00:35 UTC (rev 9834)
@@ -251,7 +251,7 @@
                 $field_set[$j] = PMA_backquote(mysql_field_name($result, $j), $use_backquotes);
                 $type          = mysql_field_type($result, $j);
                 if ($type == 'tinyint' || $type == 'smallint' || $type == 'mediumint' || $type == 'int' ||
-                    $type == 'bigint'  ||$type == 'timestamp') {
+                    $type == 'bigint') {
                     $field_num[$j] = TRUE;
                 } else {
                     $field_num[$j] = FALSE;
@@ -405,7 +405,7 @@
                     $type          = mysql_field_type($result, $j);
                     // a number
                     if ($type == 'tinyint' || $type == 'smallint' || $type == 'mediumint' || $type == 'int' ||
-                        $type == 'bigint'  ||$type == 'timestamp') {
+                        $type == 'bigint') {
                         $schema_insert .= $row[$j] . ', ';
                     }
                     // a string

Added: XoopsModules/backup/trunk/backup/include/build_dump.lib.php_
===================================================================
--- XoopsModules/backup/trunk/backup/include/build_dump.lib.php_	                        (rev 0)
+++ XoopsModules/backup/trunk/backup/include/build_dump.lib.php_	2012-07-10 04:00:35 UTC (rev 9834)
@@ -0,0 +1,498 @@
+<?php
+/* $Id: build_dump.lib.php,v 1.17 2002/02/17 11:59:04 loic1 Exp $ */
+
+
+/**
+ * Set of functions used to build dumps of tables
+ */
+
+
+
+if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
+    define('PMA_BUILD_DUMP_LIB_INCLUDED', 1);
+
+    function PMA_sqlAddslashes($a_string = '', $is_like = FALSE)
+    {
+        if ($is_like) {
+            $a_string = str_replace('\\', '\\\\\\\\', $a_string);
+        } else {
+            $a_string = str_replace('\\', '\\\\', $a_string);
+        }
+        $a_string = str_replace('\'', '\\\'', $a_string);
+
+        return $a_string;
+    } // end of the 'PMA_sqlAddslashes()' function
+
+    function PMA_mysqlDie($error_message = '', $the_query = '',
+                          $is_modify_link = TRUE, $back_url = '')
+    {
+
+    	include($xoopsConfig['root_path']."header.php");
+   		opentable();
+
+        if (!$error_message) {
+            $error_message = mysql_error();
+        }
+        if (!$the_query && !empty($GLOBALS['sql_query'])) {
+            $the_query = $GLOBALS['sql_query'];
+        }
+
+        echo '<p><b>'. $GLOBALS['strError'] . '</b></p>' . "\n";
+        // if the config password is wrong, or the MySQL server does not
+        // respond, do not show the query that would reveal the
+        // username/password
+        if (!empty($the_query) && !strstr($the_query, 'connect')) {
+            $query_base = htmlspecialchars($the_query);
+            $query_base = preg_replace("/((\015\012)|(\015)|(\012)){3,}/", "\n\n", $query_base);
+            echo '<p>' . "\n";
+            echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;' . "\n";
+            if ($is_modify_link) {
+                echo '    ['
+                     . '<a href="db_details.php?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=y">' . $GLOBALS['strEdit'] . '</a>'
+                     . ']' . "\n";
+            } // end if
+            echo '<pre>' . "\n" . $query_base . "\n" . '</pre>' . "\n";
+            echo '</p>' . "\n";
+        } // end if
+        if (!empty($error_message)) {
+            $error_message = ht...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops:[9833] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9833
          http://xoops.svn.sourceforge.net/xoops/?rev=9833&view=rev
Author:   lord_venom
Date:     2012-07-09 22:13:12 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
new design

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 22:13:12 UTC (rev 9833)
@@ -62,13 +62,17 @@
 line-height: 20px;
 }
   
-  #num, ul#menu #num{
+  #num, #num a,  ul#menu #num{
   text-align: center;
+   font-weight: normal;
 font-size: 11px;
 color: #25587C;
 text-shadow: 0 1px 0 white;
  
   }
+  #num a{
+   font-weight: bold;
+  }
 
       ul#menu #form, #form{
 	  float:right;
@@ -337,9 +341,7 @@
 	text-align: center;
 	margin: 10px;
 	padding: 10px;
-	font-size: 0.9em;
 	border: 1px solid #DDD;
-	color:#848485;
 	text-transform: uppercase;
 	float:right;
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-09 22:13:12 UTC (rev 9833)
@@ -39,7 +39,7 @@
 define("_MD_TDMPICTURE_CAT","Catégorie");
 define("_MD_TDMPICTURE_TYPE","Type");
 define("_MD_TDMPICTURE_SIZE","Poids");
-define("_MD_TDMPICTURE_WIDTH","Largeur*Hauteur");
+//define("_MD_TDMPICTURE_WIDTH","Largeur*Hauteur");
 define("_MD_TDMPICTURE_MORE","En savoir plus");
 define("_MD_TDMPICTURE_SCREEN","Taille réel");
 
@@ -134,8 +134,8 @@
 define("_MD_TDMPICTURE_URL","URL du fichier");
 //define("_MD_TDMPICTURE_TYPE","Type");
 //define("_MD_TDMPICTURE_SIZE","Taille en (octet)");
-//define("_MD_TDMPICTURE_WIDTH","Largeur");
-define("_AM_TDMPICTURE_HEIGHT","Hauteur");
+define("_MD_TDMPICTURE_WIDTH","Largeur");
+define("_MD_TDMPICTURE_HEIGHT","Hauteur");
 
 //define("_AM_TDMPICTURE_EDITOR","Editeur");
 //define("_AM_TDMPICTURE_EDITORURL","URL Editeur");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 22:13:12 UTC (rev 9833)
@@ -42,24 +42,13 @@
   
 <table class="tdmp_table"><tr>
 <th align="center"><span class="switch_title"><{$file.title}></span> <span class="switch_fav"><{$file.favourite}></span></th></tr>
-<tr><td align="center">
+<tr><td class="even" align="center">
 
 <div class="boxgrid">
     <{$file.img}>
-    <div class="cover boxcaption">
-        <p style="color: #FFF;"><{$smarty.const._MD_TDMPICTURE_MORE}></p>
-	
-		<div class="detail_info">
-<{$smarty.const._MD_TDMPICTURE_TYPE}>: <{$file.type}><br />
-<{$smarty.const._MD_TDMPICTURE_SIZE}>: <{$file.size}><br />
-<{$smarty.const._MD_TDMPICTURE_WIDTH}>: <{$file.with}>*<{$file.height}></a>
-<br/>
-    </div>
-	
+ </div>
 
-</div></div>
-
-</td></tr><tr><td>
+</td></tr><tr><td class="odd">
 <ul id="display">
 <li style="list-style: none;">
 <div style="float:left; text-align:left;">
@@ -68,16 +57,12 @@
 	</div>
 
 </div>
-<br class="clear"/>
-<{if $file.text}>
-<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
-<{/if}>
 
-<div class="switch_info">
+<div id="num" class="switch_info">
 <{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
 </div>
 
-<div class="switch_info">
+<div id="num" class="switch_info">
 <{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
 <{if $perm_vote}>
 <br />
@@ -86,14 +71,35 @@
 <{/if}>
 </div>	
 
-<div class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
+<br class="clear"/>
+<{if $file.text}>
+<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
+<{/if}>
+
+
+<!-- tableau masquer -->
+<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
+<table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
+
+<div id="num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
 	
-<div class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
+<div id="num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
 
+<div id="num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
 
+<div id="num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
+
+<div id="num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
+
+<div id="num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
+	
+</td></tr></table>
+
+<!--end-->
+
 <{if $file.menu}>
 <br class="clear"/>
-<div class="switch_info" style="float:right;">
+<div id="masque_3" class="switch_info" style="display: none; margin:5px; float:right;">
 <div align="center">
 <{if $file.edit}>
 <a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9832] XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php

[<for...@us...>]

Revision: 9832
          http://xoops.svn.sourceforge.net/xoops/?rev=9832&view=rev
Author:   forxoops
Date:     2012-07-09 21:37:55 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Commit error

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-07-09 20:21:11 UTC (rev 9831)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-07-09 21:37:55 UTC (rev 9832)
@@ -17,65 +17,6 @@
  * @version     $Id$
  */
 
-if (!defined("XOOPS_MAINFILE_INCLUDED")) {
-    define("XOOPS_MAINFILE_INCLUDED", 1);
-
-    // XOOPS Physical Paths
-
-    // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
-    define('XOOPS_ROOT_PATH', 'E:/Wamp/www/xps260/htdocs');
-
-    // For forward compatibility
-    // Physical path to the XOOPS library directory WITHOUT trailing slash
-    define('XOOPS_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_lib');
-    // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
-    define('XOOPS_VAR_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_data');
-    // Alias of XOOPS_PATH, for compatibility, temporary solution
-    define("XOOPS_TRUST_PATH", XOOPS_PATH);
-
-    // URL Association for SSL and Protocol Compatibility
-    $http = 'http://';
-    if (!empty($_SERVER['HTTPS'])) {
-        $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
-    }
-    define('XOOPS_PROT', $http);
-
-    // XOOPS Virtual Path (URL)
-    // Virtual path to your main XOOPS directory WITHOUT trailing slash
-    // Example: define('XOOPS_URL', 'http://localhost/xps260/htdocs');
-    define('XOOPS_URL', 'http://localhost/xps260/htdocs');
-
-    // Shall be handled later, don't forget!
-    define("XOOPS_CHECK_PATH", 0);
-    // Protect against external scripts execution if safe mode is not enabled
-    if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
-        if (function_exists("debug_backtrace")) {
-            $xoopsScriptPath = debug_backtrace();
-            if (!count($xoopsScriptPath)) {
-                 die("XOOPS path check: this file cannot be requested directly");
-            }
-            $xoopsScriptPath = $xoopsScriptPath[0]["file"];
-        } else {
-            $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] :  $_SERVER["SCRIPT_FILENAME"];
-        }
-        if (DIRECTORY_SEPARATOR != "/") {
-            // IIS6 may double the \ chars
-            $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
-        }
-        if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
-             exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
-        }
-    }
-
-    // Secure file
-    require XOOPS_VAR_PATH . '/data/secure.php';
-
-    define('XOOPS_GROUP_ADMIN', '1');
-    define('XOOPS_GROUP_USERS', '2');
-    define('XOOPS_GROUP_ANONYMOUS', '3');
-
-    if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
-        include XOOPS_ROOT_PATH."/include/common.php";
-    }
-
+if (! defined('XOOPS_INSTALL')) {
+    header('Location: install/index.php');
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9831] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9831
          http://xoops.svn.sourceforge.net/xoops/?rev=9831&view=rev
Author:   lord_venom
Date:     2012-07-09 20:21:11 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
bug pdf_paper.php

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php	2012-07-09 20:16:12 UTC (rev 9830)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php	2012-07-09 20:21:11 UTC (rev 9831)
@@ -214,7 +214,7 @@
 $file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
 $cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
 
-$file =& $file_handler->get($_REQUEST['ST']);
+$file =& $file_handler->get($_REQUEST['st']);
 
 $newsletter_text = utf8_decode(Chars($file->getVar('file_text')));
 $newsletter_indate = formatTimeStamp($file->getVar("file_indate"),"m");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 20:16:12 UTC (rev 9830)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 20:21:11 UTC (rev 9831)
@@ -110,8 +110,10 @@
 <{if $smarty.const.TDMPICTURE_PDF}>
 <tr><td> 
 <div style="float: left;">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> 
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> 
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> 
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> 
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> 
 <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
 </div>
 </li></ul>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9830] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9830
          http://xoops.svn.sourceforge.net/xoops/?rev=9830&view=rev
Author:   lord_venom
Date:     2012-07-09 20:16:12 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
bug pdf

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 19:34:57 UTC (rev 9829)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 20:16:12 UTC (rev 9830)
@@ -54,7 +54,7 @@
   float:left;
  
   }
-  ul#menu #text, #text {
+  #text, ul#menu #text {
   font-size: 13px;
   font-weight: normal;
 color: #728DA9;
@@ -62,7 +62,7 @@
 line-height: 20px;
 }
   
-    ul#menu #num{
+  #num, ul#menu #num{
   text-align: center;
 font-size: 11px;
 color: #25587C;
@@ -70,7 +70,7 @@
  
   }
 
-      ul#menu #form{
+      ul#menu #form, #form{
 	  float:right;
 	  padding-top:100px;
 	  padding-right:20px;
@@ -288,45 +288,7 @@
 	border-left: 1px solid #333;
 } 
 
-/* style pour l agraphe. */
-.switch_img   .paper-clip {
-	width: 30px;
-	height: 60px;
-	display: block;
-	position: absolute;
-	top: -5px;
-	left: -2px;
-	background: url(../images/paper-clip.png) no-repeat;
-	z-index:1; 
-}
 
-/* style pour le scotch regler left pour centrer */
-.switch_img  .tape {
-	width: 77px;
-	height: 27px;
-	display: block;
-	position: absolute;
-	top: -12px;
-	left: 50%;
-	background: url(../images/tape.png) no-repeat;
-	z-index:1; 
-}
-
-
-/* style pour la  punaise regler left pour centrer */
-.switch_img .pin{
-	width: 28px;
-	height: 21px;
-	display: block;
-	position: absolute;
-	top: -12px;
-	left: 50%;
-	background: url(../images/pin.png) no-repeat;
-	z-index:1; 
-}
-
-
-
 .switch_switch {
 float: left; 
 text-align:center;
@@ -339,8 +301,7 @@
 }
 
 .switch_title, .switch_title a {
-	margin-top:10px;
-	font-size: 1.3em;	
+	margin-top:10px;	
 	padding: 2px;
 }
 
@@ -356,8 +317,6 @@
 .switch_in {
 	margin-top: 10px;
 	padding: 2px;
-	color:#848485;
-	font-size: 0.6em;
 	text-transform: uppercase;
 }
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 19:34:57 UTC (rev 9829)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html	2012-07-09 20:16:12 UTC (rev 9830)
@@ -64,11 +64,7 @@
 <li style="list-style: none;">
 <div style="float:left; text-align:left;">
 <div class="switch_title"><h2><{$file.title}></h2>
-<br />
-	<span class="switch_date"><{$file.indate}></span>
-	-
-	<span class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>:<a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a></span>
-	
+	<span id="num" class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>: <{$file.indate}></span>
 	</div>
 
 </div>
@@ -114,9 +110,9 @@
 <{if $smarty.const.TDMPICTURE_PDF}>
 <tr><td> 
 <div style="float: left;">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> 
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> 
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a> 
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a> 
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
 </div>
 </li></ul>
 </td></tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9829] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<for...@us...>]

Revision: 9829
          http://xoops.svn.sourceforge.net/xoops/?rev=9829&view=rev
Author:   forxoops
Date:     2012-07-09 19:34:57 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Update theme and template for bootstrap

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-07-09 19:34:57 UTC (rev 9829)
@@ -17,6 +17,65 @@
  * @version     $Id$
  */
 
-if (! defined('XOOPS_INSTALL')) {
-    header('Location: install/index.php');
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+    define("XOOPS_MAINFILE_INCLUDED", 1);
+
+    // XOOPS Physical Paths
+
+    // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+    define('XOOPS_ROOT_PATH', 'E:/Wamp/www/xps260/htdocs');
+
+    // For forward compatibility
+    // Physical path to the XOOPS library directory WITHOUT trailing slash
+    define('XOOPS_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_lib');
+    // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+    define('XOOPS_VAR_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_data');
+    // Alias of XOOPS_PATH, for compatibility, temporary solution
+    define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+    // URL Association for SSL and Protocol Compatibility
+    $http = 'http://';
+    if (!empty($_SERVER['HTTPS'])) {
+        $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+    }
+    define('XOOPS_PROT', $http);
+
+    // XOOPS Virtual Path (URL)
+    // Virtual path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_URL', 'http://localhost/xps260/htdocs');
+    define('XOOPS_URL', 'http://localhost/xps260/htdocs');
+
+    // Shall be handled later, don't forget!
+    define("XOOPS_CHECK_PATH", 0);
+    // Protect against external scripts execution if safe mode is not enabled
+    if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+        if (function_exists("debug_backtrace")) {
+            $xoopsScriptPath = debug_backtrace();
+            if (!count($xoopsScriptPath)) {
+                 die("XOOPS path check: this file cannot be requested directly");
+            }
+            $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+        } else {
+            $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] :  $_SERVER["SCRIPT_FILENAME"];
+        }
+        if (DIRECTORY_SEPARATOR != "/") {
+            // IIS6 may double the \ chars
+            $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+        }
+        if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+             exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+        }
+    }
+
+    // Secure file
+    require XOOPS_VAR_PATH . '/data/secure.php';
+
+    define('XOOPS_GROUP_ADMIN', '1');
+    define('XOOPS_GROUP_USERS', '2');
+    define('XOOPS_GROUP_ANONYMOUS', '3');
+
+    if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+        include XOOPS_ROOT_PATH."/include/common.php";
+    }
+
 }
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css	2012-07-09 19:34:57 UTC (rev 9829)
@@ -25,7 +25,56 @@
 }
 .caption-required{color: #b94a48;}
 
+/* Area style */
+.xo-window {
+    background-color: #222222;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+    background-image: -moz-linear-gradient(top, #333333, #222222);
+    background-image: -ms-linear-gradient(top, #333333, #222222);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+    background-image: -webkit-linear-gradient(top, #333333, #222222);
+    background-image: -o-linear-gradient(top, #333333, #222222);
+    background-image: linear-gradient(top, #333333, #222222);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-border-radius: 5px 5px 0 0;
+    -khtml-border-top-left-radius: 5px;
+    -khtml-border-top-right-radius: 5px;
+    -webkit-border-radius-topleft: 5px;
+    -webkit-border-radius-topright: 5px;
+    border-radius: 5px 5px 0 0;
+    border: 1px solid #2D4760;
+    padding: 4px 6px 6px 4px;
+    height: 20px;
+}
+.xo-window-title {
+    padding: 2px 6px 6px 6px;
+    color: #fff;
+    font-weight: bold;
+    text-shadow: 0 0 2px #000;
+    font-family: tahoma, verdana, arial, sans-serif;
+}
+.xo-window-data {
+    float: left;
+    min-height: 50px;
+    padding: 6px;
+    width: 100%;
+}
 
 .clear {
     clear: both;
 }
+.spacer .spacer-mini {
+    padding:0 0 3px 0;
+}
+.spacer-mid {
+    padding:0 0 6px 0;
+}
+.spacer-large {
+    padding:0 0 12px 0;
+}
+
+.txt-center { text-align: center; }
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,7 +1,7 @@
 <ul class="nav nav-list">
     <{if $xoops_isadmin}>
     <li>
-        <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>">
+        <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>" rel="external">
             <i class="icon-wrench"></i>
             <{$block.lang_adminmenu}>
         </a>

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,64 +1,84 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<!DOCTYPE html>
+<html lang="<{$xoops_langcode}>">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-	<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
-	<title><{$xoops_sitename}> - <{$xoops_slogan}></title>
-	<meta name="robots" content="<{$xoops_meta_robots}>" />
-	<meta name="keywords" content="<{$xoops_meta_keywords}>" />
-	<meta name="description" content="<{$xoops_meta_description}>" />
-	<meta name="rating" content="<{$xoops_meta_rating}>" />
-	<meta name="author" content="<{$xoops_meta_author}>" />
-	<meta name="copyright" content="<{$xoops_meta_copyright}>" />
-	<meta name="generator" content="XOOPS" />
-	
-	<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl browse.php?xoops.css}>" />
-	<link rel="shortcut icon" type="image/ico" href="<{xoAppUrl favicon.ico}>" />
-	
-</head>
-<body>
-  <table class="collapse">
-    <tr id="header">
-      <td class="alignmiddle txtcenter" style="width: 150px; background-color: #2F5376;"><a href="<{xoAppUrl }>" title=""><img src="<{xoAppUrl images/logo.gif}>" alt="" /></a></td>
-      <td class="width100 alignmiddle txtcenter" style="background-color: #2F5376;">&nbsp;</td>
-    </tr>
-    <tr>
-      <td style="height: 8px; border-bottom: 1px solid silver; background-color: #ddd;" colspan="2">&nbsp;</td>
-    </tr>
-  </table>
+    <!-- Title and meta -->
+    <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+    <title><{$xoops_sitename}> - <{$xoops_slogan}></title>
+    <meta name="robots" content="<{$xoops_meta_robots}>" />
+    <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+    <meta name="description" content="<{$xoops_meta_description}>" />
+    <meta name="rating" content="<{$xoops_meta_rating}>" />
+    <meta name="author" content="<{$xoops_meta_author}>" />
+    <meta name="generator" content="XOOPS" />
 
-  <table class="width80 txtcenter bnone" cellspacing="1" cellpadding="10">
-    <tr>
-      <td class="txtcenter"><div class="txtcenter bold" style="background-color: #DDFFDF; color: #136C99; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; padding: 10px;"><{$lang_siteclosemsg}></div></td>
-    </tr>
-  </table>
-  
-  <form action="<{xoAppUrl user.php}>" method="post">
-    <table class="collapse txtcenter solidsilver" style="width: 200px;">
-      <tr>
-        <th class="alignmiddle pad2 white" style="background-color: #2F5376;" colspan="2"><{$lang_login}></th>
-      </tr>
-      <tr>
-        <td class="pad2"><{$lang_username}></td><td class="pad2"><input type="text" name="uname" size="12" value="" /></td>
-      </tr>
-      <tr>
-        <td class="pad2"><{$lang_password}></td><td class="pad2"><input type="password" name="pass" size="12" /></td>
-      </tr>
-      <tr>
-        <td class="pad2">&nbsp;</td>
-        <td class="pad2">
-        	<input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
-        	<input type="hidden" name="xoops_login" value="1" />
-        	<input type="submit" value="<{$lang_login}>" /></td>
-      </tr>
-    </table>
-  </form>
+    <!-- Favicon -->
+    <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
+    <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
 
-  <table class="collapse width100">
-    <tr>
-      <td style="height:8px; border-bottom: 1px solid silver; border-top: 1px solid silver; background-color: #ddd;" colspan="2">&nbsp;</td>
-    </tr>
-  </table>
+    <!-- Xoops style sheet -->
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/xoops.bootstrap.css}>" />
 
-  </body>
+    <!--[if lte IE 8]>
+    <link rel="stylesheet" href="<{xoImgUrl styleIE8.css}>" type="text/css" />
+    <![endif]-->
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="brand" href="<{xoAppUrl }>" title="<{$xoops_sitename}>">
+                <img src="<{xoImgUrl img/logo.png}>" alt="<{$xoops_sitename}>" />
+            </a>
+        </div>
+    </div>
+</div>
+<div class="container" style="margin-top: 50px;">
+    <div class="row">
+        <div class="span12">
+            <div class="alert alert-info pagination-centered" style="padding: 30px;">
+                <{$lang_siteclosemsg}>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="span6 offset3">
+            <form class="well form-horizontal" action="<{xoAppUrl user.php}>" method="post">
+                <div class="control-group">
+                    <label class="control-label" for="xo-login-uname"><{$lang_username}></label>
+                    <div class="controls">
+                        <div class="input-prepend">
+                    <span class="add-on">
+                        <i class="icon-user"></i>
+                    </span><input class="span2" type="text" name="uname" id="xo-login-uname" value="" placeholder="<{$lang_username}>">
+                        </div>
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label" for="xo-login-pass"><{$lang_password}></label>
+                    <div class="controls">
+                        <div class="input-prepend">
+                    <span class="add-on">
+                        <i class="icon-cog"></i>
+                    </span><input class="span2" type="password" name="pass" id="xo-login-pass" placeholder="<{$lang_password}>">
+                        </div>
+                    </div>
+                </div>
+                <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
+                <input type="hidden" name="xoops_login" value="1" />
+                <div class="form-actions" style="margin-bottom: 0;">
+                    <button type="submit" class="btn btn-primary"><{$lang_login}></button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+</body>
 </html>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,182 +1,201 @@
 <{if $user_ownpage == true}>
-
-<form name="usernav" action="user.php" method="post">
-
-<br /><br />
-
-<table class="width70 aligncenter bnone">
-  <tr class="txtcenter">
-    <td><input type="button" value="<{$lang_editprofile}>" onclick="location='edituser.php'" />
+<div class="btn-group">
+    <a class="btn" href="<{xoAppUrl edituser.php}>">
+        <i class="icon-edit"></i>
+        <{$lang_editprofile}>
+    </a>
     <{if $avatars == true}>
-    <input type="button" value="<{$lang_avatar}>" onclick="location='edituser.php?op=avatarform'" />
+    <a class="btn" href="<{xoAppUrl edituser.php?op=avatarform}>">
+        <i class="icon-fire"></i>
+        <{$lang_avatar}>
+    </a>
     <{/if}>
-    <input type="button" value="<{$lang_inbox}>" onclick="location='viewpmsg.php'" />
-
+    <a class="btn" href="<{xoAppUrl viewpmsg.php}>">
+        <i class="icon-envelope"></i>
+        <{$lang_inbox}>
+    </a>
     <{if $user_candelete == true}>
-    <input type="button" value="<{$lang_deleteaccount}>" onclick="location='user.php?op=delete'" />
+    <a class="btn btn-danger" href="<{xoAppUrl user.php?op=delete}>">
+        <i class="icon-trash icon-white"></i>
+        <{$lang_deleteaccount}>
+    </a>
     <{/if}>
-
-    <input type="button" value="<{$lang_logout}>" onclick="location='user.php?op=logout'" /></td>
-  </tr>
-</table>
-</form>
-
-<br /><br />
+    <a class="btn" href="<{xoAppUrl user.php?op=logout}>">
+        <i class="icon-off"></i>
+        <{$lang_logout}>
+    </a>
+</div>
 <{elseif $xoops_isadmin != false}>
-
-<br /><br />
-
-<table class="width70 aligncenter bnone">
-  <tr class="txtcenter">
-    <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user_uid}>&amp;op=modifyUser'" />
-    <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;op=delUser&amp;uid=<{$user_uid}>'" />
-  </tr>
-</table>
-
-<br /><br />
+<div class="btn-group">
+    <a class="btn" href="<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user_uid}>&amp;op=modifyUser">
+        <i class="icon-edit"></i>
+        <{$lang_editprofile}>
+    </a>
+    <a class="btn btn-danger" href="<{$xoops_url}>/modules/system/admin.php?fct=users&amp;op=delUser&amp;uid=<{$user_uid}>">
+        <i class="icon-trash icon-white"></i>
+        <{$lang_deleteaccount}>
+    </a>
+</div>
 <{/if}>
+<div class="spacer-large"></div>
+<div class="tabbable">
+    <ul class="nav nav-tabs">
+        <li class="active"><a href="#tab1" data-toggle="tab"><{$lang_allaboutuser}></a></li>
+        <li><a href="#tab2" data-toggle="tab"><{$lang_statistics}></a></li>
+    </ul>
+    <div class="tab-content">
+        <div class="tab-pane active" id="tab1">
+            <table class="table table-bordered table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th colspan="2"><{$lang_allaboutuser}></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <{if $user_avatarurl}>
+                    <tr>
+                        <td><{$lang_avatar}></td>
+                        <td><img src="<{$user_avatarurl}>" alt="Avatar" /></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_realname}>
+                    <tr>
+                        <td><{$lang_realname}></td>
+                        <td><{$user_realname}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_websiteurl}>
+                    <tr>
+                        <td><{$lang_website}></td>
+                        <td><{$user_websiteurl}></td>
+                    </tr>
 
-<table class="width100 bnone" cellspacing="5">
-  <tr class="aligntop">
-    <td class="width50">
-      <table class="outer width100" cellpadding="4" cellspacing="1">
-        <tr>
-          <th colspan="2" class="txtcenter"><{$lang_allaboutuser}></th>
-        </tr>
-        <{if $user_avatarurl}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_avatar}></td>
-          <td class="even txt center"><img src="<{$user_avatarurl}>" alt="Avatar" /></td>
-        </tr>
-        <{/if}>
-        <{if $user_realname}>
-        <tr>
-          <td class="head"><{$lang_realname}></td>
-          <td class="odd center"><{$user_realname}></td>
-        </tr>
-        <{/if}>
-        <{if $user_websiteurl}>
-        <tr>
-          <td class="head"><{$lang_website}></td>
-          <td class="even"><{$user_websiteurl}></td>
-        </tr>
-
-        <{/if}>
-        <{if $user_email}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_email}></td>
-          <td class="odd"><{$user_email}></td>
-        </tr>
-        <{/if}>
-        <{if !$user_ownpage == true}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_privmsg}></td>
-          <td class="even"><{$user_pmlink}></td>
-        </tr>
-        <{/if}>
-        <{if $user_icq}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_icq}></td>
-          <td class="odd"><{$user_icq}></td>
-        </tr>
-        <{/if}>
-        <{if $user_aim}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_aim}></td>
-          <td class="even"><{$user_aim}></td>
-        </tr>
-        <{/if}>
-        <{if $user_yim}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_yim}></td>
-          <td class="odd"><{$user_yim}></td>
-        </tr>
-        <{/if}>
-        <{if $user_msnm}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_msnm}></td>
-          <td class="even"><{$user_msnm}></td>
-        </tr>
-        <{/if}>
-        <{if $user_location}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_location}></td>
-          <td class="odd"><{$user_location}></td>
-        </tr>
-        <{/if}>
-        <{if $user_occupation}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_occupation}></td>
-          <td class="even"><{$user_occupation}></td>
-        </tr>
-        <{/if}>
-        <{if $user_interest}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_interest}></td>
-          <td class="odd"><{$user_interest}></td>
-        </tr>
-        <{/if}>
-        <{if $user_extrainfo}>
-        <tr class="aligntop">
-          <td class="head"><{$lang_extrainfo}></td>
-          <td class="even"><{$user_extrainfo}></td>
-        </tr>
-        <{/if}>
-      </table>
-    </td>
-    <td class="width50">
-      <table class="outer width100" cellpadding="4" cellspacing="1">
-        <tr class="aligntop">
-          <th class="txtcenter" colspan="2"><{$lang_statistics}></th>
-        </tr>
-        <tr class="aligntop">
-          <td class="head"><{$lang_membersince}></td>
-          <td class="even txtcenter"><{$user_joindate}></td>
-        </tr>
-        <tr class="aligntop">
-          <td class="head"><{$lang_rank}></td>
-          <td class="odd txtcenter"><{$user_rankimage}><br /><{$user_ranktitle}></td>
-        </tr>
-        <tr class="aligntop">
-          <td class="head"><{$lang_posts}></td>
-          <td class="even txtcenter"><{$user_posts}></td>
-        </tr>
-    <tr class="aligntop">
-          <td class="head"><{$lang_lastlogin}></td>
-          <td class="odd center"><{$user_lastlogin}></td>
-        </tr>
-      </table>
-      <{if $user_signature}>
-      <br />
-      <table class="outer width100" cellpadding="4" cellspacing="1">
-        <tr class="aligntop">
-          <th colspan="2" class="txtcenter"><{$lang_signature}></th>
-        </tr>
-        <tr class="aligntop">
-          <td class="even"><{$user_signature}></td>
-        </tr>
-      </table>
-      <{/if}>
-    </td>
-  </tr>
-</table>
-
+                    <{/if}>
+                    <{if $user_email}>
+                    <tr>
+                        <td><{$lang_email}></td>
+                        <td><{$user_email}></td>
+                    </tr>
+                    <{/if}>
+                    <{if !$user_ownpage == true}>
+                    <tr>
+                        <td><{$lang_privmsg}></td>
+                        <td><{$user_pmlink}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_icq}>
+                    <tr>
+                        <td><{$lang_icq}></td>
+                        <td><{$user_icq}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_aim}>
+                    <tr>
+                        <td><{$lang_aim}></td>
+                        <td><{$user_aim}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_yim}>
+                    <tr>
+                        <td><{$lang_yim}></td>
+                        <td><{$user_yim}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_msnm}>
+                    <tr>
+                        <td><{$lang_msnm}></td>
+                        <td><{$user_msnm}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_location}>
+                    <tr>
+                        <td><{$lang_location}></td>
+                        <td><{$user_location}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_occupation}>
+                    <tr>
+                        <td><{$lang_occupation}></td>
+                        <td><{$user_occupation}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_interest}>
+                    <tr>
+                        <td><{$lang_interest}></td>
+                        <td><{$user_interest}></td>
+                    </tr>
+                    <{/if}>
+                    <{if $user_extrainfo}>
+                    <tr>
+                        <td><{$lang_extrainfo}></td>
+                        <td><{$user_extrainfo}></td>
+                    </tr>
+                    <{/if}>
+                </tbody>
+            </table>
+        </div>
+        <div class="tab-pane" id="tab2">
+            <table class="table table-bordered table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th colspan="2"><{$lang_statistics}></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><{$lang_membersince}></td>
+                        <td><{$user_joindate}></td>
+                    </tr>
+                    <tr>
+                        <td><{$lang_rank}></td>
+                        <td><{$user_rankimage}><br /><{$user_ranktitle}></td>
+                    </tr>
+                    <tr>
+                        <td><{$lang_posts}></td>
+                        <td><{$user_posts}></td>
+                    </tr>
+                    <tr>
+                        <td><{$lang_lastlogin}></td>
+                        <td><{$user_lastlogin}></td>
+                    </tr>
+                </tbody>
+            </table>
+            <{if $user_signature}>
+            <table class="table table-bordered table-striped table-condensed">
+                <thead>
+                <tr>
+                    <th colspan="2"><{$lang_signature}></th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td><{$user_signature}></td>
+                </tr>
+                </tbody>
+            </table>
+            <{/if}>
+        </div>
+    </div>
+</div>
+<{if $modules}>
+<hr />
 <!-- start module search results loop -->
+<ul class="nav nav-list">
 <{foreach item=module from=$modules}>
-
-<br class="clear" />
-<h4><{$module.name}></h4>
-
-  <!-- start results item loop -->
-  <{foreach item=result from=$module.results}>
-
-  <img src="<{$result.image}>" alt="<{$module.name}>" /><strong><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></strong><br /><span class="x-small">(<{$result.time}>)</span><br />
-
-  <{/foreach}>
-  <!-- end results item loop -->
-
-<{$module.showall_link}>
-
-
+    <li class="nav-header">
+        <{$module.name}>
+    </li>
+    <!-- start results item loop -->
+    <{foreach item=result from=$module.results}>
+    <li>
+        <img src="<{$result.image}>" alt="<{$module.name}>" />
+        <strong><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></strong><br />
+        <span class="x-small">(<{$result.time}>)</span>
+    </li>
+    <{/foreach}>
+    <!-- end results item loop -->
+    <li><{$module.showall_link}></li>
 <{/foreach}>
-<!-- end module search results loop -->
\ No newline at end of file
+</ul>
+<!-- end module search results loop -->
+<{/if}>

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2012-07-09 19:34:57 UTC (rev 9829)
@@ -39,7 +39,7 @@
 
         $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css');
         $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
-        $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/bootstrap.min.css'));
+        $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css'));
 
 
         $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php	2012-07-09 19:34:57 UTC (rev 9829)
@@ -29,6 +29,7 @@
 define("_DEFAULT_SYSTEM_EXTENSION","System extensions");
 define("_DEFAULT_INSTALLEDMODULES","Installed modules");
 define("_DEFAULT_INSTALLEDEXTENSIONS","Installed extensions");
+define("_DEFAULT_NO_MODULE", "There is no modules installed actually");
 
 define("_DEFAULT_XOOPSTHEMES","XOOPS Themes");
 define("_DEFAULT_XOOPSMODULES","XOOPS Modules");
@@ -77,4 +78,3 @@
 define("_DEFAULT_HELP_DESC_2",'Blocks are discreet sections of content that can be created and configured in the admin interface. Custom blocks can be created and are typically made up of text, graphics and pictures. The content in these blocks may be formatted individually or inherit the site formatting. (<a href="modules/system/help.php?mid=1&page=blocksadmin">more ...</a>)');
 define("_DEFAULT_HELP_3","How I can find more help?");
 define("_DEFAULT_HELP_DESC_3",'If you need more help and information to using XOOPS you can use <a href="modules/system/help.php">Help pages </a> in system module or use <a href="http://www.xoops.org" rel="external">XOOPS Local support sites </a>');
-?>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -63,6 +63,7 @@
                         <a class="down" href="javascript:;">&nbsp;</a>
                     </div>
                     <div class="xo-window-data">
+                        <{if count($module_menu) > 1 }>
                         <table class="condensed-table">
                             <{foreach item=mod_list from=$module_menu}>
                             <{if $mod_list->getInfo(dirname) != 'system'}>
@@ -73,6 +74,12 @@
                             <{/if}>
                             <{/foreach}>
                         </table>
+                        <{else}>
+                        <div class="alert alert-info">
+                            <i class="ico-information"></i>
+                            <{$smarty.const._DEFAULT_NO_MODULE}>
+                        </div>
+                        <{/if}>
                         <div class="mod-link">
                             <div class="pull-right">
                                 <a class="btn btn-mini btn-info" href="<{xoAppUrl modules/system/admin.php?fct=modulesadmin}>">
@@ -102,6 +109,7 @@
                                 <td><a href="<{$plug_list->getInfo('link_admin')}>"><{$plug_list->getInfo(name)}></a>
                                 </td>
                             </tr>
+                            <{assign var=have-plugins value=true}>
                             <{/if}>
                             <{/foreach}>
                         </table>

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
-<!-- title and metas -->
-<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
-<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-<meta name="robots" content="<{$xoops_meta_robots}>" />
-<meta name="keywords" content="<{$xoops_meta_keywords}>" />
-<meta name="description" content="<{$xoops_meta_description}>" />
-<meta name="rating" content="<{$xoops_meta_rating}>" />
-<meta name="author" content="<{$xoops_meta_author}>" />
-<meta name="copyright" content="<{$xoops_meta_copyright}>" />
-<meta name="generator" content="XOOPS" />
-<{if $url}>
-        <meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
-<{/if}>
-
-<!-- Force MSIE without  javascript actived to take the default theme. not conforms to the standards but functional -->
-<{if $isMsie}>
-    <noscript>
-        <meta http-equiv="refresh" content="0; url=<{xoAppUrl . xoops_theme_select=default}>" />
-    </noscript>
-<{/if}>
-
-<!-- path favicon -->
-<link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
-<link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
-
-<!-- include xoops.js and others via header.php -->
-<{$xoops_module_header}>
-
-<!-- Xoops style sheet -->
-<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
-
-<!-- Theme style sheets -->
-<link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl style.css}>" />
-
-</head>
-<body id="xo-refresh">
-<div id="xo-wrapper" class="container center">
-    <div id="xo-redirect">
-        <div class="message">
-            <{$message}>
-            <br />
-            <img src="<{xoImgUrl icons/ajax_indicator_01.gif}>" alt="<{$message}>"/>
-        </div>
-        <div class="notreload">
-            <{$lang_ifnotreload}>
-        </div>
-        <{if $xoops_logdump != ''}><div><{$xoops_logdump}></div><{/if}>
-    </div>
-</div>
-
-</body>
-</html>
\ No newline at end of file

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
-    <!-- title and metas -->
-    <title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
-    <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-    <meta name="robots" content="<{$xoops_meta_robots}>" />
-    <meta name="keywords" content="<{$xoops_meta_keywords}>" />
-    <meta name="description" content="<{$xoops_meta_description}>" />
-    <meta name="rating" content="<{$xoops_meta_rating}>" />
-    <meta name="author" content="<{$xoops_meta_author}>" />
-    <meta name="copyright" content="<{$xoops_meta_copyright}>" />
-    <meta name="generator" content="XOOPS" />
-    <{if $url}>
-        <meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
-    <{/if}>
-
-    <!-- Force MSIE without  javascript actived to take the default theme. not conforms to the standards but functional -->
-    <{if $isMsie}>
-        <noscript>
-            <meta http-equiv="refresh" content="0; url=<{xoAppUrl . xoops_theme_select=default}>" />
-        </noscript>
-    <{/if}>
-
-    <!-- path favicon -->
-    <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
-    <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
-
-    <!-- include xoops.js and others via header.php -->
-    <{$xoops_module_header}>
-
-    <!-- Xoops style sheet -->
-    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
-
-    <!-- Theme style sheets -->
-    <link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl style.css}>" />
-</head>
-<body>
-
-<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
-    <div class="xo-wrapper">
-        <div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
-        <div id="xo-header" class="<{$xoops_dirname}>">
-            <div id="xo-top">
-            <!-- include du bloc Utilisateur dans le header -->
-            </div>
-            <!-- Start Header -->
-            <table cellspacing="0">
-                <tr id="header">
-                    <td id="headerlogo"><a href="<{xoAppUrl /}>" title="<{$xoops_sitename}>"><img src="<{xoImgUrl xoops-logo.png}>" alt="<{$xoops_sitename}>" /></a></td>
-                    <td id="headerbanner"><{$xoops_banner}></td>
-                    <td id="xo-userbar_siteclosed">
-                        <!-- menu in anonymous mode  -->
-                        <form method="post" action="<{xoAppUrl /user.php op=login}>">
-                            <input name="uname" type="text" title="" />
-                            <input name="pass" type="password" title=""/>
-                            <input type="hidden" name="xoops_redirect" value="<{$smarty.server.REQUEST_URI}>" />
-                            <{if $lang_siteclosemsg}>
-                                <input type="hidden" name="xoops_login" value="1" />
-                            <{/if}>
-                            <input type="hidden" name="op" value="login" />
-                            <input type="submit" value="<{$lang_login}>" />
-                        </form>
-                    </td>
-                </tr>
-                <tr>
-                    <td id="headerbar" colspan="3">&nbsp;</td>
-                </tr>
-            </table>
-            <!-- End header -->
-        </div>
-
-        <div id="xo-canvas-content">
-            <div id="xo-page">
-                <div id="xo-siteclose"><{$lang_siteclosemsg}></div>
-            </div>
-        </div>
-
-        <!-- Start footer -->
-        <table cellspacing="0">
-            <tr id="footerbar">
-                <td><{$xoops_footer}></td>
-            </tr>
-        </table>
-        <!-- End footer -->
-
-        <!--{xo-logger-output}-->
-    </div>
-</div>
-
-</body>
-</html>

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -90,6 +90,7 @@
             </div>
             <!-- End content module -->
             <{/if}>
+            <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomcenter or $xoBlocks.page_bottomright}>
             <div class="row">
                 <div class="span<{$col_span}> xo-bottom">
                     <div class="row">
@@ -104,7 +105,7 @@
                     <div class="row">
                         <div class="span<{$col_span_mid}> xo-left">
                             <!-- Start center-left blocks loop -->
-                            <{foreach item=block from=$xoBlocks.page_bottomright}>
+                            <{foreach item=block from=$xoBlocks.page_bottomleft}>
                             <{includeq file="$theme_tpl/block_center_l.html"}>
                             <{/foreach}>
                             <!-- End center-left blocks loop -->
@@ -120,6 +121,7 @@
                     </div>
                 </div>
             </div>
+            <{/if}>
         </div>
         <{if $xoops_showrblock}>
         <div class="span3 xo-block-right">

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html	2012-07-09 19:34:57 UTC (rev 9829)
@@ -16,7 +16,7 @@
             <ul class="dropdown-menu">
                 <{if $xoops_isadmin}>
                 <li>
-                    <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._THEME_ADMIN}>">
+                    <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._THEME_ADMIN}>" rel="external">
                         <i class="icon-wrench"></i>
                         <{$smarty.const._THEME_ADMIN}>
                     </a>

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css	2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css	2012-07-09 19:34:57 UTC (rev 9829)
@@ -368,7 +368,7 @@
 	box-shadow: 0 0 20px #787878;
 		-webkit-box-shadow:0 0 20px #787878;
 		-moz-box-shadow:0 0 20px #787878;
-		filter:progid:DXImageTransform.Microsoft.Shadow(color='#bbbbbb', Direction=135, Strength=5); 
+		filter:progid:DXImageTransform.Microsoft.Shadow(color='#bbbbbb', Direction=135, Strength=5);
 		zoom: 1;
 }
 .boxrelief {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9828] XoopsModules/TDMPicture/trunk/TDMPicture/css/ tdmpicture.css

[<lor...@us...>]

Revision: 9828
          http://xoops.svn.sourceforge.net/xoops/?rev=9828&view=rev
Author:   lord_venom
Date:     2012-07-09 17:20:33 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 17:19:31 UTC (rev 9827)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-09 17:20:33 UTC (rev 9828)
@@ -339,7 +339,9 @@
 }
 
 .switch_title, .switch_title a {
-
+	margin-top:10px;
+	font-size: 1.3em;	
+	padding: 2px;
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.