From 3430d4fae5aed6fadb6455f3d63329a3cb77037a Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 27 Nov 2013 15:15:07 +0900 Subject: [PATCH] =?UTF-8?q?NOISSUE=20=EC=82=AC=EC=9A=A9=EB=90=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8A=94=20=EB=AA=A8=EB=93=88,=20=EC=95=A0?= =?UTF-8?q?=EB=93=9C=EC=98=A8=20=EB=93=B1=EC=9D=98=20history=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=ED=8C=8C=EC=8B=B1=20=EB=A1=9C=EC=A7=81=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addon/addon.admin.model.php | 73 ---------------- modules/addon/tpl/addon_info.html | 32 ------- modules/editor/editor.model.php | 82 ------------------ modules/editor/tpl/view_component.html | 97 +++++++--------------- modules/layout/layout.model.php | 45 ---------- modules/module/module.model.php | 96 --------------------- modules/module/tpl/module_info.html | 37 --------- modules/module/tpl/skin_info.html | 36 -------- modules/widget/tpl/skin_info.html | 36 -------- modules/widget/tpl/widget_detail_info.html | 32 ------- modules/widget/widget.model.php | 76 ----------------- 11 files changed, 32 insertions(+), 610 deletions(-) diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index dda143681..f6a950385 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -296,79 +296,6 @@ class addonAdminModel extends addon } } } - - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) - { - $history = array(); - $history[] = $xml_obj->history; - } - else - { - $history = $xml_obj->history; - } - - $addon_info->history = array(); - foreach($history as $item) - { - $obj = new stdClass(); - - if($item->author) - { - if(!is_array($item->author)) - { - $obj->author_list = array(); - $obj->author_list[] = $item->author; - } - else - { - $obj->author_list = $item->author; - } - - $obj->author = array(); - foreach($obj->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; - $obj->author[] = $author_obj; - } - } - - $obj->name = $item->name->body; - $obj->email_address = $item->attrs->email_address; - $obj->homepage = $item->attrs->link; - $obj->version = $item->attrs->version; - $obj->date = $item->attrs->date; - $obj->description = $item->description->body; - - if($item->log) - { - if(!is_array($item->log)) - { - $obj->log = array(); - $obj->log[] = $item->log; - } - else - { - $obj->log = $item->log; - } - - $obj->logs = array(); - foreach($obj->log as $log) - { - $log_obj = new stdClass(); - $log_obj->text = $log->body; - $log_obj->link = $log->attrs->link; - $obj->logs[] = $log_obj; - } - } - $addon_info->history[] = $obj; - } - } } else { diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index e71d2cf53..0bd50cd8e 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -37,35 +37,3 @@ {nl2br(trim($addon_info->description))} - - -

{$lang->addon_history}

- - - - - - - -
- {$history->version}
- {$history->date}
- -

{$author->name} ({$author->homepage} / {$author->email_address})

- - -

{nl2br(trim($history->description))}

- - - - -
- diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 51f5bbaa7..14de2f713 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -133,45 +133,6 @@ class editorModel extends editor $buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link); } - // history - if($xml_doc->component->history) - { - if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history; - else $history_list = $xml_doc->component->history; - - for($i=0; $i < count($history_list); $i++) - { - unset($obj); - sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); - $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); - $buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body); - $buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version); - $buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date); - - if($history_list[$i]->author) - { - (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author; - - for($j=0; $j < count($obj->author_list); $j++) - { - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body); - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address); - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link); - } - } - - if($history_list[$i]->log) - { - (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log; - - for($j=0; $j < count($obj->log_list); $j++) - { - $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body); - $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link); - } - } - } - } // List extra variables (text type only in the editor component) $extra_vars = $xml_doc->component->extra_vars->var; if($extra_vars) @@ -768,49 +729,6 @@ class editorModel extends editor $buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address); $buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link); } - - // history - if($xml_doc->component->history) - { - if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history; - else $history_list = $xml_doc->component->history; - - for($i=0; $i < count($history_list); $i++) - { - unset($obj); - sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); - $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); - $buff .= '$xml_info->history[' . $i . '] = new stdClass();'; - $buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body); - $buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version); - $buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date); - - if($history_list[$i]->author) - { - (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author; - - for($j=0; $j < count($obj->author_list); $j++) - { - $buff .= '$xml_info->history[' . $i . ']->author[' . $j . '] = new stdClass();'; - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body); - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address); - $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link); - } - } - - if($history_list[$i]->log) - { - (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log; - - for($j=0; $j < count($obj->log_list); $j++) - { - $buff .= '$xml_info->history[' . $i . ']->log[' . $j . '] = new stdClass();'; - $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body); - $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link); - } - } - } - } } else { diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 10cc4ebaf..06e887955 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -4,71 +4,38 @@

