fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 08:41:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-05-26 06:58:12 +09:00 • committed by GitHub
commit cb1fd188ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 4286 additions and 5469 deletions
Download patch file Download diff file Expand all files Collapse all files

16
classes/context/Context.class.php
View file

@ -1120,6 +1120,14 @@ class Context
self::$_instance->security_check = 'DENY ALL';
self::$_instance->security_check_detail = 'ERR_UNSAFE_ENV';
}
if (PHP_VERSION_ID < 80000)
{
libxml_disable_entity_loader(true);
}
libxml_set_external_entity_loader(function($a, $b, $c) {
return null;
});
}
/**
@ -1261,10 +1269,6 @@ class Context
$GLOBALS['HTTP_RAW_POST_DATA'] = '';
return;
}
if (PHP_VERSION_ID < 80000)
{
libxml_disable_entity_loader(true);
}
$params = Rhymix\Framework\Parsers\XMLRPCParser::parse($GLOBALS['HTTP_RAW_POST_DATA']) ?: [];
}
elseif($request_method === 'JSON')
@ -1339,7 +1343,7 @@ class Context
unset($_FILES[$key]);
continue;
}
$val['name'] = str_replace('&amp;', '&', escape($val['name'], false));
$val['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name']);
self::set($key, $val, true);
self::set('is_uploaded', true);
self::$_instance->is_uploaded = true;
@ -1365,7 +1369,7 @@ class Context
break;
}
$file = array();
$file['name'] = str_replace('&amp;', '&', escape($val['name'][$i], false));
$file['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name'][$i]);
$file['type'] = $val['type'][$i];
$file['tmp_name'] = $val['tmp_name'][$i];
$file['error'] = $val['error'][$i];

2
classes/display/DisplayHandler.class.php
View file

@ -257,7 +257,7 @@ class DisplayHandler extends Handler
case 'HTML':
$json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0;
$panel_script = sprintf('<script src="%s%s?t=%d"></script>', RX_BASEURL, 'common/js/debug.js', filemtime(RX_BASEDIR . 'common/js/debug.js'));
$panel_script .= "\n<script>\nvar rhymix_debug_content = " . json_encode($data, $json_options) . ";\n</script>";
$panel_script .= "\n<script>\nRhymix.currentDebugData = " . json_encode($data, $json_options) . ";\n</script>";
$body_end_position = strrpos($output, '</body>') ?: strlen($output);
$output = substr($output, 0, $body_end_position) . "\n$panel_script\n" . substr($output, $body_end_position);
break;

134
classes/module/ModuleObject.class.php
View file

@ -249,7 +249,7 @@ class ModuleObject extends BaseObject
*/
public function setPrivileges()
{
if(!$this->user->isAdmin())
if (!$this->user->isAdmin())
{
// Get privileges(granted) information for target module by <permission check> of module.xml
if(($permission = $this->xml_info->action->{$this->act}->permission) && $permission->check_var)
@ -278,33 +278,28 @@ class ModuleObject extends BaseObject
foreach($check_module_srl as $target_srl)
{
// Get privileges(granted) information of current user for target module
if(($grant = ModuleModel::getInstance()->getPrivilegesBySrl($target_srl, $permission->check_type)) === false)
$check_grant = ModuleModel::getPrivilegesBySrl($target_srl, $permission->check_type);
if ($check_grant === false)
{
return false;
}
// Check permission
if(!$this->checkPermission($grant, $this->user))
if(!$this->checkPermission($check_grant, $this->user, $failed_requirement))
{
$this->stop($this->user->isMember() ? 'msg_not_permitted_act' : 'msg_not_logged');
$this->stop($this->_generatePermissionError($failed_requirement));
return false;
}
}
}
}
// If no privileges(granted) information, check permission by privileges(granted) information for current module
if(!isset($grant))
// Check permission based on the grant information for the current module.
$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
if(!$this->checkPermission($grant, $this->user, $failed_requirement))
{
// Get privileges(granted) information of current user for current module
$grant = ModuleModel::getInstance()->getGrant($this->module_info, $this->user, $this->xml_info);
// Check permission
if(!$this->checkPermission($grant, $this->user))
{
$this->stop($this->user->isMember() ? 'msg_not_permitted_act' : 'msg_not_logged');
return false;
}
$this->stop($this->_generatePermissionError($failed_requirement));
return false;
}
// If member action, grant access for log-in, sign-up, member pages
@ -313,7 +308,7 @@ class ModuleObject extends BaseObject
$grant->access = true;
}
// Set privileges(granted) variables
// Set aliases to grant object
$this->grant = $grant;
Context::set('grant', $grant);
@ -325,9 +320,10 @@ class ModuleObject extends BaseObject
*
* @param object $grant privileges(granted) information of user
* @param object $member_info member information
* @param string|array &$failed_requirement
* @return bool
*/
public function checkPermission($grant = null, $member_info = null)
public function checkPermission($grant = null, $member_info = null, &$failed_requirement = '')
{
// Get logged-in member information
if(!$member_info)
@ -356,21 +352,50 @@ class ModuleObject extends BaseObject
$permission = 'root';
}
// If permission is not or 'guest', Pass
if(empty($permission) || $permission == 'guest')
// If there is no permission or eveyone is allowed, pass
if (empty($permission) || $permission === 'guest' || $permission === 'everyone')
{
return true;
}
// If permission is 'member', check logged-in
else if($permission == 'member')
// If permission is 'member', the user must be logged in
if ($permission === 'member')
{
if($member_info->member_srl)
if ($member_info->member_srl)
{
return true;
}
else
{
$failed_requirement = 'member';
return false;
}
}
// If permission is 'not_member', the user must be logged out
if ($permission === 'not_member' || $permission === 'not-member')
{
if (!$member_info->member_srl || $grant->manager)
{
return true;
}
else
{
$failed_requirement = 'not_member';
return false;
}
}
// If permission is 'root', false
// Because an administrator who have root privilege(granted) was passed already
if ($permission == 'root')
{
$failed_requirement = 'root';
return false;
}
// If permission is 'manager', check 'is user have manager privilege(granted)'
else if(preg_match('/^(manager(?::(.+))?|([a-z0-9\_]+)-managers)$/', $permission, $type))
if (preg_match('/^(manager(?::(.+))?|([a-z0-9\_]+)-managers)$/', $permission, $type))
{
// If permission is manager(:scope), check manager privilege and scope
if ($grant->manager)
@ -404,32 +429,71 @@ class ModuleObject extends BaseObject
return true;
}
}
}
// If permission is 'root', false
// Because an administrator who have root privilege(granted) was passed already
else if($permission == 'root')
{
$failed_requirement = 'manager';
return false;
}
// If grant name, check the privilege(granted) of the user
else if($grant_names = explode(',', $permission))
{
$privilege_list = array_keys((array) $this->xml_info->grant);
foreach($grant_names as $name)
// Check grant name
// If multiple names are given, all of them must pass.
elseif ($grant_names = array_map('trim', explode(',', $permission)))
{
foreach ($grant_names as $name)
{
if(!in_array($name, $privilege_list) || !$grant->$name)
if (!isset($grant->{$name}))
{
return false;
}
if (!$grant->{$name})
{
$failed_requirement = $grant->whocan($name);
return false;
}
}
return true;
}
return false;
}
/**
* Generate an error message for a failed permission.
*
* @param mixed $failed_requirement
* @return string
*/
protected function _generatePermissionError($failed_requirement)
{
if ($failed_requirement === 'member' || !$this->user->isMember())
{
return 'msg_not_logged';
}
elseif ($failed_requirement === 'not_member')
{
return 'msg_required_not_logged';
}
elseif ($failed_requirement === 'manager' || $failed_requirement === 'root')
{
return 'msg_administrator_only';
}
elseif (is_array($failed_requirement) && count($failed_requirement))
{
if (class_exists('PointModel'))
{
$min_level = PointModel::getMinimumLevelForGroup($failed_requirement);
if ($min_level)
{
return sprintf(lang('member.msg_required_minimum_level'), $min_level);
}
}
return 'member.msg_required_specific_group';
}
else
{
return 'msg_not_permitted_act';
}
}
/**
* Stop processing this module instance.
*

150
classes/validator/Validator.class.php
View file

@ -30,31 +30,25 @@ class Validator
* rule list
* @var array
*/
var $_rules;
var $_rules = [];
/**
* filter list
* @var array
*/
var $_filters;
var $_filters = [];
/**
* custom message list
* @var array
*/
var $_message;
var $_message = [];
/**
* custom field name list
* @var array
*/
var $_fieldNames;
/**
* Can usable status for multibyte string function
* @var boolean
*/
var $_has_mb_func;
var $_fieldNames = [];
/**
* validator version
@ -75,12 +69,10 @@ class Validator
*/
function __construct($xml_path = '')
{
$this->_rules = array();
$this->_filters = array();
$this->_xml_ruleset = NULL;
if($xml_path)
if ($xml_path)
{
$this->load($xml_path);
}
// predefined rules
$this->addRule(array(
@ -93,8 +85,7 @@ class Validator
'float' => '/^\d+(\.\d+)?$/'
));
$this->_has_mb_func = is_callable('mb_strlen');
$this->setCacheDir(RX_BASEDIR . 'files/cache');
$this->_cache_dir = RX_BASEDIR . 'files/cache';
}
/**
@ -114,112 +105,26 @@ class Validator
*/
function load($xml_path)
{
$this->_xml_ruleset = NULL;
if(!is_readable($xml_path))
if (!file_exists($xml_path) || !is_file($xml_path) || !is_readable($xml_path))
{
return FALSE;
return false;
}
$parser = new XeXmlParser();
$xml = $parser->loadXmlFile($xml_path);
if(!isset($xml->ruleset) || !isset($xml->ruleset->fields) || !isset($xml->ruleset->fields->field))
$output = Rhymix\Framework\Parsers\RulesetParser::loadXML($xml_path);
if (!$output)
{
return FALSE;
return false;
}
$rules = array();
$messages = array();
// custom rules
if(isset($xml->ruleset->customrules) && isset($xml->ruleset->customrules->rule))
if ($output->rules)
{
$customrules = $xml->ruleset->customrules->rule;
if(!is_array($customrules))
{
$customrules = array($customrules);
}
foreach($customrules as $rule)
{
if(!isset($rule->attrs) || !isset($rule->attrs->name))
{
continue;
}
$message = $rule->message ? $rule->message->body : NULL;
$rule = (array) $rule->attrs;
$rule['message'] = $message;
$name = $rule['name'];
unset($rule['name']);
$rules[$name] = $rule;
if(isset($message))
{
$messages['invalid_' . $name] = $message;
}
}
if(count($rules))
{
$this->addRule($rules);
}
$this->addRule($output->rules);
}
// filters
$fields = $xml->ruleset->fields->field;
if(!is_array($fields))
{
$fields = array($fields);
}
$filters = array();
$fieldsNames = array();
foreach($fields as $field)
{
$name = '';
$filter = array();
if(!isset($field->attrs) || !isset($field->attrs->name))
{
continue;
}
$title = $field->title ? $field->title->body : NULL;
$filter = (array) $field->attrs;
$filter['title'] = $title;
$name = $filter['name'];
if(isset($title))
{
$fieldsNames[$name] = $title;
}
unset($filter['name']);
// conditional statement
if(isset($field->if))
{
$if = $field->if;
if(!is_array($if))
{
$if = array($if);
}
foreach($if as $idx => $cond)
{
$if[$idx] = (array) $cond->attrs;
}
$filter['if'] = $if;
}
$filters[$name] = $filter;
}
$this->_xml_ruleset = $xml->ruleset;
$this->_filters = $filters;
$this->_message = $messages;
$this->_fieldNames = $fieldsNames;
$this->_filters = $output->filters;
$this->_message = $output->messages;
$this->_fieldNames = $output->fieldsNames;
$this->_xml_path = $xml_path;
return TRUE;
return true;
}
/**
@ -389,7 +294,7 @@ class Validator
$strbytes = strlen($value);
if(!$is_min_b || !$is_max_b)
{
$strlength = $this->_has_mb_func ? mb_strlen($value, 'utf-8') : $this->mbStrLen($value);
$strlength = mb_strlen($value, 'UTF-8');
}
if(($min && $min > ($is_min_b ? $strbytes : $strlength)) || ($max && $max < ($is_max_b ? $strbytes : $strlength)))
@ -630,21 +535,6 @@ class Validator
return TRUE;
}
/**
* if not supported 'mb_strlen' function, this method can use.
* @param string $str
* @return int
*/
function mbStrLen($str)
{
$arr = count_chars($str);
for($i = 0x80; $i < 0xc0; $i++)
{
unset($arr[$i]);
}
return array_sum($arr);
}
/**
* Returns compiled javascript file path. The path begins from XE root directory.
* @return string Compiled JavaScript file path

238
classes/xml/XmlParser.class.php
View file

@ -1,240 +1,46 @@
<?php
/**
* Xml_Node_ class
* Element node or attribute node.
* @author NAVER (developers@xpressengine.com)
* @package /classes/xml
* @version 0.1
*/
#[AllowDynamicProperties]
class Xml_Node_
{
/** In PHP5 this will silence E_STRICT warnings
* for undeclared properties.
* No effect in PHP4
*/
function __get($name)
{
return NULL;
}
}
/**
* XmlParser class
* Class parsing a given xmlrpc request and creating a data object
* @remarks <pre>{
* This class may drops unsupported xml lanuage attributes when multiple language attributes are given.
* For example, if 'xml:lang='ko, en, ch, jp..' is given in a xml file, only ko will be left ignoring all other language
* attributes when kor is only supported language. It seems to work fine now but we did not scrutinze any potential side effects,
* }</pre>
* XML Parser class from XE
*
* @author NAVER (developers@xpressengine.com)
* @package /classes/xml
* @version 0.1
* Renamed because of conflict with built-in XMLParser class in PHP 8+
*
* @deprecated
*/
class XeXmlParser
{
/**
* Xml parser
* @var resource
* Load an XML file.
*
* @deprecated
* @param string $filename
* @return ?object
*/
var $oParser = NULL;
/**
* Input xml
* @var string
*/
var $input = NULL;
/**
* Output object in array
* @var array
*/
var $output = array();
/**
* The default language type
* @var string
*/
var $lang = "en";
/**
* Load a xml file specified by a filename and parse it to Return the resultant data object
* @param string $filename a file path of file
* @return object|null Returns a data object containing data extracted from a xml file or NULL if a specified file does not exist
*/
function loadXmlFile($filename)
public static function loadXmlFile($filename): ?object
{
if(!file_exists($filename))
$filename = strval($filename);
if (file_exists($filename))
{
return;
}
$buff = FileHandler::readFile($filename);
$oXmlParser = new self();
return $oXmlParser->parse($buff);
}
/**
* Parse xml data to extract values from it and construct data object
* @param string $input a data buffer containing xml data
* @param mixed $arg1 ???
* @param mixed $arg2 ???
* @return object|null Returns a resultant data object or NULL in case of error
*/
function parse($input = '', $arg1 = NULL, $arg2 = NULL)
{
// Save the compile starting time for debugging
$start = microtime(true);
$this->lang = Context::getLangType();
$this->input = $input ? $input : $GLOBALS['HTTP_RAW_POST_DATA'];
$this->input = str_replace(array('', ''), array('', ''), $this->input);
// extracts a supported language
preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
// extracts the supported lanuage when xml:lang is used
if(count($matches[1]) && $supported_lang = array_unique($matches[1]))
{
$tmpLangList = array_flip($supported_lang);
// if lang of the first log-in user doesn't exist, apply en by default if exists. Otherwise apply the first lang.
if(!isset($tmpLangList[$this->lang]))
{
if(isset($tmpLangList['en']))
{
$this->lang = 'en';
}
else
{
$this->lang = array_shift($supported_lang);
}
}
// uncheck the language if no specific language is set.
return Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($filename);
}
else
{
$this->lang = '';
}
$this->oParser = xml_parser_create('UTF-8');
//xml_set_object($this->oParser, $this);
xml_set_element_handler($this->oParser, [$this, "_tagOpen"], [$this, "_tagClosed"]);
xml_set_character_data_handler($this->oParser, [$this, "_tagBody"]);
xml_parse($this->oParser, $this->input);
xml_parser_free($this->oParser);
if(!count($this->output))
{
return;
}
$output = array_shift($this->output);
// Save compile starting time for debugging
if (!isset($GLOBALS['__xmlparse_elapsed__']))
{
$GLOBALS['__xmlparse_elapsed__'] = 0;
}
$GLOBALS['__xmlparse_elapsed__'] += microtime(true) - $start;
return $output;
}
/**
* Start element handler.
* @param resource $parse an instance of parser
* @param string $node_name a name of node
* @param array $attrs attributes to be set
* @return array
*/
function _tagOpen($parser, $node_name, $attrs)
{
$obj = new Xml_Node_();
$obj->node_name = strtolower($node_name);
$obj->attrs = $this->_arrToAttrsObj($attrs);
$this->output[] = $obj;
}
/**
* Character data handler
* Variable in the last element of this->output
* @param resource $parse an instance of parser
* @param string $body a data to be added
* @return void
*/
function _tagBody($parser, $body)
{
//if(!trim($body)) return;
$this->output[count($this->output) - 1]->body .= $body;
}
/**
* End element handler
* @param resource $parse an instance of parser
* @param string $node_name name of xml node
* @return void
*/
function _tagClosed($parser, $node_name)
{
$node_name = strtolower($node_name);
$cur_obj = array_pop($this->output);
$parent_obj = &$this->output[count($this->output) - 1];
if($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
{
return;
}
if($this->lang && ($parent_obj->{$node_name}->attrs->{'xml:lang'} ?? null) && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
{
return;
}
if(isset($parent_obj->{$node_name}))
{
$tmp_obj = $parent_obj->{$node_name};
if(is_array($tmp_obj))
{
$parent_obj->{$node_name}[] = $cur_obj;
}
else
{
$parent_obj->{$node_name} = array($tmp_obj, $cur_obj);
}
}
else
{
if(!is_object($parent_obj))
{
$parent_obj = (object) $parent_obj;
}
$parent_obj->{$node_name} = $cur_obj;
return null;
}
}
/**
* Method to transfer values in an array to a data object
* @param array $arr data array
* @return Xml_Node_ object
* Load an XML string.
*
* @deprecated
* @param string $$input
* @return ?object
*/
function _arrToAttrsObj($arr)
function parse($input = ''): ?object
{
$output = new Xml_Node_();
foreach($arr as $key => $val)
{
$key = strtolower($key);
$output->{$key} = $val;
}
return $output;
$input = strval($input !== '' ? $input : $GLOBALS['HTTP_RAW_POST_DATA']);
return Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($input);
}
}
/**

4
common/css/rhymix.scss
View file

@ -10,6 +10,10 @@ article, aside, details, figcaption, figure, footer, header, hgroup, nav, sectio
}
body {
position: relative;
&.rx_modal_open {
overflow: hidden;
position: fixed;
}
}
a img {
border: 0;

4
common/framework/DB.php
View file

@ -782,11 +782,11 @@ class DB
$table = Parsers\DBTableParser::loadXML($filename, $content);
if (!$table)
{
return $this->setError(-1, 'Table creation failed.');
return $this->setError(-1, 'Failed to load table schema file');
}
if ($table->deleted)
{
return new Helpers\DBResultHelper;
return new Helpers\DBResultHelper(-1, 'Table is marked as deleted');
}
// Generate the CREATE TABLE query and execute it.

4
common/framework/Password.php
View file

@ -128,12 +128,12 @@ class Password
$algorithm = $config->password_hashing_algorithm ?? '';
if (strval($algorithm) === '')
{
$algorithm = 'md5';
$algorithm = self::getBestSupportedAlgorithm();
}
}
else
{
$algorithm = 'md5';
$algorithm = self::getBestSupportedAlgorithm();
}
return $algorithm;
}

61
common/framework/Queue.php
View file

@ -11,6 +11,14 @@ class Queue
* Static properties.
*/
protected static $_drivers = [];
protected static $_signal = 0;
/**
* Priority constants.
*/
public const PRIORITY_HIGH = 'high';
public const PRIORITY_NORMAL = 'normal';
public const PRIORITY_LOW = 'low';
/**
* Add a custom Queue driver.
@ -120,9 +128,10 @@ class Queue
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public static function addTask(string $handler, ?object $args = null, ?object $options = null): int
public static function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
$driver_name = config('queue.driver');
if (!$driver_name)
@ -136,7 +145,7 @@ class Queue
throw new Exceptions\FeatureDisabled('Queue not configured');
}
return $driver->addTask($handler, $args, $options);
return $driver->addTask($handler, $args, $options, $priority);
}
/**
@ -149,9 +158,10 @@ class Queue
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public static function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null): int
public static function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
if (!config('queue.enabled'))
{
@ -160,7 +170,7 @@ class Queue
// This feature always uses the DB driver.
$driver = self::getDbDriver();
return $driver->addTaskAt($time, $handler, $args, $options);
return $driver->addTaskAt($time, $handler, $args, $options, $priority);
}
/**
@ -337,6 +347,11 @@ class Queue
foreach ($tasks as $task)
{
self::_executeTask($task);
if (self::signalReceived())
{
return;
}
}
}
if ($index === 1 || $count < 2)
@ -347,6 +362,11 @@ class Queue
{
$db_driver->updateLastRunTimestamp($task);
self::_executeTask($task);
if (self::signalReceived())
{
return;
}
}
}
@ -359,6 +379,11 @@ class Queue
if ($task)
{
self::_executeTask($task);
if (self::signalReceived())
{
return;
}
}
// If the timeout is imminent, break the loop.
@ -374,6 +399,12 @@ class Queue
{
usleep(intval((1 - $loop_elapsed_time) * 1000000));
}
// Check for a signal again after the sleep.
if (self::signalReceived())
{
break;
}
}
}
@ -479,4 +510,26 @@ class Queue
]));
}
}
/**
* Signal handler.
*
* @param int $signal
* @param mixed $siginfo
* @return void
*/
public static function signalHandler(int $signal, $siginfo): void
{
self::$_signal = $signal;
}
/**
* Has a signal been received?
*
* @return int
*/
public static function signalReceived(): int
{
return self::$_signal;
}
}

3
common/framework/drivers/QueueInterface.php
View file

@ -57,9 +57,10 @@ interface QueueInterface
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public function addTask(string $handler, ?object $args = null, ?object $options = null): int;
public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int;
/**
* Get the next task from the queue.

51
common/framework/drivers/queue/db.php
View file

@ -89,14 +89,43 @@ class DB implements QueueInterface
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public function addTask(string $handler, ?object $args = null, ?object $options = null): int
public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
$oDB = RFDB::getInstance();
$stmt = $oDB->prepare('INSERT INTO task_queue (handler, args, options, regdate) VALUES (?, ?, ?, ?)');
$result = $stmt->execute([$handler, serialize($args), serialize($options), date('Y-m-d H:i:s')]);
return $result ? $oDB->getInsertID() : 0;
if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
{
$stmt = $oDB->query('SELECT MIN(id) AS min_id FROM task_queue');
$min_id = intval($stmt->fetchColumn());
$stmt->closeCursor();
$id = $min_id ? ($min_id - rand(1, 10)) : null;
}
else
{
$min_id = null;
$id = null;
}
$stmt = $oDB->prepare('INSERT INTO task_queue (id, handler, args, options, regdate) VALUES (?, ?, ?, ?, ?)');
$result = $stmt->execute([
$id,
$handler,
serialize($args),
serialize($options),
date('Y-m-d H:i:s'),
]);
if ($result)
{
return $id ?? $oDB->getInsertID();
}
else
{
return 0;
}
}
/**
@ -106,10 +135,20 @@ class DB implements QueueInterface
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null): int
public function addTaskAt(int $time, string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
{
$time = $time - 1;
}
elseif ($priority === \Rhymix\Framework\Queue::PRIORITY_LOW)
{
$time = $time + 1;
}
$oDB = RFDB::getInstance();
$task_srl = getNextSequence();
$stmt = $oDB->prepare(trim(<<<END
@ -117,6 +156,7 @@ class DB implements QueueInterface
(task_srl, task_type, first_run, handler, args, options, regdate)
VALUES (?, ?, ?, ?, ?, ?, ?)
END));
$result = $stmt->execute([
$task_srl,
'once',
@ -126,6 +166,7 @@ class DB implements QueueInterface
serialize($options),
date('Y-m-d H:i:s'),
]);
return $result ? $task_srl : 0;
}

3
common/framework/drivers/queue/dummy.php
View file

@ -92,9 +92,10 @@ class Dummy implements QueueInterface
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public function addTask(string $handler, ?object $args = null, ?object $options = null): int
public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
$this->_dummy_queue = (object)[
'handler' => $handler,

12
common/framework/drivers/queue/redis.php
View file

@ -133,9 +133,10 @@ class Redis implements QueueInterface
* @param string $handler
* @param ?object $args
* @param ?object $options
* @param ?string $priority
* @return int
*/
public function addTask(string $handler, ?object $args = null, ?object $options = null): int
public function addTask(string $handler, ?object $args = null, ?object $options = null, ?string $priority = null): int
{
$value = serialize((object)[
'handler' => $handler,
@ -145,7 +146,14 @@ class Redis implements QueueInterface
if ($this->_conn)
{
$result = $this->_conn->rPush($this->_key, $value);
if ($priority === \Rhymix\Framework\Queue::PRIORITY_HIGH)
{
$result = $this->_conn->lPush($this->_key, $value);
}
else
{
$result = $this->_conn->rPush($this->_key, $value);
}
return intval($result);
}
else

3
common/framework/filters/FilenameFilter.php
View file

@ -34,6 +34,9 @@ class FilenameFilter
$filename = preg_replace('/__+/', '_', $filename);
$filename = preg_replace('/\.\.+/', '.', $filename);
// Remove potentially misleading double extensions.
$filename = preg_replace('/\.(?:php[\d|s]?|txt|pdf|zip|com|exe|bat|msi|scr|jsp|aspx?|docx?|xlsx?|pptx?|hwpx?)\s?(\.[a-z0-9]+)$/', '$1', $filename);
// Change .php files to .phps to make them non-executable.
if (strtolower(substr($filename, strlen($filename) - 4)) === '.php')
{

96
common/framework/parsers/AddonInfoParser.php Normal file
View file

@ -0,0 +1,96 @@
<?php
namespace Rhymix\Framework\Parsers;
/**
* Addon (info.xml) parser class for XE compatibility.
*/
class AddonInfoParser extends BaseParser
{
/**
* Load an XML file.
*
* @param string $filename
* @param string $addon_name
* @param string $lang
* @return ?object
*/
public static function loadXML(string $filename, string $addon_name, string $lang = ''): ?object
{
// Load the XML file.
$xml = simplexml_load_string(file_get_contents($filename));
if ($xml === false)
{
return null;
}
// Get the current language.
$lang = $lang ?: (\Context::getLangType() ?: 'en');
// Initialize the addon definition.
$info = new \stdClass;
$info->addon_name = $addon_name;
// Get the XML schema version.
$version = strval($xml['version']) ?: '0.1';
// Parse version 0.2
if ($version === '0.2')
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version);
$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
foreach ($xml->author as $author)
{
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link'] ?? '');
$info->author[] = $author_info;
}
}
// Parse version 0.1
else
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
$info->version = trim($xml['version'] ?? '');
$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
$author_info->email_address = trim($xml->author['email_address']);
$author_info->homepage = trim($xml->author['link'] ?? '');
$info->author[] = $author_info;
}
// Get extra_vars.
if ($xml->extra_vars)
{
$info->extra_vars = get_object_vars(self::_getExtraVars($xml->extra_vars, $lang, 'addon'));
}
else
{
$info->extra_vars = [];
}
// Prepare additional fields that will be filled in later.
$info->is_enabled = (object)['pc' => false, 'mobile' => false];
$info->xe_run_method = 'run_selected';
$info->mid_list = [];
// Return the complete result.
return $info;
}
}

97
common/framework/parsers/BaseParser.php
View file

@ -10,7 +10,7 @@ abstract class BaseParser
/**
* Get all attributes of an element as an associative array.
*
* @param SimpleXMLElement $element
* @param \SimpleXMLElement $element
* @param bool $normalize
* @return array
*/
@ -31,7 +31,7 @@ abstract class BaseParser
/**
* Get the string value of an XML attribute after normalizing its name.
*
* @param SimpleXMLElement $element
* @param \SimpleXMLElement $element
* @param string $name
* @return string
*/
@ -55,7 +55,7 @@ abstract class BaseParser
* A value that is identical to the name of the attribute will be treated as true.
* Other values will be passed to toBool() for evaluation.
*
* @param SimpleXMLElement $element
* @param \SimpleXMLElement $element
* @param string $name
* @return bool
*/
@ -77,7 +77,7 @@ abstract class BaseParser
/**
* Get the contents of child elements that match a language.
*
* @param SimpleXMLElement $parent
* @param \SimpleXMLElement $parent
* @param string $tag_name
* @param string $lang
* @return string
@ -107,46 +107,113 @@ abstract class BaseParser
/**
* Parse extra_vars.
*
* @param SimpleXMLElement $extra_vars
* @param \SimpleXMLElement $extra_vars
* @param string $lang
* @param string $type
* @return object
*/
protected static function _getExtraVars(\SimpleXMLElement $extra_vars, string $lang): \stdClass
protected static function _getExtraVars(\SimpleXMLElement $extra_vars, string $lang, string $type = ''): \stdClass
{
$result = new \stdClass;
// Recurse into groups.
$group_name = $extra_vars->getName() === 'group' ? self::_getChildrenByLang($extra_vars, 'title', $lang) : null;
foreach ($extra_vars->group ?: [] as $group)
{
$group_result = self::_getExtraVars($group, $lang);
$group_result = self::_getExtraVars($group, $lang, $type);
foreach ($group_result as $key => $val)
{
$result->{$key} = $val;
}
}
// Parse each variable in the group.
foreach ($extra_vars->var ?: [] as $var)
{
$item = new \stdClass;
$item->group = $group_name;
$item->name = trim($var['name']);
$item->type = trim($var['type']) ?: 'text';
// id and name
if ($type === 'widget' || $type === 'widgetstyle')
{
$item->id = trim($var['id'] ?? '') ?: trim($var->id);
if (!$item->id)
{
$item->id = trim($var['name'] ?? '');
}
$item->name = self::_getChildrenByLang($var, 'name', $lang);
if (!$item->name)
{
$item->name = self::_getChildrenByLang($var, 'title', $lang);
}
}
else
{
$item->name = trim($var['name'] ?? '');
}
// type
$item->type = trim($var['type'] ?? '');
if (!$item->type)
{
$item->type = trim($var->type) ?: 'text';
}
if ($item->type === 'filebox' && isset($var->type))
{
$item->filter = trim($var->type['filter'] ?? '');
$item->allow_multiple = trim($var->type['allow_multiple'] ?? '');
}
// Other common attributes
$item->title = self::_getChildrenByLang($var, 'title', $lang);
$item->description = str_replace('\\n', "\n", self::_getChildrenByLang($var, 'description', $lang));
$item->default = trim($var['default']) ?: null;
$item->default = trim($var['default'] ?? '') ?: null;
if (!isset($item->default))
{
$item->default = self::_getChildrenByLang($var, 'default', $lang);
}
$item->value = null;
// Options
if ($var->options)
{
$item->options = array();
foreach ($var->options as $option)
{
$option_item = new \stdClass;
$option_item->title = self::_getChildrenByLang($option, 'title', $lang);
$option_item->value = trim($option['value']);
$item->options[$option_item->value] = $option_item;
if ($type === 'widget' || $type === 'widgetstyle')
{
$value = trim($option->value ?? '');
$item->options[$value] = self::_getChildrenByLang($option, 'name', $lang);
if ($option['default'] === 'true')
{
$item->default_options[$value] = true;
}
if ($option['init'] === 'true')
{
$item->init_options[$value] = true;
}
}
else
{
$option_item = new \stdClass;
$option_item->title = self::_getChildrenByLang($option, 'title', $lang);
$option_item->value = trim($option['value'] ?? '') ?: trim($option->value ?? '');
$item->options[$option_item->value] = $option_item;
}
}
}
$result->{$item->name} = $item;
// Add to list of variables
if ($type === 'widget' || $type === 'widgetstyle')
{
$result->{$item->id} = $item;
}
else
{
$result->{$item->name} = $item;
}
}
return $result;
}
}

4
common/framework/parsers/DBQueryParser.php
View file

@ -31,7 +31,7 @@ class DBQueryParser extends BaseParser
/**
* Parse a query.
*
* @param SimpleXMLElement $xml
* @param \SimpleXMLElement $xml
* @param string $name
* @return object
*/
@ -248,7 +248,7 @@ class DBQueryParser extends BaseParser
/**
* Parse conditions.
*
* @param SimpleXMLElement $parent
* @param \SimpleXMLElement $parent
* @return array
*/
protected static function _parseConditions(\SimpleXMLElement $parent): array

8
common/framework/parsers/DBTableParser.php
View file

@ -33,7 +33,7 @@ class DBTableParser extends BaseParser
* @param string $content
* @return ?object
*/
public static function loadXML(string $filename = '', string $content = ''): object
public static function loadXML(string $filename = '', string $content = ''): ?object
{
// Load the XML content.
if ($content)
@ -61,10 +61,10 @@ class DBTableParser extends BaseParser
$table->name = strval($xml['name']);
}
$deleted = strval($xml['deleted']);
if ($deleted !== '')
$is_deleted = strval($xml['deleted']);
if ($is_deleted !== '')
{
$table->deleted = toBool($deleted);
$table->is_deleted = toBool($is_deleted);
}
// Load columns.

57
common/framework/parsers/EditorComponentParser.php
View file

@ -31,29 +31,58 @@ class EditorComponentParser extends BaseParser
$info = new \stdClass;
$info->component_name = $component_name;
// Get basic information.
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version ?? '');
$info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->homepage ?? '');
$info->license = trim($xml->license ?? '');
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
// Get the XML schema version.
$version = strval($xml['version']) ?: '0.1';
foreach ($xml->author as $author)
// Parse version 0.2
if ($version === '0.2')
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version ?? '');
$info->date = date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license ?? '');
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
foreach ($xml->author as $author)
{
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link'] ?? '');
$info->author[] = $author_info;
}
}
// Parse version 0.1
else
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
$info->version = trim($xml['version'] ?? '');
$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
$info->homepage = trim($xml->link) ?: trim($xml->homepage);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link'] ?? '');
$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
$author_info->email_address = trim($xml->author['email_address']);
$author_info->homepage = trim($xml->author['link'] ?? '');
$info->author[] = $author_info;
}
// Get extra_vars.
if ($xml->extra_vars)
{
$info->extra_vars = self::_getExtraVars($xml->extra_vars, $lang);
$info->extra_vars = self::_getExtraVars($xml->extra_vars, $lang, 'editor_component');
}
else
{
$info->extra_vars = new \stdClass;
}
// Return the complete result.

