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

rewrite rul에 m.layouts 추가

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7850 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-18 02:12:21 +00:00
parent 4f0ddc76fa
commit 176f66d88b
7 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.htaccess
View file

@ -1,13 +1,13 @@
RewriteEngine On RewriteEngine On
# reserve XE Layout Template Source File (*.html) # reserve XE Layout Template Source File (*.html)
RewriteRule ^layouts/(.+)/(.+)\.html$ ./index.php [L] RewriteRule ^(layouts|m.layouts)/(.+)/(.+)\.html$ ./index.php [L]
# static files # static files
RewriteCond %{SCRIPT_FILENAME} !-f RewriteCond %{SCRIPT_FILENAME} !-f
RewriteRule ^(.+)/files/(member_extra_info|attach|cache|faceOff)/(.*) ./files/$2/$3 [L] RewriteRule ^(.+)/files/(member_extra_info|attach|cache|faceOff)/(.*) ./files/$2/$3 [L]
RewriteCond %{SCRIPT_FILENAME} !-f RewriteCond %{SCRIPT_FILENAME} !-f
RewriteRule ^(.+)/(files|modules|common|widgets|widgetStyle|layouts|addons)/(.*) ./$2/$3 [L] RewriteRule ^(.+)/(files|modules|common|widgets|widgetStyle|layouts|m.layouts|addons)/(.*) ./$2/$3 [L]
# rss , blogAPI # rss , blogAPI
RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L] RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L]

2
addons/resize_image/resize_image.addon.php
View file

@ -11,4 +11,4 @@
Context::loadJavascriptPlugin('ui'); Context::loadJavascriptPlugin('ui');
Context::addJsFile('./addons/resize_image/js/resize_image.min.js',false); Context::addJsFile('./addons/resize_image/js/resize_image.min.js',false);
} }
?> ?>

2
classes/db/DB.class.php
View file

@ -309,7 +309,7 @@
if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid'); if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid');
if($source_args) $args = @clone($source_args); if($source_args) $args = @clone($source_args);
$this->source_args = $args;
$output = @include($cache_file); $output = @include($cache_file);
if( (is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output; if( (is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;

9
classes/db/DBCubrid.class.php
View file

@ -187,13 +187,18 @@
// 쿼리 문 실행 // 쿼리 문 실행
$result = @cubrid_execute ($this->fd, $query); $result = @cubrid_execute ($this->fd, $query);
//if(!$result){ debugPrint('result null: ' .$query); } if(!$result){
debugPrint('result null: ' .$query);
debugPrint($this->source_args);
}
// 오류 체크 // 오류 체크
if (cubrid_error_code ()) { if (cubrid_error_code ()) {
$code = cubrid_error_code (); $code = cubrid_error_code ();
$msg = cubrid_error_msg (); $msg = cubrid_error_msg ();
//debugPrint('query error : '. $code.', msg:'. $msg .', ' .$query); debugPrint('query error : '. $code.', msg:'. $msg .', ' .$query);
debugPrint($this->source_args);
$this->setError ($code, $msg); $this->setError ($code, $msg);
} }

4
config/func.inc.php
View file

@ -488,7 +488,7 @@
* ./files/_debug_message.php 파일에 $buff 내용을 출력한다. * ./files/_debug_message.php 파일에 $buff 내용을 출력한다.
* tail -f ./files/_debug_message.php 하여 계속 살펴 볼 수 있다 * tail -f ./files/_debug_message.php 하여 계속 살펴 볼 수 있다
**/ **/
function debugPrint($debug_output = null, $display_option = true) { function debugPrint($debug_output = null, $display_option = true, $file = '_debug_message.php') {
if(!(__DEBUG__ & 1)) return; if(!(__DEBUG__ & 1)) return;
static $firephp; static $firephp;
@ -523,7 +523,7 @@
if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) { if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
return; return;
} }
$debug_file = _XE_PATH_.'files/_debug_message.php'; $debug_file = _XE_PATH_.'files/'.$file;
if(function_exists("memory_get_usage")) if(function_exists("memory_get_usage"))
{ {
$debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, true)); $debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, true));

3
index.php
View file

@ -1,4 +1,7 @@
<?php <?php
if(!in_array($_SERVER['REMOTE_ADDR'], array('119.205.243.47','119.205.243.46','111.91.137.60','10.64.86.68','10.64.176.52'))) {
// header('location: ./work.html'); exit;
}
/** /**
* @file index.php * @file index.php
* @author NHN (developers@xpressengine.com) * @author NHN (developers@xpressengine.com)

2
modules/editor/queries/insertSavedDoc.xml
View file

@ -6,7 +6,7 @@
<column name="module_srl" var="module_srl" /> <column name="module_srl" var="module_srl" />
<column name="member_srl" var="member_srl" /> <column name="member_srl" var="member_srl" />
<column name="ipaddress" var="ipaddress" /> <column name="ipaddress" var="ipaddress" />
<column name="document_srl" var="document_srl" /> <column name="document_srl" var="document_srl" default="0" />
<column name="title" var="title" /> <column name="title" var="title" />
<column name="content" var="content" /> <column name="content" var="content" />
<column name="regdate" var="regdate" default="curdate()" /> <column name="regdate" var="regdate" default="curdate()" />