Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vo...@us...> - 2012-09-17 04:32:11
|
Revision: 10179
http://xoops.svn.sourceforge.net/xoops/?rev=10179&view=rev
Author: voltan1
Date: 2012-09-17 04:32:05 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Update template
Modified Paths:
--------------
XoopsModules/contact/branches/voltan/v1.8/contact/templates/contact_index.html
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/templates/contact_index.html
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/templates/contact_index.html 2012-09-16 06:22:07 UTC (rev 10178)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/templates/contact_index.html 2012-09-17 04:32:05 UTC (rev 10179)
@@ -1,4 +1,5 @@
<div class="contact">
- <div class="pad2 marg2"><{$info}></div>
- <div class="pad2 marg2"><{$form}></div>
+ <div class="breadcrumb"><{$breadcrumb}></div>
+ <div class="contact_info"><{$info}></div>
+ <div class="contact_form"><{$form}></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-09-16 06:22:13
|
Revision: 10178
http://xoops.svn.sourceforge.net/xoops/?rev=10178&view=rev
Author: voltan1
Date: 2012-09-16 06:22:07 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Fix perpage
Modified Paths:
--------------
XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-16 04:37:52 UTC (rev 10177)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-16 06:22:07 UTC (rev 10178)
@@ -41,7 +41,7 @@
{
case 'list':
$contact = array();
- $contact['perpage'] = '10';
+ $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
$contact['order'] = 'DESC';
$contact['sort'] = 'contact_id';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-16 04:37:59
|
Revision: 10177
http://xoops.svn.sourceforge.net/xoops/?rev=10177&view=rev
Author: irmtfan
Date: 2012-09-16 04:37:52 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
improve js scroll to current post/topic
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-15 10:51:08 UTC (rev 10176)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-16 04:37:52 UTC (rev 10177)
@@ -1,3 +1,8 @@
+date 2012-09-16
+===================================
+1- improve: Add forum_post_prefix smarty variable to have unique Ids for posts. Add js function to scroll to current post in viewtopic.php links.
+in newbb/templates/newbb_thread.html , newbb/templates/newbb_viewtopic.html
+
date 2012-09-11
===============================
1- bug fix: viewtopic admin mode action incorrectly on the topic instead of selected posts of the topic.(important)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-15 10:51:08 UTC (rev 10176)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-16 04:37:52 UTC (rev 10177)
@@ -1,4 +1,14 @@
+<!-- START irmtfan assign forum_post_prefix smarty -->
+<{if $forum_post_prefix === null }>
+ <!-- change the value to what you prefer. even value="" (no prefix) is acceptable -->
+ <{assign var=forum_post_prefix value="forumpost"}>
+ <!-- it is the first time then add id=0 for recognizoing top of the topic to scroll when $post_id=0 (just $topic_id in the URL) -->
+ <div id="<{$forum_post_prefix}>0"></div>
+<{/if}>
+<!-- END irmtfan assign forum_post_prefix smarty -->
+<!-- irmtfan removed
<{if $post_id == $topic_post.post_id}><div id="aktuell"></div><{/if}>
+-->
<table class="outer" cellpadding="0" cellspacing="0" border="0" width="100%" align="center" style="border-bottom-width: 0px;">
<tr>
<!-- irmtfan hardcode removed align="left" -->
@@ -12,7 +22,8 @@
<!-- irmtfan hardcode removed style="float: right;" -->
<div class="ThreadTitle">
<{if $topic_post.post_id > 0}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$topic_post.post_id}>">#<{$topic_post.post_no}></a>
+ <!-- irmtfan add id for each post -->
+ <a id="<{$forum_post_prefix}><{$topic_post.post_id}>" href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$topic_post.post_id}>">#<{$topic_post.post_no}></a>
<{/if}>
</div>
</th>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-15 10:51:08 UTC (rev 10176)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-16 04:37:52 UTC (rev 10177)
@@ -162,7 +162,9 @@
<div class="resultMsg"><{$smarty.const._MD_TOPICLOCK}></div>
<br />
<{/if}>
+<!-- irmtfan remove here and move to the newbb_thread.html
<{if $post_id == 0}><div id="aktuell"></div><{/if}>
+-->
<{foreachq item=topic_post from=$topic_posts}>
<{includeq file="db:newbb_thread.html" topic_post=$topic_post mode=$mode}>
<br />
@@ -262,4 +264,14 @@
<script type="text/javascript">
<!--xoopsGetElementById('aktuell').scrollIntoView(true);
</script>
--->
\ No newline at end of file
+-->
+<!-- START irmtfan add scroll js function to scroll down to current post or top of the topic -->
+<script type="text/javascript">
+if (document.body.scrollIntoView && window.location.href.indexOf('#') == -1){
+ var el = xoopsGetElementById('<{$forum_post_prefix}><{$post_id}>');
+ if (el){
+ el.scrollIntoView(true);
+ }
+}
+</script>
+<!-- END irmtfan add scroll js function to scroll down to current post or top of the topic -->
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-09-15 10:51:15
|
Revision: 10176
http://xoops.svn.sourceforge.net/xoops/?rev=10176&view=rev
Author: voltan1
Date: 2012-09-15 10:51:08 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Update copyright
Modified Paths:
--------------
XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
XoopsModules/contact/branches/voltan/v1.8/contact/header.php
XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
XoopsModules/contact/branches/voltan/v1.8/contact/index.php
XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
// Call header
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
// Call header
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
xoops_cp_footer();
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
$path = dirname(dirname(dirname(dirname(__FILE__))));
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
// Call header
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
// Call header
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
include 'header.php';
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -14,6 +14,8 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/header.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/header.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
include "../../mainfile.php";
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/index.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/index.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -1,21 +1,23 @@
<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ 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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
include 'header.php';
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-09-15 10:45:56 UTC (rev 10175)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-09-15 10:51:08 UTC (rev 10176)
@@ -14,6 +14,8 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA Voltan)
+ * @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
@@ -28,8 +30,8 @@
$modversion['version'] = 1.8;
$modversion['description'] = _MI_CONTACT_DESC;
$modversion['credits'] = 'The XOOPS Project, Mohtava Project';
-$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>';
-$modversion['nickname'] = 'Voltan';
+$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewrite by Voltan';
+$modversion['nickname'] = 'Kazumi Ono, Trabis, Voltan';
$modversion['help'] = 'page=help';
$modversion['license'] = 'GNU GPL 2.0';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-09-15 10:46:02
|
Revision: 10175
http://xoops.svn.sourceforge.net/xoops/?rev=10175&view=rev
Author: voltan1
Date: 2012-09-15 10:45:56 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Fix send email
Modified Paths:
--------------
XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-13 15:51:26 UTC (rev 10174)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-15 10:45:56 UTC (rev 10175)
@@ -1,88 +1,88 @@
-<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-// Call header
+<?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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+// Call header
require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
xoops_cp_header();
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
-// Define scripts
-$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
-// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-switch ($op)
+switch ($op)
{
case 'list':
$contact = array();
- $contact['perpage'] = '10';
- $contact['order'] = 'DESC';
+ $contact['perpage'] = '10';
+ $contact['order'] = 'DESC';
$contact['sort'] = 'contact_id';
- // get limited information
- if (isset($_REQUEST['limit'])) {
- $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
- } else {
- $contact['limit'] = $contact['perpage'];
- }
-
- // get start information
- if (isset($_REQUEST['start'])) {
- $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
- } else {
- $contact['start'] = 0;
+ // get limited information
+ if (isset($_REQUEST['limit'])) {
+ $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+ } else {
+ $contact['limit'] = $contact['perpage'];
+ }
+
+ // get start information
+ if (isset($_REQUEST['start'])) {
+ $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+ } else {
+ $contact['start'] = 0;
}
$contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
$contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
- if ($contact_numrows > $contact['limit']) {
- $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
- $contact_pagenav = $contact_pagenav->renderNav(4);
- } else {
- $contact_pagenav = '';
+ if ($contact_numrows > $contact['limit']) {
+ $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+ $contact_pagenav = $contact_pagenav->renderNav(4);
+ } else {
+ $contact_pagenav = '';
}
- $xoopsTpl->assign('contacts', $contacts);
+ $xoopsTpl->assign('contacts', $contacts);
$xoopsTpl->assign('contact_pagenav', $contact_pagenav);
$level = 'list';
break;
case 'reply':
- if ($contact_id > 0) {
+ if ($contact_id > 0) {
$obj = $contact_handler->get($contact_id);
if($obj->getVar('contact_cid') != 0) {
redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
- }
+ }
$form = $obj->Contact_ReplyForm();
$xoopsTpl->assign('replyform', $form->render());
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
}
$level = 'reply';
break;
@@ -114,7 +114,7 @@
// send mail can seet message
if($sendmail = true) {
- $message = $contact_handler->Contact_SendMail($contact);
+ $message = $contact_handler->Contact_ReplyMail($contact);
} else if ($saveinfo = true) {
$message = _MD_CONTACT_MES_SAVEINDB;
} else {
@@ -163,11 +163,11 @@
case 'delete':
if ($contact_id > 0) {
- // Prompt message
+ // Prompt message
xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
$level = 'delete';
break;
@@ -190,7 +190,7 @@
exit ();
}
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
+ redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
xoops_cp_footer ();
exit ();
break;
@@ -199,8 +199,8 @@
$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
$xoopsTpl->assign('level', $level);
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
require dirname(__FILE__) . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-13 15:51:26 UTC (rev 10174)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-15 10:45:56 UTC (rev 10175)
@@ -1,33 +1,33 @@
-<?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.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
+<?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.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+if (!defined("XOOPS_ROOT_PATH")) {
+ die("XOOPS root path not defined");
}
-class contact extends XoopsObject
+class contact extends XoopsObject
{
- function __construct()
- {
- $this->XoopsObject();
+ function __construct()
+ {
+ $this->XoopsObject();
$this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11);
$this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11);
$this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11);
@@ -123,7 +123,7 @@
xoops_load('XoopsFormCaptcha');
$form->addElement(new XoopsFormCaptcha(), true);
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return $form;
}
@@ -141,8 +141,8 @@
$form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar ( 'contact_name' )), true );
$form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar ( 'contact_mail' )), true );
$form->addElement ( new XoopsFormText ( _AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar ( 'contact_subject' )), true );
- $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true );
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true );
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return $form;
}
@@ -161,19 +161,19 @@
}
}
-class ContactContactHandler extends XoopsPersistableObjectHandler
-{
- function __construct(&$db)
- {
- parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
+class ContactContactHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
}
- /**
- * Get variables passed by GET or POST method
- *
- */
- function Contact_CleanVars(&$global, $key, $default = '', $type = 'int') {
-
+ /**
+ * Get variables passed by GET or POST method
+ *
+ */
+ function Contact_CleanVars(&$global, $key, $default = '', $type = 'int') {
+
switch ($type) {
case 'array':
$ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default;
@@ -206,7 +206,7 @@
if ($ret === false) {
return $default;
}
- return $ret;
+ return $ret;
}
function Contact_InfoProcessing($global) {
@@ -232,7 +232,7 @@
}
function Contact_SendMail($contact) {
- $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
$xoopsMailer->setFromEmail($contact['contact_mail']);
@@ -248,7 +248,7 @@
}
function Contact_ReplyMail($contact) {
- $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($contact['contact_mailto']);
$xoopsMailer->setFromEmail($contact['contact_mail']);
@@ -262,18 +262,18 @@
}
return $message;
}
-
+
function Contact_ToEmails($department = null) {
global $xoopsConfig;
- $admin_mail = $xoopsConfig['adminmail'];
- if($department) {
+ $department_mail[] = $xoopsConfig['adminmail'];
+ if(!empty($department)) {
$departments = xoops_getModuleOption('contact_dept','contact');
foreach( $departments as $vals ) {
$vale = explode( ',', $vals );
- if($department == $vale[0]) $department_mail = $vale[1];
+ if($department == $vale[0]) $department_mail[] = $vale[1];
}
}
- return $admin_mail . ','. $department_mail;
+ return $department_mail;
}
function Contact_AddReply($contact_id) {
@@ -367,5 +367,5 @@
}
}
-
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-09-13 15:51:33
|
Revision: 10174
http://xoops.svn.sourceforge.net/xoops/?rev=10174&view=rev
Author: djculex
Date: 2012-09-13 15:51:26 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
- Added new defines regarding "You need a positive integer" messages
Modified Paths:
--------------
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/locale.php
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/avatars/language/danish/admin.php
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/profile/language/danish/admin.php
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin.php
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/userrank/language/danish/admin.php
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/locale.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/locale.php 2012-09-12 18:46:05 UTC (rev 10173)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/locale.php 2012-09-13 15:51:26 UTC (rev 10174)
@@ -32,6 +32,7 @@
define("_YEARMONTHDAY","j/n/Y G:i");
define("_ELAPSE","%s siden");
define("_TIMEFORMAT_DESC","Gyldige formater: \"s\" - " . _SHORTDATESTRING . "; \"m\" - " . _MEDIUMDATESTRING . "; \"l\" - " . _DATESTRING . ";<br />" . "\"c\" or \"custom\" - format i henhold til intervallet; \"e\" - Forløbet; \"mysql\" - Y-m-d H:i:s;<br />" . "Angivet streng - Se <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
+define("_TIMEZONE_SET", "Europe/Copenhagen");
/**
* A Xoops Local
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/avatars/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/avatars/language/danish/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/avatars/language/danish/admin.php 2012-09-13 15:51:26 UTC (rev 10174)
@@ -41,6 +41,7 @@
define("_AM_AVATARS_WEIGHT", "Vis ordre i avatarmanager:");
define("_AM_AVATARS_UPLOADS", "Upload");
define("_AM_AVATARS_USERS", "brugere, der benytter denne avatar");
+define("_AM_AVATARS_ERROR_WEIGHT","Du skal bruge et positivt tal");
// Tips
define("_AM_AVATARS_SYSTEM_TIPS", "<ul><li>Tilføj, opdatere eller slette systemets avatars </li> </ul>");
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/profile/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/profile/language/danish/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/profile/language/danish/admin.php 2012-09-13 15:51:26 UTC (rev 10174)
@@ -118,4 +118,5 @@
define("_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS", "Deaktivering af en administratorkonto er ikke tilladt");
define("_PROFILE_AM_CATEGORY_LIST", "List af kategorier");
define("_PROFILE_AM_STEP_LIST", "List af registreringstrin");
-define("_PROFILE_AM_FIELD_LIST", "List af felter");
\ No newline at end of file
+define("_PROFILE_AM_FIELD_LIST", "List af felter");
+define("_PROFILE_AM_ERROR_WEIGHT","Du skal angive et positivt tal.");
\ No newline at end of file
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin.php 2012-09-13 15:51:26 UTC (rev 10174)
@@ -71,11 +71,11 @@
define("_AM_SYSTEM_DBUPDATED","Database opdateret!");
define("_AM_SYSTEM_DBERROR","Databasen blev ikke opdateret på grund af nogle fejl!");
define("_AM_SYSTEM_NOTACTIVE","Dette afsnit er ikke aktiv!");
+define("_AM_SYSTEM_ERROR_WEIGHT","Du skal angive et positivt tal.");
// Group permission phrases
define("_MD_AM_PERMADDNG","Kunne ikke tilføje %s tilladelse til %s for gruppen %s");
define("_MD_AM_PERMADDOK","Tilføjede %s tilladelse til %s for gruppe %s");
define("_MD_AM_PERMRESETNG","Kunne ikke nulstille gruppe tilladelser til modul %s");
define("_MD_AM_PERMADDNGP","Alle øvre punkter skal vælges.");
-
?><?php // Translation done by culex - 2012-03-15 19:15 ?>
\ No newline at end of file
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/userrank/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/userrank/language/danish/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/userrank/language/danish/admin.php 2012-09-13 15:51:26 UTC (rev 10174)
@@ -36,6 +36,7 @@
define("_AM_USERRANK_SUREDEL", "Er du sikker på du vil slette denne rang?");
define("_AM_USERRANK_TITLE", "Titel");
define("_AM_USERRANK_UPLOAD", "Opload");
+define("_AM_USERRANK_ERROR_POST","Du skal angive et positivt tal");
// Info
define("_AM_USERRANK_NBTOTAL", "Der er %s rangeringer i vores database");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-12 18:46:17
|
Revision: 10173
http://xoops.svn.sourceforge.net/xoops/?rev=10173&view=rev
Author: mageg
Date: 2012-09-12 18:46:05 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
update forms
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -168,7 +168,7 @@
$xoops = Xoops::getInstance();
$xoops->loadLanguage('formdhtmltextarea');
if ($this->getCols() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getCols();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -115,7 +115,7 @@
{
$name = $this->getName();
if ($this->getSize() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getSize();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -63,7 +63,7 @@
* @param int $cols number of columns
* @param string $placeholder placeholder for this element.
*/
- public function __construct($caption, $name, $value = "", $rows = 5, $cols = 6, $placeholder = '')
+ public function __construct($caption, $name, $value = "", $rows = 5, $cols = 5, $placeholder = '')
{
$this->setCaption($caption);
$this->setName($name);
@@ -116,7 +116,7 @@
$name = $this->getName();
$class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
if ($this->getCols() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getCols();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -145,7 +145,7 @@
');
}
if ($this->getSize() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 4;
} else {
$maxcols = $this->getSize();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -92,7 +92,8 @@
$obj = $avatar_Handler->create();
$form = $xoops->getModuleForm($obj, 'avatar');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
// Edit
@@ -106,7 +107,8 @@
$obj = $avatar_Handler->get($system->cleanVars($_REQUEST, 'avatar_id', 0, 'int'));
$form = $xoops->getModuleForm($obj, 'avatar');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
// Save
@@ -144,7 +146,8 @@
}
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
//Delete
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -39,7 +39,7 @@
parent::__construct($title , 'avatar_form', $action, "post", true);
$this->setExtra('enctype="multipart/form-data"');
// Name
- $this->addElement(new XoopsFormText(_AM_AVATARS_NAME, 'avatar_name', 50, 255, $obj->getVar('avatar_name', 'e')), true);
+ $this->addElement(new XoopsFormText(_AM_AVATARS_NAME, 'avatar_name', 5, 255, $obj->getVar('avatar_name', 'e')), true);
// Upload part
$imgtray_img = new XoopsFormElementTray(_AM_AVATARS_FILE, '<br />');
$imageselect_img = new XoopsFormSelect(sprintf(_AM_AVATARS_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/avatars/'), 'avatar_file', $blank_img);
@@ -56,7 +56,9 @@
$imgtray_img->addElement($fileseltray_img);
$this->addElement($imgtray_img);
// Weight
- $this->addElement(new XoopsFormText(_AM_AVATARS_WEIGHT, 'avatar_weight', 3, 4, $obj->getVar('avatar_weight', 'e')));
+ $weight = new XoopsFormText(_AM_AVATARS_WEIGHT, 'avatar_weight', 1, 4, $obj->getVar('avatar_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _AM_AVATARS_ERROR_WEIGHT);
+ $this->addElement($weight, true);
// Display
$this->addElement(new XoopsFormRadioYN(_AM_AVATARS_DISPLAY, 'avatar_display', $obj->getVar('avatar_display', 'e'), _YES, _NO));
// Hidden
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -41,6 +41,7 @@
define("_AM_AVATARS_WEIGHT","Display order in avatar manager:");
define("_AM_AVATARS_UPLOADS","Upload");
define("_AM_AVATARS_USERS","Users using this avatar");
+define("_AM_AVATARS_ERROR_WEIGHT","You need a positive integer");
// Tips
define("_AM_AVATARS_SYSTEM_TIPS","<ul><li>Add, update or delete system avatars</li></ul>");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html 2012-09-12 18:46:05 UTC (rev 10173)
@@ -45,5 +45,5 @@
<{/if}>
<!-- Display Avatar form (add,edit) -->
<{if $form}>
-<div class="spacer"><{$form}></div>
+<{includeq file="module:system|system_form.html"}>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -58,12 +58,12 @@
$client_select->addOptionArray($client_Handler->getList());
$this->addElement($client_select, true);
- $imptotal = new XoopsFormText( _AM_BANNERS_BANNERS_IMPRESSIONSP, 'imptotal', 20, 255, $obj->getVar('imptotal') );
+ $imptotal = new XoopsFormText( _AM_BANNERS_BANNERS_IMPRESSIONSP, 'imptotal', 1, 255, $obj->getVar('imptotal') );
$imptotal->setPattern('^[0-9]*[0-9]+$|^[0-9]+[0-9]*$', _AM_BANNERS_BANNERS_IMPRESSIONSP_PATTERN);
$this->addElement($imptotal, true );
$imgtray_img = new XoopsFormElementTray( _AM_BANNERS_BANNERS_IMAGE, '<br /><br />' );
- $imgtray_img->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_IMGURL, 'imageurl', 80, 255, $obj->getVar('imageurl')));
+ $imgtray_img->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_IMGURL, 'imageurl', 5, 255, $obj->getVar('imageurl')));
$imgpath_img = sprintf( _AM_BANNERS_BANNERS_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/banners/' );
$imageselect_img = new XoopsFormSelect( $imgpath_img, 'banners_imageurl', $blank_img );
$image_array_img = XoopsLists::getImgListAsArray( XOOPS_UPLOAD_PATH . '/banners' );
@@ -80,11 +80,11 @@
$imgtray_img->addElement($fileseltray_img);
$this->addElement($imgtray_img);
- $this->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_CLICKURL, 'clickurl', 80, 255, $obj->getVar('clickurl') ), false );
+ $this->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_CLICKURL, 'clickurl', 5, 255, $obj->getVar('clickurl') ), false );
$this->addElement(new XoopsFormRadioYN( _AM_BANNERS_BANNERS_USEHTML, 'htmlbanner', $html_banner, _YES, _NO) );
- $this->addElement(new xoopsFormTextArea( _AM_BANNERS_BANNERS_CODEHTML, 'htmlcode', $obj->getVar('htmlcode'), 5, 50), false );
+ $this->addElement(new xoopsFormTextArea( _AM_BANNERS_BANNERS_CODEHTML, 'htmlcode', $obj->getVar('htmlcode'), 5, 5), false );
if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'bid', $obj->getVar('bid') ) );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -33,7 +33,7 @@
parent::__construct($title, 'form', 'clients.php', 'post', true);
- $this->addElement(new XoopsFormText( _AM_BANNERS_CLIENTS_NAME, 'name', 50, 255, $obj->getVar('name') ), true );
+ $this->addElement(new XoopsFormText( _AM_BANNERS_CLIENTS_NAME, 'name', 5, 255, $obj->getVar('name') ), true );
// date
if ($obj->isNew()) {
$user = 'N';
@@ -51,7 +51,7 @@
$uname->addElement($type);
$uname->addElement(new XoopsFormSelectUser('', 'uid', false, $obj->getVar('uid'), 1, false));
$this->addElement($uname);
- $this->addElement(new xoopsFormTextArea( _AM_BANNERS_CLIENTS_EXTRAINFO, 'extrainfo', $obj->getVar('extrainfo'), 5, 50 ), false );
+ $this->addElement(new xoopsFormTextArea( _AM_BANNERS_CLIENTS_EXTRAINFO, 'extrainfo', $obj->getVar('extrainfo'), 5, 5 ), false );
if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'cid', $obj->getVar('cid') ) );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -28,13 +28,15 @@
$title = $obj->isNew() ? sprintf(_PROFILE_AM_ADD, _PROFILE_AM_CATEGORY) : sprintf(_PROFILE_AM_EDIT, _PROFILE_AM_CATEGORY);
parent::__construct($title, 'form', false, 'post', true);
- $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'cat_title', 35, 255, $obj->getVar('cat_title')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'cat_title', 5, 255, $obj->getVar('cat_title')), true);
if (!$obj->isNew()) {
//Load groups
$this->addElement(new XoopsFormHidden('id', $obj->getVar('cat_id')));
}
- $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'cat_description', $obj->getVar('cat_description', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_WEIGHT, 'cat_weight', 35, 35, $obj->getVar('cat_weight', 'e')));
+ $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'cat_description', $obj->getVar('cat_description', 'e'), 5, 5));
+ $weight = new XoopsFormText(_PROFILE_AM_WEIGHT, 'cat_weight', 1, 5, $obj->getVar('cat_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
$this->addElement(new XoopsFormHidden('op', 'save') );
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit', 'btn primary formButton'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -30,8 +30,8 @@
parent::__construct($title, 'form', '', 'post', true);
- $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'field_title', 35, 255, $obj->getVar('field_title', 'e')));
- $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'field_description', $obj->getVar('field_description', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'field_title', 5, 255, $obj->getVar('field_title', 'e')), true);
+ $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'field_description', $obj->getVar('field_description', 'e'), 5, 5));
if (!$obj->isNew()) {
$fieldcat_id = $obj->getVar('cat_id');
@@ -43,13 +43,15 @@
$cat_select->addOption(0, _PROFILE_AM_DEFAULT);
$cat_select->addOptionArray($category_handler->getList());
$this->addElement($cat_select);
- $this->addElement(new XoopsFormText(_PROFILE_AM_WEIGHT, 'field_weight', 10, 10, $obj->getVar('field_weight', 'e')));
+ $weight = new XoopsFormText(_PROFILE_AM_WEIGHT, 'field_weight', 1, 10, $obj->getVar('field_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
if ($obj->getVar('field_config') || $obj->isNew()) {
if (!$obj->isNew()) {
$this->addElement(new XoopsFormLabel(_PROFILE_AM_NAME, $obj->getVar('field_name')));
$this->addElement(new XoopsFormHidden('id', $obj->getVar('field_id')));
} else {
- $this->addElement(new XoopsFormText(_PROFILE_AM_NAME, 'field_name', 35, 255, $obj->getVar('field_name', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_NAME, 'field_name', 5, 255, $obj->getVar('field_name', 'e')), true);
}
//autotext and theme left out of this one as fields of that type should never be changed (valid assumption, I think)
@@ -77,7 +79,7 @@
XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER
);
- $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $obj->getVar('field_valuetype', 'e'));
+ $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $obj->getVar('field_valuetype', 'e'), 5, 5);
$type_select->addOptionArray($valuetypes);
$this->addElement($type_select);
break;
@@ -128,7 +130,7 @@
case "textbox":
case "textarea":
case "dhtml":
- $this->addElement(new XoopsFormText(_PROFILE_AM_MAXLENGTH, 'field_maxlength', 35, 35, $obj->getVar('field_maxlength', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_MAXLENGTH, 'field_maxlength', 5, 5, $obj->getVar('field_maxlength', 'e')));
$this->addElement(new XoopsFormTextArea(_PROFILE_AM_DEFAULT, 'field_default', $obj->getVar('field_default', 'e')));
break;
@@ -162,15 +164,15 @@
break;
case "date":
- $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 15, $obj->getVar('field_default', 'e')));
+ $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 2, $obj->getVar('field_default', 'e')));
break;
case "longdate":
- $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 15, strtotime($obj->getVar('field_default', 'e'))));
+ $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 2, strtotime($obj->getVar('field_default', 'e'))));
break;
case "datetime":
- $this->addElement(new XoopsFormDateTime(_PROFILE_AM_DEFAULT, 'field_default', 15, $obj->getVar('field_default', 'e')));
+ $this->addElement(new XoopsFormDateTime(_PROFILE_AM_DEFAULT, 'field_default', 2, $obj->getVar('field_default', 'e')));
break;
case "yesno":
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -28,9 +28,12 @@
$this->addElement(new XoopsFormHidden('id', $obj->getVar('step_id')));
}
$this->addElement(new XoopsFormHidden('op', 'save'));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPNAME, 'step_name', 25, 255, $obj->getVar('step_name', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPINTRO, 'step_desc', 25, 255, $obj->getVar('step_desc', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPORDER, 'step_order', 10, 10, $obj->getVar('step_order', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_STEPNAME, 'step_name', 5, 255, $obj->getVar('step_name', 'e')), true);
+ $this->addElement(new XoopsFormText(_PROFILE_AM_STEPINTRO, 'step_desc', 5, 255, $obj->getVar('step_desc', 'e')));
+ $order = new XoopsFormText(_PROFILE_AM_STEPORDER, 'step_order', 1, 10, $obj->getVar('step_order', 'e'), '');
+ $order->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($order, true);
+
$this->addElement(new XoopsFormRadioYN(_PROFILE_AM_STEPSAVE, 'step_save', $obj->getVar('step_save', 'e')));
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit', 'btn primary formButton'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -48,22 +48,22 @@
//$uname_size = $GLOBALS['xoopsConfigUser']['maxuname'] < 35 ? $GLOBALS['xoopsConfigUser']['maxuname'] : 35;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 35, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
+ 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 5, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
'required' => true
);
$weights[0][] = 0;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_EMAIL, 'email', 35, 255, $user->getVar('email', 'e')), 'required' => true
+ 'element' => new XoopsFormText(_US_EMAIL, 'email', 5, 255, $user->getVar('email', 'e')), 'required' => true
);
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 35, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 35, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
}
@@ -153,10 +153,10 @@
if ($user->isNew() || $xoops->user->isAdmin()) {
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 25, $xoops->user->isAdmin() ? 60
+ 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 3, $xoops->user->isAdmin() ? 60
: $GLOBALS['xoopsConfigUser']['maxuname'], $user->getVar('uname', 'e')), 'required' => 1
);
- $email_text = new XoopsFormText('', 'email', 30, 60, $user->getVar('email'));
+ $email_text = new XoopsFormText('', 'email', 4, 60, $user->getVar('email'));
} else {
$elements[0][] = array('element' => new XoopsFormLabel(_US_NICKNAME, $user->getVar('uname')), 'required' => 0);
$email_text = new XoopsFormLabel('', $user->getVar('email'));
@@ -169,8 +169,8 @@
if ($xoops->user->isAdmin() && $user->getVar('uid') != $xoops->user->getVar('uid')) {
//If the user is an admin and is editing someone else
- $pwd_text = new XoopsFormPassword('', 'password', 10, 32);
- $pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
+ $pwd_text = new XoopsFormPassword('', 'password', 3, 32);
+ $pwd_text2 = new XoopsFormPassword('', 'vpass', 3, 32);
$pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -118,4 +118,5 @@
define("_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS", "Deactivating an administrator account is not allowed");
define("_PROFILE_AM_CATEGORY_LIST", "List of categories");
define("_PROFILE_AM_STEP_LIST", "List of registration step");
-define("_PROFILE_AM_FIELD_LIST", "List of fields");
\ No newline at end of file
+define("_PROFILE_AM_FIELD_LIST", "List of fields");
+define("_PROFILE_AM_ERROR_WEIGHT","You need a positive integer");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -40,8 +40,8 @@
parent::__construct($title, 'form', 'smilies.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_AM_SMILIES_CODE, 'code', 26, 25, $obj->getVar('code'), '', '^Code(.*)$', 'Code', true), true);
- $this->addElement(new XoopsFormText(_AM_SMILIES_DESCRIPTION, 'emotion', 50, 50, $obj->getVar('emotion'), '', '', '', true), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_CODE, 'code', 2, 25, $obj->getVar('code'), '', '^Code(.*)$', 'Code', true), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_DESCRIPTION, 'emotion', 4, 50, $obj->getVar('emotion'), '', '', '', true), true);
$imgtray_img = new XoopsFormElementTray( _AM_SMILIES_FILE, '<br />' );
$imgpath_img = sprintf( _AM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -94,7 +94,9 @@
));
$this->addElement($side_select);
// Order
- $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 2, 5, $this->_obj->getVar('weight')));
+ $weight = new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 1, 5, $this->_obj->getVar('weight'), '');
+ $weight->setPattern('^\d+$', _AM_SYSTEM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
// Display
$this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_BLOCKS_VISIBLE, 'visible', $this->_obj->getVar('visible')));
// Visible In
@@ -108,15 +110,13 @@
$mod_select->addOptionArray($module_list);
$this->addElement($mod_select);
// Title
- $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_TITLE, 'title', 50, 255, $this->_obj->getVar('title')), false);
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_TITLE, 'title', 5, 255, $this->_obj->getVar('title')), false);
if ($this->_obj->isNew() || $this->_obj->isCustom()) {
$editor_configs = array();
$editor_configs["name"] = "content_block";
$editor_configs["value"] = $this->_obj->getVar('content', 'e');
- $editor_configs["rows"] = 20;
- $editor_configs["cols"] = 100;
- $editor_configs["width"] = "100%";
- $editor_configs["height"] = "400px";
+ $editor_configs["rows"] = 15;
+ $editor_configs["cols"] = 6;
$editor_configs["editor"] = $xoops->getModuleConfig('blocks_editor', 'system');
$this->addElement(new XoopsFormEditor(_AM_SYSTEM_BLOCKS_CONTENT, "content_block", $editor_configs), true);
if (in_array($editor_configs["editor"], array('dhtmltextarea', 'textarea'))) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -53,7 +53,7 @@
parent::__construct($title, "groupform", 'admin.php', "post", true);
$this->setExtra('enctype="multipart/form-data"');
- $name_text = new XoopsFormText(_AM_SYSTEM_GROUPS_NAME, "name", 30, 50, $obj->getVar('name'));
+ $name_text = new XoopsFormText(_AM_SYSTEM_GROUPS_NAME, "name", 4, 50, $obj->getVar('name'));
$desc_text = new XoopsFormTextArea(_AM_SYSTEM_GROUPS_DESCRIPTION, "desc", $obj->getVar('description'));
$system_catids = new XoopsFormElementTray( _AM_SYSTEM_GROUPS_SYSTEMRIGHTS, '' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -201,7 +201,7 @@
case 'password':
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
case 'color':
@@ -272,10 +272,10 @@
if ($obj[$i]->getVar('conf_valuetype') == 'array') {
// this is exceptional.. only when value type is arrayneed a smarter way for this
$ele = ($obj[$i]->getVar('conf_value') != '')
- ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 50)
- : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 50);
+ ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
+ : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
} else {
- $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 50);
+ $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
}
break;
@@ -328,7 +328,7 @@
case 'password':
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
break;
case 'color':
@@ -349,7 +349,7 @@
case 'textbox':
default:
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -98,26 +98,26 @@
//Affichage du formulaire
parent::__construct($form_title, "form_user", "admin.php", "post", true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NICKNAME, "username", 25, 25, $uname_value), true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NAME, "name", 30, 60, $name_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NICKNAME, "username", 4, 25, $uname_value), true);
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NAME, "name", 5, 60, $name_value));
$email_tray = new XoopsFormElementTray(_AM_SYSTEM_USERS_EMAIL, "<br />");
- $email_text = new XoopsFormText("", "email", 30, 60, $email_value);
+ $email_text = new XoopsFormText("", "email", 5, 60, $email_value);
$email_tray->addElement($email_text, true);
$email_cbox = new XoopsFormCheckBox("", "user_viewemail", $email_cbox_value);
$email_cbox->addOption(1, _AM_SYSTEM_USERS_AOUTVTEAD);
$email_tray->addElement($email_cbox);
$this->addElement($email_tray, true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_URL, "url", 30, 100, $url_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_URL, "url", 5, 100, $url_value));
$this->addElement(new XoopsFormSelectTimezone(_AM_SYSTEM_USERS_TIMEZONE, "timezone_offset", $timezone_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_ICQ, "user_icq", 15, 15, $icq_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_AIM, "user_aim", 18, 18, $aim_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_YIM, "user_yim", 25, 25, $yim_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_MSNM, "user_msnm", 30, 100, $msnm_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_LOCATION, "user_from", 30, 100, $location_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_OCCUPATION, "user_occ", 30, 100, $occ_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_INTEREST, "user_intrest", 30, 150, $interest_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_ICQ, "user_icq", 3, 15, $icq_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_AIM, "user_aim", 3, 18, $aim_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_YIM, "user_yim", 3, 25, $yim_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_MSNM, "user_msnm", 3, 100, $msnm_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_LOCATION, "user_from", 5, 100, $location_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_OCCUPATION, "user_occ", 5, 100, $occ_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_INTEREST, "user_intrest", 5, 150, $interest_value));
$sig_tray = new XoopsFormElementTray(_AM_SYSTEM_USERS_SIGNATURE, "<br />");
- $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value);
+ $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value, 5, 5);
$sig_tray->addElement($sig_tarea);
$sig_cbox = new XoopsFormCheckBox("", "attachsig", $sig_cbox_value);
$sig_cbox->addOption(1, _AM_SYSTEM_USERS_SHOWSIG);
@@ -143,7 +143,7 @@
XOOPS_NOTIFICATION_MODE_SENDONCETHENWAIT => _NOT_MODE_SENDONCEPERLOGIN
));
$this->addElement($notify_mode_select);
- $this->addElement(new XoopsFormTextArea(_AM_SYSTEM_USERS_EXTRAINFO, "bio", $bio_value));
+ $this->addElement(new XoopsFormTextArea(_AM_SYSTEM_USERS_EXTRAINFO, "bio", $bio_value, 5, 5));
$rank_select = new XoopsFormSelect(_AM_SYSTEM_USERS_RANK, "rank", $rank_value);
$ranklist = XoopsLists::getUserRankList();
$rank_select->addOption(0, "--------------");
@@ -153,11 +153,11 @@
$this->addElement($rank_select);
// adding a new user requires password fields
if (!$form_isedit) {
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 10, 32), true);
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 10, 32), true);
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 3, 32), true);
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 3, 32), true);
} else {
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 10, 32));
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 10, 32));
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 3, 32));
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 3, 32));
}
$this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_USERS_MAILOK, 'user_mailok', $mailok_value));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -68,11 +68,10 @@
define("_AM_SYSTEM_DBUPDATED","Database Updated Successfully!");
define("_AM_SYSTEM_DBERROR","Database was not updated due to some error!");
define("_AM_SYSTEM_NOTACTIVE","This section is not active!");
+define("_AM_SYSTEM_ERROR_WEIGHT","You need a positive integer");
// Group permission phrases
define("_MD_AM_PERMADDNG","Could not add %s permission to %s for group %s");
define("_MD_AM_PERMADDOK","Added %s permission to %s for group %s");
define("_MD_AM_PERMRESETNG","Could not reset group permission for module %s");
-define("_MD_AM_PERMADDNGP","All parent items must be selected.");
-
-?>
\ No newline at end of file
+define("_MD_AM_PERMADDNGP","All parent items must be selected.");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -40,9 +40,13 @@
parent::__construct($title, 'form', 'userrank.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement( new XoopsFormText( _AM_USERRANK_TITLE, 'rank_title', 50, 50, $obj->getVar('rank_title'), true ) );
- $this->addElement( new XoopsFormText( _AM_USERRANK_MINPOST, 'rank_min', 10, 10, $obj->getVar('rank_min') ) );
- $this->addElement( new XoopsFormText( _AM_USERRANK_MAXPOST, 'rank_max', 10, 10, $obj->getVar('rank_max') ) );
+ $this->addElement( new XoopsFormText( _AM_USERRANK_TITLE, 'rank_title', 4, 50, $obj->getVar('rank_title')), true );
+ $min = new XoopsFormText( _AM_USERRANK_MINPOST, 'rank_min', 1, 10, $obj->getVar('rank_min'));
+ $min->setPattern('^\d+$',_AM_USERRANK_ERROR_POST);
+ $this->addElement($min);
+ $max = new XoopsFormText( _AM_USERRANK_MAXPOST, 'rank_max', 1, 10, $obj->getVar('rank_max'));
+ $max->setPattern('^\d+$',_AM_USERRANK_ERROR_POST);
+ $this->addElement($max);
$imgtray_img = new XoopsFormElementTray( _AM_USERRANK_IMAGE, '<br />' );
$imgpath_img = sprintf( _AM_USERRANK_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/ranks/' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -36,6 +36,7 @@
define("_AM_USERRANK_SUREDEL","Are you sure you want to delete this ranking?");
define("_AM_USERRANK_TITLE","Title");
define("_AM_USERRANK_UPLOAD","Upload");
+define("_AM_USERRANK_ERROR_POST","You need a positive integer");
// Info
define("_AM_USERRANK_NBTOTAL","There are %s ranks in our database");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-12 16:52:06
|
Revision: 10172
http://xoops.svn.sourceforge.net/xoops/?rev=10172&view=rev
Author: mageg
Date: 2012-09-12 16:51:55 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
update form for module system
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-11 10:41:55 UTC (rev 10171)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 16:51:55 UTC (rev 10172)
@@ -59,10 +59,10 @@
if ($config[$i]->getVar('conf_valuetype') == 'array') {
// this is exceptional.. only when value type is arrayneed a smarter way for this
$ele = ($config[$i]->getVar('conf_value') != '')
- ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
- : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
+ ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 5)
+ : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 5);
} else {
- $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
+ $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 5);
}
break;
@@ -217,7 +217,7 @@
case 'textbox':
default:
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-11 10:41:55 UTC (rev 10171)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-12 16:51:55 UTC (rev 10172)
@@ -122,8 +122,8 @@
$select_tray->addOption(6, 'Select_tray 6');
$select_tray->setDescription('Description Select_tray');
$select_tray->setClass('span2');
+$testtray ->addElement($select_tray, true);
$testtray ->addElement($select_tray);
-$testtray ->addElement($select_tray);
$form->addElement($testtray);
$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-11 10:42:02
|
Revision: 10171
http://xoops.svn.sourceforge.net/xoops/?rev=10171&view=rev
Author: irmtfan
Date: 2012-09-11 10:41:55 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
fix viewtopic admin mode, fix notification redirect, revoke last rev 10170 in xoops_version.php
Revision Links:
--------------
http://xoops.svn.sourceforge.net/xoops/?rev=10170&view=rev
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-11 10:41:55 UTC (rev 10171)
@@ -1,3 +1,16 @@
+date 2012-09-11
+===============================
+1- bug fix: viewtopic admin mode action incorrectly on the topic instead of selected posts of the topic.(important)
+in newbb/templates/newbb_viewtopic.html
+2- change some reletive URLs to Full URLs (Roby73/irmtfan)
+in newbb/notification.inc.ini
+3- bug fix: redirect was not correct in subdomain (value=xoops_url removed)
+in newbb/templates/newbb_notification_select.html
+4- advertise post should not have admin buttons.
+in newbb/templates/newbb_thread.html
+5- revoke the last change rev 10170 and revert to rev 10102
+in newbb/xoops_version.php
+
date 2012-09-10
===============================
1- bug fix: notification not show in newbb/viewtopic.php?post_id=XXXX URLs
Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php 2012-09-11 10:41:55 UTC (rev 10171)
@@ -52,7 +52,8 @@
// Assume we have a valid forum id
$sql = 'SELECT forum_name FROM ' . $xoopsDB->prefix('bb_forums') . ' WHERE forum_id = '.$item_id;
if (!$result = $xoopsDB->query($sql)) {
- redirect_header("index.php", 2, _MD_ERRORFORUM);
+ // irmtfan full URL
+ redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERRORFORUM);
exit();
}
$result_array = $xoopsDB->fetchArray($result);
@@ -65,7 +66,8 @@
// Assume we have a valid topid id
$sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM '.$xoopsDB->prefix('bb_topics') . ' t, ' . $xoopsDB->prefix('bb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = '. $item_id . ' limit 1';
if (!$result = $xoopsDB->query($sql)) {
- redirect_header("index.php", 2, _MD_ERROROCCURED);
+ // irmtfan full URL
+ redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERROROCCURED);
exit();
}
$result_array = $xoopsDB->fetchArray($result);
@@ -78,7 +80,8 @@
// Assume we have a valid post id
$sql = 'SELECT subject,topic_id,forum_id FROM ' . $xoopsDB->prefix('bb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
if (!$result = $xoopsDB->query($sql)) {
- redirect_header("index.php", 2, _MD_ERROROCCURED);
+ // irmtfan full URL
+ redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERROROCCURED);
exit();
}
$result_array = $xoopsDB->fetchArray($result);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html 2012-09-11 10:41:55 UTC (rev 10171)
@@ -1,7 +1,8 @@
<{if $xoops_notification.show}>
<form name="notification_select" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$xoops_notification.target_page}>" method="post">
<h4 class="txtcenter"><{$lang_activenotifications}> </h4>
- <input type="hidden" name="not_redirect" value="<{$xoops_url}><{$xoops_notification.redirect_script}>" />
+ <!-- irmtfan remove value=xoops_url -->
+ <input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $GLOBALS['xoopsSecurity']->createToken();<{/php}>" />
<table class="outer">
<tr>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-11 10:41:55 UTC (rev 10171)
@@ -131,7 +131,8 @@
</td>
<!-- irmtfan removed hardcode style="text-align:right;" -->
<td class="right">
- <{if $mode gt 1}>
+ <!-- irmtfan if the post is not advertise -->
+ <{if $mode gt 1 && $topic_post.poster.uid gt -1}>
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=1" target="_self" title="<{$smarty.const._MD_SPLIT_ONE}>"><{$smarty.const._MD_SPLIT_ONE}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=2" target="_self" title="<{$smarty.const._MD_SPLIT_TREE}>"><{$smarty.const._MD_SPLIT_TREE}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> |
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-11 10:41:55 UTC (rev 10171)
@@ -53,8 +53,8 @@
<!-- irmtfan hardcode removed style="float: right; text-align: right;" -->
<div class="icon_right" id="admin">
<{if $mode gt 1}>
- <!-- irmtfan mistype forum_posts_admin => form_posts_admin -->
- <form name="form_posts_admin" action="topicmanager.php" method="POST" onsubmit="javascript: if(window.document.form_posts_admin.op.value < 1){return false;}">
+ <!-- irmtfan mistype forum_posts_admin => form_posts_admin - action="topicmanager.php" => action="action.post.php" -->
+ <form name="form_posts_admin" action="action.post.php" method="POST" onsubmit="javascript: if(window.document.form_posts_admin.op.value < 1){return false;}">
<{$smarty.const._ALL}>: <input type="checkbox" name="post_check" id="post_check" value="1" onclick="xoopsCheckAll('form_posts_admin', 'post_check');" />
<!-- irmtfan mistype mode => op -->
<select name="op">
Modified: XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php 2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php 2012-09-11 10:41:55 UTC (rev 10171)
@@ -721,8 +721,7 @@
$modversion['notification']['category'][1]['title'] = _MI_NEWBB_THREAD_NOTIFY;
$modversion['notification']['category'][1]['description'] = _MI_NEWBB_THREAD_NOTIFYDSC;
$modversion['notification']['category'][1]['subscribe_from'] = 'viewtopic.php';
-// irmtfan remove because "item_name" can be "topic_id" and/or "post_id"
-// $modversion['notification']['category'][1]['item_name'] = 'topic_id';
+$modversion['notification']['category'][1]['item_name'] = 'topic_id';
$modversion['notification']['category'][1]['allow_bookmark'] = 1;
$modversion['notification']['category'][2]['name'] = 'forum';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-10 10:57:39
|
Revision: 10170
http://xoops.svn.sourceforge.net/xoops/?rev=10170&view=rev
Author: irmtfan
Date: 2012-09-10 10:57:32 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
bug fix: notification not show in newbb/viewtopic.php?post_id=XXXX URLs
need a module update after implementation
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-10 06:44:36 UTC (rev 10169)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-10 10:57:32 UTC (rev 10170)
@@ -1,5 +1,10 @@
date 2012-09-10
===============================
+1- bug fix: notification not show in newbb/viewtopic.php?post_id=XXXX URLs
+in newbb/xoops_version.php
+
+date 2012-09-10
+===============================
1- back rank_image and rank_title to rank.image rank.title smarty variables to make consistency with old newbb versions.
in newbb/class/user.php, newbb/templates/newbb_thread.html
Modified: XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php 2012-09-10 06:44:36 UTC (rev 10169)
+++ XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php 2012-09-10 10:57:32 UTC (rev 10170)
@@ -721,7 +721,8 @@
$modversion['notification']['category'][1]['title'] = _MI_NEWBB_THREAD_NOTIFY;
$modversion['notification']['category'][1]['description'] = _MI_NEWBB_THREAD_NOTIFYDSC;
$modversion['notification']['category'][1]['subscribe_from'] = 'viewtopic.php';
-$modversion['notification']['category'][1]['item_name'] = 'topic_id';
+// irmtfan remove because "item_name" can be "topic_id" and/or "post_id"
+// $modversion['notification']['category'][1]['item_name'] = 'topic_id';
$modversion['notification']['category'][1]['allow_bookmark'] = 1;
$modversion['notification']['category'][2]['name'] = 'forum';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-10 06:44:43
|
Revision: 10169
http://xoops.svn.sourceforge.net/xoops/?rev=10169&view=rev
Author: irmtfan
Date: 2012-09-10 06:44:36 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
rank smarty variables like 3.08, full URL, up icon
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
XoopsModules/newbb/branches/irmtfan/newbb/polls.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-10 06:44:36 UTC (rev 10169)
@@ -1,3 +1,15 @@
+date 2012-09-10
+===============================
+1- back rank_image and rank_title to rank.image rank.title smarty variables to make consistency with old newbb versions.
+in newbb/class/user.php, newbb/templates/newbb_thread.html
+
+2- change some reletive URLs to Full URLs (Roby73/irmtfan)
+in newbb/viewforum.php, newbb/topicmanager.php, newbb/polls.php, newbb/templates/newbb_viewtopic.html
+
+3- add up and down icons smarty variables to templates.
+in newbb/viewpost.php, newbb/templates/newbb_viewpost.html, newbb/templates/newbb_viewtopic.html
+
+
date 2012-09-09
==================
1- some changes in persian language notifications.
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-09-10 06:44:36 UTC (rev 10169)
@@ -174,11 +174,12 @@
$userinfo["link"] = "<a href=\"".XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid") ."\">".$userinfo["name"]."</a>";
$userinfo["avatar"] = $user->getVar('user_avatar');
- // START hacked by irmtfan - easier rank getting
+ // START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
$userrank = $user->rank();
+ $userinfo["rank"]= array();
if (isset($userrank['image']) && $userrank['image']) {
- $userinfo["rank_image"] = $userrank['image'];
- $userinfo["rank_title"] = $userrank['title'];
+ $userinfo["rank"]["image"] = $userrank['image'];
+ $userinfo["rank"]["title"] = $userrank['title'];
}
// END hacked by irmtfan - easier rank getting - a little correctness dot removed
// START hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
Modified: XoopsModules/newbb/branches/irmtfan/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-10 06:44:36 UTC (rev 10169)
@@ -239,7 +239,8 @@
xoops_error($poll->getHtmlErrors());
exit();
}
- redirect_header("viewtopic.php?topic_id={$topic_id}",1,_MD_POLL_DBUPDATED);
+ // irmtfan full URL
+ redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id={$topic_id}",1,_MD_POLL_DBUPDATED);
//exit();
}
@@ -261,7 +262,8 @@
$expire_text = new XoopsFormText(_MD_POLL_EXPIRATION . "<br /><small>" . _MD_POLL_FORMAT . "<br />" . sprintf(_MD_POLL_CURRENTTIME, formatTimestamp(time(), "Y-m-d H:i:s")) . "</small>", "end_time", 20, 19, $date);
$poll_form->addElement($expire_text);
} else {
- $restart_label = new XoopsFormLabel(_MD_POLL_EXPIRATION, sprintf(_MD_POLL_EXPIREDAT, $date) . "<br /><a href='polls.php?op=restart&poll_id=" . $poll->getVar("poll_id") . "'>" . _MD_POLL_RESTART . "</a>");
+ // irmtfan full URL
+ $restart_label = new XoopsFormLabel(_MD_POLL_EXPIRATION, sprintf(_MD_POLL_EXPIREDAT, $date) . "<br /><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/polls.php?op=restart&poll_id=" . $poll->getVar("poll_id") . "'>" . _MD_POLL_RESTART . "</a>");
$poll_form->addElement($restart_label);
}
$weight_text = new XoopsFormText(_MD_POLL_DISPLAYORDER, "weight", 6, 5, $poll->getVar("weight"));
@@ -295,7 +297,8 @@
unset($color_select, $color_label, $option_id_hidden, $option_text);
$i++;
}
- $more_label = new XoopsFormLabel("", "<br /><a href='polls.php?op=addmore&poll_id=" . $poll->getVar("poll_id") . "&topic_id=" . $topic_id . "'>" . _MD_POLL_ADDMORE . "</a>");
+ // irmtfan full URL
+ $more_label = new XoopsFormLabel("", "<br /><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/polls.php?op=addmore&poll_id=" . $poll->getVar("poll_id") . "&topic_id=" . $topic_id . "'>" . _MD_POLL_ADDMORE . "</a>");
$option_tray->addElement($more_label);
$poll_form->addElement($option_tray);
$op_hidden = new XoopsFormHidden("op", "update");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-10 06:44:36 UTC (rev 10169)
@@ -21,8 +21,8 @@
<{if $topic_post.poster.uid gt -1}>
<td width="20%" class="odd" rowspan="2" valign="top">
<{if $topic_post.poster.uid != 0}>
-<!-- START hacked by irmtfan -->
- <div class="comUserRankText"><{if $topic_post.poster.rank_title !=""}> <{$topic_post.poster.rank_title}><br /><img src="<{$xoops_upload_url}>/<{$topic_post.poster.rank_image}>" alt="<{$topic_post.poster.rank_title}>" /><{/if}></div>
+<!-- START hacked by irmtfan rank_title -> rank.title -->
+ <div class="comUserRankText"><{if $topic_post.poster.rank.title !=""}> <{$topic_post.poster.rank.title}><br /><img src="<{$xoops_upload_url}>/<{$topic_post.poster.rank.image}>" alt="<{$topic_post.poster.rank.title}>" /><{/if}></div>
<!-- END hacked by irmtfan -->
<{if $topic_post.poster.avatar != "blank.gif"}>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-10 06:44:36 UTC (rev 10169)
@@ -47,8 +47,8 @@
<br />
<div style="padding: 5px;">
- <!-- irmtfan correct prev and next icons -->
- <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$previous}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev&topic_time=<{$topic_time}>"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next&topic_time=<{$topic_time}>"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <!-- irmtfan remove prev and next icons -->
+ <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a>
</div>
<br />
@@ -111,7 +111,8 @@
<div>
<!-- irmtfan hardcode removed style="float: left; text-align:left;" -->
<div class="icon_left">
- <a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a>
+ <!-- irmtfan add up button -->
+ <a id="threadbottom"></a><{$p_up}><a href="#threadtop"><{$smarty.const._MD_TOP}></a>
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;" -->
<div class="icon_right">
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-10 06:44:36 UTC (rev 10169)
@@ -96,7 +96,7 @@
<!-- irmtfan hardcode removed style="float: left; text-align:left;"" -->
<span class="icon_left">
<!-- irmtfan correct prev and next icons -->
- <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$previous}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$previous}> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
</span>
<!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
<span class="icon_right">
@@ -198,8 +198,8 @@
<div>
<div class="left">
- <!-- irmtfan correct prev and next icons -->
- <a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a> <{$previous}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <!-- irmtfan correct prev and next icons add up-->
+ <a id="threadbottom"></a><{$p_up}><a href="#threadtop"><{$smarty.const._MD_TOP}></a> <{$previous}> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
<div class="icon_right">
Modified: XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-10 06:44:36 UTC (rev 10169)
@@ -103,7 +103,8 @@
//sync($topic_id, "topic");
//xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
}
- echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+ // irmtfan full URL
+ echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} elseif ('restore' == $mode) {
//$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
$forums = array();
@@ -123,7 +124,7 @@
$forum_handler->synchronization($forums_obj[$id]);
}
unset($topics_obj, $forums_obj);
- echo $action[$mode]['msg']."<p><a href='viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+ echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} elseif ('merge' == $mode) {
$post_handler =& xoops_getmodulehandler('post', 'newbb');
@@ -191,9 +192,10 @@
}
echo $action[$mode]['msg'].
- "<p><a href='".XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$newtopic'>"._MD_VIEWTHETOPIC."</a></p>".
- "<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p>".
- "<p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+ // irmtfan full URL
+ "<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$newtopic'>"._MD_VIEWTHETOPIC."</a></p>".
+ "<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p>".
+ "<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} elseif ('move' == $mode) {
if ($newforum > 0) {
$topic_id = $topic_id[0];
@@ -209,8 +211,8 @@
}
$forum_handler->synchronization($forum);
$forum_handler->synchronization($newforum);
-
- echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+// irmtfan full URL
+ echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} else {
redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM);
}
@@ -248,7 +250,8 @@
$userstats_handler->insert($user_stat);
}
}
- echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&forum=$forum'>"._MD_VIEWTHETOPIC."</a></p><p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNFORUMINDEX."</a></p>";
+// irmtfan full URL
+ echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$topic_id&forum=$forum'>"._MD_VIEWTHETOPIC."</a></p><p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNFORUMINDEX."</a></p>";
}
} else { // No submit
$mode = $_GET['mode'];
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-09-10 06:44:36 UTC (rev 10169)
@@ -95,10 +95,11 @@
}
if ($forum_handler->getPermission($forum_obj, "post")) {
- $xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
+ // irmtfan full URL
+ $xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
if ($forum_handler->getPermission($forum_obj, "addpoll") && $pollmodules) {
$t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL);
- $xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?op=add&forum={$forum_id}\">{$t_poll}</a>");
+ $xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/newtopic.php?op=add&forum={$forum_id}\">{$t_poll}</a>");
}
} else {
if ( !empty($GLOBALS["xoopsModuleConfig"]["show_reg"]) && !is_object($xoopsUser)) {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php 2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php 2012-09-10 06:44:36 UTC (rev 10169)
@@ -370,7 +370,8 @@
$lang_title .= ' ('.XoopsUser::getUnameFromId($uid).')';
}
$xoopsTpl->assign('lang_title',$lang_title);
-$xoopsTpl->assign('up',newbb_displayImage('up',_MD_TOP));
+// irmtfan up to p_up
+$xoopsTpl->assign('p_up',newbb_displayImage('up',_MD_TOP));
$xoopsTpl->assign('groupbar_enable', $xoopsModuleConfig['groupbar_enabled']);
$xoopsTpl->assign('anonymous_prefix', $xoopsModuleConfig['anonymous_prefix']);
$xoopsTpl->assign('down',newbb_displayImage('down', _MD_BOTTOM));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-09-09 18:20:52
|
Revision: 10168
http://xoops.svn.sourceforge.net/xoops/?rev=10168&view=rev
Author: djculex
Date: 2012-09-09 18:20:46 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
missing define
Modified Paths:
--------------
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/images.php
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/images.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/images.php 2012-09-09 18:13:36 UTC (rev 10167)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/images.php 2012-09-09 18:20:46 UTC (rev 10168)
@@ -2,9 +2,11 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
+ * _LANGCODE da
* _CHARSET UTF-8
* @version $Id: images.php 5014 2010-08-23 08:08:45Z forxoops $
+ * @translation Michael Albertsen (culex)
+
*/
// Navigation
@@ -14,6 +16,8 @@
// Main
define("_AM_SYSTEM_IMAGES_ADDCAT","Tilføj kategori");
+define("_AM_SYSTEM_IMAGES_EDITCAT","Rediger kategori");
+
define("_AM_SYSTEM_IMAGES_ADDIMG","Tilføj billede");
define("_AM_SYSTEM_IMAGES_EDITIMG","Redigér billede");
define("_AM_SYSTEM_IMAGES_CATLIST","Kategori liste");
@@ -31,12 +35,15 @@
define("_AM_SYSTEM_IMAGES_IMGCATNAME","Kategori navn:");
define("_AM_SYSTEM_IMAGES_IMGCATRGRP","Vælg grupper til billed vedligeholdelse: <br /><br />Dette er grupper der har rettighed til at benytte billed værktøjet til at vælge billeder, men ikke uploade. Webmaster har automatisk denne adgang.");
define("_AM_SYSTEM_IMAGES_IMGCATWGRP","Vælg grupper med tilladelse til at uploade billeder: <br /><br />Typisk for moderatorer og administrator");
+
+
define('_AM_SYSTEM_IMAGES_IMGCATDISPLAY',"Vis denne kategori?" );
define("_AM_SYSTEM_IMAGES_IMGCATSTRTYPE","Billederne er uploadet til:");
define("_AM_SYSTEM_IMAGES_STRTYOPENG","Dette kan ikke ændres bagefter!");
define("_AM_SYSTEM_IMAGES_IMGCATWEIGHT","Visnings rækkefølge i billed værktøjet:");
define("_AM_SYSTEM_IMAGES_OFF","Vis i billede værktøj");
define("_AM_SYSTEM_IMAGES_ON","Vises ikke i billede værktøjet");
+define("_AM_SYSTEM_IMAGES_URL","Vis billed URL");
// Messages
define("_AM_SYSTEM_IMAGES_RUDELIMG","Er du sikker på at du vil slette denne billeder fil?");
@@ -45,9 +52,9 @@
define("_AM_SYSTEM_IMAGES_FAILDEL","Det mislykkedes at slette billedet %s fra databasen");
define("_AM_SYSTEM_IMAGES_FAILDELCAT","Kunne ikke slette billed-kategori %s fra databasen");
define("_AM_SYSTEM_IMAGES_FAILUNLINK","Det mislykkedes at slette billedet %s fra serverens bibliotek");
+define("_AM_SYSTEM_IMAGES_SCATDELNG","Kan ikke slette denne kategori");
// Tips
define("_AM_SYSTEM_IMAGES_TIPS","<ul><li> Administrer kategorier af billeder og brugernes tilladelser </li></ul>");
-?>
-<?php // Translation done by xtransam & anderssk - 2010-10-19 07:12 ?>
\ No newline at end of file
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-09-09 18:13:43
|
Revision: 10167
http://xoops.svn.sourceforge.net/xoops/?rev=10167&view=rev
Author: djculex
Date: 2012-09-09 18:13:36 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Removed redundant define in protector
Modified Paths:
--------------
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/protector/language/danish/admin.php
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/protector/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/protector/language/danish/admin.php 2012-09-09 17:42:02 UTC (rev 10166)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/protector/language/danish/admin.php 2012-09-09 18:13:36 UTC (rev 10167)
@@ -35,7 +35,8 @@
define("_AM_H3_PREFIXMAN" , "Præfiks vedligehold" ) ;
define("_AM_MSG_DBUPDATED" , "Databasen opdateret uden fejl!");
define("_AM_CONFIRM_DELETE" , "Alle data vil blive slettet. OK?" ) ;
-define("_AM_TXT_HOWTOCHANGEDB" , "Hvis du ønsker at ændre præfiks,<br /> skal du rediger %s/mainfile.php manuelt.<br /><br />define('XOOPS_DB_PREFIX','<b>%s</b>');" ) ;
+define("_AM_TXT_HOWTOCHANGEDB" , "Hvis du ønsker at ændre præfiks,<br /> skal du rediger %s/mainfile.php manuelt.<br /><br />");
+//define('XOOPS_DB_PREFIX','<b>%s</b>');
// advisory.php
define("_AM_ADV_NOTSECURE","Ikke sikker");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-09-09 17:42:09
|
Revision: 10166
http://xoops.svn.sourceforge.net/xoops/?rev=10166&view=rev
Author: wishcraft
Date: 2012-09-09 17:42:02 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Xortify 3.10 (Production) - Performance Enhancement as well as fixes to Ninjas after cache files routine - see changelog.txt for changes
Modified Paths:
--------------
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/providers.php
Modified: XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/changelog.txt
===================================================================
--- XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/changelog.txt 2012-09-09 17:04:52 UTC (rev 10165)
+++ XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/changelog.txt 2012-09-09 17:42:02 UTC (rev 10166)
@@ -1,5 +1,5 @@
========================================
- 2012/09/10 02:32:05 Version 3.10 STABLE
+ 2012/09/10 03:40:00 Version 3.10 -PROD-
========================================
- Changed /include/update.php - added instance key checking and updating (Wishcraft)
- Changed /include/install.php - added instance key checking and writing (Wishcraft)
@@ -7,11 +7,15 @@
- Changed /language/english/admin.php - changes to dashboard language file (Wishcraft)
- Changed /admin/index.php - changes to dashboard added instance key information (Wishcraft)
- Changed /include/functions.php - function unlinkOldCachefiles() fixed filename issue *Bug 04* (Wishcraft)
+ - Changed /preloads/core.php - loading of /include/instance.php intanciated (Wishcraft)
+ - Changed /preloads/provider.php - function init() modified, loading of instance.php instanciated (Wishcraft)
+ - Changed /xoops_version.php - new google analytics preference added, image locations changed! (Wishcraft)
- Changed **GLOBAL** renamed $GLOBALS['xortify to $_SESSION['xortify'][' - removed use of globals!! performance!! (Wishcraft)
- Added /include/instance.php - Instance Key Define File (Wishcraft)
- Added /template/xortify_instance_key.php.txt - Instance Key Template for PHP File (Wishcraft)
- Added /include/post.footer.end.php - reinstated footer end file loader (was missing) (Wishcraft)
- Added /include/functions.php - function writeInstanceKey() added to unify local client! (Wishcraft)
+ - Moved /Frameworks/moduleclasses/icons to /xortify/images move of the internal images (Wishcraft)
========================================
2012/08/23 23:33:15 Version 3.09 BETA
Modified: XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/core.php 2012-09-09 17:04:52 UTC (rev 10165)
+++ XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/core.php 2012-09-09 17:42:02 UTC (rev 10166)
@@ -35,6 +35,7 @@
include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
include_once XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/xortify/include/instance.php';
class XortifyCorePreload extends XoopsPreloadItem
{
Modified: XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/providers.php
===================================================================
--- XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/providers.php 2012-09-09 17:04:52 UTC (rev 10165)
+++ XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/providers.php 2012-09-09 17:42:02 UTC (rev 10166)
@@ -36,6 +36,7 @@
include_once( XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php' );
+include_once( XOOPS_ROOT_PATH.'/modules/xortify/include/instance.php' );
class Providers
{
@@ -46,7 +47,7 @@
defined('DS') or define('DS', DIRECTORY_SEPARATOR);
defined('NWLINE')or define('NWLINE', "\n");
- global $xoops, $xoopsPreload, $xoopsLogger, $xoopsErrorHandler, $xoopsSecurity, $sess_handler;
+ global $xoops, $xoopsPreload, $xoopsLogger, $xoopsErrorHandler, $xoopsSecurity, $sess_handler, $xoopsConfig;
include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'defines.php';
include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
@@ -78,6 +79,43 @@
include_once $xoops->path('class/database/databasefactory.php');
$GLOBALS['xoopsDB'] =& XoopsDatabaseFactory::getDatabaseConnection();
+ /**
+ * Get xoops configs
+ * Requires functions and database loaded
+ */
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfig = $config_handler->getConfigsByCat(XOOPS_CONF);
+
+ /**
+ * User Sessions
+ */
+ $xoopsUser = '';
+ $xoopsUserIsAdmin = false;
+ $member_handler =& xoops_gethandler('member');
+ $sess_handler =& xoops_gethandler('session');
+ if ($xoopsConfig['use_ssl']
+ && isset($_POST[$xoopsConfig['sslpost_name']])
+ && $_POST[$xoopsConfig['sslpost_name']] != ''
+ ) {
+ session_id($_POST[$xoopsConfig['sslpost_name']]);
+ } else if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && $xoopsConfig['session_expire'] > 0) {
+ if (isset($_COOKIE[$xoopsConfig['session_name']])) {
+ session_id($_COOKIE[$xoopsConfig['session_name']]);
+ }
+ if (function_exists('session_cache_expire')) {
+ session_cache_expire($xoopsConfig['session_expire']);
+ }
+ @ini_set('session.gc_maxlifetime', $xoopsConfig['session_expire'] * 60);
+ }
+ session_set_save_handler(array(&$sess_handler, 'open'),
+ array(&$sess_handler, 'close'),
+ array(&$sess_handler, 'read'),
+ array(&$sess_handler, 'write'),
+ array(&$sess_handler, 'destroy'),
+ array(&$sess_handler, 'gc'));
+ if (strlen(session_id())==0)
+ session_start();
+
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
if (!is_object($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-09 17:04:58
|
Revision: 10165
http://xoops.svn.sourceforge.net/xoops/?rev=10165&view=rev
Author: mageg
Date: 2012-09-09 17:04:52 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
fixed bug ID: 3560263
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcontainer.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcontainer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcontainer.php 2012-09-09 16:56:55 UTC (rev 10164)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcontainer.php 2012-09-09 17:04:52 UTC (rev 10165)
@@ -36,5 +36,5 @@
* @param $recurse
* @return void
*/
- function getElements($recurse);
+ function getElements($recurse = false);
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-09-09 16:57:05
|
Revision: 10164
http://xoops.svn.sourceforge.net/xoops/?rev=10164&view=rev
Author: wishcraft
Date: 2012-09-09 16:56:55 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Xortify 3.10 (Production) - Performance Enhancement as well as fixes to Ninjas after cache files routine - see changelog.txt for changes
Added Paths:
-----------
XoopsModules/xortify/releases/3.10/
XoopsModules/xortify/releases/3.10/docs/
XoopsModules/xortify/releases/3.10/docs/INSTALL
XoopsModules/xortify/releases/3.10/docs/UPGRADE
XoopsModules/xortify/releases/3.10/docs/licence.txt
XoopsModules/xortify/releases/3.10/extras/
XoopsModules/xortify/releases/3.10/extras/2.5.x/
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/header.php
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/3.10/htdocs/
XoopsModules/xortify/releases/3.10/htdocs/banned.php
XoopsModules/xortify/releases/3.10/htdocs/modules/
XoopsModules/xortify/releases/3.10/htdocs/modules/system/
XoopsModules/xortify/releases/3.10/htdocs/modules/system/preloads/
XoopsModules/xortify/releases/3.10/htdocs/modules/system/preloads/xortify.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/admin/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/admin/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/admin/menu.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/auth/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/log.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/cron/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/cron/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/credits.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/install.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/licence.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/docs/readme.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/16/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/16/access.list.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/16/current.bans.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/16/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/16/xortify.log.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/32/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/32/access.list.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/32/current.bans.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/32/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/32/xortify.log.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/icons/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/left_both.gif
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/right_both.gif
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/JSON.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/functions.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/install.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/instance.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/post.footer.end.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/include/update.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/ban.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/help/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/main.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/language/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/protector.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/poll/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/poll/index.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/preloads/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/protector/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/protector/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/spiders/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/providers/xortify/pre.loader.php
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/sql/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/sql/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/sql/mysql.sql
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/index.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_cpanel_bans.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_cpanel_log.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_cpanel_signup_form.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_cpanel_signup_nocommunication.html
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/templates/xortify_instance_key.php.txt
XoopsModules/xortify/releases/3.10/htdocs/modules/xortify/xoops_version.php
Added: XoopsModules/xortify/releases/3.10/docs/INSTALL
===================================================================
--- XoopsModules/xortify/releases/3.10/docs/INSTALL (rev 0)
+++ XoopsModules/xortify/releases/3.10/docs/INSTALL 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.48 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Sign up a username for Xortify.com you can do this in the module if everything |
+| is working fine and there isn't any problem with the API SOAP communications. |
+| |
+| You will recieve an activation notice but you account will already be active. |
+| |
+| You will need to alter mainfile.php and do the following:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php (pre 2.4 series) ]---------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - header.php (pre 2.4 series) ]----------------------------------------+
+| |
+| Below the lin of footer.php which reads $xoopsTpl =& $xoTheme->template; |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.add.meta.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/releases/3.10/docs/UPGRADE
===================================================================
--- XoopsModules/xortify/releases/3.10/docs/UPGRADE (rev 0)
+++ XoopsModules/xortify/releases/3.10/docs/UPGRADE 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.30 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Make sure you delete the 'providers' folder in the existing module then upload |
+| Xortify 2.30. Once you have install the file base this way you will remember |
+| to upgrade the module in the system modules application in the xoops system |
+| menu you will need to then goto the preferences and make sure you are running |
+| the protector provider if you are running protector this will populate the |
+| cloud with your bans that come in protector as well:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php ]--------------------------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - footer.php ----------------------------------------------------------+
+| |
+| At the bottom of footer.php place this line without the [|] Of course. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/releases/3.10/docs/licence.txt
===================================================================
--- XoopsModules/xortify/releases/3.10/docs/licence.txt (rev 0)
+++ XoopsModules/xortify/releases/3.10/docs/licence.txt 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/header.php
===================================================================
--- XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/header.php (rev 0)
+++ XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/header.php 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,110 @@
+<?php
+/**
+ * XOOPS global header file
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package core
+ * @since 2.0.0
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+$xoopsPreload =& XoopsPreload::getInstance();
+$xoopsPreload->triggerEvent('core.header.start');
+
+include_once $GLOBALS['xoops']->path('class/xoopsblock.php');
+
+$xoopsLogger =& XoopsLogger::getInstance();
+$xoopsLogger->stopTime('Module init');
+$xoopsLogger->startTime('XOOPS output init');
+
+if ($xoopsConfig['theme_set'] != 'default' && file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/theme.php')) {
+ require_once $GLOBALS['xoops']->path('include/xoops13_header.php');
+} else {
+ global $xoopsOption, $xoopsConfig, $xoopsModule;
+
+ $xoopsOption['theme_use_smarty'] = 1;
+
+ // include Smarty template engine and initialize it
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ require_once $GLOBALS['xoops']->path('class/theme.php');
+ require_once $GLOBALS['xoops']->path('class/theme_blocks.php');
+
+ if (@$xoopsOption['template_main']) {
+ if (false === strpos($xoopsOption['template_main'], ':')) {
+ $xoopsOption['template_main'] = 'db:' . $xoopsOption['template_main'];
+ }
+ }
+
+ $xoopsThemeFactory = null;
+ $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
+ $xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set'];
+
+ /**
+ * @var xos_opal_Theme
+ */
+ $xoTheme =& $xoopsThemeFactory->createInstance(array('contentTemplate' => @$xoopsOption['template_main']));
+ $xoopsTpl =& $xoTheme->template;
+
+ $xoopsPreload->triggerEvent('core.header.addmeta');
+
+ // Temporary solution for start page redirection
+ if (defined("XOOPS_STARTPAGE_REDIRECTED")) {
+ $params = $content = $tpl = $repeat = null;
+ $xoTheme->headContent($params, "<base href='" . XOOPS_URL . '/modules/' . $xoopsConfig['startpage'] . "/' />", $tpl, $repeat);
+ }
+
+ if (@is_object($xoTheme->plugins['xos_logos_PageBuilder'])) {
+ $aggreg =& $xoTheme->plugins['xos_logos_PageBuilder'];
+ // Backward compatibility code for pre 2.0.14 themes
+ $xoopsTpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']);
+ $xoopsTpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']);
+ $xoopsTpl->assign_by_ref('xoops_ccblocks', $aggreg->blocks['page_topcenter']);
+ $xoopsTpl->assign_by_ref('xoops_clblocks', $aggreg->blocks['page_topleft']);
+ $xoopsTpl->assign_by_ref('xoops_crblocks', $aggreg->blocks['page_topright']);
+ $xoopsTpl->assign('xoops_showlblock', !empty($aggreg->blocks['canvas_left']));
+ $xoopsTpl->assign('xoops_showrblock', !empty($aggreg->blocks['canvas_right']));
+ $xoopsTpl->assign('xoops_showcblock', !empty($aggreg->blocks['page_topcenter']) || !empty($aggreg->blocks['page_topleft']) || !empty($aggreg->blocks['page_topright']));
+ }
+
+ // Sets cache time
+ if (!empty($xoopsModule)) {
+ $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')];
+ // Tricky solution for setting cache time for homepage
+ } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
+ $xoTheme->contentCacheLifetime = 604800;
+ }
+
+ $xoopsPreload->triggerEvent('core.header.checkcache');
+ if ($xoTheme->checkCache()) {
+ $xoopsPreload->triggerEvent('core.header.cacheend');
+ exit();
+ }
+
+ if (!isset($xoopsOption['template_main']) && $xoopsModule) {
+ // new themes using Smarty does not have old functions that are required in old modules, so include them now
+ include $GLOBALS['xoops']->path('include/old_theme_functions.php');
+ // need this also
+ $xoopsTheme['thename'] = $xoopsConfig['theme_set'];
+ ob_start();
+ }
+
+ $xoopsLogger->stopTime('XOOPS output init');
+ $xoopsLogger->startTime('Module display');
+}
+
+$xoopsPreload->triggerEvent('core.header.end');
+?>
\ No newline at end of file
Added: XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/preloads/core.php (rev 0)
+++ XoopsModules/xortify/releases/3.10/extras/2.5.x/htdocs/modules/xortify/preloads/core.php 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Nexoork Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @author Richardo Costa TRABIS
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class XortifyCorePreload extends XoopsPreloadItem
+{
+
+ function eventCoreIncludeCommonStart($args)
+ {
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_include_common_start');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)+600), 600);
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), -1);
+ }
+ }
+
+ function eventCoreIncludeCommonEnd($args)
+ {
+ xoops_loadLanguage('modinfo', 'xortify');
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ if (!is_object($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']))
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module'] = $module_handler->getByDirname('xortify');
+ if (!isset($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']))
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getConfigList($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_include_common_end_cron');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']), $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']);
+ switch ($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['crontype']) {
+ case 'preloader':
+ $read = XoopsCache::read('xortify_pause_preload');
+ if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['croninterval']));
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['_preloader']=true;
+ ob_start();
+ include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
+ ob_end_clean();
+ }
+ break;
+ }
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1);
+ }
+
+ $result = XoopsCache::read('xortify_core_include_common_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']), $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']);
+ if (XortifyCorePreload::hasAPIUserPass()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
+ }
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
+ }
+
+ }
+
+ function eventCoreHeaderCacheend($args)
+ {
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_header_cache_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']), $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']);
+ if (XortifyCorePreload::hasAPIUserPass()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
+ }
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
+ }
+ }
+
+ function eventCoreFooterEnd($args)
+ {
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_header_cache_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']), $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['fault_delay']);
+ if (XortifyCorePreload::hasAPIUserPass()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
+ }
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
+ }
+ }
+
+ function eventCoreHeaderAddmeta($args)
+ {
+ if (isset($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['_pass'])) {
+ if ($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['_pass'] == true) {
+ include_once XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php';
+ addmeta_googleanalytics(_XOR_MI_XOOPS_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED, $_SERVER['HTTP_HOST']);
+ if (defined('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED')&&strlen(constant('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED'))>=13) {
+ addmeta_googleanalytics(_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED, $_SERVER['HTTP_HOST']);
+ }
+ }
+ }
+ }
+
+ function hasAPIUserPass()
+ {
+ if ($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['xortify_username']!=''&&$_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['xortify_password']!='')
+ return true;
+ else
+ return false;
+ }
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/xortify/releases/3.10/htdocs/banned.php
===================================================================
--- XoopsModules/xortify/releases/3.10/htdocs/banned.php (rev 0)
+++ XoopsModules/xortify/releases/3.10/htdocs/banned.php 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,55 @@
+<?php
+
+
+ include dirname(__FILE__).'/mainfile.php';
+ if (isset($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['lid'])) {
+ $lid = $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['lid'];
+ setcookie('xortify', array('lid' => $lid), time()+3600*24*7*4*3);
+ } elseif (isset($_COOKIE['xortify']['lid'])) {
+ $lid = $_COOKIE['xortify']['lid'];
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['lid'] = $lid;
+ }
+
+ xoops_loadLanguage('ban', 'xortify');
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ if (!is_object($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']))
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module'] = $module_handler->getByDirname('xortify');
+ if (!isset($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']))
+ $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getModuleConfig($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
+
+ $xoopsOption['template_main'] = 'xortify_banning_notice.html';
+ include_once XOOPS_ROOT_PATH.'/header.php';
+ include_once XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php';
+ if ($_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['google']==true) {
+ addmeta_googleanalytics(_XOR_MI_XOOPS_GOOGLE_ANALYTICS_ACCOUNTID_FAILEDTOPASS, $_SERVER['HTTP_HOST']);
+ if (defined('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_FAILEDTOPASS')&&strlen(constant('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_FAILEDTOPASS'))>=13) {
+ addmeta_googleanalytics(_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_FAILEDTOPASS, $_SERVER['HTTP_HOST']);
+ }
+ }
+ $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
+ $GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
+ $GLOBALS['xoopsTpl']->assign('version', $_SESSION['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('version')/100);
+ $GLOBALS['xoopsTpl']->assign('platform', XOOPS_VERSION);
+
+ $log_handler = xoops_getmodulehandler('log', 'xortify');
+ $log = $log_handler->get($lid);
+ if (is_object($log)) {
+ setcookie('xortify', array('lid' => $lid), time()+3600*24*7*4*3);
+ $GLOBALS['xoopsTpl']->assign('status', $log->getVar('extra'));
+ $GLOBALS['xoopsTpl']->assign('provider', $log->getVar('provider'));
+ $GLOBALS['xoopsTpl']->assign('agent', $log->getVar('agent'));
+ }
+ $GLOBALS['xoopsTpl']->assign('xoops_lblocks', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_rblocks', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_ccblocks', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_clblocks', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_crblocks', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_showlblock', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_showrblock', false);
+ $GLOBALS['xoopsTpl']->assign('xoops_showcblock', false);
+
+ include_once XOOPS_ROOT_PATH.'/footer.php';
+
+?>
Added: XoopsModules/xortify/releases/3.10/htdocs/modules/system/preloads/xortify.php
===================================================================
--- XoopsModules/xortify/releases/3.10/htdocs/modules/system/preloads/xortify.php (rev 0)
+++ XoopsModules/xortify/releases/3.10/htdocs/modules/system/preloads/xortify.php 2012-09-09 16:56:55 UTC (rev 10164)
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Nexoork Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @author Richardo Costa TRABIS
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restr...
[truncated message content] |
|
From: <ma...@us...> - 2012-09-09 16:55:06
|
Revision: 10163
http://xoops.svn.sourceforge.net/xoops/?rev=10163&view=rev
Author: mageg
Date: 2012-09-09 16:55:00 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Fixed bug ID: 3562232
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2012-09-09 16:40:18 UTC (rev 10162)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2012-09-09 16:55:00 UTC (rev 10163)
@@ -339,14 +339,21 @@
}
}
- if ($_REQUEST['sortby'] == "name") {
- $criteria->setSort("name");
- } else if ($_REQUEST['sortby'] == "email") {
- $criteria->setSort("email");
- } else if ($_REQUEST['sortby'] == "uname") {
- $criteria->setSort("uname");
- } else if (isset($fields[$_REQUEST['sortby']])) {
- $criteria->setSort($fields[$_REQUEST['sortby']]->getVar('field_name'));
+ $sortby = 'uname';
+ if (!empty($_REQUEST['sortby'])) {
+ switch ($_REQUEST['sortby']) {
+ case 'name':
+ case 'email':
+ case 'uname':
+ $sortby = $_REQUEST['sortby'];
+ break;
+ default:
+ if (isset($fields[$_REQUEST['sortby']])) {
+ $sortby = $fields[$_REQUEST['sortby']]->getVar('field_name');
+ }
+ break;
+ }
+ $criteria->setSort($sortby);
}
// add search groups , only for Webmasters
@@ -401,7 +408,7 @@
if ($total_users > $limit) {
$search_url[] = "op=results";
$search_url[] = "order=" . $order;
- $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
+ $search_url[] = "sortby=" . htmlspecialchars($sortby);
$search_url[] = "limit=" . $limit;
if (isset($search_url)) {
$args = implode("&", $search_url);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-09 16:40:24
|
Revision: 10162
http://xoops.svn.sourceforge.net/xoops/?rev=10162&view=rev
Author: mageg
Date: 2012-09-09 16:40:18 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Fix bug id:3565810
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2012-09-09 16:25:15 UTC (rev 10161)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2012-09-09 16:40:18 UTC (rev 10162)
@@ -52,7 +52,7 @@
// Define Stylesheet
$xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
- $xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
$xoops->theme->addScript('modules/system/js/admin.js');
$admin_page->addTips(_AM_BANNERS_TIPS_BANNERS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2012-09-09 16:25:15 UTC (rev 10161)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2012-09-09 16:40:18 UTC (rev 10162)
@@ -53,7 +53,7 @@
// Define Stylesheet
$xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
- $xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
$xoops->theme->addScript('modules/system/js/admin.js');
$admin_page->addTips(_AM_BANNERS_TIPS_CLIENTS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2012-09-09 16:25:15 UTC (rev 10161)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2012-09-09 16:40:18 UTC (rev 10162)
@@ -73,7 +73,7 @@
$xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
$xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
- $xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
$xoops->theme->addScript('modules/system/js/admin.js');
// Display banner
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php 2012-09-09 16:25:15 UTC (rev 10161)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php 2012-09-09 16:40:18 UTC (rev 10162)
@@ -32,7 +32,7 @@
// Define Stylesheet
$xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
-$xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+$xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
$xoops->theme->addScript('modules/system/js/admin.js');
$i = 0;
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-09-09 16:25:15 UTC (rev 10161)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-09-09 16:40:18 UTC (rev 10162)
@@ -43,7 +43,7 @@
$xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
- $xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
$xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js'));
// ddsmoothmenu
$xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ye...@us...> - 2012-09-09 16:25:24
|
Revision: 10161
http://xoops.svn.sourceforge.net/xoops/?rev=10161&view=rev
Author: yerres2
Date: 2012-09-09 16:25:15 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/lexikon/trunk/lexikon/admin/about.php
XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
XoopsModules/lexikon/trunk/lexikon/admin/category.php
XoopsModules/lexikon/trunk/lexikon/admin/entry.php
XoopsModules/lexikon/trunk/lexikon/admin/functions.php
XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php
XoopsModules/lexikon/trunk/lexikon/admin/index.php
XoopsModules/lexikon/trunk/lexikon/admin/menu.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php
XoopsModules/lexikon/trunk/lexikon/admin/statistics.php
XoopsModules/lexikon/trunk/lexikon/admin/submissions.php
XoopsModules/lexikon/trunk/lexikon/admin/upgrade.php
XoopsModules/lexikon/trunk/lexikon/authorlist.php
XoopsModules/lexikon/trunk/lexikon/blocks/categories_block.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_initial.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_new.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_spot.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_top.php
XoopsModules/lexikon/trunk/lexikon/blocks/random_term.php
XoopsModules/lexikon/trunk/lexikon/category.php
XoopsModules/lexikon/trunk/lexikon/changelog.txt
XoopsModules/lexikon/trunk/lexikon/comment_new.php
XoopsModules/lexikon/trunk/lexikon/comment_post.php
XoopsModules/lexikon/trunk/lexikon/content.php
XoopsModules/lexikon/trunk/lexikon/entry.php
XoopsModules/lexikon/trunk/lexikon/header.php
XoopsModules/lexikon/trunk/lexikon/images/bookmark/delicious.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/newsvine.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/technorati.png
XoopsModules/lexikon/trunk/lexikon/images/lx_slogo.png
XoopsModules/lexikon/trunk/lexikon/include/common.inc.php
XoopsModules/lexikon/trunk/lexikon/include/functions.php
XoopsModules/lexikon/trunk/lexikon/include/notification.inc.php
XoopsModules/lexikon/trunk/lexikon/include/search.inc.php
XoopsModules/lexikon/trunk/lexikon/include/sitemap.plugin.php
XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
XoopsModules/lexikon/trunk/lexikon/include/syndication.inc.php
XoopsModules/lexikon/trunk/lexikon/include/waiting.plugin.php
XoopsModules/lexikon/trunk/lexikon/index.php
XoopsModules/lexikon/trunk/lexikon/js/index.html
XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
XoopsModules/lexikon/trunk/lexikon/language/english/blocks.php
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/category_newterm_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/category_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/global_termrequest_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/global_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/lexikon_newcat_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/lexikon_newpost_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/term_approve_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/main.php
XoopsModules/lexikon/trunk/lexikon/language/english/modinfo.php
XoopsModules/lexikon/trunk/lexikon/language/german/admin.php
XoopsModules/lexikon/trunk/lexikon/language/german/blocks.php
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/category_newterm_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/category_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/global_termrequest_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/global_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/lexikon_newcat_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/lexikon_newpost_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/main.php
XoopsModules/lexikon/trunk/lexikon/language/german/modinfo.php
XoopsModules/lexikon/trunk/lexikon/letter.php
XoopsModules/lexikon/trunk/lexikon/linkterms.css
XoopsModules/lexikon/trunk/lexikon/popup.php
XoopsModules/lexikon/trunk/lexikon/print.php
XoopsModules/lexikon/trunk/lexikon/profile.php
XoopsModules/lexikon/trunk/lexikon/readme.txt
XoopsModules/lexikon/trunk/lexikon/request.php
XoopsModules/lexikon/trunk/lexikon/rss.php
XoopsModules/lexikon/trunk/lexikon/search.php
XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql
XoopsModules/lexikon/trunk/lexikon/style.css
XoopsModules/lexikon/trunk/lexikon/submit.php
XoopsModules/lexikon/trunk/lexikon/syndication.php
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_new.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_spot.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_top.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_bookmark.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_category.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_entry.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_index.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_letter.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_search.html
XoopsModules/lexikon/trunk/lexikon/xoops_version.php
Added Paths:
-----------
XoopsModules/lexikon/trunk/lexikon/admin/main.php
XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
XoopsModules/lexikon/trunk/lexikon/blocks/.htaccess
XoopsModules/lexikon/trunk/lexikon/blocks/entries_authors.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_scrolling.php
XoopsModules/lexikon/trunk/lexikon/blocks/lexikon_block_tag.php
XoopsModules/lexikon/trunk/lexikon/images/bookmark/blinklist.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/digg.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/facebook.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/fark.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/google_bookmarks.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/linkarena.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/mrwong.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/oneview.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/reddit.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/studivz.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/stumbleupon.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/twitter.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/yigg.gif
XoopsModules/lexikon/trunk/lexikon/include/install_function.php
XoopsModules/lexikon/trunk/lexikon/include/plugin.tag.php
XoopsModules/lexikon/trunk/lexikon/js/domticker.js
XoopsModules/lexikon/trunk/lexikon/js/pausescroller.js
XoopsModules/lexikon/trunk/lexikon/lang.diff
XoopsModules/lexikon/trunk/lexikon/list.tag.php
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_authors.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_scrolling.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/lexikon_tag_block_cloud.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/lexikon_tag_block_top.html
XoopsModules/lexikon/trunk/lexikon/templates/lexikon_rss.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_tag_bar.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_topten.html
XoopsModules/lexikon/trunk/lexikon/view.tag.php
Modified: XoopsModules/lexikon/trunk/lexikon/admin/about.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/about.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/about.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: about.php v 1.5 23 August 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.5
* Release Date:
* Author: hsalazar
@@ -59,7 +59,7 @@
echo "<label>" . _AM_LX_ABOUT_RELEASEDATE . ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
echo "<label>" . _AM_LX_ABOUT_AUTHOR . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
- echo "<label>" . _AM_LX_ABOUT_CREDITS . ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />";
+ //echo "<label>" . _AM_LX_ABOUT_LICENSE . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
echo "<label>" . _AM_LX_ABOUT_LICENSE . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
echo "</div>";
echo "<br clear=\"all\" />";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: admin_header.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
@@ -34,4 +34,5 @@
redirect_header(XOOPS_URL."/",1,_NOPERM);
exit();
}
+
?>
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: category.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
@@ -14,7 +14,6 @@
xoops_cp_header();
$op = '';
-
/* -- Available operations -- */
function categoryDefault() {
@@ -65,9 +64,7 @@
* Code to show existing categories
**/
- lx_collapsableBar('lexikoncat', 'lexikoncaticon');
- echo " <img onclick=\"toggle('cattable'); toggleIcon('cattableicon');\" id='lexikoncaticon' name='lexikoncaticon' src='" . XOOPS_URL . "/modules/lexikon/images/close12.gif' alt='' /></a> <A href='category.php?op=addcat'>"._AM_LX_CREATECAT."</a><br /><br />";
- echo" <div id='lexikoncat' style='float:left; width:100%;'>
+ echo" <A href='category.php?op=addcat'>"._AM_LX_CREATECAT."</a><br /><br />
<table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
@@ -119,7 +116,7 @@
$categoryID = '0';
}
echo "</table>\n";
- $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat');
+ $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat' );
echo '<div style="text-align:right;">' . $pagenav -> renderNav(8) . '</div>';
echo "<br /><br />\n";
echo "</div>";
@@ -128,11 +125,14 @@
}
}
-
/**
* Code to edit categories
**/
function categoryEdit( $categoryID = '' ) {
+ include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+ include_once XOOPS_ROOT_PATH."/class/uploader.php";
+ include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+
$weight = 1;
$name = '';
$description = '';
@@ -150,11 +150,21 @@
list( $categoryID, $name, $description, $total, $weight, $logourl ) = $xoopsDB -> fetchrow( $result );
$myts =& MyTextSanitizer::getInstance();
$name = $myts->htmlSpecialChars($name);
-
+ //permissions
+ $member_handler = & xoops_gethandler('member');
+ $group_list = & $member_handler -> getGroupList();
+ $gperm_handler = & xoops_gethandler('groupperm');
+
+ $groups = $gperm_handler -> getGroupIds("lexikon_view", $categoryID, $xoopsModule -> getVar('mid'));
+ $groups = $groups;
if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
redirect_header( "index.php", 1, _AM_LX_NOCATTOEDIT );
exit();
}
+ if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
+ redirect_header( "index.php", 1, _AM_LX_NOCATTOEDIT );
+ exit();
+ }
//$myts =& MyTextSanitizer::getInstance();
lx_adminMenu(1, _AM_LX_CATS);
@@ -163,7 +173,7 @@
} else {
//$myts =& MyTextSanitizer::getInstance();
lx_adminMenu(1, _AM_LX_CATS);
-
+ $groups = true;
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_CATSHEADER . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_NEWCAT, "op", xoops_getenv( 'PHP_SELF' ) );
}
@@ -179,19 +189,34 @@
$sform -> addElement( new XoopsFormHidden( 'categoryID', $categoryID ) );
//CategoryImage
if ($xoopsModuleConfig['useshots'] == 1) {
- $mydirname = basename ( dirname( dirname( __FILE__ ) ) ) ;
- $uploadir="/modules/" . $mydirname. "/images/uploads/";
- $catimg_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/modules/".$mydirname."/images/uploads/");
+ //CategoryImage :: Common querys from Article module by phppp
+ $image_option_tray = new XoopsFormElementTray("<b>"._AM_LX_CATIMGUPLOAD."</b>", "<br />");
+ $image_option_tray->addElement(new XoopsFormFile("", "userfile",""));
+ $sform->addElement($image_option_tray);
+ unset($image_tray);
+ unset($image_option_tray);
+
+ $path_catimg = "modules/".$xoopsModule->getVar('dirname')."/images/uploads";
+ $image_option_tray = new XoopsFormElementTray(_AM_LX_CATIMAGE."<br />"._AM_LX_CATIMG_DSC."<br />".$path_catimg, "<br />");
+ //$image_option_tray = new XoopsFormElementTray(_AM_LX_CATIMAGE.'');
+ $image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/".$path_catimg."/");
+ array_unshift($image_array, _NONE);
+
+ $image_select = new XoopsFormSelect("", "logourl", $logourl);
+ $image_select->addOptionArray($image_array);
+ $image_select->setExtra("onchange=\"showImgSelected('img', 'logourl', '/".$path_catimg."/', '', '" . XOOPS_URL . "')\"");
+ $image_tray = new XoopsFormElementTray("", " ");
+ $image_tray->addElement($image_select);
+ if (!empty($logourl) && file_exists(XOOPS_ROOT_PATH . "/" .$path_catimg."/" . $logourl)){
+ $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/" . $logourl . "\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+ } else {
+ $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/blank.gif\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+ }
+ $image_option_tray->addElement($image_tray);
+ $sform->addElement($image_option_tray);
+ }
+ $sform -> addElement(new XoopsFormSelectGroup(_AM_LX_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
- $image_option=new XoopsFormSelect('', 'logourl', $logourl);
- $image_option->addOption('',_AM_LX_NONE);
- $image_option->addOptionArray($catimg_array);
- $imgtray = new XoopsFormElementTray(_AM_LX_SHOTIMAGE,'');
- $image_option->setExtra("onchange='showImgSelected(\"logourlex\", \"logourl\", \"" . $uploadir . "\", \"\", \"" . XOOPS_URL . "\")'" );
- $imgtray->addElement($image_option,false);
- $imgtray -> addElement( new XoopsFormLabel( '', "<img src='../images/uploads/" . $logourl . "' name='logourlex' id='logourlex' alt='' />" ) );
- $sform->addElement($imgtray);
- }
$button_tray = new XoopsFormElementTray( '', '' );
$hidden = new XoopsFormHidden( 'op', 'addcategory' );
$button_tray -> addElement( $hidden );
@@ -253,9 +278,15 @@
}
$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix('lxcategories')." WHERE categoryID='$idc'");
$result2 = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE categoryID = $idc");
+ // remove permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
// delete notifications
xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'global', $categoryID);
xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'category', $categoryID);
+
redirect_header("category.php",1,sprintf( _AM_LX_CATISDELETED, $name ) );
exit();
} else {
@@ -267,18 +298,44 @@
function categorySave ($categoryID = '') {
- Global $xoopsUser, $xoopsModuleConfig, $xoopsConfig, $xoopsDB, $myts, $categoryID;
+ include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+ include_once XOOPS_ROOT_PATH."/class/uploader.php";
+ Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB, $myts, $categoryID;
+ //print_r ($_POST);
$categoryID = isset( $_POST['categoryID'] ) ? intval( $_POST['categoryID'] ) : intval( $_GET['categoryID'] );
$weight = isset($_POST['weight'] ) ? intval($_POST['weight']) : intval($_GET['weight']);
$name = isset($_POST['name'] ) ? htmlSpecialChars($_POST['name']) : htmlSpecialChars($_GET['name']);
$description = isset($_POST['description'] ) ? htmlSpecialChars($_POST['description']) : htmlSpecialChars($_GET['description']);
+ //$description = $myts->xoopsCodeDecode($description, $allowimage = 0);
$description = $myts -> xoopsCodeDecode($myts->censorString($description), $allowimage = 1);
$name = $myts->addSlashes($_POST['name']);
$logourl = $myts->addSlashes($_POST["logourl"]);
-
+ $groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+ // image upload
+ $logourl = "";
+ $maxfilesize = 30000;
+ $maxfilewidth = 128;
+ $maxfileheight = 128;
+ if (!empty($_FILES['userfile']['name'])) {
+ $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH ."/modules/".$xoopsModule->getVar('dirname')."/images/uploads/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ if (!$uploader->upload()) {
+ echo $uploader->getErrors();
+ } else {
+ echo '<h4>'._AM_LX_FILESUCCESS.'</h4>';
+ $logourl = $uploader->getSavedFileName();
+ }
+ } else {
+ echo $uploader->getErrors();
+ }
+ }
+ $logourl = empty($logourl)?(empty($_POST['logourl'])?"":$_POST['logourl']):$logourl;
+
// Run the query and update the data
if ( !$_POST['categoryID'] ) {
- if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl) VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
+ if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl)
+ VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
$newid = $xoopsDB->getInsertId();
// Increment author's posts count (only if it's a new definition)
if (is_object($xoopsUser) && empty($categoryID)) {
@@ -302,6 +359,7 @@
$tags['ITEM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $newid;
$notification_handler->triggerEvent( 'global', 0, 'new_category', $tags);
}
+ lx_save_Permissions($groups, $categoryID, "lexikon_view");
redirect_header( "category.php", 1, _AM_LX_CATCREATED );
exit();
} else {
@@ -309,7 +367,11 @@
exit();
}
} else {
- if ( $xoopsDB -> queryF( "UPDATE " . $xoopsDB -> prefix( "lxcategories" ) . " SET name = '$name', description = '$description', weight = '$weight' , logourl = '$logourl' WHERE categoryID = '$categoryID'" ) ) {
+ if ( $xoopsDB -> queryF( "
+ UPDATE " . $xoopsDB -> prefix( "lxcategories" ) . "
+ SET name = '$name', description = '$description', weight = '$weight' , logourl = '$logourl'
+ WHERE categoryID = '$categoryID'" ) ) {
+ lx_save_Permissions($groups, $categoryID, "lexikon_view");
redirect_header( "category.php", 1, _AM_LX_CATMODIFIED );
exit();
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/entry.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,11 +1,11 @@
<?php
/**
* $Id: entry.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
- * Modifs: yerres
+ * Modifs: Yerres
* Licence: GNU
*/
@@ -15,10 +15,13 @@
xoops_cp_header();
$op = '';
-
+#if ( isset( $_GET['op'] ) ) $op = $_GET['op'];
+#if ( isset( $_POST['op'] ) ) $op = $_POST['op'];
+error_reporting(E_ALL);
+ error_reporting(E_ERROR | E_WARNING | E_PARSE);
/* -- Available operations -- */
function entryDefault() {
- global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $_GET;
+ global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
lx_adminMenu(2, _AM_LX_ENTRIES);
@@ -27,7 +30,6 @@
$startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
$startsub = isset( $_GET['startsub'] ) ? intval( $_GET['startsub'] ) : 0;
$datesub = isset( $_GET['datesub'] ) ? intval( $_GET['datesub'] ) : 0;
- #$entryID =
$myts =& MyTextSanitizer::getInstance();
@@ -59,8 +61,7 @@
<td class='odd'>" . _AM_LX_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
</tr></table>
<br /><br />";
-
-
+
/**
* Code to show existing terms
**/
@@ -78,9 +79,7 @@
$resultA2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startentry );
$result = $xoopsDB->query($sql, $xoopsModuleConfig['perpage']);
- lx_collapsableBar('lexikonent', 'lexikonenticon');
- echo " <img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='lexikonenticon' name='lexikonenticon' src='" . XOOPS_URL . "/modules/lexikon/images/close12.gif' alt='' /></a> <A href='entry.php?op=add'>". _AM_LX_CREATEENTRY ."</A><br /><br/>";
- echo " <div id='lexikonent' style='float:left; width:100%;'>
+ echo " <A href='entry.php?op=add'>". _AM_LX_CREATEENTRY ."</A><br /><br/>
<table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
@@ -137,7 +136,7 @@
{
echo "<tr>";
echo "<td class='odd' align='center' colspan= '7'>"._AM_LX_NOTERMS."</td>";
- echo "</tr></DIV></DIV>";
+ echo "</tr></DIV>";
}
echo "</table>\n";
$pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startentry, 'startentry');
@@ -146,11 +145,10 @@
echo "</div>";
}
-
-// -- Edit function -- //
+// -- Edit function --
function entryEdit( $entryID = '' ) {
- global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL;
-
+ global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $init;
+ $myts =& MyTextSanitizer::getInstance();
/**
* Clear all variables before we start
*/
@@ -166,10 +164,9 @@
if(!isset($categoryID)) { $categoryID = 1; }
if(!isset($term)) { $term = ""; }
if(!isset($init)) { $init = ""; }
-
- if (!isset($definition)) {
- $definition = _AM_LX_WRITEHERE;
- }
+ if (!isset($definition)) {
+ $definition = _AM_LX_WRITEHERE;
+ }
if(!isset($ref)) { $ref = ""; }
if(!isset($url)) { $url = ""; }
if(!isset($datesub)) { $datesub = 0; }
@@ -181,16 +178,15 @@
FROM " . $xoopsDB -> prefix( "lxentries" ) . "
WHERE entryID = '$entryID'" );
list( $categoryID, $term, $init, $definition, $ref, $url, $uid, $submit, $datesub, $html, $smiley, $xcodes, $breaks, $block, $offline, $notifypub, $request ) = $xoopsDB -> fetchrow( $result );
-
- $myts =& MyTextSanitizer::getInstance();
- $term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
if ( !$xoopsDB -> getRowsNum( $result ) ) {
redirect_header( "index.php", 1, _AM_LX_NOENTRYTOEDIT );
exit();
}
- lx_adminMenu(2, _AM_LX_ENTRIES);
+ $term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
+ lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
+
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_ADMINENTRYMNGMT . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_MODENTRY . ": $term" , "op", xoops_getenv( 'PHP_SELF' ) );
} else // there's no parameter, so we're adding an entry
@@ -201,7 +197,7 @@
redirect_header( "index.php", 1, _AM_LX_NEEDONECOLUMN );
exit();
}
- lx_adminMenu(2, _AM_LX_ENTRIES);
+ lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
$uid = $xoopsUser->getVar('uid');
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_ADMINENTRYMNGMT . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_NEWENTRY, "op", xoops_getenv( 'PHP_SELF' ) );
@@ -235,11 +231,11 @@
lx_getinit( intval($init) );
$sform -> addElement( new XoopsFormLabel( _AM_LX_INIT, ob_get_contents() ) );
ob_end_clean();
-
+
// Term, definition, reference and related URL
$sform -> addElement( new XoopsFormText( _AM_LX_ENTRYTERM, 'term', 50, 80, $term ), true );
- // set editor according to the module's form_options
+ // set editor according to the module's option "form_options"
$editor = lx_getWysiwygForm( _AM_LX_ENTRYDEF, 'definition', $definition, 15, 60 );
if ($definition == _MD_LX_WRITEHERE) {
$editor -> setExtra( 'onfocus="this.select()"' );
@@ -250,6 +246,13 @@
$sform -> addElement( new XoopsFormTextArea( _AM_LX_ENTRYREFERENCE, 'ref', $ref, 5, 60 ), false );
$sform -> addElement( new XoopsFormText( _AM_LX_ENTRYURL, 'url', 50, 80, $url ), false );
+ // tags of this term - for module 'Tag'
+ $module_handler = xoops_gethandler('module');
+ $tagsModule = $module_handler->getByDirname("tag");
+ if (is_object($tagsModule)) {
+ include_once XOOPS_ROOT_PATH."/modules/tag/include/formtag.php";
+ $sform->addElement(new XoopsFormTag("item_tag", 60, 255, $entryID, $catid = 0));
+ }
// Code to take entry offline, for maintenance purposes
$offline_radio = new XoopsFormRadioYN(_AM_LX_SWITCHOFFLINE, 'offline', $offline, ' '._AM_LX_YES.'', ' '._AM_LX_NO.'');
$sform -> addElement($offline_radio);
@@ -260,7 +263,13 @@
// VARIOUS OPTIONS
$options_tray = new XoopsFormElementTray(_AM_LX_OPTIONS,'<br />');
-
+ if ($submit) {
+ $notify_checkbox = new XoopsFormCheckBox('', 'notifypub', $notifypub);
+ $notify_checkbox->addOption(1, _AM_LX_NOTIFYPUBLISH);
+ $options_tray->addElement($notify_checkbox);
+ }else{
+ $notifypub=0;
+ }
$html_checkbox = new XoopsFormCheckBox( '', 'html', $html );
$html_checkbox -> addOption( 1, _AM_LX_DOHTML );
$options_tray -> addElement( $html_checkbox );
@@ -318,14 +327,13 @@
/* Save */
function entrySave ($entryID = '') {
-
- Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsDB, $myts;
-
+ Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
$entryID = isset($_POST['entryID']) ? intval($_POST['entryID']) : intval($_GET['entryID']);
if ($xoopsModuleConfig['multicats'] == 1) {
$categoryID = isset($_POST['categoryID']) ? intval($_POST['categoryID']) : intval($_GET['categoryID']);
} else {
- $categoryID = '';
+ $categoryID = 1;
}
$block = isset($_POST['block']) ? intval($_POST['block']) : intval($_GET['block']);
$breaks = isset($_POST['breaks']) ? intval($_POST['breaks']) : intval($_GET['breaks']);
@@ -335,13 +343,7 @@
$xcodes = isset($_POST['xcodes']) ? intval($_POST['xcodes']) : intval($_GET['xcodes']);
$offline = isset($_POST['offline']) ? intval($_POST['offline']) : intval($_GET['offline']);
$init= $myts->addslashes($_POST['init']);
- $term = $myts->addSlashes($myts->censorString($_POST['term']));
- /*
- // this is for terms with umlaut or accented initials
- $term4sql = lx_sanitizeFieldName($myts->htmlspecialchars($_POST['term']));
- $init = substr($term4sql, 0, 1);
- $init = ereg("[a-zA-Z]", $init) ? strtoupper($init) : '#';
- */
+ $term = $myts->addSlashes(xoops_trim($_POST['term']));
//$definition = $myts -> xoopsCodeDecode($_POST['definition'], $allowimage = 1);
//$ref = isset($_POST['ref']) ? $myts->addSlashes($_POST['ref']) : '';
$definition = $myts -> xoopsCodeDecode($myts->censorString($_POST['definition']), $allowimage = 1);
@@ -350,12 +352,22 @@
$date = time();
$submit = 0;
- $notifypub = 0;
+ //$notifypub = 0;
+ $notifypub = isset($_POST['notifypub']) ? intval($_POST['notifypub']) : intval($_GET['notifypub']);
$request = 0;
$uid = isset($_POST['author']) ? intval($_POST['author']) : $xoopsUser->uid();
+ //-- module Tag
+ $module_handler = xoops_gethandler('module');
+ $tagsModule = $module_handler->getByDirname("tag");
+ if (is_object($tagsModule)) {
+ $tag_handler = xoops_getmodulehandler('tag', 'tag');
+ $tag_handler->updateByItem($_POST["item_tag"], $entryID, $xoopsModule->getVar("dirname"), $catid =0);
+ }
// Save to database
if ( !$entryID ) {
+ // verify that the term does not exists
+ if (lx_TermExists($term,$xoopsDB->prefix('lxentries'))) redirect_header("javascript:history.go(-1)", 2, _AM_LX_ITEMEXISTS . "<br />" . $term );
if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxentries" ) . " (entryID, categoryID, term, init, definition, ref, url, uid, submit, datesub, html, smiley, xcodes, breaks, block, offline, notifypub, request ) VALUES ('', '$categoryID', '$term', '$init', '$definition', '$ref', '$url', '$uid', '$submit', '$date', '$html', '$smiley', '$xcodes', '$breaks', '$block', '$offline', '$notifypub', '$request' )" ) ) {
$newid = $xoopsDB->getInsertId();
// Increment author's posts count (only if it's a new definition)
@@ -388,17 +400,16 @@
$tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $categoryID;
$notification_handler->triggerEvent('global', 0, 'new_post', $tags);
$notification_handler->triggerEvent('category', $categoryID, 'new_post', $tags);
- $notification_handler->triggerEvent('term', $newid, 'approve', $tags);
+ //$notification_handler->triggerEvent('term', $newid, 'approve', $tags);
}
lx_calculateTotals();
redirect_header( "entry.php", 1, _AM_LX_ENTRYCREATEDOK );
} else {
redirect_header( "index.php", 1, _AM_LX_ENTRYNOTCREATED );
}
- } else // That is, $entryID exists, thus we're editing an entry
- {
- if ( $xoopsDB -> query( "UPDATE " . $xoopsDB -> prefix( "lxentries" ) . " SET term = '$term', categoryID = '$categoryID', init = '$init', definition = '$definition', ref = '$ref', url = '$url', uid = '$uid', submit = '$submit', datesub = '$date', html = '$html', smiley = '$smiley', xcodes = '$xcodes', breaks = '$breaks', block = '$block', offline = '$offline', notifypub = '$notifypub', request = '$request' WHERE entryID = '$entryID'" ) ) {
- // trigger Notification only if it is a submission!
+ } else { // That is, $entryID exists, thus we're editing an entry
+ if ( $xoopsDB -> query( "UPDATE " . $xoopsDB -> prefix( "lxentries" ) . " SET term = '$term', categoryID = '$categoryID', init = '$init', definition = '$definition', ref = '$ref', url = '$url', uid = '$uid', submit = '$submit', datesub = '$date', html = '$html', smiley = '$smiley', xcodes = '$xcodes', breaks = '$breaks', block = '$block', offline = '$offline', notifypub = '$notifypub', request = '$request' WHERE entryID = '$entryID'" ) ) {
+ // trigger Notification only if its a new submission
if(!empty($xoopsModuleConfig['notification_enabled']) ){
global $xoopsModule;
$notification_handler =& xoops_gethandler('notification');
@@ -413,9 +424,45 @@
$row = $xoopsDB->fetchArray($result);
$tags['CATEGORY_NAME'] = $row['name'];
$tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $categoryID;
+ $notification_handler->triggerEvent('global', 0, 'new_post', $tags);
+ $notification_handler->triggerEvent('category', $categoryID, 'new_post', $tags);
$notification_handler->triggerEvent('term', $entryID, 'approve', $tags);
}
- lx_calculateTotals();
+
+ lx_calculateTotals();
+ if ($notifypub == '0'){
+ redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
+ exit();
+ } else {
+ $user = new XoopsUser($uid);
+ $userMessage = sprintf(_MD_LX_GOODDAY2, $user->getVar('uname'));
+ $userMessage .= "\n\n";
+ if ($request == '1'){$userMessage .= sprintf(_MD_LX_CONFREQ,$xoopsConfig['sitename']);
+ } else { $userMessage .= sprintf(_MD_LX_CONFSUB);}
+ $userMessage .= "\n";
+ $userMessage .= sprintf(_MD_LX_APPROVED,$xoopsConfig['sitename']);
+ $userMessage .= "\n\n";
+ $userMessage .= sprintf(_MD_LX_REGARDS);
+ $userMessage .= "\n";
+ $userMessage .= "__________________\n";
+ $userMessage .= "".$xoopsConfig['sitename']." "._MD_LX_WEBMASTER."\n";
+ $userMessage .= "".$xoopsConfig['adminmail']."";
+ $xoopsMailer =& getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setToEmails($user->getVar('email'));
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ //$xoopsMailer->setFromName($xoopsConfig['sitename']." - "._MI_LX_MD_NAME);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']." - ".$xoopsModule->name());
+ if ($request == '1'){ $conf_subject = sprintf(_MD_LX_SUBJECTREQ,$xoopsConfig['sitename']);
+ } else { $conf_subject = sprintf(_MD_LX_SUBJECTSUB,$xoopsConfig['sitename']);}
+ $xoopsMailer->setSubject($conf_subject);
+ $xoopsMailer->setBody($userMessage);
+ $xoopsMailer->send();
+ $messagesent = sprintf(_AM_LX_SENTCONFIRMMAIL,$user->getVar('uname'));
+
+ redirect_header( "entry.php", 1, $messagesent );
+ exit();
+ }
redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
} else {
redirect_header( "index.php", 1, _AM_LX_ENTRYNOTUPDATED );
@@ -433,17 +480,15 @@
// confirmed, so delete
if ( $ok == 1 ) {
$result = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE entryID = $entryID");
- // delete comments (mondarse)
xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID );
+ // delete notifications
+ xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
// update user posts
if (!empty($uid)) {
$submitter = new xoopsUser($uid);
$member_handler =& xoops_gethandler('member');
$member_handler->updateUserByField($submitter, 'posts', $submitter->getVar('posts') - 1);
}
- // delete notifications
- xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
-
redirect_header("entry.php",1,sprintf( _AM_LX_ENTRYISDELETED, $term ) );
exit();
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/functions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,10 +1,10 @@
<?php
/**
- * $Id: functions.php v 1.0 20 Mar 2011 yerres Exp $
+ * $Id: functions.php v 1.0 18 Dec 2011 Yerres Exp $
* Module: lexikon
* Version: v 1.00
* Release Date: 18 Dec 2011
- * Author: yerres
+ * Author: Yerres
* Licence: GNU
*/
@@ -60,7 +60,7 @@
/**
* Verify that a field exists inside a mysql table
*
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -73,7 +73,7 @@
/**
* Add a field to a mysql table
*
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -82,14 +82,12 @@
global $xoopsDB;
//naja !
$result=$xoopsDB->queryF("ALTER TABLE " . $table . " ADD ".$field."");
- //$result=$xoopsDB->queryF('ALTER TABLE ' . $table . ' ADD $field;');//ovp falsch
return $result;
}
-
/**
* Change a field to a mysql table
* desuet
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -111,7 +109,7 @@
/*
* Sub-Menu for Importscripts
* @package lexikon
- * @copyright (c) The Xoops Project - www.xoops.org
+ * @copyright (c) The Xoops Project - www.xoops.org
*/
function lx_importMenu ($currentoption = 0, $breadcrumb = '' ) {
@@ -190,11 +188,11 @@
}
-/*
+/**
* collapsable bar for items lists
* @package lexikon
* @copyright (c) The Xoops Project - www.xoops.org
-*/
+ */
function lx_collapsableBar($tablename = '', $iconname = '') {
@@ -276,7 +274,7 @@
$ret['readspercategory']=$ret2;
- // unused terms per category i.e. offline or submitted. Requests remain unconsidered
+ // unused terms per category i.e. offline or submitted
$ret2=array();
$sql="SELECT Count(entryID) as cpt, categoryID FROM $tbls WHERE offline > 0 OR submit > 0 GROUP BY categoryID ORDER BY categoryID";
$result = $db->query($sql);
@@ -357,19 +355,47 @@
echo "</tr>";
}
+
+/**
+ * save_permissions()
+ * adapted from WF-Downloads
+ */
+
+function lx_save_Permissions($groups, $id, $perm_name) {
+ $result = true;
+ $hModule = & xoops_gethandler('module');
+ $lxModule = & $hModule -> getByDirname('lexikon');
+
+ $module_id = $lxModule -> getVar('mid');
+ $gperm_handler = & xoops_gethandler('groupperm');
+
+ /*
+ * First, if the permissions are already there, delete them
+ */
+ $gperm_handler -> deleteByModule($module_id, $perm_name, $id);
+ /*
+ * Save the new permissions
+ */
+ if (is_array($groups)){
+ foreach ($groups as $group_id){
+ $gperm_handler -> addRight($perm_name, $id, $group_id, $module_id);
+ }
+ }
+ return $result;
+}
+
//-- Initial Selector
function lx_getinit($init) {
-
+ global $init;
echo "<select name='init'>";
- echo "<option value='#'>#</option>";
+ echo "<option value='#'> # </option>";
for ($a = 65; $a < (65+26); $a++ ) {
- $init = chr($a);
if ( chr($a) == $init) {
$opt_selected = "selected='selected'";
} else {
$opt_selected = "";
}
- echo "<option value='".chr($a)."' $opt_selected>".$init."</option>";
+ echo "<option value='".chr($a)."' $opt_selected> ".chr($a)." </option>";
}
echo "</select></div>";
}
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,6 +1,6 @@
<?php
//////////////////////////////////////////////////////////////////////////////
-// $Id: importdictionary.php,v 1.1 18/03/2011 17:21:00 Yerres Exp $ //
+// $Id: importdictionary.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
// ------------------------------------------------------------------------ //
// 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 //
@@ -17,17 +17,15 @@
// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, //
// MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-// coded bits stolen from Aiba //
+// code partially from Aiba and rmdp //
// ------------------------------------------------------------------------ //
-// import script dictionary -> Lexikon 1.00 //
+// import script dictionary -> Lexikon //
// ------------------------------------------------------------------------ //
//////////////////////////////////////////////////////////////////////////////
include("admin_header.php");
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
-
/****
* Available operations
****/
@@ -37,12 +35,19 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(7, _AM_LX_IMPORT);
+ lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
****/
-
+function showerror($msg) {
+ global $xoopsDB;
+ if ($xoopsDB->error()!='') {
+ echo "<br>".$msg . " <BR><font size=1> - ERROR: ".$xoopsDB->error()."</font>.";
+ } else {
+ echo "<br>".$msg .' O.K.!';
+ }
+}
function import2db($text) {
return preg_replace(array("/'/i"), array("\'"), $text);
}
@@ -64,7 +69,6 @@
$delete=intval($_POST['delete']);
} else {
if (isset($delete)) {
- #$delete=1;
$delete=intval($_POST['delete']);
}
}
@@ -79,9 +83,16 @@
$result3=$xoopsDB->query("select entryID from ".$xoopsDB->prefix("lxentries")."");
//now for each entry, delete the coments
while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
- xoops_comment_delete(
- $xoopsModule->getVar('mid'), $entryID);
+ xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID);
}
+ $resultC=$xoopsDB->query("SELECT categoryID FROM ".$xoopsDB->prefix("lxcategories")."");
+ while ( list($categoryID)=$xoopsDB->fetchRow($resultC) ) {
+ // delete permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
+ }
// delete everything
$sqlquery1=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxentries"));
$sqlquery2=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxcategories"));
@@ -104,9 +115,7 @@
$init = $myts -> addSlashes($row2['letter']);
$term = $myts -> addSlashes(import2db($row2['name']));
$definition = $myts -> addSlashes(import2db($row2['definition']));
- #$request = intval($row2['request']);
$datesub = $fecha++;
- #$estado = intval($row2['state']);
$estado = import2db($row2['state']);
if ($estado == 'O') {
$row2['state'] = 0;
@@ -122,7 +131,6 @@
$glocounter = $glocounter + 1;
if ( $delete ) {
-
$ret1 = $xoopsDB->queryF("
INSERT INTO ".$xoopsDB->prefix("lxentries")."
(entryID, init, term, definition, url, submit, datesub, offline, comments)
@@ -137,8 +145,7 @@
}
if (!$ret1) {
$errorcounter = $errorcounter + 1;
- echo "<font color='red'>Error: entryID: ".$entryID."</font><br>$term<br>";
- echo "<font size='1'>". xoops_substr($definition,0,25) ."</FONT><br><br>";
+ showerror('<BR>Import term failed: <font color=red>entryID: '.$entryID.'</font>: '.$term.' ...');
}
// update user posts count
if ($ret1) {
@@ -163,7 +170,7 @@
WHERE dirname = 'dictionary'");
list( $dicID ) = $xoopsDB->fetchRow( $sqlquery ) ;
echo "<p>Dictionary Module ID: ".$dicID."</p>";
- echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."</p>";
+ echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."<br/>";
//echo "<p>delete is on/off: ".$delete."</p>";
$commentaire = $xoopsDB->queryF("
@@ -171,15 +178,15 @@
SET com_modid = '".$xoopsModule->getVar('mid')."'
WHERE com_modid = '".$dicID."'");
if (!$commentaire) {
- echo "<font color='red'>Error while moving Comments from Dictionary to Lexikon module.<br><br>";
+ showerror('Import comments failed: ...');
} else {
- echo "<p>Comments successfully moved from Dictionary to Lexikon</p>";
+ showerror('Import comments : ');
}
-
+ echo "<p>Update User Post count: O.K.!</p>";
echo "<p><font color='red'>Incorrectly: ".$errorcounter."</font></p>";
echo "<p>Processed: ".$glocounter."</p>";
- echo "<br /><B><a href='importwordbook.php'>Back to Admin</a></B><p>";
- CloseTable();
+ echo "<H3>Import finished!</H3>";
+ echo "<br /><B><a href='index.php'>Back to Admin</a></B><p>";
xoops_cp_footer();
}
@@ -188,20 +195,19 @@
****/
function FormImport() {
- global $xoopsConfig, $xoopsDB;
- lx_importMenu();
+ global $xoopsConfig, $xoopsDB, $xoopsModule;
+ lx_importMenu(9);
$module_handler = xoops_gethandler('module');
$dictionaryModule = $module_handler->getByDirname("dictionary");
$got_options = false;
if (is_object($dictionaryModule)) {
-
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORT."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/lexikon/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; '></td>";
+ echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px;'></td>";
echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
@@ -219,10 +225,10 @@
} else {
echo "<BR><B><font color='red'>Module Dictionary not found on this site.</font></B><BR><A HREF='index.php'>Back</A><P>";
}
- CloseTable();
xoops_cp_footer();
}
+$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
switch ($op) {
case "import":
$delete = ( isset( $_GET['delete'] ) ) ? intval($_GET['delete']) : intval($_POST['delete']);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,18 +1,32 @@
<?php
-/**
- * $Id: index.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - a multicategory glossary
- * Version: v 1.00
- * Release Date: 8 May 2004
- * Author: hsalazar
- * Licence: GNU
- */
+//////////////////////////////////////////////////////////////////////////////
+// $Id: importglossaire.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
+// ------------------------------------------------------------------------ //
+// 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., 59 Temple Place, Suite 330, Boston, //
+// MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// code partially from Aiba and rmdp //
+// ------------------------------------------------------------------------ //
+// import script glossaire -> Lexikon //
+// ------------------------------------------------------------------------ //
+//////////////////////////////////////////////////////////////////////////////
include( "admin_header.php" );
$myts =& MyTextSanitizer::getInstance();
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
/****
* Available operations
@@ -21,15 +35,22 @@
case "default":
default:
xoops_cp_header();
- global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
+ global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(7, _AM_LX_IMPORT);
+ lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
****/
-
+function showerror($msg) {
+ global $xoopsDB;
+ if ($xoopsDB->error()!='') {
+ echo "<br>".$msg . " <BR><font size=1> - ERROR: ".$xoopsDB->error()."</font>.";
+ } else {
+ echo "<br>".$msg .' O.K.!';
+ }
+}
function import2db($text) {
return preg_replace(array("/'/i"), array("\'"), $text);
}
@@ -51,7 +72,6 @@
$delete=intval($_POST['delete']);
} else {
if (isset($delete)) {
- #$delete=1;
$delete=intval($_POST['delete']);
}
}
@@ -66,18 +86,24 @@
$result3=$xoopsDB->query("SELECT entryID FROM ".$xoopsDB->prefix("lxentries")."");
//delete comments for each entry
while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
- xoops_comment_delete(
- $xoopsModule->getVar('mid'), $entryID);
+ xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID);
}
-
+ $resultC=$xoopsDB->query("SELECT categoryID FROM ".$xoopsDB->prefix("lxcategories")."");
+ while ( list($categoryID)=$xoopsDB->fetchRow($resultC) ) {
+ // delete permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
+ }
// delete everything
$sqlquery1=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxentries"));
$sqlquery2=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxcategories"));
}
+
/****
* Import ENTRIES
****/
-
$sqlquery=$xoopsDB->query("SELECT id, lettre, nom, definition, affiche
FROM ".$xoopsDB->prefix("glossaire"));
$fecha = time()-1;
@@ -104,20 +130,20 @@
}
if (!$insert) {
$errorcounter = $errorcounter + 1;
- echo "<font color='red'>Error: #".$glo['id']."</font><br>".$glo['nom']."<br>";
- echo "<font size='1'>". substr($glo['definition'],0,25) ."...</FONT><br><br>";
+ showerror('<BR>Import term failed: <font color=red>entryID: '.$glo['id'].'</font>: '.$glo['nom'].' ...');
}
- if ($ret1) {
- if ($uid) {
- $member_handler = &xoops_gethandler('member');
- $submitter =& $member_handler -> getUser($uid);
- if (is_object($submitter) ) {
- $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
- $res=$member_handler -> insertUser($submitter, true);
- unset($submitter);
- }
- }
- }
+ // update user posts count
+ if ($ret1) {
+ if ($uid) {
+ $member_handler = &xoops_gethandler('member');
+ $submitter =& $member_handler -> getUser($uid);
+ if (is_object($submitter) ) {
+ $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
+ $res=$member_handler -> insertUser($submitter, true);
+ unset($submitter);
+ }
+ }
+ }
}
$sqlquery=$xoopsDB->query("
@@ -126,44 +152,42 @@
WHERE dirname = 'glossaire'");
list( $gloID ) = $xoopsDB->fetchRow( $sqlquery ) ;
echo "<p>Glossaire Module ID: ".$gloID."</p>";
- echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."</p>";
+ echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."<br/>";
$comentario = $xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("xoopscomments")."
SET com_modid = '".$xoopsModule->getVar('mid')."'
WHERE com_modid = '".$gloID."'");
if (!$comentario) {
- echo "<font color='red'>" . _AM_LX_MODULEIMPORTERNOCOM . "<br><br>";
+ showerror('Import comments failed: ...');
} else {
- echo "<p>" . _AM_LX_MODULEIMPORTERNOCOM . "</p>";
+ showerror('Import comments : ');
}
-
+ echo "<p>Update User Post count: O.K.!</p>";
echo "<p><font color='red'>Incorrectly: ".$errorcounter."</font></p>";
- echo "<p>Processed: ".$glocounter."</p>";
- echo "<br /><B><a href='importwordbook.php'>Back to Admin</a></B><p>";
- CloseTable();
+ echo "<p>Processed: ".$glocounter."<br/>";
+ echo "<H3>Import finished!</H3>";
+ echo "<br /><B><a href='index.php'>Back to Admin</a></B><p>";
xoops_cp_footer();
}
+
+/****
+ * IMPORT FORM
+ ****/
function FormImport() {
- global $xoopsConfig, $xoopsDB;
- lx_importMenu();
+ global $xoopsConfig, $xoopsDB, $xoopsModule;
+ lx_importMenu(9);
$module_handler = xoops_gethandler('module');
$glossaireModule = $module_handler->getByDirname("glossaire");
$got_options = false;
if (is_object($glossaireModule)) {
-
-
- /****
- * IMPORT FORM PLAIN HTML
- ****/
-
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORTGLO."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/lexikon/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; '></td>";
+ echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px; '></td>";
echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
@@ -178,7 +202,6 @@
<input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
-
} else {
echo "<BR><B><font color='red'>Module Glossaire not found on this site.</font></B><BR><A HREF='index.php'>Back</A><P>";
}
@@ -188,7 +211,7 @@
global $op;
-
+$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
switch ($op) {
case "import":
$delete = ( isset( $_GET['delete'] ) ) ? intval($_GET['delete']) : intval($_POST['delete']);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,6 +1,6 @@
<?php
//////////////////////////////////////////////////////////////////////////////
-// $Id: importWiwimod.php,v 1.1 18/03/2011 17:21:00 Yerres Exp $ //
+// $Id: importwiwimod.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
// ------------------------------------------------------------------------ //
// 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 //
@@ -17,16 +17,15 @@
// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, //
// MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-// code bits stolen from Aiba //
+// code partially from Aiba and rmdp //
// ------------------------------------------------------------------------ //
-// import script Wiwimod -> Lexikon 1.0 //
+// import script wiwimod -> Lexikon //
// ------------------------------------------------------------------------ //
//////////////////////////////////////////////////////////////////////////////
+
include("admin_header.php");
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
-
/****
* Available operations
****/
@@ -36,19 +35,25 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSani...
[truncated message content] |
|
From: <ma...@us...> - 2012-09-09 10:41:18
|
Revision: 10160
http://xoops.svn.sourceforge.net/xoops/?rev=10160&view=rev
Author: mageg
Date: 2012-09-09 10:41:11 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
fix bug
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2012-09-09 08:06:31 UTC (rev 10159)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2012-09-09 10:41:11 UTC (rev 10160)
@@ -270,7 +270,7 @@
}
}
foreach ($admin_mids as $a_mid) {
- $modperm = &$gperm_handler->create();
+ $modperm = $gperm_handler->create();
$modperm->setVar('gperm_groupid', $groupid);
$modperm->setVar('gperm_itemid', $a_mid);
$modperm->setVar('gperm_name', 'module_admin');
@@ -279,7 +279,7 @@
}
array_push($read_mids, 1);
foreach ($read_mids as $r_mid) {
- $modperm = &$gperm_handler->create();
+ $modperm = $gperm_handler->create();
$modperm->setVar('gperm_groupid', $groupid);
$modperm->setVar('gperm_itemid', $r_mid);
$modperm->setVar('gperm_name', 'module_read');
@@ -287,7 +287,7 @@
$gperm_handler->insert($modperm);
}
foreach ($read_bids as $r_bid) {
- $blockperm = &$gperm_handler->create();
+ $blockperm = $gperm_handler->create();
$blockperm->setVar('gperm_groupid', $groupid);
$blockperm->setVar('gperm_itemid', $r_bid);
$blockperm->setVar('gperm_name', 'block_read');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-09 08:06:38
|
Revision: 10159
http://xoops.svn.sourceforge.net/xoops/?rev=10159&view=rev
Author: irmtfan
Date: 2012-09-09 08:06:31 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
fix onclick xoopsCheckAll in viewtopic.php, add alt to down prev and next icons, modify presian language
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-08 21:49:43 UTC (rev 10158)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-09 08:06:31 UTC (rev 10159)
@@ -1,3 +1,12 @@
+date 2012-09-09
+==================
+1- some changes in persian language notifications.
+language/persian/modinfo.php
+2- add alt to down prev and next and change the templates
+newbb/viewtopic.php newbb/templates/newbb_viewpost.html and newbb/templates/newbb_viewtopic.html
+3- bug fix: js onclick xoopsCheckAll not work when polls is active in viewtopic admin mode.
+newbb/templates/newbb_viewtopic.html
+
date 2012-09-05
================================================
1- minor bug fix: mistype in viewtopic and viewpost admin mode submit button when admin dont select any action
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php 2012-09-08 21:49:43 UTC (rev 10158)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php 2012-09-09 08:06:31 UTC (rev 10159)
@@ -184,25 +184,25 @@
// Notification event descriptions and mail templates
define ('_MI_NEWBB_THREAD_NOTIFY','عنوان در انجمن');
-define ('_MI_NEWBB_THREAD_NOTIFYDSC',' تنظیمات آگهی رسانی که در عنوان هر انجمن به کار میرود ');
+define ('_MI_NEWBB_THREAD_NOTIFYDSC','.تنظیمات آگهی رسانی که در این عنوان به کار میرود');
define ('_MI_NEWBB_FORUM_NOTIFY','انجمن');
-define ('_MI_NEWBB_FORUM_NOTIFYDSC','تنظیمات آگهی رسانی که در هر انجمن به کار میرود');
+define ('_MI_NEWBB_FORUM_NOTIFYDSC','تنطیمات آگهی رسانی که در این انجمن به کار میرود.');
define ('_MI_NEWBB_GLOBAL_NOTIFY','کلی');
-define ('_MI_NEWBB_GLOBAL_NOTIFYDSC','تنظیمات آگهیرسانی به طور کلی');
+define ('_MI_NEWBB_GLOBAL_NOTIFYDSC','تنظیمات آگهی رسانی به طور کلی');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFY','پیام جدید');
-define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP','وقتی پیام جدیدی در هر یک از عنوان های انجمن ها زده شد مرا با خبر کن');
-define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC','وقتی پیام جدیدی در هر یک از عنوان های انجمن ها زده شد به من ارسال کن');
-define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار:پیام جدید در هر عنوان');
-define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY','عنوان در انجمن جدید');
-define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP','وقتی عنوان جدیدی در هر یک از انجمن ها زده شد مرا با خبر کن');
-define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC','وقتی عنوان جدیدی در هر یک از انجمن ها زده شد به من ارسال کن');
-define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار: عنوان جدید در هر انجمن');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP','وقتی پست جدیدی در این عنوان ارسال شد مرا با خبر کن.');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC','وقتی پست جدیدی در این عنوان ارسال شود کاربر را از آن مطلع خواهد کرد');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار:پیام جدید در عنوان');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY','عنوان جدید در انجمن');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP','وقتی عنوان جدیدی در این انجمن ارسال شد مرا با خبر کن.');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC','وقتی عنوان جدیدی در این انجمن ارسال شود کاربر از آن مطلع خواهد شد.');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار: عنوان جدید در این انجمن');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY','انجمن جدید');
-define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP','وقتی انجمن جدیدی در هر شاخه ایجاد شد مرا با خبر کن');
-define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC','وقتی انجمن جدیدی در هر شاخه ایجاد شد به من ارسال کن');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP','وقتی انجمن جدیدی در این شاخه ایجاد شد مرا با خبر کن');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC','وقتی انجمن جدیدی در این شاخه ایجاد شد به من ارسال کن');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار:انجمن جدید');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFY','پیام جدید');
-define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP','برای هر پست جدید مرا با خبر کن');
+define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP','مرا برای هر پست جدیدی با خبر کن');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC','هر پست جدید را برای من ارسال کن');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار:پیام جدید');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFY','پیام جدید');
@@ -210,7 +210,7 @@
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC','هر پیام جدیدی که در همین انجمن زده شد به من ارسال کن');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} اطلاع رسانی خودکار:پیام جدید در انجمن');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY','(پیام جدید(متن کامل');
-define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP',' متن کامل هر پیام جدید را به من اطلاع بده ');
+define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP','مرا برای هر پیام جدید با خبر کن و متن کامل پست را هم همراه آن ارسال کن.');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC','متن کامل هر پیام جدید را به من ارسال کن');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} (اطلاع رسانی خودکار:پیام جدید(متن کامل');
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFY','خلاصه');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-08 21:49:43 UTC (rev 10158)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-09 08:06:31 UTC (rev 10159)
@@ -47,7 +47,8 @@
<br />
<div style="padding: 5px;">
- <a id="threadtop"></a><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev&topic_time=<{$topic_time}>"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next&topic_time=<{$topic_time}>"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <!-- irmtfan correct prev and next icons -->
+ <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$previous}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev&topic_time=<{$topic_time}>"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next&topic_time=<{$topic_time}>"><{$smarty.const._MD_NEXTTOPIC}></a>
</div>
<br />
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-08 21:49:43 UTC (rev 10158)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-09 08:06:31 UTC (rev 10159)
@@ -79,7 +79,8 @@
<{/if}>
<div class="clear"></div>
<br />
-
+<!-- irmtfan add to not show polls in admin mode -->
+<{if $mode lte 1}>
<{if $topic_poll}>
<{if $topic_pollresult}>
<{includeq file="db:newbb_poll_results.html" poll=$poll}>
@@ -87,13 +88,15 @@
<{includeq file="db:newbb_poll_view.html" poll=$poll}>
<{/if}>
<{/if}>
+<{/if}>
<div class="clear"></div>
<br />
<div style="padding: 5px;">
<!-- irmtfan hardcode removed style="float: left; text-align:left;"" -->
<span class="icon_left">
- <a id="threadtop"></a><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$left}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <!-- irmtfan correct prev and next icons -->
+ <a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$previous}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
</span>
<!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
<span class="icon_right">
@@ -195,7 +198,8 @@
<div>
<div class="left">
- <a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+ <!-- irmtfan correct prev and next icons -->
+ <a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a> <{$previous}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$next}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
<div class="icon_right">
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-08 21:49:43 UTC (rev 10158)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-09 08:06:31 UTC (rev 10159)
@@ -107,7 +107,7 @@
$total_posts = $topic_handler->getPostCount($topic_obj, $status);
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
-//Threadersteller zählt nicht
+//Threadersteller zählt nicht
if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) {
$topic_obj->incrementCounter();
}
@@ -517,10 +517,10 @@
$xoopsTpl->assign('rating_enable', $xoopsModuleConfig['rating_enabled']);
$xoopsTpl->assign('groupbar_enable', $xoopsModuleConfig['groupbar_enabled']);
$xoopsTpl->assign('anonymous_prefix', $xoopsModuleConfig['anonymous_prefix']);
-
-$xoopsTpl->assign('previous', newbb_displayImage('previous'));
-$xoopsTpl->assign('next', newbb_displayImage('next'));
-$xoopsTpl->assign('down', newbb_displayImage('down'));
+// irmtfan add alt for prev next and down icons.
+$xoopsTpl->assign('previous', newbb_displayImage('previous',_MD_PREVTOPIC));
+$xoopsTpl->assign('next', newbb_displayImage('next',_MD_NEXTTOPIC));
+$xoopsTpl->assign('down', newbb_displayImage('down',_MD_BOTTOM));
$xoopsTpl->assign('post_content', newbb_displayImage('post'));
if (!empty($xoopsModuleConfig['rating_enabled'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-08 21:49:49
|
Revision: 10158
http://xoops.svn.sourceforge.net/xoops/?rev=10158&view=rev
Author: mageg
Date: 2012-09-08 21:49:43 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
update xoops error
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-09-08 21:49:11 UTC (rev 10157)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-09-08 21:49:43 UTC (rev 10158)
@@ -1084,7 +1084,7 @@
*/
public function error($msg, $title = '')
{
- echo '<div class="errorMsg alert-message error">';
+ echo '<div class="alert alert-error">';
if ($title != '') {
echo '<strong>' . $title . '</strong><br /><br />';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-08 21:49:18
|
Revision: 10157
http://xoops.svn.sourceforge.net/xoops/?rev=10157&view=rev
Author: mageg
Date: 2012-09-08 21:49:11 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
Update forms
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formpassword.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/content.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/subcategory.png
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -33,7 +33,7 @@
*/
public function XoopsFormColorPicker($caption, $name, $value = '#FFFFFF')
{
- parent::__construct($caption, $name, 9, 7, '', $value);
+ parent::__construct($caption, $name, 2, 7, '', $value);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdatetime.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdatetime.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -32,14 +32,13 @@
* @param integer $value
* @param mixed $showtime
*/
- public function __construct($caption, $name, $size = 15, $value = 0, $showtime = true)
+ public function __construct($caption, $name, $size = 2, $value = 0, $showtime = true)
{
parent::__construct($caption, '');
$value = intval($value);
$value = ($value > 0) ? $value : time();
$datetime = getDate($value);
$date = new XoopsFormTextDateSelect('', $name . '[date]', $size, $value);
- $date->setClass('span2');
$this->addElement($date);
if ($showtime) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -167,7 +167,12 @@
$xoops = Xoops::getInstance();
$xoops->loadLanguage('formdhtmltextarea');
- $class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
+ if ($this->getCols() > $this->getMaxcols()) {
+ $maxcols = $this->getMaxcols();
+ } else {
+ $maxcols = $this->getCols();
+ }
+ $class = ($this->getClass() != '' ? " class='span" . $maxcols . " " . $this->getClass() . "'" : " class='span" . $maxcols . "'");
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
$required = ($this->isRequired() ? ' required' : '');
$ret = "";
@@ -179,7 +184,7 @@
$ret .= "<input type='button' class='btn' onclick=\"XoopsCheckLength('" . $this->getName() . "', '" . @$this->configs['maxlength'] . "', '" . _XOOPS_FORM_ALT_LENGTH . "', '" . _XOOPS_FORM_ALT_LENGTH_MAX . "');\" value=' ? ' title='" . _XOOPS_FORM_ALT_CHECKLENGTH . "' />";
$ret .= "<br />\n";
// the textarea box
- $ret .= "<textarea" . $class . " id='" . $this->getName() . "' name='" . $this->getName() . "' title='" . $this->getTitle() . "' onselect=\"xoopsSavePosition('" . $this->getName() . "');\" onclick=\"xoopsSavePosition('" . $this->getName() . "');\" onkeyup=\"xoopsSavePosition('" . $this->getName() . "');\" cols='" . $this->getCols() . "' rows='" . $this->getRows() . "'" . $extra . $required . ">" . $this->getValue() . "</textarea><br />\n";
+ $ret .= "<textarea" . $class . " id='" . $this->getName() . "' name='" . $this->getName() . "' title='" . $this->getTitle() . "' onselect=\"xoopsSavePosition('" . $this->getName() . "');\" onclick=\"xoopsSavePosition('" . $this->getName() . "');\" onkeyup=\"xoopsSavePosition('" . $this->getName() . "');\" rows='" . $this->getRows() . "'" . $extra . $required . ">" . $this->getValue() . "</textarea><br />\n";
if (empty($this->skipPreview)) {
if (empty($xoops->theme)) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -130,6 +130,14 @@
protected $_value = '';
/**
+ * maximum columns for a field
+ *
+ * @var integer
+ * @access private
+ */
+ private $_maxcols = 12;
+
+ /**
* Generates output for the element.
*
* This method is abstract and must be overwritten by the child classes.
@@ -517,4 +525,15 @@
}
return false;
}
+
+ /**
+ * get the maximum columns for a field
+ *
+ * @param bool $encode To sanitizer the text?
+ * @return integer
+ */
+ public function getMaxcols($encode = false)
+ {
+ return $encode ? htmlspecialchars($this->_maxcols, ENT_QUOTES) : $this->_maxcols;
+ }
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formpassword.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formpassword.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formpassword.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -123,12 +123,17 @@
public function render()
{
$name = $this->getName();
- $class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
+ if ($this->getSize() > $this->getMaxcols()) {
+ $maxcols = $this->getMaxcols();
+ } else {
+ $maxcols = $this->getSize();
+ }
+ $class = ($this->getClass() != '' ? " class='span" . $maxcols . " " . $this->getClass() . "'" : " class='span" . $maxcols . "'");
$pattern = ($this->getPattern() != '' ? " pattern='" . $this->getPattern() . "'" : '');
$placeholder = ($this->getPlaceholder() != '' ? " placeholder='" . $this->getPlaceholder() . "'" : '');
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
$autocomplete = ($this->autoComplete ? '' : " autocomplete='off'");
$required = ($this->isRequired() ? ' required' : '');
- return "<input type='password' name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ." size='" . $this->getSize() . "' maxlength='" . $this->getMaxlength() . "' value='" . $this->getValue() . "'" . $pattern . $placeholder . $extra . $autocomplete . $required . ">";
+ return "<input type='password' name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ."' maxlength='" . $this->getMaxlength() . "' value='" . $this->getValue() . "'" . $pattern . $placeholder . $extra . $autocomplete . $required . ">";
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -114,12 +114,17 @@
public function render()
{
$name = $this->getName();
- $class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
+ if ($this->getSize() > $this->getMaxcols()) {
+ $maxcols = $this->getMaxcols();
+ } else {
+ $maxcols = $this->getSize();
+ }
+ $class = ($this->getClass() != '' ? " class='span" . $maxcols . " " . $this->getClass() . "'" : " class='span" . $maxcols . "'");
$list = ($this->isDatalist() != '' ? " list='list_" . $name . "'" : '');
$pattern = ($this->getPattern() != '' ? " pattern='" . $this->getPattern() . "'" : '');
$placeholder = ($this->getPlaceholder() != '' ? " placeholder='" . $this->getPlaceholder() . "'" : '');
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
$required = ($this->isRequired() ? ' required' : '');
- return "<input type='text' name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ." size='" . $this->getSize() . "' maxlength='" . $this->getMaxlength() . "' value='" . $this->getValue() . "'" . $list . $pattern . $placeholder . $extra . $required . ">";
+ return "<input type='text' name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ." maxlength='" . $this->getMaxlength() . "' value='" . $this->getValue() . "'" . $list . $pattern . $placeholder . $extra . $required . ">";
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -34,7 +34,7 @@
* @var int
* @access private
*/
- private $_cols;
+ public $_cols;
/**
* number of rows
@@ -42,7 +42,7 @@
* @var int
* @access private
*/
- private $_rows;
+ public $_rows;
/**
* placeholder for this element
@@ -50,7 +50,7 @@
* @var string
* @access private
*/
- private $_placeholder;
+ public $_placeholder;
/**
@@ -63,7 +63,7 @@
* @param int $cols number of columns
* @param string $placeholder placeholder for this element.
*/
- public function __construct($caption, $name, $value = "", $rows = 5, $cols = 50, $placeholder = '')
+ public function __construct($caption, $name, $value = "", $rows = 5, $cols = 6, $placeholder = '')
{
$this->setCaption($caption);
$this->setName($name);
@@ -115,9 +115,15 @@
{
$name = $this->getName();
$class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
+ if ($this->getCols() > $this->getMaxcols()) {
+ $maxcols = $this->getMaxcols();
+ } else {
+ $maxcols = $this->getCols();
+ }
+ $class = ($this->getClass() != '' ? " class='span" . $maxcols . " " . $this->getClass() . "'" : " class='span" . $maxcols . "'");
$placeholder = ($this->getPlaceholder() != '' ? " placeholder='" . $this->getPlaceholder() . "'" : '');
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
$required = ($this->isRequired() ? ' required' : '');
- return "<textarea name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ." rows='" . $this->getRows() . "' cols='" . $this->getCols() . "'" . $placeholder . $extra . $required . ">" . $this->getValue() . "</textarea>";
+ return "<textarea name='" . $name . "' title='" . $this->getTitle() . "' id='" . $name . "'" . $class ." rows='" . $this->getRows() . "'" . $placeholder . $extra . $required . ">" . $this->getValue() . "</textarea>";
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -35,11 +35,11 @@
* @param int $size
* @param int $value
*/
- public function __construct($caption, $name, $size = 15, $value = 0)
+ public function __construct($caption, $name, $size = 2, $value = 0)
{
$value = !is_numeric($value) ? time() : intval($value);
$value = ($value == 0) ? time() : $value;
- parent::__construct($caption, $name, $size, 25, $value);
+ parent::__construct($caption, $name, $size, 2, $value);
}
public function render()
@@ -144,9 +144,14 @@
Calendar._TT["WK"] = "";
');
}
- $class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
+ if ($this->getSize() > $this->getMaxcols()) {
+ $maxcols = $this->getMaxcols();
+ } else {
+ $maxcols = $this->getSize();
+ }
+ $class = ($this->getClass() != '' ? " class='span" . $maxcols . " " . $this->getClass() . "'" : " class='span" . $maxcols . "'");
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
$required = ($this->isRequired() ? ' required' : '');
- return "<input type='text' name='" . $ele_name . "' id='" . $ele_name . "'" . $class ." size='" . $this->getSize() . "' maxlength='" . $this->getMaxlength() . "' value='" . $display_value . "'" . $extra . $required . " /><button class='btn' type='button' onclick='return showCalendar(\"" . $this->getName() . "\");'> ... </button>" ;
+ return "<input type='text' name='" . $ele_name . "' id='" . $ele_name . "'" . $class ."' maxlength='" . $this->getMaxlength() . "' value='" . $display_value . "'" . $extra . $required . " /><button class='btn' type='button' onclick='return showCalendar(\"" . $this->getName() . "\");'> ... </button>" ;
}
}
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/content.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/content.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/subcategory.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/subcategory.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-08 14:58:08 UTC (rev 10156)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-08 21:49:11 UTC (rev 10157)
@@ -24,27 +24,23 @@
// Form Horizontal
$form = new XoopsThemeForm('Form Horizontal', 'form_horizontal', 'testform.php', 'post', true, 'horizontal');
-$code = new XoopsFormText('Code', 'code', 26, 25, '','Code...');
+$code = new XoopsFormText('Code', 'code', 2, 25, '','Code...');
$code->setDescription('Description code');
-$code->setClass('span2');
$code->setPattern('^.{3,}$', 'You need at least 3 characters');
$code->setDatalist(array('list 1','list 2','list 3'));
$form->addElement($code, true);
-$password = new XoopsFormPassword('Password', 'password', 26, 25, '', false, 'Your Password');
+$password = new XoopsFormPassword('Password', 'password', 3, 25, '', false, 'Your Password');
$password->setDescription('Description password');
-$password->setClass('span3');
$password->setPattern('^.{8,}$', 'You need at least 8 characters');
$form->addElement($password, true);
-$description = new XoopsFormTextArea('Description', 'description', '', 5, 90, 'Your description');
+$description = new XoopsFormTextArea('Description', 'description', '', 5, 6, 'Your description');
$description->setDescription('Put the description');
-$description->setClass('span5');
$form->addElement($description, true);
-$description_2 = new XoopsFormDhtmlTextArea('Description_2', 'description_2', '', 5, 90);
+$description_2 = new XoopsFormDhtmlTextArea('Description_2', 'description_2', '', 6, 7);
$description_2->setDescription('Put the description_2');
-$description_2->setClass('span6');
$form->addElement($description_2, true);
@@ -106,12 +102,11 @@
$select_optgroup->setClass('span3');
$form->addElement($select_optgroup, true);
-$date = new XoopsFormTextDateSelect('Date', 'date', 15,'','Date...');
+$date = new XoopsFormTextDateSelect('Date', 'date', 2,'','Date...');
$date->setDescription('Description Date');
-$date->setClass('span2');
$form->addElement($date, true);
-$date_time = new XoopsFormDateTime('Date time', 'date_time', 15,'','Date...');
+$date_time = new XoopsFormDateTime('Date time', 'date_time', 3,'','Date...');
$date_time->setDescription('Description Date time');
$form->addElement($date_time, true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-09-08 14:58:15
|
Revision: 10156
http://xoops.svn.sourceforge.net/xoops/?rev=10156&view=rev
Author: djculex
Date: 2012-09-08 14:58:08 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
- rearranging danish files defines to match english reference files defines
Modified Paths:
--------------
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/modulesadmin.php
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/modulesadmin.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/modulesadmin.php 2012-09-08 03:28:27 UTC (rev 10155)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/modules/system/language/danish/admin/modulesadmin.php 2012-09-08 14:58:08 UTC (rev 10156)
@@ -2,34 +2,41 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
+ * _LANGCODE da
* _CHARSET UTF-8
* @version $Id: modulesadmin.php 5536 2010-10-18 03:29:42Z beckmi $
+ * @translated by: Michael Albertsen (culex)
*/
// Navigation
define("_AM_SYSTEM_MODULES_ADMIN","Modul Administration");
define("_AM_SYSTEM_MODULES_MAIN", "Hovedmenu");
-define("_AM_SYSTEM_MODULES_LIST","Modul liste");
-define("_AM_SYSTEM_MODULES_AVAILABLE", "Tilgængelige Moduler");
+// Messages
+define("_AM_SYSTEM_MODULES_MSG_INSTALL", "Installer modul");
+define("_AM_SYSTEM_MODULES_MSG_UPDATE", "Opdater modul");
+define("_AM_SYSTEM_MODULES_MSG_UNINSTALL", "Afinstaller modul");
-define("_AM_SYSTEM_MODULES_TOINSTALL","Installer modul");
-define("_AM_SYSTEM_MODULES_VALIDATE","Godkend ændringer");
-define("_AM_SYSTEM_MODULES_SUBMITRES","Indsend resultat");
-
-// Messages
define("_AM_SYSTEM_MODULES_RUSUREINS","Tryk på knappen nedenfor for at installere dette modul");
define("_AM_SYSTEM_MODULES_RUSUREUNINS","Er du sikker på du vil afinstallere dette modul?");
define("_AM_SYSTEM_MODULES_RUSUREUPD","Tryk på knappen herunder for at opdatere dette modul");
define("_AM_SYSTEM_MODULES_BTOMADMIN","Tilbage til modul administrations siden");
+define("_AM_SYSTEM_MODULES_BLOCKADMIN","Blocksstyring");
define("_AM_SYSTEM_MODULES_INSTALLING","Installation");
define("_AM_SYSTEM_MODULES_UNINSTAL","Afinstaller");
define("_AM_SYSTEM_MODULES_DEACTIVATE","Deaktivere");
+
define("_AM_SYSTEM_MODULES_ACTIVATE","Aktivér");
define("_AM_SYSTEM_MODULES_UPDATING","Opdatering");
// Main
+define("_AM_SYSTEM_MODULES_LIST","Modul liste");
+define("_AM_SYSTEM_MODULES_AVAILABLE", "Tilgængelige Moduler");
+define("_AM_SYSTEM_MODULES_VIEWLARGE","Stor visning");
+define("_AM_SYSTEM_MODULES_VIEWLINE","Linie visning");
+define("_AM_SYSTEM_MODULES_EDIT","Klik for at redigere modulnavn...");
+// Buttons
+
define("_AM_SYSTEM_MODULES_STATUS","Start/Stop");
define("_AM_SYSTEM_MODULES_INSTALL","Installér");
define("_AM_SYSTEM_MODULES_UNINSTALL","Afinstallér");
@@ -41,16 +48,15 @@
define("_AM_SYSTEM_MODULES_CLOSE","Luk");
define("_AM_SYSTEM_MODULES_MENU","Menu styring");
define("_AM_SYSTEM_MODULES_MENUBLOCK","Menu Block");
-define("_AM_SYSTEM_MODULES_VIEWLARGE","Stor visning");
-define("_AM_SYSTEM_MODULES_VIEWLINE","Linie visning");
+
+
// Other
define("_AM_SYSTEM_MODULES_VERSION","Version:");
define("_AM_SYSTEM_MODULES_AUTHOR","Forfatter:");
define("_AM_SYSTEM_MODULES_LICENSE","Licens:");
define("_AM_SYSTEM_MODULES_LASTUP","Seneste opdatering:");
define("_AM_SYSTEM_MODULES_WEB","Web:");
-
// %s represents module name
define("_AM_SYSTEM_MODULES_FAILINS","Kunne ikke installere %s.");
define("_AM_SYSTEM_MODULES_FAILACT","Kunne ikke aktivere %s.");
@@ -75,7 +81,8 @@
define("_AM_SYSTEM_MODULES_SYSNO","Systemet Modulet kan ikke deaktiveres.");
define("_AM_SYSTEM_MODULES_STRTNO","Dette modul er angivet som din standard startside. Du kan ændre start modul så det passer til dine behov.");
-define("_AM_SYSTEM_MODULES_ORDER","Bestil");
+
+define("_AM_SYSTEM_MODULES_ORDER","Orden");
define("_AM_SYSTEM_MODULES_ORDER0","(0 = skjule)");
define("_AM_SYSTEM_MODULES_ACTIVE","Aktive");
define("_AM_SYSTEM_MODULES_INACTIVE","Inaktive");
@@ -83,8 +90,9 @@
define("_AM_SYSTEM_MODULES_NOCHANGE","Ingen ændring");
define("_AM_SYSTEM_MODULES_SUBMIT","Indsend");
define("_AM_SYSTEM_MODULES_CANCEL","Annuller");
-define("_AM_SYSTEM_MODULES_DBUPDATE","Databasen blev opdateret!");
+define("_AM_SYSTEM_MODULES_DBUPDATE",_AM_SYSTEM_DBUPDATED);
define("_AM_SYSTEM_MODULES_LISTUPBLKS","Følgende blokke vil blive opdateret. <br /> Vælg de blokke hvis indhold (skabelon og indstillinger), kan blive overskrevet. <br />");
+
define("_AM_SYSTEM_MODULES_NEWBLKS","Ny Blok");
define("_AM_SYSTEM_MODULES_DEPREBLKS","Forældet Blok");
@@ -185,13 +193,17 @@
<li>For at skjule modulet i Hovedmenuen, sæt vægtning til 0</li>
<li>Slet ubenyttede modul filer fra dein server, dette vil minimerer sikkerhedsrisise og holde din side sikker.</li>
<li>For at ændre rækkefølgen af moduler (som afspejles i hovedmenuen), skal du bare trække og slippe modulerne til den ønskede plads.</li>
+
+
+
</ul>');
define('_AM_SYSTEM_MODULES_CONFIRM_TIPS',
'<ul>
<li>Kontroller alle modifikationer for at validere.</li>
+
</ul>');
define("_AM_SYSTEM_MODULES_MENU_TIPS",
"<ul><li>For at ændre ordenen på moduler (Som reflekteres i menuen), skal du blot drag 'n drop modulerne til ønsket placering.</li></ul>"
+
);
-?>
-<?php // Translation done by xtransam & anderssk - 2010-10-19 07:12 ?>
\ No newline at end of file
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-09-08 03:28:33
|
Revision: 10155
http://xoops.svn.sourceforge.net/xoops/?rev=10155&view=rev
Author: wishcraft
Date: 2012-09-08 03:28:27 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
XoopsHash Class Modeller for Checksums call with xoops_load('hash'); then you can either use statically or instanciated ie. XoopsHash::md5($data), XoopsHash::sha1($data), XoopsHash::xoopscrc($data), XoopsHash::password($data)
Added Paths:
-----------
ThirdParty/checksums/xoopshash/htdocs/class/hash/index.html
ThirdParty/checksums/xoopshash/htdocs/class/hash/md5/index.html
ThirdParty/checksums/xoopshash/htdocs/class/hash/password/index.html
ThirdParty/checksums/xoopshash/htdocs/class/hash/sha1/index.html
ThirdParty/checksums/xoopshash/htdocs/class/hash/xoopscrc/index.html
Added: ThirdParty/checksums/xoopshash/htdocs/class/hash/index.html
===================================================================
--- ThirdParty/checksums/xoopshash/htdocs/class/hash/index.html (rev 0)
+++ ThirdParty/checksums/xoopshash/htdocs/class/hash/index.html 2012-09-08 03:28:27 UTC (rev 10155)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: ThirdParty/checksums/xoopshash/htdocs/class/hash/md5/index.html
===================================================================
--- ThirdParty/checksums/xoopshash/htdocs/class/hash/md5/index.html (rev 0)
+++ ThirdParty/checksums/xoopshash/htdocs/class/hash/md5/index.html 2012-09-08 03:28:27 UTC (rev 10155)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: ThirdParty/checksums/xoopshash/htdocs/class/hash/password/index.html
===================================================================
--- ThirdParty/checksums/xoopshash/htdocs/class/hash/password/index.html (rev 0)
+++ ThirdParty/checksums/xoopshash/htdocs/class/hash/password/index.html 2012-09-08 03:28:27 UTC (rev 10155)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: ThirdParty/checksums/xoopshash/htdocs/class/hash/sha1/index.html
===================================================================
--- ThirdParty/checksums/xoopshash/htdocs/class/hash/sha1/index.html (rev 0)
+++ ThirdParty/checksums/xoopshash/htdocs/class/hash/sha1/index.html 2012-09-08 03:28:27 UTC (rev 10155)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: ThirdParty/checksums/xoopshash/htdocs/class/hash/xoopscrc/index.html
===================================================================
--- ThirdParty/checksums/xoopshash/htdocs/class/hash/xoopscrc/index.html (rev 0)
+++ ThirdParty/checksums/xoopshash/htdocs/class/hash/xoopscrc/index.html 2012-09-08 03:28:27 UTC (rev 10155)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