97
common/framework/parsers/RulesetParser.php Normal file
View file

@ -0,0 +1,97 @@
<?php
namespace Rhymix\Framework\Parsers;
/**
* Ruleset XML parser class for XE compatibility.
*/
class RulesetParser extends BaseParser
{
/**
* Load an XML file.
*
* @param string $filename
* @param string $lang
* @return ?object
*/
public static function loadXML(string $filename, string $lang = ''): ?object
{
// Load the XML file.
$xml = simplexml_load_string(file_get_contents($filename));
if ($xml === false)
{
return null;
}
// Get the current language.
$lang = $lang ?: (\Context::getLangType() ?: 'en');
// Initialize the result object.
$info = new \stdClass;
$info->rules = [];
$info->messages = [];
$info->filters = [];
$info->fieldsNames = [];
// Parse custom rules.
if ($xml->customrules && $xml->customrules->rule)
{
foreach ($xml->customrules->rule as $rule)
{
$def = [];
foreach ($rule->attributes() as $key => $val)
{
$def[trim($key)] = trim($val);
}
$def['message'] = self::_getChildrenByLang($rule, 'message', $lang) ?: null;
unset($def['name']);
$rule_name = trim($rule['name']);
$info->rules[$rule_name] = $def;
if ($def['message'])
{
$info->messages['invalid_' . $rule_name] = $def['message'];
}
}
}
// Parse field filters.
if ($xml->fields && $xml->fields->field)
{
foreach ($xml->fields->field as $field)
{
$def = [];
foreach ($field->attributes() as $key => $val)
{
$def[trim($key)] = trim($val);
}
$def['title'] = self::_getChildrenByLang($field, 'title', $lang) ?: null;
unset($def['name']);
if ($field->if)
{
foreach ($field->if as $if)
{
$condition = [];
foreach ($if->attributes() as $key => $val)
{
$condition[trim($key)] = trim($val);
}
$def['if'][] = $condition;
}
}
$filter_name = trim($field['name']);
$info->filters[$filter_name] = $def;
if ($def['title'])
{
$info->fieldsNames[$filter_name] = $def['title'];
}
}
}
return $info;
}
}

