Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <luc...@us...> - 2014-10-26 20:00:39
|
Revision: 12820
http://sourceforge.net/p/xoops/svn/12820
Author: luciorota
Date: 2014-10-26 20:00:31 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
remove unused files
Removed Paths:
-------------
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/CHANGELOG.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/INSTALL.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANGUAGES.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANG_DIFF.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LICENSE.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/README1st.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/SMARTY_DIFF.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/UPGRADE.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/error.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/config.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/xhttperror_common_breadcrumb.tpl
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/xhttperror_index.tpl
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,79 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * XhttperrorBreadcrumb Class
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Lucio Rota <luc...@gm...>
- * @package Xhttperror
- * @since 1.01
- * @version $Id:$
- *
- * Example:
- * $breadcrumb = new XhttperrorBreadcrumb();
- * $breadcrumb->addLink( 'bread 1', 'index1.php' );
- * $breadcrumb->addLink( 'bread 2', '' );
- * $breadcrumb->addLink( 'bread 3', 'index3.php' );
- * echo $breadcrumb->render();
- */
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-
-/**
- * Class XhttperrorBreadcrumb
- */
-class XhttperrorBreadcrumb
-{
- var $dirname;
- var $_bread = array();
-
- /**
- *
- */
- function __construct()
- {
- $this->dirname = basename(dirname(dirname(__FILE__)));
- }
-
- /**
- * Add link to breadcrumb
- *
- * @param string $title
- * @param string $link
- */
- function addLink( $title='', $link='' )
- {
- $this->_bread[] = array(
- 'link' => $link,
- 'title' => $title
- );
- }
-
- /**
- * Render Xhttperror BreadCrumb
- *
- */
- function render()
- {
- if ( !isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme']) ) {
- include_once $GLOBALS['xoops']->path( "/class/theme.php" );
- $GLOBALS['xoTheme'] = new xos_opal_Theme();
- }
-
- require_once $GLOBALS['xoops']->path('class/template.php');
- $breadcrumbTpl = new XoopsTpl();
- $breadcrumbTpl->assign('breadcrumb', $this->_bread);
- $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
- unset($breadcrumbTpl);
-
- return $html;
- }
-}
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/CHANGELOG.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/CHANGELOG.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/CHANGELOG.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,13 +0,0 @@
-xHttpError History
-
-Key:
-+ Added feature.
-- Removed.
-! Bug fix.
-o General comment.
-
-
-version 1.00 (Released: 2012/08/06)
-===================================
-
-o First public release.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/INSTALL.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/INSTALL.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/INSTALL.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,41 +0,0 @@
-Installing this module
-
-1) Installing on web site:
- =======================
-
- Via FTP:
- ========
- Most people will want to use this method...
-
- 1.1) Unarchive the module archive on your computer using your favourite
- archive utility (such as WinRAR - http://www.rarlabs.com/rar_archiver.htm).
- 1.2) Upload the folder module's folder (do not rename it, or change the case!)
- and its contents to the "modules" folder on your web site using your FTP
- client.
- 1.3) Go to section 2.1.
-
-
- Via SSH/Shell:
- ==============
- If your ISP provides you with SSH access, you can use this method. More
- experienced Linux/FreeBSD users may find it quicker.
-
- 1.1) Download the module archive (or upload from your computer) to
- somewhere on your web site. You can do this easily using "wget"
- e.g., wget http://www.urltoarchive.com/filename.tar.gz
- 1.2) Go to the XOOPS module directory, e.g., "cd /path/to/xoops/modules"
- 1.3) Extract the archive, if you downloaded the *.tar.gz version,
- this can be done by "tar zxvf articles_archivename.tar.gz". If you
- have the *.zip archive, use "unzip articles_archivename.zip".
- 1.4) Delete the archive if you no longer need it, to save web space.
- 1.5) Go to section 2.1.
-
-2) Installing into the XOOPS system:
- =================================
-
- 2.1) Report in to your XOOPS web site as an administrator, and navigate to the
- modules admin area ("system admin -> modules"). Scroll to the lower
- section of the page where the modules that are not installed are listed.
- 2.2) Click on the "Install" icon for the module's listing and follow the
- instructions.
- 2.3) Click on the module's icon in the left to go to its admin area.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANGUAGES.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANGUAGES.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANGUAGES.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,24 +0,0 @@
-LANGUAGES.txt
-
-I have allowed for this module to be localised - or to be translated to
-your local language. This basically means that all captions, text and titles
-can easily be translated and displayed in your language.
-
-The default language for the this module is English as that is my primary
-language and the default for XOOPS itself. And unfortunately, while I know a
-little French, I am generally useless at learning foreign languages...
-
-If you wish to translate this module to your language, please first of all:
-
- 1) Check to see if it's already been done (and maybe just needs updating?).
- 2) Make sure you have the latest version.
- 3) Consider obtaining the latest development version...
- 4) Bear in mind that the files may change constantly during its development.
-
-To translate this module to your language, go to the "languages" folder, copy
-the folder called "english" (along with any files it contains) and rename it to
-the name of your language. Make sure that you use the English version of its
-name and, don't use capital letters and don't use any spaces.
-
-Edit the files contained within your new language files - it should (in theory)
-be fairly obvious as to what you need to change.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANG_DIFF.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANG_DIFF.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANG_DIFF.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,5 +0,0 @@
-Module Name : xHttpError
-Module developer : Rota Lucio luc...@gm...
-
-version 1.00
-============
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LICENSE.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LICENSE.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LICENSE.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. 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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. 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.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- 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.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/README1st.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/README1st.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/README1st.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,11 +0,0 @@
-Install, update and various other documentation can be found in the "docs"
-folder/directory.
-
-.:IMPORTANT:.
-Distribution files marked "beta" (they will have "beta" in the filename!) are
-still in testing and should only be used on production sites with caution.
-
-Please see the text file docs/UPDATE.txt for more information on updating
-xHttpError and if you need to run an update script. If you are installing
-xHttpError for the first time, or re-installing afresh, you need not worry
-about this.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/SMARTY_DIFF.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/SMARTY_DIFF.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/SMARTY_DIFF.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,3 +0,0 @@
-Module Name : xHttpError
-Module developer : Lucio Rota luc...@gm...
-
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/UPGRADE.txt
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/UPGRADE.txt 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/UPGRADE.txt 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,15 +0,0 @@
-Module Name : xHttpError
-Module developer : Lucio Rota luc...@gm...
-
-
-Upgrade Instructions
-1. Backup your database, customized templates and module files before
- upgrading.
-
-2. Upload all files in this package to XOOPS_ROOT_URL/modules/[module dirname]/,
- overwriting the existing files.
-
-3. Report in to your site as administrator.
-
-4. Update the module using the XOOPS module administration panel at
- 'System Admin -> Modules'.
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/index.html 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/index.html 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/xhttperror/branches/luciorota/xhttperror/error.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/error.php 2014-10-22 22:51:01 UTC (rev 12819)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/error.php 2014-10-26 20:00:31 UTC (rev 12820)
@@ -1,201 +0,0 @@
-<?php
-ob_start();
-@set_time_limit(5);
-@ini_set('memory_limit', '64M');
-@ini_set('display_errors', 'Off');
-error_reporting(0);
-
-function print_error_page() {
- $statusReason = array(
- 100 => 'Continue',
- 101 => 'Switching Protocols',
- 102 => 'Processing',
- 200 => 'OK',
- 201 => 'Created',
- 202 => 'Accepted',
- 203 => 'Non-Authoritative Information',
- 204 => 'No Content',
- 205 => 'Reset Content',
- 206 => 'Partial Content',
- 207 => 'Multi-Status',
- 226 => 'IM Used',
- 300 => 'Multiple Choices',
- 301 => 'Moved Permanently',
- 302 => 'Found',
- 303 => 'See Other',
- 304 => 'Not Modified',
- 305 => 'Use Proxy',
- 306 => 'Reserved',
- 307 => 'Temporary Redirect',
- 400 => 'Bad Request',
- 401 => 'Unauthorized',
- 402 => 'Payment Required',
- 403 => 'Forbidden',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 406 => 'Not Acceptable',
- 407 => 'Proxy Authentication Required',
- 408 => 'Request Timeout',
- 409 => 'Conflict',
- 410 => 'Gone',
- 411 => 'Length Required',
- 412 => 'Precondition Failed',
- 413 => 'Request Entity Too Large',
- 414 => 'Request-URI Too Long',
- 415 => 'Unsupported Media Type',
- 416 => 'Requested Range Not Satisfiable',
- 417 => 'Expectation Failed',
- 422 => 'Unprocessable Entity',
- 423 => 'Locked',
- 424 => 'Failed Dependency',
- 426 => 'Upgrade Required',
- 500 => 'Internal Server Error',
- 501 => 'Not Implemented',
- 502 => 'Bad Gateway',
- 503 => 'Service Unavailable',
- 504 => 'Gateway Timeout',
- 505 => 'HTTP Version Not Supported',
- 506 => 'Variant Also Negotiates',
- 507 => 'Insufficient Storage',
- 510 => 'Not Extended'
- );
-
- $statusMessage = array(
- 400 => "Your browser sent a request that this server could not understand.",
- 401 => "This server could not verify that you are authorized to access the document requested.",
- 402 => 'The server encountered an internal error or misconfiguration and was unable to complete your request.',
- 403 => "You don't have permission to access %U% on this server.",
- 404 => "We couldn't find <acronym title='%U%'>that uri</acronym> on our server, though it's most certainly not your fault.",
- 405 => "The requested method is not allowed for the URL %U%.",
- 406 => "An appropriate representation of the requested resource %U% could not be found on this server.",
- 407 => "An appropriate representation of the requested resource %U% could not be found on this server.",
- 408 => "Server timeout waiting for the HTTP request from the client.",
- 409 => 'The server encountered an internal error or misconfiguration and was unable to complete your request.',
- 410 => "The requested resource %U% is no longer available on this server and there is no forwarding address. Please remove all references to this resource.",
- 411 => "A request of the requested method GET requires a valid Content-length.",
- 412 => "The precondition on the request for the URL %U% evaluated to false.",
- 413 => "The requested resource %U% does not allow request data with GET requests, or the amount of data provided in the request exceeds the capacity limit.",
- 414 => "The requested URL's length exceeds the capacity limit for this server.",
- 415 => "The supplied request data is not in a format acceptable for processing by this resource.",
- 416 => 'Requested Range Not Satisfiable',
- 417 => "The expectation given in the Expect request-header field could not be met by this server. The client sent <code>Expect:</code>",
- 422 => "The server understands the media type of the request entity, but was unable to process the contained instructions.",
- 423 => "The requested resource is currently locked. The lock must be released or proper identification given before the method can be applied.",
- 424 => "The method could not be performed on the resource because the requested action depended on another action and that other action failed.",
- 425 => 'The server encountered an internal error or misconfiguration and was unable to complete your request.',
- 426 => "The requested resource can only be retrieved using SSL. Either upgrade your client, or try requesting the page using https://",
- 500 => 'The server encountered an internal error or misconfiguration and was unable to complete your request.',
- 501 => "This type of request method to %U% is not supported.",
- 502 => "The proxy server received an invalid response from an upstream server.",
- 503 => "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
- 504 => "The proxy server did not receive a timely response from the upstream server.",
- 505 => 'The server encountered an internal error or misconfiguration and was unable to complete your request.',
- 506 => "A variant for the requested resource <code>%U%</code> is itself a negotiable resource. This indicates a configuration error.",
- 507 => "The method could not be performed. There is insufficient free space left in your storage allocation.",
- 510 => "A mandatory extension policy in the request is not accepted by the server for this resource."
- );
-
- // Get the Status Code
- if (isset($_SERVER['REDIRECT_STATUS']) && ($_SERVER['REDIRECT_STATUS'] != 200))
- $statusCode = $_SERVER['REDIRECT_STATUS'];
- elseif (isset($_SERVER['REDIRECT_REDIRECT_STATUS']) && ($_SERVER['REDIRECT_REDIRECT_STATUS'] != 200))
- $statusCode = $_SERVER['REDIRECT_REDIRECT_STATUS'];
- $statusCode = (!isset($_GET['error']) ? 404 : $_GET['error']);
-
- $statusCode = abs(intval($statusCode));
-
- // Redirect to server home if called directly or if status is under 400
- if ( ( (isset($_SERVER['REDIRECT_STATUS']) && $_SERVER['REDIRECT_STATUS'] == 200) && (floor($statusCode / 100) == 3) )
- || (!isset($_GET['error']) && $_SERVER['REDIRECT_STATUS'] == 200) ) {
- @header("Location: http://{$_SERVER['SERVER_NAME']}",1,302);
- die();
- }
-
- // Check range of code or issue 500
- if (($statusCode < 200) || ($statusCode > 599)) $statusCode = 500;
-
- // Check for valid protocols or else issue 505
- if (!in_array($_SERVER["SERVER_PROTOCOL"], array('HTTP/1.0','HTTP/1.1','HTTP/0.9')))
- $statusCode = 505;
-
- // Get the status reason
- $reason = (isset($statusReason[$statusCode]) ? $statusReason[$statusCode] : '');
-
- // Get the status message
- $message = (isset($statusMessage[$statusCode]) ? str_replace('%U%', htmlspecialchars(strip_tags(stripslashes($_SERVER['REQUEST_URI']))), $statusMessage[$statusCode]) : 'Error');
-
- // issue optimized headers (optimized for your server)
- @header("{$_SERVER['SERVER_PROTOCOL']} {$statusCode} {$reason}", 1, $statusCode);
- if( @php_sapi_name() != 'cgi-fcgi' )
- @header("Status: {$statusCode} {$reason}", 1, $statusCode);
-
- // A very small footprint for certain types of 4xx class errors and all 5xx class errors
- if (in_array($statusCode, array(400, 403, 405)) || (floor($statusCode / 100) == 5)) {
- @header("Connection: close", 1);
- if ($statusCode == 405)
- @header('Allow: GET,HEAD,POST,OPTIONS', 1, 405);
- }
-
- echo "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html>";
- echo "<head>\n<title>{$statusCode} {$reason}</title>\n<h1>{$reason}</h1>\n<p>{$message}<br />\n</p>\n";
-}
-
-function askapache_global_debug() {
- # http://www.php.net/manual/en/function.array-walk.php#100681
- global $_GET, $_POST, $_ENV, $_SERVER;
- $g = array('_ENV','_SERVER','_GET','_POST');
- array_walk_recursive($g, create_function('$n','global $$n;if( !!$$n&&ob_start()&&(print "[ $"."$n ]\n")&&array_walk($$n,
- create_function(\'$v,$k\', \'echo "[$k] => $v\n";\'))) echo "<"."p"."r"."e>".htmlspecialchars(ob_get_clean())."<"."/"."pr"."e>";') );
-}
-
-print_error_page();
-//if($_SERVER['REMOTE_ADDR']=='youripaddress')askapache_global_debug();
-echo "</body>\n</html>";
-echo ob_get_clean();
-exit;
-
-/*
-###
-# ErrorDocument: In the event of a problem or error, what the server will return to the client. URLs
-# can begin with a / for local web-paths (relative to DocumentRoot), or be a full URL which the client
-# can resolve. Alternatively, a message can be displayed. If a malformed request is detected, normal
-# request processing will be immediately halted and the internal error message returned.
-#
-# Prior to version 2.0, messages were indicated by prefixing them with a
-# single unmatched double quote character.
-#
-# The special value d...
[truncated message content] |
|
From: <luc...@us...> - 2014-10-22 22:51:07
|
Revision: 12819
http://sourceforge.net/p/xoops/svn/12819
Author: luciorota
Date: 2014-10-22 22:51:01 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
standardize
Added Paths:
-----------
XoopsModules/xhttperror/branches/luciorota/
XoopsModules/xhttperror/branches/luciorota/xhttperror/
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/about.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_footer.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_header.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/error.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/menu.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/report.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/style.css
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/bookmarks/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/bookmarks/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/16x16/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/16x16/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/script.js
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/error.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/report.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/request.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/session.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/class/xhttperror.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/CHANGELOG.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/INSTALL.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANGUAGES.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LANG_DIFF.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/LICENSE.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/README1st.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/SMARTY_DIFF.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/UPGRADE.txt
XoopsModules/xhttperror/branches/luciorota/xhttperror/docs/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/error.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/header.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/common.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/config.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/constants.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/functions.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/oninstall.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/onuninstall.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/include/onupdate.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/index.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/admin.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/help/
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/help/help.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/help/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/mail_template/
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/mail_template/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/main.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/english/modinfo.php
XoopsModules/xhttperror/branches/luciorota/xhttperror/language/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/sql/
XoopsModules/xhttperror/branches/luciorota/xhttperror/sql/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/sql/mysql.sql
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/admin/
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/admin/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/admin/xhttperror_admin_errors_list.tpl
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/admin/xhttperror_admin_reports_list.tpl
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/blocks/
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/blocks/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/index.html
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/xhttperror_common_breadcrumb.tpl
XoopsModules/xhttperror/branches/luciorota/xhttperror/templates/xhttperror_index.tpl
XoopsModules/xhttperror/branches/luciorota/xhttperror/xoops_version.php
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/about.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/about.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/about.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,21 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_footer.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_footer.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_footer.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,19 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+echo "<div class='adminfooter'>\n";
+echo " <div style='text-align: center;'>\n";
+echo " <a href='http://www.xoops.org' rel='external'><img src='" . XHTTPERROR_IMAGES_URL . "/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n";
+echo " </div>\n";
+echo "" . _AM_MODULEADMIN_ADMIN_FOOTER . "\n";
+echo "</div>";
+
+xoops_cp_footer();
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_header.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_header.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/admin_header.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,111 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+
+$pathIcon16 = XOOPS_URL . '/' . $xhttperror->getModule()->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xhttperror->getModule()->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xhttperror->getModule()->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+
+// Load language files
+xoops_loadLanguage('admin', $xhttperror->getModule()->dirname());
+xoops_loadLanguage('modinfo', $xhttperror->getModule()->dirname());
+xoops_loadLanguage('main', $xhttperror->getModule()->dirname());
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ $xoopsTpl = new XoopsTpl();
+}
+/*
+
+
+
+
+
+
+
+
+
+
+
+
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+xoops_load ('XoopsUserUtility');
+
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname($dirname);
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images';
+
+// Include module functions
+include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/config.php";
+include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.php";
+
+
+
+// Check and load moduleadmin classes
+$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin');
+$globalLanguage = $GLOBALS['xoopsConfig']['language'];
+if ( file_exists($pathDir . '/language/' . $globalLanguage . '/main.php')){
+ include_once $pathDir . '/language/' . $globalLanguage . '/main.php';
+} else {
+ include_once $pathDir . '/language/english/main.php';
+}
+if ( file_exists($pathDir . '/moduleadmin.php')){
+ include_once $pathDir . '/moduleadmin.php';
+ //return true;
+} else {
+ xoops_cp_header();
+ echo xoops_error(_AM_XADDRESSES_NOFRAMEWORKS);
+ xoops_cp_footer();
+ //return false;
+}
+
+$myts =& MyTextSanitizer::getInstance();
+
+// Get user groups
+$groupPermHandler =& xoops_gethandler('groupperm');
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
+$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
+//xoops_cp_header();
+
+//Load module languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+*/
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/error.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/error.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/error.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,142 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * XHTTPERROR - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ * @license GNU General Public License v3.0
+ * @package xhttperror
+ * @author Rota Lucio ( luc...@gm... )
+ *
+ * $Rev$: Revision of last commit
+ * $Author$: Author of last commit
+ * $Date$: Date of last commit
+ * ****************************************************************************
+ */
+
+$currentFile = basename(__FILE__);
+include 'admin_header.php';
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['error_id']) ? "edit_error" : 'list_errors');
+switch($op ) {
+ default:
+ case 'list_errors' :
+ // render start here
+ xoops_cp_header();
+ // render submenu
+ $modcreate_admin = new ModuleAdmin();
+ echo $modcreate_admin->addNavigation('errors.php');
+ $modcreate_admin->addItemButton(_AM_XHTTPERROR_ERROR_ADD, '' . $currentFile . '?op=edit_error', 'add');
+ echo $modcreate_admin->renderButton();
+
+ $errorCount = $xhttperror->getHandler('error')->getCount();
+ if($errorCount > 0) {
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('error_statuscode');
+ $criteria->setOrder('ASC');
+ $errorObjs = $xhttperror->getHandler('error')->getObjects($criteria, true, false);
+
+ $GLOBALS['xoopsTpl']->assign('errors', $errorObjs);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $GLOBALS['xoopsTpl']->display("db:{$xhttperror->getModule()->dirname()}_admin_errors_list.tpl");
+ } else {
+ echo _AM_XHTTPERROR_ERROR_NOERRORS;
+ }
+
+ include "admin_footer.php";
+ break;
+
+ case 'edit_error' :
+ case 'new_error' :
+ // render start here
+ xoops_cp_header();
+ // render submenu
+ $modcreate_admin = new ModuleAdmin();
+ echo $modcreate_admin->addNavigation('errors.php');
+ $modcreate_admin->addItemButton(_AM_XHTTPERROR_ERROR_LIST, '' . $currentFile . '?op=list_errors', 'list');
+ echo $modcreate_admin->renderButton();
+
+ if (isset($_REQUEST['error_id'])) {
+ $errorObj = $xhttperror->getHandler('error')->get($_REQUEST['error_id']);
+ } else {
+ $errorObj = $xhttperror->getHandler('error')->create();
+
+ }
+ $form = $errorObj->getForm();
+ $form->display();
+
+ include "admin_footer.php";
+ break;
+
+ case 'save_error' :
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ( isset($_REQUEST['error_id']) ) {
+ $errorObj = $xhttperror->getHandler('error')->get($_REQUEST['error_id']);
+ } else {
+ $errorObj = $xhttperror->getHandler('error')->create();
+ }
+ // Check statuscode
+ if ( isset($_REQUEST['error_statuscode']) ) {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('error_statuscode', $_REQUEST['error_statuscode']));
+ if ($xhttperror->getHandler('error')->getCount($criteria) > 0) {
+ redirect_header($currentFile, 3, _AM_XHTTPERROR_STATUSCODE_EXISTS );
+ } else {
+ $errorObj->setVar('error_statuscode', $_REQUEST['error_statuscode']);
+ }
+ }
+ $errorObj->setVar('error_title', $_REQUEST['error_title']);
+ $errorObj->setVar('error_text', $_REQUEST['error_text']);
+ $errorObj->setVar('error_text_html', $_REQUEST['error_text_html']);
+ $errorObj->setVar('error_text_smiley', $_REQUEST['error_text_smiley']);
+ $errorObj->setVar('error_text_breaks', $_REQUEST['error_text_breaks']);
+ $errorObj->setVar('error_showme', $_REQUEST['error_showme']);
+ $errorObj->setVar('error_redirect', $_REQUEST['error_redirect']);
+ $errorObj->setVar('error_redirect_time', (int)$_REQUEST['error_redirect_time']);
+ /* IN PROGRESS
+ $errorObj->setVar('error_redirect_message', (int)$_REQUEST['error_redirect_message']);
+ */
+ $errorObj->setVar('error_redirect_uri', $_REQUEST['error_redirect_uri']);
+
+ if ( $xhttperror->getHandler('error')->insert($errorObj) ) {
+ redirect_header($currentFile, 3, _AM_XHTTPERROR_SAVEDSUCCESS );
+ } else {
+ redirect_header($currentFile, 3, _AM_XHTTPERROR_NOTSAVED );
+ }
+ break;
+
+ case 'delete_error' :
+ $errorObj = $xhttperror->getHandler('error')->get($_REQUEST['error_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($xhttperror->getHandler('error')->delete($errorObj)) {
+ redirect_header($currentFile, 3, _AM_XHTTPERROR_DELETEDSUCCESS);
+ } else {
+ echo $errorObj->getHtmlErrors();
+ }
+ } else {
+ // render start here
+ xoops_cp_header();
+ xoops_confirm(array('ok' => 1, 'error_id' => $_REQUEST['error_id'], 'op' => 'delete_error'), $_SERVER['REQUEST_URI'], sprintf(_AM_XHTTPERROR_ERROR_RUSUREDEL, $errorObj->getVar('error_title')));
+ xoops_cp_footer();
+ }
+ break;
+}
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/index.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,60 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Module_skeleton module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package module_skeleton
+ * @since 1.00
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+define('_RED', '#FF0000'); // Red
+define('_GREEN', '#00AA00'); // Green
+
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+
+//--------------------------
+$errorCount = $xhttperror->getHandler('error')->getCount();
+$reportCount = $xhttperror->getHandler('report')->getCount();
+
+$indexAdmin->addInfoBox(_AM_XHTTPERROR_INTRO);
+$indexAdmin->addInfoBoxLine(_AM_XHTTPERROR_INTRO, _AM_XHTTPERROR_INFO);
+ if( file_exists(XOOPS_ROOT_PATH . "/.htaccess")) {
+ $htaccessCheck = _AM_XHTTPERROR_FILECHK . XOOPS_ROOT_PATH ."/.htaccess " . "<br />" . _AM_XHTTPERROR_FILEEXISTS;
+} else {
+ $htaccessCheck = _AM_XHTTPERROR_FILECHK . XOOPS_ROOT_PATH ."/.htaccess " . "<br />" . _AM_XHTTPERROR_FILENOEXIST;
+}
+$indexAdmin->addInfoBoxLine(_AM_XHTTPERROR_INTRO, $htaccessCheck);
+$indexAdmin->addInfoBoxLine(_AM_XHTTPERROR_INTRO, _AM_XHTTPERROR_ADDCODE);
+if ($errorCount == 0) {
+ $indexAdmin->addInfoBoxLine(_AM_XHTTPERROR_INTRO, _AM_XHTTPERROR_NOCODE);
+} else {
+ // get errors
+ $criteria = new CriteriaCompo();
+ $errors = $xhttperror->getHandler('error')->getObjects($criteria);
+ foreach ($errors as $error) {
+ $msg_id = $error->getVar('error_id');
+ $error_statuscode = $error->getVar('error_statuscode');
+ $hmtl = "ErrorDocument " . $error_statuscode . " " . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/index.php?error=" . $error_statuscode . "";
+ $indexAdmin->addInfoBoxLine(_AM_XHTTPERROR_INTRO, $hmtl);
+ }
+}
+echo $indexAdmin->addNavigation('index.php');
+echo $indexAdmin->renderIndex();
+
+include 'admin_footer.php';
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/menu.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/menu.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/menu.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,52 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xhttperror module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xhttperror
+ * @since 1.00
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
+
+$adminmenu = array();
+$i=0;
+//$adminmenu[$i]['name'] = 'Index';
+$adminmenu[$i]['title'] = _MI_XHTTPERROR_ADMENU_INDEX;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]['icon'] = $pathIcon32 . '/house.png';
+//$adminmenu[$i]['desc'] = _MI_XHTTPERROR_ADMENU_INDEX_DESC;
+++$i;
+//$adminmenu[$i]['name'] = 'Errors';
+$adminmenu[$i]['title'] = _MI_XHTTPERROR_ADMENU_ERRORS;
+$adminmenu[$i]['link'] = "admin/error.php";
+$adminmenu[$i]['icon'] = $pathIcon32 . '/error.png';
+//$adminmenu[$i]['desc'] = _MI_XHTTPERROR_ADMENU_ERRORS_DESC;
+++$i;
+//$adminmenu[$i]['name'] = 'Reports';
+$adminmenu[$i]['title'] = _MI_XHTTPERROR_ADMENU_REPORTS;
+$adminmenu[$i]['link'] = "admin/report.php";
+$adminmenu[$i]['icon'] = $pathIcon32 . '/report_error.png';
+//$adminmenu[$i]['desc'] = _MI_XHTTPERROR_ADMENU_REPORTS_DESC;
+++$i;
+//$adminmenu[$i]['name'] = 'About';
+$adminmenu[$i]['title'] = _MI_XHTTPERROR_ADMENU_ABOUT;
+$adminmenu[$i]['link'] = "admin/about.php";
+$adminmenu[$i]['icon'] = $pathIcon32 . '/information.png';
+//$adminmenu[$i]['desc'] = _MI_XHTTPERROR_ADMENU_ABOUT_DESC;
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/report.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/report.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/admin/report.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,81 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * XHTTPERROR - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ * @license GNU General Public License v3.0
+ * @package xhttperror
+ * @author Rota Lucio ( luc...@gm... )
+ *
+ * $Rev$: Revision of last commit
+ * $Author$: Author of last commit
+ * $Date$: Date of last commit
+ * ****************************************************************************
+ */
+
+$currentFile = basename(__FILE__);
+include 'admin_header.php';
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list_reports';
+switch($op ) {
+ default:
+ case 'list_reports' :
+ // render start here
+ xoops_cp_header();
+ // render submenu
+ $modcreate_admin = new ModuleAdmin();
+ echo $modcreate_admin->addNavigation('reports.php');
+
+ $reportCount = $xhttperror->getHandler('report')->getCount();
+ if($reportCount > 0) {
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('report_date');
+ $criteria->setOrder('ASC');
+ $criteria->setLimit($xhttperror->getConfig('reports_perpage'));
+ $reportObjs = $xhttperror->getHandler('report')->getObjects($criteria, true, false);
+ foreach ($reportObjs as $key => $reportObj) {
+ $reportObjs[$key]['report_user'] = XoopsUserUtility::getUnameFromId($reportObj['report_uid'], false, true);
+ $reportObjs[$key]['report_date'] = formatTimeStamp($reportObj['report_date'], _DATESTRING);
+ }
+ $GLOBALS['xoopsTpl']->assign('reports', $reportObjs);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $GLOBALS['xoopsTpl']->display("db:{$xhttperror->getModule()->dirname()}_admin_reports_list.html");
+ } else {
+ echo _AM_XHTTPERROR_REPORT_NOREPORTS;
+ }
+ include "admin_footer.php";
+ break;
+ case 'delete_report' :
+ $reportObj = $xhttperror->getHandler('report')->get($_REQUEST['report_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ( $xhttperror->getHandler('report')->delete($reportObj)) {
+ redirect_header($currentFile, 3, _AM_XHTTPERROR_DELETEDSUCCESS );
+ } else {
+ echo $reportObj->getHtmlErrors();
+ }
+ } else {
+ // render start here
+ xoops_cp_header();
+ xoops_confirm(array('ok' => 1, 'report_id' => $_REQUEST['report_id'], 'op' => 'delete_report'), $_SERVER['REQUEST_URI'], sprintf(_AM_XHTTPERROR_REPORT_RUSUREDEL, $reportObj->getVar('report_id')));
+ xoops_cp_footer();
+ }
+ break;
+}
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/style.css
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/style.css (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/css/style.css 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * XHTTPERROR - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ * @license GPL see LICENSE
+ * @package xhttperror
+ * @author Rota Lucio ( luc...@gm... )
+ *
+ * Version : 1.0 Mon 2012/07/23 14:17:52 : XOOPS Exp $
+ * ****************************************************************************
+ */
+
+
+.box-header {
+ margin: 2px;
+ padding: 5px;
+ background-color: #ccc;
+ width: 100%;
+ height: 50px;
+}
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/bookmarks/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/bookmarks/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/bookmarks/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bookmarks/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-grey.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/bulb-yell.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/del3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/edit3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/16x16/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/16x16/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/16x16/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/error.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/house.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/information.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/32x32/report_error.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/arrow.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/off.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/icons/on.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/left_both.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/menu/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/module_logo.xcf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/right_both.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
===================================================================
(Binary files differ)
Index: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif 2014-10-20 11:53:00 UTC (rev 12818)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif 2014-10-22 22:51:01 UTC (rev 12819)
Property changes on: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/images/xoopsmicrobutton.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/index.html
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/index.html (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/index.html 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/script.js
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/script.js (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/assets/js/script.js 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,34 @@
+
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * XHTTPERROR - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ * @license GPL see LICENSE
+ * @package xhttperror
+ * @author Rota Lucio ( luc...@gm... )
+ *
+ * Version : 1.0 Mon 2012/07/23 14:17:52 : XOOPS Exp $
+ * ****************************************************************************
+ */
+
+$(document).ready(function(){
+ $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
+ $( ".check" ).css("color","#fff").button();
+ $( ".radio" ).css("color","#fff").buttonset();
+ $( ".toolbar" ).css("color","#000").buttonset();
+});
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/class/breadcrumb.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,79 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * XhttperrorBreadcrumb Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Lucio Rota <luc...@gm...>
+ * @package Xhttperror
+ * @since 1.01
+ * @version $Id:$
+ *
+ * Example:
+ * $breadcrumb = new XhttperrorBreadcrumb();
+ * $breadcrumb->addLink( 'bread 1', 'index1.php' );
+ * $breadcrumb->addLink( 'bread 2', '' );
+ * $breadcrumb->addLink( 'bread 3', 'index3.php' );
+ * echo $breadcrumb->render();
+ */
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+
+/**
+ * Class XhttperrorBreadcrumb
+ */
+class XhttperrorBreadcrumb
+{
+ var $dirname;
+ var $_bread = array();
+
+ /**
+ *
+ */
+ function __construct()
+ {
+ $this->dirname = basename(dirname(dirname(__FILE__)));
+ }
+
+ /**
+ * Add link to breadcrumb
+ *
+ * @param string $title
+ * @param string $link
+ */
+ function addLink( $title='', $link='' )
+ {
+ $this->_bread[] = array(
+ 'link' => $link,
+ 'title' => $title
+ );
+ }
+
+ /**
+ * Render Xhttperror BreadCrumb
+ *
+ */
+ function render()
+ {
+ if ( !isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme']) ) {
+ include_once $GLOBALS['xoops']->path( "/class/theme.php" );
+ $GLOBALS['xoTheme'] = new xos_opal_Theme();
+ }
+
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ $breadcrumbTpl = new XoopsTpl();
+ $breadcrumbTpl->assign('breadcrumb', $this->_bread);
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
+ unset($breadcrumbTpl);
+
+ return $html;
+ }
+}
Added: XoopsModules/xhttperror/branches/luciorota/xhttperror/class/error.php
===================================================================
--- XoopsModules/xhttperror/branches/luciorota/xhttperror/class/error.php (rev 0)
+++ XoopsModules/xhttperror/branches/luciorota/xhttperror/class/error.php 2014-10-22 22:51:01 UTC (rev 12819)
@@ -0,0 +1,180 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Xhttperror module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xhttperror
+ * @since 1.00
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+define('XHTTPERR_REDIRECT_NO', 0);
+define('XHTTPERR_REDIRECT_URI', 1);
+define('XHTTPERR_REDIRECT_PREVIOUS', 2);
+
+/**
+ * Class XhttperrorError
+ */
+class XhttperrorError extends XoopsObject
+{
+ /**
+ * @var XhttperrorXhttperror
+ * @access private
+ */
+ private $xhttperror = null;
+
+ /**
+ * constructor
+ */
+ public function __construct()
+ {
+ $this->xhttperror = XhttperrorXhttperror::getInstance();
+ $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+ $this->XoopsObject();
+ //
+ $this->initVar("error_id", XOBJ_DTYPE_INT, null, false, 5);
+ $this->initVar("error_title", XOBJ_DTYPE_TXTBOX, null, true);
+ $this->initVar("error_statuscode", XOBJ_DTYPE_TXTBOX, '000', true);
+ $this->init...
[truncated message content] |
|
From: <be...@us...> - 2014-10-20 11:53:05
|
Revision: 12818
http://sourceforge.net/p/xoops/svn/12818
Author: beckmi
Date: 2014-10-20 11:53:00 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
removing shadow box around icons for new topics/forums
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/english/style.css
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/english/style.css
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/english/style.css 2014-10-19 21:17:38 UTC (rev 12817)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/english/style.css 2014-10-20 11:53:00 UTC (rev 12818)
@@ -4,14 +4,14 @@
overflow : hidden;
border : 1px solid #aaaaaa;
width : 100%;
-}
+}
.forum_title {
- float : left;
- text-align : left;
+ float : left;
+ text-align : left;
padding : 5px;
width : 100%;
-
+
}
.forum_title a {
@@ -21,20 +21,20 @@
.forum_stats {
float:center;
- overflow:hidden;
- text-align:left;
+ overflow:hidden;
+ text-align:left;
/* border:1px solid #aaaaaa; */
padding:5px;
}
.forum_stats_left {
- float: left;
+ float: left;
text-align: left;
- width:45%;
+ width:45%;
}
.forum_stats_right {
- float: right;
+ float: right;
text-align: right;
width:45%;
}
@@ -54,19 +54,19 @@
}
.index_category{
- border: 0px;
+ border: 0px;
/*margin-top: -10px;
margin-bottom: 5px;*/
}
.ThreadUserName a {
- font-weight: bold;
+ font-weight: bold;
margin-bottom: 2px;
/*color: #000; irmtfan */
}
.ThreadTitle, .ThreadTitle a{
- font-weight: bold;
+ font-weight: bold;
margin-bottom: 2px;
/*color: #fff; irmtfan */
}
@@ -108,7 +108,7 @@
div.signature {
bottom: 10px;
border-top-width:1px;
- border-top-style: inherit;
+ border-top-style: inherit;
}
div#index_welcome{
@@ -116,7 +116,7 @@
margin-bottom: 10px;
}
html>body div#index_welcome {
- margin-bottom: 15px;
+ margin-bottom: 15px;
}
#index_welcome div.title{
@@ -139,7 +139,7 @@
.left { text-align: left; }
.right { text-align: right; }
.floatleft { float: left;}
-.floatright { float: right;}
+.floatright { float: right;}
#index_forum a{
font-weight: bold;
@@ -259,10 +259,10 @@
* From http://www.positioniseverything.net/easyclearing.html
*/
.clear:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
visibility: hidden;
}
.clear {display: inline-table;}
@@ -372,14 +372,14 @@
.topic-read {
}
.topic-new {
-box-shadow: inset 0px 10px 10px 0px rgba(0, 0, 0, 0.5);
+/*box-shadow: inset 0px 10px 10px 0px rgba(0, 0, 0, 0.5);*/
}
.forum-read {
}
.forum-new {
-box-shadow: inset 0px 10px 10px 0px rgba(0, 0, 0, 0.5);
+/*box-shadow: inset 0px 10px 10px 0px rgba(0, 0, 0, 0.5);*/
}
.newbb_select_text {
}
-/* color - end */
\ No newline at end of file
+/* color - end */
|
|
From: <wis...@us...> - 2014-10-19 21:17:59
|
Revision: 12817
http://sourceforge.net/p/xoops/svn/12817
Author: wishcraft
Date: 2014-10-19 21:17:38 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
XOOPS Rooms Chatting IRC Style Chat all in PHP
Added Paths:
-----------
XoopsModules/xalky/
XoopsModules/xalky/branches/
XoopsModules/xalky/releases/
XoopsModules/xalky/tags/
XoopsModules/xalky/trunk/
XoopsModules/xalky/trunk/modules/
XoopsModules/xalky/trunk/modules/index.html
XoopsModules/xalky/trunk/modules/xalky/
XoopsModules/xalky/trunk/modules/xalky/.htaccess
XoopsModules/xalky/trunk/modules/xalky/.htaccess_500
XoopsModules/xalky/trunk/modules/xalky/.htaccess_501
XoopsModules/xalky/trunk/modules/xalky/admin/
XoopsModules/xalky/trunk/modules/xalky/admin/index.html
XoopsModules/xalky/trunk/modules/xalky/class/
XoopsModules/xalky/trunk/modules/xalky/class/bans.php
XoopsModules/xalky/trunk/modules/xalky/class/index.html
XoopsModules/xalky/trunk/modules/xalky/class/invitations.php
XoopsModules/xalky/trunk/modules/xalky/class/messages.php
XoopsModules/xalky/trunk/modules/xalky/class/online.php
XoopsModules/xalky/trunk/modules/xalky/css/
XoopsModules/xalky/trunk/modules/xalky/css/Cobalt.css
XoopsModules/xalky/trunk/modules/xalky/css/Core.css
XoopsModules/xalky/trunk/modules/xalky/css/Lithium.css
XoopsModules/xalky/trunk/modules/xalky/css/Mercury.css
XoopsModules/xalky/trunk/modules/xalky/css/MyBB.css
XoopsModules/xalky/trunk/modules/xalky/css/Oxygen.css
XoopsModules/xalky/trunk/modules/xalky/css/Radium.css
XoopsModules/xalky/trunk/modules/xalky/css/Sulfur.css
XoopsModules/xalky/trunk/modules/xalky/css/beige.css
XoopsModules/xalky/trunk/modules/xalky/css/black.css
XoopsModules/xalky/trunk/modules/xalky/css/borders.css
XoopsModules/xalky/trunk/modules/xalky/css/fonts.css
XoopsModules/xalky/trunk/modules/xalky/css/grey.css
XoopsModules/xalky/trunk/modules/xalky/css/ie5-6.css
XoopsModules/xalky/trunk/modules/xalky/css/index.html
XoopsModules/xalky/trunk/modules/xalky/css/misc.css
XoopsModules/xalky/trunk/modules/xalky/css/positions.css
XoopsModules/xalky/trunk/modules/xalky/css/print.css
XoopsModules/xalky/trunk/modules/xalky/css/prosilver.css
XoopsModules/xalky/trunk/modules/xalky/css/subSilver.css
XoopsModules/xalky/trunk/modules/xalky/css/subblack2.css
XoopsModules/xalky/trunk/modules/xalky/css/subsilver2.css
XoopsModules/xalky/trunk/modules/xalky/css/vBulletin.css
XoopsModules/xalky/trunk/modules/xalky/docs/
XoopsModules/xalky/trunk/modules/xalky/flash/
XoopsModules/xalky/trunk/modules/xalky/flash/FABridge.swf
XoopsModules/xalky/trunk/modules/xalky/flash/index.html
XoopsModules/xalky/trunk/modules/xalky/images/
XoopsModules/xalky/trunk/modules/xalky/images/audio-off.png
XoopsModules/xalky/trunk/modules/xalky/images/audio.png
XoopsModules/xalky/trunk/modules/xalky/images/autoscroll-off.png
XoopsModules/xalky/trunk/modules/xalky/images/autoscroll.png
XoopsModules/xalky/trunk/modules/xalky/images/delete.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/angel.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/confused.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/cool.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/crying.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/devilish.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/eek.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/error.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/favorite.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/glasses.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/grin.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/help.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/idea.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/important.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/index.html
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/kiss.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/monkey.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/plain.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/razz.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/sad.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/smile-big.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/smile.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/surprise.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/warning.png
XoopsModules/xalky/trunk/modules/xalky/images/emoticons/wink.png
XoopsModules/xalky/trunk/modules/xalky/images/help.png
XoopsModules/xalky/trunk/modules/xalky/images/index.html
XoopsModules/xalky/trunk/modules/xalky/images/license.txt
XoopsModules/xalky/trunk/modules/xalky/images/loading-done.png
XoopsModules/xalky/trunk/modules/xalky/images/loading-trouble.png
XoopsModules/xalky/trunk/modules/xalky/images/loading.png
XoopsModules/xalky/trunk/modules/xalky/images/pixel.gif
XoopsModules/xalky/trunk/modules/xalky/images/playback.png
XoopsModules/xalky/trunk/modules/xalky/images/settings.png
XoopsModules/xalky/trunk/modules/xalky/images/users.png
XoopsModules/xalky/trunk/modules/xalky/include/
XoopsModules/xalky/trunk/modules/xalky/include/.htaccess
XoopsModules/xalky/trunk/modules/xalky/include/classes.php
XoopsModules/xalky/trunk/modules/xalky/include/config.php
XoopsModules/xalky/trunk/modules/xalky/include/custom.php
XoopsModules/xalky/trunk/modules/xalky/include/index.html
XoopsModules/xalky/trunk/modules/xalky/include/paths.php
XoopsModules/xalky/trunk/modules/xalky/index.php
XoopsModules/xalky/trunk/modules/xalky/js/
XoopsModules/xalky/trunk/modules/xalky/js/FABridge.js
XoopsModules/xalky/trunk/modules/xalky/js/chat.js
XoopsModules/xalky/trunk/modules/xalky/js/config.js
XoopsModules/xalky/trunk/modules/xalky/js/custom.js
XoopsModules/xalky/trunk/modules/xalky/js/index.html
XoopsModules/xalky/trunk/modules/xalky/js/lang/
XoopsModules/xalky/trunk/modules/xalky/js/lang/ar.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/bg.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/bp.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/ca.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/cy.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/cz.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/de.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/dk.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/el.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/en.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/es.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/fi.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/fr.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/gl.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/he.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/hr.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/hu.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/in.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/index.html
XoopsModules/xalky/trunk/modules/xalky/js/lang/it.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/ja.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/ka.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/kr.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/nl.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/no.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/pl.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/ro.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/ru.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/sk.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/sl.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/sr.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/sv.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/tr.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/uk.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/zh-tw.js
XoopsModules/xalky/trunk/modules/xalky/js/lang/zh.js
XoopsModules/xalky/trunk/modules/xalky/js/modal.js
XoopsModules/xalky/trunk/modules/xalky/language/
XoopsModules/xalky/trunk/modules/xalky/language/english/
XoopsModules/xalky/trunk/modules/xalky/language/english/admin.php
XoopsModules/xalky/trunk/modules/xalky/language/english/index.html
XoopsModules/xalky/trunk/modules/xalky/language/english/main.php
XoopsModules/xalky/trunk/modules/xalky/language/english/modinfo.php
XoopsModules/xalky/trunk/modules/xalky/language/english/style.css
XoopsModules/xalky/trunk/modules/xalky/language/index.html
XoopsModules/xalky/trunk/modules/xalky/socket/
XoopsModules/xalky/trunk/modules/xalky/socket/.htaccess
XoopsModules/xalky/trunk/modules/xalky/socket/server
XoopsModules/xalky/trunk/modules/xalky/socket/server.conf
XoopsModules/xalky/trunk/modules/xalky/socket/server.rb
XoopsModules/xalky/trunk/modules/xalky/sounds/
XoopsModules/xalky/trunk/modules/xalky/sounds/index.html
XoopsModules/xalky/trunk/modules/xalky/sounds/license.txt
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_1.mp3
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_2.mp3
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_3.mp3
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_4.mp3
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_5.mp3
XoopsModules/xalky/trunk/modules/xalky/sounds/sound_6.mp3
XoopsModules/xalky/trunk/modules/xalky/sql/
XoopsModules/xalky/trunk/modules/xalky/sql/chat.sql
XoopsModules/xalky/trunk/modules/xalky/src/
XoopsModules/xalky/trunk/modules/xalky/src/EmptySwf.as
XoopsModules/xalky/trunk/modules/xalky/src/FABridge.as
XoopsModules/xalky/trunk/modules/xalky/src/index.html
XoopsModules/xalky/trunk/modules/xalky/templates/
XoopsModules/xalky/trunk/modules/xalky/templates/xalky_loggedin.html
XoopsModules/xalky/trunk/modules/xalky/templates/xalky_loggedout.html
XoopsModules/xalky/trunk/modules/xalky/xoops_version.php
XoopsModules/xalky/trunk/xoops_data/
XoopsModules/xalky/trunk/xoops_data/.htaccess
XoopsModules/xalky/trunk/xoops_data/readme.txt
XoopsModules/xalky/trunk/xoops_data/xalky/
XoopsModules/xalky/trunk/xoops_lib/
XoopsModules/xalky/trunk/xoops_lib/.htaccess
XoopsModules/xalky/trunk/xoops_lib/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/
XoopsModules/xalky/trunk/xoops_lib/modules/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/Xalky.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyEncoding.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyFileSystem.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyHTTPHeader.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyLanguage.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyString.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XalkyTemplate.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/Xoops.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/XoopsInterface.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/class/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/data/
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/data/channels.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/data/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/data/users.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ar.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/bg.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/bp.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ca.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/cy.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/cz.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/de.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/dk.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/el.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/en.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/es.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/fi.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/fr.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/gl.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/he.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/hr.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/hu.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/in.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/it.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ja.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ka.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/kr.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/nl.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/no.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/pl.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ro.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/ru.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/sk.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/sl.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/sr.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/sv.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/tr.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/uk.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/zh-tw.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/lang/zh.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/templates/
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/templates/index.html
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/templates/xalky_loggedin.php
XoopsModules/xalky/trunk/xoops_lib/modules/xalky/templates/xalky_loggedout.php
XoopsModules/xalky/trunk/xoops_lib/readme.txt
Added: XoopsModules/xalky/trunk/modules/index.html
===================================================================
--- XoopsModules/xalky/trunk/modules/index.html (rev 0)
+++ XoopsModules/xalky/trunk/modules/index.html 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/.htaccess
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/.htaccess (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/.htaccess 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,10 @@
+RewriteEngine On
+RewriteCond %{SERVER_PORT} !^80$
+RewriteRule .http://%{SERVER_NAME}%{REQUEST_URI} [R,L=301]
+
+<Files ~ "^.(htaccess|htpasswd)$">
+deny from all
+</Files>
+AddCharset UTF-8 .utf8
+AddDefaultCharset UTF-8
+DirectoryIndex home.php index.php home.html index.html home.htm index.htm
Added: XoopsModules/xalky/trunk/modules/xalky/.htaccess_500
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/.htaccess_500 (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/.htaccess_500 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,7 @@
+<Files ~ "^.(htaccess|htpasswd)$">
+deny from all
+</Files>
+AddCharset UTF-8 .utf8
+AddDefaultCharset UTF-8
+AddHandler application/x-httpd-php .php3 .php .shtml .html .htm
+DirectoryIndex home.php index.php home.html index.html home.htm index.htm
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/.htaccess_501
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/.htaccess_501 (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/.htaccess_501 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,15 @@
+<Files ~ "^.(htaccess|htpasswd)$">
+deny from all
+</Files>
+AddCharset UTF-8 .utf8
+AddDefaultCharset UTF-8
+AddHandler application/x-httpd-php .php3 .php .shtml .html .htm
+DirectoryIndex home.php index.php home.html index.html home.htm index.htm
+php_value allow_url_include on
+php_value allow_url_fopen on
+php_value register_long_arrays 1
+php_flag session.bug_compat_42 0
+php_flag session.bug_compat_warn 0
+php_flag session.use_trans_sid 1
+php_flag session.use_cookies 1
+php_flag display_errors 0
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/admin/index.html
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/admin/index.html (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/admin/index.html 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/class/bans.php
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/class/bans.php (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/class/bans.php 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,45 @@
+<?php
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage classes
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+class XalkyBans extends XoopsObject
+{
+
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('userID', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('userName', XOBJ_DTYPE_TXTBOX, null, false, 64);
+ $this->initVar('time', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('ip', XOBJ_DTYPE_OTHER, null);
+ }
+
+}
+
+class XalkyBansHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "xalky_bans", "XalkyBans", "id");
+ }
+
+}
Added: XoopsModules/xalky/trunk/modules/xalky/class/index.html
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/class/index.html (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/class/index.html 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/class/invitations.php
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/class/invitations.php (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/class/invitations.php 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage classes
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+class XalkyInvitations extends XoopsObject
+{
+
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('userID', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('channel', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('time', XOBJ_DTYPE_INT, 0, false);
+ }
+
+}
+
+class XalkyInvitationsHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "xalky_invitations", "XalkyInvitations", "id");
+ }
+
+}
Added: XoopsModules/xalky/trunk/modules/xalky/class/messages.php
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/class/messages.php (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/class/messages.php 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage classes
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+class XalkyMessages extends XoopsObject
+{
+
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('userID', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('userName', XOBJ_DTYPE_TXTBOX, null, false, 64);
+ $this->initVar('userID', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('userRole', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('channel', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('time', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('ip', XOBJ_DTYPE_OTHER, null);
+ $this->initVar('text', XOBJ_DTYPE_OTHER, null);
+ }
+
+}
+
+class XalkyMessagesHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "xalky_messages", "XalkyMessages", "id");
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/class/online.php
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/class/online.php (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/class/online.php 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,64 @@
+<?php
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage classes
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+class XalkyOnline extends XoopsObject
+{
+
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('userID', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('userName', XOBJ_DTYPE_TXTBOX, null, false, 64);
+ $this->initVar('userID', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('userRole', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('channel', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('time', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('ip', XOBJ_DTYPE_OTHER, null);
+ }
+
+}
+
+class XalkyOnlineHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "xalky_online", "XalkyOnline", "id");
+ }
+
+ function setUserInactive($userId = 0, $username = '', $inactiveTimeout = 0)
+ {
+ $condition = 'userID='.$this->db->makeSafe($userID);
+ if($userName !== null) {
+ $condition .= ' OR userName='.$this->db->makeSafe($userName);
+ }
+ $sql = 'UPDATE
+ `'.$this->prefix($this->table).'`
+ SET
+ `time` = `time` + ' . ($inactiveTimeout * 60) . '
+ WHERE
+ '.$condition.';';
+
+ // Create a new SQL query:
+ return $this->db->queryF($sql);
+ }
+}
Added: XoopsModules/xalky/trunk/modules/xalky/css/Cobalt.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Cobalt.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Cobalt.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,152 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #loginContent h1 {
+ color:#D4D4D4;
+ }
+ #loginContent a {
+ color:#60A0DC;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #xalky h1 {
+ color:#D4D4D4;
+ }
+ #xalky a {
+ color:#60A0DC;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#565656;
+ background-color:#383838;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#565656;
+ }
+ #xalky .rowOdd {
+ background-color:#484848;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#D4D4D4;
+ }
+ #xalky .moderator {
+ color:#00AA00;
+ }
+ #xalky .admin {
+ color:red;
+ }
+ #xalky .xalkyBot {
+ color:#60A0DC;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#60A0DC;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Core.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Core.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Core.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,152 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#E5E5E8;
+ color:#000;
+ }
+ #loginContent h1 {
+ color:#000;
+ }
+ #loginContent a {
+ color:#000;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#FFF;
+ color:#000;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#F7F5F1;
+ color:#000;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#E5E5E8;
+ color:#000;
+ }
+ #xalky h1 {
+ color:#000;
+ }
+ #xalky a {
+ color:#000;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#FFF;
+ color:#000;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#ADADAD;
+ background-color:#FFF;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#F7F5F1;
+ color:#000;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#ECEDF3;
+ }
+ #xalky .rowOdd {
+ background-color:#F6F6F6;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#000;
+ }
+ #xalky .moderator {
+ color:#0000FF;
+ }
+ #xalky .admin {
+ color:#FF0000;
+ }
+ #xalky .xalkyBot {
+ color:#476C8E;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#476C8E;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#88A6C0;
+ color:#FFF;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Lithium.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Lithium.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Lithium.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,151 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #loginContent h1 {
+ color:#333333;
+ }
+ #loginContent a {
+ color:#638137;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #xalky h1 {
+ color:#333333;
+ }
+ #xalky a {
+ color:#638137;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#6C8A3F;
+ background-color:#FFF;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#F1F1F1;
+ }
+ #xalky .rowOdd {
+ background-color:#DEDFDF;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#000;
+ }
+ #xalky .moderator {
+ color:#00AA00;
+ }
+ #xalky .admin {
+ color:red;
+ }
+ #xalky .xalkyBot {
+ color:#638137;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#638137;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#6C8A3F;
+ color:#FFF;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Mercury.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Mercury.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Mercury.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,152 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #loginContent h1 {
+ color:#D4D4D4;
+ }
+ #loginContent a {
+ color:#F6B620;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #xalky h1 {
+ color:#D4D4D4;
+ }
+ #xalky a {
+ color:#F6B620;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#565656;
+ background-color:#383838;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#565656;
+ }
+ #xalky .rowOdd {
+ background-color:#484848;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#D4D4D4;
+ }
+ #xalky .moderator {
+ color:#00AA00;
+ }
+ #xalky .admin {
+ color:red;
+ }
+ #xalky .xalkyBot {
+ color:#F6B620;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#F6B620;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/MyBB.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/MyBB.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/MyBB.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,152 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#FFF;
+ color:#000;
+ }
+ #loginContent h1 {
+ color:#0F5C8E;
+ }
+ #loginContent a {
+ color:#026CB1;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#EFEFEF;
+ color:#000;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#F7F5F1;
+ color:#000;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#FFF;
+ color:#000;
+ }
+ #xalky h1 {
+ color:#0F5C8E;
+ }
+ #xalky a {
+ color:#026CB1;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#EFEFEF;
+ color:#000;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#0F5C8E;
+ background-color:#EFEFEF;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#F7F5F1;
+ color:#000;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#EFEFEF;
+ }
+ #xalky .rowOdd {
+ background-color:#F5F5F5;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#000;
+ }
+ #xalky .moderator {
+ color:#CC00CC;
+ }
+ #xalky .admin {
+ color:#008000;
+ }
+ #xalky .xalkyBot {
+ color:#026CB1;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#026CB1;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#ADCBE7;
+ color:#000;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Oxygen.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Oxygen.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Oxygen.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,154 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #loginContent h1 {
+ color:#333333;
+ }
+ #loginContent a {
+ color:#005CB1;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #xalky h1 {
+ color:#333333;
+ }
+ #xalky a {
+ color:#005CB1;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#0066B9;
+ background-color:#FFF;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#F1F1F1;
+ }
+ #xalky .rowOdd {
+ background-color:#DEDFDF;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#000;
+ }
+ #xalky .moderator {
+ color:#00AA00;
+ }
+ #xalky .admin {
+ color:red;
+ }
+ #xalky .xalkyBot {
+ color:#005CB1;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#005CB1;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#0066B9;
+ color:#FFF;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Radium.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Radium.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Radium.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,152 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #loginContent h1 {
+ color:#D4D4D4;
+ }
+ #loginContent a {
+ color:#60C860;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#424242;
+ color:#D4D4D4;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#2A2A2A;
+ color:#D4D4D4;
+ }
+ #xalky h1 {
+ color:#D4D4D4;
+ }
+ #xalky a {
+ color:#60C860;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#565656;
+ background-color:#383838;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#565656;
+ }
+ #xalky .rowOdd {
+ background-color:#484848;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#D4D4D4;
+ }
+ #xalky .moderator {
+ color:#00AA00;
+ }
+ #xalky .admin {
+ color:red;
+ }
+ #xalky .xalkyBot {
+ color:#60C860;
+ }
+ #xalky #xalkyList .xalkyBotErrorMessage {
+ color:red;
+ }
+ #xalky #xalkyList a {
+ color:#60C860;
+ }
+ #xalky #xalkyList .delete {
+ background:url('../images/delete.png') no-repeat right;
+ }
+ #xalky #xalkyList .deleteSelected {
+ border-color:red;
+ }
+ #xalky #onlineListContainer h3, #xalky #helpContainer h3, #xalky #settingsContainer h3 {
+ background-color:#383838;
+ color:#D4D4D4;
+ }
+ #xalky #settingsContainer #settingsList input.playback {
+ background:url('../images/playback.png') no-repeat;
+ }
+
+}
\ No newline at end of file
Added: XoopsModules/xalky/trunk/modules/xalky/css/Sulfur.css
===================================================================
--- XoopsModules/xalky/trunk/modules/xalky/css/Sulfur.css (rev 0)
+++ XoopsModules/xalky/trunk/modules/xalky/css/Sulfur.css 2014-10-19 21:17:38 UTC (rev 12817)
@@ -0,0 +1,153 @@
+/*
+ * Chronolabs XOOPS Chat Module - xALKY
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ * @copyright Chronolabs Cooperative http://labs.coop
+ * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html)
+ * @package xalky
+ * @since 1.111
+ * @author Antony Cipher <ci...@la...>
+ * @author Simon Roberts <me...@la...>
+ * @subpackage stylesheets
+ * @description Chronolabs XOOPS Module for Chat and Walky Talky Services
+ *
+ */
+
+
+@import url('positions.css');
+@import url('borders.css');
+@import url('fonts.css');
+@import url('misc.css');
+@import url('print.css');
+
+
+@media screen,projection,handheld {
+
+ #loginContent {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #loginContent h1 {
+ color:#333333;
+ }
+ #loginContent a {
+ color:#822100;
+ }
+ #loginContent input, #loginContent select {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #loginContent #loginFormContainer #loginButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #loginContent #errorContainer {
+ color:red;
+ }
+
+ #xalky {
+ background-color:#F1F1F1;
+ color:#333333;
+ }
+ #xalky h1 {
+ color:#333333;
+ }
+ #xalky a {
+ color:#822100;
+ }
+ #xalky input, #xalky select, #xalky textarea {
+ background-color:#FFF;
+ color:#333333;
+ }
+ #xalky #xalkyList, #xalky #onlineListContainer, #xalky #helpContainer, #xalky #settingsContainer, #xalky #bbCodeContainer, #xalky #colorCodesContainer, #xalky #emoticonsContainer {
+ border-color:#B84623;
+ background-color:#FFF;
+ }
+ .statusContainerOn {
+ background-image: url('../images/loading.png');
+ }
+ .statusContainerOff {
+ background-image: url('../images/loading-done.png');
+ }
+ .statusContainerAlert {
+ background-image: url('../images/loading-trouble.png');
+ }
+ #xalky #bbCodeContainer input, #xalky #logoutButton, #xalky #submitButton {
+ background-color:#F7F5F1;
+ color:#333333;
+ }
+ #xalky #colorCodesContainer a {
+ border-color:black;
+ }
+ #xalky #optionsContainer input {
+ background-color:transparent;
+ }
+ #xalky #optionsContainer #helpButton {
+ background:url('../images/help.png') no-repeat;
+ }
+ #xalky #optionsContainer #settingsButton {
+ background:url('../images/settings.png') no-repeat;
+ }
+ #xalky #optionsContainer #onlineListButton {
+ background:url('../images/users.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton {
+ background:url('../images/audio.png') no-repeat;
+ }
+ #xalky #optionsContainer #audioButton.off {
+ background:url('../images/audio-off.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton {
+ background:url('../images/autoscroll.png') no-repeat;
+ }
+ #xalky #optionsContainer #autoScrollButton.off {
+ background:url('../images/autoscroll-off.png') no-repeat;
+ }
+ #xalky .rowEven {
+ background-color:#F1F1F1;
+ }
+ #xalky .rowOdd {
+ background-color:#DEDFDF;
+ }
+ #xalky .guest {
+ color:gray;
+ }
+ #xalky .user {
+ color:#000;
+ }
+ #xalky .moderator ...
[truncated message content] |
|
From: <be...@us...> - 2014-10-19 04:35:34
|
Revision: 12816
http://sourceforge.net/p/xoops/svn/12816
Author: beckmi
Date: 2014-10-19 04:35:29 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
Cosmetic changes
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,48 +0,0 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
-
-1. Author(s)
---------------------------------
-Initial author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
-Initial TCPDF version : 6.0.093
-Programmers having been adaptation and optimization for Xoops
-- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
-- Philodenelle - www.chg-web.org - phi...@ch...
-
-2. Minimum required
---------------------------------
-- Xoops 2.5.7
-- PHP 5.3.17
-
-3. Installing TCPDF_for_Xoops
---------------------------------
-Xoops 2.5.7 and higher
-- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
-- Check the following directories have write access
- * ./xoops_lib/vendor/tcpdf/fonts
- * ./xoops_lib/vendor/tcpdf/cache
- * ./xoops_lib/vendor/tcpdf/images
-- For specifics characters (japanese, korean, chinese, taiwanese) download
- the specific font (see below) and copy the directory ./Frameworks/tcpdf/fonts or ./language/fonts
- * For Chinese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_simplified_font_tcpdf_for_xoops.zip/download
- * For Taiwan character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_taiwan_font_tcpdf_for_xoops.zip/download
- * For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
- * For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-
-4. Update TCPDF_for_xoops
---------------------------------
-Xoops 2.5.0 - 2.5.6
-- This version
-
-Xoops 2.5.7 and higher
-- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-
-
-5. Convert a font for TCPDF_for_Xoops
---------------------------------
-- Using the addTTFfont() method you can directly create a TCPDF font starting
- from a TrueType, OpenType or Type1 font.
- NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
-
- For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,4 +1,4 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
+TCPDF_for_XOOPS Version 2.01 - 2014-09-13
1. Author(s)
--------------------------------
@@ -13,11 +13,11 @@
- Xoops 2.5.7
- PHP 5.3.17
-3. Installing TCPDF_for_Xoops
+3. Installing TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.7 and higher
- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
+- replace files makepdf.php for modules you need
- Check the following directories have write access
* ./xoops_lib/vendor/tcpdf/fonts
* ./xoops_lib/vendor/tcpdf/cache
@@ -29,7 +29,7 @@
* For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
* For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-4. Update TCPDF_for_xoops
+4. Update TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.0 - 2.5.6
- This version
@@ -38,11 +38,11 @@
- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-5. Convert a font for TCPDF_for_Xoops
+5. Convert a font for TCPDF_for_XOOPS
--------------------------------
- Using the addTTFfont() method you can directly create a TCPDF font starting
from a TrueType, OpenType or Type1 font.
NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
+ $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -0,0 +1,10 @@
+CREDITS
+===============
+
+The TCPDF Library is developed by Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
+
+The adaptation and optimization for XOOPS have been done by:
+- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
+- Philodenelle - www.chg-web.org - phi...@ch...
+
+For changes: please see changelog.txt
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -323,7 +323,7 @@
}
// get char
$chr = ord($data[$pos + $charscount]);
- $charscount++;
+ ++$charscount;
// STEP L
if ($this->isCharMode($chr, ENC_ASCII_NUM)) {
$numch[ENC_ASCII] += (1 / 2);
@@ -636,17 +636,17 @@
$tcw = (($temp_cw[0] & 0x3F) << 2) + (($temp_cw[1] & 0x30) >> 4);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw= (($temp_cw[1] & 0x0F) << 4) + (($temp_cw[2] & 0x3C) >> 2);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw = (($temp_cw[2] & 0x03) << 6) + ($temp_cw[3] & 0x3F);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$temp_cw = array();
$pos = $epos;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -214,7 +214,7 @@
$len = count($frame);
// the frame is square (width = height)
foreach ($frame as &$frameLine) {
- for ($i=0; $i<$len; $i++) {
+ for ($i=0; $i<$len; ++$i) {
$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
}
}
@@ -247,10 +247,10 @@
$this->dir = -1;
$this->bit = -1;
// inteleaved data and ecc codes
- for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+ for ($i=0; $i < ($this->dataLength + $this->eccLength); ++$i) {
$code = $this->getCode();
$bit = 0x80;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
$bit = $bit >> 1;
@@ -258,7 +258,7 @@
}
// remainder bits
$j = $this->getRemainder($this->version);
- for ($i=0; $i<$j; $i++) {
+ for ($i=0; $i<$j; ++$i) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02);
}
@@ -295,7 +295,7 @@
$x--;
$this->bit++;
} else {
- $x++;
+ ++$x;
$y += $this->dir;
$this->bit--;
}
@@ -345,7 +345,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
if ($this->rsBlockNum2($spec) == 0) return 0;
$dl = $this->rsDataCodes2($spec);
@@ -364,7 +364,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
return 0;
}
@@ -525,7 +525,7 @@
$this->runLength[$head] = 1;
} elseif ($x > 0) {
if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -544,7 +544,7 @@
$this->runLength[$head] = 1;
} elseif ($y > 0) {
if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -614,7 +614,7 @@
$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
$p = 0;
while($this->isdigitat($this->dataStr, $p)) {
- $p++;
+ ++$p;
}
$run = $p;
$mode = $this->identifyMode($p);
@@ -641,7 +641,7 @@
if ($this->isdigitat($this->dataStr, $p)) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsModeAn($p) // + 4 + la
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -652,7 +652,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -685,7 +685,7 @@
if ($mode == QR_MODE_NM) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -698,7 +698,7 @@
} elseif ($mode == QR_MODE_AN) {
$q = $p;
while($this->isalnumat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeAn($q - $p) + 4 + $la
@@ -709,7 +709,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -756,7 +756,7 @@
$p += 2;
} else {
if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
- $p++;
+ ++$p;
}
}
return $this->dataStr;
@@ -1167,7 +1167,7 @@
} else {
$bstream[$p] = 0;
}
- $p++;
+ ++$p;
$mask = $mask >> 1;
}
}
@@ -1195,21 +1195,21 @@
$data = array_fill(0, (int)(($size + 7) / 8), 0);
$bytes = (int)($size / 8);
$p = 0;
- for ($i=0; $i<$bytes; $i++) {
+ for ($i=0; $i<$bytes; ++$i) {
$v = 0;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$i] = $v;
}
if ($size & 7) {
$v = 0;
- for ($j=0; $j<($size & 7); $j++) {
+ for ($j=0; $j<($size & 7); ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$bytes] = $v;
}
@@ -1295,7 +1295,7 @@
);
$yStart = $oy - 2;
$xStart = $ox - 2;
- for ($y=0; $y < 5; $y++) {
+ for ($y=0; $y < 5; ++$y) {
$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
}
return $frame;
@@ -1351,7 +1351,7 @@
"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
);
- for ($y=0; $y < 7; $y++) {
+ for ($y=0; $y < 7; ++$y) {
$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
}
return $frame;
@@ -1509,7 +1509,7 @@
}
$rs['iprim'] = (int)($iprim / $prim);
$rs['genpoly'][0] = 1;
- for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
+ for ($i = 0,$root=$fcr*$prim; $i < $nroots; ++$i, $root += $prim) {
$rs['genpoly'][$i+1] = 1;
// Multiply rs->genpoly[] by @**(root + x)
for ($j = $i; $j > 0; --$j) {
@@ -1541,7 +1541,7 @@
$PAD =& $rs['pad']; // the number of pad symbols in a block
$A0 =& $NN;
$parity = array_fill(0, $NROOTS, 0);
- for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+ for ($i=0; $i < ($NN - $NROOTS - $PAD); ++$i) {
$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
if ($feedback != $A0) {
// feedback term is non-zero
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -726,21 +726,21 @@
$pfile .= '// Japanese'."\n";
$pfile .= '$enc=\'UniJIS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Japan1\',\'Supplement\'=>5);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
case 'CID0KR': {
$pfile .= '// Korean'."\n";
$pfile .= '$enc=\'UniKS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Korea1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ak12.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ak12.php\');'."\n";
break;
}
case 'CID0CS': {
$pfile .= '// Chinese Simplified'."\n";
$pfile .= '$enc=\'UniGB-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'GB1\',\'Supplement\'=>2);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ag15.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ag15.php\');'."\n";
break;
}
case 'CID0CT':
@@ -748,7 +748,7 @@
$pfile .= '// Chinese Traditional'."\n";
$pfile .= '$enc=\'UniCNS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'CNS1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
}
@@ -997,7 +997,7 @@
$subsetglyphs[$g] = true;
}
}
- }
+ }
break;
}
case 6: { // Format 6: Trimmed table mapping
@@ -1393,7 +1393,7 @@
return $map;
}
public static function _getfontpath() {
- if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
+ if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(__DIR__.'/../fonts'))) {
if (substr($fdir, -1) != '/') $fdir .= '/';
define('K_PATH_FONTS', $fdir);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -2486,7 +2486,7 @@
// sara u, sara uu, pinthu
$lowvowel = array(0x0e38, 0x0e39, 0x0e3a);
$output = array();
- for ($i = 0; $i < $numchars; $i++) {
+ for ($i = 0; $i < $numchars; ++$i) {
if (($unicode[$i] >= 0x0e00) && ($unicode[$i] <= 0x0e5b)) {
$ch0 = $unicode[$i];
$ch1 = ($i > 0) ? $unicode[($i - 1)] : 0;
@@ -3862,7 +3862,7 @@
if (in_array($file, $this->imagekeys)) {
// get existing image data
$info = $this->getImageBuffer($file);
- $imsize = array($info['w'], $info['h']);
+ $imsize = array($info['w'], $info['h']);
} elseif (strpos($file, '__tcpdf_img') === FALSE) {
$imgdata = TCPDF_STATIC::fileGetContents($file);
}
@@ -6388,7 +6388,7 @@
// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
if ($this->pdfa_mode OR $this->force_srgb) {
$iccobj = $this->_newobj();
- $icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
+ $icc = file_get_contents(__DIR__.'/include/sRGB.icc');
$filter = '';
if ($this->compress) {
$filter = ' /Filter /FlateDecode';
@@ -6543,7 +6543,7 @@
//$out .= ' /XFA ';
$out .= ' >>';
// signatures
- if ($this->sign AND isset($this->signature_data['cert_type'])
+ if ($this->sign AND isset($this->signature_data['cert_type'])
AND (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A'))) {
if ($this->signature_data['cert_type'] > 0) {
$out .= ' /Perms << /DocMDP '.($this->sig_obj_id + 1).' 0 R >>';
@@ -10330,7 +10330,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_1d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -10624,7 +10624,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_2d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -12599,7 +12599,7 @@
$spacew = ($spacewidth * $ns);
}
$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
- $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
+ $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
if ($epsposend !== null) {
$epsposend += strlen($this->epsmarker.'Q');
$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -668,7 +668,7 @@
// create a bar-space sequence
$seq = '';
$chrlen = strlen($chr[$char_bar]);
- for ($s = 0; $s < $chrlen; $s++){
+ for ($s = 0; $s < $chrlen; ++$s){
$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
}
$seqlen = strlen($seq);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -135,14 +135,14 @@
$qrtype = strtoupper($mode[0]);
switch ($qrtype) {
case 'DATAMATRIX': { // DATAMATRIX (ISO/IEC 16022)
- require_once(dirname(__FILE__).'/include/barcodes/datamatrix.php');
+ require_once(__DIR__.'/include/barcodes/datamatrix.php');
$qrcode = new Datamatrix($code);
$this->barcode_array = $qrcode->getBarcodeArray();
$this->barcode_array['code'] = $code;
break;
}
case 'PDF417': { // PDF417 (ISO/IEC 15438:2006)
- require_once(dirname(__FILE__).'/include/barcodes/pdf417.php');
+ require_once(__DIR__.'/include/barcodes/pdf417.php');
if (!isset($mode[1]) OR ($mode[1] === '')) {
$aspectratio = 2; // default aspect ratio (width / height)
} else {
@@ -173,7 +173,7 @@
break;
}
case 'QRCODE': { // QR-CODE
- require_once(dirname(__FILE__).'/include/barcodes/qrcode.php');
+ require_once(__DIR__.'/include/barcodes/qrcode.php');
if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
$mode[1] = 'L'; // Ddefault: Low error correction
}
@@ -223,4 +223,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,6 +1,6 @@
<?php
if (!defined('XOOPS_ROOT_PATH')) die('XOOPS root path not defined');
-require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
+require_once(__DIR__.'/include/tcpdf_filters.php');
class TCPDF_PARSER {
private $pdfdata = '';
protected $xref = array();
@@ -595,4 +595,4 @@
}
}
-}
\ No newline at end of file
+}
|
|
From: <wis...@us...> - 2014-10-13 19:10:50
|
Revision: 12815
http://sourceforge.net/p/xoops/svn/12815
Author: wishcraft
Date: 2014-10-13 19:09:46 +0000 (Mon, 13 Oct 2014)
Log Message:
-----------
Update Releases from labs.coop ~ Chronolabs Cooperative
Added Paths:
-----------
XoopsModules/signed/
XoopsModules/signed/releases/
XoopsModules/signed/releases/1.11/
XoopsModules/signed/releases/1.11/modules/
XoopsModules/signed/releases/1.11/modules/index.html
XoopsModules/signed/releases/1.11/modules/signed/
XoopsModules/signed/releases/1.11/modules/signed/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/admin/
XoopsModules/signed/releases/1.11/modules/signed/admin/about.php
XoopsModules/signed/releases/1.11/modules/signed/admin/admin.php
XoopsModules/signed/releases/1.11/modules/signed/admin/admin_footer.php
XoopsModules/signed/releases/1.11/modules/signed/admin/admin_header.php
XoopsModules/signed/releases/1.11/modules/signed/admin/events.php
XoopsModules/signed/releases/1.11/modules/signed/admin/index.html
XoopsModules/signed/releases/1.11/modules/signed/admin/menu.php
XoopsModules/signed/releases/1.11/modules/signed/admin/signatures.php
XoopsModules/signed/releases/1.11/modules/signed/api/
XoopsModules/signed/releases/1.11/modules/signed/api/banned/
XoopsModules/signed/releases/1.11/modules/signed/api/banned/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/banned/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/classes/
XoopsModules/signed/releases/1.11/modules/signed/api/classes/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/classes/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/descriptions/
XoopsModules/signed/releases/1.11/modules/signed/api/descriptions/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/descriptions/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/enumerators/
XoopsModules/signed/releases/1.11/modules/signed/api/enumerators/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/enumerators/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/fields/
XoopsModules/signed/releases/1.11/modules/signed/api/fields/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/fields/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/fieldtypes/
XoopsModules/signed/releases/1.11/modules/signed/api/fieldtypes/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/fieldtypes/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/identifications/
XoopsModules/signed/releases/1.11/modules/signed/api/identifications/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/identifications/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/language/
XoopsModules/signed/releases/1.11/modules/signed/api/language/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/language/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/languages/
XoopsModules/signed/releases/1.11/modules/signed/api/languages/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/languages/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/processes/
XoopsModules/signed/releases/1.11/modules/signed/api/processes/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/processes/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/prompts/
XoopsModules/signed/releases/1.11/modules/signed/api/prompts/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/prompts/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/providers/
XoopsModules/signed/releases/1.11/modules/signed/api/providers/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/providers/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/request/
XoopsModules/signed/releases/1.11/modules/signed/api/request/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/request/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/sign/
XoopsModules/signed/releases/1.11/modules/signed/api/sign/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/sign/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/signatures/
XoopsModules/signed/releases/1.11/modules/signed/api/signatures/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/signatures/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/sites/
XoopsModules/signed/releases/1.11/modules/signed/api/sites/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/sites/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/states/
XoopsModules/signed/releases/1.11/modules/signed/api/states/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/states/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/validate.php
XoopsModules/signed/releases/1.11/modules/signed/api/validations/
XoopsModules/signed/releases/1.11/modules/signed/api/validations/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/validations/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/verification/
XoopsModules/signed/releases/1.11/modules/signed/api/verification/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/verification/index.php
XoopsModules/signed/releases/1.11/modules/signed/api/verify/
XoopsModules/signed/releases/1.11/modules/signed/api/verify/.htaccess
XoopsModules/signed/releases/1.11/modules/signed/api/verify/index.php
XoopsModules/signed/releases/1.11/modules/signed/class/
XoopsModules/signed/releases/1.11/modules/signed/class/cache/
XoopsModules/signed/releases/1.11/modules/signed/class/cache/apc.php
XoopsModules/signed/releases/1.11/modules/signed/class/cache/file.php
XoopsModules/signed/releases/1.11/modules/signed/class/cache/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/cache/memcache.php
XoopsModules/signed/releases/1.11/modules/signed/class/cache/model.php
XoopsModules/signed/releases/1.11/modules/signed/class/cache/signedcache.php
XoopsModules/signed/releases/1.11/modules/signed/class/cache/xcache.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/config.image.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/config.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/config.recaptcha.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/config.text.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background00.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background01.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background02.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background03.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background04.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background05.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background06.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background07.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background08.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background09.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/background10.png
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/backgrounds/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/Vera.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraBI.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraBd.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraIt.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraMoBI.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraMoBd.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraMoIt.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraMono.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/VeraSe.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/fonts/verasebd.ttf
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/scripts/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/scripts/image.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image/scripts/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/image.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/recaptcha/
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/recaptcha/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/recaptcha/recaptchalib.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/recaptcha.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/signedcaptcha.php
XoopsModules/signed/releases/1.11/modules/signed/class/captcha/text.php
XoopsModules/signed/releases/1.11/modules/signed/class/event_links.php
XoopsModules/signed/releases/1.11/modules/signed/class/events.php
XoopsModules/signed/releases/1.11/modules/signed/class/file/
XoopsModules/signed/releases/1.11/modules/signed/class/file/file.php
XoopsModules/signed/releases/1.11/modules/signed/class/file/folder.php
XoopsModules/signed/releases/1.11/modules/signed/class/file/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/file/signedfile.php
XoopsModules/signed/releases/1.11/modules/signed/class/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mail/
XoopsModules/signed/releases/1.11/modules/signed/class/mail/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/ChangeLog.txt
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/LICENSE
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/README
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/class.phpmailer.php
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/class.pop3.php
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/class.smtp.php
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/docs.ini
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/language/
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/language/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mail/phpmailer/language/phpmailer.lang-en.php
XoopsModules/signed/releases/1.11/modules/signed/class/mail/signedmultimailer.php
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/handlers/
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/handlers/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/handlers/sms.cardboardfish.php
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/plugin/
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/plugin/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/signedsmscontroller.php
XoopsModules/signed/releases/1.11/modules/signed/class/mobile/signedsmsmobile.php
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/qcp.base.php
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/qcp.class.php
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/qcp.enumerator.php
XoopsModules/signed/releases/1.11/modules/signed/class/qcp/qcp.leaver-beaver.php
XoopsModules/signed/releases/1.11/modules/signed/class/signatures.php
XoopsModules/signed/releases/1.11/modules/signed/class/signedapi.php
XoopsModules/signed/releases/1.11/modules/signed/class/signedarrays.php
XoopsModules/signed/releases/1.11/modules/signed/class/signedcanvas.php
XoopsModules/signed/releases/1.11/modules/signed/class/signedciphers.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/dhtmltextarea.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/editor_registry.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/language/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/language/english.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/dhtmltextarea/language/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/readme.txt
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/sampleform.inc.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/signededitor.inc.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/signededitor.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/editor_registry.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/language/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/language/english.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/language/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/textarea/textarea.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/editor_registry.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/formtinymce.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/xoopscode.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/xoopsemotions.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/xoopsimagemanager.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/xoopsmlcontent.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/include/xoopsquote.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/language/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/language/english.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/language/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/settings.php
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/style.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/changelog.txt
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/langs/en.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/license.txt
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlist/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlist/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autoresize/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autoresize/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example_dependency/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/example_dependency/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/legacyoutput/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/legacyoutput/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/lists/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/lists/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/media.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/example.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/print/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/print/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/save/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/save/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/props.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/tabfocus/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/table.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/template/template.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/index.html
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
XoopsModules/signed/releases/1.11/modules/signed/class/signededitor/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
XoopsModules/signed/releases/1.11/modules/signed/cla...
[truncated message content] |
|
From: <be...@us...> - 2014-10-08 15:01:24
|
Revision: 12814
http://sourceforge.net/p/xoops/svn/12814
Author: beckmi
Date: 2014-10-08 15:01:21 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
code clean-up for consistency
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
XoopsModules/xforms/branches/mamba/xforms/admin/file.php
XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php
XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
Added Paths:
-----------
XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,16 +1,29 @@
-<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
-
- if($value[0] != "Y-m-d" AND $value[0] != "") {
- $date_value = strtotime($value[0]);
- } else {
- $date_value = "";
- }
- $date = new XoopsFormTextDateSelect (_AM_ELE_DATE, 'ele_value', $size = 15, $date_value);
- $output->addElement($date);
-
-?>
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+if ( !defined('xforms_ROOT_PATH') ) { exit(); }
+
+ if ($value[0] != "Y-m-d" and $value[0] != "") {
+ $date_value = strtotime($value[0]);
+ } else {
+ $date_value = "";
+ }
+ $date = new XoopsFormTextDateSelect (_AM_XFORMS_ELE_DATE, 'ele_value', $size = 15, $date_value);
+ $output->addElement($date);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,25 +1,39 @@
-<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if (!defined('xforms_ROOT_PATH')) {
- exit();
-}
-
-if (empty($addopt) && !empty($ele_id)) {
- $ele_value = $element->getVar('ele_value');
-}
-$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
-$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
-$allow_multi = empty($ele_value[1]) ? 0 : 1;
-$multiple = new XoopsFormRadioYN(_AM_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
-$country = xoops_getModuleOption('mycountry', 'xforms');
-$countries = !empty($ele_value[2]) ? $ele_value[2] : $country;
-$reg_form = new XoopsFormSelectCountry(_AM_ELE_SELECT_CTRY, 'ele_value[2]', $countries);
-//
-$output->addElement($size, 1);
-$output->addElement($multiple);
-//$output->addElement($opt_tray);
-$output->addElement($reg_form);
-
-?>
\ No newline at end of file
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+if (!defined('xforms_ROOT_PATH')) {
+ exit();
+}
+
+if (empty($addopt) && !empty($ele_id)) {
+ $ele_value = $element->getVar('ele_value');
+}
+$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
+$size = new XoopsFormText(_AM_XFORMS_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
+$allow_multi = empty($ele_value[1]) ? 0 : 1;
+$multiple = new XoopsFormRadioYN(_AM_XFORMS_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
+$country = xoops_getModuleOption('mycountry', 'xforms');
+$countries = !empty($ele_value[2]) ? $ele_value[2] : $country;
+$reg_form = new XoopsFormSelectCountry(_AM_XFORMS_ELE_SELECT_CTRY, 'ele_value[2]', $countries);
+//
+$output->addElement($size, 1);
+$output->addElement($multiple);
+//$output->addElement($opt_tray);
+$output->addElement($reg_form);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/file.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/file.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/file.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,12 +1,28 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
include 'admin_header.php';
$file = isset($_GET['f']) ? trim($_GET['f']) : '';
-$path = xforms_UPLOAD_PATH.$file;
-if( !$file || !preg_match('/^[0-9]+_{1}[0-9a-z]+\.[0-9a-z]+$/', $file) || !file_exists($path) ){
- redirect_header(XOOPS_URL, 0, _AM_NOTHING_SELECTED);
+$path = XFORMS_UPLOAD_PATH.$file;
+if ( !$file || !preg_match('/^[0-9]+_{1}[0-9a-z]+\.[0-9a-z]+$/', $file) || !file_exists($path) ) {
+ redirect_header(XOOPS_URL, 0, _AM_XFORMS_NOTHING_SELECTED);
}
header("Content-Type: application/octet-stream");
@@ -17,4 +33,3 @@
header("Content-Length: ".filesize($path));
readfile($path);
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,33 +1,49 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
include 'admin_header.php';
$version = number_format($xoopsModule->getVar('version')/100, 2);
$count = $xforms_form_mgr->getCount();
-if( $version >= 1.2 || $count > 0 ){
- xoops_cp_header();
- echo 'I guess this module has been upgraded already. Why don\'t you delete this file?';
-}elseif( $_POST['goupgrade'] == 1){
- $sql = $msgs = $ret = array();
- $error = false;
-
- $msgs[] = 'Rename form elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms').'` RENAME `'.$xoopsDB->prefix('xforms_formelements').'`';
-
- $msgs[] = 'Add form_id to elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` ADD `form_id` SMALLINT( 5 ) DEFAULT '1' NOT NULL AFTER `ele_id`";
-
- $msgs[] = 'Change default value of form_id in elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` CHANGE `form_id` `form_id` SMALLINT( 5 ) DEFAULT '0' NOT NULL";
-
- $method = $xoopsModuleConfig['method'];
- $method = $xoopsModuleConfig['method'] == 'pm' ? 'p' : 'e';
- $sendto = !empty($xoopsModuleConfig['admin_only']) ? 0 : $xoopsModuleConfig['group'];
- $delimiter = $xoopsModuleConfig['delimeter'] == 'br' ? 'b' : 's';
- $msgs[] = 'Create forms table...';
- $sql[] =
- "CREATE TABLE `".$xoopsDB->prefix('xforms_forms')."` (
+if ($version >= 1.2 || $count > 0) {
+ xoops_cp_header();
+ echo 'I guess this module has been upgraded already. Why don\'t you delete this file?';
+} elseif ($_POST['goupgrade'] == 1) {
+ $sql = $msgs = $ret = array();
+ $error = false;
+
+ $msgs[] = 'Rename form elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms').'` RENAME `'.$xoopsDB->prefix('xforms_formelements').'`';
+
+ $msgs[] = 'Add form_id to elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` ADD `form_id` SMALLINT( 5 ) DEFAULT '1' NOT NULL AFTER `ele_id`";
+
+ $msgs[] = 'Change default value of form_id in elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` CHANGE `form_id` `form_id` SMALLINT( 5 ) DEFAULT '0' NOT NULL";
+
+ $method = $xoopsModuleConfig['method'];
+ $method = $xoopsModuleConfig['method'] == 'pm' ? 'p' : 'e';
+ $sendto = !empty($xoopsModuleConfig['admin_only']) ? 0 : $xoopsModuleConfig['group'];
+ $delimiter = $xoopsModuleConfig['delimeter'] == 'br' ? 'b' : 's';
+ $msgs[] = 'Create forms table...';
+ $sql[] =
+ "CREATE TABLE `".$xoopsDB->prefix('xforms_forms')."` (
`form_id` smallint(5) NOT NULL auto_increment,
`form_send_method` char(1) NOT NULL default 'e',
`form_send_to_group` smallint(3) NOT NULL default '0',
@@ -41,55 +57,54 @@
PRIMARY KEY (`form_id`),
KEY `form_order` (`form_order`)
) ENGINE=MyISAM;";
-
- $msgs[] = 'Insert default data into forms table...';
- $sql[] =
- "INSERT INTO `".$xoopsDB->prefix('xforms_forms')."` VALUES (1, '".$method."', ".intval($sendto).", 1, '".$delimiter."', 'Contact Us', '"._SUBMIT."', 'Tell us about your comments for this site.', 'Contact us by filling out this form.', '');";
-
- for( $i=0; $i<count($sql); $i++ ){
- if( false != $xoopsDB->query($sql[$i]) ){
- $ret[] = $msgs[$i].'done.';
- }else{
- $ret[] = $msgs[$i].'failed.';
- $ret[] = ' '.$xoopsDB->error().' ('.$xoopsDB->errno().')';
- $error = true;
- }
- }
-
- if( $error == false ){
- $ret[] = 'Setting up default permissions...';
- $m = ' Grant permission of form id 1 to group id %u...%s';
- for( $i=1; $i<4; $i++ ){
- $perm = $moduleperm_handler->create();
- $perm->setVar('gperm_name', $xforms_form_mgr->perm_name);
- $perm->setVar('gperm_itemid', 1);
- $perm->setVar('gperm_groupid', $i);
- $perm->setVar('gperm_modid', $xoopsModule->getVar('mid'));
- if( !$moduleperm_handler->insert($perm) ){
- $ret[] = sprintf($m, $i, 'failed.');
- $error = true;
- }else{
- $ret[] = sprintf($m, $i, 'done.');
- }
- }
- }
-
- xoops_cp_header();
- $output = '';
- foreach( $ret as $r ){
- $output .= $r.'<br />';
- }
- echo '<pre><code>'.$output.'</code></pre>';
-
- if( false != $error ){
- echo '<b>Oh No! Upgrade seems failed... I honestly hope that you have a backup...</b>';
- }else{
- echo 'Upgrade successed. Now go <a href="'.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=xforms">update this module</a>.';
- }
-}else{
- xoops_cp_header();
- xoops_confirm(array('goupgrade' => 1), xforms_URL.'admin/upgrade.php', 'Make sure you have your files and database backuped. Are you really ready to upgrade the module now?', 'Cut the crap and do it');
+
+ $msgs[] = 'Insert default data into forms table...';
+ $sql[] =
+ "INSERT INTO `".$xoopsDB->prefix('xforms_forms')."` VALUES (1, '".$method."', ".intval($sendto).", 1, '".$delimiter."', 'Contact Us', '"._SUBMIT."', 'Tell us about your comments for this site.', 'Contact us by filling out this form.', '');";
+
+ for ( $i=0; $i<count($sql); $i++ ) {
+ if ( false != $xoopsDB->query($sql[$i]) ) {
+ $ret[] = $msgs[$i].'done.';
+ } else {
+ $ret[] = $msgs[$i].'failed.';
+ $ret[] = ' '.$xoopsDB->error().' ('.$xoopsDB->errno().')';
+ $error = true;
+ }
+ }
+
+ if ($error == false) {
+ $ret[] = 'Setting up default permissions...';
+ $m = ' Grant permission of form id 1 to group id %u...%s';
+ for ($i=1; $i<4; $i++) {
+ $perm = $moduleperm_handler->create();
+ $perm->setVar('gperm_name', $xforms_form_mgr->perm_name);
+ $perm->setVar('gperm_itemid', 1);
+ $perm->setVar('gperm_groupid', $i);
+ $perm->setVar('gperm_modid', $xoopsModule->getVar('mid'));
+ if ( !$moduleperm_handler->insert($perm) ) {
+ $ret[] = sprintf($m, $i, 'failed.');
+ $error = true;
+ } else {
+ $ret[] = sprintf($m, $i, 'done.');
+ }
+ }
+ }
+
+ xoops_cp_header();
+ $output = '';
+ foreach ($ret as $r) {
+ $output .= $r.'<br />';
+ }
+ echo '<pre><code>'.$output.'</code></pre>';
+
+ if (false != $error) {
+ echo '<b>Oh No! Upgrade seems failed... I honestly hope that you have a backup...</b>';
+ } else {
+ echo 'Upgrade successed. Now go <a href="'.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=xforms">update this module</a>.';
+ }
+} else {
+ xoops_cp_header();
+ xoops_confirm(array('goupgrade' => 1), XFORMS_URL.'admin/upgrade.php', 'Make sure you have your files and database backuped. Are you really ready to upgrade the module now?', 'Cut the crap and do it');
}
xoops_cp_footer();
-?>
\ No newline at end of file
Added: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
===================================================================
(Binary files differ)
Index: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png 2014-10-08 15:01:21 UTC (rev 12814)
Property changes on: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl 2014-10-08 15:01:21 UTC (rev 12814)
@@ -0,0 +1,5 @@
+{EHEADER}<br/>
+
+{MSG}<br/><br/>
+
+{EFOOTER}<br/>
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -51,4 +51,4 @@
define("_MI_xforms_ADMENU0","Home");
//1.22
-define("_MI_XFORMS_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
+define("_MI_XFORMS_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -27,7 +27,7 @@
$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
-$modversion['image'] = "assets/images/xforms2.png";
+$modversion['image'] = "assets/images/logo.png";
$modversion['dirname'] = $myDirName;
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
|
|
From: <be...@us...> - 2014-10-08 14:58:25
|
Revision: 12813
http://sourceforge.net/p/xoops/svn/12813
Author: beckmi
Date: 2014-10-08 14:58:09 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
Merging eForms into xForms 2.0 Alpha 1
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/about.php
XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php
XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php
XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_check.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_html.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_radio.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_select.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_tarea.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_text.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_upload.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_uploadimg.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_yn.php
XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
XoopsModules/xforms/branches/mamba/xforms/admin/index.php
XoopsModules/xforms/branches/mamba/xforms/admin/main.php
XoopsModules/xforms/branches/mamba/xforms/admin/menu.php
XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php
XoopsModules/xforms/branches/mamba/xforms/class/elements.php
XoopsModules/xforms/branches/mamba/xforms/class/forms.php
XoopsModules/xforms/branches/mamba/xforms/class/index.html
XoopsModules/xforms/branches/mamba/xforms/class/uploader.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/docs/credits.txt
XoopsModules/xforms/branches/mamba/xforms/docs/install.txt
XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt
XoopsModules/xforms/branches/mamba/xforms/docs/licence.txt
XoopsModules/xforms/branches/mamba/xforms/docs/readme.txt
XoopsModules/xforms/branches/mamba/xforms/header.php
XoopsModules/xforms/branches/mamba/xforms/include/common.php
XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php
XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
XoopsModules/xforms/branches/mamba/xforms/include/functions.php
XoopsModules/xforms/branches/mamba/xforms/include/index.html
XoopsModules/xforms/branches/mamba/xforms/index.php
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/language/english/help/help.html
XoopsModules/xforms/branches/mamba/xforms/language/english/index.html
XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/index.html
XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms.tpl
XoopsModules/xforms/branches/mamba/xforms/language/english/main.php
XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
XoopsModules/xforms/branches/mamba/xforms/language/index.html
XoopsModules/xforms/branches/mamba/xforms/sql/mysql.sql
XoopsModules/xforms/branches/mamba/xforms/templates/index.html
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
Added Paths:
-----------
XoopsModules/xforms/branches/mamba/xforms/admin/report.php
XoopsModules/xforms/branches/mamba/xforms/assets/
XoopsModules/xforms/branches/mamba/xforms/assets/images/
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/1day.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/active.gif
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/content.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/delete.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/edit.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/editcopy.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/expired.gif
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/inactive.gif
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/index.html
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/mail_generic.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/rpthor.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/rpthor0.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/rptsee.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/rptvert.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/rptvert0.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/16/search.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/about.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/add.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/content.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/home.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/index.html
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/insert_table_row.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/32/manage.png
XoopsModules/xforms/branches/mamba/xforms/assets/images/icons/index.html
XoopsModules/xforms/branches/mamba/xforms/assets/images/index.html
XoopsModules/xforms/branches/mamba/xforms/assets/images/xforms.png
XoopsModules/xforms/branches/mamba/xforms/assets/index.html
XoopsModules/xforms/branches/mamba/xforms/class/constants.php
XoopsModules/xforms/branches/mamba/xforms/class/dbupdater.php
XoopsModules/xforms/branches/mamba/xforms/class/helper.php
XoopsModules/xforms/branches/mamba/xforms/class/session.php
XoopsModules/xforms/branches/mamba/xforms/class/userdata.php
XoopsModules/xforms/branches/mamba/xforms/class/xforms.php
XoopsModules/xforms/branches/mamba/xforms/file.php
XoopsModules/xforms/branches/mamba/xforms/include/directorychecker.php
XoopsModules/xforms/branches/mamba/xforms/include/filechecker.php
XoopsModules/xforms/branches/mamba/xforms/include/module.php
XoopsModules/xforms/branches/mamba/xforms/include/oninstall.php
XoopsModules/xforms/branches/mamba/xforms/include/onuninstall.php
XoopsModules/xforms/branches/mamba/xforms/include/onupdate.php
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_error.tpl
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_form.tpl
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_form_poll.tpl
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_index.tpl
Removed Paths:
-------------
XoopsModules/xforms/branches/mamba/xforms/images/
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_error.html
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_form.html
XoopsModules/xforms/branches/mamba/xforms/templates/xforms_index.html
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/about.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,29 +1,30 @@
<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
/**
* xForms module
*
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
-* @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package xforms
- * @since 2.5.0
- * @author Mage, Mamba
- * @version $Id $
- **/
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+echo $aboutAdmin->renderAbout('', true);
-include 'admin_footer.php';
\ No newline at end of file
+include __DIR__ . '/admin_footer.php';
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,23 +1,26 @@
<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
/**
* xForms module
*
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package:: xDirectory
- * @subpackage:: admin
- * @since: 2.5.0
- * @author:: XOOPS Development Team
- * @version:: $Id $
-**/
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+global $xoopsModule;
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
@@ -25,4 +28,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,51 +1,48 @@
<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
/**
- * XoopsPartners module
+ * xForms module
*
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package:: XoopsPartners
- * @subpackage:: admin
- * @since:: 2.5.0
- * @author:: XOOPS Team
- * @version:: $Id $
-**/
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+require_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include dirname(__DIR__) .'/include/common.php';
+define('XFORMS_ADMIN_URL', XFORMS_URL . '/admin/main.php');
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include '../include/common.php';
-define('xforms_ADMIN_URL', xforms_URL.'admin/main.php');
-include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
-
global $xoopsModule;
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$thisModuleDir = XFORMS_DIRNAME;
//if functions.php file exist
-require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+require_once dirname(__DIR__) . '/include/functions.php';
// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+xoops_loadLanguage('admin', XFORMS_DIRNAME);
+xoops_loadLanguage('modinfo', XFORMS_DIRNAME);
+xoops_loadLanguage('main', XFORMS_DIRNAME);
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
+$mypathIcon16 = XOOPS_URL . '/modules/' . $thisModuleDir . '/assets/images/icons/16';
+//$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,41 +1,60 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-$defaults = array();
-$defaults[0]['caption'] = _AM_ELE_YOUR_NAME;
-$defaults[0]['req'] = true;
-$defaults[0]['order'] = 1;
-$defaults[0]['display'] = 1;
-$defaults[0]['type'] = 'text';
-$defaults[0]['value'] = array(
- 0 => $xoopsModuleConfig['t_width'],
- 1 => $xoopsModuleConfig['t_max'],
- 2 => '{UNAME}'
- );
+ 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.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
-$defaults[1]['caption'] = _AM_ELE_YOUR_EMAIL;
-$defaults[1]['req'] = true;
-$defaults[1]['order'] = 2;
-$defaults[1]['display'] = 1;
-$defaults[1]['type'] = 'text';
-$defaults[1]['value'] = array(
- 0 => $xoopsModuleConfig['t_width'],
- 1 => $xoopsModuleConfig['t_max'],
- 2 => '{EMAIL}'
- );
+if (!defined('XFORMS_ROOT_PATH')) {
+ exit();
+}
-$defaults[2]['caption'] = _AM_ELE_YOUR_COMMENTS;
-$defaults[2]['req'] = true;
-$defaults[2]['order'] = 3;
-$defaults[2]['display'] = 1;
-$defaults[2]['type'] = 'textarea';
-$defaults[2]['value'] = array(
- 0 => '',
- 1 => $xoopsModuleConfig['ta_rows'],
- 2 => $xoopsModuleConfig['ta_cols']
- );
+$defaults = array();
+$defaults[0]['caption'] = _AM_XFORMS_DEFAULT_ELE_YOURNAME;
+$defaults[0]['req'] = true;
+$defaults[0]['ele_display_row'] = 1;
+$defaults[0]['order'] = 1;
+$defaults[0]['display'] = 1;
+$defaults[0]['type'] = 'text';
+$defaults[0]['value'] = array(
+ 0 => $xoopsModuleConfig['t_width'],
+ 1 => $xoopsModuleConfig['t_max'],
+ 2 => '{U_uname}'
+);
-?>
\ No newline at end of file
+$defaults[1]['caption'] = _AM_XFORMS_DEFAULT_ELE_YOUREMAIL;
+$defaults[1]['req'] = true;
+$defaults[1]['ele_display_row'] = 1;
+$defaults[1]['order'] = 2;
+$defaults[1]['display'] = 1;
+$defaults[1]['type'] = 'text';
+$defaults[1]['value'] = array(
+ 0 => $xoopsModuleConfig['t_width'],
+ 1 => $xoopsModuleConfig['t_max'],
+ 2 => '{U_email}'
+);
+
+$defaults[2]['caption'] = _AM_XFORMS_DEFAULT_ELE_COMMENTS;
+$defaults[2]['req'] = true;
+$defaults[2]['ele_display_row'] = 1;
+$defaults[2]['order'] = 3;
+$defaults[2]['display'] = 1;
+$defaults[2]['type'] = 'textarea';
+$defaults[2]['value'] = array(
+ 0 => '',
+ 1 => $xoopsModuleConfig['ta_rows'],
+ 2 => $xoopsModuleConfig['ta_cols']
+);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,218 +1,283 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-include("admin_header.php");
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+include __DIR__ . '/admin_header.php';
$xforms_ele_mgr = xoops_getmodulehandler('elements');
-include_once xforms_ROOT_PATH.'class/elementrenderer.php';
-define('_THIS_PAGE', xforms_URL.'admin/editelement.php');
+include_once XFORMS_ROOT_PATH . '/class/elementrenderer.php';
+define('_THIS_PAGE', XFORMS_URL . '/admin/editelement.php');
$myts = MyTextSanitizer::getInstance();
-if( $xforms_form_mgr->getCount() < 1 ){
- redirect_header(xforms_ADMIN_URL, 0, _AM_GO_CREATE_FORM);
+if ($xforms_form_mgr->getCount() < 1) {
+ redirect_header(XFORMS_ADMIN_URL, 0, _AM_XFORMS_GO_CREATE_FORM);
}
-if( count($_POST) > 0 ){
- extract($_POST);
-}else{
- extract($_GET);
+if (count($_POST) > 0) {
+ extract($_POST);
+} else {
+ extract($_GET);
}
-$op = isset($_GET['op']) ? trim($_GET['op']) : '';
-$op = isset($_POST['op']) ? trim($_POST['op']) : $op;
-$clone = isset($_GET['clone']) ? intval($_GET['clone']) : 0;
-$clone = isset($_POST['clone']) ? trim($_POST['clone']) : $clone;
-$form_id = isset($_GET['form_id']) ? intval($_GET['form_id']) : 0;
+$op = isset($_GET['op']) ? trim($_GET['op']) : '';
+$op = isset($_POST['op']) ? trim($_POST['op']) : $op;
+$clone = isset($_GET['clone']) ? intval($_GET['clone'], 10) : 0;
+$clone = isset($_POST['clone']) ? trim($_POST['clone']) : $clone;
+$form_id = isset($_GET['form_id']) ? intval($_GET['form_id'], 10) : 0;
$form_id = isset($_POST['form_id']) ? trim($_POST['form_id']) : $form_id;
-if( isset($_POST['submit']) && $_POST['submit'] == _AM_ELE_ADD_OPT_SUBMIT && intval($_POST['addopt']) > 0 ){
- $op = 'edit';
+if (isset($_POST['submit']) && $_POST['submit'] == _AM_XFORMS_ELE_ADD_OPT_SUBMIT && intval($_POST['addopt'], 10) > 0) {
+ $op = 'edit';
}
-switch($op){
- case 'edit':
- //adminHtmlHeader();
- xoops_cp_header();
- if( !empty($ele_id) ){
- $element = $xforms_ele_mgr->get($ele_id);
- $ele_type = $element->getVar('ele_type');
- $output_title = $clone ? _AM_ELE_CREATE : sprintf(_AM_ELE_EDIT, $element->getVar('ele_caption'));
- }else{
- $element = $xforms_ele_mgr->create();
- $output_title = _AM_ELE_CREATE;
- }
- $output = new XoopsThemeForm($output_title, 'form_ele', _THIS_PAGE);
- if( empty($addopt) ){
- $ele_caption = $clone ? sprintf(_AM_COPIED, $element->getVar('ele_caption', 'f')) : $element->getVar('ele_caption', 'f');
- $text_ele_caption = new XoopsFormText(_AM_ELE_CAPTION, 'ele_caption', 50, 255, $ele_caption);
- $value = $element->getVar('ele_value', 'f');
- $req = $element->getVar('ele_req');
- $display = $element->getVar('ele_display');
- $order = $element->getVar('ele_order');
- }else{
- $ele_caption = $myts->makeTboxData4PreviewInForm($ele_caption);
- $text_ele_caption = new XoopsFormText(_AM_ELE_CAPTION, 'ele_caption', 50, 255, $ele_caption);
- $req = isset($_POST['ele_req']) ? 1 : 0;
- $display = isset($_POST['ele_display']) ? 1 : 0;
- $order = isset($_POST['ele_order']) ? intval($_POST['ele_order']) : 0;
- }
- $output->addElement($text_ele_caption);
+switch ($op) {
+ case 'edit':
+ xoops_cp_header();
- $check_ele_req = new XoopsFormCheckBox(_AM_ELE_REQ, 'ele_req', $req);
- $check_ele_req->addOption(1, ' ');
- $output->addElement($check_ele_req);
-
- $check_ele_display = new XoopsFormCheckBox(_AM_ELE_DISPLAY, 'ele_display', $display);
- $check_ele_display->addOption(1, ' ');
- $output->addElement($check_ele_display);
-
- $text_ele_order = new XoopsFormText(_AM_ELE_ORDER, 'ele_order', 3, 2, $order);
- $output->addElement($text_ele_order);
-
- switch($ele_type){
- case 'text':
- default:
- include 'ele_text.php';
- break;
- case 'textarea':
- include 'ele_tarea.php';
- break;
- case 'select':
- include 'ele_select.php';
- break;
+ if (!empty($ele_id)) {
+ $element = $xforms_ele_mgr->get($ele_id);
+ $ele_type = $element->getVar('ele_type');
+ $output_title = $clone ? _AM_XFORMS_ELE_CREATE : sprintf(_AM_XFORMS_ELE_EDIT, $element->getVar('ele_caption'));
+ } else {
+ $element = $xforms_ele_mgr->create();
+ $output_title = _AM_XFORMS_ELE_CREATE;
+ }
+ $output = new XoopsThemeForm($output_title, 'form_ele', _THIS_PAGE);
+ if (empty($addopt)) {
+ $ele_caption = $clone ? sprintf(_AM_XFORMS_COPIED, $element->getVar('ele_caption', 'e')) : $element->getVar('ele_caption', 'e');
+ $text_ele_caption = new XoopsFormDhtmlTextArea(_AM_XFORMS_ELE_CAPTION, 'ele_caption', $myts->htmlspecialchars($myts->stripSlashesGPC($ele_caption)), 5, 90);
+ $text_ele_caption->skipPreview = true;
+ $value = $element->getVar('ele_value', 'f');
+ $req = $element->getVar('ele_req');
+ $display_row = $element->getVar('ele_display_row');
+ $display = $element->getVar('ele_display');
+ $order = $element->getVar('ele_order');
+ } else {
+ $text_ele_caption = new XoopsFormDhtmlTextArea(_AM_XFORMS_ELE_CAPTION, 'ele_caption', $myts->htmlspecialchars($myts->stripSlashesGPC($ele_caption)), 5, 90);
+ $text_ele_caption->skipPreview = true;
+ $req = isset($_POST['ele_req']) ? 1 : 0;
+ $display_row = isset($_POST['ele_display_row']) ? 2 : 1;
+ $display = isset($_POST['ele_display']) ? 1 : 0;
+ $order = isset($_POST['ele_order']) ? intval($_POST['ele_order'], 10) : 0;
+ }
+
+ if ($ele_type != 'html') {
+ $output->addElement($text_ele_caption);
+
+ $check_ele_req = new XoopsFormCheckBox(_AM_XFORMS_ELE_REQ, 'ele_req', $req);
+ $check_ele_req->addOption(1, ' ');
+ $output->addElement($check_ele_req);
+
+ $check_ele_display_row = new XoopsFormCheckBox(_AM_XFORMS_ELE_DISPLAY_ROW, 'ele_display_row', $display_row);
+ $check_ele_display_row->setDescription(_AM_XFORMS_ELE_DISPLAY_ROW_DESC);
+ $check_ele_display_row->addOption(2, ' ');
+ $output->addElement($check_ele_display_row);
+ }
+
+ $check_ele_display = new XoopsFormCheckBox(_AM_XFORMS_ELE_DISPLAY, 'ele_display', $display);
+ $check_ele_display->addOption(1, ' ');
+ $output->addElement($check_ele_display);
+
+ $text_ele_order = new XoopsFormText(_AM_XFORMS_ELE_ORDER, 'ele_order', 3, 2, $order);
+ $output->addElement($text_ele_order);
+
+ $elementName = "";
+ switch ($ele_type) {
+ case 'text':
+ default:
+ $elementName = _AM_XFORMS_ELE_TEXT;
+ include 'ele_text.php';
+ break;
+
+ case 'textarea':
+ $elementName = _AM_XFORMS_ELE_TAREA;
+ include 'ele_tarea.php';
+ break;
+
+ case 'select':
+ $elementName = _AM_XFORMS_ELE_SELECT;
+ include 'ele_select.php';
+ break;
case 'select2':
+ $elementName = _AM_XFORMS_ELE_COUNTRY;
include 'ele_select_ctry.php';
break;
case 'date':
+ $elementName = _AM_XFORMS_ELE_DATE;
include 'ele_date.php';
break;
- case 'checkbox':
- include 'ele_check.php';
- break;
- case 'radio':
- include 'ele_radio.php';
- break;
- case 'yn':
- include 'ele_yn.php';
- break;
- case 'html':
- $check_ele_req->setExtra('disabled="disabled"');
- include 'ele_html.php';
- break;
- case 'uploadimg':
- include 'ele_uploadimg.php';
- break;
- case 'upload':
- include 'ele_upload.php';
- break;
- }
+ case 'checkbox':
+ $elementName = _AM_XFORMS_ELE_CHECK;
+ include 'ele_check.php';
+ break;
- $hidden_op = new XoopsFormHidden('op', 'save');
- $hidden_type = new XoopsFormHidden('ele_type', $ele_type);
- $output->addElement($hidden_op);
- $output->addElement($hidden_type);
-
- if( $clone == true || empty($form_id) ){
- $select_apply_form = new XoopsFormSelect(_AM_ELE_APPLY_TO_FORM, 'form_id', $form_id);
- $forms = $xforms_form_mgr->getObjects(null, 'form_id, form_title');
- foreach( $forms as $f ){
- $select_apply_form->addOption($f->getVar('form_id'), $f->getVar('form_title'));
- }
- $output->addElement($select_apply_form);
- $hidden_clone = new XoopsFormHidden('clone', 1);
- $output->addElement($hidden_clone);
- }else{
- $hidden_form_id = new XoopsFormHidden('form_id', $form_id);
- $output->addElement($hidden_form_id);
- }
-
- if( !empty($ele_id) && !$clone ){
- $hidden_id = new XoopsFormHidden('ele_id', $ele_id);
- $output->addElement($hidden_id);
- }
- $submit = new XoopsFormButton('', 'submit', _AM_SAVE, 'submit');
- $cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
- $cancel->setExtra('onclick="javascript:history.go(-1);"');
- $tray = new XoopsFormElementTray('');
- $tray->addElement($submit);
- $tray->addElement($cancel);
- $output->addElement($tray);
- $output->display();
- break;
- case 'delete':
- if( empty($ele_id) ){
- redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
- }
- if( empty($_POST['ok']) ){
- //adminHtmlHeader();
- xoops_cp_header();
- xoops_confirm(array('op' => 'delete', 'ele_id' => $ele_id, 'form_id' => $form_id, 'ok' => 1), _THIS_PAGE, _AM_ELE_CONFIRM_DELETE);
- }else{
- $element = $xforms_ele_mgr->get($ele_id);
- $xforms_ele_mgr->delete($element);
- redirect_header(xforms_URL.'admin/elements.php?form_id='.$form_id, 0, _AM_DBUPDATED);
- }
- break;
- case 'save':
- if( !empty($ele_id) ){
- $element = $xforms_ele_mgr->get($ele_id);
- }else{
- $element = $xforms_ele_mgr->create();
- }
- $element->setVar('form_id', $form_id);
- $element->setVar('ele_caption', $ele_caption);
- $req = !empty($ele_req) ? 1 : 0;
- $element->setVar('ele_req', $req);
- $order = empty($ele_order) ? 0 : intval($ele_order);
- $element->setVar('ele_order', $order);
- $display = !empty($ele_display) ? 1 : 0;
- $element->setVar('ele_display', $display);
- $element->setVar('ele_type', $ele_type);
- $value = array();
- switch($ele_type){
- case 'text':
- $value[] = !empty($ele_value[0]) ? intval($ele_value[0]) : $xoopsModuleConfig['t_width'];
- $value[] = !empty($ele_value[1]) ? intval($ele_value[1]) : $xoopsModuleConfig['t_max'];
- $value[] = $ele_value[2];
- break;
- case 'textarea':
- case 'html':
- $value[] = $ele_value[0];
- if( intval($ele_value[1]) != 0 ){
- $value[] = intval($ele_value[1]);
- }else{
- $value[] = $xoopsModuleConfig['ta_rows'];
- }
- if( intval($ele_value[2]) != 0 ){
- $value[] = intval($ele_value[2]);
- }else{
- $value[] = $xoopsModuleConfig['ta_cols'];
- }
- break;
- case 'select':
+ case 'radio':
+ $elementName = _AM_XFORMS_ELE_RADIO;
+ include 'ele_radio.php';
+ break;
+
+ case 'yn':
+ $elementName = _AM_XFORMS_ELE_YN;
+ include 'ele_yn.php';
+ break;
+
+ case 'html':
+ $elementName = _AM_XFORMS_ELE_HTML;
+ include 'ele_html.php';
+ break;
+
+ case 'uploadimg':
+ $elementName = _AM_XFORMS_ELE_UPLOADIMG;
+ include 'ele_uploadimg.php';
+ break;
+
+ case 'upload':
+ $elementName = _AM_XFORMS_ELE_UPLOADFILE;
+ include 'ele_upload.php';
+ break;
+ }
+
+ $hidden_op = new XoopsFormHidden('op', 'save');
+ $hidden_type = new XoopsFormHidden('ele_type', $ele_type);
+ $output->addElement($hidden_op);
+ $output->addElement($hidden_type);
+
+ if ($clone == true || empty($form_id)) {
+ $select_apply_form = new XoopsFormSelect(_AM_XFORMS_ELE_APPLY_TO_FORM, 'form_id', $form_id);
+ $forms = $xforms_form_mgr->getObjects(null, 'form_id, form_title');
+ foreach ($forms as $f) {
+ $select_apply_form->addOption($f->getVar('form_id'), $f->getVar('form_title'));
+ }
+ $output->addElement($select_apply_form);
+ $hidden_clone = new XoopsFormHidden('clone', 1);
+ $output->addElement($hidden_clone);
+ } else {
+ $hidden_form_id = new XoopsFormHidden('form_id', $form_id);
+ $output->addElement($hidden_form_id);
+ }
+
+ if (!empty($ele_id) && !$clone) {
+ $hidden_id = new XoopsFormHidden('ele_id', $ele_id);
+ $output->addElement($hidden_id);
+ }
+ $submit = new XoopsFormButton('', 'submit', _AM_XFORMS_SAVE, 'submit');
+ $cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+ $cancel->setExtra('onclick="javascript:history.go(-1);"');
+ $tray = new XoopsFormElementTray('');
+ $tray->addElement($submit);
+ $tray->addElement($cancel);
+ $output->addElement($tray);
+ echo '<h4 style="text-align: center;">' . $elementName . '</h4>';
+ $output->display();
+ break;
+
+ case 'delete':
+ if (empty($ele_id)) {
+ redirect_header(XFORMS_ADMIN_URL, 0, _AM_XFORMS_NOTHING_SELECTED);
+ }
+ if (empty($_POST['ok'])) {
+ xoops_cp_header();
+ xoops_confirm(array('op' => 'delete', 'ele_id' => $ele_id, 'form_id' => $form_id, 'ok' => 1), _THIS_PAGE, _AM_XFORMS_ELE_CONFIRM_DELETE);
+ } else {
+ $element = $xforms_ele_mgr->get($ele_id);
+ $xforms_ele_mgr->delete($element);
+ redirect_header(XFORMS_URL . '/admin/elements.php?form_id=' . $form_id, 0, _AM_XFORMS_DBUPDATED);
+ }
+ break;
+
+ case 'save':
+ if (!empty($ele_id)) {
+ $element = $xforms_ele_mgr->get($ele_id);
+ } else {
+ $element = $xforms_ele_mgr->create();
+ }
+ $element->setVar('form_id', $form_id);
+ $element->setVar('ele_caption', $ele_caption);
+ $req = (isset($ele_req)) ? 1 : 0;
+ $element->setVar('ele_req', $req);
+ if ($ele_type != 'html') {
+ $display_row = (isset($ele_display_row)) ? 2 : 1;
+ $element->setVar('ele_display_row', $display_row);
+ } else {
+ $element->setVar('ele_display_row', 0);
+ }
+ $order = empty($ele_order) ? 0 : intval($ele_order, 10);
+ $element->setVar('ele_order', $order);
+ $display = (isset($ele_display)) ? 1 : 0;
+ $element->setVar('ele_display', $display);
+ $element->setVar('ele_type', $ele_type);
+ $value = array();
+
+ $magicQuotes = false; // Flag to fix problem with slashes
+ if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
+ $magicQuotes = true;
+ }
+ switch ($ele_type) {
+ case 'text':
+ $value[] = !empty($ele_value[0]) ? intval($ele_value[0], 10) : $xoopsModuleConfig['t_width'];
+ $value[] = !empty($ele_value[1]) ? intval($ele_value[1], 10) : $xoopsModuleConfig['t_max'];
+ $value[] = ($magicQuotes) ? stripslashes($ele_value[2]) : $ele_value[2];
+ $value[] = $ele_value[3];
+
+ break;
+
+ case 'textarea':
+ $value[] = ($magicQuotes) ? stripslashes($ele_value[0]) : $ele_value[0];
+ if (intval($ele_value[1], 10) != 0) {
+ $value[] = intval($ele_value[1], 10);
+ } else {
+ $value[] = $xoopsModuleConfig['ta_rows'];
+ }
+ if (intval($ele_value[2], 10) != 0) {
+ $value[] = intval($ele_value[2], 10);
+ } else {
+ $value[] = $xoopsModuleConfig['ta_cols'];
+ }
+ break;
+
+ case 'html':
+ $value[] = ($magicQuotes) ? stripslashes($ele_value[0]) : $ele_value[0];
+ break;
+
+ case 'select':
+ $value[0] = $ele_value[0] > 1 ? intval($ele_value[0], 10) : 1;
+ $value[1] = !empty($ele_value[1]) ? 1 : 0;
+ $v2 = array();
+ $multi_flag = 1;
+ while ($v = each($ele_value[2])) {
+ if (!empty($v['value'])) {
+ if ($value[1] == 1 || $multi_flag) {
+ if ($checked[$v['key']] == 1) {
+ $check = 1;
+ $multi_flag = 0;
+ } else {
+ $check = 0;
+ }
+ } else {
+ $check = 0;
+ }
+ $v2[$v['value']] = $check;
+ }
+ }
+ $value[2] = $v2;
+ break;
+ case 'select2':
$value[0] = $ele_value[0]>1 ? intval($ele_value[0]) : 1;
$value[1] = !empty($ele_value[1]) ? 1 : 0;
- $v2 = array();
- $multi_flag = 1;
- while( $v = each($ele_value[2]) ){
- if( !empty($v['value']) ){
- if( $value[1] == 1 || $multi_flag ){
- if( $checked[$v['key']] == 1 ){
- $check = 1;
- $multi_flag = 0;
- }else{
- $check = 0;
- }
- }else{
- $check = 0;
- }
- $v2[$v['value']] = $check;
- }
- }
- $value[2] = $v2;
- break;
- case 'select2':
- $value[0] = $ele_value[0]>1 ? intval($ele_value[0]) : 1;
- $value[1] = !empty($ele_value[1]) ? 1 : 0;
$value[2] = !empty($ele_value[2]) ? $ele_value[2] : 'LB';
/*
$v2 = array();
@@ -235,112 +300,151 @@
$value[2] = $v2;
*/
break;
- case 'date':
- $value = array();
- $value[] = $ele_value;
-
+ case 'date':
+ $value = array();
+ $value[] = $ele_value;
break;
- case 'checkbox':
- while( $v = each($ele_value) ){
- if( !empty($v['value']) ){
- if( $checked[$v['key']] == 1 ){
- $check = 1;
- }else{
- $check = 0;
- }
- $value[$v['value']] = $check;
- }
- }
- break;
- case 'radio':
- while( $v = each($ele_value) ){
- if( !empty($v['value']) ){
- if( $checked == $v['key'] ){
- $value[$v['value']] = 1;
- }else{
- $value[$v['value']] = 0;
- }
- }
- }
- break;
- case 'yn':
- if( $ele_value == '_NO' ){
- $value = array('_YES'=>0,'_NO'=>1);
- }else{
- $value = array('_YES'=>1,'_NO'=>0);
- }
- break;
- case 'uploadimg':
- $value[] = intval($ele_value[0]);
- $value[] = trim($ele_value[1]);
- $value[] = trim($ele_value[2]);
- $value[] = $ele_value[3] != 1 ? 0 : 1;
- $value[] = intval($ele_value[4]);
- $value[] = intval($ele_value[5]);
- break;
- case 'upload':
- $value[] = intval($ele_value[0]);
- $value[] = trim($ele_value[1]);
- $value[] = trim($ele_value[2]);
- $value[] = $ele_value[3] != 1 ? 0 : 1;
- break;
- }
- $element->setVar('ele_value', $value);
- if( !$xforms_ele_mgr->insert($element) ){
- //adminHtmlHeader();
- xoops_cp_header();
- echo $element->getHtmlErrors();
- }else{
- redirect_header(xforms_URL.'admin/elements.php?form_id='.$form_id, 0, _AM_DBUPDATED);
- }
- break;
- default:
- xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('editelement.php') ;
- echo "<h4>"._AM_ELE_CREATE."</h4>
- <ul>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=text'>"._AM_ELE_TEXT."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=textarea'>"._AM_ELE_TAREA."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=select'>"._AM_ELE_SELECT."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=select2'>"._AM_ELE_SELECT_CTRY."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=date'>"._AM_ELE_DATE."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=checkbox'>"._AM_ELE_CHECK."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=radio'>"._AM_ELE_RADIO."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=yn'>"._AM_ELE_YN."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=html'>"._AM_ELE_HTML."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=uploadimg'>"._AM_ELE_UPLOADIMG."</a></li>
- <li><a href='"._THIS_PAGE."?op=edit&ele_type=upload'>"._AM_ELE_UPLOADFILE."</a></li>
- </ul>"
- ;
- break;
+
+ case 'checkbox':
+ while ($v = each($ele_value)) {
+ if (!empty($v['value'])) {
+ if ($checked[$v['key']] == 1) {
+ $check = 1;
+ } else {
+ $check = 0;
+ }
+ $value[$v['value']] = $check;
+ }
+ }
+ break;
+
+ case 'radio':
+ while ($v = each($ele_value)) {
+ if (!empty($v['value'])) {
+ if ($checked == $v['key']) {
+ $value[$v['value']] = 1;
+ } else {
+ $value[$v['value']] = 0;
+ }
+ }
+ }
+ break;
+
+ case 'yn':
+ if ($ele_value == '_NO') {
+ $value = array('_YES' => 0, '_NO' => 1);
+ } else {
+ $value = array('_YES' => 1, '_NO' => 0);
+ }
+ break;
+
+ case 'uploadimg':
+ $value[] = intval($ele_value[0], 10);
+ $value[] = trim($ele_value[1]);
+ $value[] = trim($ele_value[2]);
+ $value[] = $ele_value[3] != 1 ? 0 : 1;
+ $value[] = intval($ele_value[4], 10);
+ $value[] = intval($ele_value[5], 10);
+ break;
+
+ case 'upload':
+ $value[] = intval($ele_value[0], 10);
+ $value[] = trim($ele_value[1]);
+ $value[] = trim($ele_value[2]);
+ $value[] = $ele_value[3] != 1 ? 0 : 1;
+ break;
+ }
+ $element->setVar('ele_value', $value);
+ if (!$xforms_ele_mgr->insert($element)) {
+ xoops_cp_header();
+ echo $element->getHtmlErrors();
+ } else {
+ redirect_header(XFORMS_URL . '/admin/elements.php?form_id=' . $form_id, 0, _AM_XFORMS_DBUPDATED);
+ }
+ break;
+
+ default:
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('editelement.php');
+ echo '<table class="outer" cellspacing="1" width="100%">
+ <tr><th>' . _AM_XFORMS_ELE_CREATE . '</th></tr>
+ <tr>
+ <td class="odd" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=text">' . _AM_XFORMS_ELE_TEXT . '</a></td>
+ </tr>
+ <tr>
+ <td class="even" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=textarea">' . _AM_XFORMS_ELE_TAREA . '</a></td>
+ </tr>
+ <tr>
+ <td class="odd" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=select">' . _AM_XFORMS_ELE_SELECT . '</a></td>
+ </tr>
+ <tr>
+ <td class="even" align="center"><a href="'._THIS_PAGE.'?op=edit&ele_type=select2">'. _AM_XFORMS_ELE_SELECT_CTRY .'</a></td>
+ </tr>
+ <tr>
+ <td class="odd" align="center"><a href="'._THIS_PAGE.'?op=edit&ele_type=date">'._AM_XFORMS_ELE_DATE.'</a></td>
+ </tr>
+ <tr>
+ <td class="even" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=checkbox">' . _AM_XFORMS_ELE_CHECK . '</a></td>
+ </tr>
+ <tr>
+ <td class="odd" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=radio">' . _AM_XFORMS_ELE_RADIO . '</a></td>
+ </tr>
+ <tr>
+ <td class="even" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=yn">' . _AM_XFORMS_ELE_YN . '</a></td>
+ </tr>
+ <tr>
+ <td class="odd" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=html">' . _AM_XFORMS_ELE_HTML . '</a></td>
+ </tr>
+ <tr>
+ <td class="even" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=uploadimg">' . _AM_XFORMS_ELE_UPLOADIMG . '</a></td>
+ </tr>
+ <tr>
+ <td class="odd" align="center"><a href="' . _THIS_PAGE . '?op=edit&ele_type=upload">' . _AM_XFORMS_ELE_UPLOADFILE . '</a></td>
+ </tr>
+ </table>';
+ break;
}
-include 'admin_footer.php';
+include __DIR__ . '/admin_footer.php';
xoops_cp_footer();
+/**
+ * @param $id1
+ * @param $id2
+ * @param string $text
+ * @param string $type
+ * @param null $checked
+ *
+ * @return XoopsFormElementTray
+ */
+function addOption($id1, $id2, $text = '', $type = 'check', $checked = null)
+{
+ $d = new XoopsFormText('', $id1, 40, 255, $text);
+ if ($type == 'check') {
+ $c = new XoopsFormCheckBox('', $id2, $checked);
+ $c->addOption(1, ' ');
+ } else {
+ $c = new XoopsFormRadio('', 'checked', $checked);
+ $c->addOption($id2, ' ');
+ }
+ $t = new XoopsFormElementTray('');
+ $t->addElement($c);
+ $t->addElement($d);
-function addOption($id1, $id2, $text='', $type='check', $checked=null){
- $d = new XoopsFormText('', $id1, 40, 255, $text);
- if( $type == 'check' ){
- $c = new XoopsFormCheckBox('', $id2, $checked);
- $c->addOption(1, ' ');
- }else{
- $c = new XoopsFormRadio('', 'checked', $checked);
- $c->addOption($id2, ' ');
- }
- $t = new XoopsFormElementTray('');
- $t->addElement($c);
- $t->addElement($d);
- return $t;
+ return $t;
}
-function addOptionsTray(){
- $t = new XoopsFormText('', 'addopt', 3, 2);
- $l = new XoopsFormLabel('', sprintf(_AM_ELE_ADD_OPT, $t->render()));
- $b = new XoopsFormButton('', 'submit', _AM_ELE_ADD_OPT_SUBMIT, 'submit');
- $r = new XoopsFormElementTray('');
- $r->addElement($l);
- $r->addElement($b);
- return $r;
+/**
+ * @return XoopsFormElementTray
+ */
+function addOptionsTray()
+{
+ $t = new XoopsFormText('', 'addopt', 3, 2);
+ $l = new XoopsFormLabel('', sprintf(_AM_XFORMS_ELE_ADD_OPT, $t->render()));
+ $b = new XoopsFormButton('', 'submit', _AM_XFORMS_ELE_ADD_OPT_SUBMIT, 'submit');
+ $r = new XoopsFormElementTray('');
+ $r->addElement($l);
+ $r->addElement($b);
+
+ return $r;
}
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_check.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_check.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_check.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,40 +1,57 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-$options = array();
+ 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.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+if (!defined('XFORMS_ROOT_PATH')) {
+ exit();
+}
+
+$options = array();
$opt_count = 0;
-if( empty($addopt) && !empty($ele_id) ){
- $keys = array_keys($value);
- for( $i=0; $i<count($keys); $i++ ){
- $v = $myts->makeTboxData4PreviewInForm($keys[$i]);
- $options[] = addOption('ele_value['.$opt_count.']', 'checked['.$opt_count.']', $v, 'check', $value[$keys[$i]]);
- $opt_count++;
- }
-}else{
- if( isset($ele_value) && count($ele_value) > 0 ){
- while( $v = each($ele_value) ){
- $v['value'] = $myts->makeTboxData4PreviewInForm($v['value']);
- if( !empty($v['value']) ){
- $options[] = addOption('ele_value['.$opt_count.']', 'checked['.$opt_count.']', $v['value'], 'check', $checked[$v['key']]);
- $opt_count++;
- }
- }
- }
- $addopt = empty($addopt) ? 2 : $addopt;
- for( $i=0; $i<$addopt; $i++ ){
- $options[] = addOption('ele_value['.$opt_count.']', 'checked['.$opt_count.']');
- $opt_count++;
- }
+if (empty($addopt) && !empty($ele_id)) {
+ $keys = array_keys($value);
+ for ($i = 0; $i < count($keys); ++$i) {
+ $v = $myts->makeTboxData4PreviewInForm($keys[$i]);
+ $options[] = addOption('ele_value[' . $opt_count . ']', 'checked[' . $opt_count . ']', $v, 'check', $value[$keys[$i]]);
+ ++$opt_count;
+ }
+} else {
+ if (isset($ele_value) && count($ele_value) > 0) {
+ while ($v = each($ele_value)) {
+ $v['value'] = $myts->makeTboxData4PreviewInForm($v['value']);
+ if (!empty($v['value'])) {
+ $options[] = addOption('ele_value[' . $opt_count . ']', 'checked[' . $opt_count . ']', $v['value'], 'check', $checked[$v['key']]);
+ ++$opt_count;
+ }
+ }
+ }
+ $addopt = empty($addopt) ? 2 : $addopt;
+ for ($i = 0; $i < $addopt; ++$i) {
+ $options[] = addOption('ele_value[' . $opt_count . ']', 'checked[' . $opt_count . ']');
+ ++$opt_count;
+ }
}
-$add_opt = addOptionsTray();
+$add_opt = addOptionsTray();
$options[] = $add_opt;
-$opt_tray = new XoopsFormElementTray(_AM_ELE_OPT, '<br />');
-$opt_tray->setDescription(_AM_ELE_OPT_DESC.'<br /><br />'._AM_ELE_OTHER);
-for( $i=0; $i<count($options); $i++ ){
- $opt_tray->addElement($options[$i]);
+$opt_tray = new XoopsFormElementTray(_AM_XFORMS_ELE_OPT, '<br />');
+$opt_tray->setDescription(_AM_XFORMS_ELE_OPT_DESC . '<br /><br />' . _AM_XFORMS_ELE_OTHER);
+for ($i = 0; $i < count($options); ++$i) {
+ $opt_tray->addElement($options[$i]);
}
$output->addElement($opt_tray);
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_html.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_html.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_html.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,15 +1,27 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-$rows = !empty($value[1]) ? $value[1] : $xoopsModuleConfig['ta_rows'];
-$cols = !empty($value[2]) ? $value[2] : $xoopsModuleConfig['ta_cols'];
-$rows = new XoopsFormText(_AM_ELE_ROWS, 'ele_value[1]', 3, 3, $rows);
-$cols = new XoopsFormText(_AM_ELE_COLS, 'ele_value[2]', 3, 3, $cols);
-$default = new XoopsFormDhtmlTextArea(_AM_ELE_DEFAULT, 'ele_value[0]', isset($value[0]) ? $myts->htmlspecialchars($myts->stripSlashesGPC($value[0])) : '', 10, 50);
-$output->addElement($rows, 1);
-$output->addElement($cols, 1);
+ 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.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+if (!defined('XFORMS_ROOT_PATH')) {
+ exit();
+}
+
+$default = new XoopsFormDhtmlTextArea(_AM_XFORMS_ELE_DEFAULT, 'ele_value[0]', isset($value[0]) ? $myts->htmlspecialchars($myts->stripSlashesGPC($value[0])) : '', 10, 90);
+$default->skipPreview = true;
$output->addElement($default);
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_radio.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_radio.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_radio.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,41 +1,57 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-$options = array();
+ 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.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+if (!defined('XFORMS_ROOT_PATH')) {
+ exit();
+}
+
+$options = array();
$opt_count = 0;
-if( empty($addopt) && !empty($ele_id) ){
- $keys = array_keys($value);
- for( $i=0; $i<count($keys); $i++ ){
- $r = $value[$keys[$i]] ? $opt_count : null;
- $v = $myts->makeTboxData4PreviewInForm($keys[$i]);
- $options[] = addOption('ele_value['.$opt_count.']', $opt_count, $v, 'radio', $r);
- $opt_count++;
- }
-}else{
- if( isset($ele_value) && count($ele_value) > 0 ){
- while( $v = each($ele_value) ){
- $v['value'] = $myts->makeTboxData4PreviewInForm($v['value']);
- if( !empty($v['value']) ){
- $r = ($checked == $opt_count) ? $opt_count : null;
- $options[] = addOption('ele_value['.$opt_count.']', $opt_count, $v['value'], 'radio', $r);
- $opt_count++;
- }
- }
- }
- $addopt = empty($addopt) ? 2 : $addopt;
- for( $i=0; $i<$addopt; $i++ ){
- $options[] = addOption('ele_value['.$opt_count.']', $opt_count, '', 'radio');
- $opt_count++;
- }
+if (empty($addopt) && !empty($ele_id)) {
+ $keys = array_keys($value);
+ for ($i = 0; $i < count($keys); ++$i) {
+ $r = $value[$keys[$i]] ? $opt_count : null;
+ $v = $myts->makeTboxData4PreviewInForm($keys[$i]);
+ $options[] = addOption('ele_value[' . $opt_count . ']', $opt_count, $v, 'radio', $r);
+ ++$opt_count;
+ }
+} else {
+ if (isset($ele_value) && count($ele_value) > 0) {
+ while ($v = each($ele_value)) {
+ $v['value'] = $myts->makeTboxData4PreviewInForm($v['value']);
+ if (!empty($v['value'])) {
+ $r = ($checked == $opt_count) ? $opt_count : null;
+ $options[] = addOption('ele_value[' . $opt_count . ']', $opt_count, $v['value'], 'radio', $r);
+ ++$opt_count;
+ }
+ }
+ }
+ $addopt = empty($addopt) ? 2 : $addopt;
+ for ($i = 0; $i < $addopt; ++$i) {
+ $options[] = addOption('ele_value[' . $opt_count . ']', $opt_count, '', 'radio');
+ ++$opt_count;
+ }
}
$options[] = addOptionsTray();
-$opt_tray = new XoopsFormElementTray(_AM_ELE_OPT, '<br />');
-$opt_tray->setDescription(_AM_ELE_OPT_DESC2.'<br /><br />'._AM_ELE_OTHER);
-for( $i=0; $i<count($options); $i++ ){
- $opt_tray->addElement($options[$i]);
+$opt_tray = new XoopsFormElementTray(_AM_XFORMS_ELE_OPT, '<br />');
+$opt_tray->setDescription(_AM_XFORMS_ELE_OPT_DESC2 . '<br /><br />' . _AM_XFORMS_ELE_OTHER);
+for ($i = 0; $i < count($options); ++$i) {
+ $opt_tray->addElement($options[$i]);
}
$output->addElement($opt_tray);
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_select.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_select.php 2014-10-06 19:43:10 UTC (rev 12812)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_select.php 2014-10-08 14:58:09 UTC (rev 12813)
@@ -1,52 +1,69 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-if( !defined('xforms_ROOT_PATH') ){ exit(); }
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-if( empty($addopt) && !empty($ele_id) ){
- $ele_value = $element->getVar('ele_value');
+ 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.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+if (!defined('XFORMS_ROOT_PATH')) {
+ exit();
}
-$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
-$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
+
+if (empty($addopt) && !empty($ele_id)) {
+ $ele_value = $element->getVar('ele_value');
+}
+$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
+$size = new XoopsFormText(_AM_XFORMS_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
$allow_multi = empty($ele_value[1]) ? 0 : 1;
-$multiple = new XoopsFormRadioYN(_AM_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
+$multiple = new XoopsFormRadioYN(_AM_XFORMS_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
-$options = array();
+$options = array();
$opt_count = 0;
-if( empty($addopt) && !empty($ele_id) ){
- $keys = array_keys($ele_value[2]);
- for( $i=0; $i<count(...
[truncated message content] |
|
From: <luc...@us...> - 2014-10-06 19:43:15
|
Revision: 12812
http://sourceforge.net/p/xoops/svn/12812
Author: luciorota
Date: 2014-10-06 19:43:10 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
fixed bug when updating from xNewsletter to xnewsletter on linux/unix servers
fixed bug in subscr form (goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-10-06 19:43:10 UTC (rev 12812)
@@ -110,24 +110,22 @@
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
}
-
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ //
$title = $this->isNew() ? sprintf(_MA_XNEWSLETTER_SUBSCRIPTION_ADD) : sprintf(_MA_XNEWSLETTER_SUBSCRIPTION_EDIT);
$form = new XoopsThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
-
+ //
$form->addElement(new XoopsFormLabel("<span style='text-decoration:underline'>" . _MA_XNEWSLETTER_SUBSCRIPTION_INFO_PERS . "</span>", ''));
$subscr_id = $this->isNew() ? 0 : $this->getVar('subscr_id');
-
- // subscr_email
+ // subscr: subscr_email
if ($subscr_id > 0 || $this->getVar('subscr_email') != '') {
$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_EMAIL, $this->getVar('subscr_email')));
$form->addElement(new XoopsFormHidden('subscr_email', $this->getVar('subscr_email')));
} else {
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL, 'subscr_email', 50, 255, $this->getVar('subscr_email')), true);
}
-
- // subscr_sex
+ // subscr: subscr_sex
if ($this->xnewsletter->getConfig('xn_use_salutation') == 1) {
$select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX, 'subscr_sex', $this->getVar('subscr_sex'));
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY, _AM_XNEWSLETTER_SUBSCR_SEX_EMPTY);
@@ -137,15 +135,12 @@
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY, _AM_XNEWSLETTER_SUBSCR_SEX_FAMILY);
$form->addElement($select_subscr_sex);
}
-
- // subscr_firstname
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME, 'subscr_firstname', 50, 255, $this->getVar('subscr_firstname')), true);
-
- // subscr_lastname
+ // subscr: subscr_firstname
+ $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME, 'subscr_firstname', 50, 255, $this->getVar('subscr_firstname')), false);
+ // subscr: subscr_lastname
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME, 'subscr_lastname', 50, 255, $this->getVar('subscr_lastname')), false);
-
+ //
$form->addElement(new XoopsFormLabel('<br/><br/>', ''));
-
// get newsletters available for current user
$opt_cat = array();
$opt_tray = new XoopsFormElementTray("<span style='text-decoration:underline'>" . _MA_XNEWSLETTER_SUBSCRIPTION_CATS_AVAIL . "</span>", "<br />");
@@ -153,7 +148,6 @@
$gperm_handler = xoops_gethandler('groupperm');
$uid = (is_object($GLOBALS['xoopsUser']) && isset($GLOBALS['xoopsUser'])) ? $GLOBALS['xoopsUser']->uid() : 0;
$groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-
// cats[], existing_catsubcr_id_{$cat_id}, existing_catsubscr_quited_{$cat_id}
$catCriteria = new CriteriaCompo();
$catCriteria->setSort('cat_id');
@@ -198,10 +192,8 @@
}
$cat_checkbox->setValue($values);
$form->addElement($cat_checkbox);
-
// op
$form->addElement(new XoopsFormHidden('op', 'save_subscription'));
-
// button
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
@@ -211,7 +203,7 @@
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
$form->addElement($button_tray);
-
+ //
return $form;
}
@@ -228,13 +220,12 @@
if ($action === false) {
$action = $_SERVER["REQUEST_URI"];
}
-
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ //
$title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_SUBSCR_ADD) : sprintf(_AM_XNEWSLETTER_SUBSCR_EDIT);
-
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$form = new XoopsThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
-
+ // subscr: subscr_sex
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL, 'subscr_email', 50, 255, $this->getVar('subscr_email')), true);
$select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX, 'subscr_sex', $this->getVar('subscr_sex'));
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY, _AM_XNEWSLETTER_SUBSCR_SEX_EMPTY);
@@ -243,15 +234,17 @@
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_COMP, _AM_XNEWSLETTER_SUBSCR_SEX_COMP);
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY, _AM_XNEWSLETTER_SUBSCR_SEX_FAMILY);
$form->addElement($select_subscr_sex);
+ // subscr: subscr_firstname
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME, 'subscr_firstname', 50, 255, $this->getVar('subscr_firstname')), false);
+ // subscr: subscr_lastname
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME, 'subscr_lastname', 50, 255, $this->getVar('subscr_lastname')), false);
-
+ // subscr: subscr_uid
$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_SUBSCR_UID, 'subscr_uid', true, $this->getVar('subscr_uid'), 1, false), false);
-
+ // subscr: subscr_submitter
$form->addElement(new XoopsFormHidden('subscr_submitter', $GLOBALS['xoopsUser']->uid()));
$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
//$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_SUBSCR_SUBMITTER, 'subscr_submitter', false, $this->getVar('subscr_submitter'), 1, false), true);
-
+ //
if ($this->getVar('subscr_id') > 0) {
$form->addElement(
new XoopsFormLabel(
@@ -271,7 +264,7 @@
$form->addElement(new XoopsFormHidden('subscr_actkey', ''));
$form->addElement(new XoopsFormHidden('op', 'save_subscr'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
+ //
return $form;
}
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php 2014-10-06 19:43:10 UTC (rev 12812)
@@ -1,4 +1,4 @@
-<?php
+ <?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt 2014-10-06 19:43:10 UTC (rev 12812)
@@ -1,5 +1,11 @@
-Read Me First
-=============
-1. Delete old /modules/xNewsletter directory
-2. Copy this module in /modules directory
-3. Update this module
+Read Me First in case of module update
+======================================
+If installed xNewsletter module dirname is like xNewsletter, follow these steps;
+
+1. Rename old /modules/xNewsletter directory to /modules/xNewsletter.bak
+2. Copy new module in /modules directory
+3. Rename new module to /modules/xNewsletter
+4. Update module: update procedure will convert directory name to lowercase, and modules database record too
+5. An error sould occour in some systems: this is not a problem, this is because now module admin is in /modules/xnewsletter/admin/index.php ...
+6. Check if anything runs well
+7. Remove backup dir /modules/xNewsletter.bak
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-10-06 19:43:10 UTC (rev 12812)
@@ -46,6 +46,7 @@
if ($previousVersion < 130) {
xoops_module_update_xnewsletter_130();
}
+ xoops_module_update_xnewsletter_dirtolowercase();
return true;
}
@@ -53,19 +54,44 @@
/**
* @return bool
*/
-function xoops_module_update_xnewsletter_130()
+function xoops_module_update_xnewsletter_dirtolowercase()
{
// change module dirname to lowercase
- $path = dirname(__DIR__);
- $dirname = basename(dirname(__DIR__));
- rename($path, strtolower($dirname));
- // update module dirname field in database to lowercase
- $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('modules')}` SET `dirname` = '" . strtolower($dirname) . "'";
- $sql .= " WHERE LOWER(`dirname`) = '" . strtolower($dirname) . "';";
- if (!$GLOBALS['xoopsDB']->queryF($sql)) {
- echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": UPDATE 'modules' SET `dirname` = '" . strtolower($dirname) . "'";
+ $modulePath = dirname(__DIR__);
+ $moduleDirname = basename(dirname(__DIR__));
+ if ($moduleDirname != strtolower($moduleDirname)) {
+ if (!xnewsletter_copyDir($modulePath, XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname) . '.tmp')) {
+ return false;
+ }
+ if (!xnewsletter_delDir($modulePath)) {
+ return false;
+ }
+ if (!xnewsletter_copyDir(XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname) . '.tmp', XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname))) {
+ return false;
+ }
+ if (!xnewsletter_delDir(XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname) . '.tmp')) {
+ return false;
+ }
+ // update module dirname field in database to lowercase
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('modules')}` SET `dirname` = '" . strtolower($moduleDirname) . "'";
+ $sql .= " WHERE LOWER(`dirname`) = '" . strtolower($moduleDirname) . "';";
+ if (!$GLOBALS['xoopsDB']->queryF($sql)) {
+ echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": UPDATE 'modules' SET `dirname` = '" . strtolower($moduleDirname) . "'";
+ return false;
+ }
+ } else {
+ // NOP
}
+ return true;
+}
+/**
+ * @return bool
+ */
+function xoops_module_update_xnewsletter_130()
+{
+ $moduleDirname = basename(dirname(__DIR__));
+
// reverse 'mod_' prefix on tables
xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_accounts');
xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_attachment');
@@ -136,8 +162,8 @@
// delete old html template files
- $templateDirectory = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/templates/";
- $template_list = array_diff(scandir($templateDirectory), array('..', '.'));
+ $templateDirectory = XOOPS_ROOT_PATH . "/modules/" . $moduleDirname . "/templates/";
+ $template_list = array_diff(@scandir($templateDirectory), array('..', '.'));
foreach ($template_list as $k => $v) {
$fileinfo = new SplFileInfo($templateDirectory . $v);
if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
@@ -148,17 +174,17 @@
xoops_load('xoopsfile');
//delete /images directory
- $imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/";
+ $imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $moduleDirname . "/images/";
$folderHandler = XoopsFile::getHandler("folder", $imagesDirectory);
$folderHandler->delete($imagesDirectory);
//delete /templates/style.css file
- $cssFile = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/templates/style.css";
+ $cssFile = XOOPS_ROOT_PATH . "/modules/" . $moduleDirname . "/templates/style.css";
$folderHandler = XoopsFile::getHandler("file", $cssFile);
$folderHandler->delete($cssFile);
//delete .html entries from the tpl table
- $sql = "DELETE FROM " . $GLOBALS['xoopsDB']->prefix("tplfile") . " WHERE LOWER(`tpl_module`) = '" . strtolower($dirname) . "' AND `tpl_file` LIKE '%.html%'";
+ $sql = "DELETE FROM " . $GLOBALS['xoopsDB']->prefix("tplfile") . " WHERE LOWER(`tpl_module`) = '" . strtolower($moduleDirname) . "' AND `tpl_file` LIKE '%.html%'";
$GLOBALS['xoopsDB']->queryF($sql);
return true;
@@ -303,3 +329,66 @@
return ($GLOBALS['xoopsDB']->getRowsNum($result) > 0);
}
+
+/**
+ * Copy a directory and its contents
+ *
+ * @param string $source is the original directory
+ * @param string $destination is the destination directory
+ *
+ * @return bool Returns true on success or false on failure
+ *
+ */
+function xnewsletter_copyDir($source, $destination)
+{
+ if (!$dirHandler = opendir($source)) {
+ return false;
+ }
+ @mkdir($destination);
+ while (false !== ($file = readdir($dirHandler))) {
+ if (($file != '.') && ($file != '..')) {
+ if (is_dir("{$source}/{$file}")) {
+ if (!xnewsletter_copyDir("{$source}/{$file}", "{$destination}/{$file}")) {
+ return false;
+ }
+ } else {
+ if (!copy("{$source}/{$file}", "{$destination}/{$file}")) {
+ return false;
+ }
+ }
+ }
+ }
+ closedir($dirHandler);
+ return true;
+}
+
+/**
+ * Delete a empty/not empty directory
+ *
+ * @param string $dir path to the directory to delete
+ * @param bool $if_not_empty if false it delete directory only if false
+ *
+ * @return bool Returns true on success or false on failure
+ */
+function xnewsletter_delDir($dir, $if_not_empty = true)
+{
+ if (!file_exists($dir)) {
+ return true;
+ }
+ if ($if_not_empty == true) {
+ if (!is_dir($dir)) {
+ return unlink($dir);
+ }
+ foreach (scandir($dir) as $item) {
+ if ($item == '.' || $item == '..') {
+ continue;
+ }
+ if (!xnewsletter_delDir("{$dir}/{$item}")) {
+ return false;
+ }
+ }
+ } else {
+ // NOP
+ }
+ return rmdir($dir);
+}
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php 2014-10-06 19:43:10 UTC (rev 12812)
@@ -473,12 +473,12 @@
define('_AM_XNEWSLETTER_FORMACTIVATEOK', "Activated successfully");
define('_AM_XNEWSLETTER_FORMUNACTIVATEOK', "Unactivated successfully");
//
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_EMPTY','');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_SAVED', 'Saved');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK', 'Error creating item in task list');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST', 'Newsletter sent for test (%recipient)');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND', 'Newsletter sent');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND', 'Newsletter send failed -> %error');
-define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND','Newsletter send failed -> %error');
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_PHPMAILER',"Error phpmailer -> %error");
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND_COUNT',"Error sending newsletter: %error_count of %total_count newsletters not sent");
define('_AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_COUNT',"Sending %total_count newsletter(s) successfully");
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-10-05 03:14:05 UTC (rev 12811)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-10-06 19:43:10 UTC (rev 12812)
@@ -51,7 +51,7 @@
//About
$modversion['module_status'] = 'Beta 1';
-$modversion['release_date'] = '2014/09/22';
+$modversion['release_date'] = '2014/10/02';
//$modversion['release'] = "1.3";
$modversion['demo_site_url'] = '';
$modversion['demo_site_name'] = '';
@@ -129,7 +129,7 @@
$member_handler = xoops_gethandler('member');
$uid = (is_object($GLOBALS['xoopsUser']) && isset($GLOBALS['xoopsUser'])) ? $GLOBALS['xoopsUser']->uid() : 0;
$groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-$xoopsModule = $module_handler->getByDirname('xnewsletter');
+$xoopsModule = $module_handler->getByDirname($mydirname);
$showRead = false;
$showEdit = false;
@@ -137,7 +137,7 @@
$showList = false;
if (is_object($xoopsModule)) {
- $catHandler = xoops_getModuleHandler('cat', 'xnewsletter');
+ $catHandler = xoops_getModuleHandler('cat', $mydirname);
$catCriteria = new CriteriaCompo();
$catCriteria->setSort('cat_id');
$catCriteria->setOrder('ASC');
|
|
From: <be...@us...> - 2014-10-05 03:14:17
|
Revision: 12811
http://sourceforge.net/p/xoops/svn/12811
Author: beckmi
Date: 2014-10-05 03:14:05 +0000 (Sun, 05 Oct 2014)
Log Message:
-----------
branch for Bosco
Added Paths:
-----------
XoopsModules/adslight/branches/bosco/adslight/
|
|
From: <be...@us...> - 2014-10-05 03:13:31
|
Revision: 12810
http://sourceforge.net/p/xoops/svn/12810
Author: beckmi
Date: 2014-10-05 03:13:23 +0000 (Sun, 05 Oct 2014)
Log Message:
-----------
branch for Bosco
Added Paths:
-----------
XoopsModules/adslight/branches/bosco/
|
|
From: <be...@us...> - 2014-10-03 23:45:28
|
Revision: 12809
http://sourceforge.net/p/xoops/svn/12809
Author: beckmi
Date: 2014-10-03 23:45:23 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Removing extra "the" (thanks Cesag!)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-02 23:10:18 UTC (rev 12808)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-03 23:45:23 UTC (rev 12809)
@@ -31,4 +31,4 @@
INSTALLATION
_____________________________________________________________________
-You will need to copy of the folder /xoops_lib from the the XOOPS 2.5.7 Basic Module Pack (includes TCPDF Library)
+You will need to copy of the folder /xoops_lib from the XOOPS 2.5.7 Basic Module Pack (includes TCPDF Library)
|
|
From: <be...@us...> - 2014-10-02 23:10:26
|
Revision: 12808
http://sourceforge.net/p/xoops/svn/12808
Author: beckmi
Date: 2014-10-02 23:10:18 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
code formatting, updated changelog
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-02 23:10:18 UTC (rev 12808)
@@ -1,6 +1,17 @@
<h5>1.02 Beta 3 (2014-xx-xx)</h5>
- updated to XOOPS 2.5.7 version of jQuery UI Tabs (noo-b/mamba)
+- replaced PublisherRequest with calls to XoopsRequest (mamba)
+- redesigned archives section to have months horizontally (mjoel/Mithrandir/mamba)
+- added count of articles in archive section (mamba)
+- moved TCPDF library to /xoops_lib (mamba)
+- updated makepdf.php file for the latest TCPDF (black_beard, mamba)
+- replaced $i++ with ++$i for consistency/performance (mamba)
+- started conversion to PSR-2 coding (mamba)
+TODO:
+- test with MySQL strict mode (STRICT_TRANS_TABLES)
+
+
<h5>1.02 Beta 2 (2014-xx-xx)</h5>
- added ID column in Admin's Category view (mamba)
- fixed preg_replace /e in request.php (mamba)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-02 23:10:18 UTC (rev 12808)
@@ -1,12 +1,34 @@
-Read Me First
-=============
+READ ME FIRST
+_____________________________________________________________________
-The tag module is designed for site-wide tag management, handling tag input, display and stats for each module that enables tag plugin.
-This module provides a centralized toolkit including input, display, stats and substantial more comprehensive applications, so that each module does not need to develop its own tag handling scripts.
+Forked from SmartSection 2.14 as a starting base, but redone somewhat from the ground up to reduce the overall server load and deal with bugs and such.
- Requirements
+Features:
+
+- Categories and Subcategories
+- Pages
+- Four basic templates, custom templates
+- File Wrapping
+- Page/Category images
+- File attachments
+- Scheduled publishing and expiration
+- Order by date, ratings, sort order
+- Ratings
+- Comments
+- SEO
+- Permissions: Submissions, Submit/Edit fields, Categories, Pages, Moderation (global)
+- CK Editor and others using XOOPSeditors
+- Import from SmartSection and News modules
+- Easy cloning (change the directory name)
+
+
+ REQUIREMENTS
_____________________________________________________________________
-
-- PHP version >= 5.2.0
-- XOOPS version >= 2.5.0
-- ModuleClasses in /Frameworks (download it from here: http://goo.gl/Bmknt)
\ No newline at end of file
+
+- PHP version >= 5.3.7
+- XOOPS version >= 2.5.7
+
+INSTALLATION
+_____________________________________________________________________
+
+You will need to copy of the folder /xoops_lib from the the XOOPS 2.5.7 Basic Module Pack (includes TCPDF Library)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -8,8 +8,7 @@
</tr>
<{foreach item=item from=$block.items}>
- <tr class="<{cycle values=" even
- ,odd"}>">
+ <tr class="<{cycle values=" even,odd"}>">
<td><{$item.itemlink}></td>
<td align="left"><{$item.categorylink}></td>
<td align="center"><{$item.poster}></td>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -65,7 +65,8 @@
<{if $block.template == 'slider1'}>
-<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
+<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
<script type="text/javascript">
jQuery(document).ready(function()
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -14,8 +14,7 @@
<div style="font-weight: normal"><{$element.description}></div>
<{/if}>
</td>
- <td class="<{cycle values=" even
- ,odd"}>"><{$element.body}></td>
+ <td class="<{cycle values=" even,odd"}>"><{$element.body}></td>
</tr>
<{else}> <{$element.body}> <{/if}> <{/foreach}><!-- end of form elements loop -->
</table></form>
|
|
From: <be...@us...> - 2014-10-02 23:09:02
|
Revision: 12807
http://sourceforge.net/p/xoops/svn/12807
Author: beckmi
Date: 2014-10-02 23:08:57 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
redesigned archives section to have months horizontally, added count of articles
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:07:10 UTC (rev 12806)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:08:57 UTC (rev 12807)
@@ -68,46 +68,70 @@
$criteria->setSort('datesub');
$criteria->setOrder('DESC');
//Get all articles dates as an array to save memory
-$items = $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
+$items = $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
$itemsCount = count($items);
if (!($itemsCount > 0)) {
redirect_header(XOOPS_URL, 2, _MD_PUBLISHER_NO_TOP_PERMISSIONS);
exit;
} else {
- $years = array();
+ $years = array();
$months = array();
- $i = 0;
+ $i = 0;
foreach ($items as $item) {
$time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset);
if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
- $this_year = intval($datetime[1]);
+ $this_year = intval($datetime[1]);
$this_month = intval($datetime[2]);
+ //first year
if (empty($lastyear)) {
- $lastyear = $this_year;
+ $lastyear = $this_year;
+ $articlesThisYear = 0;
+ $articlesThisMonth = 0;
}
+ //first month of the year reset
if ($lastmonth == 0) {
- $lastmonth = $this_month;
+ $lastmonth = $this_month;
$months[$lastmonth]['string'] = $months_arr[$lastmonth];
$months[$lastmonth]['number'] = $lastmonth;
+// $months[$lastmonth]['articlesMonthCount'] = 1;
+ $articlesThisMonth = 0;
}
+ //new year
if ($lastyear != $this_year) {
$years[$i]['number'] = $lastyear;
$years[$i]['months'] = $months;
- $months = array();
- $lastmonth = 0;
- $lastyear = $this_year;
+
+ $years[$i]['articlesYearCount'] = $articlesThisYear;
+
+ $months = array();
+ $lastmonth = 0;
+ $lastyear = $this_year;
+ $articlesThisYear = 0;
+ $articlesThisMonth = 0;
++$i;
}
+ //new month
if ($lastmonth != $this_month) {
- $lastmonth = $this_month;
- $months[$lastmonth]['string'] = $months_arr[$lastmonth];
- $months[$lastmonth]['number'] = $lastmonth;
+ if ($articlesThisMonth > 0) {
+ $months[$lastmonth]['articlesMonthCount'] = $articlesThisMonth;
+ }
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ $months[$lastmonth]['articlesMonthCount'] = 1;
+ $articlesThisMonth = 0;
}
+
+ ++$articlesThisMonth;
+ ++$articlesThisYear;
}
}
$years[$i]['number'] = $this_year;
$years[$i]['months'] = $months;
+
+ $years[$i]['articlesYearCount'] = $articlesThisYear;
+
$xoopsTpl->assign('years', $years);
}
unset($items);
@@ -124,19 +148,19 @@
// must adjust the selected time to server timestamp
$timeoffset = $useroffset - $xoopsConfig['server_TZ'];
$monthstart = mktime(0 - $timeoffset, 0, 0, $frommonth, 1, $fromyear);
- $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
- $monthend = ($monthend > time()) ? time() : $monthend;
+ $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
+ $monthend = ($monthend > time()) ? time() : $monthend;
$count = 0;
- $itemhandler = $publisher->getHandler('item');
- $itemhandler->table_link = $xoopsDB->prefix('publisher_categories');
- $itemhandler->field_link = 'categoryid';
+ $itemhandler = $publisher->getHandler('item');
+ $itemhandler->table_link = $xoopsDB->prefix('publisher_categories');
+ $itemhandler->field_link = 'categoryid';
$itemhandler->field_object = 'categoryid';
// Categories for which user has access
$categoriesGranted =& $publisher->getHandler('permission')->getGrantedItems('category_read');
$grantedCategories = new Criteria('l.categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->add($grantedCategories, 'AND');
$criteria->add(new Criteria('o.status', 2), 'AND');
$critdatesub = new CriteriaCompo();
@@ -151,20 +175,17 @@
$count = count($storyarray);
if (is_array($storyarray) && $count > 0) {
foreach ($storyarray as $item) {
- $story = array();
+ $story = array();
$htmltitle = '';
- $story['title'] = "<a href='" . XOOPS_URL . '/modules/publisher/category.php?categoryid='
- . $item->categoryid() . "'>"
- . $item->getCategoryName() . "</a>: <a href='"
- . $item->getItemUrl() . "'" . $htmltitle . ">"
- . $item->title() . "</a>";
- $story['counter'] = $item->counter();
- $story['date'] = $item->datesub();
+ $story['title']
+ =
+ "<a href='" . XOOPS_URL . '/modules/publisher/category.php?categoryid=' . $item->categoryid() . "'>" . $item->getCategoryName() . "</a>: <a href='" . $item->getItemUrl() . "'"
+ . $htmltitle . ">" . $item->title() . "</a>";
+ $story['counter'] = $item->counter();
+ $story['date'] = $item->datesub();
$story['print_link'] = XOOPS_URL . '/modules/publisher/print.php?itemid=' . $item->itemid();
- $story['mail_link'] = 'mailto:?subject='
- . sprintf(_CO_PUBLISHER_INTITEM, $xoopsConfig['sitename'])
- . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $xoopsConfig['sitename'])
- . ': ' . $item->getItemUrl();
+ $story['mail_link'] = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $xoopsConfig['sitename']) . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $xoopsConfig['sitename']) . ': '
+ . $item->getItemUrl();
$xoopsTpl->append('stories', $story);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl 2014-10-02 23:07:10 UTC (rev 12806)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl 2014-10-02 23:08:57 UTC (rev 12807)
@@ -2,13 +2,19 @@
<tr>
<th><{$lang_newsarchives}></th>
</tr>
- <{foreach item=year from=$years}> <{foreach item=month from=$year.months}>
- <tr class="even">
- <td>
- <a href="<{$xoops_url}>/modules/publisher/archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> <{$year.number}></a>
- </td>
- </tr>
- <{/foreach}> <{/foreach}>
+ <{foreach item=year from=$years}>
+ <tr class="even">
+ <td><{$year.number}> (<{$year.articlesYearCount}>)</td>
+ </tr>
+ <tr class="odd">
+ <td>
+ <{foreach item=month from=$year.months}>
+ <a href="./archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> (<{$month.articlesMonthCount}>) </a>
+
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/foreach}>
</table>
<{if $show_articles == true}>
|
|
From: <be...@us...> - 2014-10-02 23:07:19
|
Revision: 12806
http://sourceforge.net/p/xoops/svn/12806
Author: beckmi
Date: 2014-10-02 23:07:10 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
started conversion to PSR-2 coding
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -196,7 +196,7 @@
}
$item['pdf'] = '';
- if ($this->publisher->getConfig('display_pdf')) {
+ if ($publisher->getConfig('display_pdf')) {
if ($options[25] == 1) {
$item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='"
. _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a> ";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -33,15 +33,15 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- var $subCatsCount = 4;
+ public $subCatsCount = 4;
- var $userGroups = array();
+ public $userGroups = array();
- function __construct(&$target, $subCatsCount = 4)
+ public function __construct(&$target, $subCatsCount = 4)
{
$this->publisher = PublisherPublisher::getInstance();
@@ -58,7 +58,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsUser;
@@ -210,7 +210,7 @@
$this->addElement(new XoopsFormHidden('nb_sub_yet', $this->subCatsCount));
}
- function createButtons()
+ public function createButtons()
{
// Action buttons tray
$button_tray = new XoopsFormElementTray('', '');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,11 +34,11 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- function __construct(&$target)
+ public function __construct(&$target)
{
$this->publisher = PublisherPublisher::getInstance();
$this->targetObject = $target;
@@ -50,7 +50,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsDB, $xoopsUser;
// NAME
@@ -81,7 +81,7 @@
$this->addElement(new XoopsFormHidden('itemid', $this->targetObject->itemid()));
}
- function createButtons()
+ public function createButtons()
{
$files_button_tray = new XoopsFormElementTray('', '');
$files_hidden = new XoopsFormHidden('op', 'uploadfile');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,15 +34,15 @@
class PublisherItemForm extends PublisherThemeTabForm
{
- var $checkperm = true;
- var $tabs = array(
+ public $checkperm = true;
+ public $tabs = array(
_CO_PUBLISHER_TAB_MAIN => 'mainTab',
_CO_PUBLISHER_TAB_IMAGES => 'imagesTab',
_CO_PUBLISHER_TAB_FILES => 'filesTab',
_CO_PUBLISHER_TAB_OTHERS => 'othersTab'
);
- var $mainTab = array(
+ public $mainTab = array(
_PUBLISHER_SUBTITLE,
_PUBLISHER_ITEM_SHORT_URL,
_PUBLISHER_ITEM_TAG,
@@ -60,11 +60,11 @@
_PUBLISHER_UID
);
- var $imagesTab = array(
+ public $imagesTab = array(
_PUBLISHER_IMAGE_ITEM
);
- var $filesTab = array(
+ public $filesTab = array(
_PUBLISHER_ITEM_UPLOAD_FILE
);
@@ -75,12 +75,12 @@
_PUBLISHER_ALLOWCOMMENTS
);
- function setCheckPermissions($checkperm)
+ public function setCheckPermissions($checkperm)
{
$this->checkperm = (bool) $checkperm;
}
- function isGranted($item)
+ public function isGranted($item)
{
$publisher = PublisherPublisher::getInstance();
$ret = false;
@@ -91,7 +91,7 @@
return $ret;
}
- function hasTab($tab)
+ public function hasTab($tab)
{
if (!isset($tab) || !isset($this->tabs[$tab])) {
return false;
@@ -108,7 +108,7 @@
return false;
}
- function createElements($obj)
+ public function createElements($obj)
{
global $xoopsConfig, $xoopsUser;
@@ -366,13 +366,13 @@
$GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ajaxupload.3.9.js');
$js_data = new XoopsFormLabel('', '
<script type= "text/javascript">/*<![CDATA[*/
-$publisher(document).ready(function(){
+$publisher(document).ready(function () {
var button = $publisher("#publisher_upload_button"), interval;
new AjaxUpload(button,{
action: "' . PUBLISHER_URL . '/include/ajax_upload.php", // I disabled uploads in this example for security reasons
responseType: "text/html",
name: "publisher_upload_file",
- onSubmit : function(file, ext){
+ onSubmit : function (file, ext) {
// change button text, when user selects file
$publisher("#publisher_upload_message").html(" ");
button.html("<img src=\'' . PUBLISHER_URL . '/assets/images/loadingbar.gif\'/>"); this.setData({
@@ -382,10 +382,10 @@
// If you want to allow uploading only 1 file at time,
// you can disable upload button
this.disable();
- interval = window.setInterval(function(){
+ interval = window.setInterval(function () {
}, 200);
},
- onComplete: function(file, response){
+ onComplete: function (file, response) {
button.text("' . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '");
window.clearInterval(interval);
// enable upload button
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -365,7 +365,7 @@
$this->initVar('mime_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_ext', XOBJ_DTYPE_TXTBOX, null, true, 60);
$this->initVar('mime_types', XOBJ_DTYPE_TXTAREA, null, false, 1024);
- $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, NULL, true, 255);
+ $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, null, true, 255);
$this->initVar('mime_admin', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_user', XOBJ_DTYPE_INT, null, false);
if (isset($id)) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -23,12 +23,12 @@
class PublisherPublisher
{
- var $dirname;
- var $module;
- var $handler;
- var $config;
- var $debug;
- var $debugArray = array();
+ public $dirname;
+ public $module;
+ public $handler;
+ public $config;
+ public $debug;
+ public $debugArray = array();
protected function __construct($debug)
{
@@ -36,7 +36,7 @@
$this->dirname = basename(dirname(__DIR__));
}
- static function &getInstance($debug = false)
+ public static function &getInstance($debug = false)
{
static $instance = false;
if (!$instance) {
@@ -46,7 +46,7 @@
return $instance;
}
- function &getModule()
+ public function &getModule()
{
if ($this->module == null) {
$this->initModule();
@@ -55,7 +55,7 @@
return $this->module;
}
- function getConfig($name = null)
+ public function getConfig($name = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -75,7 +75,7 @@
return $this->config[$name];
}
- function setConfig($name = null, $value = null)
+ public function setConfig($name = null, $value = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -86,7 +86,7 @@
return $this->config[$name];
}
- function &getHandler($name)
+ public function &getHandler($name)
{
if (!isset($this->handler[$name . '_handler'])) {
$this->initHandler($name);
@@ -96,7 +96,7 @@
return $this->handler[$name . '_handler'];
}
- function initModule()
+ public function initModule()
{
global $xoopsModule;
if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
@@ -108,20 +108,20 @@
$this->addLog('INIT MODULE');
}
- function initConfig()
+ public function initConfig()
{
$this->addLog('INIT CONFIG');
$hModConfig = xoops_gethandler('config');
$this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
}
- function initHandler($name)
+ public function initHandler($name)
{
$this->addLog('INIT ' . $name . ' HANDLER');
$this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
}
- function addLog($log)
+ public function addLog($log)
{
if ($this->debug) {
if (is_object($GLOBALS['xoopsLogger'])) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,63 +34,63 @@
*/
class PublisherThemeTabForm extends XoopsForm
{
- var $_tabs;
+ public $_tabs;
/**
* "action" attribute for the html form
*
* @var string
*/
- var $_action;
+ public $_action;
/**
* "method" attribute for the form.
*
* @var string
*/
- var $_method;
+ public $_method;
/**
* "name" attribute of the form
*
* @var string
*/
- var $_name;
+ public $_name;
/**
* title for the form
*
* @var string
*/
- var $_title;
+ public $_title;
/**
* summary for the form (WGAC2 Requirement)
*
* @var string
*/
- var $_summary = '';
+ public $_summary = '';
/**
* array of {@link XoopsFormElement} objects
*
* @var array
*/
- var $_elements = array();
+ public $_elements = array();
/**
* extra information for the <form> tag
*
* @var array
*/
- var $_extra = array();
+ public $_extra = array();
/**
* required elements
*
* @var array
*/
- var $_required = array();
+ public $_required = array();
/**
* @param string $title
@@ -121,7 +121,7 @@
}
}
- //function render(){}
+ //function render() {}
public function assign(&$tpl)
{
$i = -1;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -80,27 +80,27 @@
mt_srand((double) microtime() * 1000000);
class XoopsMediaUploader
{
- var $mediaName;
- var $mediaType;
- var $mediaSize;
- var $mediaTmpName;
- var $mediaError;
- var $uploadDir = '';
- var $allowedMimeTypes = array();
- var $maxFileSize = 0;
- var $maxWidth;
- var $maxHeight;
- var $targetFileName;
- var $prefix;
- var $ext;
- var $dimension;
- var $errors = array();
- var $savedDestination;
- var $savedFileName;
+ public $mediaName;
+ public $mediaType;
+ public $mediaSize;
+ public $mediaTmpName;
+ public $mediaError;
+ public $uploadDir = '';
+ public $allowedMimeTypes = array();
+ public $maxFileSize = 0;
+ public $maxWidth;
+ public $maxHeight;
+ public $targetFileName;
+ public $prefix;
+ public $ext;
+ public $dimension;
+ public $errors = array();
+ public $savedDestination;
+ public $savedFileName;
/**
* No admin check for uploads
*/
- var $noadmin_sizecheck;
+ public $noadmin_sizecheck;
/**
* Constructor
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -24,11 +24,11 @@
class MyTextSanitizerExtension
{
- function MyTextSanitizerExtension()
+ public function MyTextSanitizerExtension()
{
}
- function &getInstance()
+ public function &getInstance()
{
static $instance;
if (!isset($instance)) {
@@ -38,7 +38,7 @@
return $instance;
}
- function wmp(&$patterns, &$replacements)
+ public function wmp(&$patterns, &$replacements)
{
$patterns[] = "/\[wmp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/wmp\]/sU";
$rp = "<object classid=\"clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6\" id=\"WindowsMediaPlayer\" width=\"\\2\" height=\"\\3\">\n";
@@ -49,7 +49,7 @@
$replacements[] = $rp;
}
- function _displayFlash($url, $width = false, $height = false)
+ public function _displayFlash($url, $width = false, $height = false)
{
if (!$width || !$height) {
if (!$dimension = @getimagesize($url)) {
@@ -75,13 +75,13 @@
return $rp;
}
- function flash(&$patterns, &$replacements)
+ public function flash(&$patterns, &$replacements)
{
$patterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
$replacements[] = "MyTextSanitizerExtension::_displayFlash( '\\5', '\\3', '\\4' )";
}
- function mms(&$patterns, &$replacements)
+ public function mms(&$patterns, &$replacements)
{
$patterns[] = "/\[mms=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/mms\]/sU";
$rp = "<OBJECT id=videowindow1 height='\\3' width='\\2' classid='CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6'>";
@@ -114,7 +114,7 @@
$replacements[] = $rp;
}
- function rtsp(&$patterns, &$replacements)
+ public function rtsp(&$patterns, &$replacements)
{
$patterns[] = "/\[rtsp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/rtsp\]/sU";
$rp = "<object classid=\"clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA\" HEIGHT='\\3' ID=Player WIDTH='\\2' VIEWASTEXT>";
|
|
From: <be...@us...> - 2014-10-02 23:04:59
|
Revision: 12805
http://sourceforge.net/p/xoops/svn/12805
Author: beckmi
Date: 2014-10-02 23:04:57 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
updated makepdf.php file for the latest TCPDF
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-10-02 23:04:01 UTC (rev 12804)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-10-02 23:04:57 UTC (rev 12805)
@@ -1,38 +1,21 @@
<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
/**
- * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Action
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @author Sina Asghari (AKA stranger) <str...@im...>
- * @version $Id: makepdf.php 335 2011-12-05 20:24:01Z lus...@gm... $
- */
+ * File : makefile.pdf for publisher
+ * For tcpdf_for_xoops 2.01 and higher
+ * Created by montuy337513 / philodenelle - http://www.chg-web.org
+**/
+error_reporting(0);
-error_reporting(0);
include_once __DIR__ . '/header.php';
-if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
- redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id,3,'TCPDF for Xoops not installed');
-}
-$itemid = PublisherRequest::getInt('itemid');
-$item_page_id = PublisherRequest::getInt('page', -1);
-
+$itemid = XoopsRequest::getInt('itemid');
+$item_page_id = XoopsRequest::getInt('page', -1);
if ($itemid == 0) {
redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
exit();
}
-
+if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
+ redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$itemid,3,'TCPF for Xoops not installed in ./xoops_lib/vendor/');
+}
// Creating the item object for the selected item
$itemObj = $publisher->getHandler('item')->get($itemid);
@@ -56,52 +39,60 @@
$dateformat = $itemObj->datesub();
$sender_inform = sprintf(_MD_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->datesub());
$mainImage = $itemObj->getMainImage();
-$pdf_data['author'] = $itemObj->posterName();
-$pdf_data['title'] = $myts->undoHtmlSpecialChars($categoryObj->name());
+
$content = '';
if ($mainImage['image_path'] != '') {
- $content .= '<img src="' . $mainImage['image_path'] . '" alt="' . $myts->undoHtmlSpecialChars($mainImage['image_name']) . '"/>';
+ $content .= '<img src="' . $mainImage['image_path'] . '" alt="' . $myts->undoHtmlSpecialChars($mainImage['image_name']) . '"/><br />';
}
-$content .= '<strong><i><u><a href="' . PUBLISHER_URL . '/item.php?itemid=' . $itemid . '" title="' . $myts->undoHtmlSpecialChars($itemObj->title()) . '">' . $myts->undoHtmlSpecialChars($itemObj->title()) . '</a></u></i></strong>';
-$content .= '<strong>' . _CO_PUBLISHER_CATEGORY . ' : <a href="' . PUBLISHER_URL . '/category.php?categoryid=' . $itemObj->categoryid() . '" title="' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '">' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '</a></strong>';
-$content .= '<br /><strong>' . $sender_inform . '</strong>';
+$content .= '<a href="' . PUBLISHER_URL . '/item.php?itemid=' . $itemid . '" style="text-decoration: none; color: black; font-size: 120%;" title="' . $myts->undoHtmlSpecialChars($itemObj->title()) . '">' . $myts->undoHtmlSpecialChars($itemObj->title()) . '</a>';
+$content .= '<br /><span style="color: #CCCCCC; font-weight: bold; font-size: 80%;">' . _CO_PUBLISHER_CATEGORY . ' : </span><a href="' . PUBLISHER_URL . '/category.php?categoryid=' . $itemObj->categoryid() . '" style="color: #CCCCCC; font-weight: bold; font-size: 80%;" title="' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '">' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '</a>';
+$content .= '<br /><span style="font-size: 80%; font-style: italic;">' . $sender_inform . '</span><br />';
$content .= $itemObj->plain_maintext();
+// Configuration for TCPDF_for_XOOPS
+$pdf_data = array (
+ 'author' => $itemObj->posterName(),
+ 'title' => $myts->undoHtmlSpecialChars($categoryObj->name()),
+ 'page_format' => 'A4',
+ 'page_orientation' => 'P',
+ 'unit' => 'mm',
+ 'rtl' => false //true if right to left
+);
require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
-// load $localLanguageOptions array with language specific definitions and apply
-if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
-} else {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
-}
-$pdf->setLanguageArray($localLanguageOptions);
$doc_title = publisher_convertCharset($myts->undoHtmlSpecialChars($itemObj->title()));
-$doc_keywords = 'XOOPS';
+$docSubject = $myts->undoHtmlSpecialChars($categoryObj->name());
+$docKeywords = $myts->undoHtmlSpecialChars($itemObj->meta_keywords());
+if(array_key_exists('rtl',$pdf_data)) $pdf->setRTL($pdf_data['rtl']);
+;
// set document information
$pdf->SetCreator(PDF_CREATOR);
$pdf->SetAuthor(PDF_AUTHOR);
$pdf->SetTitle($doc_title);
-$pdf->SetSubject($doc_title);
-$pdf->SetKeywords(XOOPS_URL . ', '.' by tcpdf_for_xoops (chg-web.org), '.$doc_title);
+$pdf->SetSubject($docSubject);
+//$pdf->SetKeywords(XOOPS_URL . ', '.' by TCPDF_for_XOOPS (chg-web.org), '.$doc_title);
+$pdf->SetKeywords($docKeywords);
-$firstLine = XOOPS_URL.' - '.publisher_convertCharset($xoopsConfig['sitename']);
+
+$firstLine = publisher_convertCharset($xoopsConfig['sitename']) . ' ('. XOOPS_URL.')';
$secondLine = publisher_convertCharset($xoopsConfig['slogan']);
//$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $firstLine, $secondLine);
$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $firstLine, $secondLine, array(0, 64, 255), array(0, 64, 128));
+
+//$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING);
+
//set margins
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP , PDF_MARGIN_RIGHT);
-$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
//set auto page breaks
$pdf->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);
-
+$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor
$pdf->setHeaderFont(Array(PDF_FONT_NAME_SUB, '', PDF_FONT_SIZE_SUB));
@@ -111,6 +102,5 @@
//initialize document
$pdf->Open();
$pdf->AddPage();
-$pdf->SetFont(PDF_FONT_NAME_MAIN,PDF_FONT_STYLE_MAIN, PDF_FONT_SIZE_MAIN);
$pdf->writeHTML($content, true, 0, true, 0);
$pdf->Output();
|
|
From: <be...@us...> - 2014-10-02 23:04:07
|
Revision: 12804
http://sourceforge.net/p/xoops/svn/12804
Author: beckmi
Date: 2014-10-02 23:04:01 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
replaced PublisherRequest with calls to XoopsRequest
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/visit.php
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/admin_header.php';
-$op = PublisherRequest::getString('op');
+$op = XoopsRequest::getString('op');
$op = isset($_POST['editor']) ? 'mod' : $op;
if (isset($_POST['addcategory'])) {
@@ -29,8 +29,8 @@
}
// Where do we start ?
-$startcategory = PublisherRequest::getInt('startcategory');
-$categoryid = PublisherRequest::getInt('categoryid');
+$startcategory = XoopsRequest::getInt('startcategory');
+$categoryid = XoopsRequest::getInt('categoryid');
switch ($op) {
@@ -65,7 +65,7 @@
case "addcategory":
global $modify;
- $parentid = PublisherRequest::getInt('parentid');
+ $parentid = XoopsRequest::getInt('parentid');
if ($categoryid != 0) {
$categoryObj = $publisher->getHandler('category')->get($categoryid);
@@ -362,7 +362,7 @@
publisher_closeCollapsableBar('subcatstable', 'subcatsicon');
publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
- $startitem = PublisherRequest::getInt('startitem');
+ $startitem = XoopsRequest::getInt('startitem');
// Get the total number of published ITEMS
$totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED));
// creating the items objects that are published
@@ -398,7 +398,7 @@
}
echo "</table>\n";
echo "<br />\n";
- $parentid = PublisherRequest::getInt('parentid');
+ $parentid = XoopsRequest::getInt('parentid');
$pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
xoops_load('XoopsPageNav');
$pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/admin_header.php';
-$op = PublisherRequest::getString('op');
+$op = XoopsRequest::getString('op');
function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,9 +22,9 @@
include_once __DIR__ . '/admin_header.php';
-$itemid = PublisherRequest::getInt('itemid');
+$itemid = XoopsRequest::getInt('itemid');
$op = ($itemid > 0 || isset($_POST['editor'])) ? 'mod' : '';
-$op = PublisherRequest::getString('op', $op);
+$op = XoopsRequest::getString('op', $op);
if (isset($_POST['additem'])) {
$op = 'additem';
@@ -33,10 +33,10 @@
}
// Where shall we start ?
-$submittedstartitem = PublisherRequest::getInt('submittedstartitem');
-$publishedstartitem = PublisherRequest::getInt('publishedstartitem');
-$offlinestartitem = PublisherRequest::getInt('offlinestartitem');
-$rejectedstartitem = PublisherRequest::getInt('rejectedstartitem');
+$submittedstartitem = XoopsRequest::getInt('submittedstartitem');
+$publishedstartitem = XoopsRequest::getInt('publishedstartitem');
+$offlinestartitem = XoopsRequest::getInt('offlinestartitem');
+$rejectedstartitem = XoopsRequest::getInt('rejectedstartitem');
switch ($op) {
case "clone":
@@ -75,7 +75,7 @@
$itemObj->setVarsFromRequest();
$old_status = $itemObj->status();
- $new_status = PublisherRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
+ $new_status = XoopsRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
switch ($new_status) {
case _PUBLISHER_STATUS_SUBMITTED:
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -35,8 +35,8 @@
$lastyear = 0;
$lastmonth = 0;
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
-$fromyear = PublisherRequest::getInt('year');
-$frommonth = PublisherRequest::getInt('month');
+$fromyear = XoopsRequest::getInt('year');
+$frommonth = XoopsRequest::getInt('month');
$pgtitle = '';
if ($fromyear && $frommonth) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/header.php';
-$uid = PublisherRequest::getInt('uid');
+$uid = XoopsRequest::getInt('uid');
if (empty($uid)) {
redirect_header('index.php', 2, _CO_PUBLISHER_ERROR);
exit();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,7 +22,7 @@
include_once __DIR__ . '/header.php';
-$categoryid = PublisherRequest::getInt('categoryid');
+$categoryid = XoopsRequest::getInt('categoryid');
// Creating the category object for the selected category
$categoryObj = $publisher->getHandler('category')->get($categoryid);
@@ -40,9 +40,9 @@
}
// At which record shall we start
-$start = PublisherRequest::getInt('start');
+$start = XoopsRequest::getInt('start');
-$item_page_id = PublisherRequest::getInt('page', -1);
+$item_page_id = XoopsRequest::getInt('page', -1);
$totalItems = $publisher->getHandler('category')->publishedItemsCount();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -581,7 +581,7 @@
return sprintf(_CO_PUBLISHER_POSTEDBY, $posterName, $postdate);
}
- /**
+ /**
* @return string
*/
public function getWho()
@@ -590,7 +590,7 @@
return $posterName;
}
- /**
+ /**
* @return string
*/
public function getWhen()
@@ -708,10 +708,10 @@
$item['subtitle'] = $this->subtitle();
$item['datesub'] = $this->datesub();
$item['counter'] = $this->counter();
- $item['who'] = $this->getWho();
- $item['when'] = $this->getWhen();
- $item['category'] = $this->getCategoryName();
- $item = $this->getMainImage($item);
+ $item['who'] = $this->getWho();
+ $item['when'] = $this->getWhen();
+ $item['category'] = $this->getCategoryName();
+ $item = $this->getMainImage($item);
switch ($display) {
case 'summary':
case 'list':
@@ -762,9 +762,9 @@
$item['adminlink'] = $this->getAdminLinks();
$item['categoryPath'] = $this->getCategoryPath($this->publisher->getConfig('format_linked_path'));
$item['who_when'] = $this->getWhoAndWhen();
- $item['who'] = $this->getWho();
- $item['when'] = $this->getWhen();
- $item['category'] = $this->getCategoryName();
+ $item['who'] = $this->getWho();
+ $item['when'] = $this->getWhen();
+ $item['category'] = $this->getCategoryName();
$item = $this->getMainImage($item);
return $item;
@@ -952,27 +952,27 @@
{
//Required fields
if (isset($_REQUEST['categoryid'])) {
- $this->setVar('categoryid', PublisherRequest::getInt('categoryid'));
+ $this->setVar('categoryid', XoopsRequest::getInt('categoryid'));
}
if (isset($_REQUEST['title'])) {
- $this->setVar('title', PublisherRequest::getString('title'));
+ $this->setVar('title', XoopsRequest::getString('title'));
}
if (isset($_REQUEST['body'])) {
- $this->setVar('body', PublisherRequest::getText('body'));
+ $this->setVar('body', XoopsRequest::getText('body'));
}
//Not required fields
if (isset($_REQUEST['summary'])) {
- $this->setVar('summary', PublisherRequest::getText('summary'));
+ $this->setVar('summary', XoopsRequest::getText('summary'));
}
if (isset($_REQUEST['subtitle'])) {
- $this->setVar('subtitle', PublisherRequest::getString('subtitle'));
+ $this->setVar('subtitle', XoopsRequest::getString('subtitle'));
}
if (isset($_REQUEST['item_tag'])) {
- $this->setVar('item_tag', PublisherRequest::getString('item_tag'));
+ $this->setVar('item_tag', XoopsRequest::getString('item_tag'));
}
if (isset($_REQUEST['image_featured'])) {
- $image_item = PublisherRequest::getArray('image_item');
- $image_featured = PublisherRequest::getString('image_featured');
+ $image_item = XoopsRequest::getArray('image_item');
+ $image_featured = XoopsRequest::getString('image_featured');
//Todo: get a better image class for xoops!
//Image hack
$image_item_ids = array();
@@ -992,12 +992,12 @@
$this->setVar('images', implode('|', $image_item_ids));
}
if (isset($_REQUEST['uid'])) {
- $this->setVar('uid', PublisherRequest::getInt('uid'));
+ $this->setVar('uid', XoopsRequest::getInt('uid'));
} elseif ($this->isnew()) {
$this->setVar('uid', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->uid() : 0);
}
if (isset($_REQUEST['author_alias'])) {
- $this->setVar('author_alias', PublisherRequest::getString('author_alias'));
+ $this->setVar('author_alias', XoopsRequest::getString('author_alias'));
if ($this->getVar('autor_alias') != '') {
$this->setVar('uid', 0);
}
@@ -1008,54 +1008,54 @@
$this->setVar('datesub', time());
}
if (isset($_REQUEST['item_short_url'])) {
- $this->setVar('short_url', PublisherRequest::getString('item_short_url'));
+ $this->setVar('short_url', XoopsRequest::getString('item_short_url'));
}
if (isset($_REQUEST['item_meta_keywords'])) {
- $this->setVar('meta_keywords', PublisherRequest::getString('item_meta_keywords'));
+ $this->setVar('meta_keywords', XoopsRequest::getString('item_meta_keywords'));
}
if (isset($_REQUEST['item_meta_description'])) {
- $this->setVar('meta_description', PublisherRequest::getString('item_meta_description'));
+ $this->setVar('meta_description', XoopsRequest::getString('item_meta_description'));
}
if (isset($_REQUEST['weight'])) {
- $this->setVar('weight', PublisherRequest::getInt('weight'));
+ $this->setVar('weight', XoopsRequest::getInt('weight'));
}
if (isset($_REQUEST['allowcomments'])) {
- $this->setVar('cancomment', PublisherRequest::getInt('allowcomments'));
+ $this->setVar('cancomment', XoopsRequest::getInt('allowcomments'));
} elseif ($this->isnew()) {
$this->setVar('cancoment', $this->publisher->getConfig('submit_allowcomments'));
}
if (isset($_REQUEST['status'])) {
- $this->setVar('status', PublisherRequest::getInt('status'));
+ $this->setVar('status', XoopsRequest::getInt('status'));
} elseif ($this->isnew()) {
$this->setVar('status', $this->publisher->getConfig('submit_status'));
}
if (isset($_REQUEST['dohtml'])) {
- $this->setVar('dohtml', PublisherRequest::getInt('dohtml'));
+ $this->setVar('dohtml', XoopsRequest::getInt('dohtml'));
} elseif ($this->isnew()) {
$this->setVar('dohtml', $this->publisher->getConfig('submit_dohtml'));
}
if (isset($_REQUEST['dosmiley'])) {
- $this->setVar('dosmiley', PublisherRequest::getInt('dosmiley'));
+ $this->setVar('dosmiley', XoopsRequest::getInt('dosmiley'));
} elseif ($this->isnew()) {
$this->setVar('dosmiley', $this->publisher->getConfig('submit_dosmiley'));
}
if (isset($_REQUEST['doxcode'])) {
- $this->setVar('doxcode', PublisherRequest::getInt('doxcode'));
+ $this->setVar('doxcode', XoopsRequest::getInt('doxcode'));
} elseif ($this->isnew()) {
$this->setVar('doxcode', $this->publisher->getConfig('submit_doxcode'));
}
if (isset($_REQUEST['doimage'])) {
- $this->setVar('doimage', PublisherRequest::getInt('doimage'));
+ $this->setVar('doimage', XoopsRequest::getInt('doimage'));
} elseif ($this->isnew()) {
$this->setVar('doimage', $this->publisher->getConfig('submit_doimage'));
}
if (isset($_REQUEST['dolinebreak'])) {
- $this->setVar('dobr', PublisherRequest::getInt('dolinebreak'));
+ $this->setVar('dobr', XoopsRequest::getInt('dolinebreak'));
} elseif ($this->isnew()) {
$this->setVar('dobr', $this->publisher->getConfig('submit_dobr'));
}
if (isset($_REQUEST['notify'])) {
- $this->setVar('notifypub', PublisherRequest::getInt('notify'));
+ $this->setVar('notifypub', XoopsRequest::getInt('notify'));
}
}
}
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -1,972 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * Publisher class
- *
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
- * @license GNU/GPL, see LICENSE.php
- * Joomla! is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- * @package Publisher
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: request.php 10374 2012-12-12 23:39:48Z trabis $
- */
-
-/**
- * Set the available masks for cleaning variables
- */
-define('PUBLISHER_REQUEST_NOTRIM', 1);
-define('PUBLISHER_REQUEST_ALLOWRAW', 2);
-define('PUBLISHER_REQUEST_ALLOWHTML', 4);
-
-/**
- * PublisherRequest Class
- * This class serves to provide a common interface to access
- * request variables. This includes $_POST, $_GET, and naturally $_REQUEST. Variables
- * can be passed through an input filter to avoid injection or returned raw.
- */
-class PublisherRequest
-{
-
- /**
- * Gets the request method
- *
- * @return string
- */
- static function getMethod()
- {
- $method = strtoupper($_SERVER['REQUEST_METHOD']);
-
- return $method;
- }
-
- /**
- * Fetches and returns a given variable.
- * The default behaviour is fetching variables depending on the
- * current request method: GET and HEAD will result in returning
- * an entry from $_GET, POST and PUT will result in returning an
- * entry from $_POST.
- * You can force the source by setting the $hash parameter:
- * post $_POST
- * get $_GET
- * files $_FILES
- * cookie $_COOKIE
- * env $_ENV
- * server $_SERVER
- * method via current $_SERVER['REQUEST_METHOD']
- * default $_REQUEST
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- * @param string $type Return type for the variable, for valid values see {@link JFilterInput::clean()}
- * @param int $mask Filter mask for the variable
- *
- * @return mixed Requested variable
- */
- static function getVar($name, $default = null, $hash = 'default', $type = 'none', $mask = 0)
- {
- // Ensure hash and type are uppercase
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- $type = strtoupper($type);
- // Get the input hash
- switch ($hash) {
- case 'GET' :
- $input = & $_GET;
- break;
- case 'POST' :
- $input = & $_POST;
- break;
- case 'FILES' :
- $input = & $_FILES;
- break;
- case 'COOKIE' :
- $input = & $_COOKIE;
- break;
- case 'ENV' :
- $input = & $_ENV;
- break;
- case 'SERVER' :
- $input = & $_SERVER;
- break;
- default:
- $input = & $_REQUEST;
- $hash = 'REQUEST';
- break;
- }
- if (isset($input[$name]) && $input[$name] !== null) {
- // Get the variable from the input hash and clean it
- $var = PublisherRequest::_cleanVar($input[$name], $mask, $type);
- // Handle magic quotes compatability
- if (get_magic_quotes_gpc() && ($var != $default) && ($hash != 'FILES')) {
- $var = PublisherRequest::_stripSlashesRecursive($var);
- }
- } elseif ($default !== null) {
- // Clean the default value
- $var = PublisherRequest::_cleanVar($default, $mask, $type);
- } else {
- $var = $default;
- }
-
- return $var;
- }
-
- /**
- * Fetches and returns a given filtered variable. The integer
- * filter will allow only digits to be returned. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param int $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return integer Requested variable
- */
- static function getInt($name, $default = 0, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'int');
- }
-
- /**
- * Fetches and returns a given filtered variable. The float
- * filter only allows digits and periods. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param float $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return float Requested variable
- */
- static function getFloat($name, $default = 0.0, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'float');
- }
-
- /**
- * Fetches and returns a given filtered variable. The bool
- * filter will only return true/false bool values. This is
- * currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param bool $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return bool Requested variable
- */
- static function getBool($name, $default = false, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'bool');
- }
-
- /**
- * Fetches and returns a given filtered variable. The word
- * filter only allows the characters [A-Za-z_]. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return string Requested variable
- */
- static function getWord($name, $default = '', $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'word');
- }
-
- /**
- * Fetches and returns a given filtered variable. The cmd
- * filter only allows the characters [A-Za-z0-9.-_]. This is
- * currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return string Requested variable
- */
- static function getCmd($name, $default = '', $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'cmd');
- }
-
- /**
- * Fetches and returns a given filtered variable. The string
- * filter deletes 'bad' HTML code, if not overridden by the mask.
- * This is currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- * @param int $mask Filter mask for the variable
- *
- * @return string Requested variable
- */
- static function getString($name, $default = '', $hash = 'default', $mask = 0)
- {
- // Cast to string, in case JREQUEST_ALLOWRAW was specified for mask
- return (string) PublisherRequest::getVar($name, $default, $hash, 'string', $mask);
- }
-
- static function getArray($name, $default = array(), $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'array');
- }
-
- static function getText($name, $default = '', $hash = 'default')
- {
- return (string) PublisherRequest::getVar($name, $default, $hash, 'string', PUBLISHER_REQUEST_ALLOWRAW);
- }
-
- /**
- * Set a variabe in on of the request variables
- *
- * @access public
- *
- * @param string $name Name
- * @param string $value Value
- * @param string $hash Hash
- * @param boolean $overwrite Boolean
- *
- * @return string Previous value
- */
- static function setVar($name, $value = null, $hash = 'method', $overwrite = true)
- {
- //If overwrite is true, makes sure the variable hasn't been set yet
- if (!$overwrite && array_key_exists($name, $_REQUEST)) {
- return $_REQUEST[$name];
- }
- // Get the request hash value
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- $previous = array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : null;
- switch ($hash) {
- case 'GET' :
- $_GET[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'POST' :
- $_POST[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'COOKIE' :
- $_COOKIE[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'FILES' :
- $_FILES[$name] = $value;
- break;
- case 'ENV' :
- $_ENV['name'] = $value;
- break;
- case 'SERVER' :
- $_SERVER['name'] = $value;
- break;
- }
-
- return $previous;
- }
-
- /**
- * Fetches and returns a request array.
- * The default behaviour is fetching variables depending on the
- * current request method: GET and HEAD will result in returning
- * $_GET, POST and PUT will result in returning $_POST.
- * You can force the source by setting the $hash parameter:
- * post $_POST
- * get $_GET
- * files $_FILES
- * cookie $_COOKIE
- * env $_ENV
- * server $_SERVER
- * method via current $_SERVER['REQUEST_METHOD']
- * default $_REQUEST
- *
- * @static
- *
- * @param string $hash to get (POST, GET, FILES, METHOD)
- * @param int $mask Filter mask for the variable
- *
- * @return mixed Request hash
- */
- static function get($hash = 'default', $mask = 0)
- {
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- switch ($hash) {
- case 'GET' :
- $input = $_GET;
- break;
- case 'POST' :
- $input = $_POST;
- break;
- case 'FILES' :
- $input = $_FILES;
- break;
- case 'COOKIE' :
- $input = $_COOKIE;
- break;
- case 'ENV' :
- $input = & $_ENV;
- break;
- case 'SERVER' :
- $input = & $_SERVER;
- break;
- default:
- $input = $_REQUEST;
- break;
- }
- $result = PublisherRequest::_cleanVar($input, $mask);
- // Handle magic quotes compatability
- if (get_magic_quotes_gpc() && ($hash != 'FILES')) {
- $result = PublisherRequest::_stripSlashesRecursive($result);
- }
-
- return $result;
- }
-
- /**
- * Sets a request variable
- *
- * @param array $array An associative array of key-value pairs
- * @param string $hash The request variable to set (POST, GET, FILES, METHOD)
- * @param boolean $overwrite If true and an existing key is found, the value is overwritten, otherwise it is ingored
- */
- static function set($array, $hash = 'default', $overwrite = true)
- {
- foreach ($array as $key => $value) {
- PublisherRequest::setVar($key, $value, $hash, $overwrite);
- }
- }
-
- /**
- * Cleans the request from script injection.
- *
- * @static
- * @return void
- */
- static function clean()
- {
- PublisherRequest::_cleanArray($_FILES);
- PublisherRequest::_cleanArray($_ENV);
- PublisherRequest::_cleanArray($_GET);
- PublisherRequest::_cleanArray($_POST);
- PublisherRequest::_cleanArray($_COOKIE);
- PublisherRequest::_cleanArray($_SERVER);
- if (isset($_SESSION)) {
- PublisherRequest::_cleanArray($_SESSION);
- }
- $REQUEST = $_REQUEST;
- $GET = $_GET;
- $POST = $_POST;
- $COOKIE = $_COOKIE;
- $FILES = $_FILES;
- $ENV = $_ENV;
- $SERVER = $_SERVER;
- if (isset ($_SESSION)) {
- $SESSION = $_SESSION;
- }
- foreach ($GLOBALS as $key => $value) {
- if ($key != 'GLOBALS') {
- unset($GLOBALS[$key]);
- }
- }
- $_REQUEST = $REQUEST;
- $_GET = $GET;
- $_POST = $POST;
- $_COOKIE = $COOKIE;
- $_FILES = $FILES;
- $_ENV = $ENV;
- $_SERVER = $SERVER;
- if (isset($SESSION)) {
- $_SESSION = $SESSION;
- }
- }
-
- /**
- * Adds an array to the GLOBALS array and checks that the GLOBALS variable is not being attacked
- *
- * @access protected
- *
- * @param array $array Array to clean
- * @param boolean $globalise True if the array is to be added to the GLOBALS
- */
- static function _cleanArray(&$array, $globalise = false)
- {
- static $banned = array('_files', '_env', '_get', '_post', '_cookie', '_server', '_session', 'globals');
- foreach ($array as $key => $value) {
- // PHP GLOBALS injection bug
- $failed = in_array(strtolower($key), $banned);
- // PHP Zend_Hash_Del_Key_Or_Index bug
- $failed |= is_numeric($key);
- if ($failed) {
- exit('Illegal variable <strong>' . implode('</strong> or <strong>', $banned) . '</strong> passed to script.');
- }
- if ($globalise) {
- $GLOBALS[$key] = $value;
- }
- }
- }
-
- /**
- * Clean up an input variable.
- *
- * @param mixed $var The input variable.
- * @param int $mask Filter bit mask. 1=no trim: If this flag is cleared and the
- * input is a string, the string will have leading and trailing whitespace
- * trimmed. 2=allow_raw: If set, no more filtering is performed, higher bits
- * are ignored. 4=allow_html: HTML is allowed, but passed through a safe
- * HTML filter first. If set, no more filtering is performed. If no bits
- * other than the 1 bit is set, a strict filter is applied.
- * @param string $type The variable type {@see JFilterInput::clean()}.
- *
- * @return string
- */
- static function _cleanVar($var, $mask = 0, $type = null)
- {
- // Static input filters for specific settings
- static $noHtmlFilter = null;
- static $safeHtmlFilter = null;
- // If the no trim flag is not set, trim the variable
- if (!($mask & 1) && is_string($var)) {
- $var = trim($var);
- }
- // Now we handle input filtering
- if ($mask & 2) {
- // If the allow raw flag is set, do not modify the variable
- } elseif ($mask & 4) {
- // If the allow html flag is set, apply a safe html filter to the variable
- if (is_null($safeHtmlFilter)) {
- $safeHtmlFilter = PublisherFilterInput::getInstance(null, null, 1, 1);
- }
- $var = $safeHtmlFilter->clean($var, $type);
- } else {
- // Since no allow flags were set, we will apply the most strict filter to the variable
- if (is_null($noHtmlFilter)) {
- $noHtmlFilter = PublisherFilterInput::getInstance( /* $tags, $attr, $tag_method, $attr_method, $xss_auto */);
- }
- $var = $noHtmlFilter->clean($var, $type);
- }
-
- return $var;
- }
-
- /**
- * Strips slashes recursively on an array
- *
- * @access protected
- *
- * @param array $value Array of (nested arrays of) strings
- *
- * @return array|string The input array with stripshlashes applied to it
- */
- protected function _stripSlashesRecursive($value)
- {
- $value = is_array($value) ? array_map(array('PublisherRequest', '_stripSlashesRecursive'), $value) : stripslashes($value);
-
- return $value;
- }
-}
-
-/**
- * PublisherInput is a class for filtering input from any data source
- * Forked from the php input filter library by: Daniel Morris <da...@ro...>
- * Original Contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
- *
- * @author Louis Landry <lou...@jo...>
- */
-class PublisherFilterInput
-{
- var $tagsArray; // default = empty array
- var $attrArray; // default = empty array
- var $tagsMethod; // default = 0
- var $attrMethod; // default = 0
- var $xssAuto; // default = 1
- var $tagBlacklist = array('applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml');
- var $attrBlacklist = array('action', 'background', 'codebase', 'dynsrc', 'lowsrc'); // also will strip ALL event handlers
- /**
- * Constructor for inputFilter class. Only first parameter is required.
- *
- * @access protected
- *
- * @param array $tagsArray list of user-defined tags
- * @param array $attrArray list of user-defined attributes
- * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
- * @param int $attrMethod WhiteList method = 0, BlackList method = 1
- * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
- */
- public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
- {
- // Make sure user defined arrays are in lowercase
- $tagsArray = array_map('strtolower', (array) $tagsArray);
- $attrArray = array_map('strtolower', (array) $attrArray);
- // Assign member variables
- $this->tagsArray = $tagsArray;
- $this->attrArray = $attrArray;
- $this->tagsMethod = $tagsMethod;
- $this->attrMethod = $attrMethod;
- $this->xssAuto = $xssAuto;
- }
-
- /**
- * Returns a reference to an input filter object, only creating it if it doesn't already exist.
- * This method must be invoked as:
- * <pre> $filter = & PublisherFilterInput::getInstance();</pre>
- *
- * @static
- *
- * @param array $tagsArray list of user-defined tags
- * @param array $attrArray list of user-defined attributes
- * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
- * @param int $attrMethod WhiteList method = 0, BlackList method = 1
- * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
- *
- * @return object The PublisherFilterInput object.
- * @since 1.5
- */
- public function & getInstance($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
- {
- static $instances;
- $sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto)));
- if (!isset ($instances)) {
- $instances = array();
- }
- if (empty ($instances[$sig])) {
- $instances[$sig] = new PublisherFilterInput($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto);
- }
-
- return $instances[$sig];
- }
-
- /**
- * Method to be called by another php script. Processes for XSS and
- * specified bad code.
- *
- * @access public
- *
- * @param mixed $source Input string/array-of-string to be 'cleaned'
- * @param string $type Return type for the variable (INT, FLOAT, BOOLEAN, WORD, ALNUM, CMD, BASE64, STRING, ARRAY, PATH, NONE)
- *
- * @return mixed 'Cleaned' version of input parameter
- * @static
- */
- public function clean($source, $type = 'string')
- {
- // Handle the type constraint
- switch (strtoupper($type)) {
- case 'INT' :
- case 'INTEGER' :
- // Only use the first integer value
- preg_match('/-?[0-9]+/', (string) $source, $matches);
- $result = @ (int) $matches[0];
- break;
- case 'FLOAT' :
- case 'DOUBLE' :
- // Only use the first floating point value
- preg_match('/-?[0-9]+(\.[0-9]+)?/', (string) $source, $matches);
- $result = @ (float) $matches[0];
- break;
- case 'BOOL' :
- case 'BOOLEAN' :
- $result = (bool) $source;
- break;
- case 'WORD' :
- $result = (string) preg_replace('/[^A-Z_]/i', '', $source);
- break;
- case 'ALNUM' :
- $result = (string) preg_replace('/[^A-Z0-9]/i', '', $source);
- break;
- case 'CMD' :
- $result = (string) preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
- $result = ltrim($result, '.');
- break;
- case 'BASE64' :
- $result = (string) preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
- break;
- case 'STRING' :
- // Check for static usage and assign $filter the proper variable
- if (isset($this) && is_a($this, 'PublisherFilterInput')) {
- $filter =& $this;
- } else {
- $filter = PublisherFilterInput::getInstance();
- }
- $result = (string) $filter->_remove($filter->_decode((string) $source));
- break;
- case 'ARRAY' :
- $result = (array) $source;
- break;
- case 'PATH' :
- $pattern = '/^[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
- preg_match($pattern, (string) $source, $matches);
- $result = @ (string) $matches[0];
- break;
- case 'USERNAME' :
- $result = (string) preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
- break;
- default :
- // Check for static usage and assign $filter the proper variable
- if (is_object($this) && get_class($this) == 'PublisherFilterInput') {
- $filter =& $this;
- } else {
- $filter = PublisherFilterInput::getInstance();
- }
- // Are we dealing with an array?
- if (is_array($source)) {
- foreach ($source as $key => $value) {
- // filter element for XSS and other 'bad' code etc.
- if (is_string($value)) {
- $source[$key] = $filter->_remove($filter->_decode($value));
- }
- }
- $result = $source;
- } else {
- // Or a string?
- if (is_string($source) && !empty ($source)) {
- // filter source for XSS and other 'bad' code etc.
- $result = $filter->_remove($filter->_decode($source));
- } else {
- // Not an array or string.. return the passed parameter
- $result = $source;
- }
- }
- break;
- }
-
- return $result;
- }
-
- /**
- * Function to determine if contents of an attribute is safe
- *
- * @static
- *
- * @param array $attrSubSet A 2 element array for attributes name,value
- *
- * @return boolean True if bad code is detected
- */
- public function checkAttribute($attrSubSet)
- {
- $attrSubSet[0] = strtolower($attrSubSet[0]);
- $attrSubSet[1] = strtolower($attrSubSet[1]);
-
- return (((strpos($attrSubSet[1], 'expression') !== false) && ($attrSubSet[0]) == 'style') || (strpos($attrSubSet[1], 'javascript:') !== false) || (strpos($attrSubSet[1], 'behaviour:') !== false) || (strpos($attrSubSet[1], 'vbscript:') !== false) || (strpos($attrSubSet[1], 'mocha:') !== false) || (strpos($attrSubSet[1], 'livescript:') !== false));
- }
-
- /**
- * Internal method to iteratively remove all unwanted tags and attributes
- *
- * @access protected
- *
- * @param string $source Input string to be 'cleaned'
- *
- * @return string 'Cleaned' version of input parameter
- */
- protected function _remove($source)
- {
- $loopCounter = 0;
- // Iteration provides nested tag protection
- while ($source != $this->_cleanTags($source)) {
- $source = $this->_cleanTags($source);
- $loopCounter++;
- }
-
- return $source;
- }
-
- /**
- * Internal method to strip a string of certain tags
- *
- * @access protected
- *
- * @param string $source Input string to be 'cleaned'
- *
- * @return string 'Cleaned' version of input parameter
- */
- protected function _cleanTags($source)
- {
- /*
- * In the beginning we don't really have a tag, so everything is
- * postTag
- */
- $preTag = null;
- $postTag = $source;
- // Is there a tag? If so it will certainly start with a '<'
- $tagOpen_start = strpos($source, '<');
- while ($tagOpen_start !== false) {
- // Get some information about the tag we are processing
- $preTag .= substr($postTag, 0, $tagOpen_start);
- $postTag = substr($postTag, $tagOpen_start);
- $fromTagOpen = substr($postTag, 1);
- $tagOpen_end = strpos($fromTagOpen, '>');
- // Let's catch any non-terminated tags and skip over them
- if ($tagOpen_end === false) {
- $postTag = substr($postTag, $tagOpen_start + 1);
- $tagOpen_start = strpos($postTag, '<');
- continue;
- }
- // Do we have a nested tag?
- $tagOpen_nested = strpos($fromTagOpen, '<');
- if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end)) {
- $preTag .= substr($postTag, 0, ($tagOpen_nested + 1));
- $postTag = substr($postTag, ($tagOpen_nested + 1));
- $tagOpen_start = strpos($postTag, '<');
- continue;
- }
- // Lets get some information about our tag and setup attribute pairs
- $currentTag = substr($fromTagOpen, 0, $tagOpen_end);
- $tagLength = strlen($currentTag);
- $tagLeft = $currentTag;
- $attrSet = array();
- $currentSpace = strpos($tagLeft, ' ');
- // Are we an open tag or a close tag?
- if (substr($currentTag, 0, 1) == '/') {
- // Close Tag
- $isCloseTag = true;
- list ($tagName) = explode(' ', $currentTag);
- $tagName = substr($tagName, 1);
- } else {
- // Open Tag
- $isCloseTag = false;
- list ($tagName) = explode(' ', $currentTag);
- }
- /*
- * Exclude all "non-regular" tagnames
- * OR no tagname
- * OR remove if xssauto is on and tag is blacklisted
- */
- if ((!preg_match("/^[a-z][a-z0-9]*$/i", $tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
- // Strip tag
- continue;
- }
- /*
- * Time to grab any attributes from the tag... need this section in
- * case attributes have spaces in the values.
- */
- while ($currentSpace !== false) {
- $attr = '';
- $fromSpace = substr($tagLeft, ($currentSpace + 1));
- $nextSpace = strpos($fromSpace, ' ');
- $openQuotes = strpos($fromSpace, '"');
- $closeQuotes = strpos(substr($fromSpace, ($openQuotes + 1)), '"') + $openQuotes + 1;
- // Do we have an attribute to process? [check for equal sign]
- if (strpos($fromSpace, '=') !== false) {
- /*
- * If the attribute value is wrapped in quotes we need to
- * grab the substring from the closing quote, otherwise grab
- * till the next space
- */
- if (($openQuotes !== false) && (strpos(substr($fromSpace, ($openQuotes + 1)), '"') !== false)) {
- $attr = substr($fromSpace, 0, ($closeQuotes + 1));
- } else {
- $attr = substr($fromSpace, 0, $nextSpace);
- }
- } else {
- /*
- * No more equal signs so add any extra text in the tag into
- * the attribute array [eg. checked]
- */
- if ($fromSpace != '/') {
- $attr = substr($fromSpace, 0, $nextSpace);
- }
- }
- // Last Attribute Pair
- if (!$attr && $fromSpace != '/') {
- $attr = $fromSpace;
- }
- // Add attribute pair to the attribute array
- $attrSet[] = $attr;
- // Move search point and continue iteration
- $tagLeft = substr($fromSpace, strlen($attr));
- $currentSpace = strpos($tagLeft, ' ');
- }
- // Is our tag in the user input array?
- $tagFound = in_array(strtolower($tagName), $this->tagsArray);
- // If the tag is allowed lets append it to the output string
- if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod)) {
- // Reconstruct tag with allowed attributes
- if (!$isCloseTag) {
- // Open or Single tag
- $attrSet = $this->_cleanAttributes($attrSet);
- $preTag .= '<' . $tagName;
- for ($i = 0; $i < count($attrSet); ++$i) {
- $preTag .= ' ' . $attrSet[$i];
- }
- // Reformat single tags to XHTML
- if (strpos($fromTagOpen, '</' . $tagName)) {
- $preTag .= '>';
- } else {
- $preTag .= ' />';
- }
- } else {
- // Closing Tag
- $preTag .= '</' . $tagName . '>';
- }
- }
- // Find next tag's start and continue iteration
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
- }
- // Append any code after the end of tags and return
- if ($postTag != '<') {
- $preTag .= $postTag;
- }
-
- return $preTag;
- }
-
- /**
- * Internal method to strip a tag of certain attributes
- *
- * @access protected
- *
- * @param array $attrSet Array of attribute pairs to filter
- *
- * @return array Filtered array of attribute pairs
- */
- protected function _cleanAttributes($attrSet)
- {
- // Initialize variables
- $newSet = array();
- // Iterate through attribute pairs
- for ($i = 0; $i < count($attrSet); ++$i) {
- // Skip blank spaces
- if (!$attrSet[$i]) {
- continue;
- }
- // Split into name/value pairs
- $attrSubSet = explode('=', trim($attrSet[$i]), 2);
- list ($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
- /*
- * Remove all "non-regular" attribute names
- * AND blacklisted attributes
- */
- if ((!preg_match('/[a-z]*$/i', $attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on')))) {
- continue;
- }
- // XSS attribute value filtering
- if ($attrSubSet[1]) {
- // strips unicode, hex, etc
- $attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
- // strip normal newline within attr value
- $attrSubSet[1] = preg_replace('/[\n\r]/', '', $attrSubSet[1]);
- // strip double quotes
- $attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
- // convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr value)
- if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'")) {
- $attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
- }
- // strip slashes
- $attrSubSet[1] = stripslashes($attrSubSet[1]);
- }
- // Autostrip script tags
- if (PublisherFilterInput::checkAttribute($attrSubSet)) {
- continue;
- }
- // Is our attribute in the user input array?
- $attrFound = in_array(strtolower($attrSubSet[0]), $this->attrArray);
- // If the tag is allowed lets keep it
- if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod)) {
- // Does the attribute have a value?
- if ($attrSubSet[1]) {
- $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
- } elseif ($attrSubSet[1] == "0") {
- /*
- * Special Case
- * Is the value 0?
- */
- $newSet[] = $attrSubSet[0] . '="0"';
- } else {
- $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[0] . '"';
- }
- }
- }
-
- return $newSet;
- }
-
- /**
- * Try to convert to plaintext
- *
- * @access protected
- *
- * @param string $source
- *
- * @return string Plaintext string
- */
- protected function _decode($source)
- {
-
- /*
- // entity decode
- $trans_tbl = get_html_translation_table(HTML_ENTITIES);
- foreach ($trans_tbl as $k => $v) {
- $ttr[$v] = utf8_encode($k);
- }
- $source = strtr($source, $ttr);
- // convert decimal
- $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
- // convert hex
- $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
-*/
-
- // url decode
- $charset = defined('_CHARSET') ? constant('_CHARSET') : 'utf-8';
- $source = html_entity_decode($source, ENT_QUOTES, $charset);
- // convert decimal
- $source = preg_replace_callback(
- '/&#(\d+);/m',
- create_function('$matches', "return chr(\$matches[1]);"),
- $source
- );
- // convert hex
- $source = preg_replace_callback(
- '/&#x([a-f0-9]+);/mi',
- create_function('$matches', "return chr('0x'.\$matches[1]);"),
- $source
- ); // hex notation
-
- return $source;
- }
-}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,8 +22,8 @@
include_once __DIR__ . '/header.php';
xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
-$op = PublisherRequest::getString('op');
-$fileid = PublisherRequest::getInt('fileid');
+$op = XoopsRequest::getString('op');
+$fileid = XoopsRequest::getInt('fileid');
if ($fileid == 0) {
redirect_header("index.php", 2, _MD_PUBLISHER_NOITEMSELECTED);
@@ -71,9 +71,9 @@
}
// Putting the values in the file object
- $fileObj->setVar('name', PublisherRequest::getString('name'));
- $fileObj->setVar('description', PublisherRequest::getString('description'));
- $fileObj->setVar('status', PublisherRequest::getInt('file_status'));
+ $fileObj->setVar('name', XoopsRequest::getString('name'));
+ $fileObj->setVar('description', XoopsRequest::getString('description'));
+ $fileObj->setVar('status', XoopsRequest::getInt('file_status'));
// attach file if any
if (isset($_FILES['item_upload_file']) && $_FILES['item_upload_file']['name'] != "") {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -37,8 +37,11 @@
include_once PUBLISHER_ROOT_PATH . '/class/metagen.php';
include_once PUBLISHER_ROOT_PATH . '/class/session.php';
include_once PUBLISHER_ROOT_PATH . '/class/publisher.php';
-include_once PUBLISHER_ROOT_PATH . '/class/request.php';
+//include_once PUBLISHER_ROOT_PATH . '/class/request.php';
+xoops_load('XoopsRequest');
+xoops_load('XoopsFilterInput');
+
$debug = false;
$publisher = PublisherPublisher::getInstance($debug);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -23,10 +23,10 @@
include_once __DIR__ . '/header.php';
// At which record shall we start for the Categories
-$catstart = PublisherRequest::getInt('catstart');
+$catstart = XoopsRequest::getInt('catstart');
// At which record shall we start for the ITEM
-$start = PublisherRequest::getInt('start');
+$start = XoopsRequest::getInt('start');
// Number of categories at the top level
$totalCategories = $publisher->getHandler('category')->getCategoriesCount(0);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,8 +22,8 @@
include_once __DIR__ . '/header.php';
-$itemid = PublisherRequest::getInt('itemid');
-$item_page_id = PublisherRequest::getInt('page', -1);
+$itemid = XoopsRequest::getInt('itemid');
+$item_page_id = XoopsRequest::getInt('page', -1);
if ($itemid == 0) {
redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -23,7 +23,7 @@
include_once __DIR__ . '/header.php';
require_once XOOPS_ROOT_PATH . '/class/template.php';
-$itemid = PublisherRequest::getInt('itemid');
+$itemid = XoopsRequest::getInt('itemid');
if ($itemid == 0) {
redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 23:04:0...
[truncated message content] |
|
From: <be...@us...> - 2014-10-02 22:59:08
|
Revision: 12803
http://sourceforge.net/p/xoops/svn/12803
Author: beckmi
Date: 2014-10-02 22:58:58 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
replaced $i++ with ++$i for consistency/performance
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -263,7 +263,7 @@
$delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>";
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= ' ';
}
@@ -275,7 +275,7 @@
echo "</tr>";
$subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
if (count($subCategoriesObj) > 0) {
- $level++;
+ ++$level;
foreach ($subCategoriesObj as $key => $thiscat) {
publisher_displayCategory($thiscat, $level);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -296,7 +296,7 @@
$resultPictures = $xoopsDB->query($sql);
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
@@ -389,7 +389,7 @@
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -146,7 +146,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -221,7 +221,7 @@
*/
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -167,7 +167,7 @@
$newArticleArray[$arrArticle['id']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -146,7 +146,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -221,7 +221,7 @@
*/
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -142,7 +142,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -200,7 +200,7 @@
$newArticleArray[$arrArticle['itemid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -150,7 +150,7 @@
publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -219,7 +219,7 @@
$newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
$newCatArray[$newCat['oldid']] = $newCat;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -142,7 +142,7 @@
publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -217,7 +217,7 @@
$newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
$newCatArray[$newCat['oldid']] = $newCat;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -320,7 +320,7 @@
$resultPictures = $xoopsDB->query($sql);
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
@@ -413,7 +413,7 @@
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -103,7 +103,7 @@
$ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
+ for ($j = 0; $j < $opcount; ++$j) {
$optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
$optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
$ele->addOption($optval, $optkey);
@@ -113,7 +113,7 @@
$ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
+ for ($j = 0; $j < $opcount; ++$j) {
$optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
$optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
$ele->addOption($optval, $optkey);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -115,7 +115,7 @@
$columns[$k][] = $mainitem;
unset($thisitem);
unset($mainitem);
- $k++;
+ ++$k;
if ($k == $opt_num_columns) {
$k = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -233,7 +233,7 @@
$block['letters'] = $letters;
$columns[$k][] = $item;
- $k++;
+ ++$k;
if ($k == $column_count) {
$k = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -322,7 +322,7 @@
public function getForm($subCatsCount = 4)
{
include_once XOOPS_ROOT_PATH . '/modules/' . PUBLISHER_DIRNAME . '/class/form/category.php';
- $form = new PublisherCategoryForm($this, $subCatsCount);
+ $form = new PublisherCategoryForm($this, $subCatsCount);
return $form;
}
@@ -498,7 +498,7 @@
{
global $theresult;
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= '--';
}
$theresult[$category['categoryid']] = $spaces . $category['name'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -82,7 +82,7 @@
$publisher->getHandler('rating')->insert($newRatingObj);
$current_rating += $rating;
-$count++;
+++$count;
$publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
$publisher->getHandler('item')->updateAll('votes', $count, $criteria, true);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -548,7 +548,7 @@
$publisher = PublisherPublisher::getInstance();
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= '--';
}
@@ -562,7 +562,7 @@
$subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
if (count($subCategoriesObj) > 0) {
- $level++;
+ ++$level;
foreach ($subCategoriesObj as $catID => $subCategoryObj) {
$ret .= publisher_addCategoryOption($subCategoryObj, $selectedid, $level);
}
@@ -915,7 +915,7 @@
$rater .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
$rater .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
- for ($ncount = 1; $ncount <= $units; $ncount++) { // loop from 1 to the number of units
+ for ($ncount = 1; $ncount <= $units; ++$ncount) { // loop from 1 to the number of units
if (!$voted) { // if the user hasn't yet voted, draw the voting stars
$rater .= '<div><a href="' . PUBLISHER_URL . '/rate.php?itemid=' . $itemid . '&rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>';
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -71,7 +71,7 @@
$publisher->getHandler('rating')->insert($newRatingObj);
$current_rating += $rating;
-$count++;
+++$count;
$publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
$publisher->getHandler('item')->updateAll('votes', $count, $criteria, true);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -753,7 +753,7 @@
$filterSettings = explode(',', $fl);
if (isset ($imageFilters[$filterSettings[0]])) {
- for ($i = 0; $i < 4; $i++) {
+ for ($i = 0; $i < 4; ++$i) {
if (!isset ($filterSettings[$i])) {
$filterSettings[$i] = null;
} else {
|
|
From: <be...@us...> - 2014-09-28 19:34:18
|
Revision: 12802
http://sourceforge.net/p/xoops/svn/12802
Author: beckmi
Date: 2014-09-28 19:34:11 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
Upgrade from montuy337513 (alias black_beard)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/config/tcpdf_config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.ctg.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/pdf417.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_colors.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_filters.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_font_data.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_images.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_static.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_autoconfig.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/format.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/pdf_data.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/index.html
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/LICENSE.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/README.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/cache/
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/composer.json
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/config/lang/
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/README.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/tcpdf_logo.jpg
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/tcpdf_signature.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tools/
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT 2014-09-28 13:38:38 UTC (rev 12801)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT 2014-09-28 19:34:11 UTC (rev 12802)
@@ -1,2823 +0,0 @@
-6.0.084 (2014-06-13)
- - A bug related to MultiCell fitcell feature was fixed.
- - Bug item #931 "Documentation error for setPageFormat()" was fixed.
-
-6.0.083 (2014-05-29)
- - Bug item #928 "setHtmlVSpace with HR element" was fixed.
-
-6.0.082 (2014-05-23)
- - Bug item #926 "test statement instead of assignment used in tcpdf_fonts.php" was fixed.
- - Bug item #925 "924 transparent images bug" was fixed.
-
-6.0.081 (2014-05-22)
- - Bug item #922 "writehtml tables thead repeating" was fixed.
- - Patch #71 "External and internal links, local and remote" wa applied.
-
-6.0.080 (2014-05-20)
- - Bug item #921 "Fatal error in hyphenateText() function" was fixed.
- - Bug item #923 "Automatic Hyphenation error" was fixed.
- - Patch #70 "Augument TCPDFBarcode classes with ability to return raw png image data" was applied.
-
-6.0.079 (2014-05-19)
- - Patch item #69 "Named destinations, HTML internal and external links" was merged.
- - Bug item #920 "hyphenateText() should not hyphenate the content of style-tags in HTML mode" was fixed.
- - Image method now trigs an error in case the cache is now writeable.
- - Fixed issue with layer default status.
-
-6.0.078 (2014-05-12)
- - A warning issue in addTTFfont() method was fixed.
- - Fonts were updated to include cbbox metrics.
-
-6.0.077 (2014-05-06)
- - A Datamatrix barcode bug was fixed.
-
-6.0.076 (2014-05-06)
- - A bug in Datamatrix Base256 encoding was fixed.
- - Merged fix for SVG use/clip-gradient.
- - Now it is possible to prefix a page number in Link methods with the * character to avoid been changed when adding/deleting/moving pages (see example_045.php).
-
-6.0.075 (2014-05-05)
- - Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
-
-6.0.074 (2014-05-03)
- - Part of Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
- - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.
-
-6.0.073 (2014-04-29)
- - Bug #913 "Possible bug with line-height" was fixed.
- - Bug #914 "MultiCell and FitCell" was fixed.
- - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.
-
-6.0.072 (2014-04-27)
- - Deprecated curly braces substring syntax was replaced with square braces.
-
-6.0.071 (2014-04-25)
- - Bug #911 "error with buffered png pics" was fixed.
-
-6.0.070 (2014-04-24)
- - Bug #910 "An SVG image is being cut off (with clipping mask) when you use align options" was fixed.
-
-6.0.069 (2014-04-24)
- - Datamatrix Base256 encoding was fixed.
-
-6.0.068 (2014-04-22)
- - Some Datamatrix barcode bugs were fixed.
-
-6.0.067 (2014-04-21)
- - startLayer() method signature was changed to include a new "lock" parameter.
-
-6.0.066 (2014-04-20)
- - Bug #908 "Linebreak is not considered when getting length of the next string" was fixed.
-
-6.0.065 (2014-04-10)
- - Bug #905 "RGB percentage color bug in convertHTMLColorToDec()" was fixed.
-
-6.0.064 (2014-04-07)
- - Header and Footer fonts are now set by default.
- - Bug #904 "PDF corrupted" was fixed.
-
-6.0.063 (2014-04-03)
- - Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.
-
-6.0.062 (2014-03-02)
- - The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.
-
-6.0.061 (2014-02-18)
- - Bug #893 "Parsing error on streamed xref for secured pdf" was fixed.
-
-6.0.060 (2014-02-16)
- - Bug #891 "Error on parsing hexa fields" was fixed.
- - Bug #892 "Parsing pdf with trailing space at start" was fixed.
-
-6.0.059 (2014-02-03)
- - SVG 'use' support was imporved.
-
-6.0.058 (2014-01-31)
- - Bug #886 "Bugs with SVG using <defs> and <use>" was fixed.
-
-6.0.057 (2014-01-26)
- - Bug #883 "Parsing error" was fixed.
-
-6.0.056 (2014-01-25)
- - The automatic cache folder selection now works also with some restricted hosting environments.
- - CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz).
- - Bug #884 "Parsing error prev tag looking for" was fixed.
-
-6.0.055 (2014-01-15)
- - Bug #880 "Error detecting hX tags (h1,h2..)" was fixed
- - Bug #879 "Thead on the second page inherits style of previous tr" was fixed
-
-6.0.054 (2014-01-13)
- - Bug #877 "Parenteses causing corrupt text" was fixed.
-
-6.0.053 (2014-01-03)
- - Bug #876 "Cell padding should not be multiplied with number of lines in getStringHeight" was fixed.
- - Patch #68 "Empty img src attribute leads to access of uninitialized string offset" was applied.
-
-6.0.052 (2013-12-12)
- - Bug #871 "Datamatrix coding" was fixed.
-
-6.0.051 (2013-12-02)
- - cbbox array values in addTTFfont() were converted to integers.
-
-6.0.050 (2013-12-01)
- - The method getNumLines() was extended to support hyphenation.
- - The CSS property line-height now supports non percentage values.
-
-6.0.050 (2013-11-27)
- - A bug related to PNG images was fixed.
-
-6.0.048 (2013-11-24)
- - SVG vars are now reset in ImageSVG() method.
-
-6.0.047 (2013-11-19)
- - SVG support was extended to support some nested defs.
-
-6.0.046 (2013-11-17)
- - preg_replace_callback functions were replaced to improve memory performances.
-
-6.0.045 (2013-11-17)
- - Bug #862 "Parsing error on flate filter" was fixed.
-
-6.0.044 (2013-11-10)
- - Bug #857 "Undefined offset error" was fixed.
- - The uniord method now uses a static cache to improve performances (thanks to Mathieu Masseboeuf for the sugegstion).
- - Two bugs in the TCPDF_FONTS class were fixed.
-
-6.0.043 (2013-10-29)
- - Bug #854 "CSS instruction display" was fixed.
-
-6.0.042 (2013-10-25)
- - Bug #852 "CMYK Colors Bug" was fixed.
-
-6.0.041 (2013-10-21)
- - Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
-
-6.0.040 (2013-10-20)
- - Bug #849 "SVG import bug" was fixed.
-
-6.0.039 (2013-10-13)
- - Bug #843 "Wrong call in parser" was fixed.
- - Bug #844 "Wrong object type named" was fixed.
- - Bug #845 "Parsing error on obj ref prefixed by '000000'" was fixed.
-
-6.0.038 (2013-10-06)
- - Bug #841 "Division by zero warning at writeHTML a <li> tag" was fixed.
-
-6.0.037 (2013-09-30)
- - Method getAllSpotColors() was added to return all spot colors.
- - Method colorRegistrationBar() was extended to automatically print all spot colors and support individual spot colors.
- - The method registrationMarkCMYK() was added to print a registration mark for CMYK colors.
- - A bug related to page groups was fixed.
- - Gradient() method now supports CMYK equivalents of spot colors.
- - Example n. 56 was updated.
-
-6.0.036 (2013-09-29)
- - Methods for registration bars and crop marks were extended to support registration color (see example n. 56).
- - New default spot colors were added to tcpdf_colors.php, including the 'All' and 'None' special registration colors.
-
-6.0.035 (2013-09-25)
- - TCPDF_PARSER class was improved.
-
-6.0.034 (2013-09-24)
- - Bug #839 "Error in xref parsing in mixed newline chars" was fixed.
-
-6.0.033 (2013-09-23)
- - Bug fix related to PNG image transparency using GD library.
-
-6.0.032 (2013-09-23)
- - Bug #838 "Fatal error when imagick cannot handle the image, even though GD is available and can" was fixed.
-
-6.0.031 (2013-09-18)
- - Bug #836 "Optional EOL marker before endstream" was fixed.
- - Some additional controls were added to avoid "division by zero" error with badly formatted input.
-
-6.0.030 (2013-09-17)
- - Bug #835 "PDF417 and Cyrilic simbols" was fixed.
-
-6.0.029 (2013-09-15)
- - Constants K_TCPDF_PARSER_THROW_EXCEPTION_ERROR and K_TCPDF_PARSER_IGNORE_DECODING_ERRORS where removed in favor of a new configuration array in the TCPDF_PARSER class.
- - The TCPDF_PARSER class can now be configured using the new $cfg parameter.
-
-6.0.028 (2013-09-15)
- - A debug print_r was removed form tcpdf_parser.php.
- - TCPDF_FILTERS class now throws an exception in case of error.
- - TCPDF_PARSER class now throws an exception in case of error unless you define the constant K_TCPDF_PARSER_THROW_EXCEPTION_ERROR to false.
- - The constant K_TCPDF_PARSER_IGNORE_DECODING_ERRORS can be set to tru eto ignore decoding errors on TCPDF_PARSER.
-
-6.0.027 (2013-09-14)
- - A bug in tcpdf_parser wen parsing hexadecimal strings was fixed.
- - A bug in tcpdf_parser wen looking for statxref was fixed.
- - A bug on RC4 encryption was fixed.
-
-6.0.026 (2013-09-14)
- - A bug in tcpdf_parser wen decoding streams was fixed.
-
-6.0.025 (2013-09-04)
- - A pregSplit() bug was fixed.
- - Improved content loading from URLs.
- - Improved font path loading.
-
-6.0.024 (2013-09-02)
- - Bug #826 "addEmptySignatureAppearance issue" was fixed.
-
-6.0.023 (2013-08-05)
- - GNU Freefont fonts were updated.
- - Licensing and copyright information about fonts were improved.
- - PNG image support was improved.
-
-6.0.022 (2013-08-02)
- - fixing initialization problem for signature_appearance property.
-
-6.0.021 (2013-07-18)
- - The bug caused by the preg_split function on some PHP 5.2.x versions was fixed.
-
-6.0.020 (2013-06-04)
- - The method addTTFfont() was fixed (Bug item #813 Undefined offset).
-
-6.0.019 (2013-06-04)
- - The magic constant __DIR__ was replaced with dirname(__FILE__) for php 5.2 compatibility.
- - The exceptions raised by file_exists() function were suppressed.
-
-6.0.018 (2013-05-19)
- - The barcode examples were changed to automatically search for the barcode class path (in case the examples directory is not installed under the TCPDF root).
-
-6.0.017 (2013-05-16)
- - The command line tool tcpdf_addfont.php was improved.
- - The php logic was removed from configuration files that now contains only constant defines.
- - The tcpdf_autoconfig.php file was added to automatically set missing configuration values.
-
-6.0.016 (2013-05-15)
- - The tcpdf_addfont.php tool was improved (thanks to Remi Collet).
- - Constant K_PATH_IMAGES is now automatically set in configuration file.
-
-6.0.015 (2013-05-14)
- - Some unused vars were removed from AddFont() method.
- - Some directories were moved inside the examples directory.
- - All examples were updated to reflect the new default structure.
- - Source code were clean-up up to be more compatible with system packaging.
- - Files encodings and permissions were reset.
- - The command line tool tcpdf_addfont.php was added on the tools directory.
-
-6.0.014 (2013-04-13)
- - The signature of addTTFfont() method includes a new parameter to link existing fonts instead of copying and compressing them.
-
-6.0.013 (2013-04-10)
- - Add support for SVG dx and dy text/tspan attributes.
- - replace require() with require_once().
- - fix some minor typos on documentation.
- - fix a problem when deleting all pages.
-
-6.0.012 (2013-04-24)
- - An error condition in addHtmlLink() method was fixed (bug #799).
-
-6.0.011 (2013-04-22)
- - Minor documentation changes.
-
-6.0.010 (2013-04-03)
- - The method Rect() was fixed to print borders correctly.
-
-6.0.009 (2013-04-02)
- - Adding back some files that were not properly committed on the latest release.
-
-6.0.008 (2013-04-01)
- - Duplicated encoding maps was removed from tcpdf_font_data.php.
- - Fixing bug on AddTTFFont().
-
-6.0.007 (2013-03-29)
- - HTML/CSS font size conversion were improved.
-
-6.0.006 (2013-03-27)
- - Bug related to SVG and EPS files on xobjects were fixed.
-
-6.0.005 (2013-03-26)
- - Default font path was fixed.
-
-6.0.004 (2013-03-21)
- - Return value of addTTFfont() method was fixed.
-
-6.0.003 (2013-03-20)
- - A bug related to non-unicode mode was fixed.
-
-6.0.002 (2013-03-18)
- - _getFIXED call on tcpdf_fonts.php was fixed.
-
-6.0.001 (2013-03-18)
- - Fixed $uni_type call on tcpdf.php.
-
-6.0.000 (2013-03-17)
- - IMPORTANT: PHP4 support has been removed starting from this version.
- - Several TCPDF methods and vars were moved to new class files: tcpdf_static.php, tcpdf_colors.php, tcpdf_images.php, tcpdf_font_data.php, tcpdf_fonts.php.
- - Files htmlcolors.php, spotcolors.php, unicode_data.php and ecodings_maps.php were removed.
- - Barcode classes were renamed and new barcode examples were added.
- - Class TCPDF_PARSER was improved.
-
-********************************************************************************
-
-5.9.209 (2013-03-15)
- - Image method was improved.
-
-5.9.208 (2013-03-15)
- - objclone fuction was patched to support old imagick extensions.
- - tcpdf_parser was improved to support Cross-Reference Streams and large streams.
-
-5.9.207 (2013-03-04)
- - Datamatrix class was fixed (a debug echo was removed).
-
-5.9.206 (2013-02-22)
- - Bug item #754 "PNG with alpha channel becomes gray scale" was fixed.
- - Minor documentation fixes.
-
-5.9.205 (2013-02-06)
- - The constant K_TCPDF_THROW_EXCEPTION_ERROR was added on configuration file to change the behavior of Error() method.
- - PDF417 barcode bug was fixed.
-
-5.9.204 (2013-01-23)
- - The method Bookmark() was extended to include named destinations, URLs, internal links or embedded files (see example n. 15).
- - automatic path calculation on configuration file was fixed.
- - Error() method was extended to throw new Exception if PHP > 5.
-
-5.9.203 (2013-01-22)
- - Horizontal position of radiobuttons and checkboxes was adjusted.
-
-5.9.202 (2012-12-16)
- - Vertical space problem after table was fixed.
-
-5.9.201 (2012-12-10)
- - First 256 chars are now always included on font subset to overcome a problem reported on the forum.
-
-5.9.200 (2012-12-05)
- - Bug item #768 "Rowspan with Pagebreak error" was fixed.
- - Page regions now works also with limited MultiCell() cells.
-
-5.9.199 (2012-11-29)
- - Internal setImageBuffer() method was improved.
-
-5.9.198 (2012-11-19)
- - Datamatrix EDIFACT mode was fixed.
-
-5.9.197 (2012-11-06)
- - Bug item #756 "TCPDF 5.9.196 shows line on top of all PDFs" was fixed.
-
-5.9.196 (2012-11-02)
- - Several methods were improved to avoid output when the context is out of page.
- - Bug item #755 "remove cached files before unsetting" was fixed.
-
-5.9.195 (2012-10-24)
- - Method _putfonts() was improved.
-
-5.9.194 (2012-10-23)
- - Text alignment on TextField() method was fixed.
-
-5.9.193 (2012-09-25)
- - Support for named destinations on HTML links was added (i.e.: <a href="#destinationname">link to named destination</a>).
-
-5.9.192 (2012-09-24)
- - A problem on the releasing process was fixed.
-
-5.9.191 (2012-09-24)
- - SVG image naow support svg and eps images.
-
-5.9.190 (2012-09-23)
- - "page" word translation is now set to empty if not defined.
- - Tooltip feature was added on the radiobutton annotation.
-
-5.9.189 (2012-09-18)
- - Bug item #3568969 "ini_get safe_mode error" was fixed.
-
-5.9.188 (2012-09-15)
- - A datamatrix barcode bug was fixed.
-
-5.9.187 (2012-09-14)
- - Subset feature was extended to include the first 256 characters.
-
-5.9.186 (2012-09-13)
- - barcodes.php file was resynced.
- - Methods SetAbsX, SetAbsY, SetAbsXY where added to set the absolute pointer coordinates.
- - Method getCharBBox were added to get single character bounding box.
- - Signature of addTTFfont method was changed ($addcbbox paramter was added).
-
-5.9.185 (2012-09-12)
- - Method _putfontwidths() was fixed.
-
-5.9.184 (2012-09-11)
- - A problem with EAN barcodes was fixed.
-
-5.9.183 (2012-09-07)
- - A problem with font names normalization was fixed.
-
-5.9.182 (2012-09-05)
- - Bug item #3564982 "Infinite loop in Write() method" was fixed.
-
-5.9.181 (2012-08-31)
- - composer.json file was added.
- - Bug item #3563369 "Cached images are not unlinked some time" was fixed.
-
-5.9.180 (2012-08-22)
- - Bug item #3560493 "Problems with nested cells in HTML" was fixed.
-
-5.9.179 (2012-08-04)
- - SVG 'use' tag was fixed for 'circle' and 'ellipse' shift problem.
- - Alpha status is now correctly stored and restored by getGraphicVars() and SetGraphicVars() methods.
-
-5.9.178 (2012-08-02)
- - SVG 'use' tag was fixed for 'circle' and 'ellipse'.
-
-5.9.177 (2012-08-02)
- - An additional control on annotations was fixed.
-
-5.9.176 (2012-07-25)
- - A bug related to stroke width was fixed.
- - A problem related to font spacing in HTML was fixed.
-
-5.9.175 (2012-07-25)
- - The problem of missing letter on hyphen break was fixed.
-
-5.9.174 (2012-07-25)
- - The problem of wrong filename when downloading PDF from an Android device was fixed.
- - The method setHeaderData() was extended to set text and line color for header (see example n. 1).
- - The method setFooterData() was added to set text and line color for footer (see example n. 1).
- - The methods setTextShadow() and getTextShadow() were added to set text shadows (see example n. 1).
- - The GetCharWidth() method was fixed for negative character spacing.
- - A 'none' border mode is now correctly recognized.
- - Break on hyphen problem was fixed.
-
-5.9.173 (2012-07-23)
- - Some additional control wher added on barcode methods.
- - The option CURLOPT_FOLLOWLOCATION on Image method is now disabled if PHP safe_mode is on or open_basedir is set.
- - Method Bookmark() was extended to include X parameter.
- - Method setDestination() was extended to include X parameter.
- - A problem with Thai language was fixed.
-
-5.9.172 (2012-07-02)
- - A PNG color profile issue was fixed.
-
-5.9.171 (2012-07-01)
- - Some SVG rendering problems were fixed.
-
-5.9.170 (2012-06-27)
- - Bug #3538227 "Numerous errors inserting shared images" was fixed.
-
-5.9.169 (2012-06-25)
- - Some SVG rendering problems were fixed.
-
-5.9.168 (2012-06-22)
- - Thai language rendering was fixed.
-
-5.9.167 (2012-06-22)
- - Thai language rendering was fixed and improved.
- - Method isCharDefined() was improved.
- - Protected method replaceChar() was added.
- - Font "kerning" word was corrected to "tracking".
-
-5.9.166 (2012-06-21)
- - Array to string conversion on file_id creation was fixed.
- - Thai language rendering was fixed (thanks to Atsawin Chaowanakritsanakul).
-
-5.9.165 (2012-06-07)
- - Some HTML form related bugs were fixed.
-
-5.9.164 (2012-06-06)
- - A bug introduced on the latest release was fixed.
-
-5.9.163 (2012-06-05)
- - Method getGDgamma() was changed.
- - Rendering performances of PNG images with alpha channel were improved.
-
-5.9.162 (2012-05-11)
- - A bug related to long text on TD cells was fixed.
-
-5.9.161 (2012-05-09)
- - A bug on XREF table was fixed (Bug ID: 3525051).
- - Deprecated Imagick:clone was replaced.
- - Method objclone() was fixed for PHP4.
-
-5.9.160 (2012-05-03)
- - A bug on tcpdf_parser.php was fixed.
-
-5.9.159 (2012-04-30)
- - Barcode classes were updated to fix PNG export Bug (ID: 3522291).
-
-5.9.158 (2012-04-22)
- - Some SVG-related bugs were fixed.
-
-5.9.157 (2012-04-16)
- - Some SVG-related bugs were fixed.
-
-5.9.156 (2012-04-10)
- - Bug item #3515885 "TOC and booklet: left and right page exchanged".
- - SetAutoPageBreak(false) now works also in multicolumn mode.
-
-5.9.155 (2012-04-02)
- - Bug item #3512596 "font import problems" was fixed.
- - Method addTTFfont() was modified to extract only specified Platform ID and Encoding ID (check the source code documentation).
- - All fonts were updated.
- - Bug item #3513867 "booklet and setHeaderTemplateAutoreset: header shifted left" was fixed.
- - Bug item #3513749 "TCPDF Superscript/Subscript" was fixed.
-
-5.9.154 (2012-03-29)
- - A debug echo was removed.
-
-5.9.153 (2012-03-28)
- - A bug on font conversion was fixed.
- - All fonts were updated.
- - Method isCharDefined() was added to find if a character is defined on the selected font.
- - Method replaceMissingChars() was added to automatically replace missing chars on selected font.
- - SetFont() method was fixed.
-
-5.9.152 (2012-03-23)
- - The following overprint methods were added: setOverprint(), getOverprint().
- - Signature of setAlpha() method was changed and method getAlpha() was added.
- - stroke-opacity support was added on SVG.
- - The following date methods were added: setDocCreationTimestamp(), setDocModificationTimestamp(), getDocCreationTimestamp(), getDocModificationTimestamp(), getFormattedDate(), getTimestamp().
- - Signature of _datestring() method was changed.
- - Method getFontBBox() was added.
- - Method setPageBoxTypes() was aded.
-
-5.9.151 (2012-03-22)
- - Bug item #3509889 "Transform() distorts PDF" was fixed.
- - Precision of real number were extended.
- - ComboBox and ListBox methods were fixed.
- - Bulgarian language file was added.
- - addTOC() method was improved to include bookmark color and font style.
-
-5.9.150 (2012-03-16)
- - A bug related to form fields in PDF/A mode was fixed.
-
-5.9.149 (2012-02-21)
- - Bug item #3489933 "SVG Parser treats tspan like text" was fixed.
-
-5.9.148 (2012-02-17)
- - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed.
-
-5.9.147 (2012-02-14)
- - A problem with SVG gradients has been fixed.
-
-5.9.146 (2012-02-12)
- - Bug item #3486880 "$filehash undefine error" was fixed.
- - The default font is now the one specified at PDF_FONT_NAME_MAIN constant.
-
-5.9.145 (2012-01-28)
- - Japanese language file was added.
- - TCPDF license and README.TXT files were updated.
-
-5.9.144 (2012-01-12)
- - HTML output on barcode classes was improved.
-
-5.9.143 (2012-01-08)
- - Bug item #3471057 "setCreator() has no effect" was fixed.
-
-5.9.142 (2011-12-23)
- - Source code documentation was updated.
-
-5.9.141 (2011-12-14)
- - Some minor bugs were fixed.
-
-5.9.140 (2011-12-13)
- - SVG now supports embedded images encoded as base64.
-
-5.9.139 (2011-12-11)
- - Spot color methods were fixed.
-
-5.9.138 (2011-12-10)
- - cropMark() method was improved (check source code documentation).
- - Example n. 56 was updated.
- - Bug item #3452390 "Check Box still not ticked when set to true" was fixed.
-
-5.9.137 (2011-12-01)
- - Bug item #3447005 "Background color and border of Form Elements is printed" was fixed.
- - Color support for Form elements was improved.
-
-5.9.136 (2011-11-27)
- - Bug item #3443387 "SetMargins with keep option does not work for top margin" was fixed.
-
-5.9.135 (2011-11-04)
- - Bug item #3433406 "Double keywords in description" was fixed.
-
-5.9.134 (2011-10-29)
- - The default value for $defcol parameter on convertHTMLColorToDec() method was fixed.
- - Deafult HTTP headers were changed to avoid browser caching.
- - Some deprecated syntax were replaced.
-
-5.9.133 (2011-10-26)
- - Bug item #3428446 "copyPage method not working when diskcache enabled" was fixed.
-
-5.9.132 (2011-10-20)
- - Bug item #3426167 "bug in function convertHTMLColorToDec()" was fixed.
-
-5.9.131 (2011-10-13)
- - An error message was added to ImagePngAlpha() method.
-
-5.9.130 (2011-10-12)
- - Now you can set image data strings on HTML img tag by encoding the image binary data in this way: $imgsrc = '@'.base64_encode($imgdata);
-
-5.9.129 (2011-10-07)
- - Core fonts metrics was fixed (replace all helvetica and times php files on fonts folder).
- - Form fields support was improved and some problems were fixed (check the example n. 14).
- - Bug item #3420249 "Issue with booklet and MultiCell" was fixed.
-
-5.9.128 (2011-10-06)
- - Method addTTFfont() was improved (check the source code documentation).
- - Method setExtraXMP() to set custom XMP data was added.
-
-5.9.127 (2011-10-04)
- - Readonly mode option was activated for radiobuttons.
-
-5.9.126 (2011-10-03)
- - Bug item #3417989 "Graphics State operator in form XObject fails to render" was fixed.
- - Xobjects problems with transparency, gradients and spot colors were fixed.
-
-5.9.125 (2011-10-03)
- - Support for 8-digit CMYK hexadecimal color representation was added (to be used with XHTML and SVG).
- - Spot colors support was improved (check example n. 37).
- - Color methods were improved.
-
-5.9.124 (2011-10-02)
- - Core fonts were updated.
-
-5.9.123 (2011-10-02)
- - The method addTTFfont() wad added to automatically convert TTF fonts (check the new fonts guide at http://www.tcpdf.org).
- - Old font utils were removed.
- - All fonts were updated and new arabic fonts were added (almohanad were removed and replaced by aefurat and aealarabiya).
- - The file unicode_data.php was updated.
- - The file encodings_maps.php was added.
- - PDF/A files are now compressed to save space.
- - XHTML input form fields now support text-alignment attribute.
-
-5.9.122 (2011-09-29)
- - PDF/A-1b compliance was improved to pass some online testing.
-
-5.9.121 (2011-09-28)
- - This version includes support for PDF/A-1b format (the class constructor signature was changed - see example n. 65).
- - Method setSRGBmode() was added to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document (file sRGB.icc was added).
- - 14 new fonts were added to allow embedding core fonts (for PDF/A compliance).
- - Font utils were fixed.
-
-5.9.120 (2011-09-22)
- - This version includes a fix for _getTrueTypeFontSubset() method.
-
-5.9.119 (2011-09-19)
- - This version includes a fix for extra page numbering on TOC.
-
-5.9.118 (2011-09-17)
- - This version includes some changes that allows you to add a bookmark for a page that do not exist.
-
-5.9.117 (2011-09-15)
- - TCPDFBarcode and TCPDF2DBarcode classes were extended to include a method for exporting barcodes as PNG images.
-
-5.9.116 (2011-09-14)
- - Datamatrix class was improved and documentation was fixed.
-
-5.9.115 (2011-09-13)
- - Datamatrix ECC200 barcode support was added (a new datamatrix.php file was added) - check example n. 50.
- - getBarcodeHTML() method was added on TCPDFBarcode and TCPDF2DBarcode classes to return an HTML representation of the barcode.
- - cURL options on Image() method were improved.
- - A bug on write2DBarcode() was fixed.
-
-5.9.114 (2011-09-04)
- - A bug related to column position was fixed.
-
-5.9.113 (2011-08-24)
- - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under development).
-
-5.9.112 (2011-08-18)
- - A newline character was added after the 'trailer' keyword for compatibility with some parsers.
- - Support for layers was improved.
-
-5.9.111 (2011-08-17)
- - Barcode CODE 39 default gap was restored at 1.
-
-5.9.110 (2011-08-17)
- - Barcode CODE 39 was fixed.
-
-5.9.109 (2011-08-12)
- - Method getNumLines() was fixed.
- - A bug related to page break in multi-column mode was fixed.
-
-5.9.108 (2011-08-09)
- - A bug on PHP4 version was fixed.
-
-5.9.107 (2011-08-08)
- - This version includes a minor bugfix.
-
-5.9.106 (2011-08-04)
- - This version includes transparency groups: check the new parameter on startTemplate() method and example 62.
-
-5.9.105 (2011-08-04)
- - Bug item #3386153 "Check Box not ticked when set to true" was fixed.
-
-5.9.104 (2011-08-01)
- - Bug item #3383698 "imagemagick, resize and dpi" was fixed.
-
-5.9.103 (2011-07-16)
- - Alignment of XHTML lines was improved.
- - Spell of the "length" word was fixed.
-
-5.9.102 (2011-07-13)
- - Methods startLayer() and endLayer() were added to support arbitrary PDF layers.
- - Some improvements/fixes for images were added (thanks to Brendan Abbott).
-
-5.9.101 (2011-07-07)
- - Support for JPEG and PNG ICC Color Profiles was added.
- - Method addEmptySignatureAppearance() was added to add empty signature fields (see example n. 52).
- - Bug item #3354332 "Strange line spacing with reduced font-size in writeHTML" was fixed.
-
-5.9.100 (2011-06-29)
- - An SVG bug has been fixed.
-
-5.9.099 (2011-06-27)
- - Bug item #3335045 "Font freesans seems somehow corrupted in footer" was fixed.
-
-5.9.098 (2011-06-23)
- - The Named Destination feature was fixed.
-
-5.9.097 (2011-06-23)
- - The method setHtmlVSpace() now can be used also for tags: div, li, br, dt and dd.
- - The Named Destination feature was added (check the example n. 15) - thanks to Christian Deligant.
-
-5.9.096 (2011-06-19)
- - Bug item #3322234 "Surrogate pairs codes in arrUTF8ToUTF16BE" was fixed.
-
-5.9.095 (2011-06-18)
- - Numbers alignment for Table-Of-Content methods was improved and fixed.
- - Font subsetting was fixed to include all parts of composite fonts.
-
-5.9.094 (2011-06-17)
- - Bug item #3317898 "Page Group numbering broken in 5.9.093" was fixed.
-
-5.9.093 (2011-06-16)
- - Method setStartingPageNumber() was added to set starting page number (for automatic page numbering).
-
-5.9.092 (2011-06-15)
- - Method _putpages() was improved.
- - Bug item #3316678 "Memory overflow when use Rotate and SetAutoPageBreak" was fixed.
- - Right alignment of page numbers was improved.
-
-5.9.090 (2011-06-14)
- - Methods AliasNbPages() and AliasNumPage() were re-added as deprecated for backward compatibility.
-
-5.9.089 (2011-06-13)
- - Example n. 8 was updated.
- - Method sendOutputData() was changed to remove default compression (it was incompatible with some server settings).
- - Bugs related to page group numbers were fixed.
- - Method copyPage() was fixed.
- - Method Image() was improved to include support for alternative and external images.
-
-5.9.088 (2011-06-01)
- - Method getAutoPageBreak() was added (see example n. 51).
- - Example n. 51 (full page background) was updated.
-
-5.9.087 (2011-06-01)
- - Method sendOutputData() was improved to include deflate encoding.
- - Barcode classes on PHP 4 version were fixed.
-
-5.9.086 (2011-05-31)
- - Font files were updated (the ones on the previous release were broken).
- - The script fonts/utils/makeallttffonts.php was updated and fixed.
- - Output() method was improved to use compression when available.
-
-5.9.085 (2011-05-31)
- - TCPDFBarcode class (barcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode.
- - TCPDF2DBarcode class (2dbarcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode.
-
-5.9.084 (2011-05-29)
- - Font files were updated.
- - The file fonts/utils/makeallttffonts.php was updated.
- - Bug item# 3308774 "Problems with font subsetting" was fixed.
-
-5.9.083 (2011-05-24)
- - Bug item #3308387 "line height & SetCellHeightRatio" was fixed.
-
-5.9.082 (2011-05-22)
- - Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed.
-
-5.9.081 (2011-05-18)
- - Method resetHeaderTemplate() was added to reset the xobject template used by Header() method.
- - Method setHeaderTemplateAutoreset() was added to automatically reset the xobject template used by Header() method at each page.
-
-5.9.080 (2011-05-17)
- - A problem related to file path calculation for images was fixed.
- - A problem related to unsupressed getimagesize() error was fixed.
-
-5.9.079 (2011-05-16)
- - Footer() method was changed to use C128 barcode as default (instead of the previous C128B).
-
-5.9.078 (2011-05-12)
- - Bug item #3300878 "wrong rendering for html bullet list in some case" was fixed.
- - Bug item #3301017 "Emphasized vs. font-weight" was fixed.
- - Barcode Code 128 was improved to include AUTO mode (automatically switch between A, B and C modes).
- - Examples n. 27 and 49 were updated.
-
-5.9.077 (2011-05-07)
- - Bug item #3298591 "error code93" was fixed.
- - SetLineStyle() function was improved.
-
-5.9.076 (2011-05-06)
- - Bug item #3298264 "codebar 93 error" was fixed.
-
-5.9.075 (2011-05-02)
- - Table header alignment when using WriteHTMLCell() or MultiCell() was fixed.
-
-5.9.074 (2011-04-28)
- - Bug item #3294306 "CSS classes not work in <thead> table section" was fixed.
-
-5.9.073 (2011-04-27)
- - A bug related to character entities on HTML cells was fixed.
-
-5.9.072 (2011-04-26)
- - Method resetColumns() was added to remove multiple columns and reset page margins (example n. 10 was updated).
-
-5.9.071 (2011-04-19)
- - Bug #3288574 "<br/> trouble" was fixed.
-
-5.9.069 (2011-04-19)
- - Bug #3288763 "HTML-Table: non-breaking table rows: Bug" was fixed.
-
-5.9.068 (2011-04-15)
- - Bookmark, addTOC and addHTMLTOC methods were improved to include font style and color (Examples 15, 49 and 59 were updated).
- - Default $_SERVER['DOCUMENT_ROOT'] value on tcpdf_config.php file was changed.
-
-5.9.067 (2011-04-10)
- - Performances were drastically improved (PDF documents are now created more quickly).
-
-5.9.066 (2011-04-09)
- - A bug related to digital signature + encryption was fixed.
- - A bug related to encryption + xobject templates was fixed.
-
-5.9.065 (2011-04-08)
- - Bug item #3280512 "Text encoding iso-8859-2 crashes" was fixed.
-
-5.9.064 (2011-04-05)
- - A bug related to character entities on HTML cells was fixed.
-
-5.9.063 (2011-04-01)
- - Bug item #3267235 "WriteHTML() and image that doesn't fit on the page" was fixed.
-
-5.9.062 (2011-03-23)
- - Bug item #3232650 "Using Write if there are pageRegions active creates error" was fixed.
- - Bug item #3221891 "text input borders" was fixed.
- - Bug item #3228958 "Adobe Reader 9.4.2 crash" was fixed.
-
-5.9.061 (2011-03-15)
- - Bug item #3213488 "wrong function call in function Write" was fixed.
- - Bug item #3203007 "list element with black background" was fixed.
-
-5.9.060 (2011-03-08)
- - addTOC() method was fixed for text alignment problems.
-
-5.9.059 (2011-02-27)
- - Default Header() method was improved to reduce document size.
-
-5.9.058 (2011-02-25)
- - Image() method was improved to cache images with transparency layers (thanks to Korneliusz Jarzębski for reporting this problem).
-
-5.9.057 (2011-02-24)
- - A problem with image caching system was fixed (thanks to Korneliusz Jarzębski for reporting this problem).
-
-5.9.056 (2011-02-22)
- - A bug on fixHTMLCode() method was fixed.
- - Automatic line break for HTML was fixed.
-
-5.9.055 (2011-02-17)
- - Another bug related to HTML table page break was fixed.
-
-5.9.054 (2011-02-16)
- - A bug related to HTML table page break was fixed.
-
-5.9.053 (2011-02-16)
- - Support for HTML attribute display="none" was added.
-
-5.9.052 (2011-02-15)
- - A bug related to HTML automatic newlines was fixed.
-
-5.9.051 (2011-02-12)
- - "Commas at beginning of new lines" problem was fixed.
-
-5.9.050 (2011-02-11)
- - Bug #3177606 "SVG Bar chart error" was fixed.
-
-5.9.049 (2011-02-03)
- - Bug #3170777 "TCPDF creates a new page after a single line in writeHTML" was fixed.
-
-5.9.048 (2011-02-02)
- - No changes. Just released to override previous release that was not uploaded correctly.
-
-5.9.047 (2011-01-28)
- - Bug #3167115 "PDF error in <table> (example 48)" was fixed (was introduced in 5.8.046).
-
-5.9.046 (2011-01-18)
- - PDF view/print layers are now automatically turned off if not used (see setVisibility() method).
-
-5.9.045 (2011-01-17)
- - HTML list support were improved.
-
-5.9.044 (2011-01-15)
- - Bug #3158422 "writeHTMLCell Loop" was fixed.
- - Some HTML image alignment problems were fixed.
-
-5.9.043 (2011-01-14)
- - Bug #3158178 "PHP Notice" was fixed.
- - Bug #3158193 "Endless loop in writeHTML" was fixed.
- - Bug #3157764 "SVG Pie chart incorrectly rendered2".
-
-5.9.042 (2011-01-14)
- - Some problems of the PHP4 version were fixed.
-
-5.9.041 (2011-01-13)
- - A problem with SVG elliptical arc path was fixed (ref. bug #3156574).
- - A problem related to font weight on HTML table headers was fixed.
-
-5.9.040 (2011-01-12)
- - A bug related to empty pages after table was fixed.
-
-5.9.039 (2011-01-12)
- - Bug item #3155759 "openssl_random_pseudo_bytes() slow under Windows" was fixed.
-
-5.9.038 (2011-01-11)
- - Minor bugs were fixed.
-
-5.9.037 (2011-01-09)
- - An alignment problem for HTML texts was fixed.
-
-5.9.036 (2011-01-07)
- - A bug related to HTML tables on header was fixed.
-
-5.9.035 (2011-01-03)
- - A problem related to HTML table border alignment was fixed.
- - Bug #2996366 "FastCGI and Header Problems" was fixed.
-
-5.9.034 (2010-12-19)
- - DejaVu and GNU Free fonts were updated.
-
-5.9.033 (2010-12-18)
- - Source code documetnation was improved.
-
-5.9.032 (2010-12-18)
- - Default font stretching and spacing values are now inherited by HTML methods.
-
-5.9.031 (2010-12-16)
- - Source code documentation errors were fixed.
-
-5.9.030 (2010-12-16)
- - Several source code documentation errors were fixed.
- - Source code style was changed for Doxygen.
- - Source code documentation was moved online to http://www.tcpdf.org
-
-5.9.029 (2010-12-04)
- - The $fitbox parameter on Image() method was extended to specify image alignment inside the box (check the example n. 9).
-
-5.9.028 (2010-12-03)
- - Font utils makefont.php and makeallttffonts.php were updated.
-
-5.9.027 (2010-12-01)
- - Spot Colors are now better integrated with HTML mode.
- - Method SetDocInfoUnicode() was added to turn on/off Unicode mode for document information dictionary (meta tags) - check the example n. 19.
-
-5.9.026 (2010-12-01)
- - A problem with mixed text directions on HTML was fixed.
-
-5.9.025 (2010-12-01)
- - The AddSpotColor() now automatically fills the spotcolor array (defined on spotcolors.php file).
-
-5.9.024 (2010-11-30)
- - Bug item #3123612 "SVG not use gradientTransform in percentage mode" was fixed.
-
-5.9.023 (2010-11-25)
- - A potential bug on SVG transcoder was fixed.
-
-5.9.022 (2010-11-21)
- - Method ImageEPS includes support for EPS/AI Spot colors.
- - Method ImageEPS includes a new parameter $fixoutvals to remove values outside the bounding box.
-
-5.9.021 (2010-11-20)
- - Support for custom bullet points images was added (check the example n.6)
- - Examples n. 6 and 61 were update (check the comments inside).
-
-5.9.020 (2010-11-19)
- - A problem related to additional page when using multicolumn mode was fixed.
-
-5.9.019 (2010-11-19)
- - An SVG bug was fixed.
- - ImageSVG() and ImageEPS() methods now accepts image data streams (put the string on the $file parameter preceded by '@' character).
- - Option 'E' was added to the $dest parameter of Output() method to return the document as base64 mime multi-part email attachment (RFC 2045).
-
-5.9.018 (2010-11-19)
- - An SVG bug was fixed.
-
-5.9.017 (2010-11-16)
- - Tagline color was set to transparent.
- - The method fixHTMLCode() was added to automatically clean up HTML code (requires HTML Tidy).
-
-5.9.016 (2010-11-16)
- - Bug item #3109705 "list item page break hanging bullet" was fixed.
-
-5.9.015 (2010-11-16)
- - Bug item affecting QRCode was fixed.
- - Some bugs affecting HTML lists were fixed.
- - ImageSVG() and fitBlock() methods were improved to handle some SVG problems.
- - Some problems with PHP4 compatibility were fixed.
-
-5.9.014 (2010-11-15)
- - Bug item #3109464 "QRCode error" was fixed.
-
-5.9.013 (2010-11-15)
- - Bug item #3109257 "Problem with interlaced GIFs and PNGs" was fixed.
- - Image function now accepts image data streams (check example n. 9).
-
-5.9.012 (2010-11-12)
- - Method getTCPDFVersion() was added.
- - PDF_PRODUCER constant was removed.
- - Method convertHTMLColorToDec() was improved.
- - HTML colors now support spot color names defined on the new spotcolors.php file.
- - The default method Header() was improved to support SVG and EPS/AI images.
- - A bug on SVG importer was fixed.
-
-5.9.011 (2010-11-02)
- - Bug item #3101486 "Bug Fix for image loading" was fixed.
-
-5.9.010 (2010-10-27)
- - Support for CSS properties 'border-spacing' and 'padding' for tables were added.
- - Several language files were added.
-
-5.9.009 (2010-10-21)
- - HTML text alignment was improved to include the case of RTL text on LTR direction and LTR text on RTL direction.
-
-5.9.008 (2010-10-21)
- - Bug item #3091502 "Bookmark oddity" was fixed.
- - HTML internal links now accepts page number and Y position.
- - The method write1DBarcode() was improved to accept separate horizontal and vertical padding (see example n. 27).
-
-5.9.007 (2010-10-20)
- - Method adjustCellPadding() was fixed to handle bad input.
-
-5.9.006 (2010-10-19)
- - Support for AES 256 bit encryption was added (see example n. 16).
- - Method getNumLines() was fixed for the empty string case.
-
-5.9.005 (2010-10-18)
- - Method addPageRegion() was changed to accept regions starting exactly from the top of the page.
-
-5.9.004 (2010-10-18)
- - A bug related to annotations was fixed.
- - The file unicode_data.php was canged to encapsulate all data in a class.
- - The file htmlcolors.php was changed to remove the global variable.
-
-5.9.003 (2010-10-15)
- - Support for no-write page regions was added. Check the example n. 64 and new methods setPageRegions(), addPageRegion(), getPageRegions(), removePageRegion().
- - A bug on Right-To-Left alignment was fixed.
-
-5.9.002 (2010-10-08)
- - Cell method was improved to preserve the font stretching and spacing values when using the $stretch parameter (see example n. 4).
-
-5.9.001 (2010-10-07)
- - The problem of blank page for nobr table higher than a single page was fixed.
-
-5.9.000 (2010-10-06)
- - Support for text stretching and spacing (tracking) was added, see example n. 63 and methods setFontStretching(), getFontStretching(), setFontSpacing(), getFontSpacing().
- - Support for CSS properties 'font-stretch' and 'letter-spacing' was added (see example n. 63).
- - The cMargin state was replaced by cell_padding array that can be set/get using setCellPadding() and getCellPadding() methods.
- - Methods getCellPaddings() and setCellPaddings() were added to fine tune cell paddings (see example n. 5).
- - Methods getCellMargins() and setCellMargins() were added to fine tune cell margins (see example n. 5).
- - Method write1DBarcode() was improved to permit custom labels (see example n. 27).
- - Method ImagePngAlpha() now includes support for ImageMagick to improve performances.
- - XObject Template support was extended to support Multicell(), writeHTML() and writeHTMLCell() methods.
- - The signature of getNumLines() and getStringHeight() methods is changed.
- - Example n. 57 was updated.
-
-// -------------------------------------------------------------------
-
-5.8.034 (2010-09-27)
- - A bug related to SetFont on XObject templates was fixed.
-
-5.8.033 (2010-09-25)
- - A problem with Footer() and multiple columns was fixed.
-
-5.8.032 (2010-09-22)
- - Bug #3073165 "Issues with changes to addHTMLVertSpace()" was fixed.
-
-5.8.031 (2010-09-20)
- - Bug #3071961 "Spaces in HTML" was fixed.
-
-5.8.030 (2010-09-17)
- - SVG support was improved and some bugs were fixed.
-
-5.8.029 (2010-09-16)
- - A problem with HTML borders was fixed.
-
-5.8.028 (2010-09-13)
- - Bug #3065224 "mcrypt_create_iv error on TCPDF 5.8.027 on PHP 5.3.2" was fixed.
-
-5.8.027 (2010-09-13)
- - Bug #3065118 "mcrypt_decrypt error on TCPDF 5.8.026 on PHP 5.3.2" was fixed.
-
-5.8.026 (2010-09-13)
- - A bug on addHTMLTOC() method was fixed. Note: be sure that the #TOC_PAGE_NUMBER# template has enough width to be printed correctly.
-
-5.8.025 (2010-09-09)
- - Bug #3062692 "Textarea inside a table" was fixed.
-
-5.8.024 (2010-09-08)
- - Bug #3062005 "Undefined variable: ann_obj_id" was fixed.
-
-5.8.023 (2010-08-31)
- - Forms bug added on version 5.8.019 was fixed.
-
-5.8.022 (2010-08-31)
- - Bug #3056632 "SVG rendered vertically flipped" was fixed.
-
-5.8.021 (2010-08-30)
- - A new CID-0 'chinese' font was added for traditional Chinese.
- - Bug #3054287 'Inner tags are ignored due to "align" attribute' was fixed.
-
-5.8.020 (2010-08-26)
- - CSS "catch-all" class selector is now supported.
-
-5.8.019 (2010-08-26)
- - XObject Templates now includes support for links and annotations.
- - A problem related to link alignment on cell was fixed.
- - A problem related to SVG styles was fixed.
-
-5.8.018 (2010-08-25)
- - Method getNumberOfColumns() was added.
- - A problem related to table header was fixed.
- - Method getSVGTransformMatrix() was fixed to apply SVG transformations in the correct order.
- - SVG support was improved and several bugs were fixed.
-
-5.8.017 (2010-08-25)
- - This version includes support for XObject Templates (see the new example n. 62).
- - Methods starttemplate(), endTemplate() and printTemplate() were added (see the new example n. 62).
-
-5.8.016 (2010-08-24)
- - Alignment problem on write2DBarcode was fixed.
-
-5.8.015 (2010-08-24)
- - A problem arised with the latest bugfix was fixed.
-
-5.8.014 (2010-08-23)
- - Method _getxobjectdict() was added for better compatibility with external extensions.
- - A bug related to radiobuttons was fixed.
- - Bug #3051509 "new line after punctuation marks" was fixed (partially).
-
-5.8.013 (2010-08-23)
- - SVG support for 'direction' property was added.
- - A problem on default width calculation for linear barcodes was fixed.
- - New option was added to write1DBarcode() method to improve alignments (see example n. 27).
- - Bug #3050896 "Nested HTML tables: styles are not applied" was fixed.
- - Method _putresourcedict() was improved to include external XObject templates.
-
-5.8.012 (2010-08-22)
- - Support for SVG 'text-anchor' property was added.
-
-5.8.011 (2010-08-21)
- - Method write1DBarcode() was improved to be backward compatible (check the new example n. 27).
- - Support for CSS width and height properties on images were added.
-
-5.8.010 (2010-08-20)
- - Documentation of unhtmlentities() was fixed.
- - The 'fitwidth' option was added and border color problem was fixed on write1DBarcode() method (check the example n. 27).
-
-5.8.009 (2010-08-20)
- - Internal object numbering was improved.
- - Some errors in object encryption were fixed.
-
-5.8.008 (2010-08-19)
- - Method write1DBarcode() was changed, check the example n. 27.
- - Method Footer() was changed to account for barcode changes.
- - Automatic calculation of K_PATH_URL constant was fixed on configuration file.
- - Method setEqualColumns() was fixed for $width=0 case.
- - Method AddTOC() was fixed for multipage and multicolumn modes.
- - Better support for SVG "font-family" property.
- - A problem on default Page Zoom mode was fixed.
- - Several Annotation bugs were fixed.
-
-5.8.007 (2010-08-18)
- - A bug affecting HTML tables was fixed.
- - Bug #3047500 "SVG not rendering paths properly" was fixed.
-
-5.8.006 (2010-08-17)
- - A bug affecting HTML table nesting was fixed.
-
-5.8.005 (2010-08-17)
- - A bug affecting the HTML 'select' tag in certain conditions was fixed.
-
-5.8.004 (2010-08-17)
- - Better support for HTML "font-family" property.
- - A bug related to HTML multicolumn was fixed.
-
-5.8.003 (2010-08-16)
- - Better support for HTML "font-family" property.
-
-5.8.002 (2010-08-14)
- - HTML alignments were improved
- - IMPORTANT: Default regular expression to find spaces has been changed to exclude the non-breaking-space (160 DEC- A0 HEX). If you are using setSpacesRE() method, please read the new documentation.
- - Example n. 1 was updated.
-
-5.8.001 (2010-08-12)
- - Bug #3043650 "subsetchars incorrectly cached" was fixed.
-
-5.8.000 (2010-08-11)
- - A control to avoid bookmarking page 0 was added.
- - addTOC() method now includes support for multicolumn mode.
- - Support for tables in multicolumn mode was improved.
- - Example n.10 was updated.
- - All trimming functions were replaced with stringLeftTrim(), stringRightTrim() and stringTrim().
- - HTML alignments were improved.
-
-------------------------------------------------------------
-
-5.7.003 (2010-08-08)
- - Bug #3041263 "php source ending is bad" was fixed (all PHP files were updated, including fonts).
-
-5.7.002 (2010-08-06)
- - Methods copyPage(), movePage() and deletePage() were changed to account for internal markings.
-
-5.7.001 (2010-08-05)
- - Bug #3040105 "Broken PDF when using TOC (example 45)" was fixed.
-
-5.7.000 (2010-08-03)
- - CSS borders are now supported for HTML tables and other block tags (see example n. 61);
- - Cell borders were improved (see example n. 57);
- - Minor bugs were fixed.
-
-------------------------------------------------------------
-
-5.6.000 (2010-07-31)
- - A bug with object IDs was fixes.
- - Performances were improved.
-
-------------------------------------------------------------
-
-5.5.015 (2010-07-29)
- - Automatic fix for unclosed self-closing tag.
- - Support for deprecated 's' and 'strike' tags was added.
- - Empty list items problem was fixed.
-
-5.5.014 (2010-07-15)
- - Support for external images was improved.
-
-5.5.013 (2010-07-14)
- - Bug #3029338 "FI and FO output destination filename bug" was fixed (previous fix was wrong).
-
-5.5.012 (2010-07-14)
- - Bug #3029310 "Font baseline inconsistencies with line-height and font-size" was fixed.
- - Bug #3029338 "FI and FO output destination filename bug" was fixed.
-
-5.5.011 (2010-07-09)
- - Support for multiple CSS classes was added.
- - The method getColumn() was added to return the current column number.
- - Some regular Expressions were fixed to be more compatible with UTF-8.
-
-5.5.010 (2010-07-06)
- - Bug item #3025772 "Borders in all image functions are still flawed" was fixed.
-
-5.5.009 (2010-07-05)
- - A problem related to last page footer was fixed.
- - Image alignments and fit-on-page features were improved.
-
-5.5.008 (2010-07-02)
- - A problem on table header alignment in booklet mode was fixed.
- - Default graphic vars are now applied for setHeader();
-
-5.5.007 (2010-07-02)
- - Attribute "readonly" was added to input and textarea form fields.
- - Vertical alignment feature was added on MultiCell() method only for simple text mode (see example n. 5).
- - Text-Fit feature was added on MultiCell() method only for simple text mode (see example n. 5).
-
-5.5.006 (2010-06-29)
- - getStringHeight() and getNumLines() methods were fixed.
-
-5.5.005 (2010-06-28)
- - Bug #3022170 "getFontDescent() does not return correct descent value" was fixed.
- - Some problems with multicolumn mode were fixed.
-
-5.5.004 (2010-06-27)
- - Bug #3021803 "SVG Border" was fixed.
-
-5.5.003 (2010-06-26)
- - On Write() method, blank lines at the beginning of a page or column are now automatically removed.
-
-5.5.002 (2010-06-24)
- - ToUnicode Identity-H name was replaced with a full CMap (to avoid preflight syntax error).
- - Bug #3020638 "str_split() not available in php4" was fixed.
- - Bug #3020665 "file_get_contents() too many parameters for php4" was fixed.
-
-5.5.001 (2010-06-23)
- - A problem on image streams was fixed.
-
-5.5.000 (2010-06-22)
- - Several PDF syntax errors (and related bugs) were fixed.
- - Bug #3019090 "/Length values are wrong if AES encryption is used" was fixed.
-
-------------------------------------------------------------
-
-5.4.003 (2010-06-19)
- - A problem related to page boxes was fixed.
- - Bug #3016920 "Font subsetting issues when editing pdf" was partially fixed (Note that flattening transparency layers is currently incompatible with TrueTypeUnicode fonts).
-
-5.4.002 (2010-06-18)
- - A problem related with setProtection() method was fixed.
-
-5.4.001 (2010-06-18)
- - A problem related with setProtection() method was fixed.
-
-5.4.000 (2010-06-18)
- - The method setSignatureAppearance() was added, check the example n. 52.
- - Several problems related to font subsetting were fixed.
-
-------------------------------------------------------------
-
-5.3.010 (2010-06-15)
- - Previous release was corrupted.
-
-5.3.009 (2010-06-15)
- - Bug #3015934 "Bullets don't display correctly" was fixed.
-
-5.3.008 (2010-06-13)
- - This version fixes some problems of SVG rasterization.
-
-5.3.007 (2010-06-13)
- - This version improves SVG support.
-
-5.3.006 (2010-06-10)
- - This version includes a change in uniqid calls for backward compatibility with PHP4.
-
-5.3.005 (2010-06-09)
- - The method getPageSizeFromFormat() was changed to include all standard page formats (includes 281 page formats + variation).
-
-5.3.004 (2010-06-08)
- - Bug #3013291 "HTML table cell width" was fixed.
- - Bug #3013294 "HTML table cell alignment" was fixed.
- - The columns widths of HTML tables are now inherited from the first row.
-
-5.3.003 (2010-06-08)
- - Bug #3013102 "HTML table header misaligned after page break" was fixed.
-
-5.3.002 (2010-06-07)
- - The methods setFontSubsetting() and setFontSubsetting() were added to control the default font subsetting mode (see example n. 1).
- - Bug #3012596 "Whitespace should not appeared after use Thai top characters" was fixed.
- - Examples n. 1, 14, and 54 were updated.
-
-5.3.001 (2010-06-06)
- - Barcode PDF417 was improved to support Macro Code Blocks (see example n. 50).
-
-5.3.000 (2010-06-05)
- - License was changed to GNU-LGPLv3 (see the updated LICENSE.TXT file).
- - PDF417 barcode support was added (check the example n. 50).
- - The method write2DBarcode() was improved (some parameters were added and other changed - check example n. 50).
-
-------------------------------------------------------------
-
-5.2.000 (2010-06-02)
- - IMPORTANT: Support for font subsetting was added by default to reduce the size of documents using large unicode font files.
- If you embed the whole font in the PDF, the person on the other end can make changes to it even if he didn't have your font.
- If you subset the font, file size of the PDF will be smaller but the person who receives your PDF would need to have your same font in order to make changes to your PDF.
- - The signature of the SetFont() and AddFont() methods were changed to include the font subsetting option (subsetting is applied by default).
- - Examples 14 and 54 were updated.
-
-------------------------------------------------------------
-
-5.1.002 (2010-05-27)
- - Bug #3007818 "SetAutoPageBreak fails with MultiCell" was fixed.
- - A bug related to MultiCell() minimun height was fixed.
-
-5.1.001 (2010-05-26)
- - The problem of blank page after table was fixed.
-
-5.1.000 (2010-05-25)
- - This version includes support for CSS (Cascading Style Sheets) (see example n. 61).
- - The convertHTMLColorToDec() method was improved.
-
-------------------------------------------------------------
-
-5.0.014 (2010-05-21)
- - A problem on color and style of HTML links was fixed.
- - A bug relative to gradients was fixed.
- - The getStringHeight() method was added and getNumLines() method was improved.
- - All examples were updated.
-
-5.0.013 (2010-05-19)
- - A bug related to page-breaks and table cells was fixed.
-
-5.0.012 (2010-05-19)
- - Page orientation bug was fixed.
- - The access to method setPageFormat() was changed to 'protected' because it is not intended to be directly called.
-
-5.0.011 (2010-05-19)
- - Page orientation bug was fixed.
- - Bug #3003966 "Multiple columns and nested lists" was fixed.
-
-5.0.010 (2010-05-17)
- - The methods setPageFormat(), setPageOrientation() and related methods were extended to include page boxes, page rotations and page transitions.
- - The method setPageBoxes() was added to set page boundaries (MediaBox, CropBox, BleedBox, TrimBox, ArtBox);
- - A bug relative to underline, overline and linethrough was fixed.
-
-5.0.009 (2010-05-16)
- - Bug #3002381 "Multiple columns and nested lists" was fixed.
-
-5.0.008 (2010-05-15)
- - Bug "Columns WriteHTML and Justification" was fixed.
-
-5.0.007 (2010-05-14)
- - Bug #3001347 "Bug when using WriteHTML with setEqualColumns()" was fixed.
- - Bug #3001505 "problem with sup and sub tags at the beginning of a line" was fixed.
-
-5.0.006 (2010-05-13)
- - Length of hr tag was fixed.
- - An error on 2d barcode method was fixed.
-
-5.0.005 (2010-05-12)
- - WARNING: The logic of permissions on the SetProtection() method has been inverted and extended (see example 16). Now you have to specify the features you want to block.
- - SetProtection() method was extended to support RSA and AES 128 encryption and public-keys (see example 16).
- - Bug #2999489 "setEqualColumns() and TOC uses wrong columns" was fixed (see the example 10).
-
-5.0.004 (2010-05-10)
- - HTML line alignment when using sub and sup tags was fixed.
-
-5.0.003 (2010-05-07)
- - Horizontal alignment was fixed for images and barcodes. Now the X coordinate is always relative to the left margin. Use GetAbsX() instead of GetX() to get the X relative to left margin.
- - Header() method was changed to account for new image alignment rules.
-
-5.0.002 (2010-05-06)
- - Bookmark() and related methods were fixed to accept HTML code.
- - A problem on HTML links was fixed.
-
-5.0.001 (2010-05-06)
- - Protected method _putstream was re-added for backward compatibility.
- - The following method were added to display HTML Table Of Content (see example n. 59):
- addTOCPage(), endT...
[truncated message content] |
|
From: <be...@us...> - 2014-09-28 13:38:45
|
Revision: 12801
http://sourceforge.net/p/xoops/svn/12801
Author: beckmi
Date: 2014-09-28 13:38:38 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
Adding /themes/xbootstrap/modules with renamed templates to .tpl
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/contact_contactusform.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-album.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-photo.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-sendecard.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/newbb_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/news_block_top.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_article.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/obituaries/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/obituaries/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/obituaries/obituaries_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/obituaries/obituaries_user.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/obituaries/obituaries_users.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/pm/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/pm/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/pm/pm_readpmsg.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/pm/pm_viewpmsg.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/profile/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/profile/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/profile/profile_userinfo.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_category_items_sel.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_columns.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_menu.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_random_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_recent.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_items_spot.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_latest_files.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/blocks/publisher_search_block.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_categories_table.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_display_full.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_display_list.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_display_wfsection.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_header.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_item(title_bottom).tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_search.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_singleitem.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/publisher_singleitem_block.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php.bak
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/css/publisher.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/publisher/xoops_and_module_changes/xoops.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_login.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_mainmenu.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_newusers.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_online.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_search.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_themes.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_topusers.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/blocks/system_block_user.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/system_comment.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/system_comments_flat.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/system_comments_thread.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/system_notification_select.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/system/system_siteclosed.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tag/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tag/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tag/tag_bar.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/blocks/tdmdownloads_block_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_brokenfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_download.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_modfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_ratefile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_singlefile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_viewcat.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopsfaq/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopsfaq/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopsfaq/xoopsfaq_category.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopsfaq/xoopsfaq_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/blocks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/blocks/xoopstube_block_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/videoload.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/xoopstube_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/xoopstube_singlevideo.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/xoopstube_videoload.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/xoopstube/xoopstube_viewcat.tpl
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/contact_contactusform.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/contact_contactusform.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/contact_contactusform.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,14 @@
+<div class="contact-module">
+<{$contactform.javascript}>
+<form name="<{$contactform.name}>" action="<{$contactform.action}>" method="<{$contactform.method}>" <{$contactform.extra}>>
+<h4><{$contactform.title}></h4>
+<{foreach item=element from=$contactform.elements}>
+ <{if $element.hidden != true}>
+ <{$element.caption}>
+ <{$element.body}>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
+<{/foreach}>
+</form>
+</div>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/contact/index.html 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_index.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_index.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_index.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,88 @@
+<div class="row">
+ <div class="col-md-12"><a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><h4><{$extgalleryName}></h4></a></div>
+ <div class="col-xs-4 col-sm-4 col-md-4"><{$lang.categoriesAlbums}></div>
+ <!-- <div class="col-xs-4 col-sm-4 col-md-4"><{$lang.nbAlbums}></div> -->
+ <!-- <div class="col-xs-4 col-sm-4 col-md-4"><{$lang.nbPhotos}></div> -->
+</div>
+
+<div class="row">
+ <{foreachq item=child from=$cats}>
+ <div class="col-xs-4 col-sm-4 col-md-4 xoops-gallery-thumb">
+ <{if $child.cat_nb_album == 0}>
+
+ <{else}>
+
+ <{/if}>
+
+<{if $disp_cat_img == 1 }>
+ <{if $child.cat_imgurl != "" }>
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>">
+ <img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>">
+ </a>
+ <{else}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>">
+ <img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>">
+ </a>
+ <{/if}>
+ <{else}>
+ <{if $child.photo}>
+
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>">
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>">
+ </a>
+ <{else}>
+ <a title="<{$child.cat_name}>" href="pu<{$extgalleryName}>blic-categories.php?id=<{$child.cat_id}>">
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>">
+ </a>
+ <{/if}>
+<{/if}>
+<{/if}>
+<{else}>
+
+<{if $child.photo}>
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>">
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>">
+ </a>
+ <{else}>
+
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>">
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>">
+ </a>
+ <{/if}>
+<{/if}>
+<{/if}>
+
+<{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>" class="extgallery-album-name">
+ <strong><{$child.cat_name}></strong>
+ </a>
+
+ <{$child.cat_desc}>
+
+<{else}>
+<a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>">
+ <{$child.cat_name}>
+</a>
+<{$child.cat_desc}>
+<{/if}>
+
+<{if $child.cat_nb_album != 0}>
+ <{$child.cat_nb_album}>
+<{/if}>
+
+<strong class="number-photos"><{$child.cat_nb_photo}> <{$lang.nbPhotos}></strong>
+</div>
+<{/foreach}>
+<{if $show_rss}>
+ <div class="clearfix"></div>
+ <div class="col-md-12">
+ <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
+ <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>">
+ </a>
+ </div>
+<{/if}>
+</div>
+<{include file='db:system_notification_select.html'}>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-album.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-album.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-album.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,115 @@
+<div class="row extGalleryAlbum">
+<div class="col-md-12">
+ <ul class="breadcrumb">
+ <li><a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><{$extgalleryName}></a></li>
+ <{foreachq item=node from=$catPath name=breadcrumb}>
+ <li><a title="<{$node.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$node.cat_id}>"><{$node.cat_name}></a></li>
+ <{/foreach}>
+ <li><{$cat.cat_name}></li>
+ </ul>
+</div>
+
+<div class="col-md-12 aligncenter">
+ <h3 class="gallerytitle"><{$extgallerySortbyOrderby}></h3>
+</div>
+
+<div class="col-md-12 aligncenter orderbyicons">
+<ul class="list-unstyled">
+ <li>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_date&orderby=DESC" title="<{$smarty.const._MD_EXTGALLERY_SORTDATEDESC}>">
+ <span class="glyphicon glyphicon glyphicon-collapse-up"></span>
+ </a>
+ <span><{$smarty.const._MD_EXTGALLERY_SORTDATE}></span>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_date&orderby=ASC" title="<{$smarty.const._MD_EXTGALLERY_SORTDATEASC}>">
+ <span class="glyphicon glyphicon-collapse-down"></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_title&orderby=ASC" title="<{$smarty.const._MD_EXTGALLERY_SORTNAMEASC}>">
+ <span class="glyphicon glyphicon glyphicon-collapse-up"></span>
+ </a>
+ <span><{$smarty.const._MD_EXTGALLERY_SORTNAME}></span>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_title&orderby=DESC" title="<{$smarty.const._MD_EXTGALLERY_SORTNAMEDESC}>">
+ <span class="glyphicon glyphicon-collapse-down"></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_hits&orderby=DESC" title="<{$smarty.const._MD_EXTGALLERY_SORTHITSDESC}>">
+ <span class="glyphicon glyphicon glyphicon-collapse-up"></span>
+ </a>
+ <span><{$smarty.const._MD_EXTGALLERY_SORTHITS}></span>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_hits&orderby=ASC" title="<{$smarty.const._MD_EXTGALLERY_SORTHITSASC}>">
+ <span class="glyphicon glyphicon-collapse-down"></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_rating&orderby=DESC" title="<{$smarty.const._MD_EXTGALLERY_SORTNOTEDESC}>">
+ <span class="glyphicon glyphicon glyphicon-collapse-up"></span>
+ </a>
+ <span><{$smarty.const._MD_EXTGALLERY_SORTNOTE}></span>
+ <a href="<{xoAppUrl modules/extgallery/}>public-album.php?id=<{$extgalleryID}>&start=<{$extgalleryStart}>&sortby=photo_rating&orderby=ASC" title="<{$smarty.const._MD_EXTGALLERY_SORTNOTEASC}>">
+ <span class="glyphicon glyphicon-collapse-down"></span>
+ </a>
+ </li>
+</ul>
+</div>
+
+<div class="col-md-12"><h3 class="gallerytitle"><{$cat.cat_name}></h3></div>
+
+<{section name=photo loop=$photos}>
+<div class="col-xs-4 col-sm-4 col-md-4 album-thumb">
+<{if $photos[photo].photo_id}>
+ <ul class="adminlinks list-unstyled">
+ <{if $xoops_isadmin}>
+ <li><a title="edit" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=edit&id=<{$photos[photo].photo_id}>"><span class="glyphicon glyphicon-edit"></span></a></li>
+ <li><a title="delete" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=delete&id=<{$photos[photo].photo_id}>"><span class="glyphicon glyphicon-trash"></span></a></li>
+ <{/if}>
+
+ <{if $enable_show_comments}><li><{$photos[photo].photo_comment}> <{$lang.comments}></li><{/if}>
+ <{if $enable_photo_hits}><li><{$photos[photo].photo_hits}> <{$lang.hits}></li><{/if}>
+ <{if $enable_date}><li><span class="glyphicon glyphicon-calendar"></span> <{$photos[photo].photo_date}></li><{/if}>
+ <{if $enable_submitter_lnk}><li><a title="<{$photos[photo].user.uname}>" href="<{$xoops_url}>/userinfo.php?uid=<{$photos[photo].user.uid}>"><{$photos[photo].user.uname}></a></li><{/if}>
+ </ul>
+<{if $photos[photo].photo_serveur && $photos[photo].photo_name}>
+ <a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$photos[photo].photo_id}>" title="<{$photos[photo].photo_title}>">
+ <img src="<{$photos[photo].photo_serveur}>thumb_<{$photos[photo].photo_name}>" alt="<{$photos[photo].photo_title}>">
+ </a>
+
+<{elseif $photos[photo].photo_name}>
+
+ <a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$photos[photo].photo_id}>" title="<{$photos[photo].photo_title}>">
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$photos[photo].photo_name}>" alt="<{$photos[photo].photo_title}>">
+ </a>
+<{/if}>
+
+<{if $enableRating}>
+<div class="photoRating"><img src="<{xoAppUrl modules/extgallery/}>images/rating_<{$photos[photo].photo_rating}>.gif" alt="<{$lang.rate_score}> : <{$photos[photo].photo_rating}>" title="<{$lang.rate_score}>"></div>
+<{/if}>
+
+<{foreachq item=pluginLink from=$photos[photo].link}>
+ <a href="<{$pluginLink.link}><{$photos[photo].photo_id}>" title="<{$pluginLink.name}>"><{$pluginLink.name}></a>
+<{/foreach}>
+<{/if}>
+</div>
+<{/section}>
+</div><!-- .row -->
+
+<div class="pageNav">
+ <{$pageNav}>
+</div>
+
+<{if $show_rss}>
+ <div id="rss">
+ <a href="<{xoAppUrl modules/extgallery/public-rss.php?id=}><{$extgalleryID}>" title="<{$smarty.const._MD_EXTGALLERY_ALBUMRSS}>">
+ <img src="<{xoAppUrl modules/extgallery/images/feedblue.png}>" alt="<{$smarty.const._MD_EXTGALLERY_ALBUMRSS}>" />
+ </a>
+ <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
+ <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>" />
+ </a>
+ </div>
+<{/if}>
+
+<{include file='db:system_notification_select.html'}>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-photo.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-photo.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-photo.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,164 @@
+<div class="row extGalleryAlbum">
+<div class="col-md-12">
+ <ul class="breadcrumb">
+ <li><a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><{$extgalleryName}></a></li>
+
+ <{foreachq item=node from=$catPath name=breadcrumb}>
+ <li><a href="<{xoAppUrl modules/extgallery/}>public-<{if $node.cat_isalbum}><{$display_type}><{else}>categories<{/if}>.php?id=<{$node.cat_id}>" title="<{$node.cat_name}>"><{$node.cat_name}></a></li>
+ <{/foreach}>
+ <li><{$photo.photo_title}></li>
+ </ul>
+</div>
+
+<div class="col-md-12 aligncenter gallery-single-photo">
+ <!-- Start Admin link -->
+ <div class="row photo-nav-controls">
+ <div class="col-xs-6 col-sm-6 col-md-6">
+ <{if $xoops_isadmin}>
+ <div class="pull-left">
+ <a title="edit" class="btn btn-success btn-xs" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=edit&id=<{$photo.photo_id}>"><span class="glyphicon glyphicon-edit"></span></a>
+ <a title="delete" class="btn btn-danger btn-xs" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=delete&id=<{$photo.photo_id}>"><span class="glyphicon glyphicon-trash"></span></a>
+ </div>
+ <{/if}>
+ </div>
+
+ <div class="col-xs-6 col-sm-6 col-md-6">
+ <ul class="pull-right list-unstyled">
+ <{if $prevId != 0}><li class="nav-btn"><a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$prevId}>"><span class="glyphicon glyphicon-circle-arrow-left"></span></a><{else}></li><{/if}>
+ <li class="small"><{$currentPhoto}></li>
+ <li class="small"><{$lang.of}></li>
+ <li class="small"><{$totalPhoto}></li>
+ <{if $nextId != 0}><li class="nav-btn"><a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$nextId}>"><span class="glyphicon glyphicon-circle-arrow-right"></span></a><{else}></li><{/if}>
+ </ul>
+ </div>
+ </div><!-- .row || .photo-nav-controls -->
+
+ <{if $photo.photo_serveur}>
+ <img src="<{$photo.photo_serveur}><{$photo.photo_name}>" alt="<{$photo.photo_desc}>" class="img-thumbnail">
+ <{else}>
+ <img src="<{$xoops_url}>/uploads/extgallery/public-photo/medium/<{$photo.photo_name}>" alt="<{$photo.photo_title}>" class="img-thumbnail">
+ <{/if}>
+</div><!-- .gallery-single-photo -->
+
+<div class="row gallery-image-details">
+ <{if $disp_ph_title == 1 }>
+ <!-- Start Photo Title -->
+ <div class="col-md-12">
+ <h3 class="gallerytitle"><{$photo.photo_title}></h3>
+ </div>
+ <{/if}>
+
+ <!-- Start Photo desc -->
+ <div class="col-md-12">
+ <{$photo.photo_desc}>
+ </div>
+
+ <{if $enableExtra}>
+ <!-- Start extra field -->
+ <div class="col-md-12">
+ <{$photo.photo_extra}>
+ </div>
+ <{/if}>
+
+ <{foreachq item=pluginLink from=$pluginPhotoAlbumLink}>
+ <a href="<{$pluginLink.link}><{$photo.photo_id}>" title="<{$pluginLink.name}>"><{$pluginLink.name}></a>
+ <{/foreach}>
+ <{foreachq item=pluginLink from=$photo.link}>
+ <a href="<{$pluginLink.link}><{$photo.photo_id}>" title="<{$pluginLink.name}>"><{$pluginLink.name}></a>
+ <{/foreach}>
+
+ <!-- Start XOOPS Tag -->
+ <{if $tags}>
+ <div class="col-md-12">
+ <{include file="db:tag_bar.html"}>
+ </div>
+ <{/if}>
+
+ <!-- Start social network and bookmarks -->
+ <div class="col-md-12 aligncenter">
+ <div class='shareaholic-canvas' data-app='share_buttons' data-app-id='482507'></div>
+ </div>
+</div><!-- .gallery-image-details -->
+
+<!-- Start Rating part -->
+<{if $canRate}>
+ <div class="col-md-12">
+ <h3 class="gallerytitle"><{$lang.voteFor}></h3>
+ <div class="aligncenter">
+ <a title="<{$lang.voteFor}> : 1" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=1"><img src="images/rating_1.gif" alt="<{$lang.voteFor}> : 1"></a>
+ <a title="<{$lang.voteFor}> : 2" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=2"><img src="images/rating_2.gif" alt="<{$lang.voteFor}> : 2"></a>
+ <a title="<{$lang.voteFor}> : 3" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=3"><img src="images/rating_3.gif" alt="<{$lang.voteFor}> : 3"></a>
+ <a title="<{$lang.voteFor}> : 4" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=4"><img src="images/rating_4.gif" alt="<{$lang.voteFor}> : 4"></a>
+ <a title="<{$lang.voteFor}> : 5" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=5"><img src="images/rating_5.gif" alt="<{$lang.voteFor}> : 5"></a>
+ </div>
+ </div>
+<{/if}>
+
+<!-- Start Photo Information -->
+<{if $enable_info }>
+<div class="text-center">
+ <a href="#gallery-info" data-toggle="collapse" class="big-info-icon-link" title="Info"><span class="glyphicon glyphicon-info-sign"></span></a>
+</div>
+
+<div class="panel-collapse collapse" id="gallery-info">
+
+ <h3 class="gallerytitle aligncenter"><{$lang.photoInfo}></h3>
+ <ul class="list-unstyled photo-info">
+ <{if $enable_submitter_lnk}>
+ <li><{$lang.submitter}> : <a title="<{$photo.user.uname}>" href="<{$xoops_url}>/userinfo.php?uid=<{$photo.user.uid}>"><{$photo.user.uname}></a>
+ <a title="<{$lang.allPhotoBy}> <{$photo.user.uname}>" href="<{xoAppUrl modules/extgallery/}>public-useralbum.php?id=<{$photo.user.uid}>">
+ <{$lang.allPhotoBy}> <{$photo.user.uname}>
+ </a>
+ </li>
+ <{/if}>
+
+ <{if $enable_photo_hits}>
+ <li><{$lang.view}> : <{$photo.photo_hits}> <{$lang.hits}></li>
+ <{/if}>
+
+ <{if $enable_resolution}>
+ <li><{$lang.resolution}> : <{$photo.photo_res_x}> x <{$photo.photo_res_y}> <{$lang.pixels}> | <{$lang.fileSize}> : <{$photo.photo_size}> Kb</li>
+ <{/if}>
+
+ <{if $enable_date}>
+ <li><{$lang.added}> : <{$photo.photo_date}></li>
+ <{/if}>
+
+ <{if $canRate}>
+ <li><{$lang.score}> : <img src="images/rating_<{$rating}>.gif" alt="rating"> | <{$photo.photo_nbrating}> <{$lang.votes}></li>
+ <{/if}>
+
+ <{if $canDownload && $enable_download}>
+ <li><a title="<{$lang.downloadOrig}>" href="<{xoAppUrl modules/extgallery/}>public-download.php?id=<{$photo.photo_id}>"><{$lang.downloadOrig}><img src="images/download.gif" alt="<{$lang.downloadOrig}>"></a> | <{$photo.photo_download}> <{$lang.donwloads}></li>
+ <{/if}>
+
+ <{if $canSendEcard && $enable_ecards}>
+ <li><a title="<{$lang.sendEcard}>" href="<{xoAppUrl modules/extgallery/}>public-sendecard.php?id=<{$photo.photo_id}>"><{$lang.sendEcard}> <img src="images/ecard.gif" alt="<{$lang.sendEcard}>"></a> | <{$photo.photo_ecard}> <{$lang.sends}></li>
+ <{/if}>
+ </ul>
+</div>
+<{/if}>
+
+ <{if $show_rss}>
+ <div id="rss">
+ <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
+ <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>" />
+ </a>
+ </div>
+ <{/if}>
+
+</div><!-- .row || .extGalleryAlbum -->
+
+<{$commentsnav}>
+
+<{$lang_notice}>
+
+<{if $comment_mode == "flat"}>
+ <{include file="db:system_comments_flat.html"}>
+<{elseif $comment_mode == "thread"}>
+ <{include file="db:system_comments_thread.html"}>
+<{elseif $comment_mode == "nest"}>
+ <{include file="db:system_comments_nest.html"}>
+<{/if}>
+
+<{include file='db:system_notification_select.html'}>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-sendecard.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-sendecard.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/extgallery_public-sendecard.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,44 @@
+<form class="form-horizontal" role="form" id="<{$send_ecard.name}>" action="<{$send_ecard.action}>" method="<{$send_ecard.method}>" <{$send_ecard.extra}>>
+<h3 class="gallerytitle"><{$send_ecard.title}></h3>
+
+<img class="pull-right img-thumbnail" src="<{$photo}>" alt="<{$lang.from}>">
+
+<ul class="list-unstyled form-send-e-card">
+
+<li><h3 class="gallerytitle"><{$lang.from}>:</h3></li>
+
+<li><{$send_ecard.elements.ecard_fromname.caption}></li>
+
+<li><{$send_ecard.elements.ecard_fromname.body}></li>
+
+<li><{$send_ecard.elements.ecard_fromemail.caption}></li>
+
+<li><{$send_ecard.elements.ecard_fromemail.body}></li>
+
+<li><h3 class="gallerytitle"><{$lang.to}>:</h3></li>
+
+<li><{$send_ecard.elements.ecard_toname.caption}></li>
+<li><{$send_ecard.elements.ecard_toname.body}></li>
+
+<li><{$send_ecard.elements.ecard_toemail.caption}></li>
+<li><{$send_ecard.elements.ecard_toemail.body}></li>
+
+<li><{$send_ecard.elements.ecard_greetings.caption}></li>
+
+<li><{$send_ecard.elements.ecard_greetings.body}></li>
+
+<li><{$send_ecard.elements.ecard_desc.caption}></li>
+
+<li><{$send_ecard.elements.ecard_desc.body}></li>
+
+<{if $send_ecard.elements.captcha.body}>
+<li><{$send_ecard.elements.captcha.caption}></li>
+<li><img src="<{xoAppUrl modules/extgallery/}>images/captcha.php" alt="captcha"></li>
+<li><{$send_ecard.elements.captcha.body}></li>
+<{/if}>
+<{$send_ecard.elements.step.body}>
+<{$send_ecard.elements.photo_id.body}>
+<li class="aligncenter"><{$send_ecard.elements.submit.body}></li>
+
+</ul>
+</form>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/extgallery/index.html 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/index.html 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/newbb_index.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/newbb_index.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/newbb/newbb_index.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,310 @@
+<div class="newbb">
+
+<div class="jumbotron newbb-header">
+<h3>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php" title="<{$index_title}>">
+ <{$index_title}>
+ </a>
+</h3>
+
+<p><{$index_desc}></p>
+<div class="text-right"><{includeq file="db:newbb_index_menu.tpl"}></div>
+
+<div class="newbb-header-icons hidden-xs">
+<{if $viewer_level gt 1}>
+<div>
+ <strong><{$smarty.const._MD_TOPIC}>:</strong>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" title="<{$smarty.const._MD_TYPE_ADMIN}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_ADMIN}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" title="<{$smarty.const._MD_TYPE_PENDING}>" class="btn btn-xs btn-primary">
+ <{if $wait_new_topic}><span class="badge"><{$wait_new_topic}></span><{/if}> <{$smarty.const._MD_TYPE_PENDING}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" title="<{$smarty.const._MD_TYPE_DELETED}>" class="btn btn-xs btn-danger">
+ <{if $delete_topic}><span class="badge"><{$delete_topic}></span><{/if}> <{$smarty.const._MD_TYPE_DELETED}>
+ </a>
+</div>
+<div>
+ <strong><{$smarty.const._MD_POST2}>:</strong>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" title="<{$smarty.const._MD_TYPE_ADMIN}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_ADMIN}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" title="<{$smarty.const._MD_TYPE_PENDING}>" class="btn btn-xs btn-primary">
+ <{if $wait_new_post}>(<font color="red"><{$wait_new_post}></font>)<{/if}> <{$smarty.const._MD_TYPE_PENDING}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" title="<{$smarty.const._MD_TYPE_DELETED}>" class="btn btn-xs btn-primary">
+ <{if $delete_post}>(<font color="red"><{$delete_post}></font>)<{/if}> <{$smarty.const._MD_TYPE_DELETED}>
+ </a>
+
+ <{if $report_post}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php" title="<{$report_post}>" class="btn btn-xs btn-primary">
+ <{$report_post}>
+ </a>
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" title="<{$smarty.const._MD_TYPE_SUSPEND}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_SUSPEND}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" title="<{$smarty.const._MD_ADMINCP}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_ADMINCP}>
+ </a>
+</div>
+<{/if}>
+</div><!-- .newbb-header-icons -->
+</div><!-- .newbb-header -->
+
+<div class="panel-group xoops-newbb-category-list" id="accordion">
+<{foreachq item=category from=$categories}><!-- Forum categories -->
+ <div class="panel panel-default mb10">
+ <div class="panel-heading">
+ <h4 class="panel-title xoops-mewbb-forum-title">
+ <{if $category.forums}>
+ <a data-toggle="collapse" data-parent="#accordion" href="#<{$category.cat_element_id}>" title="<{$smarty.const.THEME_NEWBB_TOPIC}>">
+ <span class="glyphicon glyphicon-plus-sign"></span>
+ </a>
+ <{/if}>
+ <{if $category.cat_image}>
+ <img src="<{$category.cat_image}>" alt="<{$category.cat_title}>">
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" title="<{$category.cat_title}>">
+ <{$category.cat_title}>
+ </a>
+
+ <{if $category.cat_sponsor}>
+ <a href="<{$category.cat_sponsor.link}>" title="<{$smarty.const.THEME_FORUM_SPONSORBY}> <{$category.cat_sponsor.title}>" target="_blank" class="pull-right btn btn-xs btn-success">
+ <{$category.cat_sponsor.title}>
+ </a>
+ <{/if}>
+
+ <{if $category.cat_description}>
+ <a href="#forum-desc-<{$category.cat_element_id}>" title="<{$smarty.const.THEME_FORUM_DESCRIPTION}>" data-toggle="modal" data-target="#forum-desc-<{$category.cat_element_id}>" class="btn btn-xs btn-info pull-right">
+ <span class="glyphicon glyphicon-info-sign"></span>
+ </a>
+ <{/if}>
+ </h4>
+<{if $category.cat_description}>
+<div class="modal fade" id="forum-desc-<{$category.cat_element_id}>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="myModalLabel"><{$category.cat_title}></h4>
+ </div>
+ <div class="modal-body">
+ <p><{$category.cat_description}></p>
+ </div>
+ <div class="modal-footer">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" title="<{$smarty.const.THEME_GOTOTHEFORUM}>" class="btn btn-default">
+ <{$smarty.const.THEME_GOTOTHEFORUM}>
+ </a>
+ </div>
+ </div>
+ </div>
+</div>
+<{/if}>
+ </div><!-- .panel-heading -->
+
+<div id="<{$category.cat_element_id}>" class="panel-collapse collapse <{if $subforum_display == 'expand'}>in<{/if}>">
+ <div class="panel-body">
+ <{if $category.forums}>
+ <div class="row hidden-xs">
+ <{if $subforum_display == "expand"}>
+ <div class="col-sm-6 col-md-6"><strong><{$smarty.const._MD_FORUM}></strong></div>
+ <{else}>
+ <div class="col-sm-6 col-md-6"><strong><{$smarty.const._MD_FORUM}></strong></div>
+ <{/if}>
+ <div class="col-sm-1 col-md-1"><strong><{$smarty.const._MD_TOPICS}></strong></div>
+ <div class="col-sm-1 col-md-1"><strong><{$smarty.const._MD_POSTS}></strong></div>
+ <div class="col-sm-4 col-md-4"><strong><{$smarty.const._MD_LASTPOST}></strong></div>
+ </div>
+ <{/if}>
+ <{foreachq item=forum from=$category.forums}>
+ <div class="row xoops-newbb-list-foruns mb10">
+ <div class="col-sm-6 col-md-6">
+ <{if $forum.subforum}>
+ <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+ <{$forum.forum_folder}>
+ </div>
+ <{else}>
+ <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+ <{$forum.forum_folder}>
+ </div>
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>" title="<{$forum.forum_name}>">
+ <{$forum.forum_name}>
+ </a>
+
+ <{if $rss_enable}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed" class="pull-right btn btn-xs btn-warning">
+ RSS
+ </a>
+ <{/if}>
+ <!-- Forum description -->
+ <{if $forum.forum_desc != ""}>
+ <button class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#forumDesc-<{$forum.forum_id}>"><span class="glyphicon glyphicon-info-sign"></span></button>
+
+ <div class="modal fade" id="forumDesc-<{$forum.forum_id}>" tabindex="-1" role="dialog" aria-labelledby="ForumDescription" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="ForumDescription"><{$smarty.const.THEME_FORUM_DESC}>: <{$category.cat_title}> - <{$forum.forum_name}></h4>
+ </div>
+ <div class="modal-body">
+ <{$forum.forum_desc}>
+ </div>
+ <div class="modal-footer">
+ <{if $forum.forum_moderators}>
+ <div class="pull-left"><span class="label label-info"><{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}></span></div>
+ <{/if}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" class="btn btn-default" title="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>">
+ <{$smarty.const.THEME_GOTOTHEFORUM}>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <{/if}>
+ <!-- End forum description-->
+ </div>
+
+ <div class="col-sm-1 col-md-1 text-center hidden-xs">
+ <{if $stats[$forum.forum_id].topic.day}>
+ <strong><{$stats[$forum.forum_id].topic.day}></strong>/
+ <{/if}>
+ <{$forum.forum_topics}>
+ </div>
+
+ <div class="col-sm-1 col-md-1 text-center hidden-xs">
+ <{if $stats[$forum.forum_id].post.day}>
+ <strong><{$stats[$forum.forum_id].post.day}></strong>/
+ <{/if}>
+ <{$forum.forum_posts}>
+ </div>
+
+ <div class="col-sm-4 col-md-4 hidden-xs">
+ <{if $forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
+ <{$forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_icon}>
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+
+ <{if $forum.subforum}>
+ <{$smarty.const._MD_SUBFORUMS}><{$img_subforum}>
+ <{foreachq item=subforum from=$forum.subforum}>
+ [<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
+ <{/foreach}>
+ <{/if}>
+ </div>
+ </div>
+ <{/foreach}>
+ </div><!-- .panel-body -->
+ </div><!-- .panel-collapse .collapse -->
+ </div><!-- .panel .panel-default -->
+<{/foreach}><!-- End Forum Categories -->
+</div><!-- .panel-group -->
+
+<div class="row mb10">
+ <div class="col-md-12">
+ <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}>
+ <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-md-8 mb10">
+ <form class="input-group" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search" role="search">
+ <input name="term" id="term" type="text" class="form-control" placeholder="<{$smarty.const.THEME_NEWBB_SEARCH_FORUM}>">
+ <input type="hidden" name="forum" id="forum" value="all">
+ <input type="hidden" name="sortby" id="sortby" value="p.post_time desc">
+ <input type="hidden" name="searchin" id="searchin" value="both">
+
+ <span class="input-group-btn">
+ <button class="btn btn-primary" type="submit" id="submit"><{$smarty.const._MD_SEARCH}></button>
+ </span>
+ </form>
+ </div>
+ <div class="col-md-4">
+ <a class="btn btn-primary btn-block" href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>
+ </div>
+</div>
+
+<{if $currenttime}>
+<div class="row">
+ <div class="col-lg-12"><h3 class="nompl"><{$online.statistik}> <{$smarty.const._MD_NEWBB_STATS}></h3></div>
+ <div class="col-sm-6 col-md-6">
+ <ul class="list-unstyled lw30">
+ <li><{$currenttime}></li>
+ <li><{$lastvisit}></li>
+
+ <li><{$smarty.const._MD_TOTALTOPICSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>">
+ <{$stats[0].topic.total}>
+ </a></li>
+
+ <li><{$smarty.const._MD_TOTALPOSTSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>">
+ <{$stats[0].post.total}>
+ </a></li>
+ <{if $stats[0].digest.total}>
+ <li><{$smarty.const._MD_TOTALDIGESTSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>">
+ <{$stats[0].digest.total}>
+ </a></li>
+ <{/if}>
+
+ <li><a class="btn btn-xs btn-primary" href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>">
+ <{$smarty.const._MD_VIEW_NEWPOSTS}>
+ </a></li>
+ </ul>
+ </div>
+
+ <div class="col-sm-6 col-md-6">
+ <ul class="list-unstyled lw30">
+ <{if $userstats}>
+ <li><{*$userstats.lastvisit*}>
+ <{$userstats.lastpost}></li>
+ <{/if}>
+
+ <li><{$smarty.const._MD_TODAYTOPICSC}> <{$stats[0].topic.day|default:0}></li>
+ <li><{$smarty.const._MD_TODAYPOSTSC}> <{$stats[0].post.day|default:0}></li>
+
+ <{if $userstats}>
+ <li><{$userstats.topics}> | <{$userstats.posts}></li>
+ <{if $userstats.digests}>
+ <li><{$userstats.digests}></li>
+ <{/if}>
+ <{/if}>
+ </ul>
+ </div>
+
+</div>
+<{/if}>
+
+<{if $online}>
+ <{includeq file="db:newbb_online.tpl"}>
+<{/if}>
+
+<ul class="list-unstyled">
+<li><a title="NewBB" href="http://www.simple-xoops.de" class="btn btn-xs btn-success">NewBB Version <{$version/100}></a></li>
+<{if $rss_button}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED">
+ <{$rss_button}>
+ </a>
+<{/if}>
+</ul>
+
+<{includeq file='db:newbb_notification_select.tpl'}>
+
+</div><!-- .xoops-newbb -->
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/index.html 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/news_block_top.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/news_block_top.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/blocks/news_block_top.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,14 @@
+<ul class="list-unstyled">
+ <{foreach item=news from=$block.stories}>
+ <li>
+ <{if $block.sort=='counter'}>
+ [<{$news.hits}>]
+ <{elseif $block.sort=='published'}>
+ [<{$news.date}>]
+ <{else}>
+ [<{$news.rating}>]
+ <{/if}>
+ <a title="<{$news.title}>" href="<{$xoops_url}>/modules/news/article.php?storyid=<{$news.id}>"><{$news.title}></a>
+ </li>
+ <{/foreach}>
+</ul>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/index.html 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_article.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_article.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_article.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,89 @@
+<{include file="db:news_item.tpl" story=$story}>
+
+<{if $attached_files_count>0}>
+ <{$lang_attached_files}>
+ <{foreach item=onefile from=$attached_files}>
+ <a href="<{$onefile.visitlink}>" target="_blank"><{$onefile.file_realname}></a>
+ <{/foreach}>
+<{/if}>
+
+<div class="row xoops-news-navigation">
+ <{if $pagenav}><{$smarty.const._NW_PAGE}><{$pagenav}><{/if}>
+ <{if $nav_links}>
+<div class="col-md-6 alignleft">
+ <{if $previous_story_id != -1}>
+ <a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$previous_story_id}>" title="<{$previous_story_title}>">
+ <span class="glyphicon glyphicon-circle-arrow-left"></span> <{$lang_previous_story}>
+ </a>
+ <{/if}>
+</div>
+
+<div class="col-md-6 alignright">
+ <{if $next_story_id!= -1}>
+ <a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$next_story_id}>" title="<{$next_story_title}>">
+ <{$lang_next_story}> <span class="glyphicon glyphicon-circle-arrow-right"></span>
+ </a>
+ <{/if}>
+</div>
+ <{/if}>
+</div><!-- .row -->
+
+<div class="xoops-news-icons aligncenter">
+ <{if $showicons == true}>
+ <a href="<{$xoops_url}>/modules/news/print.php?storyid=<{$story.id}>" title="<{$lang_printerpage}>">
+ <span class="glyphicon glyphicon-print"></span>
+ </a>
+
+ <a target="_top" href="<{$mail_link}>" title="<{$lang_sendstory}>">
+ <span class="glyphicon glyphicon-envelope"></span>
+ </a>
+
+ <a target="_blank" href="<{$xoops_url}>/modules/news/makepdf.php?storyid=<{$story.id}>" title="<{$lang_pdfstory}>">
+ <span class="glyphicon glyphicon-file"></span>
+ </a>
+ <{/if}>
+
+ <{if $xoops_isadmin}>
+ <a href="<{$xoops_url}>/modules/news/submit.php?op=edit&storyid=<{$story.id}>" title="Edit">
+ <span class="glyphicon glyphicon-edit"></span>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/news/admin/index.php?op=delete&storyid=<{$story.id}>" title="Delete">
+ <span class="glyphicon glyphicon-trash"></span>
+ </a>
+ <{/if}>
+</div>
+
+<{if $tags}>
+ <{include file="db:tag_bar.tpl"}>
+<{/if}>
+
+<{if $showsummary == true && $summary_count>0}>
+<{$lang_other_story}>
+ <{foreach item=onesummary from=$summary}>
+ <{$onesummary.story_published}>
+ <a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$onesummary.story_id}>" title="<{$onesummary.htmltitle}>">
+ <{$onesummary.story_title}>
+ </a>
+ <{/foreach}>
+<{/if}>
+
+<{if $share == true}>
+ <div class='shareaholic-canvas' data-app='share_buttons' data-app-id='482507'></div>
+<{/if}>
+
+<div class="comments-nav">
+<{$commentsnav}>
+</div>
+
+<{$lang_notice}>
+
+<{if $comment_mode == "flat"}>
+ <{include file="db:system_comments_flat.html"}>
+<{elseif $comment_mode == "thread"}>
+ <{include file="db:system_comments_thread.html"}>
+<{elseif $comment_mode == "nest"}>
+ <{include file="db:system_comments_nest.html"}>
+<{/if}>
+
+<{include file='db:system_notification_select.html'}>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_index.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_index.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_index.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,45 @@
+<div class="news-home">
+ <{if $topic_rssfeed_link != ""}>
+ <{$topic_rssfeed_link}>
+ <{/if}>
+
+ <{if $displaynav == true}>
+ <div class="text-center">
+ <form name="form1" action="<{$xoops_url}>/modules/news/index.php" method="get">
+ <{$topic_select}> <select name="storynum"><{$storynum_options}></select> <input type="submit" value="<{$lang_go}>">
+ </form>
+ </div>
+ <{/if}>
+
+ <{if $topic_description != ""}>
+ <{$topic_description}>
+ <{/if}>
+
+ <div class="row">
+ <{section name=i loop=$columns}>
+ <{foreach item=story from=$columns[i]}>
+ <div class="col-md-6 home-news-loop">
+ <{if $story.picture != ""}>
+ <div class="home-thumbnails hidden-xs">
+ <img src="<{$story.picture}>" alt="<{$story.pictureinfo}>" class="img-responsive">
+ </div><!-- .home-thumbnails -->
+ <{else}>
+ <div class="home-thumbnails hidden-xs">
+ <img src="<{$xoops_imageurl}>images/tdm-no-image.jpg" alt="" class="img-responsive">
+ </div><!-- .home-thumbnails -->
+ <{/if}>
+ <h3 class="xoops-default-title one-line-title"><{$story.news_title|strip_tags}></h3>
+ <div class="excerpt-news"><{$story.text}></div>
+ <{$story.morelink}>
+ </div>
+ <{/foreach}>
+ <{/section}>
+ </div>
+
+ <div class="text-center generic-pagination">
+ <{$pagenav}>
+ </div>
+
+</div>
+
+<{include file='db:system_notification_select.html'}>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_item.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_item.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/themes/xbootstrap/modules/news/news_item.tpl 2014-09-28 13:38:38 UTC (rev 12801)
@@ -0,0 +1,44 @@
+<section role="main" class="news-item">
+ <article role="article">
+ <{if $story.picture != ""}>
+ <div class="news-header">
+ <{if $s...
[truncated message content] |
|
From: <be...@us...> - 2014-09-28 13:36:07
|
Revision: 12800
http://sourceforge.net/p/xoops/svn/12800
Author: beckmi
Date: 2014-09-28 13:35:54 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
replaced "dirname(__FILE__)" with "__DIR__"
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -31,4 +31,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-$path = dirname(dirname(dirname(dirname(__FILE__))));
+$path = dirname(dirname(dirname(__DIR__)));
include_once $path . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -203,4 +203,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -34,4 +34,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -52,4 +52,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,10 +20,10 @@
* @version $Id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$module = $module_handler->getByDirname(basename(dirname(__DIR__)));
$pathIcon32 = '../../' . $module->getInfo('icons32');
xoops_loadLanguage('modinfo', $module->dirname());
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -56,4 +56,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include 'header.php';
+include __DIR__ . '/header.php';
if (!empty($_POST)) {
// Info Processing
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,9 +20,7 @@
* @version $Id$
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
class contact extends XoopsObject
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include XOOPS_ROOT_PATH . "/modules/contact/class/contact.php";
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,8 +20,8 @@
* @version $Id$
*/
-include 'header.php';
-$xoopsOption['template_main'] = 'contact_index.html';
+include __DIR__ . '/header.php';
+$xoopsOption['template_main'] = 'contact_index.tpl';
//unset($_SESSION);
include XOOPS_ROOT_PATH . "/header.php";
@@ -44,7 +44,7 @@
|| ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
) {
// Verify entered code
-
+
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
$xoopsCaptcha = XoopsCaptcha::getInstance();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,9 +20,9 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-$moduleDirName = basename(dirname(__FILE__));
+$moduleDirName = basename(__DIR__);
$modversion['name'] = _MI_CONTACT_NAME;
$modversion['version'] = 1.81;
@@ -35,7 +35,7 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 1;
$modversion['image'] = "assets/images/contact_slogo.png";
-$modversion['dirname'] = basename(dirname(__FILE__));
+$modversion['dirname'] = $moduleDirName;
$modversion['onUpdate'] = 'include/functions_update.php';
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
@@ -46,8 +46,8 @@
$modversion['tables'][0] = "contact";
//about
-$modversion["module_status"] = "Beta 1";
-$modversion["release_date"] = "2014/04/23";
+$modversion["module_status"] = "Beta 2";
+$modversion["release_date"] = "2014/09/23";
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["author_website_url"] = "http://www.xoops.org/";
|
|
From: <luc...@us...> - 2014-09-23 20:08:00
|
Revision: 12799
http://sourceforge.net/p/xoops/svn/12799
Author: luciorota
Date: 2014-09-23 20:07:56 +0000 (Tue, 23 Sep 2014)
Log Message:
-----------
use screenshots field instead of screenshot, screentshot1, ... IN PROGRESS
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -730,12 +730,14 @@
$newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
$newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
$newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
+/*
$url = urldecode($myts->htmlSpecialChars($newDownload_array['url']));
$homepage = $myts->htmlSpecialChars($newDownload_array['homepage']);
$version = $myts->htmlSpecialChars($newDownload_array['version']);
$size = $myts->htmlSpecialChars($newDownload_array['size']);
$platform = $myts->htmlSpecialChars($newDownload_array['platform']);
$logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']); // IN PROGRESS
+*/
$newDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($newDownload_array['submitter']);
$newDownload_array['date_formatted'] = XoopsLocal::formatTimestamp($newDownload_array['date'], 'l');
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
@@ -746,9 +748,9 @@
// Autopublished Downloads
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('published', time(), ">"));
+ $criteria->add(new Criteria('published', time(), '>'));
$criteria->setSort('published');
- $criteria->setOrder("ASC");
+ $criteria->setOrder('ASC');
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$autopublishedDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
@@ -856,9 +858,9 @@
}
$batchFile = $batchFiles[$batchid];
- $savedFileName = iconv("UTF-8", "ASCII//TRANSLIT", $batchFile);
+ $savedFileName = iconv('UTF-8', "ASCII//TRANSLIT", $batchFile);
$savedFileName = preg_replace('!\s+!', '_', $savedFileName);
- $savedFileName = preg_replace("/[^a-zA-Z0-9\._-]/", "", $savedFileName);
+ $savedFileName = preg_replace('/[^a-zA-Z0-9\._-]/', '', $savedFileName);
$savedFileName = uniqid(time()) . '--' . $savedFileName;
if (!wfdownloads_copyFile($batchPath . '/' . $batchFile, $wfdownloads->getConfig('uploaddir') . '/' . $savedFileName)) {
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -375,7 +375,11 @@
}
$GLOBALS['xoopsDB']->query($sql);
echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} downloads into {$destination['downloads']}<br />";
+// IN PROGRESS
+// IN PROGRESS IMPORT AND UPDATE SCREENSHOTS
+// IN PROGRESS
+
//Import data into mirrors table
$sql = "INSERT INTO {$destination['mirrors']} (";
$sql .= " `lid`, `title`, `homeurl`, `location`, `continent`, `downurl`, `submit`, `date`, `uid`";
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -98,7 +98,7 @@
// Get common keys
$commonKeys = array_intersect($downloadKeys, $modificationKeys);
// Set not allowed keys
- $notAllowedKeys = array('lid', 'submitter', 'publisher', 'requestid', 'forumid', 'modifysubmitter', 'screenshots', 'paypalemail');
+ $notAllowedKeys = array('lid', 'submitter', 'publisher', 'requestid', 'forumid', 'modifysubmitter', 'paypalemail');
$i = 0;
$mcform->addElement(null, false, null, null);
@@ -156,6 +156,21 @@
//
if ($modificationContent != '') $modificationContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$modificationContent}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
break;
+ case 'screenshots':
+ $downloadScreenshots = $downloadContent;
+ $modificationScreenshots = $modificationContent;
+ unset($downloadContent);
+ unset($modificationContent);
+ $downloadContent = '';
+ $modificationContent = '';
+ foreach ($downloadScreenshots as $key => $value) {
+ $downloadScreenshot = $downloadScreenshots[$key];
+ $modificationScreenshot = $modificationScreenshots[$key];
+ if ($downloadScreenshot != '') $downloadContent += "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$downloadScreenshot}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ //
+ if ($modificationContent != '') $modificationContent += "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$modificationScreenshot}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ }
+ break;
case 'publisher':
$downloadContent = XoopsUserUtility::getUnameFromId($downloadContent);
//
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -81,6 +81,7 @@
// $this->initVar('ipaddress', XOBJ_DTYPE_TXTBOX, '');
// $this->initVar('notifypub', XOBJ_DTYPE_INT, 0);
// added 3.23
+ $this->initVar('screenshots', XOBJ_DTYPE_ARRAY, array()); // IN PROGRESS
$this->initVar('dohtml', XOBJ_DTYPE_INT, false); // boolean
$this->initVar('dosmiley', XOBJ_DTYPE_INT, true); // boolean
$this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
@@ -156,6 +157,7 @@
d.updated = m.updated,
d.summary = m.summary,
d.description = m.description,
+ d.screenshots = m.screenshots,
d.dohtml = m.dohtml,
d.dosmiley = m.dosmiley,
d.doxcode = m.doxcode,
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -191,6 +191,7 @@
// ???
"formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true),
// added 3.23
+ "screenshots" => array("Type" => "text NOT NULL", "Default" => true),
"dohtml" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
"dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
"doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
@@ -361,7 +362,7 @@
);
echo "<br /><span style='font-weight: bold;'>Checking Download table</span><br />";
$download_handler = xoops_getmodulehandler('download', 'wfdownloads');
- $download_table = new WfdownloadsTable("wfdownloads_downloads");
+ $download_table = new WfdownloadsTable('wfdownloads_downloads');
$fields = get_table_info($download_handler->table, $download_fields);
// check for renamed fields
rename_fields($download_table, $renamed_fields, $fields, $download_fields);
@@ -425,7 +426,7 @@
);
echo "<br /><span style='font-weight: bold;'>Checking Modified Downloads table</span><br />";
$mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
- $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $mod_table = new WfdownloadsTable('wfdownloads_mod');
$fields = get_table_info($mod_handler->table, $mod_fields);
rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
update_table($mod_fields, $fields, $mod_table);
@@ -455,7 +456,7 @@
);
echo "<br /><span style='font-weight: bold;'>Checking Category table</span><br />";
$cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
- $cat_table = new WfdownloadsTable("wfdownloads_cat");
+ $cat_table = new WfdownloadsTable('wfdownloads_cat');
$fields = get_table_info($cat_handler->table, $cat_fields);
update_table($cat_fields, $fields, $cat_table);
if ($dbupdater->updateTable($cat_table)) {
@@ -475,7 +476,7 @@
);
echo "<br /><span style='font-weight: bold;'>Checking Broken Report table</span><br />";
$broken_handler = xoops_getmodulehandler('report', 'wfdownloads');
- $broken_table = new WfdownloadsTable("wfdownloads_broken");
+ $broken_table = new WfdownloadsTable('wfdownloads_broken');
$fields = get_table_info($broken_handler->table, $broken_fields);
update_table($broken_fields, $fields, $broken_table);
if ($dbupdater->updateTable($broken_table)) {
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-23 20:07:56 UTC (rev 12799)
@@ -344,6 +344,7 @@
description text NOT NULL,
modifysubmitter int(11) NOT NULL default '0',
requestdate int(11) NOT NULL default '0',
+ screenshots text NOT NULL,
dohtml tinyint(1) NOT NULL default '0',
dosmiley tinyint(1) NOT NULL default '1',
doxcode tinyint(1) NOT NULL default '1',
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php 2014-09-22 20:06:12 UTC (rev 12798)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php 2014-09-23 20:07:56 UTC (rev 12799)
@@ -357,7 +357,7 @@
$owner_groups,
$groups,
'new'
- ); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
+ ); // 'new' causes xoops token check to be skipped, since Wfdownloads should be doing that
if (!$owner) {
$id_req = $entries[$fid][0];
$downloadObj->setVar('formulize_idreq', $id_req);
@@ -445,12 +445,12 @@
$offline = (isset($_POST['offline']) && $_POST['offline'] == 1) ? true : false;
$downloadObj->setVar('offline', $offline);
$downloadObj->setVar('date', time());
-
+/*
$screenshot1 = '';
$screenshot2 = '';
$screenshot3 = '';
$screenshot4 = '';
-
+*/
if ($lid == 0) {
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$downloadObj->setVar('notifypub', $notifypub);
|
|
From: <luc...@us...> - 2014-09-22 20:06:23
|
Revision: 12798
http://sourceforge.net/p/xoops/svn/12798
Author: luciorota
Date: 2014-09-22 20:06:12 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
convert to Unix file format 'cause this is the standard for Xoops files
standardize var names
minor bug fixes
add method to protocol handler to create a protocol using only 1 line of code (IN PROGRESS)
fixed db bug
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -70,6 +70,6 @@
}
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -139,8 +139,8 @@
break;
case 'run_bmh':
- require_once('bmh_callback_database.php');
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
+ require_once 'bmh_callback_database.php' ;
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php';
$accountCriteria = new CriteriaCompo();
$accountCriteria->add(new Criteria('accounts_use_bmh', '1'));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -232,7 +232,7 @@
$subscr_id = $_REQUEST['subscr_id'];
$catsubscrObj_cat = $xnewsletter->getHandler('cat')->get($_REQUEST['cat_id']);
if ($catsubscrObj_cat->getVar('cat_mailinglist') > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $catsubscrObj_cat->getVar('cat_mailinglist'));
}
redirect_header('catsubscr.php', 3, _AM_XNEWSLETTER_FORMDELOK);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -60,9 +60,9 @@
$importObjs = $xnewsletter->getHandler('import')->getAll($importCriteria);
if ($importsCount > 0) {
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $action = $_SERVER["REQUEST_URI"];
+ $action = $_SERVER['REQUEST_URI'];
$unique_id = uniqid(mt_rand());
$form = "<br/>";
$form .= "<form name=\"form_import_{$unique_id}\" id=\"form_import_{$unique_id}\" action=\"{$currentFile}\" method=\"post\" enctype=\"multipart/form-data\">";
@@ -330,7 +330,7 @@
unset($cat_mls);
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
@@ -396,7 +396,7 @@
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
- require_once($pluginFile);
+ require_once $pluginFile;
$function = 'xnewsletter_plugin_getdata_' . $plugin;
if (!function_exists($function)) {
@@ -450,7 +450,7 @@
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
- require_once($pluginFile);
+ require_once $pluginFile;
$function = "xnewsletter_plugin_getform_{$plugin}";
if (!function_exists($function)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -346,7 +346,7 @@
}
// upload attachments
$uploadedFiles = array();
- include_once XOOPS_ROOT_PATH . "/class/uploader.php";
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$uploaddir = XOOPS_UPLOAD_PATH . $xnewsletter->getConfig('xn_attachment_path') . $letter_id . '/';
// check upload_dir
if (!is_dir($uploaddir)) {
@@ -389,11 +389,6 @@
//
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
- // create item in protocol
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $protocolObj->setVar('protocol_letter_id', $letter_id);
- $protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_success', true);
$action = xnewsletterRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
switch ($action) {
case _XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW:
@@ -409,6 +404,13 @@
$redirectUrl = '?op=list_letters';
break;
}
+ // create item in protocol
+ $xnewsletter->getHandler('protocol')->protocol($letter_id, 0, _AM_XNEWSLETTER_LETTER_ACTION_SAVED, _XNEWSLETTER_PROTOCOL_STATUS_SAVED, array(), true);
+/*
+ $protocolObj = $xnewsletter->getHandler('protocol')->create();
+ $protocolObj->setVar('protocol_letter_id', $letter_id);
+ $protocolObj->setVar('protocol_subscriber_id', 0);
+ $protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED); // old style
$protocolObj->setVar('protocol_status_str_id', _XNEWSLETTER_PROTOCOL_STATUS_SAVED); // new from v1.3
$protocolObj->setVar('protocol_status_vars', array()); // new from v1.3
@@ -421,6 +423,8 @@
} else {
echo 'Error create protocol: ' . $protocolObj->getHtmlErrors();
}
+*/
+ redirect_header($redirectUrl, 3, _AM_XNEWSLETTER_FORMOK);
} else {
echo 'Error create letter: ' . $letterObj->getHtmlErrors();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -103,15 +103,10 @@
// IN PROGRESS
$protocol_status .= "...";
}
- echo "
- <td>
- <a href='?op=list_letter&letter_id=0'>" . $protocol_status . "</a>
- </td>
- <td>{$protocol_created_formatted}</td>
- <td class='center'>
- <a href='?op=list_letter&letter_id=0'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a>
- </td>
- </tr>";
+ echo "<td><a href='?op=list_letter&letter_id=0'>{$protocol_status}</a></td>";
+ echo "<td>{$protocol_created_formatted}</td>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id=0'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a></td>";
+ echo "</tr>";
foreach (array_keys($letterObjs) as $i) {
$protocolCriteria = new CriteriaCompo();
@@ -145,16 +140,10 @@
if ($protocolCount > 2) {
$protocol_status .= "...";
}
- echo "
- <td class='center'>
- <a href='?op=list_letter&letter_id=" . $i . "'>" . $protocol_status . "</a>
- </td>
- <td class='center'>" . $protocol_created . "</td>
- <td class='center'>
- <a href='?op=list_letter&letter_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='"
- . _AM_XNEWSLETTER_DETAILS . "' /></a>
- </td>
- </tr>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id={$i}'>{$protocol_status}</a></td>";
+ echo "<td class='center'>{$protocol_created}</td>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id={$i}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a></td>";
+ echo "</tr>";
}
}
}
@@ -224,11 +213,7 @@
echo "<td>" . $success . "</td>";
echo "<td>" . XoopsUser::getUnameFromId($protocolObj->getVar('protocol_submitter'), 'S') . "</td>";
echo "<td>" . formatTimeStamp($protocolObj->getVar('protocol_created'), 'L') . "</td>";
-
- echo "
- <td>
- <a href='?op=delete_protocol&protocol_id=" . $protocol_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
- </td>";
+ echo "<td><a href='?op=delete_protocol&protocol_id={$protocol_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a></td>";
echo "</tr>";
}
}
@@ -238,54 +223,6 @@
echo "<br />";
break;
- case 'new_protocol':
- echo $protocolAdmin->addNavigation($currentFile);
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
- echo $protocolAdmin->renderButton();
- //
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
- case 'save_protocol':
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['protocol_id'])) {
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
- } else {
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- }
-
- $protocolObj->setVar('protocol_letter_id', $_REQUEST['protocol_letter_id']);
- $protocolObj->setVar('protocol_subscriber_id', $_REQUEST['protocol_subscriber_id']);
-// IN PROGRESS
- $protocolObj->setVar('protocol_status', $_REQUEST['protocol_status']);
- $protocolObj->setVar('protocol_success', $_REQUEST['protocol_success']);
- $protocolObj->setVar('protocol_submitter', $_REQUEST['protocol_submitter']);
- $protocolObj->setVar('protocol_created', strtotime($_REQUEST['protocol_created']));
-
- if ($xnewsletter->getHandler('protocol')->insert($protocolObj)) {
- redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
- }
-
- echo $protocolObj->getHtmlErrors();
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
- case 'edit_protocol':
- echo $protocolAdmin->addNavigation($currentFile);
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_NEWPROTOCOL, '?op=new_protocol', 'add');
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
- echo $protocolAdmin->renderButton();
- //
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
case 'delete_protocol':
$protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -92,7 +92,7 @@
$pluginName = str_replace('.php', '', $file);
$pluginFile = XNEWSLETTER_ROOT_PATH . '/plugins/' . $pluginName . '.php';
if (file_exists($pluginFile)) {
- require_once($pluginFile);
+ require_once $pluginFile;
$function = 'xnewsletter_plugin_getinfo_' . $pluginName;
$arrPlugin = $function();
$show_plugin = $this->tableExists($arrPlugin['tables'][0]);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -78,52 +78,6 @@
{
return xnewsletter_sprintf($this->protocol_status_strs[$this->getVar('protocol_status_str_id')], $this->getVar('protocol_status_vars'));
}
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_PROTOCOL_ADD) : sprintf(_AM_XNEWSLETTER_PROTOCOL_EDIT);
-
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $letterCriteria = new CriteriaCompo();
- $letterCriteria->setSort('letter_id');
- $letterCriteria->setOrder('DESC');
- $letter_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_LETTER_ID, 'protocol_letter_id', $this->getVar('protocol_letter_id'));
- $letter_select->addOptionArray($this->xnewsletter->getHandler('letter')->getList($letterCriteria));
- $form->addElement($letter_select, true);
-
- $subscrCriteria = new CriteriaCompo();
- $subscrCriteria->setSort('subscr_id');
- $subscrCriteria->setOrder('ASC');
- $subscr_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_SUBSCRIBER_ID, "protocol_subscriber_id", $this->getVar("protocol_subscriber_id"));
- $subscr_select->addOptionArray($this->xnewsletter->getHandler('subscr')->getList($subscrCriteria));
- $form->addElement($subscr_select, true);
-
-// IN PROGRESS
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_PROTOCOL_STATUS, "protocol_status", 50, 200, $this->getVar("protocol_status")), false);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_PROTOCOL_SUCCESS, "protocol_success", 50, 255, $this->getVar("protocol_success")), false);
-
- $form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_PROTOCOL_SUBMITTER, "protocol_submitter", false, $this->getVar("protocol_submitter"), 1, false), true);
-
- $form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_PROTOCOL_CREATED, "protocol_created", "", $this->getVar("protocol_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_protocol"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -321,7 +321,7 @@
if ($this->xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, $force)) {
// handle mailinglists
if ($cat_mailinglist != 0) {
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php');
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -32,11 +32,13 @@
echo '<br/>start cron job<br/>';
-require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/task.inc.php';
+include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/task.inc.php';
// execute all pending tasks
$result_exec = xnewsletter_executeTasks($xnewsletter->getConfig('xn_send_in_packages'), 0);
if ($result_exec != '') {
+ $newsletter->getHandler('protocol')->protocol(0, 0, 'Cron: ' . $result_exec, _XNEWSLETTER_PROTOCOL_STATUS_CRON, array('%result_exec' => $result_exec), true);
+/*
// you can enable the block for creating protocol for cron
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
@@ -54,5 +56,6 @@
} else {
echo $protocolObj->getHtmlErrors();
}
+*/
}
echo "<br/>result cron: {$result_exec}";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -33,8 +33,6 @@
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
include_once XOOPS_ROOT_PATH . '/include/functions.php';
-global $xoopsConfig;
-
//Load languages
xoops_loadLanguage('admin', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -58,6 +58,6 @@
// Load Xoops handlers
$module_handler = xoops_gethandler('module');
$member_handler = xoops_gethandler('member');
-$notification_handler = &xoops_gethandler('notification');
+$notification_handler = xoops_gethandler('notification');
$gperm_handler = xoops_gethandler('groupperm');
$config_handler = xoops_gethandler('config');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -455,15 +455,13 @@
*/
function xnewsletter_emailSize($letter_id = 0)
{
- require_once XNEWSLETTER_ROOT_PATH . '/class/class.xnewslettermailer.php';
+ include_once XNEWSLETTER_ROOT_PATH . '/class/class.xnewslettermailer.php';
- global $xoopsTpl;
$xnewsletter = XnewsletterXnewsletter::getInstance();
- if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . "/class/template.php");
- $xoopsTpl = new XoopsTpl();
- }
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+
// get template path
$template_path = XNEWSLETTER_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/templates/';
if (!is_dir($template_path)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -38,7 +38,6 @@
*/
function subscribingMLHandler($type, $subscr_id, $mailinglist_id)
{
- global $xoopsConfig;
$xnewsletter = XnewsletterXnewsletter::getInstance();
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -59,9 +58,9 @@
echo "<br />action_code: {$action_code}";
echo "<br />";
*/
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.phpmailer.php");
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.pop3.php");
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.smtp.php");
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php';
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.pop3.php';
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.smtp.php';
//get emails of subscribers
$recipients = array();
@@ -89,11 +88,11 @@
$xoopsMailer->setHTML(false);
//$xoopsMailer->setTemplate('activate.tpl');
$xoopsMailer->setToEmails($recipient["address"]);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
//$xoopsMailer->setSubject($subject);
$xoopsMailer->setBody($action_code);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -28,8 +28,8 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-include_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/common.php");
-@include_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/language/" . $xoopsConfig['language'] . "/admin.php");
+include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/common.php';
+@include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
define('INDEX_FILE_PATH', XOOPS_UPLOAD_PATH . "/index.html");
define('BLANK_FILE_PATH', XOOPS_UPLOAD_PATH . "/blank.gif");
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -27,23 +27,23 @@
* ****************************************************************************
*
* @param $xoopsModule
- * @param null $oldversion
+ * @param null $previousVersion
*
* @return bool
*/
-function xoops_module_update_xnewsletter(&$xoopsModule, $oldversion = null)
+function xoops_module_update_xnewsletter(&$xoopsModule, $previousVersion = null)
{
- if ($oldversion == 100) {
+ if ($previousVersion == 100) {
xoops_module_update_xnewsletter_101();
}
- if ($oldversion < 103) {
+ if ($previousVersion < 103) {
xoops_module_update_xnewsletter_103();
}
- if ($oldversion < 104) {
+ if ($previousVersion < 104) {
xoops_module_update_xnewsletter_104();
}
- if ($oldversion < 130) {
+ if ($previousVersion < 130) {
xoops_module_update_xnewsletter_130();
}
@@ -60,7 +60,7 @@
$dirname = basename(dirname(__DIR__));
rename($path, strtolower($dirname));
// update module dirname field in database to lowercase
- $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("modules")}` SET `dirname` = '" . strtolower($dirname) . "'";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('modules')}` SET `dirname` = '" . strtolower($dirname) . "'";
$sql .= " WHERE LOWER(`dirname`) = '" . strtolower($dirname) . "';";
if (!$GLOBALS['xoopsDB']->queryF($sql)) {
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": UPDATE 'modules' SET `dirname` = '" . strtolower($dirname) . "'";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -45,7 +45,7 @@
*/
include_once dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
-require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php');
+require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php' ;
define('VERBOSE_QUIET', 0); // means no output at all
define('VERBOSE_SIMPLE', 1); // means only output simple report
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -173,7 +173,7 @@
$xnewsletter = XnewsletterXnewsletter::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
}
// get template path
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -510,11 +510,6 @@
//
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
- // create item in protocol
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $protocolObj->setVar('protocol_letter_id', $letter_id);
- $protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_success', true);
$action = xnewsletterRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
switch ($action) {
case _XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW :
@@ -530,6 +525,13 @@
$redirectUrl = '?op=list_letters';
break;
}
+ // create item in protocol
+ $xnewsletter->getHandler('protocol')->protocol($letter_id, 0, _AM_XNEWSLETTER_LETTER_ACTION_SAVED, _XNEWSLETTER_PROTOCOL_STATUS_SAVED, array(), true);
+/*
+ $protocolObj = $xnewsletter->getHandler('protocol')->create();
+ $protocolObj->setVar('protocol_letter_id', $letter_id);
+ $protocolObj->setVar('protocol_subscriber_id', 0);
+ $protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED); // ols style
$protocolObj->setVar('protocol_status_str_id', _XNEWSLETTER_PROTOCOL_STATUS_SAVED); // new from v1.3
$protocolObj->setVar('protocol_status_vars', array()); // new from v1.3
@@ -542,6 +544,8 @@
} else {
echo 'Error create protocol: ' . $protocolObj->getHtmlErrors();
}
+*/
+ redirect_header($redirectUrl, 3, _AM_XNEWSLETTER_FORMOK);
} else {
echo 'Error create letter: ' . $letterObj->getHtmlErrors();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -136,7 +136,7 @@
$title = _AM_XNEWSLETTER_IMPORT_CSV_OPT;
- include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$form = new XoopsThemeForm($title, 'form_add_csv', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -133,7 +133,7 @@
$title = _AM_XNEWSLETTER_IMPORT_XOOPSUSER;
- include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$form = new XoopsThemeForm($title, 'form_add_xoopsuser', 'import.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -96,7 +96,7 @@
redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERCONTENT);
}
-$xoopsTpl->assign('xoopsConfig', $xoopsConfig);
+$xoopsTpl->assign('xoopsConfig', $GLOBALS['xoopsConfig']);
$xoopsTpl->assign('xoops_meta_keywords', $xoops_meta_keywords);
$xoopsTpl->assign('xoops_meta_description', $xoops_meta_description);
@@ -110,18 +110,18 @@
*/
function xnewsletter_printPage($content)
{
- global $xoopsConfig, $xoops_meta_keywords, $xoops_meta_description;
+ global $xoops_meta_keywords, $xoops_meta_description;
$myts =& MyTextSanitizer::getInstance();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo _LANGCODE; ?>" lang="<?php echo _LANGCODE; ?>">
<?php
echo "<head>\n";
- echo "<title>{$xoopsConfig['sitename']}</title>\n";
+ echo "<title>" . $GLOBALS['xoopsConfig']['sitename'] . "</title>\n";
echo "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n";
- echo "<meta name='AUTHOR' content='{$xoopsConfig['sitename']}' />\n";
+ echo "<meta name='AUTHOR' content='" . $GLOBALS['xoopsConfig']['sitename'] . "' />\n";
echo "<meta name='keywords' content='{$xoops_meta_keywords}' />\n";
- echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . " by {$xoopsConfig['sitename']}' />\n";
+ echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . " by " . $GLOBALS['xoopsConfig']['sitename'] . "' />\n";
echo "<meta name='DESCRIPTION' content='{$xoops_meta_description}' />\n";
echo "<meta name='GENERATOR' content='XOOPS' />\n";
echo "<!-- Sheet Css -->\n";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -245,11 +245,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('activate.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex'));
@@ -513,11 +513,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate(($saveType == 'update') ? 'update.tpl' : 'activate.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex') != '' ? $subscrObj->getVar('subscr_sex') : $subscr_sex);
@@ -641,7 +641,7 @@
}
// handle mailinglists
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
@@ -654,7 +654,7 @@
if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
// handle mailinglists
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php');
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
@@ -704,11 +704,11 @@
$xoopsMailer->setHTML();
$xoopsMailer->setTemplate('info_change.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscr_sex);
@@ -862,11 +862,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('delete.tpl');
$xoopsMailer->setToEmails($subscrObj->getVar('subscr_email'));
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscrObj->getVar('subscr_email'));
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex'));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl 2014-09-22 20:06:12 UTC (rev 12798)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$smarty.const._LANGCODE}>" lang="<{$smarty.const._LANGCODE}>">
<head>
- <title>' . $xoopsConfig['sitename'] . '</title>
+ <title><{$xoopsConfig.sitename}></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="AUTHOR" content="<{$xoopsConfig.sitename}>" />
<meta name="keywords" content="<{$xoops_meta_keywords}>" />
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -51,7 +51,7 @@
//About
$modversion['module_status'] = 'Beta 1';
-$modversion['release_date'] = '2014/09/16';
+$modversion['release_date'] = '2014/09/22';
//$modversion['release'] = "1.3";
$modversion['demo_site_url'] = '';
$modversion['demo_site_name'] = '';
|
|
From: <luc...@us...> - 2014-09-22 19:57:20
|
Revision: 12797
http://sourceforge.net/p/xoops/svn/12797
Author: luciorota
Date: 2014-09-22 19:57:08 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
fixed bug in var names, standardize var names
fixed bug in db
uses screenshots filed and improved update function (task: add possibility to have all the screenshots you wish IN PROGRESS)
changed some configuration default values
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -273,14 +273,14 @@
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != 'http://') {
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST['size'];
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -292,7 +292,7 @@
$downloadObj->setVar('filetype', $filetype);
} else {
$down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
@@ -306,12 +306,13 @@
$downloadObj->setVar('filetype', $filetype);
}
// Get data from form
- $screenshot = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
- $screenshot2 = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
- $screenshot3 = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
- $screenshot4 = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
+ $screenshots = array();
+ $screenshots[] = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
+ $screenshots[] = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
+ $screenshots[] = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
+ $screenshots[] = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
- if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
+ if (!empty($_POST['homepage']) || $_POST['homepage'] != 'http://') {
$downloadObj->setVar('homepage', trim($_POST['homepage']));
$downloadObj->setVar('homepagetitle', trim($_POST['homepagetitle']));
}
@@ -349,10 +350,11 @@
$downloadObj->setVar('title', $title);
$downloadObj->setVar('status', $status);
$downloadObj->setVar('size', $size);
- $downloadObj->setVar('screenshot', $screenshot);
- $downloadObj->setVar('screenshot2', $screenshot2);
- $downloadObj->setVar('screenshot3', $screenshot3);
- $downloadObj->setVar('screenshot4', $screenshot4);
+ $downloadObj->setVar('screenshot', $screenshots[0]); // old style
+ $downloadObj->setVar('screenshot2', $screenshots[1]); // old style
+ $downloadObj->setVar('screenshot3', $screenshots[2]); // old style
+ $downloadObj->setVar('screenshot4', $screenshots[3]); // old style
+ $downloadObj->setVar('screenshots', $screenshots); // new style
$downloadObj->setVar('platform', trim($_POST['platform']));
$downloadObj->setVar('summary', trim($_POST['summary']));
$downloadObj->setVar('description', trim($_POST['description']));
@@ -438,7 +440,7 @@
if ($fid) {
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formread.php';
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
- $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
+ $formulizeElements_handler = xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $downloadObj->getVar('formulize_idreq');
if ($entries[$fid][0]) {
@@ -461,7 +463,7 @@
$uid = !empty($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
$groups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$entries = handleSubmission(
- $formulize_mgr,
+ $formulizeElements_handler,
$entries,
$uid,
$owner,
@@ -687,14 +689,14 @@
foreach ($publishedDownloadObjs as $publishedDownloadObj) {
$publishedDownload_array = $publishedDownloadObj->toArray();
$publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
- $publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
+ $publishedDownload_array['category_title'] = $categoryObjs[$publishedDownload_array['cid']]['title'];
$publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
$publishedDownload_array['published_formatted'] = XoopsLocal::formatTimestamp($publishedDownload_array['published'], 'l');
$GLOBALS['xoopsTpl']->append('published_downloads', $publishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($publishedDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
+ $pagenav = new XoopsPageNav($publishedDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('filter_title', $filter_title);
$GLOBALS['xoopsTpl']->assign('filter_title_condition', $filter_title_condition);
$GLOBALS['xoopsTpl']->assign('filter_category_title', $filter_category_title);
@@ -733,7 +735,7 @@
$version = $myts->htmlSpecialChars($newDownload_array['version']);
$size = $myts->htmlSpecialChars($newDownload_array['size']);
$platform = $myts->htmlSpecialChars($newDownload_array['platform']);
- $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']);
+ $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']); // IN PROGRESS
$newDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($newDownload_array['submitter']);
$newDownload_array['date_formatted'] = XoopsLocal::formatTimestamp($newDownload_array['date'], 'l');
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
@@ -780,12 +782,12 @@
$GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadCount);
if ($expiredDownloadCount > 0) {
foreach ($expiredDownloadObjs as $expiredDownloadObj) {
- $expired_download_array = $expiredDownloadObj->toArray();
- $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
- $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
- $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
- $expired_download_array['published_formatted'] = XoopsLocal::formatTimestamp($expired_download_array['published'], 'l');
- $GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
+ $expiredDownload_array = $expiredDownloadObj->toArray();
+ $expiredDownload_array['title_html'] = $myts->htmlSpecialChars(trim($expiredDownload_array['title']));
+ $expiredDownload_array['category_title'] = $categories[$expiredDownload_array['cid']]['title'];
+ $expiredDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expiredDownload_array['submitter']);
+ $expiredDownload_array['published_formatted'] = XoopsLocal::formatTimestamp($expiredDownload_array['published'], 'l');
+ $GLOBALS['xoopsTpl']->append('expired_downloads', $expiredDownload_array);
}
}
$pagenav = new XoopsPageNav($expiredDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -350,17 +350,17 @@
$submitter = isset($users[$downloadObjs[$reportObj->getVar('lid')]->getVar('submitter')])
? $users[$downloadObjs[$reportObj->getVar('lid')]->getVar('submitter')] : false;
$report_array['submitter_email'] = is_object($submitter) ? $submitter->getVar('email') : '';
- $report_array['submitter_uname'] = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
+ $report_array['submitter_uname'] = is_object($submitter) ? $submitter->getVar('uname') : $GLOBALS['xoopsConfig']['anonymous'];
} else {
$report_array['download_lid'] = false;
$download_link = _AM_WFDOWNLOADS_BROKEN_DOWNLOAD_DONT_EXISTS;
$report_array['submitter_email'] = '';
- $report_array['submitter_uname'] = $xoopsConfig['anonymous'];
+ $report_array['submitter_uname'] = $GLOBALS['xoopsConfig']['anonymous'];
}
$sender = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')] : '';
$report_array['reporter_email'] = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')]->getVar('email') : '';
$report_array['reporter_uname'] = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')]->getVar('uname')
- : $xoopsConfig['anonymous'];
+ : $GLOBALS['xoopsConfig']['anonymous'];
$report_array['formatted_date'] = XoopsLocal::formatTimestamp($reportObj->getVar('date'), 'l');
$GLOBALS['xoopsTpl']->append('reports', $report_array);
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -97,16 +97,16 @@
$xoopsMailer = & getMailer();
$xoopsMailer->useMail();
- $template_dir = WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/mail_template';
+ $template_dir = WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_template';
$xoopsMailer->setTemplateDir($template_dir);
$xoopsMailer->setTemplate('filebroken_notify.tpl');
$xoopsMailer->setToEmails($user->email());
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
$xoopsMailer->assign('X_UNAME', $user->uname());
- $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
- $xoopsMailer->assign('X_ADMINMAIL', $xoopsConfig['adminmail']);
+ $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->assign('X_ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
$xoopsMailer->assign('X_SITEURL', XOOPS_URL . '/');
$xoopsMailer->assign('X_TITLE', $title);
$xoopsMailer->assign('X_SUB_DATE', $subdate);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -321,7 +321,7 @@
$allsubcats_linked_totop = array();
foreach ($this->allCategories as $cid => $category) {
$parentCategoryObjs = $categoryObjsTree->getAllParent($cid);
- if (count($parents) == 0) {
+ if (count($parentCategoryObjs) == 0) {
// is a top category
$allsubcats_linked_totop[$cid] = $cid;
} else {
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -131,7 +131,6 @@
function getDownloadInfo()
{
- global $xoopsConfig, $myts;
xoops_load('XoopsUserUtility');
$download['id'] = $this->getVar('lid');
@@ -176,95 +175,99 @@
$download['url'] = $this->getVar('url');
$download['filename'] = $this->getVar('filename');
$download['filetype'] = $this->getVar('filetype');
-
- if ($this->getVar('screenshot')) {
- $download['screenshot_full'] = $this->getVar('screenshot');
- if ($this->getVar('screenshot')
+/*
+ if ($this->getVar('screenshot')) { // IN PROGRESS
+ $download['screenshot_full'] = $this->getVar('screenshot'); // IN PROGRESS
+ $download['screenshot_full1'] = $this->getVar('screenshot'); // IN PROGRESS
+ if ($this->getVar('screenshot') // IN PROGRESS
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb'] = wfdownloads_createThumb(
- $download['screenshot_full'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot'));
}
+ $download['screenshot_thumb1'] = $download['screenshot_thumb']; // IN PROGRESS
}
}
- if ($this->getVar('screenshot2') && $this->wfdownloads->getConfig('max_screenshot') >= 2) {
+ if ($this->getVar('screenshot2') && $this->wfdownloads->getConfig('max_screenshot') >= 2) { // IN PROGRESS
$download['screenshot_full2'] = $this->getVar('screenshot2');
if ($this->getVar('screenshot2')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb2'] = wfdownloads_createThumb(
- $download['screenshot_full2'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full2'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb2'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2'));
}
}
}
- if ($this->getVar('screenshot3') && $this->wfdownloads->getConfig('max_screenshot') >= 3) {
+ if ($this->getVar('screenshot3') && $this->wfdownloads->getConfig('max_screenshot') >= 3) { // IN PROGRESS
$download['screenshot_full3'] = $this->getVar('screenshot3');
if ($this->getVar('screenshot3')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb3'] = wfdownloads_createThumb(
- $download['screenshot_full3'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full3'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb3'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3'));
}
}
}
- if ($this->getVar('screenshot4') && $this->wfdownloads->getConfig('max_screenshot') >= 4) {
+ if ($this->getVar('screenshot4') && $this->wfdownloads->getConfig('max_screenshot') >= 4) { // IN PROGRESS
$download['screenshot_full4'] = $this->getVar('screenshot4');
if ($this->getVar('screenshot4')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb4'] = wfdownloads_createThumb(
- $download['screenshot_full4'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full4'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb4'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4'));
}
}
}
+*/
+ // IN PROGRESS
+ $screenshots = $this->getVar('screenshots');
+ $download['screenshots'] = array();
+ foreach ($screenshots as $key => $screenshot) {
+ if (file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($screenshot))) {
+ if ($this->wfdownloads->getConfig('usethumbs') == true
+ && $screenshot != ''
+ ) {
+ $screenshot_thumb = wfdownloads_createThumb(
+ $screenshot, $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
+ );
+ } else {
+ $screenshot_thumb = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($screenshot);
+ }
+ $download['screenshots'][$key]['filename'] = $screenshot;
+ $download['screenshots'][$key]['thumb_url'] = $screenshot_thumb;
+ unset($screenshot_thumb);
+ }
+ }
//
$download['homepage'] = (!$this->getVar('homepage') || $this->getVar('homepage') == 'http://')
? ''
- : $myts->htmlSpecialChars(trim($this->getVar('homepage')));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($this->getVar('homepage')));
//
$homepagetitle = $this->getVar('homepagetitle');
if ($download['homepage'] && !empty($download['homepage'])) {
@@ -306,8 +309,8 @@
// patch for multilanguage summary if xlanguage module is installed
if (wfdownloads_checkModule('xlanguage')) {
global $xlanguage;
- include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php');
- include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php');
+ include_once XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php' ;
+ include_once XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php';
$download['summary'] = xlanguage_ml($download['summary']);
}
// html or plain text auto summary
@@ -330,17 +333,17 @@
$limitationsArray = $this->wfdownloads->getConfig('limitations');
$download['limitations'] = ($this->getVar('limitations') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($limitationsArray[$this->getVar('limitations')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($limitationsArray[$this->getVar('limitations')]));
//
$versiontypesArray = $this->wfdownloads->getConfig('versiontypes');
$download['versiontypes'] = ($this->getVar('versionypes') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($versiontypesArray[$this->getVar('versiontypes')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($versiontypesArray[$this->getVar('versiontypes')]));
$licenseArray = $this->wfdownloads->getConfig('license');
//
$download['license'] = ($this->getVar('license') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($licenseArray[$this->getVar('license')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($licenseArray[$this->getVar('license')]));
//
$download['submitter'] = XoopsUserUtility::getUnameFromId($this->getVar('submitter'));
//
@@ -350,10 +353,10 @@
: '';
//
$platformArray = $this->wfdownloads->getConfig('platform');
- $download['platform'] = $myts->htmlSpecialChars($platformArray[$this->getVar('platform')]);
+ $download['platform'] = $GLOBALS['myts']->htmlSpecialChars($platformArray[$this->getVar('platform')]);
//
$history = $this->getVar('dhistory', 'n');
- $download['history'] = $myts->displayTarea($history, true);
+ $download['history'] = $GLOBALS['myts']->displayTarea($history, true);
//
$download['features'] = array();
if ($this->getVar('features')) {
@@ -371,9 +374,9 @@
}
}
//
- $download['mail_subject'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $xoopsConfig['sitename']));
+ $download['mail_subject'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $GLOBALS['xoopsConfig']['sitename']));
//
- $download['mail_body'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $xoopsConfig['sitename']) . ': ' . WFDOWNLOADS_URL . '/singlefile.php?cid=' . $download['cid'] . '&lid=' . $download['id']);
+ $download['mail_body'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . WFDOWNLOADS_URL . '/singlefile.php?cid=' . $download['cid'] . '&lid=' . $download['id']);
//
$download['isadmin'] = (wfdownloads_userIsAdmin()) ? true : false;
//
@@ -417,7 +420,7 @@
// file url
$fullFilename = trim($download['filename']);
if ((!$download['url'] == '' && !$download['url'] == 'http://') || $fullFilename == '') {
- $download['file_url'] = $myts->htmlSpecialChars(preg_replace('/javascript:/si', 'javascript:', $download['url']), ENT_QUOTES);
+ $download['file_url'] = $GLOBALS['myts']->htmlSpecialChars(preg_replace('/javascript:/si', 'javascript:', $download['url']), ENT_QUOTES);
} else {
$download['file_url'] = XOOPS_URL . str_replace(XOOPS_ROOT_PATH, '', $this->wfdownloads->getConfig('uploaddir')) . '/' . stripslashes(trim($fullFilename));
}
@@ -632,15 +635,15 @@
if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups))
|| wfdownloads_userIsAdmin()
) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot', 0), false); // IN PROGRESS
if ($this->wfdownloads->getConfig('max_screenshot') >= 2) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot2', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot2', 0), false); // IN PROGRESS
}
if ($this->wfdownloads->getConfig('max_screenshot') >= 3) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot3', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot3', 0), false); // IN PROGRESS
}
if ($this->wfdownloads->getConfig('max_screenshot') >= 4) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot4', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot4', 0), false); // IN PROGRESS
}
}
@@ -916,111 +919,64 @@
if (!$this->isNew() && $this->getVar('dhistory') != '') {
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_HISTORYD, 'dhistoryaddedd', '', 7, 60), false);
}
+
// download: screenshot
- $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
- $indeximage_select = new XoopsFormSelect('', 'screenshot', $this->getVar('screenshot', 'e'));
- $indeximage_select->addOptionArray($graph_array);
- $indeximage_select->setExtra(
- "onchange='showImgSelected(\"image1\", \"screenshot\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
- $indeximage_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
- $indeximage_tray->addElement($indeximage_select);
- if ($this->getVar('screenshot') != '') {
- $indeximage_tray->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot',
- 'e'
- ) . "' id='image1' alt='' title='screenshot 1' />")
- );
+ $graph_array1 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
+ $indeximage_select1 = new XoopsFormSelect('', 'screenshot', $this->getVar('screenshot', 'e'));
+ $indeximage_select1->addOptionArray($graph_array1);
+ $indeximage_select1->setExtra("onchange='showImgSelected(\"image1\", \"screenshot\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
+ $indeximage_tray1 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
+ $indeximage_tray1->addElement($indeximage_select1);
+ if ($this->getVar('screenshot') != '') { // IN PROGRESS
+ $indeximage_tray1->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot', 'e') . "' id='image1' alt='' title='screenshot 1' />"));
} else {
- $indeximage_tray->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image1' alt='' title='' />")
- );
+ $indeximage_tray1->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image1' alt='' title='' />"));
}
- $sform->addElement($indeximage_tray);
+ $sform->addElement($indeximage_tray1);
+
// download: screenshot2
- $graph_array2 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = 'images'
- );
+ $graph_array2 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select2 = new XoopsFormSelect('', 'screenshot2', $this->getVar('screenshot2', 'e'));
$indeximage_select2->addOptionArray($graph_array2);
- $indeximage_select2->setExtra(
- "onchange='showImgSelected(\"image2\", \"screenshot2\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select2->setExtra("onchange='showImgSelected(\"image2\", \"screenshot2\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray2 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray2->addElement($indeximage_select2);
if ($this->getVar('screenshot2') != '') {
- $indeximage_tray2->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot2',
- 'e'
- ) . "' id='image2' alt='' title='screenshot 2' />")
- );
+ $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot2', 'e') . "' id='image2' alt='' title='screenshot 2' />"));
} else {
- $indeximage_tray2->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image2' alt='' title='' />")
- );
+ $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image2' alt='' title='' />"));
}
$sform->addElement($indeximage_tray2);
+
// download: screenshot3
- $graph_array3 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = "images"
- );
+ $graph_array3 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select3 = new XoopsFormSelect('', 'screenshot3', $this->getVar('screenshot3', 'e', true));
$indeximage_select3->addOptionArray($graph_array3);
- $indeximage_select3->setExtra(
- "onchange='showImgSelected(\"image3\", \"screenshot3\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select3->setExtra("onchange='showImgSelected(\"image3\", \"screenshot3\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray3 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray3->addElement($indeximage_select3);
if ($this->getVar('screenshot3') != '') {
- $indeximage_tray3->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot3',
- 'e'
- ) . "' id='image3' alt='' title='screenshot 3' />")
- );
+ $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot3', 'e') . "' id='image3' alt='' title='screenshot 3' />"));
} else {
- $indeximage_tray3->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image3' alt='' title='' />")
- );
+ $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image3' alt='' title='' />"));
}
$sform->addElement($indeximage_tray3);
+
// download: screenshot4
- $graph_array4 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = 'images'
- );
+ $graph_array4 = WfsLists::getListTypeAsArray(
+ XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select4 = new XoopsFormSelect('', 'screenshot4', $this->getVar('screenshot4', 'e'));
$indeximage_select4->addOptionArray($graph_array4);
- $indeximage_select4->setExtra(
- "onchange='showImgSelected(\"image4\", \"screenshot4\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select4->setExtra("onchange='showImgSelected(\"image4\", \"screenshot4\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray4 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray4->addElement($indeximage_select4);
if ($this->getVar('screenshot4') != "") {
- $indeximage_tray4->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot4',
- 'e'
- ) . "' id='image4' alt='' title='screenshot 4' />")
- );
+ $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot4', 'e') . "' id='image4' alt='' title='screenshot 4' />"));
} else {
- $indeximage_tray4->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image4' alt='' title='' />")
- );
+ $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image4' alt='' title='' />"));
}
$sform->addElement($indeximage_tray4);
+
$sform->insertBreak(sprintf(_AM_WFDOWNLOADS_FILE_MUSTBEVALID, "<b>" . $this->wfdownloads->getConfig('screenshots') . "</b>"), "even");
// download: published
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -71,8 +71,8 @@
* @copyright (c) 2000-2003 The Xoops Project - www.xoops.org
*/
mt_srand((double) microtime() * 1000000);
-//require_once XOOPS_ROOT_PATH . "/modules/wfdownloads/class/uploader.php";
-require_once XOOPS_ROOT_PATH . "/class/uploader.php";
+//require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/uploader.php';
+require_once XOOPS_ROOT_PATH . '/class/uploader.php';
/**
* Class XoopsMediaImgUploader
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt 2014-09-22 19:57:08 UTC (rev 12797)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 RC2 (2014-09-03)</u></b>
+<b><u>=> Version 3.23 RC2 (2014-09-22)</u></b>
- todo: Swish-e files indexing support
- removed obsolete eval() that was used for PHP4 (mamba)
- removed object.php file (mamba)
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -25,7 +25,7 @@
*/
function wfdownloads_notify_iteminfo($category, $item_id)
{
- global $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
+ global $xoopsModule, $xoopsModuleConfig;
if (empty($xoopsModule) || $xoopsModule->dirname() != 'wfdownloads') {
$module_handler = xoops_gethandler('module');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,7 +20,7 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
define('INDEX_FILE_PATH', XOOPS_ROOT_PATH . '/uploads/index.html');
define('BLANK_FILE_PATH', XOOPS_ROOT_PATH . '/uploads/blank.gif');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,7 +20,7 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
/**
* @param $xoopsModule
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,26 +20,26 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
include_once WFDOWNLOADS_ROOT_PATH . '/class/dbupdater.php';
/**
* @param $xoopsModule
- * @param $prev_version
+ * @param $previousVersion
*
* @return bool
*/
-function xoops_module_update_wfdownloads(&$xoopsModule, $prev_version)
+function xoops_module_update_wfdownloads(&$xoopsModule, $previousVersion)
{
ob_start();
invert_nohtm_dohtml_values();
- if ($prev_version <= 322) {
+ if ($previousVersion < 322) {
update_tables_to_322($xoopsModule);
}
- if ($prev_version <= 323) {
+ if ($previousVersion < 323) {
update_permissions_to_323($xoopsModule);
+ update_tables_to_323($xoopsModule);
}
- update_tables_to_323($xoopsModule);
$feedback = ob_get_clean();
if (method_exists($xoopsModule, 'setMessage')) {
$xoopsModule->setMessage($feedback);
@@ -106,7 +106,7 @@
"summary" => array("Type" => "text NOT NULL", "Default" => false),
"formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true),
// added 3.23
- "screenshots" => array("Type" => "text NOT NULL default ''", "Default" => true),
+ "screenshots" => array("Type" => "text NOT NULL", "Default" => true),
"dohtml" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
"dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
"doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
@@ -118,7 +118,7 @@
//);
echo "<br /><span style='font-weight: bold;'>Checking Download table</span><br />";
$download_handler = xoops_getmodulehandler('download', 'wfdownloads');
- $download_table = new WfdownloadsTable("wfdownloads_downloads");
+ $download_table = new WfdownloadsTable('wfdownloads_downloads');
$fields = get_table_info($download_handler->table, $download_fields);
// check for renamed fields
//rename_fields($download_table, $renamed_fields, $fields, $download_fields);
@@ -128,7 +128,20 @@
echo "Downloads table updated<br />";
}
unset($fields);
+ // populate screenshots with screenshot, screenshot2, screenshot3, screenshot4 values
+ $downloadsObjs = $download_handler->getObjects();
+ foreach ($downloadsObjs as $downloadsObj) {
+ $screenshots = array();
+ $screenshots[] = $downloadsObj->getVar('screenshot');
+ $screenshots[] = $downloadsObj->getVar('screenshot2');
+ $screenshots[] = $downloadsObj->getVar('screenshot3');
+ $screenshots[] = $downloadsObj->getVar('screenshot4');
+ $downloadsObj->setVar('screenshots', $screenshots);
+ unset($screenshots);
+ $download_handler->insert($downloadsObj);
+ }
+
// update wfdownloads_mod table
$mod_fields = array(
"requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
@@ -189,7 +202,7 @@
//);
echo "<br /><span style='font-weight: bold;'>Checking Modified Downloads table</span><br />";
$mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
- $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $mod_table = new WfdownloadsTable('wfdownloads_mod');
$fields = get_table_info($mod_handler->table, $mod_fields);
// check for renamed fields
//rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -110,7 +110,7 @@
if ($wfdownloads->getHandler('rating')->insert($ratingObj)) {
// All is well. Calculate Score & Add to Summary (for quick retrieval & sorting) to DB.
wfdownloads_updateRating($lid);
- $thankyouMessage = _MD_WFDOWNLOADS_VOTEAPPRE . "<br />" . sprintf(_MD_WFDOWNLOADS_THANKYOU, $xoopsConfig['sitename']);
+ $thankyouMessage = _MD_WFDOWNLOADS_VOTEAPPRE . "<br />" . sprintf(_MD_WFDOWNLOADS_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
redirect_header("singlefile.php?cid={$cid}&lid={$lid}", 4, $thankyouMessage);
} else {
echo $ratingObj->getHtmlErrors();
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -31,7 +31,7 @@
$xoopsOption['template_main'] = 'system_' . $feed_type . '.tpl';
error_reporting(0);
-include_once(XOOPS_ROOT_PATH . '/class/template.php');
+include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
// Find case
@@ -63,7 +63,7 @@
}
$xoopsTpl->caching = true;
-$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][(int) $wfdownloads->getModule()->mid()];
+$xoopsTpl->cache_lifetime = $GLOBALS['xoopsConfig']['module_cache'][(int) $wfdownloads->getModule()->mid()];
if (!$xoopsTpl->is_cached('db:' . $xoopsOption['template_main'], $cache_prefix)) {
// Get content
$limit = 30;
@@ -77,8 +77,8 @@
default:
case 'all':
$shorthand = 'all';
- $title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($wfdownloads->getModule()->getVar('name'), ENT_QUOTES);
- $desc = $xoopsConfig['slogan'];
+ $title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . htmlspecialchars($wfdownloads->getModule()->getVar('name'), ENT_QUOTES);
+ $desc = $GLOBALS['xoopsConfig']['slogan'];
$channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php';
$criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
@@ -88,8 +88,8 @@
case 'category':
$shorthand = 'cat';
- $title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
- $desc = $xoopsConfig['slogan'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
+ $title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
+ $desc = $GLOBALS['xoopsConfig']['slogan'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
$channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php?cid=' . (int) $categoryObj->getVar('cid');
$criteria->add(new Criteria('cid', (int) $categoryObj->getVar('cid')));
@@ -103,9 +103,9 @@
$xoopsTpl->assign('channel_desc', xoops_utf8_encode($desc, 'n'));
$xoopsTpl->assign('channel_link', $channel_url);
$xoopsTpl->assign('channel_lastbuild', formatTimestamp(time(), $feed_type));
- $xoopsTpl->assign('channel_webmaster', $xoopsConfig['adminmail']);
- $xoopsTpl->assign('channel_editor', $xoopsConfig['adminmail']);
- $xoopsTpl->assign('channel_editor_name', $xoopsConfig['sitename']);
+ $xoopsTpl->assign('channel_webmaster', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsTpl->assign('channel_editor', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsTpl->assign('channel_editor_name', $GLOBALS['xoopsConfig']['sitename']);
$xoopsTpl->assign('channel_category', $wfdownloads->getModule()->getVar('name', 'e'));
$xoopsTpl->assign('channel_generator', 'PHP');
$xoopsTpl->assign('channel_language', _LANGCODE);
@@ -128,7 +128,7 @@
$link = $url . 'singlefile.php?lid=' . (int) $item->getVar('lid');
$title = htmlspecialchars($item->getVar('title', 'n'));
$teaser = htmlspecialchars($item->getVar('summary', 'n'));
- $author = isset($users[$item->getVar('submitter')]) ? isset($users[$item->getVar('submitter')]) : $xoopsConfig['anonymous'];
+ $author = isset($users[$item->getVar('submitter')]) ? isset($users[$item->getVar('submitter')]) : $GLOBALS['xoopsConfig']['anonymous'];
$xoopsTpl->append(
'items',
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -241,7 +241,7 @@
} else {
$user_reviews = "cid={$cid}&lid={$lid}\">" . _MD_WFDOWNLOADS_NOUSERREVIEWS;
}
-$xoopsTpl->assign('lang_user_reviews', $xoopsConfig['sitename'] . ' ' . _MD_WFDOWNLOADS_USERREVIEWSTITLE);
+$xoopsTpl->assign('lang_user_reviews', $GLOBALS['xoopsConfig']['sitename'] . ' ' . _MD_WFDOWNLOADS_USERREVIEWSTITLE);
$xoopsTpl->assign('lang_UserReviews', sprintf($user_reviews, $downloadObj->getVar('title')));
$xoopsTpl->assign('review_amount', $reviewCount);
@@ -255,7 +255,7 @@
} else {
$user_mirrors = "cid={$cid}&lid={$lid}\">" . _MD_WFDOWNLOADS_NOUSERMIRRORS;
}
-$xoopsTpl->assign('lang_user_mirrors', $xoopsConfig['sitename'] . ' ' . _MD_WFDOWNLOADS_USERMIRRORSTITLE);
+$xoopsTpl->assign('lang_user_mirrors', $GLOBALS['xoopsConfig']['sitename'] . ' ' . _MD_WFDOWNLOADS_USERMIRRORSTITLE);
$xoopsTpl->assign('lang_UserMirrors', sprintf($user_mirrors, $downloadObj->getVar('title')));
$xoopsTpl->assign('mirror_amount', $mirrorCount);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-22 19:57:08 UTC (rev 12797)
@@ -3,14 +3,14 @@
#
CREATE TABLE wfdownloads_broken (
- reportid int(5) NOT NULL auto_increment,
- lid int(11) NOT NULL default '0',
- sender int(11) NOT NULL default '0',
- ip varchar(20) NOT NULL default '',
- date varchar(11) NOT NULL default '0',
- confirmed tinyint(1) NOT NULL default '0',
- acknowledged tinyint(1) NOT NULL default '0',
- PRIMARY KEY (reportid),
+ reportid int(5) NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ sender int(11) NOT NULL default '0',
+ ip varchar(20) NOT NULL default '',
+ date varchar(11) NOT NULL default '0',
+ confirmed tinyint(1) NOT NULL default '0',
+ acknowledged tinyint(1) NOT NULL default '0',
+ PRIMARY KEY (reportid),
KEY lid (lid),
KEY sender (sender),
KEY ip (ip)
@@ -28,23 +28,23 @@
#
CREATE TABLE wfdownloads_cat (
- cid int(5) unsigned NOT NULL auto_increment,
- pid int(5) unsigned NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- imgurl varchar(255) NOT NULL default '',
- description text NOT NULL,
- total int(11) NOT NULL default '0',
- summary text NOT NULL,
- spotlighttop int(11) NOT NULL default '0',
- spotlighthis int(11) NOT NULL default '0',
- dohtml tinyint(1) NOT NULL default '0',
- dosmiley tinyint(1) NOT NULL default '1',
- doxcode tinyint(1) NOT NULL default '1',
- doimage tinyint(1) NOT NULL default '1',
- dobr tinyint(1) NOT NULL default '1',
- weight int(11) NOT NULL default '0',
- formulize_fid int(5) NOT NULL default '0',
- PRIMARY KEY (cid),
+ cid int(5) unsigned NOT NULL auto_increment,
+ pid int(5) unsigned NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ imgurl varchar(255) NOT NULL default '',
+ description text NOT NULL,
+ total int(11) NOT NULL default '0',
+ summary text NOT NULL,
+ spotlighttop int(11) NOT NULL default '0',
+ spotlighthis int(11) NOT NULL default '0',
+ dohtml tinyint(1) NOT NULL default '0',
+ dosmiley tinyint(1) NOT NULL default '1',
+ doxcode tinyint(1) NOT NULL default '1',
+ doimage tinyint(1) NOT NULL default '1',
+ dobr tinyint(1) NOT NULL default '1',
+ weight int(11) NOT NULL default '0',
+ formulize_fid int(5) NOT NULL default '0',
+ PRIMARY KEY (cid),
KEY pid (pid)
) ENGINE=MyISAM;
@@ -59,55 +59,55 @@
#
CREATE TABLE wfdownloads_downloads (
- lid int(11) unsigned NOT NULL auto_increment,
- cid int(5) unsigned NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- url varchar(255) NOT NULL default '',
- filename varchar(150) NOT NULL default '',
- filetype varchar(100) NOT NULL default '',
- homepage varchar(100) NOT NULL default '',
- version varchar(20) NOT NULL default '',
- size int(8) NOT NULL default '0',
- platform varchar(50) NOT NULL default '',
- screenshot varchar(255) NOT NULL default '',
- screenshot2 varchar(255) NOT NULL default '',
- screenshot3 varchar(255) NOT NULL default '',
- screenshot4 varchar(255) NOT NULL default '',
- submitter int(11) NOT NULL default '0',
- publisher varchar(255) NOT NULL default '',
- status tinyint(2) NOT NULL default '0',
- date int(10) NOT NULL default '0',
- hits int(11) unsigned NOT NULL default '0',
- rating double(6,4) NOT NULL default '0.0000',
- votes int(11) unsigned NOT NULL default '0',
- comments int(11) unsigned NOT NULL default '0',
- license varchar(255) NOT NULL default '',
- mirror varchar(255) NOT NULL d...
[truncated message content] |
|
From: <be...@us...> - 2014-09-22 08:24:09
|
Revision: 12796
http://sourceforge.net/p/xoops/svn/12796
Author: beckmi
Date: 2014-09-22 08:23:59 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
reverting couple of $i++ conversions
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-22 08:23:59 UTC (rev 12796)
@@ -10,6 +10,7 @@
- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
- allowing for "https" URL in YouTube links in Textsanitizer (mamba)
- converting $i++ to ++$i for improved performance (mamba)
+- reverting couple of $i++ conversions (zyspec/mamba)
===============================
2014-06-20: Version 2.5.7 Final (Patch)
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -100,7 +100,7 @@
for ($i = 0; $i < $count; ++$i) {
$_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
$_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
- $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
+ $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval($cnt++)] = $_items[$i];
}
} else {
echo $rss2parser->getErrors();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -324,7 +324,7 @@
$var_value = '';
while ($i<$count) {
if (($pos = strpos($lines[$i], '"""')) === false) {
- $var_value .= $lines[++$i];
+ $var_value .= $lines[$i++];
} else {
/* end of multiline-value */
$var_value .= substr($lines[$i], 0, $pos);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -304,7 +304,7 @@
}
}
}
-
+
/* Compile the template tags into PHP code. */
$compiled_tags = array();
for ($i = 0, $for_max = count($template_tags); $i < $for_max; ++$i) {
@@ -333,7 +333,7 @@
for ($j = $i + 1; $j < $for_max; ++$j) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
- if ($compiled_tags[$j] == '{/strip}') {
+ if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
}
@@ -349,9 +349,9 @@
}
}
$compiled_content = '';
-
+
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-
+
/* Interleave the compiled contents and text blocks to get the final result. */
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) {
if ($compiled_tags[$i] == '') {
@@ -361,7 +361,7 @@
// replace legit PHP tags with placeholder
$text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
$compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-
+
$compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
}
$compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
@@ -371,8 +371,8 @@
$compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
// recover legit tags
- $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
-
+ $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
+
// remove \n from the end of the file, if any
if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
$compiled_content = substr($compiled_content, 0, -1);
@@ -437,7 +437,7 @@
/* Matched comment. */
if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
return '';
-
+
/* Split tag into two three parts: command, command modifiers and the arguments. */
if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
. '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -445,7 +445,7 @@
~xs', $template_tag, $match)) {
$this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
$tag_command = $match[1];
$tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null;
@@ -585,7 +585,7 @@
} else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
return $output;
} else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
- return $output;
+ return $output;
} else {
$this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -936,7 +936,7 @@
if (empty($name)) {
return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
if (!preg_match('~^\w+$~', $name)) {
return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -1225,7 +1225,7 @@
$buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
$assign = isset($attrs['assign']) ? $attrs['assign'] : null;
$append = isset($attrs['append']) ? $attrs['append'] : null;
-
+
$output = "<?php ob_start(); ?>";
$this->_capture_stack[] = array($buffer, $assign, $append);
} else {
@@ -1266,11 +1266,11 @@
if(empty($tokens)) {
$_error_msg = $elseif ? "'elseif'" : "'if'";
- $_error_msg .= ' statement requires arguments';
+ $_error_msg .= ' statement requires arguments';
$this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
}
-
-
+
+
// make sure we have balanced parenthesis
$token_count = array_count_values($tokens);
if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
@@ -1368,8 +1368,8 @@
if ($is_arg_start != 0) {
if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
$is_arg_start--;
- }
- }
+ }
+ }
} else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
@@ -1400,7 +1400,7 @@
}
} elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
// variable function call
- $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
+ $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
} elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
// object or variable
$token = $this->_parse_var_props($token);
@@ -1475,7 +1475,7 @@
case 'even':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "!(1 & $is_arg)";
@@ -1484,7 +1484,7 @@
case 'odd':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "(1 & $is_arg)";
@@ -1493,7 +1493,7 @@
case 'div':
if (@$tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
} else {
$this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1753,12 +1753,12 @@
$_var_ref = $var_expr;
else
$_var_ref = substr($var_expr, 1);
-
+
if(!$_has_math) {
-
+
// get [foo] and .foo and ->foo and (...) pieces
preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-
+
$_indexes = $match[0];
$_var_name = array_shift($_indexes);
@@ -2018,7 +2018,7 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
break;
-
+
case 'first':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
@@ -2028,12 +2028,12 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
break;
-
+
case 'show':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
break;
-
+
default:
unset($_max_index);
$compiled_ref = "\$this->_foreach[$_var]";
@@ -2159,7 +2159,7 @@
case 'rdelim':
$compiled_ref = "'$this->right_delimiter'";
break;
-
+
default:
$this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
break;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -50,7 +50,7 @@
$level--;
unset($results[$i]);
} else { // opening tag
- if (++$level > 0) unset($results[$i]);
+ if ($level++ > 0) unset($results[$i]);
}
++$j;
} elseif ($level > 0) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -368,13 +368,13 @@
// BYTE rgbGreen;
// BYTE rgbRed;
// BYTE rgbReserved;
- $blue = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
- $green = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
- $red = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
+ $blue = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
+ $green = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
+ $red = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
// no padding byte
} else {
- ++$paletteoffset; // padding byte
+ $paletteoffset++; // padding byte
}
$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue));
}
@@ -395,7 +395,7 @@
case 1:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
for ($i = 7; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -404,7 +404,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -412,7 +412,7 @@
case 4:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
for ($i = 1; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -421,7 +421,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -429,12 +429,12 @@
case 8:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) {
- $paletteindex = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindex = ord($BMPpixelData{$pixeldataoffset++});
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -447,7 +447,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -460,7 +460,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -481,8 +481,8 @@
case 8:
$pixelcounter = 0;
while ($pixeldataoffset < strlen($BMPpixelData)) {
- $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
if ($firstbyte == 0) {
// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -503,8 +503,8 @@
// delta - The 2 bytes following the escape contain unsigned values
// indicating the horizontal and vertical offsets of the next pixel
// from the current position.
- $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -516,7 +516,7 @@
// number of bytes that follow, each of which contains the color index
// of a single pixel. Each run must be aligned on a word boundary.
for ($i = 0; $i < $secondbyte; ++$i) {
- $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -524,7 +524,7 @@
}
while (($pixeldataoffset % 2) != 0) {
// Each run must be aligned on a word boundary.
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
break;
}
@@ -557,8 +557,8 @@
case 4:
$pixelcounter = 0;
while ($pixeldataoffset < strlen($BMPpixelData)) {
- $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
if ($firstbyte == 0) {
// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -579,8 +579,8 @@
// delta - The 2 bytes following the escape contain unsigned values
// indicating the horizontal and vertical offsets of the next pixel
// from the current position.
- $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -593,13 +593,13 @@
// each run must be aligned on a word boundary.
unset($paletteindexes);
for ($i = 0; $i < ceil($secondbyte / 2); ++$i) {
- $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
$paletteindexes[] = ($paletteindexbyte & 0x0F);
}
while (($pixeldataoffset % 2) != 0) {
// Each run must be aligned on a word boundary.
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
foreach ($paletteindexes as $dummy => $paletteindex) {
@@ -652,13 +652,13 @@
return false;
}
while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) {
- ++$redshift;
+ $redshift++;
}
while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) {
- ++$greenshift;
+ $greenshift++;
}
while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) {
- ++$blueshift;
+ $blueshift++;
}
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) {
@@ -672,7 +672,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -875,4 +875,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -2439,7 +2439,7 @@
$this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
foreach ($nohotlink_text_array as $textline) {
$leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2));
- ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + (++$rowcounter * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
+ ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
}
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -215,7 +215,7 @@
$has_xoopscomments = false ;
foreach ($tables as $table) {
if( $table == $prefix['name'] . '_xoopscomments' ) $has_xoopscomments = true ;
- if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count ;
+ if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count;
}
// check if prefix_xoopscomments exists
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -94,8 +94,8 @@
// script special case
// the contents of the script block must be ONE token
// for this to work.
- $html .= $this->generateFromToken($tokens[++$i]);
- $html .= $this->generateScriptFromToken($tokens[++$i]);
+ $html .= $this->generateFromToken($tokens[$i++]);
+ $html .= $this->generateScriptFromToken($tokens[$i++]);
}
$html .= $this->generateFromToken($tokens[$i]);
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -114,7 +114,7 @@
$go = false;
$def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name];
while (isset($node->children[$ix])) {
- $child = $node->children[++$ix];
+ $child = $node->children[$ix++];
if ($child instanceof HTMLPurifier_Node_Element) {
$go = true;
$stack[] = array($node, $is_inline, $excludes, $ix);
|
8 messages has been excluded from this view by a project administrator.
