Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12593] XoopsCore/branches/2.5.x/2.5.7
|
From: <be...@us...> - 2014-06-14 16:04:13
|
Revision: 12593
http://sourceforge.net/p/xoops/svn/12593
Author: beckmi
Date: 2014-06-14 16:04:02 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Cosmetic changes in preparation for 2.5.7 Final release
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/README.txt
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/prune.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/install.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/readme.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/permissions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/install.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/docs/readme.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/docs/readme.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README_PL.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/release_notes.txt
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7_Beta_1.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7_RC1.png
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/README.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/README.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/README.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,9 +1,8 @@
-XOOPS 2.5.6 Final
+XOOPS 2.5.7 Final
-The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.6 Final. This version has been made compatible with PHP 5.4, in addition to security enhancement.
-New is also Fast Comment Hack contributed by Voltan. (see changelog for more info).
+The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.7 Final. This version has been made compatible with PHP 5.5.x, in addition to security enhancement.
-Download XOOPS 2.5.6 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.6/]Sourceforge repository[/url].
+Download XOOPS 2.5.7 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.7/]Sourceforge repository[/url].
How to contribute
@@ -14,4 +13,4 @@
Release announcement: https://lists.sourceforge.net/lists/listinfo/xoops-announcement
XOOPS Development Team
-April 21, 2013
\ No newline at end of file
+June 14, 2014
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,7 +1,7 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
===============================
-2014/xx/xx: Version 2.5.7 Final
+2014/06/14: Version 2.5.7 Final
===============================
- updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec)
- added .tpl to XoopsList's getHtmlListAsArray (wizanda)
@@ -12,6 +12,7 @@
- added missing .php file extension (AngeloRocha/Zyspec/rgriffith)
- deprecated destoryVars($var) in object.php (cesag/rgriffith)
- update phpmailer translation array to include all keys, and remove reassignment of $PHPMAILER_LANG as array() (cesag/rgriffith)
+- added XoopsRequest class (rgriffith)
Updated:
- TinyMCE to 3.5.11 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -32,25 +32,25 @@
* Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @copyright Copyright 2005-2008, Cake Software Foundation, Inc.
- * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package cake
+ * @copyright Copyright 2005-2008, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package cake
* @subpackage cake.cake.libs
- * @since CakePHP(tm) v 0.2.9
- * @version $Revision$
+ * @since CakePHP(tm) v 0.2.9
+ * @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
+
/**
* Folder structure browser, lists folders and files.
*
* Long description for class
*
- * @package cake
+ * @package cake
* @subpackage cake.cake.libs
*/
-
class XoopsFolderHandler
{
/**
@@ -158,7 +158,7 @@
* Change directory to $desired_path.
*
* @param string $path Path to the directory to change to
- *
+ *
* @return string The new path. Returns false on failure
* @access public
*/
@@ -178,13 +178,14 @@
*
* @param boolean $sort
* @param mixed $exceptions either an array or boolean true will no grab dot files
+ *
* @return mixed Contents of current directory as an array, false on failure
* @access public
*/
function read($sort = true, $exceptions = false)
{
$dirs = $files = array();
- $dir = opendir($this->path);
+ $dir = opendir($this->path);
if ($dir !== false) {
while (false !== ($n = readdir($dir))) {
$item = false;
@@ -192,8 +193,10 @@
if (!in_array($n, $exceptions)) {
$item = $n;
}
- } else if ((!preg_match('/^\\.+$/', $n) && $exceptions == false) || ($exceptions == true && !preg_match('/^\\.(.*)$/', $n))) {
- $item = $n;
+ } else {
+ if ((!preg_match('/^\\.+$/', $n) && $exceptions == false) || ($exceptions == true && !preg_match('/^\\.(.*)$/', $n))) {
+ $item = $n;
+ }
}
if ($item !== false) {
if (is_dir($this->addPathElement($this->path, $item))) {
@@ -211,8 +214,9 @@
}
return array(
- $dirs ,
- $files);
+ $dirs,
+ $files
+ );
}
/**
@@ -220,6 +224,7 @@
*
* @param string $regexp_pattern Preg_match pattern (Defaults to: .*)
* @param bool $sort
+ *
* @return array Files that match given pattern
* @access public
*/
@@ -245,13 +250,14 @@
*
* @param string $pattern Preg_match pattern (Defaults to: .*)
* @param bool $sort
+ *
* @return array Files matching $pattern
* @access public
*/
function findRecursive($pattern = '.*', $sort = false)
{
$startsOn = $this->path;
- $out = $this->_findRecursive($pattern, $sort);
+ $out = $this->_findRecursive($pattern, $sort);
$this->cd($startsOn);
return $out;
@@ -262,6 +268,7 @@
*
* @param string $pattern Pattern to match against
* @param bool $sort
+ *
* @return array Files matching pattern
* @access private
*/
@@ -286,7 +293,8 @@
/**
* Returns true if given $path is a Windows path.
*
- * @param string $path Path to check
+ * @param string $path Path to check
+ *
* @return boolean true if windows path, false otherwise
* @access public
* @static
@@ -304,6 +312,7 @@
* Returns true if given $path is an absolute path.
*
* @param string $path Path to check
+ *
* @return bool
* @access public
* @static
@@ -319,6 +328,7 @@
* Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
*
* @param string $path Path to check
+ *
* @return string Set of slashes ("\\" or "/")
* @access public
* @static
@@ -336,6 +346,7 @@
* Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
*
* @param string $path Path to check
+ *
* @return string Set of slashes ("\\" or "/")
* @access public
* @static
@@ -353,6 +364,7 @@
* Returns $path with added terminating slash (corrected for Windows or other OS).
*
* @param string $path Path to check
+ *
* @return string Path with ending slash
* @access public
* @static
@@ -371,6 +383,7 @@
*
* @param string $path Path
* @param string $element Element to and at end of path
+ *
* @return string Combined path
* @access public
* @static
@@ -384,12 +397,13 @@
* Returns true if the File is in a given XoopsPath.
*
* @param string $path
+ *
* @return bool
* @access public
*/
function inXoopsPath($path = '')
{
- $dir = substr($this->slashTerm(XOOPS_ROOT_PATH), 0, - 1);
+ $dir = substr($this->slashTerm(XOOPS_ROOT_PATH), 0, -1);
$newdir = $dir . $path;
return $this->inPath($newdir);
@@ -400,12 +414,13 @@
*
* @param string $path
* @param bool $reverse
+ *
* @return bool
* @access public
*/
function inPath($path = '', $reverse = false)
{
- $dir = $this->slashTerm($path);
+ $dir = $this->slashTerm($path);
$current = $this->slashTerm($this->pwd());
if (!$reverse) {
$return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current);
@@ -426,6 +441,7 @@
* @param bool|int $mode octal value 0755
* @param boolean $recursive chmod recursively
* @param array $exceptions array of files, directories to skip
+ *
* @return boolean Returns TRUE on success, FALSE on failure
* @access public
*/
@@ -475,16 +491,18 @@
* @param string $path the directory path to build the tree from
* @param boolean $hidden return hidden files and directories
* @param string $type either file or dir. null returns both files and directories
+ *
* @return mixed array of nested directories and files in each directory
* @access public
*/
function tree($path, $hidden = true, $type = null)
{
- $path = rtrim($path, '/');
- $this->files = array();
+ $path = rtrim($path, '/');
+ $this->files = array();
$this->directories = array(
- $path);
- $directories = array();
+ $path
+ );
+ $directories = array();
while (count($this->directories)) {
$dir = array_pop($this->directories);
$this->_tree($dir, $hidden);
@@ -492,8 +510,9 @@
}
if ($type === null) {
return array(
- $directories ,
- $this->files);
+ $directories,
+ $this->files
+ );
}
if ($type === 'dir') {
return $directories;
@@ -507,6 +526,7 @@
*
* @param string $path
* @param $hidden
+ *
* @internal param $ $ = boolean $hidden
* @access private
*/
@@ -516,7 +536,7 @@
$dirHandle = opendir($path);
while (false !== ($item = readdir($dirHandle))) {
$found = false;
- if (($hidden === true && $item != '.' && $item != '..') || ($hidden === false && ! preg_match('/^\\.(.*)$/', $item))) {
+ if (($hidden === true && $item != '.' && $item != '..') || ($hidden === false && !preg_match('/^\\.(.*)$/', $item))) {
$found = $path . '/' . $item;
}
if ($found !== false) {
@@ -536,6 +556,7 @@
*
* @param string $pathname The directory structure to create
* @param bool|int $mode octal value 0755
+ *
* @return boolean Returns TRUE on success, FALSE on failure
* @access public
*/
@@ -544,7 +565,7 @@
if (is_dir($pathname) || empty($pathname)) {
return true;
}
- if (! $mode) {
+ if (!$mode) {
$mode = $this->mode;
}
if (is_file($pathname)) {
@@ -573,32 +594,34 @@
/**
* Returns the size in bytes of this Folder.
*
- * @return int $size
+ * @return int $size
* @access public
*/
function dirsize()
{
- $size = 0;
+ $size = 0;
$directory = $this->slashTerm($this->path);
- $stack = array($directory);
- $count = count($stack);
- for ($i = 0, $j = $count; $i < $j; ++ $i) {
+ $stack = array($directory);
+ $count = count($stack);
+ for ($i = 0, $j = $count; $i < $j; ++$i) {
if (is_file($stack[$i])) {
$size += filesize($stack[$i]);
- } else if (is_dir($stack[$i])) {
- $dir = dir($stack[$i]);
- if ($dir) {
- while (false !== ($entry = $dir->read())) {
- if ($entry == '.' || $entry == '..') {
- continue;
+ } else {
+ if (is_dir($stack[$i])) {
+ $dir = dir($stack[$i]);
+ if ($dir) {
+ while (false !== ($entry = $dir->read())) {
+ if ($entry == '.' || $entry == '..') {
+ continue;
+ }
+ $add = $stack[$i] . $entry;
+ if (is_dir($stack[$i] . $entry)) {
+ $add = $this->slashTerm($add);
+ }
+ $stack[] = $add;
}
- $add = $stack[$i] . $entry;
- if (is_dir($stack[$i] . $entry)) {
- $add = $this->slashTerm($add);
- }
- $stack[] = $add;
+ $dir->close();
}
- $dir->close();
}
}
$j = count($stack);
@@ -610,7 +633,8 @@
/**
* Recursively Remove directories if system allow.
*
- * @param string $path Path of directory to delete
+ * @param string $path Path of directory to delete
+ *
* @return boolean Success
* @access public
*/
@@ -618,10 +642,10 @@
{
$path = $this->slashTerm($path);
if (is_dir($path) === true) {
- $files = glob($path . '*', GLOB_NOSORT);
+ $files = glob($path . '*', GLOB_NOSORT);
$normal_files = glob($path . '*');
$hidden_files = glob($path . '\.?*');
- $files = array_merge($normal_files, $hidden_files);
+ $files = array_merge($normal_files, $hidden_files);
if (is_array($files)) {
foreach ($files as $file) {
if (preg_match("/(\.|\.\.)$/", $file)) {
@@ -633,9 +657,11 @@
} else {
$this->errors[] = sprintf('%s NOT removed', $path);
}
- } else if (is_dir($file) === true) {
- if ($this->delete($file) === false) {
- return false;
+ } else {
+ if (is_dir($file) === true) {
+ if ($this->delete($file) === false) {
+ return false;
+ }
}
}
}
@@ -657,6 +683,7 @@
* Recursive directory copy.
*
* @param array $options (to, from, chmod, skip)
+ *
* @return bool
* @access public
*/
@@ -664,18 +691,22 @@
{
$to = null;
if (is_string($options)) {
- $to = $options;
+ $to = $options;
$options = array();
}
- $options = array_merge(array(
- 'to' => $to ,
- 'from' => $this->path ,
- 'mode' => $this->mode ,
- 'skip' => array()), $options);
+ $options = array_merge(
+ array(
+ 'to' => $to,
+ 'from' => $this->path,
+ 'mode' => $this->mode,
+ 'skip' => array()
+ ),
+ $options
+ );
$fromDir = $options['from'];
- $toDir = $options['to'];
- $mode = $options['mode'];
+ $toDir = $options['to'];
+ $mode = $options['mode'];
if (!$this->cd($fromDir)) {
$this->errors[] = sprintf('%s not found', $fromDir);
@@ -689,16 +720,20 @@
return false;
}
- $exceptions = array_merge(array(
- '.' ,
- '..' ,
- '.svn'), $options['skip']);
- $handle = opendir($fromDir);
+ $exceptions = array_merge(
+ array(
+ '.',
+ '..',
+ '.svn'
+ ),
+ $options['skip']
+ );
+ $handle = opendir($fromDir);
if ($handle) {
while (false !== ($item = readdir($handle))) {
if (!in_array($item, $exceptions)) {
$from = $this->addPathElement($fromDir, $item);
- $to = $this->addPathElement($toDir, $item);
+ $to = $this->addPathElement($toDir, $item);
if (is_file($from)) {
if (copy($from, $to)) {
chmod($to, intval($mode, 8));
@@ -712,9 +747,13 @@
if (mkdir($to, intval($mode, 8))) {
chmod($to, intval($mode, 8));
$this->messages[] = sprintf('%s created', $to);
- $options = array_merge($options, array(
- 'to' => $to ,
- 'from' => $from));
+ $options = array_merge(
+ $options,
+ array(
+ 'to' => $to,
+ 'from' => $from
+ )
+ );
$this->copy($options);
} else {
$this->errors[] = sprintf('%s not created', $to);
@@ -736,7 +775,8 @@
/**
* Recursive directory move.
*
- * @param array $options (to, from, chmod, skip)
+ * @param array $options (to, from, chmod, skip)
+ *
* @return boolean Success
* @access public
*/
@@ -744,14 +784,18 @@
{
$to = null;
if (is_string($options)) {
- $to = $options;
- $options = (array) $options;
+ $to = $options;
+ $options = (array)$options;
}
- $options = array_merge(array(
- 'to' => $to ,
- 'from' => $this->path ,
- 'mode' => $this->mode ,
- 'skip' => array()), $options);
+ $options = array_merge(
+ array(
+ 'to' => $to,
+ 'from' => $this->path,
+ 'mode' => $this->mode,
+ 'skip' => array()
+ ),
+ $options
+ );
if ($this->copy($options)) {
if ($this->delete($options['from'])) {
return $this->cd($options['to']);
@@ -787,6 +831,7 @@
* Get the real path (taking ".." and such into account)
*
* @param string $path Path to resolve
+ *
* @return string The resolved path
*/
function realpath($path)
@@ -799,9 +844,9 @@
return $path;
}
- $parts = explode('/', $path);
+ $parts = explode('/', $path);
$newparts = array();
- $newpath = $path{0} == '/' ? '/' : '';
+ $newpath = $path{0} == '/' ? '/' : '';
while (($part = array_shift($parts)) !== null) {
if ($part == '.' || $part == '') {
continue;
@@ -827,7 +872,8 @@
/**
* Returns true if given $path ends in a slash (i.e. is slash-terminated).
*
- * @param string $path Path to check
+ * @param string $path Path to check
+ *
* @return boolean true if path ends with slash, false otherwise
* @access public
* @static
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -103,8 +103,11 @@
* Temporay solution for XOOPS 2.3
*
* @param string $name Name of class to be loaded
- * @param string $type domain of the class, potential values: core - locaded in /class/; framework - located in /Frameworks/; other - module class, located in /modules/[$type]/class/
- * @return boolean
+ * @param string $type domain of the class, potential values: core - located in /class/;
+ * framework - located in /Frameworks/;
+ * other - module class, located in /modules/[$type]/class/
+ *
+*@return boolean
*/
function xoops_load($name, $type = 'core')
{
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -30,4 +30,4 @@
/**
* Define XOOPS version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.7_RC2');
+define('XOOPS_VERSION', 'XOOPS 2.5.7');
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7_Beta_1.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7_RC1.png
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -210,7 +210,7 @@
$dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)");
$dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
$dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
- $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright \xA9 2001-" . date('Y', time()) . "', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
+ $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright © 2001-" . date('Y', time()) . "', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
$dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
$dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");
$dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '0', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/about.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/about.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,9 +17,9 @@
* @version $Id $
**/
-include '../../../include/cp_header.php';
+include_once dirname(__FILE__) . '../../../include/cp_header.php';
include '../../../class/xoopsformloader.php';
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$aboutAdmin = new ModuleAdmin();
@@ -27,5 +27,5 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
-xoops_cp_footer();
+include_once dirname(__FILE__) . '/admin_footer.php';
+//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-include_once 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -25,5 +25,5 @@
echo $indexAdmin->addNavigation('admin.php');
echo $indexAdmin->renderIndex();
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin_footer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin_footer.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin_footer.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,6 +1,6 @@
<?php
/**
- * XoopsPartner module
+ * PM 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
@@ -11,7 +11,7 @@
*
* @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
* @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package:: Xoops Partner
+ * @package:: PM
* @since:: 2.5.0
* @author:: XOOPS Development Team
* @version: $Id $
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/prune.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/prune.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/prune.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -84,5 +84,5 @@
redirect_header('admin.php', 2, sprintf(_PM_AM_MESSAGESPRUNED, $deletedrows));
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/install.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/install.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/install.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,6 +1,6 @@
INSTALL/UNISTALL
=================
-No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+No special measures necessary, follow the standard installation process – extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i)
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/readme.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/readme.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/readme.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -13,7 +13,7 @@
Install/uninstall
------------------
-No special measures necessary, follow the standard installation process \x96 extract the xoopspartners folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+No special measures necessary, follow the standard installation process – extract the xoopspartners folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i)
@@ -21,9 +21,9 @@
------------------------
To set up this module you need to:
-i) Enter your partner\x92s details \x96 including a URL for their website and (optionally) logo plus a short description (see \x91Adding a partner\x92)
+i) Enter your partner’s details – including a URL for their website and (optionally) logo plus a short description (see ‘Adding a partner’)
-ii) Configure your preferences for the module (see \x91Preferences\x92) and optionally the Partners block if you intend to use it (see \x91Blocks\x92)
+ii) Configure your preferences for the module (see ‘Preferences’) and optionally the Partners block if you intend to use it (see ‘Blocks’)
iii) Check that you have given your user groups the necessary module and block access rights to use this module. Group permissions are set through the Administration Menu -> System -> Groups.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -40,17 +40,7 @@
return false;
}
}
- // remove old html template files
- $template_directory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
- $template_list = array_diff(scandir($template_directory), array('..', '.'));
- foreach ($template_list as $k => $v) {
- $fileinfo = new SplFileInfo($template_directory . $v);
- if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
- @unlink($template_directory . $v);
- }
- }
-
if ($oldversion < 110) {
// remove old html template files
$templateDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -40,8 +40,8 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion["module_status"] = "RC 2";
-$modversion['release_date'] = '2014/04/23';
+$modversion["module_status"] = "Final";
+$modversion['release_date'] = '2014/06/14';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion['min_php'] = '5.3.7';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,8 +17,8 @@
* @version $Id $
**/
-include '../../../include/cp_header.php';
-include 'admin_header.php';
+include_once dirname(__FILE__) . '../../../include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
@@ -28,4 +28,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -28,7 +28,7 @@
// URL: http://www.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -104,4 +104,4 @@
if ( isset($template_main) ) {
$GLOBALS['xoopsTpl']->display("db:{$template_main}");
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,5 +1,5 @@
<?php
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
if ( !isset($_REQUEST['uid']) ) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -335,4 +335,4 @@
}
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/index.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/index.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -28,7 +28,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include_once 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -49,5 +49,5 @@
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/permissions.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/permissions.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('permissions.php');
@@ -105,5 +105,5 @@
}
}
$form->display();
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -111,4 +111,4 @@
}
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('user.php');
@@ -212,5 +212,5 @@
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
//there is no way to override current tabs when using system menu
//this dirty hack will have to do it
@@ -96,5 +96,5 @@
$GLOBALS['xoopsTpl']->display("db:profile_admin_visibility.tpl");
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
//xoops_cp_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/install.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/install.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/install.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,6 +1,6 @@
INSTALL/UNISTALL
=================
-No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+No special measures necessary, follow the standard installation process – extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i)
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -107,7 +107,7 @@
if ($oldversion < 186) {
- // remove old html template files
+ // delete old html template files
$templateDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
$template_list = array_diff(scandir($templateDirectory), array('..', '.'));
foreach ($template_list as $k => $v) {
@@ -118,10 +118,14 @@
}
// Load class XoopsFile
xoops_load('xoopsfile');
- //remove /images directory
+ //delete /images directory
$imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
$folderHandler = XoopsFile::getHandler("folder", $imagesDirectory);
$folderHandler->delete($imagesDirectory);
+ //delete /templates/style.css file
+ $cssFile = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/style.css";
+ $folderHandler = XoopsFile::getHandler("file", $cssFile);
+ $folderHandler->delete($cssFile);
}
$profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n'));
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -39,8 +39,8 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion["module_status"] = "RC 2";
-$modversion['release_date'] = '2014/04/23';
+$modversion["module_status"] = "Final";
+$modversion['release_date'] = '2014/06/14';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion['min_php'] = '5.3.7';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,7 +1,7 @@
<?php
// $Id$
-include '../../../include/cp_header.php';
+include_once dirname(__FILE__) . '../../../include/cp_header.php';
$modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0;
// we don't want system module permissions to be changed here
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -91,7 +91,7 @@
function Blur(&$gdimg, $radius=0.5)
{
- // Taken from Torstein H\xF8nsi's phpUnsharpMask (see phpthumb.unsharp.php)
+ // Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
$radius = round(max(0, min($radius, 50)) * 2);
if (!$radius) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -3,7 +3,7 @@
////
//// Unsharp Mask for PHP - version 2.1.1
////
-//// Unsharp mask algorithm by Torstein H\xF8nsi 2003-07.
+//// Unsharp mask algorithm by Torstein Hønsi 2003-07.
//// thoensi_at_netcom_dot_no.
//// Please leave this notice.
////
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/docs/readme.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/docs/readme.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/docs/readme.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -12,4 +12,4 @@
- installer le plugin smarty function.block.php (http://www.xuups.com/modules/publisher/item.php?itemid=10) dans root/class/smarty/xoops_plugins/
- copier le fichier xo_block.html du dossier "extras" dans "xotpl"
- retirer les commentaires pour activer le template xo_block.html
-- \xE9diter le template xo_block.html et saissisez le num\xE9ro des blocs que vous d\xE9sirez afficher
\ No newline at end of file
+- éditer le template xo_block.html et saissisez le numéro des blocs que vous désirez afficher
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/docs/readme.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/docs/readme.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/docs/readme.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -10,5 +10,5 @@
Copy file function.xoMemberInfo.php (file in themename/extras/) in xoopssite/class/smarty/xoops_plugins
/* french */
-Installation : une fois l'archive d\xE9compress\xE9e, il faut t\xE9l\xE9verser le dossier du th\xE8me (et uniquement celui-ci) dans le r\xE9pertoire "themes" de votre site.
-Copier le fichier function.xoMemberInfo.php se trouvant dans le dossier "extras" du th\xE8me dans le dossier : xoopsite/class/smarty/xoops_plugins
\ No newline at end of file
+Installation : une fois l'archive décompressée, il faut téléverser le dossier du thème (et uniquement celui-ci) dans le répertoire "themes" de votre site.
+Copier le fichier function.xoMemberInfo.php se trouvant dans le dossier "extras" du thème dans le dossier : xoopsite/class/smarty/xoops_plugins
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README_PL.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README_PL.txt 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README_PL.txt 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,4 +1,4 @@
-Dokumentacja modu\xB3u:
+Dokumentacja modułu:
http://www.xoopswiki.org/wiki/index.php?title=Protector/pl
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -14,7 +14,7 @@
if ( version_compare( PHP_VERSION , '5.0.0' ) < 0 ) {
die( 'Turn postcommon_post_htmlpurify4everyone.php off because this filter cannot run with PHP4' ) ;
}
-
+/*
if ( file_exists( XOOPS_ROOT_PATH.'/class/icms.htmlpurifier.php' ) ) {
// use HTMLPurifier inside ImpressCMS
if ( ! class_exists( 'icms_HTMLPurifier' ) ) {
@@ -26,6 +26,7 @@
$this->method = 'icms_html_purifier' ;
} else {
+ */
// use HTMLPurifier inside Protector
require_once dirname(dirname(__FILE__)).'/library/HTMLPurifier.auto.php' ;
$config = HTMLPurifier_Config::createDefault();
@@ -34,7 +35,7 @@
//$config->set('HTML', 'Doctype', 'HTML 4.01 Transitional');
$this->purifier = new HTMLPurifier($config);
$this->method = 'purify' ;
- }
+// }
$_POST = $this->purify_recursive( $_POST ) ;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -23,7 +23,7 @@
if ( is_object( $xoopsUser ) ) {
return true ;
}
-
+/*
if ( file_exists( XOOPS_ROOT_PATH.'/class/icms.htmlpurifier.php' ) ) {
// use HTMLPurifier inside ImpressCMS
if ( ! class_exists( 'icms_HTMLPurifier' ) ) {
@@ -35,6 +35,7 @@
$this->method = 'icms_html_purifier' ;
} else {
+ */
// use HTMLPurifier inside Protector
require_once dirname(dirname(__FILE__)).'/library/HTMLPurifier.auto.php' ;
$config = HTMLPurifier_Config::createDefault();
@@ -43,7 +44,7 @@
//$config->set('HTML', 'Doctype', 'HTML 4.01 Transitional');
$this->purifier = new HTMLPurifier($config);
$this->method = 'purify' ;
- }
+// }
$_POST = $this->purify_recursive( $_POST ) ;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-06-14 13:32:08 UTC (rev 12592)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-06-14 16:04:02 UTC (rev 12593)
@@ -1,141 +1,141 @@
<?php
// start hack by Trabis
-if (!class_exists('ProtectorRegistry')) exit('Registry not found');
+if (!class_exists('ProtectorRegistry')) {
+ exit('Registry not found');
+}
-$registry =& ProtectorRegistry::getInstance();
-$mydirname = $registry->getEntry('mydirname');
-$mydirpath = $registry->getEntry('mydirpath');
-$language = $registry->getEntry('language');
+$registry =& ProtectorRegistry::getInstance();
+$mydirname = $registry->getEntry('mydirname');
+$mydirpath = $registry->getEntry('mydirpath');
+$language = $registry->getEntry('language');
// end hack by Trabis
-if( file_exists( dirname(__FILE__).'/language/'.$language.'/modinfo.php' ) ) {
- include dirname(__FILE__).'/language/'.$language.'/modinfo.php' ;
-} else if( file_exists( dirname(__FILE__).'/language/english/modinfo.php' ) ) {
- include dirname(__FILE__).'/language/english/modinfo.php' ;
+if (file_exists(dirname(__FILE__) . '/language/' . $language . '/modinfo.php')) {
+ include dirname(__FILE__) . '/language/' . $language . '/modinfo.php';
+} else {
+ if (file_exists(dirname(__FILE__) . '/language/english/modinfo.php')) {
+ include dirname(__FILE__) . '/language/english/modinfo.php';
+ }
}
-$constpref = '_MI_' . strtoupper( $mydirname ) ;
+$constpref = '_MI_' . strtoupper($mydirname);
// end hack
-$modversion['name'] = constant($constpref.'_NAME') ;
-$modversion['description'] = constant($constpref.'_DESC') ;
-$modversion['version'] = file_get_contents( dirname(__FILE__).'/include/version.txt' ) ;
-$modversion['credits'] = "PEAK Corp." ;
-$modversion['author'] = "GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/)" ;
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['official'] = 1 ;
-$modversion['image'] = file_exists( $mydirpath.'/module_icon.png' ) ? 'module_icon.png' : 'module_icon.php' ;
-$modversion['iconbig'] = 'module_icon.php?file=iconbig' ;
-$modversion['iconsmall'] = 'module_icon.php?file=iconsmall' ;
-$modversion['dirname'] = $mydirname ;
+$modversion['name'] = constant($constpref . '_NAME');
+$modversion['description'] = constant($constpref . '_DESC');
+$modversion['version'] = file_get_contents(dirname(__FILE__) . '/include/version.txt');
+$modversion['credits'] = "PEAK Corp.";
+$modversion['author'] = "GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/)";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['official'] = 1;
+$modversion['image'] = file_exists($mydirpath . '/module_icon.png') ? 'module_icon.png' : 'module_icon.php';
+$modversion['iconbig'] = 'module_icon.php?file=iconbig';
+$modversion['iconsmall'] = 'module_icon.php?file=iconsmall';
+$modversion['dirname'] = $mydirname;
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2014/02/05';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_status"] = "Final";
+$modversion['release_date'] = '2014/06/14';
+$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC 2";
-$modversion['min_php']='5.3.7';
-$modversion['min_xoops']="2.5.7";
-// start hack by Mage
-// Admin menu
-// Set to 1 if you want to display menu generated by system module
-$modversion['system_menu'] = 1 ;
-// end hack by Mage
+$modversion['min_php'] = '5.3.7';
+$modversion['min_xoops'] = "2.5.7";
// Any tables can't be touched by modulesadmin.
-$modversion['sqlfile'] = false ;
-$modversion['tables'] = array() ;
+$modversion['sqlfile'] = false;
+$modversion['tables'] = array();
// Admin things
-$modversion['hasAdmin'] = 1;
+$modversion['hasAdmin'] = 1;
+$modversion['system_menu'] = 1;
$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/admin_menu.php";
+$modversion['adminmenu'] = "admin/admin_menu.php";
// Templates
// Blocks
-$modversion['blocks'] = array() ;
+$modversion['blocks'] = array();
// Menu
$modversion['hasMain'] = 0;
// Config
$modversion['config'][1] = array(
- 'name' => 'global_disabled' ,
- 'title' => $constpref.'_GLOBAL_DISBL' ,
- 'description' => $constpref.'_GLOBAL_DISBLDSC' ,
- 'formtype' => 'yesno' ,
- 'valuetype' => 'int' ,
- 'default' => "0" ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'default_lang' ,
- 'title' => $constpref.'_DEFAULT_LANG' ,
- 'description' => $constpref.'_DEFAULT_LANGDSC' ,
- 'formtype' => 'text' ,
- 'valuetype' => 'text' ,
- 'default' => @$GLOBALS['xoopsConfig']['language'] ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'log_level' ,
- 'title' => $constpref.'_LOG_LEVEL' ,
- 'description' => '' ,
- 'formtype' => 'select' ,
- 'valuetype' => 'int' ,
- 'default' => 255 ,
- 'options' => array( $constpref.'_LOGLEVEL0' => 0 , $constpref.'_LOGLEVEL15' => 15 , $constpref.'_LOGLEVEL63' => 63 , $constpref.'_LOGLEVEL255' => 255 )
-) ;
-$modversion['config'][] = array(
- 'name' => 'banip_time0' ,
- 'title' => $constpref.'_BANIP_TIME0' ,
- 'description' => '' ,
- 'formtype' => 'text' ,
- 'valuetype' => 'int' ,
- 'default' => 86400 ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'reliable_ips' ,
- 'title' => $constpref.'_RELIABLE_IPS' ,
- 'description' => $constpref.'_RELIABLE_IPSDSC' ,
- 'formtype' => 'textarea' ,
- 'valuetype' => 'array' ,
- 'default' => "^192.168.|127.0.0.1" ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'session_fixed_topbit' ,
- 'title' => $constpref.'_HIJACK_TOPBIT' ,
- 'description' => $constpref.'_HIJACK_TOPBITDSC' ,
- 'formtype' => 'text' ,
- 'valuetype' => 'int' ,
- 'default' => 24 ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'groups_denyipmove' ,
- 'title' => $constpref.'_HIJACK_DENYGP' ,
- 'description' => $constpref.'_HIJACK_DENYGPDSC' ,
- 'formtype' => 'group_multi' ,
- 'valuetype' => 'array' ,
- 'default' => array(1) ,
- 'options' => array()
-) ;
-$modversion['config'][] = array(
- 'name' => 'san_nullbyte' ,
- 'title' => $constpref.'_SAN_NULLBYTE' ,
- 'description' => $constpref.'_SAN_NULLBYTEDSC' ,
- 'formtype' => 'yesno' ,
- 'valuetype' => 'int' ,
- 'default' => "1" ,
- 'options' => array()
-) ;
+ 'name' => 'global_disabled',
+ 'title' => $constpref . '_GLOBAL_DISBL',
+ 'description' => $constpref . '_GLOBAL_DISBLDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => "0",
+ 'options' => arr...
[truncated message content] |