96
common/framework/parsers/WidgetInfoParser.php Normal file
View file

@ -0,0 +1,96 @@
<?php
namespace Rhymix\Framework\Parsers;
/**
* Widget (info.xml) parser class for XE compatibility.
*/
class WidgetInfoParser extends BaseParser
{
/**
* Load an XML file.
*
* @param string $filename
* @param string $widget_name
* @param string $lang
* @return ?object
*/
public static function loadXML(string $filename, string $widget_name, string $lang = ''): ?object
{
// Load the XML file.
$xml = simplexml_load_string(file_get_contents($filename));
if ($xml === false)
{
return null;
}
// Get the current language.
$lang = $lang ?: (\Context::getLangType() ?: 'en');
// Initialize the widget definition.
$info = new \stdClass;
$info->widget = $widget_name;
$info->path = sprintf('./widgets/%s/', $widget_name);
// Get the XML schema version.
$version = strval($xml['version']) ?: '0.1';
// Parse version 0.2
if ($version === '0.2')
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version);
$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
foreach ($xml->author as $author)
{
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link'] ?? '');
$info->author[] = $author_info;
}
}
// Parse version 0.1
else
{
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml->author, 'description', $lang);
$info->version = trim($xml['version'] ?? '');
$info->date = date('Ymd', strtotime($xml->author['date'] . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
$info->author = array();
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($xml->author, 'name', $lang);
$author_info->email_address = trim($xml->author['email_address']);
$author_info->homepage = trim($xml->author['link'] ?? '');
$info->author[] = $author_info;
}
// Get extra_vars.
if ($xml->extra_vars)
{
$info->extra_var = self::_getExtraVars($xml->extra_vars, $lang, 'widget');
}
else
{
$info->extra_var = new \stdClass;
}
// Prepare additional fields that will be filled in later.
$info->widget_srl = null;
$info->widget_title = null;
// Return the complete result.
return $info;
}
}

83
common/framework/parsers/WidgetStyleInfoParser.php Normal file
View file

@ -0,0 +1,83 @@
<?php
namespace Rhymix\Framework\Parsers;
/**
* Widget Style (info.xml) parser class for XE compatibility.
*/
class WidgetStyleInfoParser extends BaseParser
{
/**
* Load an XML file.
*
* @param string $filename
* @param string $widgetstyle_name
* @param string $lang
* @return ?object
*/
public static function loadXML(string $filename, string $widgetstyle_name, string $lang = ''): ?object
{
// Load the XML file.
$xml = simplexml_load_string(file_get_contents($filename));
if ($xml === false)
{
return null;
}
// Get the current language.
$lang = $lang ?: (\Context::getLangType() ?: 'en');
// Initialize the widget definition.
$info = new \stdClass;
$info->widgetStyle = $widgetstyle_name;
$info->path = sprintf('./widgetstyles/%s/', $widgetstyle_name);
// Parse common fields.
$info->title = self::_getChildrenByLang($xml, 'title', $lang);
$info->description = self::_getChildrenByLang($xml, 'description', $lang);
$info->version = trim($xml->version);
$info->date = ($xml->date === 'RX_CORE') ? '' : date('Ymd', strtotime($xml->date . 'T12:00:00Z'));
$info->homepage = trim($xml->link);
$info->license = trim($xml->license);
$info->license_link = trim($xml->license['link'] ?? '');
// Parse the preview image.
$preview_filename = trim($xml->preview ?? 'preview.jpg');
$preview_path = sprintf('%s%s', $info->path, $preview_filename);
if (file_exists($preview_path))
{
$info->preview = $preview_path;
}
else
{
$info->preview = null;
}
// Parse the author list.
$info->author = array();
foreach ($xml->author as $author)
{
$author_info = new \stdClass;
$author_info->name = self::_getChildrenByLang($author, 'name', $lang);
$author_info->email_address = trim($author['email_address'] ?? '');
$author_info->homepage = trim($author['link'] ?? '');
$info->author[] = $author_info;
}
// Get extra_vars.
if ($xml->extra_vars)
{
$info->extra_var = self::_getExtraVars($xml->extra_vars, $lang, 'widget');
}
else
{
$info->extra_var = new \stdClass;
}
// Count extra vars.
$info->extra_var_count = count(get_object_vars($info->extra_var));
// Return the complete result.
return $info;
}
}

116
common/framework/parsers/XEXMLParser.php Normal file
View file

@ -0,0 +1,116 @@
<?php
namespace Rhymix\Framework\Parsers;
/**
* Generic XML parser that produces output identical to XE's XML parser.
*/
#[\AllowDynamicProperties]
class XEXMLParser
{
/**
* Load an XML file.
*
* @param string $filename
* @param string $lang
* @return ?self
*/
public static function loadXMLFile(string $filename, string $lang = ''): ?self
{
$content = file_get_contents($filename);
return self::loadXMLString($content, $lang);
}
/**
* Load an XML file.
*
* @param string $filename
* @param string $lang
* @return ?self
*/
public static function loadXMLString(string $content, string $lang = ''): ?self
{
// Apply transformations identical to XE's XML parser.
$content = str_replace([chr(1), chr(2)], ['', ''], $content);
$xml = simplexml_load_string($content);
if ($xml === false)
{
return null;
}
// Get the current language.
$lang = $lang ?: (\Context::getLangType() ?: 'en');
// Create the result object.
$result = new self;
$root_name = $xml->getName();
$result->$root_name = self::_recursiveConvert($xml, $lang);
return $result;
}
/**
* Convert an XML node recursively.
*
* @param \SimpleXMLElement $element
* @param string $lang
* @return self
*/
protected static function _recursiveConvert(\SimpleXMLElement $element, string $lang): self
{
// Create the basic structure of the node.
$node = new self;
$node->node_name = $element->getName();
$node->attrs = new self;
$node->body = trim($element->__toString());
// Add attributes.
$attrs = $element->attributes();
foreach ($attrs as $key => $val)
{
$node->attrs->{$key} = trim($val);
}
$attrs = $element->attributes('xml', true);
foreach ($attrs as $key => $val)
{
$node->attrs->{"xml:$key"} = trim($val);
}
// Recursively process child elements.
foreach ($element->children() as $child)
{
// Skip children that do not match the language.
$attrs = $child->attributes('xml', true);
if (isset($attrs['lang']) && strval($attrs['lang']) !== $lang)
{
continue;
}
$child_name = $child->getName();
$child_node = self::_recursiveConvert($child, $lang);
if (!isset($node->$child_name))
{
$node->$child_name = $child_node;
}
elseif (is_array($node->$child_name))
{
$node->$child_name[] = $child_node;
}
else
{
$node->$child_name = [$node->$child_name, $child_node];
}
}
return $node;
}
/**
* Hack to prevent undefined property errors.
*
* @param string $name
*/
public function __get($name)
{
return isset($this->$name) ? $this->$name : null;
}
}

2
common/framework/parsers/dbtable/Table.php
View file

@ -12,7 +12,7 @@ class Table
public $indexes = array();
public $primary_key = array();
public $constraints = array();
public $deleted = false;
public $is_deleted = false;
/**
* Generate the CREATE TABLE query for this table.

3029
common/js/common.js
View file

File diff suppressed because it is too large Load diff

14
common/js/debug.js
View file

@ -40,7 +40,7 @@ $(function() {
}));
// Define a function for adding debug data to the panel.
window.rhymix_debug_add_data = function(data, open) {
Rhymix.addDebugData = function(data, open) {
// Define loop variables.
var i, j, entry, num, cnt, backtrace, description;
@ -238,15 +238,15 @@ $(function() {
};
// Add debug data from the current request.
if (window.rhymix_debug_content) {
window.rhymix_debug_content.page_title = 'MAIN PAGE';
rhymix_debug_add_data(window.rhymix_debug_content, true);
if (Rhymix.currentDebugData) {
Rhymix.currentDebugData.page_title = 'MAIN PAGE';
Rhymix.addDebugData(Rhymix.currentDebugData, true);
}
// Add debug data from pending AJAX requests.
if (window.rhymix_debug_pending_data) {
while (window.rhymix_debug_pending_data.length) {
rhymix_debug_add_data(window.rhymix_debug_pending_data.shift());
if (Rhymix.pendingDebugData) {
while (Rhymix.pendingDebugData.length) {
Rhymix.addDebugData(Rhymix.pendingDebugData.shift());
}
}
});

2
common/js/js_app.js
View file

@ -261,7 +261,7 @@
}
window.xe = $.extend(_app_base, _xe_base);
window.xe.lang = {}; // language repository
window.xe.lang = Rhymix.langCodes;
// domready event
$(function(){ xe.broadcast('ONREADY'); });

2
common/js/plugins/ckeditor/ckeditor/plugins/rx_paste/plugin.js
View file

@ -102,7 +102,7 @@ CKEDITOR.plugins.add('rx_paste', {
* Display an error message.
*/
const displayError = function(type, message) {
alert(window.xe.msg_file_upload_error + ' (Type ' + type + ")\n" + message);
alert(Rhymix.lang('msg_file_upload_error') + ' (Type ' + type + ")\n" + message);
};
}

16
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -106,7 +106,7 @@
$.each(item.files, function(index, file) {
if(data.settings.maxFileSize > 0 && data.settings.maxFileSize < file.size) {
dfd.reject();
alert(window.xe.msg_exceeds_limit_size);
alert(window.xe.lang.msg_exceeds_limit_size);
return false;
}
dfd.resolve();
@ -133,19 +133,19 @@
if (res.result.message) {
alert(res.result.message);
} else {
alert(window.xe.msg_file_upload_error + " (Type 1)");
alert(window.xe.lang.msg_file_upload_error + " (Type 1)");
}
return chunkStatus = false;
}
} else {
alert(window.xe.msg_file_upload_error + " (Type 2)");
alert(window.xe.lang.msg_file_upload_error + " (Type 2)");
return chunkStatus = false;
}
},
chunkfail: function(e, res) {
lastUploadTime = Date.now();
if (chunkStatus) {
alert(window.xe.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
alert(window.xe.lang.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
return chunkStatus = false;
}
},
@ -162,14 +162,14 @@
var result = res.response().result;
var temp_code = '';
if (!result) {
alert(window.xe.msg_file_upload_error + " (Type 4)");
alert(window.xe.lang.msg_file_upload_error + " (Type 4)");
return false;
}
if (!jQuery.isPlainObject(result)) {
result = jQuery.parseJSON(result);
}
if (!result) {
alert(window.xe.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
alert(window.xe.lang.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
return false;
}
@ -215,7 +215,7 @@
return false;
} else {
$container.data('editorStatus', null);
alert(window.xe.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
alert(window.xe.lang.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
return false;
}
},
@ -229,7 +229,7 @@
}
}, 1000);
if (chunkStatus) {
alert(window.xe.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
alert(window.xe.lang.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
return false;
}
},

459
common/js/unittest/JSSpec/COPYING
View file

@ -1,459 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser 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 Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "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
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY 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
LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS

1548
common/js/unittest/JSSpec/JSSpec.js
View file

File diff suppressed because it is too large Load diff

210
common/js/unittest/JSSpec/demo.html
View file

@ -1,210 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<title>JSSpec results</title>
<link rel="stylesheet" type="text/css" href="../css/JSSpec.css" />
<script type="text/javascript" src="diff_match_patch.js"></script>
<script type="text/javascript" src="JSSpec.js"></script>
<script type="text/javascript">// <![CDATA[
describe('Foo (base)', {
'before': function() {
target = {sayFoo: function() {return "foo";}};
},
'should say "foo"': function() {
value_of(target.sayFoo()).should_be("foo");
}
})
describe('Boo (derived)', {
'before': function() {
target = {
sayFoo: function() {return "foo";},
sayBar: function() {return "bar";}
};
},
'should also say "bar"': function() {
value_of(target.sayBar()).should_be("bar");
}
}, 'Foo (base)')
describe('Plus operator (just for example)', {
'should concatenate two strings': function() {
value_of("Hello " + "World").should_be("Hello World");
},
'should add two numbers': function() {
value_of(1 + 2).should_be(3);
}
})
describe('"Should match"s', {
'Should match': function() {
value_of("Hello").should_match(/ell/);
},
'Should match 1': function() {
value_of("Hello").should_match(/x/);
},
'Should match 2': function() {
value_of([1,2,3]).should_match(/x/);
},
'Should not match 1': function() {
value_of("Hello").should_not_match(/ell/);
},
'Should not match 2': function() {
value_of([1,2,3]).should_not_match(/x/);
}
})
describe('"Should include"s', {
'Should include': function() {
value_of([1,2,3]).should_include(4);
},
'Should not include': function() {
value_of([1,2,3]).should_not_include(2);
},
'Should include / Non-array object': function() {
value_of(new Date()).should_include(4);
},
'Should not include / Non-array object': function() {
value_of(new Date()).should_not_include('getMonth');
},
'Should include 2': function() {
value_of({a:1, b:2}).should_not_include('a');
}
})
describe('"Should have"s', {
'String length': function() {
value_of("Hello").should_have(4, "characters");
},
'Array length': function() {
value_of([1,2,3]).should_have(4, "items");
},
'Object\'s item length': function() {
value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
},
'No match': function() {
value_of("This is a string").should_have(5, "players");
},
'Exactly': function() {
value_of([1,2,3]).should_have_exactly(2, "items");
},
'At least': function() {
value_of([1,2,3]).should_have_at_least(4, "items");
},
'At most': function() {
value_of([1,2,3]).should_have_at_most(2, "items");
},
'Member': function() {
value_of({x: 0}).should_have_member('x'); // true
value_of({x: 0}).should_have_member('y'); // false
}
})
describe('"Should be empty"s', {
'String': function() {
value_of("Hello").should_be_empty();
},
'Array': function() {
value_of([1,2,3]).should_be_empty();
},
'Object\'s item': function() {
value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(0, "accounts");
}
})
describe('Failure messages', {
'Should be (String)': function() {
value_of("Hello World").should_be("Good-bye world");
},
'Should have (Object\s item)': function() {
value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
},
'Should have at least': function() {
value_of([1,2,3]).should_have_at_least(4, "items");
},
'Should include': function() {
value_of([1,2,3]).should_include(4);
},
'Should match': function() {
value_of("Hello").should_match(/bye/);
}
})
describe('"Should be"s', {
'String mismatch': function() {
value_of("Hello world").should_be("Good-bye world");
},
'Array item mismatch': function() {
value_of(['ab','cd','ef']).should_be(['ab','bd','ef']);
},
'Array length mismatch': function() {
value_of(['a',2,'4',5]).should_be([1,2,[4,5,6],6,7]);
},
'Undefined value': function() {
value_of("Test").should_be(undefined);
},
'Null value': function() {
value_of(null).should_be("Test");
},
'Boolean value 1': function() {
value_of(true).should_be(false);
},
'Boolean value 2': function() {
value_of(false).should_be_true();
},
'Boolean value 3': function() {
value_of(true).should_be_false();
},
'Number mismatch': function() {
value_of(1+2).should_be(4);
},
'Date mismatch': function() {
value_of(new Date(1979, 3, 27)).should_be(new Date(1976, 7, 23));
},
'Object mismatch 1': function() {
var actual = {a:1, b:2};
var expected = {a:1, b:2, d:3};
value_of(actual).should_be(expected);
},
'Object mismatch 2': function() {
var actual = {a:1, b:2, c:3, d:4};
var expected = {a:1, b:2, c:3};
value_of(actual).should_be(expected);
},
'Object mismatch 3': function() {
var actual = {a:1, b:4, c:3};
var expected = {a:1, b:2, c:3};
value_of(actual).should_be(expected);
},
'null should be null': function() {
value_of(null).should_be(null);
},
'null should not be undefined': function() {
value_of(null).should_be(undefined);
},
'null should not be null': function() {
value_of(null).should_not_be(null);
},
'empty array 1': function() {
value_of([]).should_be_empty();
value_of([1]).should_be_empty();
},
'empty array 2': function() {
value_of([1]).should_not_be_empty();
value_of([]).should_not_be_empty();
}
})
describe('Equality operator', {
'should work for different Date instances which have same value': function() {
var date1 = new Date(1979, 03, 27);
var date2 = new Date(1979, 03, 27);
value_of(date1).should_be(date2);
}
})
// ]]></script>
</head>
<body><div style="display:none;"><p>A</p><p>B</p></div></body>
</html>

1
common/js/unittest/JSSpec/diff_match_patch.js
View file

File diff suppressed because one or more lines are too long

224
common/js/unittest/css/JSSpec.css
View file

@ -1,224 +0,0 @@
@CHARSET "UTF-8";
/* --------------------
* @Layout
*/
html {
overflow: hidden;
}
body, #jsspec_container {
overflow: hidden;
padding: 0;
margin: 0;
width: 100%;
height: 100%;
background-color: white;
}
#title {
padding: 0;
margin: 0;
position: absolute;
top: 0px;
left: 0px;
width: 100%;
height: 40px;
overflow: hidden;
}
#list {
padding: 0;
margin: 0;
position: absolute;
top: 40px;
left: 0px;
bottom: 0px;
overflow: auto;
width: 250px;
_height:expression(document.body.clientHeight-40);
}
#log {
padding: 0;
margin: 0;
position: absolute;
top: 40px;
left: 250px;
right: 0px;
bottom: 0px;
overflow: auto;
_height:expression(document.body.clientHeight-40);
_width:expression(document.body.clientWidth-250);
}
/* --------------------
* @Decorations and colors
*/
* {
padding: 0;
margin: 0;
font-family: "Lucida Grande", Helvetica, sans-serif;
}
li {
list-style: none;
}
/* hiding subtitles */
h2 {
display: none;
}
/* title section */
div#title {
padding: 0em 0.5em;
}
div#title h1 {
font-size: 1.5em;
float: left;
}
div#title ul li {
float: left;
padding: 0.5em 0em 0.5em 0.75em;
}
div#title p {
float:right;
margin-right:1em;
font-size: 0.75em;
}
/* spec container */
ul.specs {
margin: 0.5em;
}
ul.specs li {
margin-bottom: 0.1em;
}
/* spec title */
ul.specs li h3 {
font-weight: bold;
font-size: 0.75em;
padding: 0.2em 1em;
cursor: pointer;
_cursor: hand;
}
/* example container */
ul.examples li {
border-style: solid;
border-width: 0px 0px 1px 5px;
margin: 0.2em 0em 0.2em 1em;
}
/* example title */
ul.examples li h4 {
font-weight: normal;
font-size: 0.75em;
margin-left: 1em;
}
pre.examples-code {
margin: 0.5em 2em;
padding: 0.5em;
background: white;
border: solid 1px #CCC;
}
/* example explaination */
ul.examples li div {
padding: 1em 2em;
font-size: 0.75em;
}
/* styles for ongoing, success, failure, error */
div.success, div.success a {
color: #FFFFFF;
background-color: #65C400;
}
ul.specs li.success h3, ul.specs li.success h3 a {
color: #FFFFFF;
background-color: #65C400;
}
ul.examples li.success, ul.examples li.success a {
color: #3D7700;
background-color: #DBFFB4;
border-color: #65C400;
}
div.exception, div.exception a {
color: #FFFFFF;
background-color: #C20000;
}
ul.specs li.exception h3, ul.specs li.exception h3 a {
color: #FFFFFF;
background-color: #C20000;
}
ul.examples li.exception, ul.examples li.exception a {
color: #C20000;
background-color: #FFFBD3;
border-color: #C20000;
}
div.ongoing, div.ongoing a {
color: #000000;
background-color: #FFFF80;
}
ul.specs li.ongoing h3, ul.specs li.ongoing h3 a {
color: #000000;
background-color: #FFFF80;
}
ul.examples li.ongoing, ul.examples li.ongoing a {
color: #000000;
background-color: #FFFF80;
border-color: #DDDD00;
}
/* --------------------
* values
*/
.number_value, .string_value, .regexp_value, .boolean_value, .dom_value {
font-family: monospace;
color: blue;
}
.object_value, .array_value {
line-height: 2em;
padding: 0.1em 0.2em;
margin: 0.1em 0;
}
.date_value {
font-family: monospace;
color: olive;
}
.undefined_value, .null_value {
font-style: italic;
color: blue;
}
.dom_attr_name {
}
.dom_attr_value {
color: red;
}
.dom_path {
font-size: 0.75em;
color: gray;
}
strong {
font-weight: normal;
background-color: #FFC6C6;
}

