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

merge & tag 1.4.3

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-07-06 08:29:10 +00:00
parent 762ebbf445
commit 289973781a
200 changed files with 2296 additions and 1827 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/module/conf/module.xml
View file

@ -37,5 +37,7 @@
<action name="procModuleAdminModuleGrantSetup" type="controller" standalone="true" />
<action name="procModuleAdminInsertLang" type="controller" standalone="true" />
<action name="procModuleAdminDeleteLang" type="controller" standalone="true" />
<action name="dispModuleChangeLang" type="mobile" />
</actions>
</module>

18
modules/module/module.class.php
View file

@ -74,6 +74,11 @@
if($oDB->isIndexExists('sites', 'idx_domain')) return true;
if(!$oDB->isIndexExists('sites','unique_domain')) return true;
if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
if(!$oDB->isColumnExists("modules", "mcontent")) return true;
if(!$oDB->isColumnExists("modules", "mskin")) return true;
return false;
}
@ -298,6 +303,19 @@
$oDB->addIndex('sites','unique_domain',array('domain'),true);
}
if(!$oDB->isColumnExists("modules", "use_mobile")) {
$oDB->addColumn('modules','use_mobile','char',1,'N');
}
if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
$oDB->addColumn('modules','mlayout_srl','number',11, 0);
}
if(!$oDB->isColumnExists("modules", "mcontent")) {
$oDB->addColumn('modules','mcontent','bigtext');
}
if(!$oDB->isColumnExists("modules", "mskin")) {
$oDB->addColumn('modules','mskin','varchar',250);
}
return new Object(0, 'success_updated');
}

4
modules/module/module.controller.php
View file

@ -164,14 +164,18 @@
unset($extra_vars->module);
unset($extra_vars->module_category_srl);
unset($extra_vars->layout_srl);
unset($extra_vars->mlayout_srl);
unset($extra_vars->use_mobile);
unset($extra_vars->menu_srl);
unset($extra_vars->site_srl);
unset($extra_vars->mid);
unset($extra_vars->skin);
unset($extra_vars->mskin);
unset($extra_vars->browser_title);
unset($extra_vars->description);
unset($extra_vars->is_default);
unset($extra_vars->content);
unset($extra_vars->mcontent);
unset($extra_vars->open_rss);
unset($extra_vars->header_text);
unset($extra_vars->footer_text);

10
modules/module/module.mobile.php Normal file
View file

@ -0,0 +1,10 @@
<?php
class moduleMobile extends moduleObject {
function dispModuleChangeLang() {
$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
$this->setTemplateFile('lang.html');
}
}
?>

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

