diff --git a/bbcode.php b/bbcode.php index 247c264..e90a0ae 100644 --- a/bbcode.php +++ b/bbcode.php @@ -15,8 +15,10 @@ if (!class_exists('cartpaujBBCodeParser')) '/\[\*\](.+)\\n/Ui', '/\[spoil\](.+)\[\/spoil\]/Uis', '/\[b\](.+)\[\/b\]/Uis', + '/\[quotetitle\](.+)\[\/quotetitle\]/Uis', '/\[i\](.+)\[\/i\]/Uis', '/\[u\](.+)\[\/u\]/Uis', + '/\[font size=[0-9]*\](.+)\[\/font\]/Uis', '/\[s\](.+)\[\/s\]/Uis', '/\[url=(.+)\](.+)\[\/url\]/Ui', '/\[url](.+)\[\/url\]/Ui', @@ -27,21 +29,13 @@ if (!class_exists('cartpaujBBCodeParser')) '/\[email=(.+)\](.+)\[\/email\]/Ui', '/\[img\](.+)\[\/img\]/Ui', '/\[img=(.+)\](.+)\[\/img\]/Ui', - '/\[color=(\#[0-9a-f]{6}|[a-z]+)\](.+)\[\/color\]/Ui', '/\[color=(\#[0-9a-f]{6}|[a-z]+)\](.+)\[\/color\]/Uis', - '/\[left\](.+)\[\/left\]/Ui', '/\[left\](.+)\[\/left\]/Uis', - '/\[center\](.+)\[\/center\]/Ui', '/\[center\](.+)\[\/center\]/Uis', - '/\[right\](.+)\[\/right\]/Ui', '/\[right\](.+)\[\/right\]/Uis', - '/\[justify\](.+)\[\/justify\]/Ui', '/\[justify\](.+)\[\/justify\]/Uis', - '/\[spoiler\](.+)\[\/spoiler\]/Ui', '/\[spoiler\](.+)\[\/spoiler\]/Uis', - '/\[spoiler=(.+)\](.+)\[\/spoiler\]/Ui', '/\[spoiler=(.+)\](.+)\[\/spoiler\]/Uis', - '/\[quote](.+)\[\/quote]/Ui', '/\[quote](.+)\[\/quote]/Uis' ); @@ -49,35 +43,29 @@ if (!class_exists('cartpaujBBCodeParser')) ( '', '
  • \1
    • ', - '\1', + '\1', '\1', + '
    \1
    ', '\1', '\1', + '\2', '\1', - '\2', - '\1', - '', + '\2', + '\1', + '', '\1', '\1', - '\1', - '\2', - 'Image', - '\2', - '\2', - '
    \2
    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '

    \1

    ', - '', - '', - '', - '', - '
    \1
    ', + '\1', + '\2', + 'Image', + '\2', + '\2', + '

    \1

    ', + '

    \1

    ', + '

    \1

    ', + '

    \1

    ', + '', + '', '
    \1
    ' ); diff --git a/fs-admin/fs-admin.php b/fs-admin/fs-admin.php index d3abbb2..70fc273 100644 --- a/fs-admin/fs-admin.php +++ b/fs-admin/fs-admin.php @@ -229,7 +229,7 @@ $image = WPFURL."images/user.png"; $image = WPFURL."images/logomain.png"; echo "

    ".__("Mingle Forum >> Skin options", "mingleforum")."


    ".__("Get More Skins", "mingleforum")."

    - +
    @@ -546,14 +546,17 @@ $image = WPFURL."images/user.png"; "; echo " - - - + + + - + echo "/> ($defStr = ".__('Off', 'mingleforum').") + "; echo " diff --git a/i18n/mingleforum-fr_FR.mo b/i18n/mingleforum-fr_FR.mo index 277920e..ab5e8a4 100644 Binary files a/i18n/mingleforum-fr_FR.mo and b/i18n/mingleforum-fr_FR.mo differ diff --git a/i18n/mingleforum-fr_FR.po b/i18n/mingleforum-fr_FR.po index ff6122a..7ef5259 100644 --- a/i18n/mingleforum-fr_FR.po +++ b/i18n/mingleforum-fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Mingle Forum\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-20 10:58+0100\n" -"PO-Revision-Date: 2013-08-20 10:58+0100\n" +"POT-Creation-Date: 2013-08-20 16:37+0100\n" +"PO-Revision-Date: 2013-08-20 16:37+0100\n" "Last-Translator: Xefir Destiny \n" "Language-Team: Gobiel \n" "Language: fr_FR\n" @@ -15,19 +15,19 @@ msgstr "" "X-Generator: Poedit 1.5.7\n" "X-Poedit-SearchPath-0: .\n" -#: bbcode.php:122 +#: bbcode.php:110 msgid "Code" msgstr "Code" -#: bbcode.php:126 +#: bbcode.php:114 msgid "Embed YouTube Video" msgstr "Ajouter une vidéo Youtube" -#: bbcode.php:130 +#: bbcode.php:118 msgid "Embed Google Map" msgstr "Insérer la carte Google" -#: bbcode.php:134 +#: bbcode.php:122 msgid "Spoiler" msgstr "Objet caché" @@ -39,7 +39,7 @@ msgstr "Fil RSS du forum" msgid "Forum Topic:" msgstr "Sujet du forum:" -#: feed.php:30 wpf.class.php:1815 wpf_define.php:30 +#: feed.php:30 wpf.class.php:1822 wpf_define.php:30 msgid "Forum" msgstr "Forum" @@ -83,13 +83,13 @@ msgstr "Vous avez des notifications par courriel pour ces discussions:" msgid "You have email notifications for these Topics:" msgstr "Vous avez des notifications par courriel pour ces discussions:" -#: wpf-edit-profile.php:59 fs-admin/fs-admin.php:576 +#: wpf-edit-profile.php:59 fs-admin/fs-admin.php:579 msgid "Save options" msgstr "Sauvegarder les options" -#: wpf-edit-profile.php:65 wpf.class.php:589 wpf.class.php:2055 -#: wpf.class.php:2077 wpf.class.php:2108 wpf.class.php:2132 wpf.class.php:2140 -#: wpf.class.php:2274 +#: wpf-edit-profile.php:65 wpf.class.php:596 wpf.class.php:2062 +#: wpf.class.php:2084 wpf.class.php:2115 wpf.class.php:2139 wpf.class.php:2147 +#: wpf.class.php:2281 msgid "An unknown error has occured. Please try again." msgstr "" "Une erreur inconnue s'est produite. Réessayez de nouveau s'il vous plait." @@ -98,36 +98,36 @@ msgstr "" msgid "Oops only Administrators can post in this Forum!" msgstr "Oups. Seuls les administrateurs peuvent poster sur ce forum !" -#: wpf-insert.php:36 +#: wpf-insert.php:38 msgid "To help prevent spam, we require that you wait" msgstr "Pour éviter le spam, nous vous demandons d'attendre" -#: wpf-insert.php:36 +#: wpf-insert.php:38 msgid "" "minutes before posting again. Please use your browsers back button to return." msgstr "" "quelques minutes avant de poster à nouveau. Utilisez le bouton retour de " "votre navigateur pour revenir en arrière." -#: wpf-insert.php:137 +#: wpf-insert.php:142 msgid "Security code does not match" msgstr "Les codes de sécurité ne sont pas les mêmes" -#: wpf-insert.php:154 wpf-insert.php:159 wpf-insert.php:164 wpf-insert.php:218 -#: wpf-insert.php:223 wpf-insert.php:228 wpf-insert.php:274 wpf-insert.php:279 -#: wpf-insert.php:285 +#: wpf-insert.php:159 wpf-insert.php:164 wpf-insert.php:169 wpf-insert.php:223 +#: wpf-insert.php:228 wpf-insert.php:233 wpf-insert.php:279 wpf-insert.php:284 +#: wpf-insert.php:290 msgid "An error occured" msgstr "Erreur" -#: wpf-insert.php:155 wpf-insert.php:219 wpf-insert.php:275 +#: wpf-insert.php:160 wpf-insert.php:224 wpf-insert.php:280 msgid "You must enter a subject" msgstr "Vous devez entrer un sujet" -#: wpf-insert.php:160 wpf-insert.php:224 wpf-insert.php:280 +#: wpf-insert.php:165 wpf-insert.php:229 wpf-insert.php:285 msgid "You must enter a message" msgstr "Vous devez entrer un message" -#: wpf-insert.php:286 +#: wpf-insert.php:291 msgid "You do not have permission to edit this post!" msgstr "Vous n'avez pas la permission pour voir cela" @@ -135,11 +135,11 @@ msgstr "Vous n'avez pas la permission pour voir cela" msgid "Quote from" msgstr "Citation de" -#: wpf-post.php:10 wpf.class.php:648 wpf.class.php:657 wpf.class.php:1211 +#: wpf-post.php:10 wpf.class.php:655 wpf.class.php:664 wpf.class.php:1218 msgid "on" msgstr "le" -#: wpf-post.php:20 wpf.class.php:1348 wpf.class.php:1881 +#: wpf-post.php:20 wpf.class.php:1355 wpf.class.php:1888 msgid "Post Reply" msgstr "Répondre au message" @@ -147,7 +147,7 @@ msgstr "Répondre au message" msgid "Subject:" msgstr "Sujet:" -#: wpf-post.php:24 wpf.class.php:928 +#: wpf-post.php:24 wpf.class.php:935 msgid "Re:" msgstr "Re:" @@ -163,7 +163,7 @@ msgstr "Image" msgid "Submit" msgstr "Envoyer" -#: wpf-post.php:73 wpf.class.php:1345 wpf.class.php:1884 +#: wpf-post.php:73 wpf.class.php:1352 wpf.class.php:1891 msgid "Edit Post" msgstr "Modifier" @@ -179,99 +179,99 @@ msgstr "Créer une nouvelle discussion" msgid "Sorry. you don't have permission to post." msgstr "Désolé. Vous n'avez pas la permission pour publier" -#: wpf.class.php:151 fs-admin/fs-admin.php:439 +#: wpf.class.php:152 fs-admin/fs-admin.php:439 msgid "Newbie" msgstr "Nouveau" -#: wpf.class.php:152 fs-admin/fs-admin.php:443 +#: wpf.class.php:153 fs-admin/fs-admin.php:443 msgid "Beginner" msgstr "Débutant" -#: wpf.class.php:153 fs-admin/fs-admin.php:451 +#: wpf.class.php:154 fs-admin/fs-admin.php:451 msgid "Advanced" msgstr "Avancé" -#: wpf.class.php:154 fs-admin/fs-admin.php:459 +#: wpf.class.php:155 fs-admin/fs-admin.php:459 msgid "Pro" msgstr "Profil" -#: wpf.class.php:177 wpf.class.php:178 +#: wpf.class.php:178 wpf.class.php:179 msgid "Mingle Forum - Options" msgstr "Mingle Forum >> Options de Skins" -#: wpf.class.php:178 +#: wpf.class.php:179 msgid "Options" msgstr "Options générales" -#: wpf.class.php:179 +#: wpf.class.php:180 msgid "Ads" msgstr "Annonces" -#: wpf.class.php:180 +#: wpf.class.php:181 msgid "Skins" msgstr "Skins" -#: wpf.class.php:181 +#: wpf.class.php:182 msgid "Forum Structure - Categories & Forums" msgstr "Catégories et forums" -#: wpf.class.php:181 +#: wpf.class.php:182 msgid "Forum Structure" msgstr "Structure du forum" -#: wpf.class.php:182 +#: wpf.class.php:183 msgid "Moderators" msgstr "Modérateurs" -#: wpf.class.php:183 +#: wpf.class.php:184 msgid "User Groups" msgstr "Groupes" -#: wpf.class.php:184 +#: wpf.class.php:185 msgid "About" msgstr "À propos" -#: wpf.class.php:193 wpf.class.php:194 +#: wpf.class.php:194 wpf.class.php:195 msgid "Forums Latest Activity" msgstr "Dernières activités du forum" -#: wpf.class.php:213 wpf.class.php:233 +#: wpf.class.php:214 wpf.class.php:234 msgid "by:" msgstr "par:" -#: wpf.class.php:250 +#: wpf.class.php:251 msgid "Title to display in the sidebar:" msgstr "Titre à afficher dans la barre latérale:" -#: wpf.class.php:252 +#: wpf.class.php:253 msgid "How many items would you like to display?" msgstr "Combien de messages voulez-vou afficher ?" -#: wpf.class.php:639 wpf.class.php:2309 +#: wpf.class.php:646 wpf.class.php:2316 msgid "Guest" msgstr "Invité" -#: wpf.class.php:648 wpf.class.php:1210 +#: wpf.class.php:655 wpf.class.php:1217 msgid "by" msgstr "par" -#: wpf.class.php:657 +#: wpf.class.php:664 msgid "Latest Post by" msgstr "Dernier message par" -#: wpf.class.php:688 wpf.class.php:1131 +#: wpf.class.php:695 wpf.class.php:1138 msgid "Topics: " msgstr "Discussions: " -#: wpf.class.php:688 wpf.class.php:1131 +#: wpf.class.php:695 wpf.class.php:1138 msgid "Posts: " msgstr "Messages: " -#: wpf.class.php:711 +#: wpf.class.php:718 msgid "Remove this Forum from your email notifications?" msgstr "Supprimer cette discussion de vos alertes par courriel?" -#: wpf.class.php:713 +#: wpf.class.php:720 msgid "" "This will notify you of all new Topics created in this Forum. Are you sure " "that is what you want to do?" @@ -279,64 +279,64 @@ msgstr "" "Cela va vous informer de tous les sujets créés dans ce forum. Etes-vous sûr " "que c'est ce que vous voulez faire ?" -#: wpf.class.php:719 wpf.class.php:856 +#: wpf.class.php:726 wpf.class.php:863 msgid "Sorry, but you don't have access to this forum" msgstr "Désolé, mais vous n'avez pas l'accès à ce forum" -#: wpf.class.php:725 wpf.class.php:1432 +#: wpf.class.php:732 wpf.class.php:1439 msgid "Subforums" msgstr "Sous-forums" -#: wpf.class.php:738 wpf.class.php:2362 +#: wpf.class.php:745 wpf.class.php:2369 msgid "Status" msgstr "Statut" -#: wpf.class.php:739 wpf.class.php:2363 +#: wpf.class.php:746 wpf.class.php:2370 msgid "Topic Title" msgstr "Titre" -#: wpf.class.php:740 wpf.class.php:2364 wpf.class.php:2476 +#: wpf.class.php:747 wpf.class.php:2371 wpf.class.php:2483 msgid "Started by" msgstr "Créé par" -#: wpf.class.php:741 wpf.class.php:1059 wpf.class.php:2365 +#: wpf.class.php:748 wpf.class.php:1066 wpf.class.php:2372 msgid "Replies" msgstr "Réponses" -#: wpf.class.php:742 wpf.class.php:1059 +#: wpf.class.php:749 wpf.class.php:1066 msgid "Views" msgstr "Vues" -#: wpf.class.php:743 wpf.class.php:1210 wpf.class.php:2366 +#: wpf.class.php:750 wpf.class.php:1217 wpf.class.php:2373 msgid "Last post" msgstr "Dernier message" -#: wpf.class.php:747 +#: wpf.class.php:754 msgid "Sticky Topics" msgstr "Discussions du moment" -#: wpf.class.php:751 wpf.class.php:753 wpf.class.php:797 wpf.class.php:799 -#: wpf.class.php:1663 wpf.class.php:1671 +#: wpf.class.php:758 wpf.class.php:760 wpf.class.php:804 wpf.class.php:806 +#: wpf.class.php:1670 wpf.class.php:1678 msgid "Move Topic" msgstr "Déplacer la discussion" -#: wpf.class.php:751 wpf.class.php:753 wpf.class.php:797 wpf.class.php:799 +#: wpf.class.php:758 wpf.class.php:760 wpf.class.php:804 wpf.class.php:806 msgid "Delete Topic" msgstr "Supprimer la discussion" -#: wpf.class.php:763 wpf.class.php:792 wpf.class.php:1049 +#: wpf.class.php:770 wpf.class.php:799 wpf.class.php:1056 msgid "New posts since last visit" msgstr "Nouveaux messages depuis la dernière visite" -#: wpf.class.php:780 +#: wpf.class.php:787 msgid "Forum Topics" msgstr "Discussions" -#: wpf.class.php:846 +#: wpf.class.php:853 msgid "Remove this Topic from your email notifications?" msgstr "Supprimer cette discussion de vos alertes par courriel?" -#: wpf.class.php:848 +#: wpf.class.php:855 msgid "" "This will notify you of all responses to this Topic. Are you sure that is " "what you want to do?" @@ -344,386 +344,386 @@ msgstr "" "Cela va vous informer de toutes les réponses à cette rubrique. Etes-vous sûr " "que c'est ce que vous voulez faire ?" -#: wpf.class.php:867 +#: wpf.class.php:874 msgid "TOPIC CLOSED" msgstr "DISCUSSION FERMÉE" -#: wpf.class.php:873 +#: wpf.class.php:880 msgid "Author" msgstr "Auteur" -#: wpf.class.php:889 wpf.class.php:2420 +#: wpf.class.php:896 wpf.class.php:2427 msgid "Posts:" msgstr "Messages:" -#: wpf.class.php:927 +#: wpf.class.php:934 msgid "Quick Reply" msgstr "Réponse rapide" -#: wpf.class.php:935 +#: wpf.class.php:942 msgid "Submit Quick Reply" msgstr "Réponse rapide" -#: wpf.class.php:959 wpf_define.php:33 +#: wpf.class.php:966 wpf_define.php:33 msgid "Post" msgstr "Publier" -#: wpf.class.php:962 +#: wpf.class.php:969 msgid "on:" msgstr "le:" -#: wpf.class.php:968 wpf.class.php:977 +#: wpf.class.php:975 wpf.class.php:984 msgid "Quote" msgstr "Citer" -#: wpf.class.php:970 wpf.class.php:979 fs-admin/fs-admin.php:149 -#: fs-admin/fs-admin.php:975 +#: wpf.class.php:977 wpf.class.php:986 fs-admin/fs-admin.php:149 +#: fs-admin/fs-admin.php:978 msgid "Remove" msgstr "Supprimer" -#: wpf.class.php:972 wpf.class.php:981 +#: wpf.class.php:979 wpf.class.php:988 msgid "Edit" msgstr "Modifier" -#: wpf.class.php:1038 +#: wpf.class.php:1045 msgid "Latest posts" msgstr "Derniers messages" -#: wpf.class.php:1089 wpf.class.php:1142 +#: wpf.class.php:1096 wpf.class.php:1149 msgid "New posts" msgstr "Nouveaux messages" -#: wpf.class.php:1089 wpf.class.php:1142 +#: wpf.class.php:1096 wpf.class.php:1149 msgid "No new posts" msgstr "Aucun nouveau message" -#: wpf.class.php:1089 +#: wpf.class.php:1096 msgid "Mark All Read" msgstr "Marquer tout comme lu" -#: wpf.class.php:1208 +#: wpf.class.php:1215 msgid "No topics yet" msgstr "Aucune discussion pour l'instant" -#: wpf.class.php:1211 +#: wpf.class.php:1218 msgid "in" msgstr "dans" -#: wpf.class.php:1269 +#: wpf.class.php:1276 msgid "Forums RSS" msgstr "Fil RSS des forums" -#: wpf.class.php:1284 +#: wpf.class.php:1291 msgid "Are you sure you want to remove this?" msgstr "Êtes-vous sûr de vouloir supprimer cela ?" -#: wpf.class.php:1339 wpf.class.php:1874 +#: wpf.class.php:1346 wpf.class.php:1881 msgid "Search Results" msgstr "Résultats de la recherche" -#: wpf.class.php:1342 +#: wpf.class.php:1349 msgid "Profile" msgstr "Profil" -#: wpf.class.php:1351 wpf.class.php:1572 wpf.class.php:1887 +#: wpf.class.php:1358 wpf.class.php:1579 wpf.class.php:1894 msgid "New Topic" msgstr "Nouvelle discussion" -#: wpf.class.php:1422 +#: wpf.class.php:1429 msgid "Moderators:" msgstr "Modérateurs:" -#: wpf.class.php:1577 wpf.class.php:1637 +#: wpf.class.php:1584 wpf.class.php:1644 msgid "Unsubscribe" msgstr "Souscrire" -#: wpf.class.php:1579 wpf.class.php:1639 +#: wpf.class.php:1586 wpf.class.php:1646 msgid "Subscribe" msgstr "Souscrire" -#: wpf.class.php:1603 wpf.class.php:1616 +#: wpf.class.php:1610 wpf.class.php:1623 msgid "Undo Sticky" msgstr "-Important" -#: wpf.class.php:1605 wpf.class.php:1618 +#: wpf.class.php:1612 wpf.class.php:1625 msgid "Sticky" msgstr "+Important" -#: wpf.class.php:1608 wpf.class.php:1621 +#: wpf.class.php:1615 wpf.class.php:1628 msgid "Re-open" msgstr "Réouvrir" -#: wpf.class.php:1610 wpf.class.php:1623 +#: wpf.class.php:1617 wpf.class.php:1630 msgid "Close" msgstr "Fermer" -#: wpf.class.php:1632 +#: wpf.class.php:1639 msgid "Reply" msgstr "Répondre" -#: wpf.class.php:1642 +#: wpf.class.php:1649 msgid "RSS feed" msgstr "Fil RSS" -#: wpf.class.php:1656 +#: wpf.class.php:1663 msgid "My profile" msgstr "Mon profil" -#: wpf.class.php:1656 +#: wpf.class.php:1663 msgid "My Profile" msgstr "Mon profil" -#: wpf.class.php:1661 wpf.class.php:1669 +#: wpf.class.php:1668 wpf.class.php:1676 msgid "Forum Home" msgstr "Accueil" -#: wpf.class.php:1736 +#: wpf.class.php:1743 msgid "You are logged in as:" msgstr "Vous êtes enregistrés sous:" -#: wpf.class.php:1742 +#: wpf.class.php:1749 msgid "Username: " msgstr "Pseudonyme:" -#: wpf.class.php:1743 +#: wpf.class.php:1750 msgid "Password: " msgstr "Mot de passe:" -#: wpf.class.php:1745 +#: wpf.class.php:1752 msgid "Remember Me" msgstr "Se rappeler de moi" -#: wpf.class.php:1764 +#: wpf.class.php:1771 msgid "Administrator" msgstr "Administrateur" -#: wpf.class.php:1768 +#: wpf.class.php:1775 msgid "Moderator" msgstr "Modérateur" -#: wpf.class.php:1868 +#: wpf.class.php:1875 msgid "New Topics since last visit" msgstr "Nouvelles discussions depuis la dernière visite" -#: wpf.class.php:1878 +#: wpf.class.php:1885 msgid "Profile Info" msgstr "Infos du profil" -#: wpf.class.php:1934 +#: wpf.class.php:1941 msgid "Edit Profile" msgstr "Modifier le profil" -#: wpf.class.php:1937 wpf.class.php:1948 +#: wpf.class.php:1944 wpf.class.php:1955 msgid "Welcome" msgstr "Bienvenue" -#: wpf.class.php:1938 +#: wpf.class.php:1945 msgid "Your last visit was:" msgstr "Votre dernière visite était le:" -#: wpf.class.php:1939 +#: wpf.class.php:1946 msgid "Show new topics since your last visit" msgstr "Montrer les nouvelles discussions" -#: wpf.class.php:1940 +#: wpf.class.php:1947 msgid "Edit your forum options" msgstr "Modifier les options du forum" -#: wpf.class.php:1942 +#: wpf.class.php:1949 msgid "Log out" msgstr "Se déconnecter" -#: wpf.class.php:1947 +#: wpf.class.php:1954 msgid "Welcome Guest, please login or" msgstr "Bienvenue utilisateur invité. Merci de vous enregistrer ou de vous " -#: wpf.class.php:1947 +#: wpf.class.php:1954 msgid "register." msgstr "inscrire." -#: wpf.class.php:1952 +#: wpf.class.php:1959 msgid "Welcome Guest, posting in this forum requires" msgstr "Bienvenue utilisateur invité, publier sur ce forum requiert" -#: wpf.class.php:1952 +#: wpf.class.php:1959 msgid "registration." msgstr "une inscription." -#: wpf.class.php:1960 +#: wpf.class.php:1967 msgid "Show/Hide Header" msgstr "Afficher/Cacher l'entête" -#: wpf.class.php:1974 +#: wpf.class.php:1981 msgid "Search forums" msgstr "Rechercher dans les forums" -#: wpf.class.php:1988 wpf.class.php:2019 +#: wpf.class.php:1995 wpf.class.php:2026 msgid "Pages:" msgstr "Pages:" -#: wpf.class.php:2001 wpf.class.php:2032 +#: wpf.class.php:2008 wpf.class.php:2039 msgid "First" msgstr "Premier de la liste" -#: wpf.class.php:2012 wpf.class.php:2043 +#: wpf.class.php:2019 wpf.class.php:2050 msgid "Last" msgstr "Dernier de la liste" -#: wpf.class.php:2067 +#: wpf.class.php:2074 msgid "Move" msgstr "Déplacer" -#: wpf.class.php:2067 +#: wpf.class.php:2074 msgid "to new forum:" msgstr "vers un nouveau forum :" -#: wpf.class.php:2130 +#: wpf.class.php:2137 msgid "Post deleted" msgstr "Message supprimé" -#: wpf.class.php:2308 fs-admin/fs-admin.php:151 +#: wpf.class.php:2315 fs-admin/fs-admin.php:151 msgid "View profile" msgstr "Voir le profil" -#: wpf.class.php:2326 +#: wpf.class.php:2333 msgid "Info Center" msgstr "Centre d'informations" -#: wpf.class.php:2333 +#: wpf.class.php:2340 msgid "Posts in" msgstr "Messages dans" -#: wpf.class.php:2333 +#: wpf.class.php:2340 msgid "Topics Made by" msgstr "discussions crées par" -#: wpf.class.php:2333 fs-admin/fs-admin.php:143 +#: wpf.class.php:2340 fs-admin/fs-admin.php:143 msgid "Members" msgstr "Membres" -#: wpf.class.php:2333 +#: wpf.class.php:2340 msgid "Latest Member:" msgstr "Derniers membres:" -#: wpf.class.php:2359 +#: wpf.class.php:2366 msgid "New topics since your last visit" msgstr "Nouvelles discussions depuis votre dernière visite" -#: wpf.class.php:2405 +#: wpf.class.php:2412 msgid "Summary" msgstr "Sommaire" -#: wpf.class.php:2411 wpf.class.php:2619 wpf.class.php:2641 wpf.class.php:2663 +#: wpf.class.php:2418 wpf.class.php:2626 wpf.class.php:2648 wpf.class.php:2670 #: fs-admin/wpf-add-forum.php:14 fs-admin/wpf-edit-forum-group.php:38 #: fs-admin/wpf-usergroup-edit.php:32 msgid "Name:" msgstr "Nom" -#: wpf.class.php:2416 +#: wpf.class.php:2423 msgid "Registered:" msgstr "Enregistré:" -#: wpf.class.php:2424 +#: wpf.class.php:2431 msgid "Position:" msgstr "Rang:" -#: wpf.class.php:2427 +#: wpf.class.php:2434 msgid "Website:" msgstr "Site web:" -#: wpf.class.php:2431 +#: wpf.class.php:2438 msgid "AIM:" msgstr "AIM:" -#: wpf.class.php:2435 +#: wpf.class.php:2442 msgid "Yahoo:" msgstr "Yahoo:" -#: wpf.class.php:2438 +#: wpf.class.php:2445 msgid "Jabber/google Talk:" msgstr "Jabber/Google Talk:" -#: wpf.class.php:2442 +#: wpf.class.php:2449 msgid "Biographical Info:" msgstr "Biographie:" -#: wpf.class.php:2474 +#: wpf.class.php:2481 msgid "Subject" msgstr "Sujet" -#: wpf.class.php:2475 +#: wpf.class.php:2482 msgid "Relevance" msgstr "Pertinence" -#: wpf.class.php:2477 +#: wpf.class.php:2484 msgid "Posted" msgstr "Publié" -#: wpf.class.php:2542 +#: wpf.class.php:2549 msgid "Closed topic" msgstr "Discussion fermée" -#: wpf.class.php:2545 +#: wpf.class.php:2552 msgid "Normal topic" msgstr "Discussion normale" -#: wpf.class.php:2548 +#: wpf.class.php:2555 msgid "Hot topic" msgstr "Discussion en vogue" -#: wpf.class.php:2551 +#: wpf.class.php:2558 msgid "Very Hot topic" msgstr "Discussion très en vogue" -#: wpf.class.php:2583 +#: wpf.class.php:2590 msgid "Security Code:" msgstr "Code de sécurité:" -#: wpf.class.php:2603 +#: wpf.class.php:2610 msgid "Enter Security Code: (required)" msgstr "Code de sécurité:" -#: wpf.class.php:2617 wpf.class.php:2639 +#: wpf.class.php:2624 wpf.class.php:2646 msgid "Forum post - " msgstr "Discussions" -#: wpf.class.php:2618 wpf.class.php:2640 wpf.class.php:2662 +#: wpf.class.php:2625 wpf.class.php:2647 wpf.class.php:2669 msgid "DETAILS:" msgstr "DÉTAILS:" -#: wpf.class.php:2620 wpf.class.php:2642 wpf.class.php:2664 +#: wpf.class.php:2627 wpf.class.php:2649 wpf.class.php:2671 msgid "Email:" msgstr "Email" -#: wpf.class.php:2621 wpf.class.php:2643 wpf.class.php:2665 +#: wpf.class.php:2628 wpf.class.php:2650 wpf.class.php:2672 msgid "Date:" msgstr "Date" -#: wpf.class.php:2622 wpf.class.php:2644 wpf.class.php:2666 +#: wpf.class.php:2629 wpf.class.php:2651 wpf.class.php:2673 msgid "Reply Content:" msgstr "Réponse:" -#: wpf.class.php:2623 wpf.class.php:2645 wpf.class.php:2667 +#: wpf.class.php:2630 wpf.class.php:2652 wpf.class.php:2674 msgid "View Post Here:" msgstr "Voir discussion:" -#: wpf.class.php:2661 +#: wpf.class.php:2668 msgid "New Forum content - " msgstr "Nouveau contenu sur le forum - " -#: wpf.class.php:2861 +#: wpf.class.php:2868 msgid "Mingle Forum Post Options" msgstr "Mingle Forum >> Options de Skins" -#: wpf.class.php:2867 +#: wpf.class.php:2874 msgid "Add this post to" msgstr "Supprimer ce message?" -#: wpf.class.php:2871 +#: wpf.class.php:2878 msgid "Do not check this if this post has already been linked to the forum!" msgstr "Ne cochez pas cette option si ce post a déjà été lié sur le forum !" -#: wpf.class.php:2903 +#: wpf.class.php:2910 msgid "Join the Forum discussion on this post" msgstr "Rejoignez le forum de discussion sur ce post" @@ -743,7 +743,7 @@ msgstr "Discussion" msgid "You must specify a user group name." msgstr "Vous devez spécifier un nom de groupe?" -#: fs-admin/fs-admin.php:35 fs-admin/fs-admin.php:696 +#: fs-admin/fs-admin.php:35 fs-admin/fs-admin.php:699 #: fs-admin/wpf-usergroup-edit.php:14 msgid "" "You have choosen a name that already exists in the database, please specify " @@ -810,12 +810,12 @@ msgstr "Membre supprimé avec succès." msgid "Mingle Forum >> Manage User Groups" msgstr "Forum >> Groupes d'utilisateurs" -#: fs-admin/fs-admin.php:114 fs-admin/fs-admin.php:788 -#: fs-admin/fs-admin.php:961 +#: fs-admin/fs-admin.php:114 fs-admin/fs-admin.php:791 +#: fs-admin/fs-admin.php:964 msgid "add new" msgstr "ajouter nouveau" -#: fs-admin/fs-admin.php:121 fs-admin/fs-admin.php:809 +#: fs-admin/fs-admin.php:121 fs-admin/fs-admin.php:812 msgid "Delete" msgstr "Surpprimer" @@ -966,7 +966,7 @@ msgstr "Intégrer les articles de WordPress avec le forum :" #: fs-admin/fs-admin.php:403 fs-admin/fs-admin.php:470 #: fs-admin/fs-admin.php:493 fs-admin/fs-admin.php:517 -#: fs-admin/fs-admin.php:556 fs-admin/fs-admin.php:572 +#: fs-admin/fs-admin.php:558 fs-admin/fs-admin.php:575 msgid "Off" msgstr "Off" @@ -1114,69 +1114,69 @@ msgstr "Cocher" msgid "for date formatting." msgstr "pour le formatage des dates." -#: fs-admin/fs-admin.php:549 +#: fs-admin/fs-admin.php:550 msgid "Closed Categories (Admin posting only):" msgstr "Catégories fermés (seul les Admins peuvent poster) :" -#: fs-admin/fs-admin.php:549 +#: fs-admin/fs-admin.php:550 msgid "Comma separated list of Category ID's (Ex: 1, 2, 3)" msgstr "Liste des IDs de Catégories séparée par des virgules" -#: fs-admin/fs-admin.php:552 +#: fs-admin/fs-admin.php:553 msgid "Users can reply in locked categories" msgstr "Les utilisateurs peuvent répondre dans les catégories verrouillées" -#: fs-admin/fs-admin.php:560 +#: fs-admin/fs-admin.php:563 msgid "Time limit between posting:" msgstr "Délai entre deux posts :" -#: fs-admin/fs-admin.php:560 +#: fs-admin/fs-admin.php:563 msgid "Prevent lots of SPAM by making users wait a time period between posts." msgstr "" "Éviter beaucoup de SPAM en faisant attendre les utilisateurs une période de " "temps entre les messages." -#: fs-admin/fs-admin.php:560 +#: fs-admin/fs-admin.php:563 msgid "seconds" msgstr "secondes." -#: fs-admin/fs-admin.php:564 +#: fs-admin/fs-admin.php:567 msgid "Number of last posts on home:" msgstr "Nombre de messages:" -#: fs-admin/fs-admin.php:564 +#: fs-admin/fs-admin.php:567 msgid "0 to disable" msgstr "0 pour désactiver" -#: fs-admin/fs-admin.php:568 +#: fs-admin/fs-admin.php:571 msgid "Disable Branding:" msgstr "Activer la zone au-dessus du branding" -#: fs-admin/fs-admin.php:672 +#: fs-admin/fs-admin.php:675 msgid "Forums deleted:" msgstr "Forums supprimés:" -#: fs-admin/fs-admin.php:673 +#: fs-admin/fs-admin.php:676 msgid "Threads deleted:" msgstr "Sujets supprimés:" -#: fs-admin/fs-admin.php:674 +#: fs-admin/fs-admin.php:677 msgid "Posts deleted:" msgstr "Messages supprimés:" -#: fs-admin/fs-admin.php:694 fs-admin/fs-admin.php:718 +#: fs-admin/fs-admin.php:697 fs-admin/fs-admin.php:721 msgid "You must enter a name" msgstr "Vous devez entrer un nom:" -#: fs-admin/fs-admin.php:703 +#: fs-admin/fs-admin.php:706 msgid "Category added successfully" msgstr "Catégorie ajoutée avec succès" -#: fs-admin/fs-admin.php:715 +#: fs-admin/fs-admin.php:718 msgid "You must select a category" msgstr "Vous devez choisir une catégorie" -#: fs-admin/fs-admin.php:721 +#: fs-admin/fs-admin.php:724 msgid "" "You have choosen a forum name that already exists in this group, please " "specify another" @@ -1184,142 +1184,142 @@ msgstr "" "Vous avez choisi un nom de forum qui existe déjà dans ce groupe, merci d'en " "spécifier un autre" -#: fs-admin/fs-admin.php:728 +#: fs-admin/fs-admin.php:731 msgid "Forum added successfully" msgstr "Forum ajouté avec succès" -#: fs-admin/fs-admin.php:755 fs-admin/fs-admin.php:800 +#: fs-admin/fs-admin.php:758 fs-admin/fs-admin.php:803 msgid "Modify" msgstr "Modifier" -#: fs-admin/fs-admin.php:755 fs-admin/fs-admin.php:810 +#: fs-admin/fs-admin.php:758 fs-admin/fs-admin.php:813 msgid "Add forum" msgstr "Ajouter un forum" -#: fs-admin/fs-admin.php:782 +#: fs-admin/fs-admin.php:785 msgid "Mingle Forum >> Categories and Forums " msgstr "Mingle Forum >> Catégories et Forums" -#: fs-admin/fs-admin.php:834 +#: fs-admin/fs-admin.php:837 msgid "Group Moved Down" msgstr "Groupe déplacé vers le bas" -#: fs-admin/fs-admin.php:844 +#: fs-admin/fs-admin.php:847 msgid "Forum Moved Down" msgstr "Fil RSS du forum" -#: fs-admin/fs-admin.php:854 +#: fs-admin/fs-admin.php:857 msgid "Group Moved Up" msgstr "Groupe déplacé vers le haut" -#: fs-admin/fs-admin.php:864 +#: fs-admin/fs-admin.php:867 msgid "Forum Moved Up" msgstr "Fil RSS du forum" -#: fs-admin/fs-admin.php:911 fs-admin/fs-admin.php:918 +#: fs-admin/fs-admin.php:914 fs-admin/fs-admin.php:921 msgid "Moderator successfully removed." msgstr "Modérateur supprimé avec succès" -#: fs-admin/fs-admin.php:913 +#: fs-admin/fs-admin.php:916 msgid "Moderator successfully saved." msgstr "Modérateur sauvé avec succès" -#: fs-admin/fs-admin.php:920 +#: fs-admin/fs-admin.php:923 msgid "Moderator NOT removed." msgstr "Modérateur NON supprimé?" -#: fs-admin/fs-admin.php:932 +#: fs-admin/fs-admin.php:935 msgid "You must select a user" msgstr "Vous devez sélectionner un utilisateur" -#: fs-admin/fs-admin.php:936 +#: fs-admin/fs-admin.php:939 msgid "Global Moderator added successfully" msgstr "Modérateur Global ajouté avec succès" -#: fs-admin/fs-admin.php:940 +#: fs-admin/fs-admin.php:943 msgid "Moderator added successfully" msgstr "Modérateur ajouté avec succès" -#: fs-admin/fs-admin.php:961 +#: fs-admin/fs-admin.php:964 msgid "Mingle Forum >> Manage Moderators" msgstr "Mingle Forum >> Gérer les Modérateurs" -#: fs-admin/fs-admin.php:970 +#: fs-admin/fs-admin.php:973 msgid "Currently moderating" msgstr "En cours de modération" -#: fs-admin/fs-admin.php:974 +#: fs-admin/fs-admin.php:977 msgid "Update" msgstr "Mise à jour" -#: fs-admin/fs-admin.php:984 fs-admin/wpf-moderator.php:25 +#: fs-admin/fs-admin.php:987 fs-admin/wpf-moderator.php:25 msgid "Global moderator: (User can moderate all forums)" msgstr "Modérateur Global: (peut modérer tous les forums)" -#: fs-admin/fs-admin.php:1003 +#: fs-admin/fs-admin.php:1006 msgid "No moderators yet" msgstr "Aucun modérateur pour l'instant" -#: fs-admin/fs-admin.php:1028 +#: fs-admin/fs-admin.php:1031 msgid "Ads saved successfully" msgstr "ajouté avec succès" -#: fs-admin/fs-admin.php:1033 +#: fs-admin/fs-admin.php:1036 msgid "Mingle Forum Ads >> options" msgstr "Mingle Forum >> Options de Skins" -#: fs-admin/fs-admin.php:1035 +#: fs-admin/fs-admin.php:1038 msgid "HTML is allowed in all ad areas below" msgstr "HTML est autorisé dans toutes les zones d'annonces ci-dessous" -#: fs-admin/fs-admin.php:1039 +#: fs-admin/fs-admin.php:1042 msgid "Ads Option" msgstr "Nom de l'option" -#: fs-admin/fs-admin.php:1046 +#: fs-admin/fs-admin.php:1049 msgid "Enable Area Above Forum" msgstr "Activer la zone au-dessus du forum" -#: fs-admin/fs-admin.php:1048 fs-admin/fs-admin.php:1056 -#: fs-admin/fs-admin.php:1064 fs-admin/fs-admin.php:1072 -#: fs-admin/fs-admin.php:1080 fs-admin/fs-admin.php:1088 -#: fs-admin/fs-admin.php:1096 +#: fs-admin/fs-admin.php:1051 fs-admin/fs-admin.php:1059 +#: fs-admin/fs-admin.php:1067 fs-admin/fs-admin.php:1075 +#: fs-admin/fs-admin.php:1083 fs-admin/fs-admin.php:1091 +#: fs-admin/fs-admin.php:1099 msgid "css-value:" msgstr "Valeur CSS :" -#: fs-admin/fs-admin.php:1054 +#: fs-admin/fs-admin.php:1057 msgid "Enable Area Below Forum" msgstr "Activer la zone en dessous du forum" -#: fs-admin/fs-admin.php:1062 +#: fs-admin/fs-admin.php:1065 msgid "Enable Area Above Branding" msgstr "Activer la zone au-dessus du branding" -#: fs-admin/fs-admin.php:1070 +#: fs-admin/fs-admin.php:1073 msgid "Enable Area Above Info Center" msgstr "Activer la zone au-dessus du centre d'informations" -#: fs-admin/fs-admin.php:1078 +#: fs-admin/fs-admin.php:1081 msgid "Enable Area Above Breadcrumbs" msgstr "Activer la zone au-dessus du fil d'Ariane" -#: fs-admin/fs-admin.php:1086 +#: fs-admin/fs-admin.php:1089 msgid "Enable Area Above Quick Reply Form" msgstr "Activer la zone au-dessus du formulaire de réponse rapide" -#: fs-admin/fs-admin.php:1094 +#: fs-admin/fs-admin.php:1097 msgid "Enable Area Below First Post" msgstr "Activer la zone en dessous du premier post" -#: fs-admin/fs-admin.php:1101 +#: fs-admin/fs-admin.php:1104 msgid "Below you can modify/add your own CSS" msgstr "Ci-dessous vous pouvez modifier / ajouter votre propre CSS" -#: fs-admin/fs-admin.php:1102 +#: fs-admin/fs-admin.php:1105 msgid "NOTE: If you do not know what this is for, leave it blank" msgstr "REMARQUE : Si vous ne savez pas ce que c'est, laissez ce champ vide" -#: fs-admin/fs-admin.php:1109 +#: fs-admin/fs-admin.php:1112 msgid "Save Options" msgstr "Sauvegarder les options" diff --git a/readme.txt b/readme.txt index 04cf005..6f55e11 100644 --- a/readme.txt +++ b/readme.txt @@ -121,7 +121,15 @@ Need help?: [Cartpauj Support Forums](http://cartpauj.icomnow.com/forum "Cartpauj Support Forums") == Frequently Asked Questions == -n/a +* **My users can't register?** - Dashboard -> Settings -> General -> Anyone can register -> Save +* **Help! I can't create new topics** - Make sure you have watched the setup videos and have created both categories AND forums. +* **How can I hide the sidebar on the forum page?** - When editing the forum page, if your theme supports it, you should be able to change your Template to a full-width one. If you don't see this option, either hire a developer to make one for you, or bug your theme author to add it. +* **I made customizations to the forum, but they get overwritten on every update** - If you customize anything inside of the /mingle-forum/ folder it will be overwritten, there's no way around that. If all you're changing is CSS, then put it somewhere else, like at the bottom of your theme's styles.css file (which gets overwritten when you upgrade your theme FYI). +* **My skin looks bad/funny** - Your theme is most likely causing a conflict with the forum's table styles. We do our best, but can't possibly make the forum work for every conceivable WordPress theme. Find a friend who knows a thing or two about CSS and see if they'll help you get some custom styles set to fix the issue. +* **Can I put different forums on different pages?** - No. Not right now, and maybe not ever. +* **SEO friedly URL's are not working** - Make sure you have permalinks enabled in WordPress. Any setting but "default" should work. We personally like Day & Name for blogs, or Postname for non-blogs. +* **Google isn't indexing my forum pages** - Step 1: Set WordPress Permalink settings to anything but default, then enable SEO Friendly URLs in the forum's options. Step 2: Make sure you don't have Canonical URLs enabled on the forum page by another plugin like All In One SEO Pack. Mingle Forum implements some of its own SEO features making this unneccessary. +* **I can only see the front page of the forum. No matter what I click, it goes back to the front page** - Step 1: Make sure the forum isn't the home page of your site. Mingle Forum does not currently work when set to the home page. Step 2: Try enabling or disabling SEO Friendly URL's in the Forum Options. Step 3: Are you using WP SEO by Yoast? If so, disable the option to rewrite ugly permalinks. == Upgrade Notice == @@ -152,6 +160,10 @@ To make your theme compatible with this copy of Mingle Forum, in your style.css, * Fix display glitches * Fix -1 threads after delete the last post * Fix Quick Reply on IE +* Fix SPAM time limit not working for guests +* Fix quote link issue +* Fix move/delete topics broken for moderators +* Fix known conflict with WordPress SEO by Yoast = 1.0.34 = * Added ability to limit SPAM by setting a time interval users must wait between posts * Added option to allow users to post replies in locked categories diff --git a/wpf-insert.php b/wpf-insert.php index 120c59f..38b5b59 100644 --- a/wpf-insert.php +++ b/wpf-insert.php @@ -31,11 +31,16 @@ if(is_numeric($the_forum_id)) //Spam time interval check if(!is_super_admin() && !$mingleforum->is_moderator($user_ID, $the_forum_id)) { - $last_post_time = get_user_meta((int)$user_ID, 'mingle_forum_last_post_time_'.ip_to_string(), true); + //We're going to not set a user ID here, I know unconventional, but it's an easy way to account for guests. + $spam_meta_key = "mingle_forum_last_post_time_".ip_to_string(); + $last_post_time = $wpdb->get_var($wpdb->prepare("SELECT `meta_value` FROM {$wpdb->usermeta} WHERE `meta_key` = %s", $spam_meta_key)); if((time() - (int)$last_post_time) < stripslashes($mingleforum->options['forum_posting_time_limit'])) wp_die(__('To help prevent spam, we require that you wait', 'mingleforum').' '.ceil(((int)(stripslashes($mingleforum->options['forum_posting_time_limit']))/60)).' '.__('minutes before posting again. Please use your browsers back button to return.', 'mingleforum')); else - update_user_meta((int)$user_ID, 'mingle_forum_last_post_time_'.ip_to_string(), time()); + if($last_post_time !== null) + $wpdb->query($wpdb->prepare("UPDATE {$wpdb->usermeta} SET `meta_value` = %d WHERE `meta_key` = %s", time(), $spam_meta_key)); + else + $wpdb->query($wpdb->prepare("INSERT INTO {$wpdb->usermeta} (`meta_key`, `meta_value`) VALUES (%s, %d)", $spam_meta_key, time())); } function ip_to_string() @@ -155,12 +160,12 @@ function ip_to_string() $msg .= ("

    ".__("You must enter a subject", "mingleforum")."

    "); $error = true; } - else if($content == "") { + elseif($content == "") { $msg .= "

    ".__("An error occured", "mingleforum")."

    "; $msg .= ("

    ".__("You must enter a message", "mingleforum")."

    "); $error = true; } - else if(!$mingleforum->have_access($forum_id) || !$mingleforum->have_access($forum_id, 'post') || !$mingleforum->have_access($group_id) || !$mingleforum->have_access($group_id, 'post')) { + elseif(!$mingleforum->have_access($forum_id) || !$mingleforum->have_access($forum_id, 'post') || !$mingleforum->have_access($group_id) || !$mingleforum->have_access($group_id, 'post')) { $msg .= "

    ".__("An error occured", "mingleforum")."

    "; $error = true; } @@ -219,12 +224,12 @@ function ip_to_string() $msg .= ("

    ".__("You must enter a subject", "mingleforum")."

    "); $error = true; } - else if($content == ""){ + elseif($content == ""){ $msg .= "

    ".__("An error occured", "mingleforum")."

    "; $msg .= ("

    ".__("You must enter a message", "mingleforum")."

    "); $error = true; } - else if(!$mingleforum->have_access($forum_id) || !$mingleforum->have_access($forum_id, 'post') || !$mingleforum->have_access($group_id) || !$mingleforum->have_access($group_id, 'post')) { + elseif(!$mingleforum->have_access($forum_id) || !$mingleforum->have_access($forum_id, 'post') || !$mingleforum->have_access($group_id) || !$mingleforum->have_access($group_id, 'post')) { $msg .= "

    ".__("An error occured", "mingleforum")."

    "; $error = true; } diff --git a/wpf-main.php b/wpf-main.php index aafafef..d6df0ed 100644 --- a/wpf-main.php +++ b/wpf-main.php @@ -3,7 +3,7 @@ Plugin Name: Mingle Forum Plugin URI: http://cartpauj.com/projects/mingle-forum-plugin Description: Mingle Forum is growing rapidly in popularity because it is simple, reliable, lightweight and does just enough to keep things interesting. If you like this plugin please consider making a donation at http://cartpauj.com/donate/ -Version: 1.0.34 +Version: 2.0.34 Author: Cartpauj Author URI: http://cartpauj.com/ Text Domain: mingleforum diff --git a/wpf.class.php b/wpf.class.php index d4f02b5..d946688 100644 --- a/wpf.class.php +++ b/wpf.class.php @@ -2,8 +2,8 @@ include("wpf_define.php"); include_once('bbcode.php'); -if(!class_exists('mingleforum')){ -class mingleforum { +if(!class_exists('mingleforum')) { +class mingleforum{ var $db_version = 2; //MANAGES DB VERSION @@ -21,6 +21,7 @@ class mingleforum { add_action("wp_head", array(&$this, "setup_header")); add_action("plugins_loaded", array(&$this, "wpf_load_widget")); add_action("wp_footer", array(&$this, "wpf_footer")); + add_filter('wpseo_whitelist_permalink_vars', array($this, 'yoast_seo_whitelist_vars')); if($this->options['wp_posts_to_forum']) { add_action("add_meta_boxes", array(&$this, "send_wp_posts_to_forum")); @@ -263,6 +264,12 @@ class mingleforum { "; } + //Fix SEO by Yoast conflict + public function yoast_seo_whitelist_vars($vars) { + $my_vars = array('vforum', 'g', 'viewforum', 'f', 'viewtopic', 't', 'mingleforumaction', 'topic', 'user_id', 'quote', 'thread', 'id', 'action', 'forum', 'markallread', 'getNewForumID', 'delete_topic', 'remove_post', 'forumsubs', 'threadsubs', 'sticky', 'closed', 'move_topic'); + return array_merge($vars, $my_vars); + } + function wpf_footer(){ if(is_page($this->get_pageid())) { @@ -696,9 +703,9 @@ class mingleforum { function showforum($forum_id){ global $user_ID; if(isset($_GET['delete_topic'])) - $this->remove_topic(); + $this->remove_topic($forum_id); if(isset($_GET['move_topic'])) - $this->move_topic(); + $this->move_topic($forum_id); if(!empty($forum_id)){ $out = ""; $del = ""; @@ -964,7 +971,7 @@ class mingleforum { { if($this->options['forum_use_seo_friendly_urls']) { - if($user_ID && !$this->is_closed() && $this->have_access($this->current_forum, 'post') && $this->have_access($this->current_group, 'post')) + if(($user_ID || $this->allow_unreg()) && !$this->is_closed() && $this->have_access($this->current_forum, 'post') && $this->have_access($this->current_group, 'post')) $o .= "    "; if($this->is_moderator($user_ID, $this->current_forum)) $o .= ""; @@ -973,7 +980,7 @@ class mingleforum { } else { - if($user_ID && !$this->is_closed() && $this->have_access($this->current_forum, 'post') && $this->have_access($this->current_group, 'post')) + if(($user_ID || $this->allow_unreg()) && !$this->is_closed() && $this->have_access($this->current_forum, 'post') && $this->have_access($this->current_group, 'post')) $o .= ""; if($this->is_moderator($user_ID, $this->current_forum)) $o .= ""; @@ -1114,10 +1121,10 @@ class mingleforum { if($last_posterid != $user_ID){ $lp = strtotime($lpif); // date $lv = strtotime($this->last_visit()); - if($lv < $lp) - $image = "on.gif"; - else - $image = "off.gif"; + if($lv < $lp) + $image = "on.gif"; + else + $image = "off.gif"; } } $this->o .= " @@ -2045,10 +2052,10 @@ class mingleforum { return "".$out.""; } - function remove_topic(){ + function remove_topic($forum_id){ global $user_ID, $wpdb; $topic = $_GET['topic']; - if($this->is_moderator($user_ID, $this->current_forum)){ + if($this->is_moderator($user_ID, $forum_id)){ $wpdb->query($wpdb->prepare("DELETE FROM {$this->t_posts} WHERE `parent_id` = %d", $topic)); $wpdb->query($wpdb->prepare("DELETE FROM {$this->t_threads} WHERE `id` = %d", $topic)); }else{ @@ -2094,12 +2101,12 @@ class mingleforum { return $out; } - function move_topic(){ + function move_topic($forum_id){ global $user_ID, $wpdb; $topic = $_GET['topic']; $newForumID = !empty($_GET['newForumID']) ? (int)$_GET['newForumID'] : 0; $newForumID = !empty($_POST['newForumID']) ? (int)$_POST['newForumID'] : $newForumID; - if($this->is_moderator($user_ID, $this->current_forum)){ + if($this->is_moderator($user_ID, $forum_id)){ $strSQL = $wpdb->prepare("UPDATE {$this->t_threads} SET `parent_id` = {$newForumID} WHERE id = %d", $topic); $wpdb->query($strSQL); @header("location: ".$this->base_url."viewforum&f=".$newForumID);
    ".__("Screenshot", "mingleforum")."
    ".__("Closed Categories (Admin posting only):", "mingleforum")."
    ".__("Comma separated list of Category ID's (Ex: 1, 2, 3)", "mingleforum")."
    " + .__("Closed Categories (Admin posting only):", "mingleforum")."
    ".__("Comma separated list of Category ID's (Ex: 1, 2, 3)", "mingleforum")."
    ".__("Users can reply in locked categories", "mingleforum")." + ($defStr = ".__('Off', 'mingleforum').")
    ".__("Quote", "mingleforum")." ".__("Remove", "mingleforum")." ".__("Quote", "mingleforum")." ".__("Remove", "mingleforum")."