87
common/js/unittest/unittest_common.html
View file

@ -1,87 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<title>JSSpec results</title>
<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
<script type="text/javascript" src="../jquery.js"></script>
<script type="text/javascript" src="../common.js"></script>
<script>
var current_url = 'http://xpressengine.com/';
var http_port = 80;
var https_port = 443;
var enforce_ssl = false;
</script>
<script type="text/javascript">// <![CDATA[
describe('SetQuery', {
'should satisfy basic uri condition' : function() {
target = "http://xpressengine.com/";
value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/index.php?q=r");
},
'should work when ssl is on' : function() {
target = "http://xpressengine.com/";
window.ssl_actions = new Array("dispLogin");
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
},
'should work when ssl is on and https_port is set (not 443)' : function() {
target = "http://xpressengine.com/";
window.https_port = 445;
window.ssl_actions = new Array("dispLogin");
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
},
'should work when ssl is on and https_port is set as 443' : function() {
target = "http://xpressengine.com/";
window.https_port = 443;
window.ssl_actions = new Array("dispLogin");
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
},
'should replace https to http if act is not a member of ssl_actions': function() {
targets = "https://xpressengine.com/";
window.ssl_actions = new Array("dispLogin");
value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?act=dispLogin2");
},
'should remove https port' : function() {
targetsp = "https://xpressengine.com:443/index.php?q=r";
value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
},
'should remove https port and add http port if http port is defined' : function() {
targetsp = "https://xpressengine.com:443/index.php?q=r";
window.http_port = 8080;
value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8080/index.php?q=r&act=dispLogin2");
},
'should only remove https port and if http port is defined as 80' : function() {
targetsp = "https://xpressengine.com:443/index.php?q=r";
window.http_port = 80;
value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
},
'should work if enforce_ssl is set' : function() {
target = "http://xpressengine.com/";
window.enforce_ssl = true;
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
},
'should work if enforce_ssl is set' : function() {
target = "https://xpressengine.com:4433/";
window.http_port = 8080;
window.https_port = 4433;
window.enforce_ssl = false;
value_of(target.setQuery("act","dispTest")).should_be("http://xpressengine.com:8080/index.php?act=dispTest");
},
'should work if enforce_ssl is set with 443 port' : function() {
target = "http://xpressengine.com/";
window.enforce_ssl = true;
window.https_port = 443;
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
},
'should work if enforce_ssl is set with none-443 port' : function() {
target = "http://xpressengine.com/";
window.enforce_ssl = true;
window.https_port = 445;
value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
}
})
// ]]></script>
</head>
<body><div style="display:none;"><p>A</p><p>B</p></div></body>
</html>

109
common/js/unittest/unittest_validator.html
View file

@ -1,109 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<title>JSSpec results</title>
<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
<script type="text/javascript" src="../jquery.js"></script>
<script type="text/javascript" src="../js_app.js"></script>
<script type="text/javascript" src="../xml_js_filter.js"></script>
<script type="text/javascript">// <![CDATA[
var v, f, t, last_alert='';
var validate, set_filter, set_value;
describe('Validator', {
'before' : function() {
v = xe.getApp('Validator')[0];
f = $('#form1');
t = f[0].elements['text'];
validate = function(){ return v.cast('VALIDATE', [f[0]]); };
set_filter = function(filter_name){ f[0]._filter.value = filter_name };
set_value = function(val){ t.value = val };
var silent = xe.createPlugin('silent', {
API_BEFORE_SHOW_ALERT : function(sender, params) { last_alert=params[1]; return false; }
});
v.registerPlugin(new silent);
},
'should be true with no filter' : function() {
// no filter
set_filter('');
value_of(validate()).should_be_true();
},
'should check required feild' : function() {
v.cast('ADD_FILTER', ['required', {
'text' : {required:true}
}]);
set_filter('required');
set_value('');
value_of(validate()).should_be_false();
set_value('1');
value_of(validate()).should_be_true();
},
'validate email' : function() {
v.cast('ADD_FILTER', ['email', {
'text' : {required:true, rule:'email'}
}]);
set_filter('email');
set_value('not_email');
value_of(validate()).should_be_false();
set_value('email@mail.com');
value_of(validate()).should_be_true();
},
'validate with length' : function() {
v.cast('ADD_FILTER', ['minlength', {
'text' : {required:true, minlength:5}
}]);
v.cast('ADD_FILTER', ['maxlength', {
'text' : {required:true, maxlength:10}
}]);
v.cast('ADD_FILTER', ['minmaxlength', {
'text' : {required:true, minlength:5, maxlength:10}
}]);
set_filter('minlength');
set_value('1');
value_of(validate()).should_be_false();
set_value('12345');
value_of(validate()).should_be_true();
set_filter('maxlength');
set_value('12345678901');
value_of(validate()).should_be_false();
set_value('1');
value_of(validate()).should_be_true();
set_filter('minmaxlength');
set_value('1');
value_of(validate()).should_be_false();
set_value('12345678901');
value_of(validate()).should_be_false();
set_value('12345');
value_of(validate()).should_be_true();
set_value('1234567');
value_of(validate()).should_be_true();
}
})
// ]]></script>
</head>
<body>
<form id="form1">
<input type="hidden" name="_filter" value="" />
<input type="hidden" name="text" value="" />
</form>
</body>
</html>

67
common/js/xml_handler.js
View file

@ -17,12 +17,6 @@
*/
window.show_leaving_warning = false;
/**
* This variable becomes true when the user tries to navigate away from the page.
* It should not be manually edited.
*/
var page_unloading = false;
/**
* Function for compatibility with XE's exec_xml()
*/
@ -66,10 +60,10 @@
// Add debug information.
if (data._rx_debug) {
data._rx_debug.page_title = "AJAX : " + params.module + "." + params.act;
if (window.rhymix_debug_add_data) {
window.rhymix_debug_add_data(data._rx_debug);
if (Rhymix.addDebugData) {
Rhymix.addDebugData(data._rx_debug);
} else {
window.rhymix_debug_pending_data.push(data._rx_debug);
Rhymix.pendingDebugData.push(data._rx_debug);
}
}
@ -127,7 +121,7 @@
}
// If the user is navigating away, don't do anything.
if (xhr.status == 0 && page_unloading) {
if (xhr.status == 0 && Rhymix.unloading) {
return;
}
@ -232,10 +226,10 @@
// Add debug information.
if (data._rx_debug) {
data._rx_debug.page_title = "AJAX : " + request_info;
if (window.rhymix_debug_add_data) {
window.rhymix_debug_add_data(data._rx_debug);
if (Rhymix.addDebugData) {
Rhymix.addDebugData(data._rx_debug);
} else {
window.rhymix_debug_pending_data.push(data._rx_debug);
Rhymix.pendingDebugData.push(data._rx_debug);
}
}
@ -293,7 +287,7 @@
var errorHandler = function(xhr, textStatus) {
// If the user is navigating away, don't do anything.
if (xhr.status == 0 && page_unloading) {
if (xhr.status == 0 && Rhymix.unloading) {
return;
}
@ -378,50 +372,11 @@
}
};
/**
* Function for AJAX submission of arbitrary forms.
*/
XE.ajaxForm = function(form, callback_success, callback_error) {
form = $(form);
// Get success and error callback functions.
if (typeof callback_success === 'undefined') {
callback_success = form.data('callbackSuccess');
if (callback_success && window[callback_success] && $.isFunction(window[callback_success])) {
callback_success = window[callback_success];
} else {
callback_success = function(data) {
if (data.message && data.message !== 'success') {
rhymix_alert(data.message, data.redirect_url);
}
if (data.redirect_url) {
redirect(data.redirect_url);
}
};
}
}
if (typeof callback_error === 'undefined') {
callback_error = form.data('callbackError');
if (callback_error && window[callback_error] && $.isFunction(window[callback_error])) {
callback_error = window[callback_error];
} else {
callback_error = null;
}
}
window.exec_json('raw', new FormData(form[0]), callback_success, callback_error);
};
$(document).on('submit', 'form.rx_ajax', function(event) {
// Abort if the form already has a 'target' attribute.
if (!$(this).attr('target')) {
event.preventDefault();
XE.ajaxForm(this);
}
});
/**
* Empty placeholder for beforeUnload handler.
*/
var beforeUnloadHandler = function() {
page_unloading = true;
Rhymix.unloading = true;
return "";
};
@ -435,10 +390,6 @@
}).bind("ajaxStop cancel_confirm", function() {
$(window).unbind("beforeunload", beforeUnloadHandler);
});
} else {
$(window).on('beforeunload', function() {
page_unloading = true;
});
}
});

4
common/js/xml_js_filter.js
View file

@ -467,13 +467,13 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf
};
if (!hasFile) {
exec_json(module + '.' + act, params, callback_wrapper);
Rhymix.ajax(module + '.' + act, params, callback_wrapper);
} else {
var fd = new FormData();
for (let key in params) {
fd.append(key, params[key]);
}
exec_json('raw', fd, callback_wrapper);
Rhymix.ajax(null, fd, callback_wrapper);
}
};

3
common/lang/en.php
View file

@ -251,7 +251,8 @@ $lang->msg_not_founded = 'Cannot find the target.';
$lang->msg_no_result = 'No results found.';
$lang->msg_fail_to_request_open = 'Failed to open your request.';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'You do not have permission to execute requested action.';
$lang->msg_administrator_only = 'Only administrators can access this page.';
$lang->msg_not_permitted_act = 'You do not have permission to access this page.';
$lang->msg_module_is_not_exists = 'Cannot find the page you requested. Ask your Site Admin to check the page.';
$lang->msg_module_is_not_standalone = 'Requested page cannot be executed independently.';
$lang->msg_module_class_not_found = 'Cannot find class to handle the requested action.';

1
common/lang/ko.php
View file

@ -251,6 +251,7 @@ $lang->msg_not_founded = '대상을 찾을 수 없습니다.';
$lang->msg_no_result = '검색 결과가 없습니다.';
$lang->msg_fail_to_request_open = '요청한 연결에 실패했습니다.';
$lang->msg_invalid_format = '잘못된 형식입니다.';
$lang->msg_administrator_only = '관리자만 사용할 수 있는 기능입니다.';
$lang->msg_not_permitted_act = '요청한 기능을 실행할 수 있는 권한이 없습니다.';
$lang->msg_module_is_not_exists = '요청한 페이지를 찾을 수 없습니다. 사이트 관리자에게 문의해 주세요.';
$lang->msg_module_is_not_standalone = '요청한 페이지는 독립적으로 동작할 수 없습니다.';

56
common/scripts/clean_empty_dirs.php
View file

