From 9bf08cf3df9e29d8f9378cdb19edb80ea9bd19c1 Mon Sep 17 00:00:00 2001 From: ovclas Date: Fri, 23 Mar 2012 05:49:16 +0000 Subject: [PATCH] merge from 1.5.2.1 git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DBMssql.class.php | 36 ++++++++++++++++--- classes/mobile/Mobile.class.php | 2 +- common/css/xe.css | 33 +++++------------ common/css/xe.min.css | 2 +- common/lang/lang.info | 2 +- config/config.inc.php | 4 +-- modules/admin/tpl/index.html | 27 +++++--------- modules/document/document.controller.php | 2 +- .../editor/skins/xpresseditor/css/default.css | 2 +- .../skins/xpresseditor/js/xpresseditor.js | 21 ++++++----- modules/member/member.controller.php | 5 --- modules/member/member.model.php | 5 +++ modules/member/skins/default/login_form.html | 2 +- modules/member/tpl/insert_member.html | 2 +- modules/member/tpl/login_form.html | 4 +-- modules/module/tpl/module_grants.html | 4 +-- modules/module/tpl/skin_config.html | 6 ++-- modules/point/tpl/config.html | 2 +- .../db/db/xml_query/mssql/MssqlUpdateTest.php | 28 +++++++++------ .../modules/member/login_form.html | 2 +- .../skins/xe_global/login_form.html | 4 +-- .../skins/xe_global/login_info.html | 2 +- .../skins/xe_globalTwo/login_form.html | 4 +-- .../skins/xe_globalTwo/login_info.html | 2 +- .../xe_solid_enterprise_login/login_form.html | 2 +- .../xe_solid_enterprise_login/login_info.html | 2 +- 26 files changed, 110 insertions(+), 97 deletions(-) diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index 24396a4ec..43b467306 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -348,21 +348,26 @@ $default = $column->attrs->default; $auto_increment = $column->attrs->auto_increment; - $column_schema[] = sprintf('[%s] %s%s %s %s %s %s', + $column_schema[] = sprintf('[%s] %s%s %s %s %s', $name, $this->column_type[$type], !in_array($type,array('number','text'))&&$size?'('.$size.')':'', - $primary_key?'primary key':'', isset($default)?"default '".$default."'":'', $notnull?'not null':'null', $auto_increment?'identity(1,1)':'' ); - if($unique) $unique_list[$unique][] = $name; + if($primary_key) $primary_list[] = $name; + else if($unique) $unique_list[$unique][] = $name; else if($index) $index_list[$index][] = $name; } - $schema = sprintf('create table [%s] (xe_seq int identity(1,1),%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n")); + if(count($primary_list)) + { + $column_schema[] = sprintf("primary key (%s)", '"'.implode($primary_list,'","').'"'); + } + + $schema = sprintf('create table [%s] (%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n")); $output = $this->_query($schema); if(!$output) return false; @@ -403,6 +408,27 @@ return $this->_query($query); } + function getUpdateSql($query, $with_values = true, $with_priority = false){ + $columnsList = $query->getUpdateString($with_values); + if($columnsList == '') return new Object(-1, "Invalid query"); + + $from = $query->getFromString($with_values); + if($from == '') return new Object(-1, "Invalid query"); + + $tables = $query->getTables(); + $alias_list = ''; + foreach($tables as $table) + $alias_list .= $table->getAlias(); + join(',', split(' ', $alias_list)); + + $where = $query->getWhereString($with_values); + if($where != '') $where = ' WHERE ' . $where; + + $priority = $with_priority?$query->getPriority():''; + + return "UPDATE $priority $alias_list SET $columnsList FROM ".$from.$where; + } + /** * @brief Handle deleteAct **/ @@ -499,6 +525,7 @@ } $count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):''; + $this->param = $queryObject->getArguments(); $result_count = $this->_query($count_query, $connection); $count_output = $this->_fetch($result_count); $total_count = (int)$count_output->count; @@ -529,6 +556,7 @@ $start_count = ($page - 1) * $list_count; $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):''; + $this->param = $queryObject->getArguments(); $result = $this->_query ($query, $connection); if ($this->isError ()) return $this->queryError($queryObject); diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php index 26c9c216d..35631377e 100644 --- a/classes/mobile/Mobile.class.php +++ b/classes/mobile/Mobile.class.php @@ -55,7 +55,7 @@ class Mobile { function isMobileCheckByAgent() { - $mobildAgent = array('iPod','iPhone','iPad','Android','BlackBerry','SymbianOS','Bada','Kindle','Wii','SCH-','SPH-','CANU-','Windows Phone','Windows CE','POLARIS','Palm','webOS','Dorothy Browser','IEMobile','MobileSafari','Opera Mobi','Opera Mini','MobileExplorer','Minimo','AvantGo','NetFront','Googlebot-Mobile','Nokia','LGPlayer','SonyEricsson','HTC','hp-tablet','SKT','lgtelecom','Vodafone'); + $mobildAgent = array('iPod','iPhone','Android','BlackBerry','SymbianOS','Bada','Kindle','Wii','SCH-','SPH-','CANU-','Windows Phone','Windows CE','POLARIS','Palm','webOS','Dorothy Browser','IEMobile','MobileSafari','Opera Mobi','Opera Mini','MobileExplorer','Minimo','AvantGo','NetFront','Googlebot-Mobile','Nokia','LGPlayer','SonyEricsson','HTC','hp-tablet','SKT','lgtelecom','Vodafone'); foreach($mobildAgent as $agent) { diff --git a/common/css/xe.css b/common/css/xe.css index 6c2dc8c75..59a3ec90d 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,39 +1,25 @@ @charset "utf-8"; +/* NHN (developers@xpressengine.com) */ /* Element Reset */ body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px} body{word-break:break-all;word-wrap:break-word} -img{border:0} +img{border:0;max-width:100%;height:auto} +/* Button Area */ +.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both} +.btnArea:after{content:"";display:block;clear:both} +.btnArea .etc{float:left} /* Button */ .btn{position:relative;display:inline-block;vertical-align:middle} .btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} -.btn *[type=submit][disabled=disabled], -.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} +.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} .btn a, -.btn input[type=button], -.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} -.btn input[type=submit], -.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} +.btn *[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} +.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} .btn a{height:22px} .btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px} .btn.medium a{height:28px} .btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px} .btn.large a{height:34px} -/* Button - Regucy */ -span.button, -a.button{position:relative;display:inline-block;vertical-align:top} -span.button *, -a.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} -span.button *[type=submit][disabled=disabled], -span.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} -a.button span, -span.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} -span.button input, -span.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} -a.button span{height:22px} -/* Button Area */ -.btnArea{margin:1em 0;text-align:right;zoom:1} -.btnArea:after{content:"";display:block;clear:both} -.btnArea .etc{float:left} /* Text Button */ input[type=submit].text, input[type=button].text, @@ -49,7 +35,6 @@ button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;co #popup_menu_area a:focus{text-decoration:underline} /* Message */ .message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px} -body>.message{margin:1em} .message p{margin:1em 0 !important} .message em{font-style:normal;color:#e00} .message.info, diff --git a/common/css/xe.min.css b/common/css/xe.min.css index c74da8660..527219387 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -1 +1 @@ -@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}body{word-break:break-all;word-wrap:break-word}img{border:0}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[type=submit][disabled=disabled],.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn input[type=button],.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}.btn input[type=submit],.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}span.button,a.button{position:relative;display:inline-block;vertical-align:top}span.button *,a.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}span.button *[type=submit][disabled=disabled],span.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}a.button span,span.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}span.button input,span.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}a.button span{height:22px}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a !important;background:none;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}body>.message{margin:1em}.message p{margin:1em 0 !important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file +@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}body{word-break:break-all;word-wrap:break-word}img{border:0;max-width:100%;height:auto}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../common/img/msg.update.png) no-repeat 1em .5em}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file diff --git a/common/lang/lang.info b/common/lang/lang.info index b2fba7d77..840a2b044 100644 --- a/common/lang/lang.info +++ b/common/lang/lang.info @@ -7,6 +7,6 @@ fr,Français de,Deutsch ru,Русский es,Español -tr,Turkey +tr,Turkçe vi,Tiếng Việt mn,Mongolian diff --git a/config/config.inc.php b/config/config.inc.php index 137997cfd..dd317482a 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -13,7 +13,7 @@ * @brief display XE's full version * Even The file should be revised when releasing altough no change is made **/ - define('__XE_VERSION__', '1.5.2'); + define('__XE_VERSION__', '1.5.2.1'); define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. /** @@ -51,7 +51,7 @@ * define('__ENABLE_PHPUNIT_TEST__', 0); * define('__PROXY_SERVER__', 'http://domain:port/path'); * define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/'); - * define('__XE_CDN_VERSION__', 'yourCndVersion'); + * define('__XE_CDN_VERSION__', 'yourCdnVersion'); */ if(file_exists(_XE_PATH_.'config/config.user.inc.php')) { require _XE_PATH_.'config/config.user.inc.php'; diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index c10a10aee..46f20d5a8 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -1,7 +1,4 @@ - - - - +

{$XE_VALIDATOR_MESSAGE}

@@ -28,7 +25,7 @@
  • {$value->module} -
    • -
  • {$value->module} -
    • +
  • {$value->module} -
    • @@ -52,16 +49,14 @@ {@$document = $value->variables}
  • {$value->getTitle()}{$lang->no_title_document} {$document['nick_name']} - -
    + -
    -     +
  • {$lang->no_data}
    • @@ -73,16 +68,14 @@
  • {$value->getSummary()}{$lang->no_text_comment} {$value->nick_name} - -
    + -
    -     +
  • {$lang->no_data}
    • @@ -94,15 +87,13 @@
  • {$value->title} {$value->blog_name} - -
    + -
    -     +
  • {$lang->no_data}
    • @@ -110,4 +101,4 @@
    - + diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index aee5f5123..792ae9bcf 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -166,7 +166,7 @@ class documentController extends document { // Set to 0 if the category_srl doesn't exist if($obj->category_srl) { $category_list = $oDocumentModel->getCategoryList($obj->module_srl); - if(!$category_list[$obj->category_srl]->grant) + if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant) { return new Object(-1, 'msg_not_permitted'); } diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 9ebbda389..49c60badf 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -32,7 +32,7 @@ .xpress-editor a.skip:hover, .xpress-editor a.skip:active, .xpress-editor a.skip:focus{position:relative;display:block;padding:5px;right:0;z-index:60;width:auto;height:auto;text-align:right;white-space:nowrap;color:#000;text-decoration:none;letter-spacing:-1px;_zoom:1} -.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px} +.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px;overflow:hidden} .xpress-editor .input_area iframe, .xpress-editor .input_area textarea{display:block;width:100% !important;position:relative;height:100%;border:0 !important;padding:0 !important;overflow:auto} .xpress-editor .input_area textarea{*margin:0 -10px;_margin-bottom:-2px} diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js index 7723d8c68..6e9bf045e 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js @@ -5813,18 +5813,21 @@ xe.XE_Table = $.Class({ } }).extend(xe.XE_Table); +})(jQuery); + // Auto Resize Checkbox Toggle Class -$('.input_auto>input').change(function(){ - setTimeout(function(){ - if($('.input_control').is(':hidden')){ - $('.input_auto').addClass('line'); - } else { - $('.input_auto').removeClass('line'); - } - },1); +jQuery(function($){ + $('.input_auto>input').change(function(){ + setTimeout(function(){ + if($('.input_control').is(':hidden')){ + $('.input_auto').addClass('line'); + } else { + $('.input_auto').removeClass('line'); + } + },1); + }); }); -})(jQuery); if (!window.xe) xe = {}; xe.Editors = []; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index fb8c96169..1a28dbb02 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1689,11 +1689,6 @@ if (!$args->user_id) $args->user_id = 't'.$args->member_srl; if (!$args->user_name) $args->user_name = $args->member_srl; - if(trim($args->find_account_answer)) - { - $args->find_account_answer = md5($args->find_account_answer); - } - $output = executeQuery('member.insertMember', $args); if(!$output->toBool()) { $oDB->rollback(); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index e28fbbc17..a7f12e271 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -250,6 +250,11 @@ } } + if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer)) + { + $info->find_account_answer = null; + } + // XSS defence $oSecurity = new Security($info); $oSecurity->encodeHTML('user_name', 'nick_name', 'find_account_answer', 'description', 'address.', 'group_list..'); diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index 9b420ef8c..bcc14d96e 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -3,7 +3,7 @@

    {$XE_VALIDATOR_MESSAGE}

    -

    {$lang->cmd_login}...

    +

    {$lang->cmd_login}

    diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 6998258b9..27d2864a8 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -36,7 +36,7 @@

    {$lang->password} *

    - +

  • diff --git a/modules/member/tpl/login_form.html b/modules/member/tpl/login_form.html index 2aa55a86f..3b8b89d73 100644 --- a/modules/member/tpl/login_form.html +++ b/modules/member/tpl/login_form.html @@ -1,7 +1,7 @@
    -

    {$lang->cmd_login}...

    +

    {$lang->cmd_login}

    @@ -13,7 +13,7 @@
    -
    +
    diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 4cfa978f8..4f4a81d80 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -9,7 +9,7 @@ -

    {$lang->module_admin}

    +

    {$lang->module_admin}

    {$lang->about_admin_id}

    • @@ -33,7 +33,7 @@

    -

    {$lang->permission_setting}

    +

    {$lang->permission_setting}

    {$lang->about_grant_deatil}

    diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html index d9b1f0c6a..d9ece30a0 100644 --- a/modules/module/tpl/skin_config.html +++ b/modules/module/tpl/skin_config.html @@ -6,7 +6,7 @@ -

    {$lang->skin_default_info}

    +

    {$lang->skin_default_info}

    @@ -46,7 +46,7 @@
    -

    {$lang->extra_vars}

    +

    {$lang->extra_vars}

    @@ -75,7 +75,7 @@ {@$group = $val->group}
    -

    {$group}

    +

    {$group}

    diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index 271cfc0b5..1bb032fb0 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -30,7 +30,7 @@
    : - +
    : diff --git a/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php index 6e335cef3..c3b1d8fb3 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php @@ -1,16 +1,22 @@ _testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL); - } + function _test($xml_file, $argsString, $expected, $expectedArgs = NULL) { + $this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL); + } + + function test_counter_updateCounterUnique() { + $xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml"; + $argsString = '$args->regdate = 25;'; + $expected = 'UPDATE [counter_status] + SET [unique_visitor] = [unique_visitor] + ? + , [pageview] = [pageview] + ? + FROM [xe_counter_status] as [counter_status] + WHERE [regdate] = ?'; + $this->_test($xml_file, $argsString, $expected, array("25", 1, 1)); + } + +} - function test_counter_updateCounterUnique(){ - $xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml"; - $argsString = '$args->regdate = 25;'; - $expected = 'UPDATE [xe_counter_status] as [counter_status] SET [unique_visitor] = [unique_visitor] + ?, [pageview] = [pageview] + ? WHERE [regdate] = ?'; - $this->_test($xml_file, $argsString, $expected, array("25", 1, 1)); - } - } ?> \ No newline at end of file diff --git a/themes/xe_solid_enterprise/modules/member/login_form.html b/themes/xe_solid_enterprise/modules/member/login_form.html index 6469b35e5..a86975ee6 100644 --- a/themes/xe_solid_enterprise/modules/member/login_form.html +++ b/themes/xe_solid_enterprise/modules/member/login_form.html @@ -10,7 +10,7 @@
    -
    {$lang->cmd_login}...
    +
    {$lang->cmd_login}

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/widgets/login_info/skins/xe_global/login_form.html b/widgets/login_info/skins/xe_global/login_form.html index 783963ff7..9c646861a 100644 --- a/widgets/login_info/skins/xe_global/login_form.html +++ b/widgets/login_info/skins/xe_global/login_form.html @@ -18,7 +18,7 @@