@ -264,9 +264,11 @@
/**
* @brief act 값에 의한 forward 값을 구함
**/
function getActionForward($act) {
function getActionForward($act, $module = "") {
$args->act = $act;
$output = executeQuery('module.getActionForward',$args);
$args->module = ($module)?$module:null;
if (strlen ($args->module) > 0) $output = executeQuery ('module.getActionForwardWithModule', $args);
else $output = executeQuery('module.getActionForward',$args);
return $output->data;
}

12
modules/module/queries/getActionForwardWithModule.xml Normal file
View file

@ -0,0 +1,12 @@
<query id="getActionForward" action="select">
<tables>
<table name="action_forward" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="act" var="act" />
<condition operation="equal" column="module" var="module" />
</conditions>
</query>

4
modules/module/queries/getSiteInfo.xml
View file

@ -13,13 +13,17 @@
<column name="modules.module" alias="module" />
<column name="modules.module_category_srl" alias="module_category_srl" />
<column name="modules.layout_srl" alias="layout_srl" />
<column name="modules.mlayout_srl" alias="mlayout_srl" />
<column name="modules.use_mobile" alias="use_mobile" />
<column name="modules.menu_srl" alias="menu_srl" />
<column name="modules.mid" alias="mid" />
<column name="modules.skin" alias="skin" />
<column name="modules.mskin" alias="mskin" />
<column name="modules.browser_title" alias="browser_title" />
<column name="modules.description" alias="description" />
<column name="modules.is_default" alias="is_default" />
<column name="modules.content" alias="content" />
<column name="modules.mcontent" alias="mcontent" />
<column name="modules.open_rss" alias="open_rss" />
<column name="modules.header_text" alias="header_text" />
<column name="modules.footer_text" alias="footer_text" />

4
modules/module/queries/insertModule.xml
View file

@ -8,10 +8,12 @@
<column name="module_category_srl" var="module_category_srl" default="0" />
<column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
<column name="skin" var="skin" minlength="1" maxlength="250" />
<column name="mskin" var="mskin" />
<column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
<column name="layout_srl" var="layout_srl" />
<column name="description" var="description" />
<column name="content" var="content" />
<column name="mcontent" var="mcontent" />
<column name="module" var="module" notnull="notnull" maxlength="80" />
<column name="is_default" var="is_default" default="N" notnull="notnull" />
<column name="menu_srl" var="menu_srl" filter="number" />
@ -19,5 +21,7 @@
<column name="header_text" var="header_text" />
<column name="footer_text" var="footer_text" />
<column name="regdate" default="curdate()" />
<column name="mlayout_srl" var="mlayout_srl" />
<column name="use_mobile" var="use_mobile" default="N" />
</columns>
</query>

4
modules/module/queries/updateModule.xml
View file

@ -7,15 +7,19 @@
<column name="module_category_srl" var="module_category_srl" />
<column name="layout_srl" var="layout_srl" />
<column name="skin" var="skin" minlength="0" maxlength="250" />
<column name="mskin" var="mskin" />
<column name="menu_srl" var="menu_srl" filter="number" />
<column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
<column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
<column name="description" var="description" default="" />
<column name="is_default" var="is_default" default="N" notnull="notnull" />
<column name="content" var="content" />
<column name="mcontent" var="mcontent" />
<column name="open_rss" var="open_rss" default="Y" notnull="notnull" />
<column name="header_text" var="header_text" default="" />
<column name="footer_text" var="footer_text" default="" />
<column name="mlayout_srl" var="mlayout_srl" />
<column name="use_mobile" var="use_mobile" default="N" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" filter="number" notnull="notnull" />

4
modules/module/schemas/modules.xml
View file

@ -3,14 +3,18 @@
<column name="module" type="varchar" size="80" notnull="notnull" index="idx_module" />
<column name="module_category_srl" type="number" size="11" default="0" index="idx_module_category" />
<column name="layout_srl" type="number" size="11" default="0" />
<column name="use_mobile" type="char" size="1" default="N" />
<column name="mlayout_srl" type="number" size="11" default="0" />
<column name="menu_srl" type="number" size="11" default="0" />
<column name="site_srl" type="number" size="11" notnull="notnull" default="0" />
<column name="mid" type="varchar" size="40" notnull="notnull" />
<column name="skin" type="varchar" size="250" />
<column name="mskin" type="varchar" size="250" />
<column name="browser_title" type="varchar" size="250" notnull="notnull" />
<column name="description" type="text" />
<column name="is_default" type="char" size="1" notnull="notnull" default="N" />
<column name="content" type="bigtext" />
<column name="mcontent" type="bigtext" />
<column name="open_rss" type="char" size="1" notnull="notnull" default="Y" />
<column name="header_text" type="text" />
<column name="footer_text" type="text" />

12
modules/module/tpl/css/mlang.css Normal file
View file

@ -0,0 +1,12 @@
/* Body */
.bd{position:relative;overflow:hidden;clear:both}
/* GNB */
.gn,.gn ul{margin:0;padding:0;list-style:none}
.gn li{margin:-1px 0;border:1px solid #999;border-left:0;border-right:0;vertical-align:top}
.gn li a{display:block;text-decoration:none;height:45px;line-height:45px;padding:0 10px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.gn li strong{display:block;text-decoration:none;height:45px;line-height:45px;padding:0 10px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.gn li a em{font-weight:normal;color:#f60;font-size:12px}
.gn li a:visited{color:#666}
.gn li li a{padding:0 10px 0 20px}
.gn li li li a{padding:0 10px 0 30px}
.gn li li li li a{padding:0 10px 0 50px}

12
modules/module/tpl/lang.html Normal file
View file

@ -0,0 +1,12 @@
<!--%import("css/mlang.css")-->
<div class="bd">
<ul class="gn">
<!--@foreach($lang_supported as $key=>$val)-->
<!--@if($key != $lang_type)-->
<li><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
<!--@else-->
<li><strong>{$val}</strong></li>
<!--@end-->
<!--@end-->
</ul>
</div>