@ -1,58 +1,8 @@
<?php
/**
* This script deletes empty directories under the 'files' directory.
*
* It may be useful when your web host imposes a hard limit on the number of
* inodes, or when your backups take too long due to the large number of
* unused directories.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
* This script is @deprecated.
* Please invoke: php index.php file.cleanEmptyDirs
*/
require_once __DIR__ . '/common.php';
// Initialize the exit status.
$exit_status = 0;
// Delete empty directories in the attachment directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/attach')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/attach.\n";
}
else
{
echo "Error while deleting empty directories under files/attach.\n";
$exit_status = $result;
}
// Delete empty directories in the member extra info directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/member_extra_info')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/member_extra_info.\n";
}
else
{
echo "Error while deleting empty directories under files/member_extra_info.\n";
$exit_status = $result;
}
// Delete empty directories in the thumbnails directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/thumbnails.\n";
}
else
{
echo "Error while deleting empty directories under files/thumbnails.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/file/scripts/cleanEmptyDirs.php';

96
common/scripts/clean_garbage_files.php
View file

@ -1,98 +1,8 @@
<?php
/**
* This script deletes files that were not properly uploaded.
*
* Files can remain in an invalid status for two reasons: 1) a user abandons
* a document or comment after uploading files; or 2) a chunked upload is
* aborted without the server having any opportunity to clean it up.
* These files can obviously take up a lot of disk space. In order to prevent
* them from accumulating too much, you should run this script at least once
* every few days.
* This script is @deprecated.
* Please invoke: php index.php file.cleanGarbageFiles
*/
require_once __DIR__ . '/common.php';
// Delete garbage files older than this number of days.
$days = 10;
// Initialize the exit status.
$exit_status = 0;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = getController('file');
// Find and delete files where isvalid = N.
$args = new stdClass;
$args->isvalid = 'N';
$args->list_count = 50;
$args->regdate_before = date('YmdHis', time() - ($days * 86400));
while (true)
{
$output = executeQueryArray('file.getFileList', $args);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting garbage files older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all garbage files older than $days days.\n";
}
// Find and delete temporary chunks.
$dirname = RX_BASEDIR . 'files/attach/chunks';
$threshold = time() - ($days * 86400);
$chunks = Rhymix\Framework\Storage::readDirectory($dirname);
if ($chunks)
{
foreach ($chunks as $chunk)
{
if (@filemtime($chunk) < $threshold)
{
$result = Rhymix\Framework\Storage::delete($chunk);
if (!$result)
{
$exit_status = 12;
}
}
}
}
if ($exit_status == 0)
{
echo "Successfully deleted aborted file chunks older than $days days.\n";
}
else
{
echo "Error while deleting aborted file chunks older than $days days.\n";
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/file/scripts/cleanGarbageFiles.php';

61
common/scripts/clean_message_files.php
View file

@ -1,63 +1,8 @@
<?php
/**
* This script deletes old message attachments.
*
* Files attached to member messages are not viewable by other users, but they
* take up space on the server. You may want to delete them after a certain
* number of days in order to prevent users from using messages as a sort of
* private storage space.
* This script is @deprecated.
* Please invoke: php index.php communication.cleanMessageFiles
*/
require_once __DIR__ . '/common.php';
// Delete attachments older than this number of days.
$days = 30;
// Initialize the exit status.
$exit_status = 0;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = getController('file');
// Find and delete files where upload_target_type = msg.
$args = new stdClass;
$args->upload_target_type = 'msg';
$args->list_count = 50;
$args->regdate_before = date('YmdHis', time() - ($days * 86400));
while (true)
{
$output = executeQueryArray('file.getFileList', $args);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting message attachments older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all message attachments older than $days days.\n";
}
require_once RX_BASEDIR . 'modules/communication/scripts/cleanMessageFiles.php';

64
common/scripts/clean_old_logs.php
View file

@ -1,66 +1,8 @@
<?php
/**
* This script deletes old logs from the database.
*
* Rhymix produces various logs that can increase the size of the database
* unnecessarily if not cleaned. This script removes old logs.
* This script is @deprecated.
* Please invoke: php index.php module.cleanMiscLogs
*/
require_once __DIR__ . '/common.php';
// Delete logs older than this number of days.
$days = 30;
// Initialize the exit status.
$exit_status = 0;
// Delete advanced mailer mail logs.
$args = new stdClass;
$args->regdate = date('YmdHis', time() - ($days * 86400));
$output = executeQuery('advanced_mailer.deleteMailLogs', $args);
if ($output->toBool())
{
echo "Successfully deleted all mail logs older than $days days.\n";
}
else
{
echo "Error while deleting mail logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Delete advanced mailer SMS logs.
$args = new stdClass;
$args->regdate = date('YmdHis', time() - ($days * 86400));
$output = executeQuery('advanced_mailer.deleteSMSLogs', $args);
if ($output->toBool())
{
echo "Successfully deleted all SMS logs older than $days days.\n";
}
else
{
echo "Error while deleting SMS logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 12;
}
// Delete spamfilter logs.
$args = new stdClass;
$args->regdate = date('YmdHis', time() - ($days * 86400));
$output = executeQuery('spamfilter.deleteLog', $args);
if ($output->toBool())
{
echo "Successfully deleted all spamfilter logs older than $days days.\n";
}
else
{
echo "Error while deleting spamfilter logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 12;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/module/scripts/cleanMiscLogs.php';

38
common/scripts/clean_old_notifications.php
View file

@ -1,40 +1,8 @@
<?php
/**
* This script deletes old notifications.
*
* Notifications must be dismissed as quickly as possible in order to prevent
* the ncenterlite_notify table from becoming too large. For best performance,
* you should run this script at least once every few days.
* This script is @deprecated.
* Please invoke: php index.php ncenterlite.cleanNotifications
*/
require_once __DIR__ . '/common.php';
// Delete notifications older than this number of days.
$days = 30;
// Initialize the exit status.
$exit_status = 0;
// Execute the query.
$args = new stdClass;
$args->old_date = date('YmdHis', time() - ($days * 86400));
$output = executeQuery('ncenterlite.deleteNotifyAll', $args);
if ($output->toBool())
{
echo "Successfully deleted all notifications older than $days days.\n";
$delete_obj = (object)array('regdate' => time());
Rhymix\Framework\Cache::clearGroup('ncenterlite');
Rhymix\Framework\Storage::writePHPData(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php', $delete_obj);
}
else
{
echo "Error while deleting notifications older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/ncenterlite/scripts/cleanNotifications.php';

39
common/scripts/clean_old_thumbnails.php
View file

@ -1,41 +1,8 @@
<?php
/**
* This script deletes old thumbnails.
*
* Thumbnails can take up a large amount of disk space and inodes if they are
* allowed to accumulate. Since most websites only need thumbnails for recent
* posts, it is okay to delete old thumbnails.
*
* Do not run this script if you have a gallery-style module where visitors
* regularly view old posts. This will force thumbnails to be regenerated,
* increasing the server load and making your pages load slower.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
* This script is @deprecated.
* Please invoke: php index.php file.cleanThumbnails
*/
require_once __DIR__ . '/common.php';
// Delete thumbnails older than this number of days.
$days = 90;
// Initialize the exit status.
$exit_status = 0;
// Delete old thumbnails.
passthru(sprintf('find %s -type f -mtime +%d -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails'), abs($days)), $result);
if ($result == 0)
{
echo "Successfully deleted all thumbnails older than $days days.\n";
}
else
{
echo "Error while deleting thumbnails older than $days days.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/file/scripts/cleanThumbnails.php';

15
common/scripts/cron.php
View file

@ -52,6 +52,19 @@ if (PHP_SAPI !== 'cli')
}
}
// Set up a signal handler.
if (PHP_SAPI === 'cli' && function_exists('pcntl_signal'))
{
if (function_exists('pcntl_async_signals'))
{
pcntl_async_signals(true);
}
foreach ([SIGINT, SIGHUP, SIGTERM, SIGQUIT, SIGUSR1, SIGUSR2] as $signal)
{
pcntl_signal($signal, [Rhymix\Framework\Queue::class, 'signalHandler']);
}
}
// Create multiple processes if configured.
if (PHP_SAPI === 'cli' && $process_count > 1 && function_exists('pcntl_fork') && function_exists('pcntl_waitpid'))
{
@ -84,7 +97,7 @@ if (PHP_SAPI === 'cli' && $process_count > 1 && function_exists('pcntl_fork') &&
}
// The parent process waits for its children to finish.
while (count($pids))
while (count($pids) && !Rhymix\Framework\Queue::signalReceived())
{
$pid = pcntl_waitpid(-1, $status, \WNOHANG);
if ($pid)

61
common/scripts/update_all_modules.php
View file

@ -1,63 +1,8 @@
<?php
/**
* This script updates all modules.
*
* Running this script on the CLI is better than clicking 'update' in the
* admin dashboard because some module updates may take a long time.
* This script is @deprecated.
* Please invoke: php index.php module.updateAllModules
*/
require_once __DIR__ . '/common.php';
Context::init();
$oModuleModel = getModel('module');
// Get the list of modules that need to be updated.
$module_list = $oModuleModel->getModuleList();
$need_install = array();
$need_update = array();
foreach($module_list as $key => $value)
{
if($value->need_install)
{
$need_install[] = $value->module;
}
if($value->need_update)
{
$need_update[] = $value->module;
}
}
// Install all modules.
$oInstallController = InstallController::getInstance();
foreach ($need_install as $module)
{
try
{
echo 'Installing ' . $module . '...' . PHP_EOL;
$oInstallController->installModule($module, './modules/' . $module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Update all modules.
foreach ($need_update as $module)
{
try
{
echo 'Updating ' . $module . '...' . PHP_EOL;
$oInstallController->updateModule($module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}
require_once RX_BASEDIR . 'modules/module/scripts/updateAllModules.php';

5
common/tpl/popup_layout.html
View file

@ -11,10 +11,7 @@
const iframe_sequence = '{{ $iframe_sequence }}';
window.opener = window.parent;
window.close = function() {
const iframe = parent.document.getElementById('_rx_iframe_' + iframe_sequence);
if (iframe) {
iframe.remove();
}
parent.closeModal('_rx_iframe_' + iframe_sequence);
};
</script>
<style>

42
modules/addon/addon.admin.controller.php
View file

@ -197,16 +197,19 @@ class addonAdminController extends addonController
*/
function procAddonAdminSetupAddon()
{
$args = Context::getRequestVars();
$module = $args->module;
$addon_name = $args->addon_name;
unset($args->module);
unset($args->act);
unset($args->addon_name);
unset($args->body);
unset($args->error_return_url);
$vars = Context::getRequestVars();
$module = $vars->module;
$addon_name = $vars->addon_name;
$args = new stdClass();
$site_module_info = Context::get('site_module_info');
$addon_info = AddonAdminModel::getInstance()->getAddonInfoXml($addon_name, $site_module_info->site_srl, 'site');
foreach ($addon_info->extra_vars as $key => $val)
{
$args->{$key} = $vars->{$key} ?? '';
}
$args->xe_run_method = $vars->xe_run_method ?? '';
$args->mid_list = $vars->mid_list ?? [];
$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
if(!$output->toBool())
@ -234,6 +237,29 @@ class addonAdminController extends addonController
*/
function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N', $extra_vars = null)
{
if (!is_object($extra_vars))
{
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass;
$args->addon = $addon;
if (strlen($isUsed) == 2)

238
modules/addon/addon.admin.model.php
View file

@ -162,18 +162,14 @@ class addonAdminModel extends addon
return;
}
// Read the xml file for module skin information
// Read the xml file for addon information
$xml_file = sprintf("%sconf/info.xml", FileHandler::getRealpath($addon_path));
if(!file_exists($xml_file))
if (!file_exists($xml_file))
{
return;
}
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$xml_obj = $tmp_xml_obj->addon;
if(!$xml_obj)
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
if (!$addon_info)
{
return;
}
@ -190,224 +186,52 @@ class addonAdminModel extends addon
$db_args->site_srl = $site_srl;
$output = executeQuery('addon.getSiteAddonInfo', $db_args);
}
$extra_vals = unserialize($output->data->extra_vars);
$addon_info = new stdClass();
if($extra_vals->mid_list)
// Add run settings
$extra_vals = isset($output->data->extra_vars) ? unserialize($output->data->extra_vars) : new stdClass;
if (!empty($extra_vals->mid_list))
{
$addon_info->mid_list = $extra_vals->mid_list;
}
else
{
$addon_info->mid_list = array();
}
if($extra_vals->xe_run_method)
if (!empty($extra_vals->xe_run_method))
{
$addon_info->xe_run_method = $extra_vals->xe_run_method;
}
// Add information
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
if (isset($output->data) && $output->data->is_used === 'Y')
{
// addon format v0.2
if ($xml_obj->date->body === 'RX_CORE')
$addon_info->is_enabled->pc = true;
}
if (isset($output->data) && $output->data->is_used_m === 'Y')
{
$addon_info->is_enabled->mobile = true;
}
// Add current settings
foreach ($addon_info->extra_vars ?? [] as $key => $val)
{
if (isset($extra_vals->{$key}))
{
$addon_info->date = '';
if (is_string($extra_vals->{$key}) && str_contains($extra_vals->{$key}, '|@|'))
{
$val->value = explode('|@|', $extra_vals->{$key});
}
else
{
$val->value = $extra_vals->{$key};
}
}
else
{
$date_obj = new stdClass();
sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$val->value = $val->default;
}
$addon_info->addon_name = $addon;
$addon_info->title = $xml_obj->title->body;
$addon_info->description = trim($xml_obj->description->body);
$addon_info->version = $xml_obj->version->body;
$addon_info->homepage = $xml_obj->link->body;
$addon_info->license = $xml_obj->license->body;
$addon_info->license_link = $xml_obj->license->attrs->link;
if(!is_array($xml_obj->author))
if ($val->type === 'mid_list' && !is_array($val->value))
{
$author_list = array();
$author_list[] = $xml_obj->author;
}
else
{
$author_list = $xml_obj->author;
$val->value = isset($val->value) ? [$val->value] : [];
}
$addon_info->author = array();
foreach($author_list as $author)
{
$author_obj = new stdClass();
$author_obj->name = $author->name->body;
$author_obj->email_address = $author->attrs->email_address;
$author_obj->homepage = $author->attrs->link;
$addon_info->author[] = $author_obj;
}
// Expand the variable order
if($xml_obj->extra_vars)
{
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups)
{
$extra_var_groups = $xml_obj->extra_vars;
}
if(!is_array($extra_var_groups))
{
$extra_var_groups = array($extra_var_groups);
}
foreach($extra_var_groups as $group)
{
$extra_vars = $group->var;
if(!is_array($group->var))
{
$extra_vars = array($group->var);
}
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
if(!$val->attrs)
{
$val->attrs = new stdClass();
}
if(!$val->attrs->type)
{
$val->attrs->type = 'text';
}
$obj->group = $group->title->body;
$obj->name = $val->attrs->name;
$obj->title = $val->title->body;
$obj->type = $val->attrs->type;
$obj->description = $val->description->body;
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != FALSE)
{
$obj->value = explode('|@|', $obj->value);
}
if($obj->type == 'mid_list' && !is_array($obj->value))
{
$obj->value = array($obj->value);
}
// 'Select'type obtained from the option list.
if($val->options && !is_array($val->options))
{
$val->options = array($val->options);
}
for($i = 0, $c = countobj($val->options); $i < $c; $i++)
{
$obj->options[$i] = new stdClass();
$obj->options[$i]->title = $val->options[$i]->title->body;
$obj->options[$i]->value = $val->options[$i]->attrs->value;
}
$addon_info->extra_vars[] = $obj;
}
}
}
}
else
{
// addon format 0.1
$addon_info = new stdClass();
$addon_info->addon_name = $addon;
$addon_info->title = $xml_obj->title->body;
$addon_info->description = trim($xml_obj->author->description->body);
$addon_info->version = $xml_obj->attrs->version;
$date_obj = new stdClass();
sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$author_obj = new stdClass();
$author_obj->name = $xml_obj->author->name->body;
$author_obj->email_address = $xml_obj->author->attrs->email_address;
$author_obj->homepage = $xml_obj->author->attrs->link;
$addon_info->author = array();
$addon_info->author[] = $author_obj;
if($xml_obj->extra_vars)
{
// Expand the variable order
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups)
{
$extra_var_groups = $xml_obj->extra_vars;
}
if(!is_array($extra_var_groups))
{
$extra_var_groups = array($extra_var_groups);
}
foreach($extra_var_groups as $group)
{
$extra_vars = $group->var;
if(!is_array($group->var))
{
$extra_vars = array($group->var);
}
$addon_info->extra_vars = array();
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
$obj->group = $group->title->body;
$obj->name = $val->attrs->name;
$obj->title = $val->title->body;
$obj->type = $val->type->body ? $val->type->body : 'text';
$obj->description = $val->description->body;
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != false)
{
$obj->value = explode('|@|', $obj->value);
}
if($obj->type == 'mid_list' && !is_array($obj->value))
{
$obj->value = array($obj->value);
}
// 'Select'type obtained from the option list.
if($val->options && !is_array($val->options))
{
$val->options = array($val->options);
}
$obj->options = array();
foreach ($val->options ?? [] as $i => $option)
{
$obj->options[$i]->title = $option->title->body;
$obj->options[$i]->value = $option->value->body;
}
$addon_info->extra_vars[] = $obj;
}
}
}
}
return $addon_info;
}

24
modules/addon/addon.controller.php
View file

@ -111,7 +111,7 @@ class addonController extends addon
$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);
// Addon configuration
$buff[] = '$addon_info = unserialize(' . var_export(serialize($extra_vars), true) . ');';
$buff[] = '$addon_info = ' . var_export($extra_vars, true) . ';';
// Decide whether to run in this mid
if ($run_method === 'no_run_selected')
@ -159,9 +159,27 @@ class addonController extends addon
*/
function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
{
if(!is_array($extra_vars->mid_list))
if (!is_object($extra_vars))
{
unset($extra_vars->mid_list);
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key) && isset($val->default))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass();

3
modules/admin/controllers/Dashboard.php
View file

@ -185,8 +185,7 @@ class Dashboard extends Base
$params["act"] = "getResourceapiLastupdate";
$body = \XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml");
$xml_lUpdate = new \XeXmlParser();
$lUpdateDoc = $xml_lUpdate->parse($buff);
$lUpdateDoc = \Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$updateDate = $lUpdateDoc->response->updatedate->body;
if(!$updateDate)

1
modules/admin/controllers/maintenance/Cleanup.php
View file

@ -332,6 +332,7 @@ class Cleanup extends Base
'modules/admin/tpl/js/config.min.js' => 'deleted',
'modules/admin/tpl/js/admin.min.js' => 'deleted',
'modules/admin/tpl/js/menu_setup.min.js' => 'deleted',
'modules/admin/tpl/img/bgDragable.gif' => 'deleted',
'modules/admin/tpl/img/faviconSample.png' => 'deleted',
'modules/admin/tpl/img/mobiconSample.png' => 'deleted',
'modules/autoinstall/ruleset/' => 'deleted:xe',

8
modules/admin/tpl/_header.html
View file

@ -4,10 +4,10 @@
{@ Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
<script>
var admin_menu_srl = "{$admin_menu_srl}";
xe.cmd_find = "{$lang->cmd_find}";
xe.cmd_cancel = "{$lang->cmd_cancel}";
xe.cmd_confirm = "{$lang->cmd_confirm}";
xe.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.cmd_find = "{$lang->cmd_find}";
xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.confirm_run = "{$lang->confirm_run}";
xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
</script>

20
modules/admin/tpl/css/admin.css
View file

@ -356,11 +356,15 @@ body>.x,
color: #fff;
}
.x .x_modal-header>.close_window {
font-size: 20px;
font-size: 24px;
line-height: 30px;
font-weight: bold;
text-decoration: none;
color: #fff;
opacity: 0.5;
opacity: 0.6;
}
.x .x_modal-header>.close_window:hover {
opacity: 0.8;
}
.x .x_modal-body {
overflow-y: visible;
@ -1690,14 +1694,16 @@ html[lang="id"] .x .g11n.active>[disabled],
}
.x .uDrag .dragBtn {
position: absolute;
width: 8px;
width: 24px;
height: 100%;
padding: 0;
box-sizing: content-box;
overflow: hidden;
background: url(../img/bgDragable.gif);
background: url(../img/bgDragable.png);
background-position: center top;
background-repeat: no-repeat;
top: 1px;
left: 0;
text-indent: 12px;
left: -8px;
text-indent: 20px;
border: 0;
cursor: n-resize;
white-space: nowrap;

BIN
modules/admin/tpl/img/bgDragable.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 46 B

BIN
modules/admin/tpl/img/bgDragable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 145 B

28
modules/admin/tpl/js/admin.js
View file

@ -977,7 +977,7 @@ jQuery(function($){
tmpCount++;
// add html
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
var $displayInput = $('<input type="text" readonly>');
$this.after($btn).after('&nbsp;').after($displayInput).hide();
$btn.xeModuleSearch();
@ -1050,10 +1050,10 @@ jQuery(function($){
$.xeMsgBox = {
htOptions : {}
};
//xe.cmd_cancel = "{$lang->cmd_cancel}";
//xe.cmd_confirm = "{$lang->cmd_confirm}";
//xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
//xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+'</button> </div> ');
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.lang.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.lang.cmd_confirm+'</button> </div> ');
$("body").append($msgBox);
$msgBox.find("._ok").click(function(){
$.xeMsgBox.fnOnOK();
@ -1513,13 +1513,13 @@ jQuery(function($){
// change text
if(options.create_type != 'save_and_use'){
$g11n_create.find('.save-useit').text(xe.cmd_save);
$g11n_create.find('.save-useit').text(xe.lang.cmd_save);
}
// #lang_create confirm
function g11n_create_save_confirm(){
if($g11n_create.is(':visible') && is_create_changed){
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
$g11n_create.find('.save-useit').trigger('click');
}
}
@ -1531,7 +1531,7 @@ jQuery(function($){
function g11n_search_save_confirm(){
if($g11n_search.is(':visible') && $g11n_search.find('.editMode').length){
var $search_item = $g11n_search.find('.editMode');
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
$search_item.find('.save').trigger('click');
}else{
$search_item.find('.cancel').trigger('click');
@ -1701,7 +1701,7 @@ jQuery(function($){
if(!options.view_modify) $g11n_search.find('.modify').hide();
if(!options.view_delete) $g11n_search.find('.delete').hide();
if(options.modify_type == 'save'){
$g11n_search.find('.save').text(xe.cmd_save);
$g11n_search.find('.save').text(xe.lang.cmd_save);
}
// Modify click
@ -1727,7 +1727,7 @@ jQuery(function($){
// Delete click
$g11n_search.find('.delete').click(function(){
if(!confirm(xe.confirm_delete)) return;
if(!confirm(xe.lang.confirm_delete)) return;
var $this = $(this);
@ -1827,7 +1827,7 @@ jQuery(function($){
});
if(!current_lang_value){
alert(xe.msg_empty_multilingual);
alert(xe.lang.msg_empty_multilingual);
return false;
}
@ -1933,8 +1933,8 @@ jQuery(function($){
}
$displayInput.attr('placeholder', $this.attr('placeholder'));
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.cmd_set_multilingual_text + '</a>').data('lang-target', id);
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.lang.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.lang.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.lang.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.lang.cmd_set_multilingual_text + '</a>').data('lang-target', id);
$this.parent().addClass('g11n').addClass('x_input-append');
$this.after($displayInput, $remover, $setter);
@ -2377,7 +2377,7 @@ jQuery(function($){
$.xeMenuSelectorVar.$container = $.xeMsgBox.$msgBox;
$.xeMsgBox.confirmDialog({
sTitle : xe.msg_select_menu,
sTitle : xe.lang.msg_select_menu,
sText : '<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',
@ -2447,7 +2447,7 @@ jQuery(function($){
var sDisallowedType = $this.attr('data-disallowedType');
// add html
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
$btn.data('multiple', sMultiple);
$btn.data('allowedType', sAllowedType);
$btn.data('disallowedType', sDisallowedType);

1
modules/board/board.class.php
View file

@ -20,6 +20,7 @@ class Board extends ModuleObject
'user_name',
'nick_name',
'user_id',
'regdate',
'tag',
];

5
modules/board/conf/module.xml
View file

@ -60,11 +60,6 @@
<route route="$document_srl:int" priority="100" />
<route route="$document_srl:int/" priority="100" />
<route route="$document_srl:int/comment/$comment_srl:int" priority="100" />
<route route="$document_srl:int/page/$page:int" priority="100" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="60" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="60" />
<route route="search/$search_target:word/$search_keyword:any" priority="50" />
<route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="50" />
<route route="category/$category:int" priority="40" />
<route route="category/$category:int/page/$page:int" priority="40" />
<route route="page/$page:int" priority="10" />

2
modules/board/tpl/js/rewrite.js
View file

@ -13,7 +13,7 @@
if (match && match[1] === window.current_mid) {
newpath = location.pathname.replace(/\/(comment|page)\/([0-9]+)$/, '');
}
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?category=[0-9]+$/)) {
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?(category|comment_srl|page)=[0-9]+$/)) {
newpath = newpath ? newpath : location.pathname;
}
if (newpath && location.hash && location.hash != '#') {

19
modules/comment/tpl/js/comment_admin.js
View file

@ -1,16 +1,17 @@
function doCancelDeclare() {
var comment_srl = new Array();
jQuery('#fo_list input[name="cart[]"]:checked').each(function() {
comment_srl[comment_srl.length] = jQuery(this).val();
$('#fo_list input[name="cart[]"]:checked').each(function() {
comment_srl.push($(this).val());
});
if (comment_srl.length < 1) {
return;
}
if(comment_srl.length<1) return;
var params = new Array();
params['comment_srl'] = comment_srl.join(',');
exec_xml('comment','procCommentAdminCancelDeclare', params, function() { location.reload(); });
var params = { comment_srl: comment_srl.join(',') };
Rhymix.ajax('comment.procCommentAdminCancelDeclare', params, function() {
location.reload();
});
}
function insertSelectedModule(id, module_srl, mid, browser_title) {
@ -26,7 +27,7 @@ function getCommentList()
var commentListTable = jQuery('#commentListTable');
var cartList = [];
commentListTable.find(':checkbox[name=cart]').each(function(){
if(this.checked) cartList.push(this.value);
if(this.checked) cartList.push(this.value);
});
var params = new Array();

67
modules/communication/scripts/cleanMessageFiles.php Normal file
View file

@ -0,0 +1,67 @@
<?php
/**
* This script deletes old message attachments.
*
* Files attached to member messages are not viewable by other users, but they
* take up space on the server. You may want to delete them after a certain
* number of days in order to prevent users from using messages as a sort of
* private storage space.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete attachments older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = FileController::getInstance();
// Find and delete files where upload_target_type = msg.
while (true)
{
$output = executeQueryArray('file.getFileList', [
'upload_target_type' => 'msg',
'list_count' => 50,
'regdate_before' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting message attachments older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all message attachments older than $days days.\n";
}

1
modules/document/conf/module.xml
View file

@ -49,6 +49,7 @@
<action name="procDocumentAdminInsertExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" ruleset="insertExtraVar" />
<action name="procDocumentAdminDeleteExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminMoveExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminReorderExtraVars" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminRecalculateCategoryCounts" type="controller" />
</actions>
<eventHandlers>

222
modules/document/document.admin.controller.php
View file

@ -246,29 +246,50 @@ class DocumentAdminController extends Document
$type = Context::get('type');
$module_srl = Context::get('module_srl');
$var_idx = Context::get('var_idx');
if (!$type || !$module_srl || !$var_idx)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
if(!$type || !$module_srl || !$var_idx) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if (!$module_info || !$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$module_info->module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$extra_keys = DocumentModel::getExtraKeys($module_srl);
if (!$extra_keys)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
if (!$extra_keys[$var_idx])
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oDocumentModel = getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!$extra_keys[$var_idx]) throw new Rhymix\Framework\Exceptions\InvalidRequest;
if($type == 'up') $new_idx = $var_idx-1;
else $new_idx = $var_idx+1;
if($new_idx<1) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$new_idx = ($type === 'up') ? $var_idx - 1 : $var_idx + 1;
if ($new_idx < 1)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$args = new stdClass();
$args->module_srl = $module_srl;
$args->var_idx = $new_idx;
$output = executeQuery('document.getDocumentExtraKeys', $args);
if (!$output->toBool()) return $output;
if (!$output->data) throw new Rhymix\Framework\Exceptions\InvalidRequest;
if (!$output->toBool())
{
return $output;
}
if (!$output->data)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
unset($args);
$oDB = DB::getInstance();
$oDB->begin();
// update immediately if there is no idx to change
if(!$extra_keys[$new_idx])
{
@ -277,11 +298,19 @@ class DocumentAdminController extends Document
$args->var_idx = $var_idx;
$args->new_idx = $new_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
// replace if exists
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
// replace if exists
else
{
$args = new stdClass();
@ -289,25 +318,174 @@ class DocumentAdminController extends Document
$args->var_idx = $new_idx;
$args->new_idx = -10000;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$args->var_idx = $var_idx;
$args->new_idx = $new_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$args->var_idx = -10000;
$args->new_idx = $var_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
$oDB->commit();
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
}
/**
* Reorder extra vars of a module.
*/
public function procDocumentAdminReorderExtraVars()
{
// Validate input data.
$module_srl = intval(Context::get('module_srl'));
$order = Context::get('order');
if (!$module_srl || !$order || !is_array($order))
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
foreach ($order as $key => $val)
{
$order[$key] = $val = (object)$val;
if (empty($val->eid))
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
}
// Validate module info and existing extra keys.
$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if (!$module_info || !$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$extra_keys = DocumentModel::getExtraKeys($module_srl);
if (!$extra_keys)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$extra_keys = array_combine(array_map(function($item) {
return $item->eid;
}, $extra_keys), array_values($extra_keys));
// Calculate changes.
// We don't actually do anything with the submitted values of old/new idx.
// We calculate them anew with the data we have on the server.
$changes = [];
$i = 1;
foreach ($order as $key => $val)
{
if (!isset($extra_keys[$val->eid]))
{
continue;
}
if ($i != $extra_keys[$val->eid]->idx)
{
$changes[] = [
'eid' => $val->eid,
'old_idx' => $extra_keys[$val->eid]->idx,
'new_idx' => $i,
];
}
$i++;
}
// Begin transaction.
$oDB = DB::getInstance();
$oDB->begin();
// Apply changes.
// We need to do this twice because of the unique constraint.
foreach ($changes as $change)
{
$output = executeQuery('document.updateDocumentExtraKeyIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],
'new_idx' => $change['new_idx'] - 10000,
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],
'new_idx' => $change['new_idx'] - 10000,
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
foreach ($changes as $change)
{
$output = executeQuery('document.updateDocumentExtraKeyIdx', [
'module_srl' => $module_srl,
'var_idx' => $change['new_idx'] - 10000,
'new_idx' => $change['new_idx'],
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', [
'module_srl' => $module_srl,
'var_idx' => $change['new_idx'] - 10000,
'new_idx' => $change['new_idx'],
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
// Commit.
$oDB->commit();
// Clear cache.
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
}

3
modules/document/document.controller.php
View file

@ -1780,6 +1780,7 @@ class DocumentController extends Document
$output = executeQuery('document.updateDocumentExtraVar', $obj);
}
unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
return $output;
}
@ -1836,6 +1837,7 @@ class DocumentController extends Document
$oDB->commit();
unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
return new BaseObject();
}
@ -3714,6 +3716,7 @@ Content;
if ($type === 'all' || $type === 'extra_vars')
{
unset($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
unset($GLOBALS['XE_EXTRA_CHK'][$document_srl]);
unset($GLOBALS['RX_DOCUMENT_LANG'][$document_srl]);
}
}

21
modules/document/document.model.php
View file

@ -55,19 +55,16 @@ class DocumentModel extends Document
return;
}
static $checked = array();
static $module_extra_keys = array();
// check documents
$document_srls = array();
foreach($_document_list as $document_srl => $oDocument)
{
if(isset($checked[$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
if(isset($GLOBALS['XE_EXTRA_CHK'][$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
{
continue;
}
$checked[$document_srl] = true;
$GLOBALS['XE_EXTRA_CHK'][$document_srl] = true;
$document_srls[] = $document_srl;
}
@ -102,16 +99,16 @@ class DocumentModel extends Document
if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
{
// get extra keys of the module
if(!isset($module_extra_keys[$module_srl]))
if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{
$module_extra_keys[$module_srl] = self::getExtraKeys($module_srl);
$GLOBALS['XE_EXTRA_KEYS'][$module_srl] = self::getExtraKeys($module_srl);
}
// set extra variables of the document
if($module_extra_keys[$module_srl])
if(!empty($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{
$document_extra_vars = array();
foreach($module_extra_keys[$module_srl] as $idx => $key)
foreach($GLOBALS['XE_EXTRA_KEYS'][$module_srl] as $idx => $key)
{
$document_extra_vars[$idx] = clone($key);
@ -1491,11 +1488,13 @@ class DocumentModel extends Document
case 'nick_name' :
case 'email_address' :
case 'homepage' :
case 'regdate' :
case 'last_update' :
case 'ipaddress' :
$args->{'s_' . $search_target} = str_replace(' ', '%', $search_keyword);
break;
case 'regdate' :
case 'last_update' :
$args->{'s_' . $search_target} = preg_replace('/[^\d]/', '', $search_keyword);
break;
case 'member_srl' :
case 'readed_count' :
case 'voted_count' :

3
modules/document/queries/updateDocumentExtraKeyIdx.xml
View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

3
modules/document/queries/updateDocumentExtraVarIdx.xml
View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

16
modules/document/tpl/extra_keys.html
View file

@ -110,7 +110,7 @@
<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
</div>
</div>
<table class="x_table x_table-striped x_table-hover">
<table class="x_table x_table-striped x_table-hover sortable extra_keys" data-module-srl="{$module_srl}">
<thead>
<tr class="nowr">
<th>{$lang->no}</th>
@ -123,10 +123,15 @@
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<tbody class="uDrag">
<block loop="$extra_keys => $key,$val">
<tr>
<td rowspan="2"|cond="$val->desc">{$val->idx}</td>
<tr data-eid="{$val->eid}" data-idx="{$val->idx}">
<td>
<div class="wrap" style="user-select:none">
<button type="button" class="dragBtn">Move to</button>
<span class="var_idx">{$val->idx}</span>
</div>
</td>
<td>{$val->eid}</td>
<td class="nowr"><strong>{$val->name}</strong></td>
<td class="nowr">{$lang->column_type_list[$val->type]}</td>
@ -144,9 +149,6 @@
<button type="button" class="x_icon-trash" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</button>
</td>
</tr>
<tr cond="$val->desc">
<td colspan="7">{$val->desc}</td>
</tr>
</block>
</tbody>
</table>

37
modules/document/tpl/js/document_admin.js
View file

@ -3,12 +3,10 @@
* @brief 모든 생성된 섬네일 삭제하는 액션 호출
**/
function doDeleteAllThumbnail() {
exec_xml('document','procDocumentAdminDeleteAllThumbnail', [], completeDeleteAllThumbnail);
}
function completeDeleteAllThumbnail(ret_obj) {
alert(ret_obj['message']);
location.reload();
Rhymix.ajax('document.procDocumentAdminDeleteAllThumbnail', {}, function(ret_obj) {
alert(ret_obj['message']);
location.reload();
});
}
/* 선택된 글의 삭제 또는 이동 */
@ -28,22 +26,20 @@ function completeManageDocument(ret_obj) {
window.close();
}
/* 신고 취소 */
function doCancelDeclare() {
var document_srl = [];
jQuery('#fo_list input[name=cart]:checked').each(function() {
document_srl[document_srl.length] = jQuery(this).val();
$('#fo_list input[name=cart]:checked').each(function() {
document_srl.push($(this).val());
});
if (document_srl.length < 1) {
return;
}
if(document_srl.length<1) return;
var params = {document_srl : document_srl.join(',')};
exec_xml('document','procDocumentAdminCancelDeclare', params, completeCancelDeclare);
}
function completeCancelDeclare(ret_obj) {
location.reload();
var params = { document_srl : document_srl.join(',') };
Rhymix.ajax('document.procDocumentAdminCancelDeclare', params, function() {
location.reload();
});
}
function completeInsertExtraVar(ret_obj) {
@ -93,8 +89,9 @@ function moveVar(type, module_srl, var_idx) {
module_srl : module_srl,
var_idx : var_idx
};
var response_tags = ['error','message'];
exec_xml('document','procDocumentAdminMoveExtraVar', params, function() { location.reload() });
Rhymix.ajax('document.procDocumentAdminMoveExtraVar', params, function() {
location.reload();
});
}
function completeRestoreTrash(ret_obj) {

27
modules/document/tpl/js/document_extra_keys.js
View file

@ -1,5 +1,31 @@
(function($) {
$(function() {
// Reorder extra keys
$('table.extra_keys.sortable').on('after-drag.st', function(e) {
const $table = $(this);
let order = [];
let i = 1;
$table.find('tbody > tr').each(function() {
order.push({
eid: $(this).data('eid'),
old_idx: parseInt($(this).data('idx'), 10),
new_idx: i++
});
});
Rhymix.ajax('document.procDocumentAdminReorderExtraVars', {
module_srl: $(this).data('moduleSrl'),
order: order
}, function() {
let i = 1;
$table.find('.var_idx').each(function() {
$(this).text(i);
i++;
});
});
});
// Show or hide fields depending on the type of variable
$('select#type').on('change', function() {
const selected_type = $(this).val();
$(this).parents('form').find('.x_control-group').each(function() {
@ -21,5 +47,6 @@
}
});
}).triggerHandler('change');
});
})(jQuery);

12
modules/editor/skins/ckeditor/file_upload.html
View file

@ -58,10 +58,10 @@
</div>
<script>
window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
xe.lang.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
xe.lang.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
xe.lang.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
xe.lang.msg_file_upload_error = '{$lang->msg_file_upload_error}';
</script>

4
modules/editor/tpl/js/editor_common.js
View file

@ -211,7 +211,7 @@ function openComponent(component_name, editor_sequence, manual_url) {
if(typeof(current_mid)!="undefined" && current_mid) popup_url += "&mid="+escape(current_mid);
if (navigator.userAgent.match(/mobile/i)) {
openFullScreenIframe(popup_url, 'editorComponent');
openModalIframe(popup_url, 'editorComponent');
} else {
popopen(popup_url, 'editorComponent');
}
@ -244,7 +244,7 @@ function editorSearchComponent(evt) {
if(editorMode[editor_sequence]=='html') return;
var popup_url = request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&module_srl="+editor_sequence
if (navigator.userAgent.match(/mobile/i)) {
openFullScreenIframe(popup_url, 'GenerateCodeInPage');
openModalIframe(popup_url, 'GenerateCodeInPage');
} else {
popopen(popup_url, 'GenerateCodeInPage');
}

4
modules/editor/tpl/js/editor_module_config.js
View file

@ -1,5 +1,7 @@
"use strict";
function getEditorSkinColorList() { }
(function($) {
$(function() {
$('.editor_skin_selector').on('change', function() {
@ -18,4 +20,4 @@
}
});
});
})(jQuery);
})(jQuery);

9
modules/file/file.controller.php
View file

@ -1265,7 +1265,14 @@ class FileController extends File
$adjusted['height'] = (int)$resize_height;
if (!$is_animated && $adjusted['type'] === $image_info['type'] && $config->max_image_size_same_format !== 'Y')
{
$adjusted['type'] = $config->max_image_size_same_format ?: 'jpg';
if (in_array($config->max_image_size_same_format, ['jpg', 'png', 'webp']))
{
$adjusted['type'] = $config->max_image_size_same_format;
}
else
{
$adjusted['type'] = 'jpg';
}
}
}
}

61
modules/file/scripts/cleanEmptyDirs.php Normal file
View file

@ -0,0 +1,61 @@
<?php
/**
* This script deletes empty directories under the 'files' directory.
*
* It may be useful when your web host imposes a hard limit on the number of
* inodes, or when your backups take too long due to the large number of
* unused directories.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete empty directories in the attachment directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/attach')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/attach.\n";
}
else
{
echo "Error while deleting empty directories under files/attach.\n";
$exit_status = $result;
}
// Delete empty directories in the member extra info directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/member_extra_info')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/member_extra_info.\n";
}
else
{
echo "Error while deleting empty directories under files/member_extra_info.\n";
$exit_status = $result;
}
// Delete empty directories in the thumbnails directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/thumbnails.\n";
}
else
{
echo "Error while deleting empty directories under files/thumbnails.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

102
modules/file/scripts/cleanGarbageFiles.php Normal file
View file

@ -0,0 +1,102 @@
<?php
/**
* This script deletes files that were not properly uploaded.
*
* Files can remain in an invalid status for two reasons: 1) a user abandons
* a document or comment after uploading files; or 2) a chunked upload is
* aborted without the server having any opportunity to clean it up.
* These files can obviously take up a lot of disk space. In order to prevent
* them from accumulating too much, you should run this script at least once
* every few days.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete garbage files older than this number of days.
$days = intval($args[0] ?? 0) ?: 10;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = FileController::getInstance();
// Find and delete files where isvalid = N.
while (true)
{
$output = executeQueryArray('file.getFileList', [
'isvalid' => 'N',
'list_count' => 50,
'regdate_before' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting garbage files older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all garbage files older than $days days.\n";
}
// Find and delete temporary chunks.
$dirname = RX_BASEDIR . 'files/attach/chunks';
$threshold = time() - ($days * 86400);
$chunks = Rhymix\Framework\Storage::readDirectory($dirname);
if ($chunks)
{
foreach ($chunks as $chunk)
{
if (@filemtime($chunk) < $threshold)
{
$result = Rhymix\Framework\Storage::delete($chunk);
if (!$result)
{
$exit_status = 12;
}
}
}
}
if ($exit_status == 0)
{
echo "Successfully deleted temporary file chunks older than $days days.\n";
}
else
{
echo "Error while deleting temporary file chunks older than $days days.\n";
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

44
modules/file/scripts/cleanThumbnails.php Normal file
View file

@ -0,0 +1,44 @@
<?php
/**
* This script deletes old thumbnails.
*
* Thumbnails can take up a large amount of disk space and inodes if they are
* allowed to accumulate. Since most websites only need thumbnails for recent
* posts, it is okay to delete old thumbnails.
*
* Do not run this script if you have a gallery-style module where visitors
* regularly view old posts. This will force thumbnails to be regenerated,
* increasing the server load and making your pages load slower.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete thumbnails older than this number of days.
$days = intval($args[0] ?? 0) ?: 90;
// Delete old thumbnails.
passthru(sprintf('find %s -type f -mtime +%d -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails'), abs($days)), $result);
if ($result == 0)
{
echo "Successfully deleted thumbnails older than $days days.\n";
}
else
{
echo "Error while deleting thumbnails older than $days days.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

32
modules/importer/importer.admin.controller.php
View file

@ -18,11 +18,6 @@ class importerAdminController extends importer
* @var int
*/
var $unit_count = 300;
/**
* Xml parser
* @var XmlParser
*/
var $oXmlParser = null;
/**
* Initialization
@ -346,8 +341,6 @@ class importerAdminController extends importer
function importMember($key, $cur, $index_file)
{
if(!$cur) $cur = 0;
// Create the xmlParser object
$oXmlParser = new XeXmlParser();
// Create objects for importing member information
$this->oMemberController = getController('member');
$this->oMemberModel = getModel('member');
@ -368,7 +361,7 @@ class importerAdminController extends importer
// Find a given location
$target_file = trim(fgets($f, 1024));
// Load and parse the file
$xmlObj = $oXmlParser->loadXmlFile($target_file);
$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
FileHandler::removeFile($target_file);
if(!$xmlObj) continue;
// List Objects
@ -539,8 +532,6 @@ class importerAdminController extends importer
function importMessage($key, $cur, $index_file)
{
if(!$cur) $cur = 0;
// Create the xmlParser object
$oXmlParser = new XeXmlParser();
// Open an index file
$f = fopen($index_file,"r");
// Pass if already read
@ -552,7 +543,7 @@ class importerAdminController extends importer
// Find a location
$target_file = trim(fgets($f, 1024));
// Load and parse the file
$xmlObj = $oXmlParser->loadXmlFile($target_file);
$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
FileHandler::removeFile($target_file);
if(!$xmlObj) continue;
// List objects
@ -638,8 +629,6 @@ class importerAdminController extends importer
*/
function importModule($key, $cur, $index_file, $module_srl)
{
// Pre-create the objects needed
$this->oXmlParser = new XeXmlParser();
// Get category information of the target module
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
@ -651,9 +640,7 @@ class importerAdminController extends importer
if(file_exists($category_file))
{
$buff = FileHandler::readFile($category_file);
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($category_file);
$categories = $xmlDoc->items->category;
if($categories)
@ -757,7 +744,7 @@ class importerAdminController extends importer
if($started) $buff[] = $str;
}
$xmlDoc = $this->oXmlParser->parse(implode('', $buff));
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString(implode('', $buff));
$category = base64_decode($xmlDoc->post->category->body);
if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
@ -901,7 +888,7 @@ class importerAdminController extends importer
// If </trackback>, insert to the DB
if(trim($str) == '</trackback>')
{
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$obj = new stdClass;
$obj->trackback_srl = getNextSequence();
@ -963,7 +950,7 @@ class importerAdminController extends importer
// If </comment> is, insert to the DB
if(trim($str) == '</comment>')
{
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$sequence = base64_decode($xmlDoc->comment->sequence->body);
$sequences[$sequence] = $obj->comment_srl;
@ -1106,7 +1093,7 @@ class importerAdminController extends importer
// If it ends with </attach>, handle attachements
if(trim($str) == '</attach>')
{
$xmlDoc = $this->oXmlParser->parse($buff.$str);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff.$str);
$file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
$file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
@ -1250,14 +1237,13 @@ class importerAdminController extends importer
if(!$buff) return array();
$buff = '<extra_vars>'.$buff;
$oXmlParser = new XeXmlParser();
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
if(empty($xmlDoc->extra_vars->key)) return array();
$index = 1;
foreach($xmlDoc->extra_vars->key as $k => $v)
{
unset($vobj);
$vobj = new stdClass();
if($v->var_idx)
{
$vobj->var_idx = base64_decode($v->var_idx->body);

30
modules/importer/ttimport.class.php
View file

@ -13,12 +13,6 @@
*/
class ttimport
{
/**
* Xml Parse
* @var XmlParser
*/
var $oXmlParser = null;
/**
* Import data in module.xml format
* @param int $key
@ -33,8 +27,6 @@ class ttimport
*/
function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
{
// Pre-create the objects needed
$this->oXmlParser = new XeXmlParser();
// Get category information of the target module
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
@ -45,8 +37,8 @@ class ttimport
$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
if(file_exists($category_file))
{
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($category_file);
// List category information
if($xmlDoc->categories->category)
{
@ -62,7 +54,7 @@ class ttimport
$obj = null;
$obj->title = $category;
$obj->module_srl = $module_srl;
$obj->module_srl = $module_srl;
if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
$output = $oDocumentController->insertCategory($obj);
@ -126,7 +118,7 @@ class ttimport
if($started) $buff .= $str;
}
$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString('<post>'.$buff);
$author_xml_id = $xmlDoc->post->author->body;
@ -250,7 +242,7 @@ class ttimport
// Save state if not published
if(!in_array($xmlDoc->post->visibility->body, $status_published))
{
$obj->module_srl = $member_info->member_srl;
$obj->module_srl = $member_info->member_srl;
}
}
// Document
@ -288,8 +280,8 @@ class ttimport
$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
if(file_exists($guestbook_file))
{
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($guestbook_file);
// Handle guest book information
if($guestbook_module_srl && $xmlDoc->guestbook->comment)
{
@ -480,7 +472,7 @@ class ttimport
$buff .= '</attachment>';
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString($buff);
$file_obj->source_filename = $xmlDoc->attachment->label->body;
$file_obj->download_count = $xmlDoc->attachment->downloads->body;
@ -516,7 +508,7 @@ class ttimport
{
$uploaded_count++;
$tmp_obj = null;
if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename;
if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename;
else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
$files[$name]->direct_download = $file_obj->direct_download;
$files[$name]->source_filename = $file_obj->source_filename;
@ -583,7 +575,7 @@ class ttimport
if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
{
return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
// If other multimedia file but image is,
// If other multimedia file but image is,
}
else
{
@ -606,7 +598,7 @@ class ttimport
$key = $matches[1];
if(!$key) return $matches[0];
return
return
'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
'<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
'<param name="allowScriptAccess" value="always"/>'.

3
modules/krzip/krzip.model.php
View file

@ -173,8 +173,7 @@ class krzipModel extends krzip
$request_config
);
$oXmlParser = new XeXmlParser();
$result = $oXmlParser->parse($buff);
$result = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
if($result->error)
{
$err_msg = trim($result->error->message->body);

16
modules/layout/layout.model.php
View file

@ -572,13 +572,17 @@ class LayoutModel extends Layout
return $layout_info;
}
// If no cache file exists, parse the xml and then return the variable.
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$tmp_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($xml_file);
if (!$tmp_xml_obj)
{
return;
}
if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
if(!$xml_obj) return;
$xml_obj = !empty($tmp_xml_obj->layout) ? $tmp_xml_obj->layout : $tmp_xml_obj->skin;
if (!$xml_obj)
{
return;
}
$buff = array();
$buff[] = '$layout_info = new stdClass;';

14
modules/layout/tpl/layout_info_view.html
View file

@ -53,10 +53,10 @@
<h1>{$lang->extra_vars}</h1>
{@$cnt = 1}
<block loop="$selected_layout->extra_var => $name, $var">
<block cond="$cnt == 1 && $var->group"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
<block cond="$group != $var->group">
<block cond="$cnt == 1 && !empty($var->group)"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
<block cond="($group ?? null) != ($var->group ?? null)">
<li class="x_active"|cond="$cnt == 1"><a href="#extra_var{$cnt}" data-index="{$cnt}">{$var->group}</a></li>
{@$group = $var->group}
{@$group = $var->group ?? null}
{@$cnt ++}
</block>
</block>
@ -77,7 +77,7 @@
<label class="x_control-label" for="{$name}"|cond="$var->type!='text'&&$var->type!='textarea'" for="lang_{$name}"|cond="$var->type=='text'||$var->type=='textarea'">{$var->title}</label>
<div class="x_controls">
<div cond="$var->type == 'text'">
<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value ?? '', '$user_lang->') !== false)-->{htmlspecialchars($var->value ?? '', ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
</div>
<div cond="$var->type == 'textarea'">
@ -118,7 +118,7 @@
<block cond="$var->type == 'radio'">
<div class="x_thumbnails">
<block loop="$var->options => $key, $val">
<div class="x_span2 <!--@if($val->thumbnail)-->x_thumbnail<!--@end-->">
<div class="x_span2 <!--@if(!empty($val->thumbnail))-->x_thumbnail<!--@end-->">
<img src="../../../{$val->thumbnail}" cond="$val->thumbnail" alt="{$val->val}" />
<div class="x_caption">
<label><input type="radio" name="{$name}" value="{$key}" checked="checked"|cond="$key == $var->value" /> {$val->val}</label>
@ -156,8 +156,8 @@
<div class="x_clearfix btnArea">
<span class="etc">
<a cond="$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type)}">{$lang->cmd_list}</a>
<a cond="!$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type)}">{$lang->cmd_list}</a>
<a cond="!empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type ?? null)}">{$lang->cmd_list}</a>
<a cond="empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type ?? null)}">{$lang->cmd_list}</a>
</span>
<span class="x_btn-group x_pull-right">
<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" onclick="doSubmitConfig()"/>

3
modules/member/lang/en.php
View file

@ -201,6 +201,9 @@ $lang->msg_email_address_not_changeable = 'You cannot change your email address
$lang->msg_signup_disabled = 'You are not able to sign up';
$lang->msg_already_logged = 'You have already signed up.';
$lang->msg_not_logged = 'Please log in.';
$lang->msg_required_not_logged = 'This page is only available to users who are not logged in.';
$lang->msg_required_specific_group = 'You need to belong to a certain group in order to access this page.';
$lang->msg_required_minimum_level = 'YOu need to be level %d or higher in order to access this page.';
$lang->msg_insert_group_name = 'Please enter the name of group.';
$lang->msg_check_group = 'Please select the group.';
$lang->msg_not_uploaded_profile_image = 'Profile image could not be registered.';

3
modules/member/lang/ko.php
View file

@ -203,6 +203,9 @@ $lang->msg_email_address_not_changeable = '이메일 주소는 이 화면에서
$lang->msg_signup_disabled = '회원 가입할 수 없습니다.';
$lang->msg_already_logged = '이미 로그인되어 있습니다.';
$lang->msg_not_logged = '로그인이 필요합니다.';
$lang->msg_required_not_logged = '로그인하지 않은 상태에서만 사용할 수 있는 기능입니다.';
$lang->msg_required_specific_group = '이 기능을 사용할 수 있는 그룹이 제한되어 있습니다.';
$lang->msg_required_minimum_level = '이 기능을 사용하려면 레벨 %d 이상이어야 합니다.';
$lang->msg_insert_group_name = '그룹명을 입력해 주세요.';
$lang->msg_check_group = '그룹을 선택해 주세요.';
$lang->msg_not_uploaded_profile_image = '프로필 이미지를 등록할 수 없습니다.';

2
modules/member/tpl/group_list.html
View file

@ -23,7 +23,7 @@
<caption>
<strong>{count($group_list)}{$lang->msg_groups_exist}</strong>
<span class="x_pull-right" style="position:relative;top:7px">
{$lang->use_group_image_mark}:
{$lang->use_group_image_mark}:
<label for="yes" class="x_inline"><input type="radio" name="group_image_mark" id="yes" value="Y" checked="checked"|cond="$config->group_image_mark == 'Y'" /> {$lang->cmd_yes}</label>
<label for="no" class="x_inline"><input type="radio" name="group_image_mark" id="no" value="N" checked="checked"|cond="$config->group_image_mark != 'Y'" /> {$lang->cmd_no}</label>
</span>

13
modules/menu/tpl/sitemap.html
View file

@ -680,6 +680,7 @@
<select id="auth${PermId}">
<option class="_group_all" value="0">{$lang->grant_to_all}</option>
<option class="_group_loggedin" value="-1">{$lang->grant_to_login_user}</option>
<option class="_group_not_loggedin" value="-4">{$lang->grant_to_non_login_user}</option>
<option class="_group_manager" value="-3">{$lang->grant_to_admin}</option>
<option class="_group_selected" value="-10">{$lang->grant_to_group}</option>
</select>
@ -1521,12 +1522,12 @@ jQuery(function($){
$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
if($(this).hasClass('_nodeType_1')){
$.xeMsgBox.alert(xe.msg_no_root);
$.xeMsgBox.alert(xe.lang.msg_no_root);
return;
}
if($(this).hasClass('_nodeType_3')){
$.xeMsgBox.alert(xe.msg_no_shortcut);
$.xeMsgBox.alert(xe.lang.msg_no_shortcut);
return;
}
@ -2328,7 +2329,8 @@ jQuery(function($){
var htGrantStrToSelectValMap = {
'all': '0',
'member': '-1',
'site': '-2',
'site': '-1',
'not_member': '-4',
'manager': '-3',
'group': '-10'
};
@ -2366,7 +2368,7 @@ jQuery(function($){
/*
guest : 모든 옵션 사용 가능, 항상 권한 있음.
member : '모든 사용자' 제외하고 사용 가능, 로그인 정보가 있을 경우 true
site : '모든 사용자' 제외하고 사용 가능, 가상 사이트일 경우에는 가입된 그룹 정보가 있어야 하며, 가상 사이트가 아닐 경우에는 'member'와 동일.
not_member : 비로그인 사용자, 로그인 정보가 *없을* 경우 true
manager : '관리자만','선택그룹 사용자' 옵션만 사용가능, 관리자일 경우에만 true
root : manager와 동일.
*/
@ -2377,6 +2379,9 @@ jQuery(function($){
case 'member':
$node.find('._group_all').remove();
break;
case 'not_member':
$node.find('._group_all').remove();
break;
case 'site':
$node.find('._group_all').remove();
break;

7
modules/module/lang/en.php
View file

@ -46,11 +46,12 @@ $lang->header_script = 'Header Script';
$lang->about_header_script = 'You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself. You can use &lt;script&gt;, &lt;style&gt; or &lt;meta&gt; tags.';
$lang->grant_access = 'Access';
$lang->grant_manager = 'Management';
$lang->grant_to_all = 'All users';
$lang->grant_to_login_user = 'Login users';
$lang->grant_to_all = 'Everyone';
$lang->grant_to_login_user = 'Logged in users';
$lang->grant_to_non_login_user = 'Logged out users';
$lang->grant_to_site_user = 'Registered users';
$lang->grant_to_admin = 'Administrator only';
$lang->grant_to_group = 'Selected group users';
$lang->grant_to_group = 'Selected group members';
$lang->cmd_add_shortcut = 'Add Shortcut';
$lang->cmd_install = 'Install';
$lang->cmd_create_db_table = 'Create DB Table';

5
modules/module/lang/ko.php
View file

@ -46,11 +46,12 @@ $lang->header_script = '헤더 스크립트';
$lang->about_header_script = 'HTML &lt;head&gt;...&lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. 예) &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; ';
$lang->grant_access = '접근 권한';
$lang->grant_manager = '관리 권한';
$lang->grant_to_all = '모든 사용자';
$lang->grant_to_all = '모든 방문자';
$lang->grant_to_login_user = '로그인 사용자';
$lang->grant_to_non_login_user = '비로그인 사용자';
$lang->grant_to_site_user = '가입한 사용자';
$lang->grant_to_admin = '관리자만';
$lang->grant_to_group = '선택 그룹 사용자';
$lang->grant_to_group = '선택 그룹 소속 회원';
$lang->cmd_add_shortcut = '바로가기 추가';
$lang->cmd_install = '설치';
$lang->cmd_create_db_table = 'DB Table 생성하기';

194
modules/module/models/Permission.php
View file

@ -7,31 +7,138 @@ class Permission
{
/**
* Default properties.
*
* Note that $is_admin is an alias to $root,
* and $is_site_admin is an alias to $manager.
*/
public $access;
public $root;
public $manager;
public $scopes;
/**
* Alias to $root, kept for backward compatibility only.
*
* @deprecated
* Requirements for this module.
*/
public $is_admin;
protected $_spec = [];
/**
* Alias to $manager, kept for backward compatibility only.
*
* @deprecated
* Scopes for module managers.
*/
public $is_site_admin;
protected $_scopes = [];
/**
* Primary method to determine whether a user is allowed to do something.
* Constructor will be called from ModuleModel::getGrant().
*
* @param array $xml_grant_list
* @param array $module_grants
* @param ?object $module_info
* @param ?object $member_info
*/
public function __construct(array $xml_grant_list, array $module_grants, ?object $module_info = null, ?object $member_info = null)
{
// Generate the list of default permissions.
$this->_spec = [
'access' => 'guest',
'root' => 'root',
'manager' => 'manager',
'is_admin' => 'root',
'is_site_admin' => 'root',
];
foreach ($xml_grant_list as $key => $val)
{
$this->_spec[$key] = $val->default ?? '';
}
// Override the defaults with user settings.
foreach ($module_grants as $row)
{
$key = $row->name;
if ($row->group_srl == 0)
{
$this->_spec[$key] = 'guest';
continue;
}
if ($row->group_srl == -1 || $row->group_srl == -2)
{
$this->_spec[$key] = 'member';
continue;
}
if ($row->group_srl == -4)
{
$this->_spec[$key] = 'not_member';
continue;
}
if ($row->group_srl == -3)
{
$this->_spec[$key] = 'manager';
continue;
}
if ($row->group_srl > 0)
{
if (!isset($this->_spec[$key]) || !is_array($this->_spec[$key]))
{
$this->_spec[$key] = [];
}
$this->_spec[$key][] = $row->group_srl;
continue;
}
}
// If the member is an administrator, grant all possible permissions.
if ($member_info && $member_info->is_admin === 'Y')
{
$this->_scopes = true;
foreach ($this->_spec as $key => $requirement)
{
$this->{$key} = true;
}
return;
}
// If the member is a module manager, fill the scope of management.
$manager_scopes = !empty($module_info->module_srl) ? \ModuleModel::isModuleAdmin($member_info, $module_info->module_srl) : false;
$member_groups = !empty($member_info->group_list) ? array_keys($member_info->group_list) : [];
if ($manager_scopes)
{
$this->manager = true;
$this->_scopes = $manager_scopes;
}
// Check if each permission is granted to the current user.
foreach ($this->_spec as $key => $requirement)
{
if ($requirement === 'guest')
{
$this->{$key} = true;
}
elseif ($requirement === 'member')
{
$this->{$key} = ($member_info && $member_info->member_srl);
}
elseif ($requirement === 'not_member')
{
$this->{$key} = !($member_info && $member_info->member_srl) || $this->manager;
}
elseif ($requirement === 'manager')
{
$this->{$key} = $this->manager ? true : false;
}
elseif ($requirement === 'root')
{
$this->{$key} = $this->root ? true : false;
}
elseif (is_array($requirement))
{
$this->{$key} = array_intersect($member_groups, $requirement) ? true : false;
if ($key === 'manager' && $this->{$key} === true)
{
$this->_scopes = true;
}
}
}
}
/**
* Find out whether the current user is allowed to do something.
*
* This is more portable than accessing object attributes directly,
* and also supports manager scopes.
*
* @param string $scope
* @return bool
@ -43,17 +150,17 @@ class Permission
return boolval($this->{$scope});
}
if ($this->manager && $this->scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
if ($this->manager && $this->_scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
{
if ($this->scopes === true)
if ($this->_scopes === true)
{
return true;
}
if (is_array($this->scopes) && in_array($scope, $this->scopes))
if (is_array($this->_scopes) && in_array($scope, $this->_scopes))
{
return true;
}
if (is_array($this->scopes) && in_array($matches[1] . ':*', $this->scopes))
if (is_array($this->_scopes) && in_array($matches[1] . ':*', $this->_scopes))
{
return true;
}
@ -61,4 +168,57 @@ class Permission
return false;
}
/**
* Find out who is allowed to do something.
*
* This method returns 'root', 'manager', 'member', 'guest',
* or an array of group_srls whose members are allowed.
*
* If you pass the name of a scope, the result might vary
* depending on whether you are a module manager.
*
* @param string key
* @return string|array
*/
public function whocan(string $key)
{
if (isset($this->_spec[$key]))
{
return $this->_spec[$key];
}
elseif (preg_match('/^(\w+):(\w+)$/', $key))
{
if ($this->manager)
{
return $this->can($key) ? 'manager' : 'root';
}
else
{
return 'manager';
}
}
else
{
return 'nobody';
}
}
/**
* Magic method to provide deprecated aliases.
*
* @param string $key
* @return mixed
*/
public function __get(string $key)
{
if ($key === 'is_admin' || $key === 'is_site_admin')
{
return $this->root;
}
else
{
return false;
}
}
}

6
modules/module/module.admin.model.php
View file

@ -182,7 +182,8 @@ class ModuleAdminModel extends Module
{
if($val->group_srl == 0) $default_grant[$val->name] = 'all';
else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
else if($val->group_srl == -2) $default_grant[$val->name] = 'member';
else if($val->group_srl == -4) $default_grant[$val->name] = 'not_member';
else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
else
{
@ -260,7 +261,8 @@ class ModuleAdminModel extends Module
{
if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'member';
else if($val->group_srl == -4) $defaultGrant->{$val->name} = 'not_member';
else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
else
{

149
modules/module/module.model.php
View file

@ -1031,8 +1031,7 @@ class ModuleModel extends Module
}
// Create XmlParser object
$oXmlParser = new XeXmlParser();
$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
$_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($skin_xml_file);
// Return if no skin information is
if(!$_xml_obj->skin) return;
$xml_obj = $_xml_obj->skin;
@ -2187,7 +2186,7 @@ class ModuleModel extends Module
*/
public static function getGrant($module_info, $member_info, $xml_info = null)
{
if(empty($module_info->module))
if (empty($module_info->module))
{
$module_info = new stdClass;
$module_info->module = $module_info->module_srl = 0;
@ -2202,148 +2201,16 @@ class ModuleModel extends Module
}
}
// Get information of module.xml
if(!$xml_info)
// Get module grant information
if (!$xml_info)
{
$xml_info = self::getModuleActionXml($module_info->module);
}
// Generate grant
$xml_grant_list = isset($xml_info->grant) ? (array)$xml_info->grant : array();
// Get group information of member
$member_group = !empty($member_info->group_list) ? array_keys($member_info->group_list) : array();
$is_module_admin = !empty($module_info->module_srl) ? self::isModuleAdmin($member_info, $module_info->module_srl) : false;
// Get 'privilege name' list from module.xml
$privilege_list = array_keys($xml_grant_list);
// Prepend default 'privilege name'
// manager, is_site_admin not distinguish because of compatibility.
array_unshift($privilege_list, 'access', 'is_admin', 'manager', 'is_site_admin', 'root');
// Unique
$privilege_list = array_unique($privilege_list, SORT_STRING);
// Grant first
$grant = new Rhymix\Modules\Module\Models\Permission;
foreach($privilege_list as $val)
{
// If an administrator, grant all
if($member_info && $member_info->is_admin == 'Y')
{
$grant->{$val} = true;
}
// If a module manager, grant all (except 'root', 'is_admin')
elseif ($is_module_admin && $val !== 'root' && $val !== 'is_admin')
{
$grant->{$val} = true;
}
// If module_srl doesn't exist, grant access
else if(empty($module_info->module_srl) && $val === 'access')
{
$grant->{$val} = true;
}
// Default : not grant
else
{
$grant->{$val} = false;
}
}
// If module admin, add scopes
if ($member_info && $member_info->is_admin == 'Y')
{
$grant->scopes = true;
}
elseif ($is_module_admin)
{
$grant->scopes = $is_module_admin;
}
else
{
$grant->scopes = [];
}
// If access were not granted, check more
if(!$grant->access)
{
$checked = array();
// Grant privileges by information that get from the DB
foreach(self::getModuleGrants($module_info->module_srl)->data as $val)
{
$checked[$val->name] = true;
if($grant->{$val->name})
{
continue;
}
// All user
if($val->group_srl == 0)
{
$grant->{$val->name} = true;
continue;
}
// Log-in member only
if($member_info && $member_info->member_srl)
{
if($val->group_srl == -1 || $val->group_srl == -2)
{
$grant->{$val->name} = true;
}
// Manager only
else if($val->group_srl == -3)
{
if($grant->manager)
{
$grant->{$val->name} = true;
}
}
// If a target is a group
else if(count($member_group) && in_array($val->group_srl, $member_group))
{
$grant->{$val->name} = true;
if ($val->name === 'manager' && !$grant->scopes)
{
$grant->scopes = true;
}
}
}
}
// Grant access by default
if(!isset($checked['access']))
{
$grant->access = true;
}
// Grant privileges by default information of module
foreach($xml_grant_list as $name => $item)
{
if(isset($checked[$name]) || $grant->{$name})
{
continue;
}
// All user
if($item->default == 'guest')
{
$grant->{$name} = true;
continue;
}
// Log-in member only
if($member_info && $member_info->member_srl)
{
if($item->default == 'member' || $item->default == 'site')
{
$grant->{$name} = true;
}
}
}
}
$module_grants = self::getModuleGrants($module_info->module_srl ?? 0)->data ?: [];
$grant = new Rhymix\Modules\Module\Models\Permission($xml_grant_list, $module_grants, $module_info, $member_info ?: null);
return $__cache = $grant;
}

84
modules/module/scripts/cleanMiscLogs.php Normal file
View file

@ -0,0 +1,84 @@
<?php
/**
* This script deletes old logs from the database.
*
* Rhymix produces various logs that can increase the size of the database
* unnecessarily if not cleaned. This script removes old logs.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete logs older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Delete advanced mailer email logs.
$output = executeQuery('advanced_mailer.deleteMailLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all email logs older than $days days.\n";
}
else
{
echo "Error while deleting email logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Delete advanced mailer SMS logs.
$output = executeQuery('advanced_mailer.deleteSMSLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all SMS logs older than $days days.\n";
}
else
{
echo "Error while deleting SMS logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 12;
}
// Delete advanced mailer Push logs.
$output = executeQuery('advanced_mailer.deletePushLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all Push logs older than $days days.\n";
}
else
{
echo "Error while deleting Push logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 13;
}
// Delete spamfilter logs.
$output = executeQuery('spamfilter.deleteLog', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all spamfilter logs older than $days days.\n";
}
else
{
echo "Error while deleting spamfilter logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 21;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

67
modules/module/scripts/updateAllModules.php Normal file
View file

@ -0,0 +1,67 @@
<?php
/**
* This script updates all modules.
*
* When upgrading from a very old version, it is safer to run this script
* on the CLI than clicking 'update' in the admin dashboard.
* This is because some module updates may take a long time.
*
* Note that if you use APC cache, you may need to reset the cache
* in the admin dashboard after running this script.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Get the list of modules that need to be updated.
$module_list = ModuleModel::getModuleList();
$need_install = array();
$need_update = array();
foreach ($module_list as $key => $value)
{
if ($value->need_install)
{
$need_install[] = $value->module;
}
if ($value->need_update)
{
$need_update[] = $value->module;
}
}
// Install all modules.
$oInstallController = InstallController::getInstance();
foreach ($need_install as $module)
{
try
{
echo 'Installing ' . $module . '...' . PHP_EOL;
$oInstallController->installModule($module, './modules/' . $module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Update all modules.
foreach ($need_update as $module)
{
try
{
echo 'Updating ' . $module . '...' . PHP_EOL;
$oInstallController->updateModule($module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

5
modules/module/tpl/include.module_grant_setup.html
View file

@ -13,8 +13,9 @@
<label class="x_control-label" for="{$grant_name}_default">{$grant_item->title}</label>
<div class="x_controls">
<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
<option value="0" cond="$grant_item->default == 'guest'">{$lang->grant_to_all}</option>
<option value="-1" cond="$grant_item->default != 'manager'">{$lang->grant_to_login_user}</option>
<option value="0">{$lang->grant_to_all}</option>
<option value="-1">{$lang->grant_to_login_user}</option>
<option value="-4">{$lang->grant_to_non_login_user}</option>
<option value="-3">{$lang->grant_to_admin}</option>
<option value="">{$lang->grant_to_group}</option>
</select>

5
modules/module/tpl/module_grants.html
View file

@ -58,8 +58,9 @@
<label for="{$grant_name}_default" class="x_control-label">{$grant_item->title}</label>
<div class="x_controls">
<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
<!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
<!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
<option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option>
<option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option>
<option value="-4" <!--@if($default_grant[$grant_name]=='not_member')-->selected="selected"<!--@end-->>{$lang->grant_to_non_login_user}</option>
<option value="-3" <!--@if($default_grant[$grant_name]=='manager')-->selected="selected"<!--@end-->>{$lang->grant_to_admin}</option>
<option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
</select>

14
modules/module/tpl/multilingual_v17.html
View file

@ -41,11 +41,11 @@
</div>
</div>
<script>
xe.confirm_delete = '{$lang->confirm_delete}';
xe.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
xe.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
xe.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
xe.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
xe.use_after_save = '{$lang->use_after_save}';
xe.cmd_save = '{$lang->cmd_save}';
xe.lang.confirm_delete = '{$lang->confirm_delete}';
xe.lang.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
xe.lang.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
xe.lang.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
xe.lang.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
xe.lang.use_after_save = '{$lang->use_after_save}';
xe.lang.cmd_save = '{$lang->cmd_save}';
</script>

44
modules/ncenterlite/scripts/cleanNotifications.php Normal file
View file

@ -0,0 +1,44 @@
<?php
/**
* This script deletes old notifications.
*
* Notifications must be dismissed as quickly as possible in order to prevent
* the ncenterlite_notify table from becoming too large. For best performance,
* you should run this script at least once every few days.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete notifications older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Execute the query.
$output = executeQuery('ncenterlite.deleteNotifyAll', [
'old_date' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all notifications older than $days days.\n";
$delete_obj = (object)array('regdate' => time());
Rhymix\Framework\Cache::clearGroup('ncenterlite');
Rhymix\Framework\Storage::writePHPData(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php', $delete_obj);
}
else
{
echo "Error while deleting notifications older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

Some files were not shown because too many files have changed in this diff Show more