|
From: <be...@us...> - 2013-08-02 12:35:27
|
Revision: 11866
http://sourceforge.net/p/xoops/svn/11866
Author: beckmi
Date: 2013-08-02 12:35:22 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Updating to XOOPS 2.5.6 Admin GUI
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/addcoupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/about.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/index.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_top.php
XoopsModules/mxDirectory/trunk/mxdirectory/header.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php
XoopsModules/mxDirectory/trunk/mxdirectory/index.php
XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php
XoopsModules/mxDirectory/trunk/mxdirectory/mxdir_rss.php
XoopsModules/mxDirectory/trunk/mxdirectory/mxdir_rss_mkurl.php
XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php
XoopsModules/mxDirectory/trunk/mxdirectory/sql/mysql.sql
XoopsModules/mxDirectory/trunk/mxdirectory/submit.php
XoopsModules/mxDirectory/trunk/mxdirectory/topten.php
XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php
XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php
XoopsModules/mxDirectory/trunk/mxdirectory/xoops_version.php
Added Paths:
-----------
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/_images/css/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/_images/matriximages/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/_images/ratings/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/_images/rss/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/admin/about0.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_footer.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_header.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php
XoopsModules/mxDirectory/trunk/mxdirectory/class/mxdirectorytree.php
XoopsModules/mxDirectory/trunk/mxdirectory/docs/
XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/credits.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/docs/install.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/lang_diff.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/license.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/readme.txt
XoopsModules/mxDirectory/trunk/mxdirectory/docs/upgrade.txt
XoopsModules/mxDirectory/trunk/mxdirectory/images/css/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/images/matriximages/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/images/ratings/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/images/rss/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/language/_RC1_Changes/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/help/
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/help/help.html
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/help/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/mail_template/index.html
Removed Paths:
-------------
XoopsModules/mxDirectory/trunk/mxdirectory/INSTALL.TXT
XoopsModules/mxDirectory/trunk/mxdirectory/LICENSE.TXT
XoopsModules/mxDirectory/trunk/mxdirectory/README.txt
XoopsModules/mxDirectory/trunk/mxdirectory/UPGRADE.txt
XoopsModules/mxDirectory/trunk/mxdirectory/language/japanese/
XoopsModules/mxDirectory/trunk/mxdirectory/language/nederlands/
XoopsModules/mxDirectory/trunk/mxdirectory/language/spanish/
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/INSTALL.TXT
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/INSTALL.TXT 2013-08-02 12:14:22 UTC (rev 11865)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/INSTALL.TXT 2013-08-02 12:35:22 UTC (rev 11866)
@@ -1,15 +0,0 @@
-Module Name : MX-Directory
-Version Number : 3.00
-Module developer : Tripmon
-
-Install Instructions
-1. Upload the mxdirectory directory to XOOPS_ROOT_URL/modules/
-
-2. Rename the mxdirectory if desired to a new directory name if desired. Note this must be done
- before installing the module (step 3 below).
-
-2. Log in to your site as administrator.
-
-3. Install the module using the XOOPS module administration panel at 'System Admin -> Modules'.
-
-4. Configure module options using the XOOPS module administration panel at 'MX-Directory -> Preferences'.
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/LICENSE.TXT
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/LICENSE.TXT 2013-08-02 12:14:22 UTC (rev 11865)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/LICENSE.TXT 2013-08-02 12:35:22 UTC (rev 11866)
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 Library 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
-
- Appendix: 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) 19yy <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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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) 19yy 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 Library General
-Public License instead of this License.
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/index.html
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/index.html (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/index.html 2013-08-02 12:35:22 UTC (rev 11866)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/README.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/README.txt 2013-08-02 12:14:22 UTC (rev 11865)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/README.txt 2013-08-02 12:35:22 UTC (rev 11866)
@@ -1,99 +0,0 @@
-See install.txt for installation instructions.
-
-LANGUAGE FILES - If you can help translate, please do.
-The only accurate language for this RC1 release is english.
-
-To make things easier for translators, we have included a change list in :
-language/_RC1_Changes
-the files will show additions, deletions, and changes for RC1
-
-**************************************************************************************
-Known Issues:
-**************************************************************************************
-XHTML Validation - Due to the issue below, this module will not validate fully at this time. (but it functions fine)
-
-Due to architecture of 2.0.x & allowing both 2.0 & 2.2 to run under a single module....:
-When NOT cached, the pages will load the stylesheet and rss wrapper (FF Live Bookmarks) 2 times.
-Unfortunately, that's necessary in order to have the stylesheet display when the module wide cache settings are enabled.
-
-A workaround exists for 2.2 via smarty, but have not yet found a way to fix in 2.0.
-
-**************************************************************************************
-Directory Naming DOES NOT FUNCTION WITH UPGRADE from xdirectory or Beta1 only for a Beta 2 upgrade or new install.
-**************************************************************************************
-Variable directory name:
-The module 'display' name can be edited via admin., text below is talking about the directory itself.
-
-The code of mx-directory allows for the module directory to be custom named.
-this is for the directory name that will display in the URL...
-
-To implement a custom name for the directory:
-
-BEFORE INSTALLING
-
-1. Change the folder name to a lower case text name without numbers spaces or other stupid characters.
-2. go to module admin (after changes above are made)
-3. install the module
-
-All of the settings should autodetect and the module should now work with the custom name you provided
-
-**************************************************************************************
-**** Preferences
-**************************************************************************************
-Settings here should be self explanatory.
-
-To select multiple features for a level (in multi-select boxes) hold down ctrl.
-The colors assigned to levels will override css (see below).
-
-**************************************************************************************
-***TIPS:
-**************************************************************************************
-To easily customize, I have added a stylesheet which is located in
-images/style.css
-
-If you have a listing assigned to a Option Level (premium) and disable the level, the listings in that level will still display, just without options, this is by design. ((baseline)data presented regardless of view)
-
-
-**************************************************************************************
-***Coupons:
-**************************************************************************************
-Use the admin section to add coupons & manage existing coupons.
-
-Savings.php will display a categorized listing of active coupons and appears as a sub-menu item as well as a link on the directory pages.
-
-If your coupons don't show up after adding them, make sure the time settings are correct for the server and xoops.
-
-All links with coupons will display a coupon button.
-
-I decided not to tie the coupons into Premium services (aside from display) to allow you more flexibility. As admin, you can add a coupon to any listing. There are no coupon limits as described in the premium section description page (matrix.php) you can add as many as you like.
-
-Coupons will pull logos from the listing and can provide an additional unique coupon image if desired.
-
-Coupon counts when the print coupon button is clicked and the format is as follows:
-#of views+Couponid
-so for coupon id #3 with 2 views, the top right of the coupon will display: 23
-so for coupon id #3 with 10 views, the top right of the coupon will display: 103
-
-I just thought it would be better to do it this way than a 1,2,3 counter
-
-Savings will show *all active coupons...regardless of your view settings per Option level. This is by design, use the admin to edit coupons if necessary.
-**************************************************************************************
-***Premium Services:
-**************************************************************************************
-You can now name them from the admin., the listing 'levels' function according to select box settings...
-
-Edit the matrix.php page to reflect your setup. (click "what's this" next to the premium dropdown in 'submit' to view)
-*********************************************************************************
-***Multiple Categories:
-*********************************************************************************
-Only the admin can add multiple categories.
-Use from the Multicat Manager in the admin (categories) section.
-
-This is an RC, please don't make feature requests, please do expose bugs.
-
-
-If you experience difficulties with the process, post to the support or bug tracker at:
- http://dev.xoops.org/modules/xfmod/tracker/?group_id=1223
-
-Thanks,
-Tripmon
\ No newline at end of file
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/UPGRADE.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/UPGRADE.txt 2013-08-02 12:14:22 UTC (rev 11865)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/UPGRADE.txt 2013-08-02 12:35:22 UTC (rev 11866)
@@ -1,39 +0,0 @@
-Module Name : MX-Directory
-Version Number : 3.00
-Module developer : Tripmon
-
-**Upgrades from mxdirectory Beta1 should see instructions in readme1st.txt... do not use this upgrade proces...
[truncated message content] |
|
From: <be...@us...> - 2013-08-02 12:42:34
|
Revision: 11867
http://sourceforge.net/p/xoops/svn/11867
Author: beckmi
Date: 2013-08-02 12:42:30 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Updating deprecated "'Database::getInstance();"
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -68,7 +68,7 @@
// get blocks owned by the module (Imported from xoopsblock.php then modified)
//$block_arr =& XoopsBlock::getByModule( $target_mid ) ;
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = "SELECT * FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid' ORDER BY visible DESC,side,weight";
$result = $db->query($sql);
$block_arr = array();
@@ -148,7 +148,7 @@
}
// target modules
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$result = $db->query( "SELECT module_id FROM ".$db->prefix('block_module_link')." WHERE block_id='$bid'" ) ;
$selected_mids = array();
while ( list( $selected_mid ) = $db->fetchRow( $result ) ) {
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -63,7 +63,7 @@
if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
// get blocks owned by the module (Imported from xoopsblock.php then modified)
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = "SELECT bid,name,show_func,func_file,template FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid'";
$result = $db->query($sql);
$block_arr = array();
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -40,7 +40,7 @@
*/
function Coupon($coupid = false) {
global $mydirname;
- $this->db = Database::getInstance();
+ $this->db = XoopsDatabaseFactory::getDatabaseConnection();
$this->initVar('couponid', XOBJ_DTYPE_INT, null, false);
$this->initVar('lid', XOBJ_DTYPE_INT, null, true);
$this->initVar('description', XOBJ_DTYPE_TXTAREA);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -329,7 +329,7 @@
// edit_block($bid); GIJ imported from blocksadmin.php
$myblock = new XoopsBlock($bid);
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
$result = $db->query($sql);
$modules = array();
@@ -353,7 +353,7 @@
xoops_cp_header();
$myblock = new XoopsBlock($bid);
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
$result = $db->query($sql);
$modules = array();
@@ -429,7 +429,7 @@
$tplman->insert($tplclone);
}
} */
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$bmodule = (isset($_POST['bmodule']) && is_array($_POST['bmodule'])) ? $_POST['bmodule'] : array(-1) ; // GIJ +
foreach( $bmodule as $bmid ) {
$sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
@@ -497,7 +497,7 @@
}
$msg = _AM_DBUPDATED;
if ($myblock->store() != false) {
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
$db->query($sql);
foreach ($bmodule as $bmid) {
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -2,7 +2,7 @@
// comment callback functions
function xdir_com_update($link_id, $total_num){
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = 'UPDATE '.$db->prefix('xdir_links').' SET comments = '.$total_num.' WHERE lid = '.$link_id;
$db->query($sql);
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -8,7 +8,7 @@
function b_sitemap_'.$mydirname.'(){
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$smtree = new MxdirectoryTree($db->prefix("xdir_cat"),"cid","pid");
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php 2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php 2013-08-02 12:42:30 UTC (rev 11867)
@@ -18,7 +18,7 @@
function b_waiting_mxdirectory_base( $mydirname )
{
- $xoopsDB =& Database::getInstance();
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
$mydirname = (basename ( dirname ( dirname( __FILE__ ) ) , "a" ) ) ;
|
|
From: <be...@us...> - 2013-08-02 13:14:50
|
Revision: 11868
http://sourceforge.net/p/xoops/svn/11868
Author: beckmi
Date: 2013-08-02 13:14:45 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Adding few missing translations, removing Blocks Tab
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
Added Paths:
-----------
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php 2013-08-02 12:42:30 UTC (rev 11867)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php 2013-08-02 13:14:45 UTC (rev 11868)
@@ -84,11 +84,11 @@
$adminmenu[$i]['title'] = _MI_XDIR_ADMENU5;
$adminmenu[$i]['link'] = "admin/main.php?op=listModReq";
$adminmenu[$i]["icon"] = $pathIcon32 . '/modifiedlink.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_XDIR_ADMENU10;
+//$adminmenu[$i]['link'] = "admin/myblocksadmin.php";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/block.png';
$i++;
-$adminmenu[$i]['title'] = _MI_XDIR_ADMENU10;
-$adminmenu[$i]['link'] = "admin/myblocksadmin.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/block.png';
-$i++;
$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php 2013-08-02 12:42:30 UTC (rev 11867)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php 2013-08-02 13:14:45 UTC (rev 11868)
@@ -141,7 +141,7 @@
$title = $instances[$i]->getVar("title") ;
$bcachetime = $instances[$i]->getVar("bcachetime") ;
$bid = $instances[$i]->getVar("bid") ;
- $name = $myts->makeTboxData4Edit( $block_arr[$bid]['name'] ) ;
+ $name = $myts->htmlSpecialChars( $block_arr[$bid]['name'] ) ;
$visiblein = $instances[$i]->getVisibleIn();
@@ -261,14 +261,14 @@
$description4show = '' ;
foreach( $block_configs as $bconf ) {
if( $block['show_func'] == $bconf['show_func'] && $block['func_file'] == $bconf['file'] && ( empty( $bconf['template'] ) || $block['template'] == $bconf['template'] ) ) {
- if( ! empty( $bconf['description'] ) ) $description4show = $myts->makeTboxData4Show( $bconf['description'] ) ;
+ if( ! empty( $bconf['description'] ) ) $description4show = $myts->htmlSpecialChars( $bconf['description'] ) ;
}
}
echo "
<tr>
<td class='$class' align='left'>
- ".$myts->makeTboxData4Edit($block['name'])."
+ ".$myts->htmlSpecialChars($block['name'])."
</td>
<td class='$class' align='left' colspan='4'>
$description4show
Added: XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php 2013-08-02 13:14:45 UTC (rev 11868)
@@ -0,0 +1,25 @@
+<?php
+
+//3.02
+define("_AM_TOPPAGE","Top Page");
+define("_AM_ALLPAGES","All Pages");
+define("_AM_BADMIN","Page");
+define("_AM_TITLE","Title");
+define("_AM_SIDE","Side");
+define("_AM_WEIGHT","Weight");
+define("_AM_VISIBLE","Visible");
+define("_AM_VISIBLEIN","Visible In");
+define("_AM_ACTION","Action");
+
+define('_AM_ACTIVERIGHTS','Admin Rights');
+define('_AM_ACCESSRIGHTS','Access Rights');
+define('_AM_UNLIMIT','Unlimited');
+
+
+define('_AM_BCACHETIME', 'Cache time');
+define('_MD_AM_ADGS', 'Groups');
+
+define('_AM_SYSTEMLEVEL', 'System Level');
+define('_AM_ADMINBLOCK', 'Admin Block');
+
+define('_AM_ALLMODULEPAGES', 'Admin Block');
\ No newline at end of file
Property changes on: XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
|
|
From: <be...@us...> - 2013-08-06 19:24:01
|
Revision: 11886
http://sourceforge.net/p/xoops/svn/11886
Author: beckmi
Date: 2013-08-06 19:23:58 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
More bug fixing
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
XoopsModules/mxDirectory/trunk/mxdirectory/brokenlink.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/functions.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php
XoopsModules/mxDirectory/trunk/mxdirectory/index.php
XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php
XoopsModules/mxDirectory/trunk/mxdirectory/mylistings.php
XoopsModules/mxDirectory/trunk/mxdirectory/print.php
XoopsModules/mxDirectory/trunk/mxdirectory/ratelink.php
XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php
XoopsModules/mxDirectory/trunk/mxdirectory/sql/mysql.sql
XoopsModules/mxDirectory/trunk/mxdirectory/submit.php
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_savings.html
XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php
XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -35,7 +35,7 @@
//In html templates $mydirname = Smarty variable <{$smartydir}>
//$mydirname = $xoopsModule->getVar('dirname');
-
+include_once "admin_header.php";
xoops_cp_header();
include 'functions.php';
//adminmenu(-1);
@@ -134,7 +134,7 @@
}
$output .= "<tr class='".$class."'>
<td>";
- $output .= '<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'"><img src="'.XOOPS_URL.'/modules/' .$mydirname. '/images/editicon.gif" alt="'._MD_EDITCOUPON.'" /></a>
+ $output .= '<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'"><img src="'. $pathIcon16 .'/edit.png"'.' alt="'._MD_EDITCOUPON.'" /></a>
<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/singlelink.php?lid='.$coupon['lid'].'">'.$coupon['linkTitle'].'</a><br />
<br />
'._MD_PUBLISHEDON.' '.$coupon['publish'];
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -92,7 +92,7 @@
echo"<span style='font-size:xx-small;'><table class=\"outer\" cellpadding=\"0\" cellspacing=\"1\" width=\"100%\"><tr class=\"head\"><td width=\"12%\" >"._MI_XDIR_PREMIUM_ACTV."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_ON."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLLF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_CALI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_CALF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LOLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LOLF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LLSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LLCSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_UON."</td></tr></table></span>";
reset($actvlvls);
while (list($key, $val) = each($actvlvls)) {
- $actvopts = getpremopts($key);
+ $actvopts = getPremiumOptions($key);
echo"<span style='font-size:xx-small;'><table class=\"outer\" width=\"100%\"><tr class=\"even\"><td width=\"12%\" >$val</td>";
while (list ($okey, $oval) = each($actvopts)){
echo"<td width=\"8%\" ><div style=\"text-align: center;\">$oval</div></td>";
@@ -917,7 +917,7 @@
$totalmodrequests = $xoopsDB->getRowsNum($result);
echo "<table>";
echo "<tr><td colspan='2' align='left'><h4>"._MD_WEBLINKSCONF."</h4></td></tr>";
-// echo "<table><tr><td valign=top width=45%>";
+// echo "<table><tr><td valign=top width=45 >";
if ( $totalmodrequests > 0 ) {
@@ -979,9 +979,9 @@
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSCITY , "<span style='font-size:xx-small;'>".$origcity."</span>"));
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSSTATE , "<span style='font-size:xx-small;'>".$origstate."</span>"));
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSCOUNTRY , "<span style='font-size:xx-small;'>".$origcountry."</span>"));
- $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSMFHRS , "<span style='font-size:xx-small;'>".ampm($origmfhrs)."</span>"));
- $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSSATHRS , "<span style='font-size:xx-small;'>".ampm($origsathrs)."</span>"));
- $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSSUNHRS , "<span style='font-size:xx-small;'>".ampm($origsunhrs)."</span>"));
+ $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSMFHRS , "<span style='font-size:xx-small;'>".displayTime($origmfhrs)."</span>"));
+ $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSSATHRS , "<span style='font-size:xx-small;'>".displayTime($origsathrs)."</span>"));
+ $listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSSUNHRS , "<span style='font-size:xx-small;'>".displayTime($origsunhrs)."</span>"));
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSPHONE , "<span style='font-size:xx-small;'>".$origphone."</span>"));
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSFAX , "<span style='font-size:xx-small;'>".$origfax."</span>"));
$listmodreqorigform->addElement(new XoopsFormLabel(_MD_BUSMOBILE , "<span style='font-size:xx-small;'>".$origmobile."</span>"));
@@ -1009,9 +1009,9 @@
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSCITY , "<span style='font-size:xx-small;'>".$city."</span>"));
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSSTATE , "<span style='font-size:xx-small;'>".$state."</span>"));
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSCOUNTRY , "<span style='font-size:xx-small;'>".$country."</span>"));
- $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSMFHRS , "<span style='font-size:xx-small;'>".ampm($mfhrs)."</span>"));
- $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSSATHRS , "<span style='font-size:xx-small;'>".ampm($sathrs)."</span>"));
- $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSSUNHRS , "<span style='font-size:xx-small;'>".ampm($sunhrs)."</span>"));
+ $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSMFHRS , "<span style='font-size:xx-small;'>".displayTime($mfhrs)."</span>"));
+ $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSSATHRS , "<span style='font-size:xx-small;'>".displayTime($sathrs)."</span>"));
+ $listmodreqform->addElement(new XoopsFormLabel(_MD_BUSSUNHRS , "<span style='font-size:xx-small;'>".displayTime($sunhrs)."</span>"));
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSPHONE , "<span style='font-size:xx-small;'>".$phone."</span>"));
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSFAX , "<span style='font-size:xx-small;'>".$fax."</span>"));
$listmodreqform->addElement(new XoopsFormLabel(_MD_BUSMOBILE , "<span style='font-size:xx-small;'>".$mobile."</span>"));
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -35,10 +35,13 @@
* $options[1] = Horizontal Menu (1=yes, 0=no)
* Output : Returns the links to categories
******************************************************************************/
+$mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
+//include XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
+
function b_xdir_categories($options) {
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
- $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
- include XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
+// $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
+// include XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
global $xoopsDB, $xoopModuleConfig;
$mydirname = basename ( dirname( dirname( __FILE__ ) ) ) ;
@@ -72,8 +75,8 @@
function b_xdir_cat_edit($options) {
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
- $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
- include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
+// $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
+// include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
global $xoopsDB, $xoopModuleConfig;
$mytree = new MxdirectoryTree($xoopsDB->prefix("xdir_cat"),"cid","pid");
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -53,7 +53,7 @@
$mydirname = (basename ( dirname ( dirname( __FILE__ ) ) , "a" ) ) ;
include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/coupon.php";
$myts =& MyTextSanitizer::getInstance();
- include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/header.php";
+// include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/header.php";
$coupon_handler = new XdirectoryCouponHandler($xoopsDB);
$block = array();
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/brokenlink.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/brokenlink.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/brokenlink.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -61,7 +61,7 @@
$sql = sprintf("INSERT INTO %s (reportid, lid, sender, ip) VALUES (%u, %u, %u, '%s')", $xoopsDB->prefix("xdir_broken"), $newid, $lid, $sender, $ip);
$xoopsDB->query($sql) or exit();
$tags = array();
- $tags['BROKENREPORTS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=listBrokenLinks';
+ $tags['BROKENREPORTS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=listBrokenLinks';
$notification_handler =& xoops_gethandler('notification');
$notification_handler->triggerEvent('global', 0, 'link_broken', $tags);
redirect_header("index.php",2,_MD_THANKSFORINFO);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/functions.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/functions.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/functions.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -243,7 +243,7 @@
return $letterchoice;
}
//Display Time
-function ampm($value){
+function displayTime($value){
global $xoopsModuleConfig;
// $valckr = ($value = "0") ? _MD_UNKNOWN : $value ;
@@ -275,30 +275,31 @@
$clocktype = ($clocktype < 1 ) ? $clocktype = $timearray : $clocktype = $ampmarray ;
//display specific
- $value = ( ($value !== '') && ($closestrip !== '25:00') && ($closestrip !== '26:00') && ($openstrip !== '25:00') && ($openstrip !== '26:00') )? ($clocktype[$openstrip].' - '.$clocktype[$closestrip]) : $value ;
+ $value = ( ($value !== '') && ($closestrip !== '25:00') && ($closestrip !== '26:00') && ($openstrip !== '25:00') && ($openstrip !== '26:00') )? ((isset($clocktype[$openstrip])?$clocktype[$openstrip]:0).' - '.(isset($clocktype[$closestrip])?$clocktype[$closestrip]:0)) : $value ;
$value = ( ( $openstrip == '25:00') || ($closestrip == '25:00')) ? _MD_BUSCLOSED : $value ;
$value = ( ( $openstrip == '26:00') || ($closestrip == '26:00')) ? _MD_ALOPEN : $value ;
- $value = ( ($value == ' - ') || ( $openstrip == ' - ') || ($closestrip == ' - ') ) ? _MD_UNKNOWN : $value ;
+ $value = ( ($value == ' - ') || ( $openstrip == ' - ') || ($closestrip == ' - ') ) ? _MD_UNKNOWN : $value ;
$value = ( ($value == '-') || ($value == '') || ( $osckr == '-') || ($csckr == '-') ) ? _MD_UNKNOWN : $value ;
return $value;
}
//Level Options Arrayer
-function getpremopts($olvl) {
- global $xoopsModuleConfig, $mydirname;
- $mylvlopt = ($xoopsModuleConfig['premium_listing'.$olvl.'opts']);
+function getPremiumOptions($olvl)
+{
+ global $xoopsModuleConfig, $mydirname;
+ $myLevelOption = ($xoopsModuleConfig['premium_listing' . $olvl . 'opts']);
//$nl = intval(count($mylvlopt));
// $nlvls with 11
- for ($opi = 1; $opi < 12; $opi++) {
- $premopt = (in_array($opi, $mylvlopt)) ? '1' : '0';
- $lvloptions[$opi] = $premopt;
- if ($lvloptions['1'] == '0'){
- array_fill(2, 9, '0');
- $opi = 12;
- }
-
- }
- return $lvloptions;
+ for ($opi = 1; $opi < 12; $opi++) {
+ $premiumOption = (in_array($opi, $myLevelOption)) ? '1' : '0';
+ $levelOptions[$opi] = $premiumOption;
+ if ($levelOptions['1'] == '0') {
+ array_fill(2, 9, '0');
+ $opi = 12;
+ }
+
+ }
+ return $levelOptions;
}
//Level Select Builder
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -32,7 +32,7 @@
// list($block['pendingnum']) = $xoopsDB->fetchRow($result);
// $block['lang_linkname'] = _PI_WAITING_EVENTS ;
list($cnt) = $xoopsDB->fetchRow($result);
- $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/index.php?op=listNewLinks",
+ $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/main.php?op=listNewLinks",
"pendingnum" => $cnt,
"lang_linkname" => _PI_WAITING_SUBMITTED );
}
@@ -42,14 +42,14 @@
// list($block['pendingnum']) = $xoopsDB->fetchRow($result);
// $block['lang_linkname'] = _PI_WAITING_EVENTS ;
list($cnt) = $xoopsDB->fetchRow($result);
- $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/index.php?op=listModReq",
+ $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/main.php?op=listModReq",
"pendingnum" => $cnt,
"lang_linkname" => _PI_WAITING_MODREQS );
}
$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix('xdir_broken'));
if ( $result ) {
list($cnt) = $xoopsDB->fetchRow($result);
- $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/index.php?op=listBrokenLinks",
+ $block[] = array("adminlink" => XOOPS_URL."/modules/".$mydirname."/admin/main.php?op=listBrokenLinks",
"pendingnum" => $cnt,
"lang_linkname" => _PI_WAITING_BROKENS );
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/index.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/index.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/index.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -36,7 +36,8 @@
include XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
//include 'include/functions.php';
-global $xoopModuleConfig;
+global $xoopModuleConfig, $xoopsModule;
+$pathIcon16 = $xoopsModule->getInfo('icons16');
/* // EVU CODE FIX - To make it work using PHP5
function add_header($tpl_source, &$xoopsTpl)
@@ -147,9 +148,9 @@
//Nice arrays for smarty selects
//include_once "include/functions.php";
-$mfhrs = ampm($mfhrs);
-$sathrs = ampm($sathrs);
-$sunhrs = ampm($sunhrs);
+$mfhrs = displayTime($mfhrs);
+$sathrs = displayTime($sathrs);
+$sunhrs = displayTime($sunhrs);
$bizhrs = array('1' => _MD_BUSMFHRSSHORT.$mfhrs,'2' => _MD_BUSSATHRSSHORT.$sathrs,'3' => _MD_BUSSUNHRSSHORT.$sunhrs,);
$bnums = array($phone,$fax,$mobile,$home,$tollfree);
@@ -157,10 +158,10 @@
$is_owner = (!empty($xoopsUser) && ($xoopsUser->getvar('uid') == $submitter)) ? '1' : null ;
-$lvlopts = getpremopts($premium);
+$lvlopts = getPremiumOptions($premium);
if ($isadmin) {
- $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=modLink&lid='.$lid.'"><img src="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/images/editicon.gif" border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
+ $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=modLink&lid='.$lid.'"><img src="'. $pathIcon16 .'/edit.png"'.' border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
} else {
$adminlink = '';
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -159,7 +159,7 @@
// and finally set the notification
//
$tags = array();
- $tags['MODIFYREPORTS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=listModReq';
+ $tags['MODIFYREPORTS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=listModReq';
$notification_handler =& xoops_gethandler('notification');
$notification_handler->triggerEvent('global', 0, 'link_modify', $tags);
redirect_header("index.php",2,_MD_THANKSFORINFO);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/mylistings.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/mylistings.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/mylistings.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -31,7 +31,8 @@
include_once XOOPS_ROOT_PATH."/class/pagenav.php";
include_once "class/coupon.php";
-global $xoopsDB, $xoopsUser, $xoopsModuleConfig;
+global $xoopsDB, $xoopsUser, $xoopsModuleConfig, $xoopsModule;
+$pathIcon16 = $xoopsModule->getInfo('icons16');
$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
$coupon_handler = new XdirectoryCouponHandler($xoopsDB);
@@ -62,7 +63,7 @@
if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
$isadmin = true;
- $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=modLink&lid='.$lid.'"><img src="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/images/editicon.gif" border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
+ $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=modLink&lid='.$lid.'"><img src="'. $pathIcon16 .'/edit.png"'.' border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
} else {
$adminlink = '';
$isadmin = false;
@@ -102,14 +103,14 @@
$is_owner = ($userid == $submitter) ? '1' : null ;
//Adding record related template items
-$mfhrs = ampm($mfhrs);
-$sathrs = ampm($sathrs);
-$sunhrs = ampm($sunhrs);
+$mfhrs = displayTime($mfhrs);
+$sathrs = displayTime($sathrs);
+$sunhrs = displayTime($sunhrs);
$bizhrs = array(_MD_BUSMFHRSSHORT.$mfhrs,_MD_BUSSATHRSSHORT.$sathrs,_MD_BUSSUNHRSSHORT.$sunhrs);
$bnums = array($phone,$fax,$mobile,$home,$tollfree);
$biznums = displaybiznums($bnums);
-$lvlopts = getpremopts($premium);
+$lvlopts = getPremiumOptions($premium);
if ($status == 0) {
$new = '';
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/print.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/print.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/print.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -54,9 +54,9 @@
$xoopsTpl->assign('lang_noscreenshot', _MD_NOSHOTS);
}
- $mfhrs = ampm($mfhrs);
- $sathrs = ampm($sathrs);
- $sunhrs = ampm($sunhrs);
+ $mfhrs = displayTime($mfhrs);
+ $sathrs = displayTime($sathrs);
+ $sunhrs = displayTime($sunhrs);
$bizhrs = array( _MD_BUSMFHRSSHORT.$mfhrs, _MD_BUSSATHRSSHORT.$sathrs, _MD_BUSSUNHRSSHORT.$sunhrs);
$bnums = array(0=>$phone, 1=>$fax, 2=>$mobile, 3=>$home, 4=>$tollfree);
$biznums = displaybiznums($bnums);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/ratelink.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/ratelink.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/ratelink.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -104,8 +104,8 @@
$xoopsOption['template_main'] = 'xdir_ratelink.html';
include XOOPS_ROOT_PATH."/header.php";
- $lid = intval($_GET['lid']);
- $cid = intval($_GET['cid']);
+ $lid = isset($_GET['lid']) ? intval($_GET['lid']) : 0;
+ $cid = isset($_GET['cid']) ? intval($_GET['cid']) : 0;
$result=$xoopsDB->query("select title from ".$xoopsDB->prefix("xdir_links")." where lid=$lid");
list($title) = $xoopsDB->fetchRow($result);
$xoopsTpl->assign('link', array('id' => $lid, 'cid' => $cid, 'title' => $myts->htmlSpecialChars($title)));
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -34,6 +34,9 @@
include_once XOOPS_ROOT_PATH."/modules/$mydirname/class/coupon.php";
//include_once "include/functions.php";
+global $xoopsModule;
+$pathIcon16 = $xoopsModule->getInfo('icons16');
+
$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
//include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
$mydirname = basename ( dirname( __FILE__ ) ) ;
@@ -57,7 +60,7 @@
//Pretty Page Titles
$title="";
-$lvlopts = getpremopts($premium);
+$lvlopts = getPremiumOptions($premium);
if($cid>0)
{
$show = 0;
@@ -83,7 +86,7 @@
$admcont = '';
if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
$xoopsTpl->assign('admin', 1);
- $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=modLink&lid='.$lid.'"><img src="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/images/editicon.gif" border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
+ $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=modLink&lid='.$lid.'"><img src="'. $pathIcon16 .'/edit.png"'.' border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
if (trim($admname) != '') {
$admcont = trim($admname)." - ";
$admcont .= trim($admnumb)== '' ? _MD_UNKNOWN : trim($admnumb);
@@ -95,16 +98,16 @@
$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
if ($xoopsModuleConfig['useshots'] == 1) {
- $xoopsTpl->assign('shotwidth', $xoopsModuleConfig['logo_maximagewidth']);
- $xoopsTpl->assign('tablewidth', $xoopsModuleConfig['logo_maximagewidth'] + 10);
+ $xoopsTpl->assign('shotwidth', $xoopsModuleConfig['logo_maximgwidth']);
+ $xoopsTpl->assign('tablewidth', $xoopsModuleConfig['logo_maximgwidth'] + 10);
$xoopsTpl->assign('show_screenshot', true);
$xoopsTpl->assign('lang_noscreenshot', _MD_NOSHOTS);
}
//include_once "include/functions.php";
-$mfhrs = ampm($mfhrs);
-$sathrs = ampm($sathrs);
-$sunhrs = ampm($sunhrs);
+$mfhrs = displayTime($mfhrs);
+$sathrs = displayTime($sathrs);
+$sunhrs = displayTime($sunhrs);
$bizhrs = array('1' => _MD_BUSMFHRSSHORT.$mfhrs,'2' => _MD_BUSSATHRSSHORT.$sathrs,'3' => _MD_BUSSUNHRSSHORT.$sunhrs,);
$bnums = array($phone,$fax,$mobile,$home,$tollfree);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/sql/mysql.sql
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/sql/mysql.sql 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/sql/mysql.sql 2013-08-06 19:23:58 UTC (rev 11886)
@@ -79,7 +79,7 @@
# --------------------------------------------------------
#
-# Table structure for table `xdir_mod`
+# Table structure for table `xdir_mod`, holding link modifications to be reviewed
#
CREATE TABLE `xdir_mod` (
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/submit.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/submit.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/submit.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -189,7 +189,7 @@
$notification_handler->triggerEvent('category', $cid, 'new_link', $tags);
redirect_header("index.php",2,_MD_RECEIVED."<br />"._MD_ISAPPROVED."");
}else{
- $tags['WAITINGLINKS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=listNewLinks';
+ $tags['WAITINGLINKS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=listNewLinks';
$notification_handler->triggerEvent('global', 0, 'link_submit', $tags);
$notification_handler->triggerEvent('category', $cid, 'link_submit', $tags);
if ($notify) {
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_savings.html
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_savings.html 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_savings.html 2013-08-06 19:23:58 UTC (rev 11886)
@@ -10,7 +10,7 @@
<td>
<div><{if $coupon.logourl}> <img src="<{$xoops_url}>/modules/<{$smartydir}>/images/shots/<{$coupon.logourl}>" alt="<{$coupon.linkTitle}> <{$smarty.const._MD_LOGO}>" border="0" />
<{/if}>
- <div> <{if $admin}> <a href="<{$xoops_url}>/modules/<{$smartydir}>/addcoupon.php?couponid=<{$coupon.couponid}>"><img src="<{$xoops_url}>/modules/<{$smartydir}>/images/editicon.gif" alt="<{$smarty.const._MD_EDITCOUPON}>" /></a>
+ <div> <{if $admin}> <a href="<{$xoops_url}>/modules/<{$smartydir}>/addcoupon.php?couponid=<{$coupon.couponid}>"><img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._MD_EDITCOUPON}>" /></a>
<{/if}> <a href="<{$xoops_url}>/modules/<{$smartydir}>/singlelink.php?lid=<{$coupon.lid}>" class="c_title"><{$coupon.linkTitle}></a><br />
<span class="c_body"><{$coupon.address}><br />
<{if $coupon.address2}> <{$coupon.address2}><br />
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -37,7 +37,8 @@
include XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
include_once XOOPS_ROOT_PATH."/class/pagenav.php";
-global $xoopsDB, $xoopModuleConfig;
+global $xoopsDB, $xoopModuleConfig, $xoopsModule;
+$pathIcon16 = $xoopsModule->getInfo('icons16');
include_once XOOPS_ROOT_PATH."/modules/$mydirname/class/coupon.php";
$mytree = new MxdirectoryTree($xoopsDB->prefix("xdir_cat"),"cid","pid");
@@ -105,20 +106,20 @@
while(list($lid, $cid, $ltitle, $address, $address2, $city, $state, $zip, $country, $mfhrs, $sathrs, $sunhrs, $phone, $fax, $mobile, $home, $tollfree, $email, $url, $logourl, $submitter, $status, $time, $hits, $rating, $votes, $comments, $premium, $description) = $xoopsDB->fetchRow($result)) {
- $lvlopts = getpremopts($premium);
+ $lvlopts = getPremiumOptions($premium);
$pcounter = intval($lvlopts['9']);
$pcount = ( $pcounter != 0 ) ? ($pcount + 1) : $pcount;
if ($isadmin) {
- $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=modLink&lid='.$lid.'"><img src="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/images/editicon.gif" border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
+ $adminlink = '<a href="'.XOOPS_URL.'/modules/' . $xoopsModule->getVar('dirname') . '/admin/main.php?op=modLink&lid='.$lid.'"><img src="'. $pathIcon16 .'/edit.png"'.' border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
} else {
$adminlink = '';
}
// include_once "include/functions.php";
- $mfhrs = ampm($mfhrs);
- $sathrs = ampm($sathrs);
- $sunhrs = ampm($sunhrs);
+ $mfhrs = displayTime($mfhrs);
+ $sathrs = displayTime($sathrs);
+ $sunhrs = displayTime($sunhrs);
$bizhrs = array('1' => _MD_BUSMFHRSSHORT.$mfhrs,'2' => _MD_BUSSATHRSSHORT.$sathrs,'3' => _MD_BUSSUNHRSSHORT.$sunhrs,);
$bnums = array($phone,$fax,$mobile,$home,$tollfree);
$biznums = displaybiznums($bnums);
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php 2013-08-06 18:58:57 UTC (rev 11885)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php 2013-08-06 19:23:58 UTC (rev 11886)
@@ -38,7 +38,8 @@
include_once XOOPS_ROOT_PATH."/class/pagenav.php";
include_once XOOPS_ROOT_PATH."/modules/$mydirname/class/coupon.php";
-global $xoopsDB, $xoopModuleCo...
[truncated message content] |
|
From: <be...@us...> - 2013-08-11 20:39:37
|
Revision: 11895
http://sourceforge.net/p/xoops/svn/11895
Author: beckmi
Date: 2013-08-11 20:39:34 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
fixing minor issues in blocks
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-11 20:39:34 UTC (rev 11895)
@@ -75,8 +75,8 @@
function b_xdir_cat_edit($options) {
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
-// $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
-// include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
+ $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
+ include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
global $xoopsDB, $xoopModuleConfig;
$mytree = new MxdirectoryTree($xoopsDB->prefix("xdir_cat"),"cid","pid");
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-11 20:39:34 UTC (rev 11895)
@@ -41,7 +41,8 @@
* $options[5] = Category to use
* Output : Returns the desired most recent or most popular links
******************************************************************************/
-function b_xdir_coup_show($options) {
+function b_xdir_coup_show($options)
+{
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
$mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
@@ -81,8 +82,8 @@
for ($i=0;$i<count($block);$i++) {
$block[$i]['mydirname'] = $mydirname;
}
- if( empty($block) ) {
- $block = ($options[4] == 0) ? "" : array('id'=>'','cid'=>'','title'=>'');
+ if( empty($block) ) {
+ $block = ($options[5] == 0) ? "" : array('ld' => '', 'cid' => '', 'image' => '','mydirname' => '' ,'linkTitle' => '');
}
return $block;
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt 2013-08-11 20:39:34 UTC (rev 11895)
@@ -2,6 +2,7 @@
3.02 Beta 1 2013-08-02
---------------------------------------
- Converted to XOOPS 2.5.6 Admin GUI (Mamba)
+- fix: missing variable is blocks
---------------------------------------
3.01 RC 1 2006-05-19
|
|
From: <be...@us...> - 2013-08-24 14:21:07
|
Revision: 11970
http://sourceforge.net/p/xoops/svn/11970
Author: beckmi
Date: 2013-08-24 14:20:57 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
added Google maps, renamed language definitions
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/addcoupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_header.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/functions.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/menu.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblockform.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/mygroupperm.php
XoopsModules/mxDirectory/trunk/mxdirectory/admin/upgrade.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_top.php
XoopsModules/mxDirectory/trunk/mxdirectory/brokenlink.php
XoopsModules/mxDirectory/trunk/mxdirectory/class/formtime.php
XoopsModules/mxDirectory/trunk/mxdirectory/contact.php
XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
XoopsModules/mxDirectory/trunk/mxdirectory/header.php
XoopsModules/mxDirectory/trunk/mxdirectory/images/xdir_slogo.png
XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/couponform.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/functions.php
XoopsModules/mxDirectory/trunk/mxdirectory/include/subscription.php
XoopsModules/mxDirectory/trunk/mxdirectory/index.php
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/admin.php
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/blocks.php
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/main.php
XoopsModules/mxDirectory/trunk/mxdirectory/language/english/modinfo.php
XoopsModules/mxDirectory/trunk/mxdirectory/matrix.php
XoopsModules/mxDirectory/trunk/mxdirectory/modlink.php
XoopsModules/mxDirectory/trunk/mxdirectory/mxdir_rss.php
XoopsModules/mxDirectory/trunk/mxdirectory/mxdir_rss_mkurl.php
XoopsModules/mxDirectory/trunk/mxdirectory/myheader.php
XoopsModules/mxDirectory/trunk/mxdirectory/mylistings.php
XoopsModules/mxDirectory/trunk/mxdirectory/print.php
XoopsModules/mxDirectory/trunk/mxdirectory/ratelink.php
XoopsModules/mxDirectory/trunk/mxdirectory/singlelink.php
XoopsModules/mxDirectory/trunk/mxdirectory/sql/DB_ADDITIONS_RC1.txt
XoopsModules/mxDirectory/trunk/mxdirectory/submit.php
XoopsModules/mxDirectory/trunk/mxdirectory/templates/blocks/xdir_block_exp.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/blocks/xdir_block_pub.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_brokenlink.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_index.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_link.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_listingfull.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_mylistings.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_premiumlink.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_print.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_print_savings.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_ratelink.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_savings.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_singlelink.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_topten.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_viewalpha.html
XoopsModules/mxDirectory/trunk/mxdirectory/templates/xdir_viewcat.html
XoopsModules/mxDirectory/trunk/mxdirectory/topten.php
XoopsModules/mxDirectory/trunk/mxdirectory/viewalpha.php
XoopsModules/mxDirectory/trunk/mxdirectory/viewcat.php
XoopsModules/mxDirectory/trunk/mxdirectory/xoops_version.php
Added Paths:
-----------
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/Australia.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/USA.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/index.html
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/Canada.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/ITALY.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/JAPAN.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/UK.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/USA.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/index.html
Removed Paths:
-------------
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Canada.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/ITALY.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/JAPAN.txt
XoopsModules/mxDirectory/trunk/mxdirectory/Maps/UK.txt
XoopsModules/mxDirectory/trunk/mxdirectory/language/_RC1_Changes/
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Canada.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Canada.txt 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Canada.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -1,7 +0,0 @@
-<form name="mapForm2" action="http://ca.maps.yahoo.com/maps/home/submit_a/*-http://ca.maps.yahoo.com/maps" target="_new" method="get">
-<input type="hidden" name="addr" value="<{$link.address}>" />
-<input type="hidden" name="csz" value="<{$link.city}>, <{$link.state}> <{$link.zip}>" />
-<input type="hidden" name="country" value="ca" />
-<input type="hidden" name="srchtype" value="a" />
-<input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MAPBTN}>" />
-</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/Australia.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/Australia.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/Australia.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,6 @@
+<form action="http://maps.google.com.au/maps?" method="get" name="mapForm2" target="_new" id="mapForm2">
+ <input type="hidden" name="f" value="q" />
+ <input type="hidden" name="hl" value="au" />
+ <input type="hidden" name="q" value="<{$link.address}>, <{$link.zip}> <{$link.city}>, <{$link.country}> " />
+ <input type=submit name="getmap" value="Map">
+ </form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/USA.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/USA.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/USA.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,6 @@
+<form action="http://maps.google.com/maps?" method="get" name="mapForm2" target="_new" id="mapForm2">
+<input type="hidden" name="f" value="q" />
+<input type="hidden" name="hl" value="us" />
+<input type="hidden" name="q" value="<{$link.address}>, <{$link.zip}> <{$link.city}>, <{$link.country}> " />
+<input type=submit name="getmap" value="Map">
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/index.html
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/index.html (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Google/index.html 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/ITALY.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/ITALY.txt 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/ITALY.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -1,8 +0,0 @@
-<form name=mapForm action="http://www.maporama.com/share/map.asp?" target="_new" method="get">
- <input type="hidden" name="COUNTRYCODE" value="IT" />
- <input type="hidden" name="_XgoGCAddress" value="<{$link.address}>" />
- <input type="hidden" name="Zip" value="" />
- <input type="hidden" name="State" value="" />
- <input type="hidden" name="_XgoGCTownName" value="<{$link.city}>" />
- <input type="submit" name="getmap" class="c_mapbtn" value="<{$smarty.const._MD_MAPBTN}>" />
-</form>
\ No newline at end of file
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/JAPAN.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/JAPAN.txt 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/JAPAN.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -1,4 +0,0 @@
-<form name="mapForm2" action="http://search.map.yahoo.co.jp/search?" target="_new" method="get">
- <input type="hidden" name="p" value="<{$link.zip}>" />
- <input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MAPBTN}>" />
-</form>
\ No newline at end of file
Deleted: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/UK.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/UK.txt 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/UK.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -1,4 +0,0 @@
-<form name=mapForm action="http://www.multimap.com/map/browse.cgi?" target="_new" method="get">
- <input type="hidden" name="pc" value="<{$link.zip}>" />
- <input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MAPBTN}>" />
-</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/Canada.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/Canada.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/Canada.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,7 @@
+<form name="mapForm2" action="http://ca.maps.yahoo.com/maps/home/submit_a/*-http://ca.maps.yahoo.com/maps" target="_new" method="get">
+<input type="hidden" name="addr" value="<{$link.address}>" />
+<input type="hidden" name="csz" value="<{$link.city}>, <{$link.state}> <{$link.zip}>" />
+<input type="hidden" name="country" value="ca" />
+<input type="hidden" name="srchtype" value="a" />
+<input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MXDIR_MAPBTN}>" />
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/ITALY.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/ITALY.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/ITALY.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,8 @@
+<form name=mapForm action="http://www.maporama.com/share/map.asp?" target="_new" method="get">
+ <input type="hidden" name="COUNTRYCODE" value="IT" />
+ <input type="hidden" name="_XgoGCAddress" value="<{$link.address}>" />
+ <input type="hidden" name="Zip" value="" />
+ <input type="hidden" name="State" value="" />
+ <input type="hidden" name="_XgoGCTownName" value="<{$link.city}>" />
+ <input type="submit" name="getmap" class="c_mapbtn" value="<{$smarty.const._MD_MXDIR_MAPBTN}>" />
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/JAPAN.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/JAPAN.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/JAPAN.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,4 @@
+<form name="mapForm2" action="http://search.map.yahoo.co.jp/search?" target="_new" method="get">
+ <input type="hidden" name="p" value="<{$link.zip}>" />
+ <input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MXDIR_MAPBTN}>" />
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/UK.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/UK.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/UK.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,4 @@
+<form name=mapForm action="http://www.multimap.com/map/browse.cgi?" target="_new" method="get">
+ <input type="hidden" name="pc" value="<{$link.zip}>" />
+ <input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MXDIR_MAPBTN}>" />
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/USA.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/USA.txt (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/USA.txt 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1,7 @@
+<form name="mapForm2" action="http://us.rd.yahoo.com/maps/home/submit_a/*-http://maps.yahoo.com/maps" target="_new" method="get">
+<input type="hidden" name="addr" value="<{$link.address}>" />
+<input type="hidden" name="csz" value="<{$link.city}>, <{$link.state}> <{$link.zip}>" />
+<input type="hidden" name="country" value="us" />
+<input type="hidden" name="srchtype" value="a" />
+<input name="getmap" type="submit" class="c_mapbtn" value="<{$smarty.const._MD_MXDIR_MAPBTN}>" />
+</form>
\ No newline at end of file
Added: XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/index.html
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/index.html (rev 0)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/Maps/Yahoo/index.html 2013-08-24 14:20:57 UTC (rev 11970)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/addcoupon.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/addcoupon.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/addcoupon.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -99,11 +99,11 @@
// $coupon_handler =& xoops_getmodulehandler('coupon', $mydirname);
if (isset($_POST['couponid'])) {
$thiscoupon =& $coupon_handler->get($_POST['couponid']);
- $message = _MD_COUPONEDITED;
+ $message = _MD_MXDIR_COUPONEDITED;
}
else {
$thiscoupon =& $coupon_handler->create();
- $message = _MD_COUPONADDED;
+ $message = _MD_MXDIR_COUPONADDED;
}
$thiscoupon->setVar('description', $_POST['descr']);
$thiscoupon->setVar('image', $_POST['image']);
@@ -134,13 +134,13 @@
$coupon =& $coupon_handler->get($_POST['couponid']);
$lid = $coupon->getVar('lid');
if ($coupon_handler->delete($coupon)) {
- redirect_header("singlelink.php?lid=".$lid,3, _MD_COUPONDELETED);
+ redirect_header("singlelink.php?lid=".$lid,3, _MD_MXDIR_COUPONDELETED);
exit();
}
}
else {
include XOOPS_ROOT_PATH.'/header.php';
- xoops_confirm(array('delete' => 'yes', 'couponid' => intval($_POST['couponid']), 'ok' => 1), 'addcoupon.php', _MD_COUPONRUSURE);
+ xoops_confirm(array('delete' => 'yes', 'couponid' => intval($_POST['couponid']), 'ok' => 1), 'addcoupon.php', _MD_MXDIR_COUPONRUSURE);
include_once XOOPS_ROOT_PATH.'/footer.php';
exit();
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -41,7 +41,7 @@
// include "../../mainfile.php"; GIJ
include XOOPS_ROOT_PATH."/include/cp_functions.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
+include_once XOOPS_ROOT_PATH."/kernel/module.php";
include_once "../include/gtickets.php" ;// GIJ
$admintest = 0;
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_header.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_header.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/admin_header.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -25,7 +25,8 @@
global $xoopsModule;
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$thisModuleDir = basename(dirname(dirname(__FILE__)));
//if functions.php file exist
//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/coupon.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -40,11 +40,11 @@
include 'functions.php';
//adminmenu(-1);
-if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
- include "../language/".$xoopsConfig['language']."/main.php";
-} else {
- include "../language/english/main.php";
-}
+//if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+// include "../language/".$xoopsConfig['language']."/main.php";
+//} else {
+// include "../language/english/main.php";
+//}
$mydirname = $xoopsModule->getVar('dirname');
// redirect_header(XOOPS_URL,10,"Made it to here - directory name (".$mydirname.")");
@@ -66,8 +66,8 @@
case "menu":
- $cadmform = new XoopsThemeForm(_MI_XDIR_ADMENU6, 'cadmform', '../savings.php', 'GET');
- $select_link = (new XoopsFormSelect(_MD_LINKID , 'lid', $lid, 1, false));
+ $cadmform = new XoopsThemeForm(_MI_MXDIR_ADMENU6, 'cadmform', '../savings.php', 'GET');
+ $select_link = (new XoopsFormSelect(_MD_MXDIR_LINKID , 'lid', $lid, 1, false));
while (list($lid, $title) = $xoopsDB->fetchRow($result3) ) {
$select_link->addOption($lid, $title);
@@ -77,12 +77,12 @@
$wraptray = new XoopsFormElementTray('','');
$regtray = new XoopsFormElementTray('','');
- $sbtn=new XoopsFormButton('', '', _MD_COUPMODADD, 'submit');
+ $sbtn=new XoopsFormButton('', '', _MD_MXDIR_COUPMODADD, 'submit');
$sbtn->setExtra('onclick="document.cadmform.action =\'../addcoupon.php\'"');
$regtray->addElement($sbtn);
$deltray = new XoopsFormElementTray('','');
- $dbtn=new XoopsFormButton('', '', _MD_COUPMOD, 'submit');
+ $dbtn=new XoopsFormButton('', '', _MD_MXDIR_COUPMOD, 'submit');
$dbtn->setExtra('onclick="document.cadmform.action =\'../savings.php\'"');
$deltray->addElement($dbtn);
@@ -95,10 +95,10 @@
- $cmform = new XoopsThemeForm(_MI_XDIR_ADMENU6, 'cmform', $_SERVER['PHP_SELF'], 'GET');
- $cmform->addElement(new XoopsFormLabel(_MI_XDIR_ADMENU11, " <a href=coupon.php?op=noexp> No Expiration Coupons</a>"));
- $cmform->addElement(new XoopsFormLabel(_MI_XDIR_ADMENU8, "<a href=coupon.php?op=future> Future Coupons</a>"));
- $cmform->addElement(new XoopsFormLabel(_MI_XDIR_ADMENU7, " <a href=coupon.php?op=expired> Expired Coupons</a>"));
+ $cmform = new XoopsThemeForm(_MI_MXDIR_ADMENU6, 'cmform', $_SERVER['PHP_SELF'], 'GET');
+ $cmform->addElement(new XoopsFormLabel(_MI_MXDIR_ADMENU11, " <a href=coupon.php?op=noexp> No Expiration Coupons</a>"));
+ $cmform->addElement(new XoopsFormLabel(_MI_MXDIR_ADMENU8, "<a href=coupon.php?op=future> Future Coupons</a>"));
+ $cmform->addElement(new XoopsFormLabel(_MI_MXDIR_ADMENU7, " <a href=coupon.php?op=expired> Expired Coupons</a>"));
$cmform->display();
break;
@@ -134,27 +134,27 @@
}
$output .= "<tr class='".$class."'>
<td>";
- $output .= '<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'"><img src="'. $pathIcon16 .'/edit.png"'.' alt="'._MD_EDITCOUPON.'" /></a>
+ $output .= '<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'"><img src="'. $pathIcon16 .'/edit.png"'.' alt="'._MD_MXDIR_EDITCOUPON.'" /></a>
<a href="'.XOOPS_URL.'/modules/' .$mydirname. '/singlelink.php?lid='.$coupon['lid'].'">'.$coupon['linkTitle'].'</a><br />
<br />
- '._MD_PUBLISHEDON.' '.$coupon['publish'];
+ '._MD_MXDIR_PUBLISHEDON.' '.$coupon['publish'];
if ($coupon['expire'] > 0) {
- $output .= "<br />"._MD_EXPIRESON.$coupon['expire'];
+ $output .= "<br />"._MD_MXDIR_EXPIRESON.$coupon['expire'];
}
- $output .= "<br />"._MD_COUPONHITS." : ".$coupon['counter'];
+ $output .= "<br />"._MD_MXDIR_COUPONHITS." : ".$coupon['counter'];
$output .= '</div>
</td>
<td valign="top">'.$coupon['heading'].'<br />'.$coupon['description'].'</td>
</tr>
<tr>
<td colspan="2" class="foot">
- <a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'">'._MD_EDITCOUPON.'</a>
+ <a href="'.XOOPS_URL.'/modules/' .$mydirname. '/addcoupon.php?couponid='.$coupon['couponid'].'">'._MD_MXDIR_EDITCOUPON.'</a>
</tr>';
}
}
$output .= "</table>";
if (count($coupons) < 1) {
- $output = "<br /><br />"._MD_NOSAVINGS;
+ $output = "<br /><br />"._MD_MXDIR_NOSAVINGS;
}
echo "<div><table style=\"width: 100%; text-align: center; vertical-align: middle;\"><tr><td style=\"padding: 10;\">".$output."</td></tr></table></div>";
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/functions.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/functions.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/functions.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -51,8 +51,8 @@
$return .= "<div id='buttontop'>";
$return .= "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
- $return .= "<td style='width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;'><a class='nobutton' href='" . XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid') . "'>" . _MI_XDIR_PREFERENCES . "</a> | <a href='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/index.php'>" . _MI_XDIR_GOMOD . "</a> | <a href='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/admin/about.php'>" . _MI_XDIR_ABOUT . "</a></td>";
- $return .= "<td style='width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;'><b>" . $xoopsModule->name() . " " . _MI_XDIR_MODADMIN . "</b> " . $breadcrumb . "</td>";
+ $return .= "<td style='width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;'><a class='nobutton' href='" . XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid') . "'>" . _MI_MXDIR_PREFERENCES . "</a> | <a href='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/index.php'>" . _MI_MXDIR_GOMOD . "</a> | <a href='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/admin/about.php'>" . _MI_MXDIR_ABOUT . "</a></td>";
+ $return .= "<td style='width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;'><b>" . $xoopsModule->name() . " " . _MI_MXDIR_MODADMIN . "</b> " . $breadcrumb . "</td>";
$return .= "</tr></table>";
$return .= "</div>";
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php 2013-08-24 08:53:30 UTC (rev 11969)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/main.php 2013-08-24 14:20:57 UTC (rev 11970)
@@ -58,7 +58,7 @@
{
global $xoopsDB, $xoopsModule, $xoopsModuleConfig, $mydirname;
- $xdirform = new XoopsThemeForm(_MD_WEBLINKSCONF, 'xdirform', $_SERVER['PHP_SELF'], 'POST');
+ $xdirform = new XoopsThemeForm(_MD_MXDIR_WEBLINKSCONF, 'xdirform', $_SERVER['PHP_SELF'], 'POST');
// Temporarily 'homeless' links
$result = $xoopsDB->query("select count(*) from ".$xoopsDB->prefix("xdir_broken")."");
list($totalbrokenlinks) = $xoopsDB->fetchRow($result);
@@ -76,20 +76,20 @@
$totalnewlinks = "<span style='color: #ff0000; font-weight: bold'>$totalnewlinks</span>";
}
- $xdirform->addElement(new XoopsFormLabel( _MD_ADDMODDELETE, "<a href=main.php?op=linksConfigMenu>"._MD_ADDMODDELETE."</a>"));
- $xdirform->addElement(new XoopsFormLabel(_MD_LINKSWAITING, "<a href=main.php?op=listNewLinks> ($totalnewlinks)</a>"));
- $xdirform->addElement(new XoopsFormLabel(_MD_BROKENREPORTS, " <a href=main.php?op=listBrokenLinks> ($totalbrokenlinks)</a>"));
- $xdirform->addElement(new XoopsFormLabel(_MD_MODREQUESTS, " <a href=main.php?op=listModReq> ($totalmodrequests)</a>"));
+ $xdirform->addElement(new XoopsFormLabel( _MD_MXDIR_ADDMODDELETE, "<a href=main.php?op=linksConfigMenu>"._MD_MXDIR_ADDMODDELETE."</a>"));
+ $xdirform->addElement(new XoopsFormLabel(_MD_MXDIR_LINKSWAITING, "<a href=main.php?op=listNewLinks> ($totalnewlinks)</a>"));
+ $xdirform->addElement(new XoopsFormLabel(_MD_MXDIR_BROKENREPORTS, " <a href=main.php?op=listBrokenLinks> ($totalbrokenlinks)</a>"));
+ $xdirform->addElement(new XoopsFormLabel(_MD_MXDIR_MODREQUESTS, " <a href=main.php?op=listModReq> ($totalmodrequests)</a>"));
$result=$xoopsDB->query("select count(*) from ".$xoopsDB->prefix("xdir_links")." where status>0");
list($numrows) = $xoopsDB->fetchRow($result);
$xdirform->display();
echo"<div style=\"text-align: center;\">";
- printf(_MD_THEREARE,$numrows); echo "</div><br />";
+ printf(_MD_MXDIR_THEREARE,$numrows); echo "</div><br />";
//Level Option Table
$actvlvls = getlvlselects();
// $als = count ($actvlvls);
if ($actvlvls != false) {
- echo"<span style='font-size:xx-small;'><table class=\"outer\" cellpadding=\"0\" cellspacing=\"1\" width=\"100%\"><tr class=\"head\"><td width=\"12%\" >"._MI_XDIR_PREMIUM_ACTV."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_ON."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_SLLF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_CALI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_CALF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LOLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LOLF."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LLSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_LLCSLI."</td><td width=\"8%\">"._MI_XDIR_PREMIUM_UON."</td></tr></table></span>";
+ echo"<span style='font-size:xx-small;'><table class=\"outer\" cellpadding=\"0\" cellspacing=\"1\" width=\"100%\"><tr class=\"head\"><td width=\"12%\" >"._MI_MXDIR_PREMIUM_ACTV."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_ON."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_SLLI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_SLSLI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_SLLF."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_CALI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_CALF."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_LOLI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_LOLF."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_LLSLI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_LLCSLI."</td><td width=\"8%\">"._MI_MXDIR_PREMIUM_UON."</td></tr></table></span>";
reset($actvlvls);
while (list($key, $val) = each($actvlvls)) {
$actvopts = getPremiumOptions($key);
@@ -112,8 +112,8 @@
$result = $xoopsDB->query("select lid, cid, title, address, address2, city, state, zip, country, mfhrs, sathrs, sunhrs, phone, fax, mobile, home, tollfree, email, url, admcontname, admcontnumb, logourl, submitter, premium from ".$xoopsDB->prefix("xdir_links")." where status=0 order by date DESC");
$numrows = $xoopsDB->getRowsNum($result);
- echo "<h4>"._MD_WEBLINKSCONF."</h4>";
- echo "<h4>"._MD_LINKSWAITING." ($numrows)</h4><br />";
+ echo "<h4>"._MD_MXDIR_WEBLINKSCONF."</h4>";
+ echo "<h4>"._MD_MXDIR_LINKSWAITING." ($numrows)</h4><br />";
if ( $numrows > 0 ) {
while(list($lid, $cid, $title, $address, $address2, $city, $state, $zip, $country, $mfhrs, $sathrs, $sunhrs, $phone, $fax, $mobile, $home, $tollfree, $email, $url, $admcontname, $admcontnumb, $logourl, $submitterid, $premium) = $xoopsDB->fetchRow($result)) {
$result2 = $xoopsDB->query("select description from ".$xoopsDB->prefix("xdir_text")." where lid=$lid");
@@ -142,44 +142,44 @@
$submitter = XoopsUser::getUnameFromId($submitterid);
$premium = $myts->htmlSpecialChars($premium);
- $addwaitingform = new XoopsThemeForm(_MD_ADDNEWLINK, 'addwaitingform', $_SERVER['PHP_SELF'], 'POST', true);
- $addwaitingform->addElement(new XoopsFormText(_MD_SITETITLE , 'title', 50, 100, $btitle));
- $addwaitingform->ad...
[truncated message content] |