{$component->title} ver. {$component->version}

- - - - + + + + + + +
{$lang->component_author}
- - {$author->name} ({$author->homepage}, {$author->email_address})
+ + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -
{$lang->component_author}
+ + {$author->name} ({$author->homepage}, {$author->email_address})
+ +
{$lang->homepage}
{$component->homepage}
{$lang->regdate}
{zdate(str_replace('-',"",$component->date), 'Y-m-d')}
{$lang->component_license}
+ {nl2br(trim($component->license))} + +

{$component->license_link}

-
{$lang->homepage}
{$component->homepage}
{$lang->regdate}
{zdate(str_replace('-',"",$component->date), 'Y-m-d')}
{$lang->component_license}
- {nl2br(trim($component->license))} - -

{$component->license_link}

- -
{$lang->component_description}
{nl2br(trim($component->description))}
+
{$lang->component_description}
{nl2br(trim($component->description))}
- -

{$lang->component_history}

- - - - - - - - -
- {$history->version}
- {zdate($history->date, 'Y-m-d')} -
- -

{$author->name} ({$author->homepage} / {$author->email_address})

- - -

{nl2br(trim($history->description))}

- - - - -
-
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 59bbe4e60..43962bccf 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -638,51 +638,6 @@ class layoutModel extends layout $buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name); } } - - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history; - else $history_list = $xml_obj->history; - - $buff[] = '$layout_info->history = array();'; - for($i=0, $c=count($history_list); $i<$c; $i++) - { - sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); - $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); - $buff[] = sprintf('$layout_info->history[%d] = new stdClass;', $i); - $buff[] = sprintf('$layout_info->history[%d]->description = "%s";', $i, $history_list[$i]->description->body); - $buff[] = sprintf('$layout_info->history[%d]->version = "%s";', $i , $history_list[$i]->attrs->version); - $buff[] = sprintf('$layout_info->history[%d]->date = "%s";', $i, $date); - - if($history_list[$i]->author) - { - (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author; - - $buff[] = sprintf('$layout_info->history[%d]->author = array();', $i); - for($j=0, $jc=count($obj->author_list); $j<$jc; $j++) - { - $buff[] = sprintf('$layout_info->history[%d]->author[%d] = new stdClass;', $i, $j); - $buff[] = sprintf('$layout_info->history[%d]->author[%d]->name = "%s";', $i, $j, $obj->author_list[$j]->name->body); - $buff[] = sprintf('$layout_info->history[%d]->author[%d]->email_address = "%s";', $i, $j, $obj->author_list[$j]->attrs->email_address); - $buff[] = sprintf('$layout_info->history[%d]->author[%d]->homepage = "%s";', $i, $j, $obj->author_list[$j]->attrs->link); - } - } - - if($history_list[$i]->log) - { - (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log; - - $buff[] = sprintf('$layout_info->history[%d]->logs = array();', $i, $j, $obj->log_list[$j]->body); - for($j=0, $jc=count($obj->log_list); $j<$jc; $j++) - { - $buff[] = sprintf('$layout_info->history[%d]->logs[%d] = new stdClass;', $i, $j); - $buff[] = sprintf('$layout_info->history[%d]->logs[%d]->text = "%s";', $i, $j, $obj->log_list[$j]->body); - $buff[] = sprintf('$layout_info->history[%d]->logs[%d]->link = "%s";', $i, $j, $obj->log_list[$j]->attrs->link); - } - } - } - } } else { diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 8fb6e9233..7899132a5 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -658,54 +658,6 @@ class moduleModel extends module $author_obj->homepage = $author->attrs->link; $module_info->author[] = $author_obj; } - - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) $history[] = $xml_obj->history; - else $history = $xml_obj->history; - - foreach($history as $item) - { - unset($obj); - - if($item->author) - { - (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author; - - foreach($obj->author_list as $author) - { - unset($author_obj); - $author_obj->name = $author->name->body; - $author_obj->email_address = $author->attrs->email_address; - $author_obj->homepage = $author->attrs->link; - $obj->author[] = $author_obj; - } - } - - $obj->name = $item->name->body; - $obj->email_address = $item->attrs->email_address; - $obj->homepage = $item->attrs->link; - $obj->version = $item->attrs->version; - $obj->date = $item->attrs->date; - $obj->description = $item->description->body; - - if($item->log) - { - (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log; - - foreach($obj->log as $log) - { - unset($logs_obj); - $logs_obj->text = $log->body; - $logs_obj->link = $log->attrs->link; - $obj->logs[] = $logs_obj; - } - } - - $module_info->history[] = $obj; - } - } } else { @@ -1136,54 +1088,6 @@ class moduleModel extends module } } } - - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) $history[] = $xml_obj->history; - else $history = $xml_obj->history; - - foreach($history as $item) - { - unset($obj); - - if($item->author) - { - (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author; - - foreach($obj->author_list as $author) - { - unset($author_obj); - $author_obj->name = $author->name->body; - $author_obj->email_address = $author->attrs->email_address; - $author_obj->homepage = $author->attrs->link; - $obj->author[] = $author_obj; - } - } - - $obj->name = $item->name->body; - $obj->email_address = $item->attrs->email_address; - $obj->homepage = $item->attrs->link; - $obj->version = $item->attrs->version; - $obj->date = $item->attrs->date; - $obj->description = $item->description->body; - - if($item->log) - { - (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log; - - foreach($obj->log as $log) - { - unset($log_obj); - $log_obj->text = $log->body; - $log_obj->link = $log->attrs->link; - $obj->logs[] = $log_obj; - } - } - - $skin_info->history[] = $obj; - } - } } else { diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html index 857a722a2..cc8ed2aa5 100644 --- a/modules/module/tpl/module_info.html +++ b/modules/module/tpl/module_info.html @@ -39,40 +39,3 @@ - - -

{$lang->module_history}

- - --- - - - - - - -
- {$history->version}
- {$history->date} -
- -

{$author->name} ({$author->homepage} / {$author->email_address})

- - -

{nl2br(trim($history->description))}

- - - - -
- diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html index 98defb9e2..9aca5de92 100644 --- a/modules/module/tpl/skin_info.html +++ b/modules/module/tpl/skin_info.html @@ -43,39 +43,3 @@ - - -

{$lang->skin_history}

- --- - - - - - - -
- {$history->version}
- {$history->date} -
- -

{$author->name} ({$author->homepage} / {$author->email_address})

- - -

{nl2br(trim($history->description))}

- - - - -
- diff --git a/modules/widget/tpl/skin_info.html b/modules/widget/tpl/skin_info.html index 98defb9e2..9aca5de92 100644 --- a/modules/widget/tpl/skin_info.html +++ b/modules/widget/tpl/skin_info.html @@ -43,39 +43,3 @@ - - -

{$lang->skin_history}

- --- - - - - - - -
- {$history->version}
- {$history->date} -
- -

{$author->name} ({$author->homepage} / {$author->email_address})

- - -

{nl2br(trim($history->description))}

- - - - -
- diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html index a66f928b6..eeb737bbb 100644 --- a/modules/widget/tpl/widget_detail_info.html +++ b/modules/widget/tpl/widget_detail_info.html @@ -42,35 +42,3 @@ {nl2br(trim($widget_info->description))} - - -

{$lang->widget_history}

- - - - - - - - -
- {$history->version}
- {$history->date} -
- - -

{$author->name} ({$author->homepage} / {$author->email_address})

- - - - -

{nl2br(trim($history->description))}

- - - -
    -
  • {$log->text}
  • -
- -
- diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php index 2ff86db9d..5e08b5665 100644 --- a/modules/widget/widget.model.php +++ b/modules/widget/widget.model.php @@ -170,44 +170,6 @@ class widgetModel extends widget $buff .= sprintf('$widget_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address); $buff .= sprintf('$widget_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link); } - - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history; - else $history_list = $xml_obj->history; - - for($i=0; $i < count($history_list); $i++) - { - sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); - $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); - $buff .= sprintf('$widget_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body); - $buff .= sprintf('$widget_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version); - $buff .= sprintf('$widget_info->history['.$i.']->date = "%s";', $date); - - if($history_list[$i]->author) - { - (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author; - - for($j=0; $j < count($obj->author_list); $j++) - { - $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body); - $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address); - $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link); - } - } - - if($history_list[$i]->log) - { - (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log; - - for($j=0; $j < count($obj->log_list); $j++) { - $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body); - $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link); - } - } - } - } } else { @@ -342,44 +304,6 @@ class widgetModel extends widget $buff .= sprintf('$widgetStyle_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link); } - // history - if($xml_obj->history) - { - if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history; - else $history_list = $xml_obj->history; - - for($i=0; $i < count($history_list); $i++) - { - sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); - $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->date = "%s";', $date); - - if($history_list[$i]->author) - { - (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author; - - for($j=0; $j < count($obj->author_list); $j++) - { - $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link); - } - } - - if($history_list[$i]->log) - { - (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log; - - for($j=0; $j < count($obj->log_list); $j++) - { - $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body); - $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link); - } - } - } - } // Extra vars (user defined variables to use in a template) $extra_var_groups = $xml_obj->extra_vars->group; if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;