fanbinit 12-24

https://rhymix.org/qna/1924307

.editorconfig

@@ -1,9 +1,23 @@
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = false
+end_of_line = lf
+trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.py]
+indent_style = space
 indent_size = 4
+
+[*.{json,yml,md}]
+indent_style = space
+indent_size = 2
+
+[*.{jsx,tsx,svelte,vue}]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,6 +1,6 @@
 .gitattributes export-ignore
+.github export-ignore
 .gitignore export-ignore
-/tools/ export-ignore
+codeception.dist.yml export-ignore
 /tests/ export-ignore
-Gruntfile.js export-ignore
-.travis.yml export-ignore
+/common/vendor/bin/ export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: PHP Lint & Codeception
+on: [ push, pull_request ]
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
+
+    name: PHP ${{ matrix.php }}
+    steps:
+
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Install PHP
+      run: chmod +x .github/workflows/setup-php.sh && .github/workflows/setup-php.sh ${{ matrix.php }}
+
+    - name: Create test database
+      run: chmod +x .github/workflows/setup-mysql.sh && .github/workflows/setup-mysql.sh
+
+    - name: PHP Lint
+      run: if find . -name "*.php" ! -path "./common/vendor/*" -print0 | xargs -0 -n 1 -P 8 php -l | grep -v "No syntax errors detected"; then exit 1; fi
+
+    - name: Download codeception
+      run: wget https://res.rhymix.org/ci/php${{ matrix.php }}/codecept.phar
+
+    - name: Run PHP development server
+      run: php -S localhost:8000 &
+
+    - name: Build and run codeception
+      run: |
+        php codecept.phar build
+        php codecept.phar run --debug --fail-fast

.github/workflows/setup-mysql.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+AUTH="-uroot -proot"
+
+# Start MySQL
+sudo systemctl start mysql.service
+
+# Create default database
+sudo mysql $AUTH -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci"
+sudo mysql $AUTH -e "CREATE USER rhymix@localhost IDENTIFIED WITH mysql_native_password BY 'rhymix'"
+sudo mysql $AUTH -e "GRANT ALL ON rhymix.* to rhymix@localhost; FLUSH PRIVILEGES"
+
+# Check MySQL version
+sudo mysql $AUTH -e "SELECT VERSION()"

.github/workflows/setup-php.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Based on https://github.com/nanasess/setup-php
+sudo add-apt-repository -y ppa:ondrej/php
+
+# Install all required packages
+sudo apt -y install \
+	php$1-apcu \
+	php$1-bcmath \
+	php$1-cli \
+	php$1-common \
+	php$1-curl \
+	php$1-gd \
+	php$1-intl \
+	php$1-mbstring \
+	php$1-mysql \
+	php$1-readline \
+	php$1-sqlite3 \
+	php$1-xml \
+	php$1-zip
+
+# Adjust php.ini settings
+sudo bash -c "echo 'register_argc_argv = On' >> /etc/php/$1/cli/php.ini"
+sudo bash -c "echo 'opcache.enable = 1' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+sudo bash -c "echo 'opcache.enable_cli = 1' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+sudo bash -c "echo 'opcache.jit = tracing' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+sudo bash -c "echo 'opcache.jit_buffer_size = 128M' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+
+# Enable APCu
+if [ -f "/etc/php/$1/cli/conf.d/20-apcu.ini" ]; then
+  sudo bash -c "echo 'apc.enable_cli = 1' >> /etc/php/$1/cli/conf.d/20-apcu.ini"
+fi
+
+# Disable xdebug
+sudo phpdismod -v ALL -s ALL xdebug
+
+# Set and check default PHP version
+sudo update-alternatives --set php /usr/bin/php$1
+php -v

.gitignore

@@ -17,10 +17,11 @@ codeception.yml
 /node_modules/
 /bower_components/
 composer.phar
+codecept.phar
 
 .idea
 *.sublime-workspace
 *.sublime-project
 .codeintel
+.vscode
 error_log
-

.htaccess

@@ -2,9 +2,8 @@ RewriteEngine On
 
 # block direct access to templates, XML schema files, config files, dotfiles, environment, etc.
 RewriteCond %{REQUEST_URI} !/modules/editor/(skins|styles)/
-RewriteCond %{REQUEST_URI} !/common/manual/
-RewriteRule ^(addons|common/tpl|files/ruleset|(m\.)?layouts|modules|plugins|themes|widgets|widgetstyles)/.+\.(html|xml)$ - [L,F]
-RewriteRule ^files/(attach|config|cache/store)/.+\.php$ - [L,F]
+RewriteRule ^(addons|common/tpl|files/(faceOff|ruleset)|(m\.)?layouts|modules|plugins|themes|widgets|widgetstyles)/.+\.(html|xml|blade\.php)$ - [L,F]
+RewriteRule ^files/(attach|config|cache)/.+\.(ph(p|t|ar)?[0-9]?|p?html?|cgi|pl|exe|[aj]spx?|inc|bak)$ - [L,F]
 RewriteRule ^files/(env|member_extra_info/(new_message_flags|point))/ - [L,F]
 RewriteRule ^(\.git|\.ht|\.travis|codeception\.|composer\.|Gruntfile\.js|package\.json|CONTRIBUTING|COPYRIGHT|LICENSE|README) - [L,F]
 
@@ -14,27 +13,7 @@ RewriteRule ^(.+)/(addons|files|layouts|m\.layouts|modules|widgets|widgetstyles)
 RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteRule ^(.+)\.min\.(css|js)$ ./$1.$2 [L]
 
-# rss, blogAPI
-RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L]
-RewriteRule ^([a-zA-Z0-9_]+)/(rss|atom|api)$ ./index.php?mid=$1&act=$2 [L]
-
-# trackback
-RewriteRule ^([0-9]+)/(.+)/trackback$ ./index.php?document_srl=$1&key=$2&act=trackback [L]
-RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?mid=$1&document_srl=$2&key=$3&act=trackback [L]
-
-# document category
-RewriteRule ^([a-zA-Z0-9_]+)/category/([0-9]+)$ ./index.php?mid=$1&category=$2 [L,QSA]
-
-# document permanent link
-RewriteRule ^([0-9]+)$ ./index.php?document_srl=$1 [L,QSA]
-
-# mid link
+# all other short URLs
+RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteRule ^admin/?$ ./index.php?module=admin [L,QSA]
-RewriteRule ^([a-zA-Z0-9_]+)/?$ ./index.php?mid=$1 [L,QSA]
-
-# mid + document link
-RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?mid=$1&document_srl=$2 [L,QSA]
-
-# mid + entry title
-RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L,QSA]
+RewriteRule . index.php [L]

.travis.yml

@@ -1,24 +0,0 @@
-language: php
-php:
-- 5.5
-- 5.6
-- 7.0
-- 7.1
-- hhvm
-matrix:
-  allow_failures:
-  - php: hhvm
-sudo: false
-before_script:
-- npm install grunt grunt-cli grunt-contrib-jshint grunt-contrib-csslint grunt-phplint --save-dev
-- mysql -u root -e "CREATE DATABASE rhymix"
-- mysql -u root -e "SET PASSWORD FOR 'travis'@'localhost' = PASSWORD('travis')"
-- if [[ $TRAVIS_PHP_VERSION != "hhvm" ]]; then php -S localhost:8000 & fi
-- wget http://codeception.com/releases/2.1.11/codecept.phar
-script:
-- php codecept.phar build
-- if [[ $TRAVIS_PHP_VERSION == "hhvm" ]]; then php codecept.phar run -d --fail-fast --env travis --skip install; fi
-- if [[ $TRAVIS_PHP_VERSION != "hhvm" ]]; then php codecept.phar run -d --fail-fast --env travis; fi
-- grunt lint
-notifications:
-  email: false

CONTRIBUTING.md

@@ -1,219 +1,7 @@
 # 개발에 참여하고 싶으신 분들께 드리는 안내문
 
-## 이슈 작성
+이 파일의 내용은 공식 매뉴얼로 옮겨졌습니다.
 
-- **구글에서 답을 찾을 수 있는지 먼저 확인해 주십시오.**
-- 관련된 이슈가 이미 있는지 검색하고, 같은 내용이라면 댓글로 덧붙여 주십시오.
-  오래된 이슈라도 메일로 알림이 전달되므로 묻힐 염려가 없습니다.
-- 무관한 이슈에 댓글을 달지 말아 주십시오. 엉뚱한 사람에게 메일 알림이 전달됩니다.
-- 2가지 이상 서로 다른 문제가 있는 경우, 각각 이슈를 등록해 주십시오.
-- 보안 취약점은 공개적으로 언급하지 말고 devops@rhymix.org로 알려 주시면 감사하겠습니다.
-- **버그 신고 전 자신의 서버가 Rhymix의 실행 환경을 충족하는지 확인해 주십시오.**
-  - PHP 5.5 미만, EUC-KR 환경, 퍼미션 오류 등은 호스팅 업체에 문의하셔야 합니다.
-  - 자신의 서버 환경은 `phpinfo`를 사용하여 확인할 수 있습니다.
-- **버그 신고에는 아래의 내용을 반드시 포함시켜 주십시오.**
-  - 실행 환경
-    - 호스팅 환경에 대한 간단한 설명 (예: ○○24 리눅스 웹호스팅)
-    - Rhymix 버전 (예: 1.8.15)
-    - PHP 버전 (예: 5.6.16)
-    - 브라우저 종류 및 버전 (예: IE 11)
-  - 에러가 발생하는 경우 에러 메시지 전체
-    - 화면상에 에러가 표시되거나 디자인이 깨져 보이는 경우, 해당 스크린샷
-    - 브라우저의 개발자도구(F12)에 에러가 표시되는 경우, 콘솔 및 네트워크 탭의 스크린샷
-  - 증상을 확인해 볼 수 있는 웹사이트 주소
-    - 내부망이나 로컬 개발환경 등 외부인의 접속이 원천적으로 불가능한 경우가 아니라면 반드시 주소를 남겨 주시기 바랍니다.
-
-## 풀 리퀘스트(PR) 작성
-
-- 자신의 저장소에서 별도의 브랜치를 만들어 작업하신 후, `develop` 브랜치로 풀 리퀘스트를 넣어주시면 됩니다.
-  - 예: 썸네일 관련 버그를 수정하는 경우 자신의 저장소에서 `fix/thumbnail` 브랜치를 만들어 작업하십시오.
-    작성 후에 수정할 것이 있으면 이 브랜치에서 계속 작업하고 커밋하시면 됩니다. PR 페이지에 자동으로 반영됩니다.
-- 개발 진행 및 안정화에 따라 브랜치별 운영 정책이 변경될 수 있으니 유의하십시오.
-- 아래의 코딩 규칙을 지키려고 노력해 주시기 바랍니다.
-- **코딩 규칙에 맞지 않는 소스를 발견하더라도 PR의 주제와 관계없는 부분은 함부로 고치지 마세요!
-  코딩 규칙에 맞도록 소스를 수정하는 작업은 모두 별도의 PR로 처리하여야 합니다.**
-- **단, PR을 검토하는 개발자들은 괄호의 위치와 같은 사소한 문제를 지적하느라고
-  실제 기능에 관심을 주지 못하는 오류를 범하지 않도록 노력해야 합니다.**
-- PR의 제목은 커밋 메시지에 적용되는 규칙을 참고하되, 가능하면 한글로 작성해 주십시오.
-- 유닛 테스트를 통과하지 못하거나, 통과하기 위해 테스트를 삭제할 경우 PR이 거부될 수 있습니다.
-  단, 테스트 자체에 문제가 있거나 테스트 내용을 변경해야 한다고 생각되는 경우 개발팀과 의논해 주십시오.
-
-## 저작권 및 라이선스
-
-- 모든 소스 코드의 저작권은 해당 작성자가 가집니다.
-- 모든 소스 코드에는 GPL v2 또는 그 이후 버전의 라이선스가 적용됩니다.
-  - Rhymix 개발팀을 비롯한 전세계 어느 누구라도 어떤 목적으로든지 자유롭게 사용, 수정, 재배포할 수 있습니다.
-  - 타인에게 저작권이 있는 코드를 가져온 경우, 원본의 라이선스를 GPL로 전환할 수 있어야 합니다.
-  - 한 번 적용한 라이선스는 철회할 수 없습니다.
-- **풀 리퀘스트를 작성하실 경우 위의 두 가지에 동의하시는 것으로 간주합니다.**
-
-## 코딩 규칙
-
-### 일반
-
-PHP, HTML, XML, CSS, JS 등 모든 텍스트 파일의 문자셋은 BOM이 없는 UTF-8입니다.
-
-줄바꿈 문자는 유닉스 방식(`LF`)을 따릅니다.
-
-윈도우 메모장에서 편집한 파일은 위의 두 가지 규칙에 어긋납니다.
-윈도우 사용자는 [Notepad++](https://notepad-plus-plus.org/) 등의 개발자용 에디터를 사용하여 편집하시기 바랍니다.
-
-들여쓰기는 1개의 탭으로 합니다.
-단, 탭 대신 공백을 사용하는 파일에서는 일관성 유지를 위해 4칸의 공백을 사용할 수 있습니다.
-
-들여쓴 줄들 사이의 빈 줄도 들여씁니다. (에디터에서 후행 공백을 제거하지 않도록 설정하십시오.)
-
-PHP 코드만으로 이루어진 파일은 맨 끝에 `?>` 태그를 사용하지 않습니다.
-
-### 공백 및 줄바꿈 규칙
-
-클래스 및 함수 선언과 `if`, `for`, `foreach`, `while` 등의 중괄호는 다음 줄에 씁니다.
-
-    class Foo
-    {                              // RIGHT
-        public function bar() {    // WRONG
-            
-        }
-    }
-
-조건문이나 순환문 내에 하나의 명령만 있는 경우에도 반드시 중괄호를 사용합니다.
-그래야 나중에 명령이 추가될 경우 수정하기 편리합니다.
-
-    if (!$foo) return false;    // WRONG
-    if (!$bar)                  // RIGHT
-    {
-        return true;
-    }
-
-단, 클로져는 같은 줄에 중괄호를 쓸 수 있으며,
-이 경우 중괄호 앞뒤에 한 칸씩 공백을 두어 클로져가 시작되고 끝나는 지점을 찾기 쉽도록 합니다.
-닫는 중괄호와 그 뒤의 기호 사이에는 공백을 두지 않습니다.
-
-    $foo = function($bar) { return $bar + 1; };    // RIGHT
-    $foo = function($bar) {                        // RIGHT
-        return $bar + 1;
-    };
-    $foo = function($bar){return $bar + 1;};       // WRONG
-
-자바스크립트에서는 거의 모든 함수가 클로져이며, 잘못 줄바꿈할 경우 세미콜론이 삽입될 수 있으므로
-중괄호를 다음 줄에 쓰지 않아도 됩니다.
-
-    $("#foo").on("click", function() {    // OK
-        if ($(this).val() === "bar") {    // OK
-            $(this).val("baz");
-        }
-    });
-
-함수 호출시 함수명과 괄호 사이, 괄호와 인자 사이에 공백을 두지 않습니다.
-인자를 구분하는 쉼표는 뒤쪽에만 한 칸의 공백을 둡니다.
-
-    function foobar($baz, $param)        // RIGHT
-    function foobar ( $baz , $param )    // WRONG
-
-`if`, `for`, `foreach`, `while` 등의 키워드 뒤에는 한 칸의 공백을 둘 수 있으며,
-`==`, `!=`, `>` 등의 연산자는 앞뒤에 한 칸씩 공백을 둡니다.
-
-    if ($foo === $bar)    // RECOMMENDED
-    if($foo === $bar)     // OK for XE Compatibility
-    if($foo==$bar){       // WRONG
-
-여러 줄에 걸쳐 배열을 선언할 경우, 마지막 구성요소 뒤에 쉼표를 남깁니다.
-그래야 나중에 구성요소를 추가할 때 편리합니다.
-
-    $animals = array(
-        'bear',
-        'cat',
-        'dog',    // COMMA
-    );
-
-단, 자바스크립트 및 JSON에서는 마지막 쉼표를 반드시 삭제해야 합니다.
-쉼표를 남겨둘 경우 일부 브라우저에서 오류가 발생할 수 있기 때문입니다.
-
-    var animals = [
-        'bear',
-        'cat',
-        'dog'    // NO COMMA
-    ];
-
-### 주석
-
-주석은 관련 코드 윗줄에 써야 합니다. 조건문이나 루프의 경우에도 마찬가지입니다.
-
-    // If foo is bar, do something.
-    if ($foo->isBar())
-    {
-        // Note: this will do X, Y, and Z.
-        $foo->doSomething();
-    }
-    // Otherwise, do something else.
-    else
-    {
-        // TODO: Refactor this later.
-        $foo->doSomethingElse();
-    }
-
-모든 클래스와 함수에는 `/**`으로 시작하는 PHPDoc 방식의 주석을 붙여야 합니다.
-PHPDoc 주석 작성에 어려움이 있는 경우, 다른 클래스와 함수의 주석을 참고하십시오.
-
-    /**
-     * This is the Foo class.
-     */
-    class Foo
-    {
-        /**
-         * Constructor.
-         *
-         * @param string $member_srl
-         */
-        public function __construct($member_srl)
-        {
-            // 생략
-        }
-        
-        /**
-         * Check if this Foo is bar.
-         *
-         * @return bool
-         */
-        public function isBar()
-        {
-            return true;
-        }
-    }
-
-불가피한 경우를 제외하면 주석은 영문으로 쓰는 것을 원칙으로 하며,
-대문자로 시작하는 완전한 문장으로 이루어져야 합니다.
-
-### 커밋 메시지
-
-커밋 메시지는 가능하면 영문으로 작성하며, **현재형** 동사로 시작하는 **명령형** 문장 사용을 원칙으로 합니다.
-
-    Delete unnecessary condition     // RIGHT
-    Fix #1234                        // RIGHT
-    Deletes unnecessary condition    // WRONG (불필요한 동사변화)
-    Fixed #1234                      // WRONG (불필요한 과거형)
-
-이 규칙에 맞추어 영문으로 커밋 메시지를 작성하기 어려운 경우, 한글로 작성해도 무방합니다.
-한글 커밋 메시지는 **어디서** **무엇을** **어떻게** 했는지 간결하고 명확하고 격식있게 표현하며,
-가능하면 현재형 동사로 마치도록 합니다.
-
-    크롬 최신 버전에서 스크립트 오류 해결    // RIGHT
-    Foo 클래스에 bar() 메소드 추가           // RIGHT
-    파일첨부 에러나는거 고쳤쩌염~^^          // WRONG (격식없는 표현)
-    함수 개선                                // WRONG (두리뭉실한 표현)
-
-### 기타
-
-Rhymix의 기본 `error_reporting` 설정 하에서 어떤 에러도 발생하지 않도록 하는 것을 목표로 합니다.
-
-문자열과 문자열, 정수와 정수를 비교할 때는 가능하면 `==` 대신 `===`을 사용합니다.
-실제 자료형이 다를 가능성이 있는 경우 `intval()`, `strval()` 등의 함수와 함께 사용합니다.
-
-PHP 5.4 이상에서 지원하는 간단한 배열 문법(`[1, 2, 3]`)을 사용할 수 있으나,
-복잡한 구조의 배열을 선언할 때는 이 문법이 오히려 가독성을 해칠 수 있으니 주의하시기 바랍니다.
-
-전역 상수를 참조할 때는 `\RX_CLIENT_IP`와 같이 `\`를 앞에 붙여서,
-추후 다른 네임스페이스로 코드를 이동 또는 복사하더라도 문제가 생기지 않도록 합니다.
-
-여기에서 규정하지 않은 내용은 [PSR-1](http://www.php-fig.org/psr/psr-1/)과
-[PSR-2](http://www.php-fig.org/psr/psr-2/)를 따릅니다.
+- [이슈 및 PR 작성 방법](https://rhymix.org/manual/contrib/github)
+- [코딩 규칙](https://rhymix.org/manual/contrib/coding-standards)
+- [GPL: 개발자, 디자이너, 사용자 등의 권리와 의무](https://rhymix.org/manual/contrib/license)

COPYRIGHT

@@ -1,2 +0,0 @@
-Copyright (c) Rhymix Developers and Contributors <devops@rhymix.org>
-Copyright (c) NAVER <http://www.navercorp.com>

Gruntfile.js

@@ -1,87 +0,0 @@
-module.exports = function(grunt) {
-	"use strict";
-
-	grunt.file.defaultEncoding = 'utf8';
-
-	grunt.initConfig({
-		jshint: {
-			files: [
-				'Gruntfile.js',
-				'common/js/*.js',
-				'modules/admin/tpl/js/*.js',
-				'modules/board/tpl/js/*.js',
-				'modules/board/skins/*/*.js',
-				'modules/editor/tpl/js/*.js',
-				'modules/menu/tpl/js/*.js',
-				'modules/widget/tpl/js/*.js',
-			],
-			options : {
-				ignores : [
-					'**/jquery*.js',
-					'**/swfupload.js',
-					'**/**.min.js',
-					'**/*-packed.js',
-					'**/*.compressed.js',
-					'**/jquery-*.js',
-					'**/jquery.*.js',
-					'common/js/html5.js',
-					'common/js/x.js',
-					'common/js/xe.js',
-					'common/js/xml2json.js',
-					'common/js/modernizr.js',
-					'vendor/**',
-					'tests/**',
-				]
-			}
-		},
-		csslint: {
-			'common-css': {
-				options: {
-					import : 2,
-					'adjoining-classes' : false,
-					'box-model' : false,
-					'box-sizing' : false,
-					'font-sizes' : false,
-					'duplicate-background-images' : false,
-					'order-alphabetical' : false,
-					'ids' : false,
-					'important' : false,
-					'overqualified-elements' : false,
-					'qualified-headings' : false,
-					'star-property-hack' : false,
-					'underscore-property-hack' : false,
-				},
-				src: [
-					'common/css/*.css',
-					'!common/css/bootstrap.css',
-					'!common/css/bootstrap-responsive.css',
-					'!**/*.min.css',
-					'!vendor/**',
-					'!tests/**',
-				]
-			}
-		},
-		phplint: {
-			default : {
-				options: {
-					phpCmd: "php",
-				},
-				src: [
-					"**/*.php",
-					"!files/**",
-					"!tests/**",
-					"!tools/**",
-					"!common/libraries/**",
-					"!vendor/**",
-					"!tests/_output/**"
-				],
-			},
-		}
-	});
-	
-	grunt.loadNpmTasks('grunt-contrib-jshint');
-	grunt.loadNpmTasks('grunt-contrib-csslint');
-	grunt.loadNpmTasks('grunt-phplint');
-	
-	grunt.registerTask('lint', ['jshint', 'csslint', 'phplint']);
-};

README.md

@@ -1,10 +1,13 @@
+[![Rhymix](./common/img/logo.png)](https://rhymix.org)
+
+![PHP Lint & Codeception](https://github.com/rhymix/rhymix/workflows/PHP%20Lint%20&%20Codeception/badge.svg)
+
 # 한국어
-[![Rhymix](https://cloud.githubusercontent.com/assets/8565457/12881857/7c3e69d6-ce90-11e5-94dc-8a592cf9ab7d.png)](https://www.rhymix.org)
 
 Rhymix(라이믹스)는 누구든지 쉽고 자유롭게 독립적인 홈페이지를 만들어
 자신을 표현하고 커뮤니티를 키워나갈 수 있도록 돕기 위한 CMS(content management system)입니다.
 
-[XpressEngine](https://www.xpressengine.com) 1.8 버전을 fork(가지치기)하여 진행하는 프로젝트로,
+[XpressEngine](https://xe1.xpressengine.com) 1.8 버전을 fork(가지치기)하여 진행하는 프로젝트로,
 누구나 무료로 사용할 수 있고 개발에 참여할 수도 있는 자유 소프트웨어(free software)입니다.
 
 Rhymix는 "시를 짓다, 운을 맞추다"라는 의미의 "rhyme"과
@@ -22,7 +25,7 @@ Rhymix는 개발자와 사용자가 서로의 권리와 책임을 존중하는
 개발자 위주, 서비스 제공자 위주로 나아가는 현대의 IT 동향을 무차별적으로 받아들이기보다는
 사용자의 주권과 열린 인터넷 환경을 보호하는 기술을 집중적으로 발굴하며,
 우리나라 인터넷 커뮤니티의 성장을 이끌었던 90년대 제로보드와 2000년대 XE의 정신을 이어받아
-2010년대 후반 현재 위기에 처한 오픈 웹을 지키고 회복시키는 일에 앞장서고자 합니다.
+2020년대 현재 위기에 처한 오픈 웹을 지키고 회복시키는 일에 앞장서고자 합니다.
 
 그러기 위해서는 다른 어떤 CMS보다도 일반 사용자를 위한 편리성이 가장 뛰어나야 합니다.
 
@@ -33,37 +36,26 @@ Rhymix는 개발자와 사용자가 서로의 권리와 책임을 존중하는
 
 ### 설치 환경
 
-Rhymix를 사용하려면 아래의 조건을 충족하는 웹호스팅이나 서버를 마련하셔야 합니다.
-
-
-- PHP 5.5.9 이상 (PHP 7 권장)
-- MySQL 5.0.7 이상 (MariaDB 권장)
-- 필수 PHP 모듈
-  - curl
-  - gd
-  - iconv 또는 mbstring
-  - json
-  - mcrypt 또는 openssl
-  - simplexml
-- php.ini에서 session.auto_start = Off로 설정되어 있어야 합니다.
-- 설치 폴더 또는 files 폴더에 쓰기 권한이 주어져야 합니다.
+Rhymix를 사용하려면 PHP 7.4 이상, MySQL 또는 MariaDB가 필요합니다.
+자세한 설치 환경은 [매뉴얼](https://rhymix.org/manual/introduction/requirements)을 참고하십시오.
 
 ### 개발 참여
 
 Rhymix는 개발자, 디자이너, 번역가 등의 도움과 일반 사용자들의 버그 신고를 환영합니다.
 참여를 원하시는 분은 질서있고 효율적인 프로젝트 운영을 위해
-[CONTRIBUTING.md](./CONTRIBUTING.md)를 먼저 읽어 주시기 바랍니다.
+[이슈 및 PR 작성 방법](https://rhymix.org/manual/contrib/github)과
+[코딩 규칙](https://rhymix.org/manual/contrib/coding-standards)을 먼저 읽어 주시기 바랍니다.
 
 보안 취약점을 발견하셨다면 해커들에게 알려지기 전에 먼저 패치를 작성할 수 있도록
 devops@rhymix.org로 알려 주시면 감사하겠습니다.
 
 ### 공식 홈페이지
 
-- Rhymix : https://www.rhymix.org
+- Rhymix : https://rhymix.org
 
 ### 커뮤니티
 
-- XETOWN : https://www.xetown.com
+- XETOWN : https://xetown.com
 
 ### 저작권 및 라이선스
 
@@ -74,7 +66,7 @@ Rhymix는 [GNU GPL v2](http://korea.gnu.org/documents/copyleft/gpl.ko.html)
 누구나 무료로 사용할 수 있고 개발에 참여할 수도 있습니다.
 
 Rhymix는 [NAVER](https://www.navercorp.com/)가 일부 저작권을 가진
-[XpressEngine](https://www.xpressengine.com)의 소스코드에 바탕을 두고 있습니다.
+[XpressEngine](https://xe1.xpressengine.com)의 소스코드에 바탕을 두고 있습니다.
 Rhymix 개발자들이 추가 및 변경한 부분의 저작권은 해당 개발자들에게 있습니다.
 
 XpressEngine은 초창기에 GPL을 사용하다가 버전 1.4.0부터 LGPL로 전환했지만,
@@ -90,11 +82,10 @@ Rhymix의 소스코드를 수정하거나 확장 기능을 직접 개발하여
 이러한 소스코드는 모두 GPL 라이선스의 적용을 받습니다.
 
 # English
-[![Rhymix](https://cloud.githubusercontent.com/assets/8565457/12881857/7c3e69d6-ce90-11e5-94dc-8a592cf9ab7d.png)](https://www.rhymix.org)
 
-Rhymix is a content management system (CMS) for anyone who wants to create independent homepages to express themselves and grow their communities easily and freely.
+Rhymix is a content management system (CMS) for everyone who wants to create independent homepages to express themselves and build their communities easily and freely.
 
-Rhymix is a project to fork [XpressEngine](https://www.xpressengine.com) version 1.8 and is free software that anyone can use for free and participate in.
+Rhymix is a fork of [XpressEngine](https://xe1.xpressengine.com) version 1.8 and is free software that anyone can use for free and participate.
 
 Rhymix is a combination of "rhyme" in the sense of "making a poem, adjusting the sound", and "remix" in the sense of "combining, changing".
 Rhymix cheers everyone who freely creates and/or assembles new things in the Internet space by combining various software and contents.
@@ -102,63 +93,53 @@ Rhymix cheers everyone who freely creates and/or assembles new things in the Int
 ### Development Direction
 
 Rhymix developers want an Internet ecosystem where developers and users respect each other's rights and responsibilities, 
-a world where everyone can voice their voice without relying on a centralized SNS platform, 
+a world where everyone can speak their voice without relying on a centralized SNS platform, 
 a future where ordinary bloggers, students, the disabled and others as well as developers of startups can build a home in cyberspace and communicate with each other.
 
 Rather than indiscriminately accepting modern IT trends that are centered on developers and service providers, 
-we focused on technologies that protect users' sovereignty and open Internet environment. Taking the spirit of ZeroBoard and XpressEngine, which led the growth of the Korean Internet communities in the 1990s and 2000s respectively, Rhymix wants to take the lead in recovering and restoring the open web in the crisis of late 2010s.
-
+we focused on technologies that protect users' sovereignty and open Internet environment. Taking the spirit of ZeroBoard and XpressEngine, which led the growth of the Korean Internet communities in the 1990s and 2000s respectively, Rhymix wants to take the lead in recovering and restoring the open web in the crisis of the 2020s.
 
 This requires the most convenience for the average user over any other CMS.
 
-- CMS that is convenient enough for beginners to easily create the website with a few clicks
+- CMS that is convenient enough to create the website easily, even for beginners, with a few clicks
 - CMS that is actively using the latest technology, fast and secure
 - CMS to help users and developers communicate well through community
 - We try to ensure maximum compatibility with existing XpressEngine third-party materials such as add-ons, modules and widgets.
 
 ### Installation Environment
 
-To use Rhymix, you must have a web hosting or server that meets the following requirements.
-
-- PHP 5.5.9 or higher (PHP 7 recommended)
-- MySQL 5.0.7 or higher (MariaDB recommended)
-- Required PHP module
-  - curl
-  - gd
-  - iconv or mbstring
-  - json
-  - mcrypt or openssl
-  - simplexml
-- In php.ini, session.auto_start = Off should be set.
-- The installation folder or the files folder must have write permission.
+Rhymix requires PHP 7.4 or higher, and MySQL or MariaDB.
+Please see the [online manual](https://rhymix.org/manual/introduction/requirements) for more information on server requirements.
 
 ### Participation in Development
 
 Rhymix welcomes developers, designers, translators, and bugs to the public.
-If you would like to participate, please read [CONTRIBUTING.md](./CONTRIBUTING.md) first to ensure efficient and orderly project management.
+If you would like to participate, please read [Issue and PR Submission Guide](https://rhymix.org/manual/contrib/github)
+and [Coding Standards](https://rhymix.org/manual/contrib/coding-standards) first to ensure efficient and orderly project management.
 
-If you have found a security vulnerability, please let us know at devops@rhymix.org so that we can create a patch before it is exploited.
+If you have found a security vulnerability, please let us know at devops@rhymix.org so that we can make a patch before it is exploited.
 
 ### Official Website
 
-- Rhymix : https://www.rhymix.org
+- Rhymix : https://rhymix.org
 
 ### Community
 
-- XETOWN (Korean) : https://www.xetown.com
+- XETOWN (Korean) : https://xetown.com
 
 ### Copyright and License
 
-Rhymix is a free software licensed under the [GNU GPL v2](http://korea.gnu.org/documents/copyleft/gpl.ko.html) or later.
-Free software, also known as "open source" or "open", is a program that emphasizes the freedom and rights of developers and users, their participation and responsibilities, and is free to use and participate in development.
+Rhymix is a free software licensed under the [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html) or later.
+Free software is a program that emphasizes the rights and responsibilities of developers and users to participate or use in freedom.
 
-Rhymix is based on the source code of [XpressEngine](https://www.xpressengine.com), which [NAVER](https://www.navercorp.com/) is partly copyrighted free software.
+Rhymix is based on the source code of [XpressEngine](https://xe1.xpressengine.com) ([Github](https://github.com/xpressengine/xe-core/)), which is free software partly owned by [NAVER](https://www.navercorp.com/).
 Rhymix developers have copyrights on the added and modified code.
 
-XpressEngine had used the GPL in its early days and switched from version 1.4.0 to LGPL, but Rhymix has reverted its licenses to the GPL to further protect its rights and adhere to the spirit of free software.
+XpressEngine has been licensed under the GPL in its early days and switched to LGPL from version 1.4.0, but Rhymix has reverted its licenses to the GPL for further protection of the rights and spirit of free software.
 (License conversion is allowed in [LGPL v2.1 Section 3](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).)
 
-GPL is a license that is commonly adopted by global CMSs such as WordPress, Drupal, and Joomla, so the rights and obligations of users and developers are the same as those of CMS.
+The GPL is commonly adopted by global CMSes such as WordPress, Drupal, and Joomla. The rights and obligations of users and developers of Rhymix are the same as those CMSes.
+
+The use of Rhymix on homepage does not impose a duty on you to release the source code, even if you modify the source code or develop the extension yourself.
+However, distributing and/or selling the source code or extension according to the GPL license, you have to provide the source code.
 
-The use of Rhymix on the homepage does not oblige you to release the source code, even if you modify the Rhymix source code or develop the extension yourself.
-However, if you distribute or sell your own extensions to a third party, you must provide the source code, which is subject to the GPL license.

SECURITY.md

@@ -0,0 +1,17 @@
+Security Policy
+---------------
+
+### Supported Versions
+
+Only the latest version is actively supported.
+
+## Reporting a Vulnerability
+
+Please report possible vulnerabilities by email to devops@rhymix.org.
+Please DO NOT use GitHub issues or pull requests for this purpose.
+
+We do not consider it a vulnerability if the superuser (is_admin=Y) account
+can insert scripts or delete information. That's what the superuser account is for!
+It will, however, be considered a serious vulnerability if someone else can
+trick a superuser to perform such actions inadvertently,
+for example through a CSRF attack.

addons/adminlogging/conf/info.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon version="0.2">
     <title xml:lang="ko">어드민 메뉴 접근 로깅</title>
-    <title xml:lang="en">admin menu access logging</title>
+    <title xml:lang="en">Logging Access to the Administrator Menu</title>
 	<title xml:lang="zh-CN">后台访问日志</title>
     <title xml:lang="zh-TW">管理選單訪問日誌</title>
     <description xml:lang="ko">
@@ -13,8 +13,11 @@
     <description xml:lang="zh-TW">
 		管理選單訪問紀錄及登入日誌。
     </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <description xml:lang="en">
+		This addon will record Rhymix administrators' access to the menu.
+    </description>
+    <version>RX_VERSION</version>
+    <date>RX_CORE</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="ko">NAVER</name>

addons/autolink/autolink.js

@@ -24,7 +24,7 @@
 			var thisPlugin = this;
 
 			// extract target text nodes
-			this.extractTargets($('.xe_content'));
+			this.extractTargets($('.rhymix_content, .xe_content'));
 
 			$(this.targets).each(function(){
 				thisPlugin.cast('AUTOLINK', [this]);
@@ -40,6 +40,7 @@
 			content = content.replace(url_regex, function(match, p1, offset, string) {
 				var match;
 				var suffix = '';
+				var attribute = '';
 				if (p1.indexOf('(') < 0 && p1.match(/\)$/)) {
 					p1 = p1.replace(/\)$/, '');
 					suffix = ')';
@@ -53,7 +54,10 @@
 					p1 = match[1];
 					suffix = match[2];
 				}
-				return '<a href="' + p1 + '" target="_blank">' + p1 + '</a>' + suffix;
+				if(!isSameOrigin(location.href, p1)) {
+					attribute = ' target="_blank"';
+				}
+				return '<a href="' + p1 + '"' + attribute + '>' + p1 + '</a>' + suffix;
 			});
 
 			$(textNode).before(dummy);
@@ -63,7 +67,7 @@
 		},
 		extractTargets : function(obj) {
 			var thisPlugin = this;
-			var wrap = $('.xe_content', obj);
+			var wrap = $('.rhymix_content, .xe_content', obj);
 			if(wrap.length) {
 				this.extractTargets(wrap);
 				return;
@@ -92,10 +96,15 @@
 	});
 
 	xe.registerPlugin(new AutoLink());
-	
-	$(document).on('click', '.xe_content a', function() {
-		if (!$(this).attr("target")) {
-			$(this).attr("target", "_blank");
+
+	$(document).on('click', '.rhymix_content a, .xe_content a', function() {
+		var $this = $(this);
+		var href = $this.attr('href');
+		if(!href || /^(?:javascript|mailto):|#/.test(href)) {
+			return;
+		}
+		if (!$this.attr("target") && !isSameOrigin(location.href, href)) {
+			$this.attr("target", "_blank");
 		}
 	});
 	

addons/autolink/conf/info.xml

@@ -36,8 +36,8 @@
     <description xml:lang="zh-TW">
         是種可將文章及回覆內容中的 URL 網址字串自動轉換成連結的附加元件。
     </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <version>RX_VERSION</version>
+    <date>RX_CORE</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="ko">NAVER</name>

addons/blogapi/blogapi.addon.php

@@ -1,602 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-	exit();
-
-/**
- * @file blogapicounter.addon.php
- * @author NAVER (developers@xpressengine.com)
- * @brief Add blogAPI
- *
- * It enables to write a post by using an external tool such as ms live writer, firefox performancing, zoundry and so on.
- * It should be called before executing the module(before_module_proc). If not, it is forced to shut down.
- * */
-// Insert a rsd tag when called_position is after_module_proc
-if($called_position == 'after_module_proc')
-{
-	// Create rsd address of the current module
-	$site_module_info = Context::get('site_module_info');
-	$rsd_url = getFullSiteUrl($site_module_info->domain, '', 'mid', $this->module_info->mid, 'act', 'api');
-	// Insert rsd tag into the header
-	Context::addHtmlHeader("    " . '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . $rsd_url . '" />');
-}
-// If act isnot api, just return
-if($_REQUEST['act'] != 'api')
-{
-	return;
-}
-
-// Read func file
-require_once(_XE_PATH_ . 'addons/blogapi/blogapi.func.php');
-
-$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-
-// If HTTP_RAW_POST_DATA is NULL, Print error message
-if(!$xml)
-{
-	$content = getXmlRpcFailure(1, 'Invalid Method Call');
-	printContent($content);
-}
-
-// xmlprc parsing
-// Parse the requested xmlrpc
-if(Security::detectingXEE($xml))
-{
-	header("HTTP/1.0 400 Bad Request");
-	exit;
-}
-
-if(version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
-$xml = new SimpleXMLElement($xml, LIBXML_NONET | LIBXML_NOENT);
-
-$method_name = (string)$xml->methodName;
-$params = $xml->params->param;
-
-// Compatible with some of methodname
-if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo')))
-{
-	$method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
-}
-
-// Get user_id, password and attempt log-in
-$user_id = trim((string)$params[1]->value->string);
-$password = trim((string)$params[2]->value->string);
-
-// Before executing the module, authentication is processed.
-if($called_position == 'before_module_init')
-{
-	// Attempt log-in by using member controller
-	if($user_id && $password)
-	{
-		$oMemberController = getController('member');
-		$output = $oMemberController->doLogin($user_id, $password);
-		// If login fails, an error message appears
-		if(!$output->toBool())
-		{
-			$content = getXmlRpcFailure(1, $output->getMessage());
-			printContent($content);
-		}
-	}
-	else
-	{
-		$content = getXmlRpcFailure(1, 'not logged');
-		printContent($content);
-	}
-}
-
-// Before module processing, handle requests from blogapi tool and then terminate.
-if($called_position == 'before_module_proc')
-{
-	// Check writing permission 
-	if(!$this->grant->write_document)
-	{
-		printContent(getXmlRpcFailure(1, 'no permission'));
-	}
-
-	// Get information of the categories
-	$oDocumentModel = getModel('document');
-	$category_list = $oDocumentModel->getCategoryList($this->module_srl);
-
-	// Specifies a temporary file storage
-	$logged_info = Context::get('logged_info');
-	$mediaPath = sprintf('files/cache/blogapi/%s/%s/', $this->mid, $logged_info->member_srl);
-	$mediaAbsPath = _XE_PATH_ . $mediaPath;
-	$mediaUrlPath = Context::getRequestUri() . $mediaPath;
-
-	switch($method_name)
-	{
-		// Blog information
-		case 'blogger.getUsersBlogs' :
-			$obj = new stdClass();
-			$obj->url = getFullSiteUrl('');
-			$obj->blogid = $this->mid;
-			$obj->blogName = $this->module_info->browser_title;
-			$blog_list = array($obj);
-
-			$content = getXmlRpcResponse($blog_list);
-			printContent($content);
-			break;
-
-		// Return a list of categories
-		case 'metaWeblog.getCategories' :
-			$category_obj_list = array();
-			if($category_list)
-			{
-				foreach($category_list as $category_srl => $category_info)
-				{
-					$obj = new stdClass();
-					$obj->description = $category_info->title;
-					//$obj->htmlUrl = Context::getRequestUri().$this->mid.'/1';
-					//$obj->rssUrl= Context::getRequestUri().'rss/'.$this->mid.'/1';
-					$obj->title = $category_info->title;
-					$obj->categoryid = $category_srl;
-					$category_obj_list[] = $obj;
-				}
-			}
-
-			$content = getXmlRpcResponse($category_obj_list);
-			printContent($content);
-			break;
-
-		// Upload file
-		case 'metaWeblog.newMediaObject' :
-			// Check a file upload permission
-			$oFileModel = getModel('file');
-			$file_module_config = $oFileModel->getFileModuleConfig($this->module_srl);
-			if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant) > 0)
-			{
-				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin != 'Y')
-				{
-					$is_permitted = false;
-					for($i = 0; $i < count($file_module_config->download_grant); $i++)
-					{
-						$group_srl = $file_module_config->download_grant[$i];
-						if($logged_info->group_list[$group_srl])
-						{
-							$is_permitted = true;
-							break;
-						}
-					}
-					if(!$is_permitted){
-						printContent(getXmlRpcFailure(1, 'no permission'));
-					}
-				}
-			}
-
-			$fileinfo = $params[3]->value->struct->member;
-			foreach($fileinfo as $key => $val)
-			{
-				$nodename = (string)$val->name;
-				if($nodename === 'bits')
-				{
-					$filedata = base64_decode((string)$val->value->base64);
-				}
-				else if($nodename === 'name')
-				{
-					$filename = pathinfo((string)$val->value->string, PATHINFO_BASENAME);
-				}
-			}
-
-			if($logged_info->is_admin != 'Y')
-			{
-				// check file type
-				if(isset($file_module_config->allowed_filetypes) && $file_module_config->allowed_filetypes !== '*.*')
-				{
-					$filetypes = explode(';', $file_module_config->allowed_filetypes);
-					$ext = array();
-
-					foreach($filetypes as $item)
-					{
-						$item = explode('.', $item);
-						$ext[] = strtolower(array_pop($item));
-					}
-
-					$uploaded_ext = explode('.', $filename);
-					$uploaded_ext = strtolower(array_pop($uploaded_ext));
-
-					if(!in_array($uploaded_ext, $ext))
-					{
-						printContent(getXmlRpcFailure(1, 'Not allowed file type'));
-						break;
-					}
-				}
-
-				$allowed_filesize = $file_module_config->allowed_filesize * 1024 * 1024;
-				if($allowed_filesize < strlen($filedata))
-				{
-					printContent(getXmlRpcFailure(1, 'This file exceeds the attachment limit'));
-					break;
-				}
-			}
-
-			$temp_filename = Password::createSecureSalt(12, 'alnum');
-			$target_filename = sprintf('%s%s', $mediaAbsPath, $temp_filename);
-			FileHandler::makeDir($mediaAbsPath);
-			FileHandler::writeFile($target_filename, $filedata);
-			FileHandler::writeFile($target_filename . '_source_filename', $filename);
-
-			$obj = new stdClass();
-			$obj->url = Context::getRequestUri() . $mediaPath . $temp_filename;
-			$content = getXmlRpcResponse($obj);
-			printContent($content);
-			break;
-		// Get posts
-		case 'metaWeblog.getPost' :
-			$document_srl = (string)$params[0]->value->string;
-			if(!$document_srl)
-			{
-				printContent(getXmlRpcFailure(1, 'no permission'));
-			}
-			else
-			{
-				$oDocumentModel = getModel('document');
-				$oDocument = $oDocumentModel->getDocument($document_srl);
-				if(!$oDocument->isExists() || !$oDocument->isGranted())
-				{
-					printContent(getXmlRpcFailure(1, 'no permission'));
-				}
-				else
-				{
-					// Get a list of categories and set Context
-					$category = "";
-					if($oDocument->get('category_srl'))
-					{
-						$oDocumentModel = getModel('document');
-						$category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
-						if($category_list[$oDocument->get('category_srl')])
-						{
-							$category = $category_list[$oDocument->get('category_srl')]->title;
-						}
-					}
-
-					$content = sprintf(
-							'<?xml version="1.0" encoding="utf-8"?>' .
-							'<methodResponse>' .
-							'<params>' .
-								'<param>' .
-									'<value>' .
-										'<struct>' .
-											'<member><name>categories</name><value><array><data><value><![CDATA[%s]]></value></data></array></value></member>' .
-											'<member><name>dateCreated</name><value><dateTime.iso8601>%s</dateTime.iso8601></value></member>' .
-											'<member><name>description</name><value><![CDATA[%s]]></value></member>' .
-											'<member><name>link</name><value>%s</value></member>' .
-											'<member><name>postid</name><value><string>%s</string></value></member>' .
-											'<member><name>title</name><value><![CDATA[%s]]></value></member>' .
-											'<member><name>publish</name><value><boolean>1</boolean></value></member>' .
-										'</struct>' .
-									'</value>' .
-								'</param>' .
-							'</params>' .
-							'</methodResponse>', 
-							$category,
-							date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime()),
-							$oDocument->getContent(false, false, true, false),
-							getFullUrl('', 'document_srl', $oDocument->document_srl),
-							$oDocument->document_srl,
-							$oDocument->getTitleText()
-					);
-					printContent($content);
-				}
-			}
-			break;
-
-		// Write a new post
-		case 'metaWeblog.newPost' :
-			$obj = new stdClass();
-			$info = $params[3];
-			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
-			{
-				switch((string)$val->name)
-				{
-					case 'title' :
-						$obj->title = (string)$val->value->string;
-						break;
-					case 'description' :
-						$obj->content = (string)$val->value->string;
-						break;
-					case 'categories' :
-						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
-						{
-							foreach($category_list as $category_srl => $category_info)
-							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
-							}
-						}
-						break;
-					case 'tagwords' :
-						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
-						{
-							$tag_list[] = (string)$tag->string;
-						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
-						break;
-				}
-			}
-
-			// Set document srl
-			$document_srl = getNextSequence();
-			$obj->document_srl = $document_srl;
-			$obj->module_srl = $this->module_srl;
-
-			// Attachment
-			if(is_dir($mediaAbsPath))
-			{
-				$file_list = FileHandler::readDir($mediaAbsPath, '/(_source_filename)$/is');
-				$file_count = count($file_list);
-				if($file_count)
-				{
-					$oFileController = getController('file');
-					$oFileModel = getModel('file');
-					foreach($file_list as $file)
-					{
-						$filename = FileHandler::readFile($mediaAbsPath . $file);
-						$temp_filename = str_replace('_source_filename', '', $file);
-
-						$file_info = array();
-						$file_info['tmp_name'] = sprintf('%s%s', $mediaAbsPath, $temp_filename);
-						$file_info['name'] = $filename;
-						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
-
-						if($fileOutput->get('direct_download') === 'N')
-						{
-							$replace_url =  Context::getRequestUri() . $oFileModel->getDownloadUrl($fileOutput->file_srl, $fileOutput->sid, $this->module_srl);
-						}
-						else
-						{
-							$replace_url = Context::getRequestUri() . $fileOutput->get('uploaded_filename');
-						}
-
-						$obj->content = str_replace($mediaUrlPath . $temp_filename, $replace_url, $obj->content);
-					}
-					$obj->uploaded_count = $file_count;
-				}
-			}
-
-			$oDocumentController = getController('document');
-			$obj->commentStatus = 'ALLOW';
-			$obj->allow_trackback = 'Y';
-			
-			$logged_info = Context::get('logged_info');
-			$obj->member_srl = $logged_info->member_srl;
-			$obj->user_id = $logged_info->user_id;
-			$obj->user_name = $logged_info->user_name;
-			$obj->nick_name = $logged_info->nick_name;
-			$obj->email_address = $logged_info->email_address;
-			$obj->homepage = $logged_info->homepage;
-			$output = $oDocumentController->insertDocument($obj, TRUE);
-
-			if(!$output->toBool())
-			{
-				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
-			{
-				$content = getXmlRpcResponse(strval($document_srl));
-			}
-			FileHandler::removeDir($mediaAbsPath);
-
-			printContent($content);
-			break;
-
-		// Edit post
-		case 'metaWeblog.editPost' :
-			$tmp_val = (string)$params[0]->value->string;
-			if(!$tmp_val)
-				$tmp_val = (string)$params[0]->value->i4;
-			if(!$tmp_val)
-			{
-				$content = getXmlRpcFailure(1, 'no permission');
-				break;
-			}
-			$tmp_arr = explode('/', $tmp_val);
-			$document_srl = array_pop($tmp_arr);
-			if(!$document_srl)
-			{
-				$content = getXmlRpcFailure(1, 'no permission');
-				break;
-			}
-
-			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);
-			// Check if a permission to modify a document is granted
-			if(!$oDocument->isGranted())
-			{
-				$content = getXmlRpcFailure(1, 'no permission');
-				break;
-			}
-
-			$obj = $oDocument->getObjectVars();
-
-			$info = $params[3];
-			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
-			{
-				switch((string)$val->name)
-				{
-					case 'title' :
-						$obj->title = (string)$val->value->string;
-						break;
-					case 'description' :
-						$obj->content = (string)$val->value->string;
-						break;
-					case 'categories' :
-						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
-						{
-							foreach($category_list as $category_srl => $category_info)
-							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
-							}
-						}
-						break;
-					case 'tagwords' :
-						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
-						{
-							$tag_list[] = (string)$tag->string;
-						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
-						break;
-				}
-			}
-			// Document srl
-			$obj->document_srl = $document_srl;
-			$obj->module_srl = $this->module_srl;
-
-			// Attachment
-			if(is_dir($mediaAbsPath))
-			{
-				$file_list = FileHandler::readDir($mediaAbsPath, '/(_source_filename)$/is');
-				$file_count = count($file_list);
-				if($file_count)
-				{
-					$oFileController = getController('file');
-					$oFileModel = getModel('file');
-					foreach($file_list as $file)
-					{
-						$filename = FileHandler::readFile($mediaAbsPath . $file);
-						$temp_filename = str_replace('_source_filename', '', $file);
-
-						$file_info = array();
-						$file_info['tmp_name'] = sprintf('%s%s', $mediaAbsPath, $temp_filename);
-						$file_info['name'] = $filename;
-						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
-
-						if($fileOutput->get('direct_download') === 'N')
-						{
-							$replace_url =  Context::getRequestUri() . $oFileModel->getDownloadUrl($fileOutput->file_srl, $fileOutput->sid, $this->module_srl);
-						}
-						else
-						{
-							$replace_url = Context::getRequestUri() . $fileOutput->get('uploaded_filename');
-						}
-
-						$obj->content = str_replace($mediaUrlPath . $temp_filename, $replace_url, $obj->content);
-					}
-					$obj->uploaded_count += $file_count;
-				}
-			}
-
-			$oDocumentController = getController('document');
-			$output = $oDocumentController->updateDocument($oDocument, $obj, TRUE);
-
-			if(!$output->toBool())
-			{
-				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
-			{
-				$content = getXmlRpcResponse(true);
-				FileHandler::removeDir($mediaAbsPath);
-			}
-
-			printContent($content);
-			break;
-		// Delete the post
-		case 'blogger.deletePost' :
-			$tmp_val = (string)$params[1]->value->string;
-			$tmp_arr = explode('/', $tmp_val);
-			$document_srl = array_pop($tmp_arr);
-			// Get a document
-			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);
-			// If the document exists
-			if(!$oDocument->isExists())
-			{
-				$content = getXmlRpcFailure(1, 'not exists');
-				// Check if a permission to delete a document is granted
-			}
-			elseif(!$oDocument->isGranted())
-			{
-				$content = getXmlRpcFailure(1, 'no permission');
-				break;
-				// Delete
-			}
-			else
-			{
-				$oDocumentController = getController('document');
-				$output = $oDocumentController->deleteDocument($document_srl);
-				if(!$output->toBool())
-					$content = getXmlRpcFailure(1, $output->getMessage());
-				else
-					$content = getXmlRpcResponse(true);
-			}
-
-			printContent($content);
-			break;
-		// Get recent posts
-		case 'metaWeblog.getRecentPosts' :
-			// Options to get a list
-			$args = new stdClass();
-			$args->module_srl = $this->module_srl; // /< module_srl of the current module
-			$args->page = 1;
-			$args->list_count = 20;
-			$args->sort_index = 'list_order'; // /< Sorting values
-			$logged_info = Context::get('logged_info');
-			$args->search_target = 'member_srl';
-			$args->search_keyword = $logged_info->member_srl;
-			$output = $oDocumentModel->getDocumentList($args);
-			if(!$output->toBool() || !$output->data)
-			{
-				$content = getXmlRpcFailure(1, 'post not founded');
-			}
-			else
-			{
-				$oEditorController = getController('editor');
-
-				$posts = array();
-				foreach($output->data as $key => $oDocument)
-				{
-					$post = new stdClass();
-					$post->categories = array();
-					$post->dateCreated = date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime());
-					$post->description = sprintf('<![CDATA[%s]]>',$oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
-					$post->link = $post->permaLink = getFullUrl('', 'document_srl', $oDocument->document_srl);
-					$post->postid = $oDocument->document_srl;
-					$post->title = htmlspecialchars($oDocument->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-					$post->publish = 1;
-					$post->userid = $oDocument->get('user_id');
-					$post->mt_allow_pings = 0;
-					$post->mt_allow_comments = $oDocument->allowComment() ? 1 : 0;
-					$posts[] = $post;
-				}
-				$content = getXmlRpcResponse($posts);
-				printContent($content);
-			}
-			break;
-
-		// Display RSD if there is no request
-		default :
-			$homepagelink = getUrl('', 'mid', $this->mid);
-			$site_module_info = Context::get('site_module_info');
-			$api_url = getFullSiteUrl($site_module_info->domain, '', 'mid', $site_module_info->mid, 'act', 'api');
-			$content = <<<RSDContent
-<?xml version="1.0" ?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd" >
-<service>
-    <engineName>Rhymix</engineName>
-    <engineLink>https://www.rhymix.org/ </engineLink>
-    <homePageLink>{$homepagelink}</homePageLink>
-    <apis>
-        <api name="MetaWeblog" preferred="true" apiLink="{$api_url}" blogID="" />
-    </apis>
-</service>
-</rsd>
-RSDContent;
-			printContent($content);
-			break;
-	}
-}
-/* End of file blogapi.addon.php */
-/* Location: ./addons/blogapi/blogapi.addon.php */

addons/blogapi/blogapi.func.php

@@ -1,101 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-	exit();
-
-/**
- * @file ./addons/blogapi/blogapi.func.php
- * @author NAVER (developers@xpressengine.com)
- * @brief Function collections for the implementation of blogapi
- * */
-// Error messages
-function getXmlRpcFailure($error, $message)
-{
-	return
-			sprintf(
-					"<methodResponse>\n<fault><value><struct>\n<member>\n<name>faultCode</name>\n<value><int>%d</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>%s</string></value>\n</member>\n</struct></value></fault>\n</methodResponse>\n", $error, htmlspecialchars($message, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)
-	);
-}
-
-// Display results
-function getXmlRpcResponse($params)
-{
-	$buff = '<?xml version="1.0" encoding="utf-8"?>' . "\n<methodResponse><params>";
-	$buff .= _getEncodedVal($params);
-	$buff .= "</params>\n</methodResponse>\n";
-
-	return $buff;
-}
-
-// Encoding
-function _getEncodedVal($val, $is_sub_set = false)
-{
-	if(preg_match('/^\<\!\[CDATA\[/',$val))
-	{
-		$buff = sprintf("<value>%s</value>", $val);
-	}
-	elseif(is_int($val))
-	{
-		$buff = sprintf("<value><i4>%d</i4></value>", $val);
-	}
-	elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
-	{
-		$buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
-	}
-	elseif(is_double($val))
-	{
-		$buff = sprintf("<value><double>%f</double></value>", $val);
-	}
-	elseif(is_bool($val))
-	{
-		$buff = sprintf("<value><boolean>%d</boolean></value>", $val ? 1 : 0);
-	}
-	elseif(is_object($val))
-	{
-		$values = get_object_vars($val);
-		$val_count = count($values);
-		$buff = "<value><struct>";
-		foreach($values as $k => $v)
-		{
-			$buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), _getEncodedVal($v, true));
-		}
-		$buff .= "</struct></value>\n";
-	}
-	elseif(is_array($val))
-	{
-		$val_count = count($val);
-		$buff = "<value><array>\n<data>";
-		for($i = 0; $i < $val_count; $i++)
-		{
-			$buff .= _getEncodedVal($val[$i], true);
-		}
-		$buff .= "</data>\n</array></value>";
-	}
-	else
-	{
-		$buff = sprintf("<value><string>%s</string></value>\n", $val);
-	}
-	if(!$is_sub_set)
-	{
-		return sprintf("<param>\n%s</param>", $buff);
-	}
-	return $buff;
-}
-
-// Display the result
-function printContent($content)
-{
-	header("Content-Type: text/xml; charset=UTF-8");
-	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-	header("Cache-Control: no-store, no-cache, must-revalidate");
-	header("Cache-Control: post-check=0, pre-check=0", false);
-	header("Pragma: no-cache");
-	print $content;
-	Context::close();
-	exit();
-}
-
-/* End of file blogapi.func.php */
-/* Location: ./addons/blogapi/blogapi.func.php */

addons/blogapi/conf/info.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">BlogAPI 애드온</title>
-    <title xml:lang="jp">BlogAPIアドオン</title>
-    <title xml:lang="zh-CN">BlogAPI</title>
-    <title xml:lang="en">Addon for BlogAPI</title>
-    <title xml:lang="vi">BlogAPI Addon</title>
-    <title xml:lang="ge">Addon für BlogAPI</title>
-    <title xml:lang="es">Addon para BlogAPI</title>
-    <title xml:lang="ru">Аддон для BlogAPI</title>
-    <title xml:lang="zh-TW">部落格 API</title>
-    <description xml:lang="ko">
-        metaWeblog를 지원하는 blogApi애드온입니다.
-        사용으로 설정하면 각 모듈마다 RSD 태그를 노출합니다.
-        api의 주소는 http://설치주소/모듈명/api 입니다.
-        사용으로 해야 RSD태그 및 api가 동작을 합니다.
-    </description>
-    <description xml:lang="jp">
-        MetaWeblogをサポートするBlog APIアドオンです。
-        「使用する」にチェックすると各モジュールごとにRSDのアドレスを表示します。
-        APIのアドレスは「http://インストールURL/モジュール名/api」です。
-        「使用する」に設定してから、RSDタグ、およびAPIが作動します。
-    </description>
-    <description xml:lang="zh-CN">
-        支持metaWeblog的 blogApi插件。
-        设置为"启用"时,会使每个模块都会显示RSD标签。
-        api地址为http://安装地址/模块名/api。
-        把状态设置为"使用"时，才会激活RSD标签及api。
-    </description>
-    <description xml:lang="en">
-        This blogAPI addon supports metaWeblog.
-        By using this option, it lets the RSD tag to be exposed to each module.
-        URL to the API is http://setup_path/module_name/api.
-        RSD tag and the api will work only if you use this addon.
-    </description>
-    <description xml:lang="vi">
-        Addon BlogAPI này hỗ trợ metaWeblog..
-        Bằng việc sử dụng tùy chọn này, Tag RSD sẽ được hiển thị đến mỗi Module.
-        URL cho API có dạng http://setup_path/module_name/api.
-        RSD Tag và API chỉ làm việc khi Addon này được kích hoạt.
-    </description>
-    <description xml:lang="ge">
-        Diese blogApi addon metaWeblog unterstützt.
-        Durch die Verwendung dieser Option, die es ermöglicht RSD Tag ausgesetzt werden jedes Modul.
-        URL der api ist http://setup_path/module_name/api.
-        RSD-Tag und dem API arbeiten und nur dann, wenn Sie über dieses Addon.
-    </description>
-    <description xml:lang="es">
-        Este blogApi addon soporta el metaWeblog.
-        Si seleccionas la optión usar, cada módulo entregará la etiqueta RSD.
-        La dirección de api es http://dirección de la instalación/nombre de módulo/api.
-        Sólo si seleccionas la opción usar, funcionará la etiqueta RSD y api.
-    </description>
-    <description xml:lang="ru">
-        Этот blogApi аддон поддерживает metaWeblog.
-        Используя этот аддон, RSD тег становится доступным для каждого модуля.
-        URL для api - http://setup_path/module_name/api.
-        тег RSD и api работают только при включенном аддоне.
-    </description>
-    <description xml:lang="zh-TW">
-        支援 MetaWeblog 的部落格 API 附加元件。
-        設置成"啟用"時，會使每個模組都顯示 RSD 圖示。
-        API網址是 http://安裝位置/模組名稱/api。
-        將狀態設置成"啟用"時，才可使用 RSD 和 API
-    </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="ge">NAVER</name>
-        <name xml:lang="es">NAVER</name>
-        <name xml:lang="ru">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
-    </author>
-</addon>

addons/counter/conf/info.xml

@@ -45,8 +45,8 @@
         使用XE的網站訪問統計模組記錄網站訪問資料。
         將狀態設置成"使用"時，才會紀錄網站訪問資料。
     </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <version>RX_VERSION</version>
+    <date>RX_CORE</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="ko">NAVER</name>

addons/counter/counter.addon.php

@@ -10,7 +10,7 @@ if(!defined('__XE__'))
  * @brief Counter add-on
  */
 // Execute if called_position is before_display_content
-if($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
+if($called_position == 'before_display_content' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
 {
 	$oCounterController = getController('counter');
 	$oCounterController->counterExecute();

addons/member_extra_info/conf/info.xml

@@ -36,8 +36,8 @@
     <description xml:lang="zh-TW">
         可將用戶資料中的暱稱圖片、用戶圖示、簽名檔等資料顯示到頁面當中。
     </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <version>RX_VERSION</version>
+    <date>RX_CORE</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="ko">NAVER</name>

addons/member_extra_info/member_extra_info.addon.php

@@ -22,7 +22,8 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP
 	return;
 }
 // Include a file having functions to replace member image name/mark
-require_once('./addons/member_extra_info/member_extra_info.lib.php');
+require_once __DIR__ . '/member_extra_info.lib.php';
+
 // 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
 if($temp_output)

addons/member_extra_info/member_extra_info.lib.php

@@ -29,29 +29,31 @@ function memberTransImageName($matches)
 	$_tmp = &$GLOBALS['_transImageNameList'][$member_srl];
 	
 	// If pre-defined data in the global variables, return it
-	if(!$_tmp->cached)
+	if(!isset($_tmp->cached) || !$_tmp->cached)
 	{
 		$_tmp->cached = true;
 		$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 		$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 
-		if(file_exists(_XE_PATH_ . $image_name_file))
+		if(file_exists(RX_BASEDIR . $image_name_file))
 		{
-			$_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_name_file));
+			$_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(RX_BASEDIR . $image_name_file));
 			$image_name_file = $_tmp->image_name_file;
 		}
 		else
 		{
+			$_tmp->image_name_file = '';
 			$image_name_file = '';
 		}
 
-		if(file_exists(_XE_PATH_ . $image_mark_file))
+		if(file_exists(RX_BASEDIR . $image_mark_file))
 		{
-			$_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_mark_file));
+			$_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(RX_BASEDIR . $image_mark_file));
 			$image_mark_file = $_tmp->image_mark_file;
 		}
 		else
 		{
+			$_tmp->image_mark_file = '';
 			$image_mark_file = '';
 		}
 

addons/mobile/classes/hdml.class.php

@@ -1,124 +0,0 @@
-<?php
-/**
- * HDML Library ver 0.1
- * @author NAVER (developers@xpressengine.com)
- */
-class wap extends mobileXE {
-
-	/**
-	 * @brief constructor
-	 **/
-	function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * @brief hdml header output
-	 **/
-	function printHeader()
-	{
-		header("Content-Type:text/x-hdml; charset=".$this->charset);
-		header("Cache-Control: no-store, no-cache, must-revalidate");
-		header("Cache-Control: post-check=0, pre-check=0", false);
-		header("Pragma: no-cache");
-
-		print '<hdml version=3.0 ttl=0 markable=true>';
-		print "\n";
-		print $this->hasChilds()?'<choice name=main>':'<display>';
-		print "\n";
-
-		if($this->upperUrl)
-		{
-			$url = $this->upperUrl;
-			printf('<action type=soft1 task=go dest="%s" label="%s">%s', $url->url, $url->text, "\n");
-		}
-	}
-
-	/**
-	 * @brief Output title
-	 **/
-	function printTitle()
-	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('<b>&lt;%s%s&gt;%s', $this->title,$titlePageStr,"\n");
-	}
-
-	/**
-	 * @brief Output information
-	 * hasChilds() if there is a list of content types, otherwise output
-	 **/
-	function printContent()
-	{
-		if($this->hasChilds())
-		{
-			foreach($this->getChilds() as $key => $val)
-			{
-				if(!$val['link']) continue;
-				printf('<ce task=go label="%s" dest="%s">%s%s',lang('cmd_select'), $val['href'], $val['text'], "\n");
-			}
-		}
-		else
-		{
-			printf('<wrap>%s<br>%s', $this->getContent(),"\n");
-		} 
-	}
-
-	/**
-	 * @brief Button to output
-	 **/
-	function printBtn()
-	{
-		// Menu Types
-		if($this->hasChilds())
-		{
-			if($this->nextUrl)
-			{
-				$url = $this->nextUrl;
-				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-			}
-			if($this->prevUrl)
-			{
-				$url = $this->prevUrl;
-				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-			}
-			if($this->homeUrl)
-			{
-				$url = $this->homeUrl;
-				printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-			}
-			// Content Types
-		}
-		else
-		{
-			if($this->nextUrl)
-			{
-				$url = $this->nextUrl;
-				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-			}
-			if($this->prevUrl)
-			{
-				$url = $this->prevUrl;
-				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-			}
-			if($this->homeUrl)
-			{
-				$url = $this->homeUrl;
-				printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-			}
-		}
-	}
-
-	/**
-	 * @brief Footer information output
-	 **/
-	function printFooter()
-	{
-		print $this->hasChilds()?'</choice>':'</display>';
-		print "\n";
-		print("</hdml>");
-	}
-}
-
-/* End of file hdml.class.php */
-/* Location: ./addons/mobile/classes/hdml.class.php */

addons/mobile/classes/mhtml.class.php

@@ -1,98 +0,0 @@
-<?php
-include './mobile.class.php';
-/**
- * mhtml Library ver 0.1
- * @author NAVER (developers@xpressengine.com) / lang_select : misol
- */
-class wap extends mobileXE
-{
-	/**
-	 * @brief constructor
-	 **/
-	function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * @brief hdml header output
-	 **/
-	function printHeader()
-	{
-		print("<html><head>\n");
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-	}
-	// Output title
-	function printTitle()
-	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
-	}
-
-	/**
-	 * @brief Output information
-	 * hasChilds() if there is a list of content types, otherwise output
-	 **/
-	function printContent()
-	{
-		if($this->hasChilds())
-		{
-			foreach($this->getChilds() as $key => $val)
-			{
-				if(!$val['link']) continue;
-				printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
-				if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
-			}
-		}
-		else
-		{
-			print(str_replace('<br/>','<br>',$this->getContent())."\n");
-		}
-		print "<hr><br>";
-	}
-
-	/**
-	 * @brief Button to output
-	 **/
-	function printBtn()
-	{
-		if($this->nextUrl)
-		{
-			$url = $this->nextUrl;
-			printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
-		}
-		if($this->prevUrl)
-		{
-			$url = $this->prevUrl;
-			printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
-		}
-		// Select Language
-		if(!parent::isLangChange())
-		{
-			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.lang('select_lang'), "\n");
-		}
-		else
-		{
-			printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), lang('lang_return'), "\n");
-		}
-		if($this->upperUrl)
-		{
-			$url = $this->upperUrl;
-			printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
-		}
-		if($this->homeUrl)
-		{
-			$url = $this->homeUrl;
-			printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");
-		}
-	}
-	// Footer information output
-	function printFooter()
-	{
-		print("</body></html>\n");
-	}
-}
-/* End of file mhtml.class.php */
-/* Location: ./addons/mobile/classes/mhtml.class.php */

addons/mobile/classes/mobile.class.php

@@ -1,632 +0,0 @@
-<?php
-/**
- * Mobile XE Library Class ver 0.1
- * @author NAVER (developers@xpressengine.com) / lang_select : misol
- * @brief XE library for WAP tag output
- */
-class mobileXE
-{
-	// Base url
-	var $homeUrl = NULL;
-	var $upperUrl = NULL;
-	var $nextUrl = NULL;
-	var $prevUrl = NULL;
-	var $etcBtn = NULL;
-	// Variable for menu navigation
-	var $childs = null;
-	// Basic variable
-	var $title = NULL;
-	var $content = NULL;
-	var $mobilePage = 0;
-	var $totalPage = 1;
-	var $charset = 'UTF-8';
-	var $no = 0;
-	// Navigation-related variables
-	var $menu = null;
-	var $listed_items = null;
-	var $node_list = null;
-	var $index_mid = null;
-	// Navigation On/Off status value
-	var $navigationMode = 0;
-	// XE module information currently requested
-	var $module_info = null;
-	// Currently running instance of the module
-	var $oModule = null;
-
-	// Deck size
-	var $deckSize = 1024;
-	// Changing the language setting
-	var $languageMode = 0;
-	var $lang = null;
-	/**
-	 * @brief getInstance
-	 */
-	function &getInstance()
-	{
-		static $instance = null;
-
-		if(!$instance)
-		{
-
-			$browserType = mobileXE::getBrowserType();
-			if(!$browserType) return;
-
-			$class_file = sprintf('%saddons/mobile/classes/%s.class.php', _XE_PATH_, $browserType);
-			require_once($class_file);
-			// Download mobile language settings (cookies, not willing to come up when you click create cache file ...- is initialized ..)
-			$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			if($this->lang)
-			{
-				$lang_supported = Context::get('lang_supported');
-				$this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-				if(isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
-			}
-			Context::loadLang(_XE_PATH_.'addons/mobile/lang');
-
-			$instance = new wap();
-
-			$mobilePage = (int)Context::get('mpage');
-			if(!$mobilePage) $mobilePage = 1;
-
-			$instance->setMobilePage($mobilePage);
-		}
-		return $instance;
-	}
-
-	/**
-	 * @brief constructor
-	 */
-	function __construct()
-	{
-		// Check navigation mode
-		if(Context::get('nm'))
-		{
-			$this->navigationMode = 1;
-			$this->cmid = (int)Context::get('cmid');
-		}
-
-		if(Context::get('lcm'))
-		{
-			$this->languageMode = 1;
-			$this->lang = Context::get('sel_lang');
-		}
-	}
-
-	/**
-	 * @brief Check navigation mode
-	 * navigationMode settings and modules of information must be menu_srl return to navigation mode = true
-	 */
-	function isNavigationMode()
-	{
-		return ($this->navigationMode && $this->module_info->menu_srl)?true:false;
-	}
-
-	/**
-	 * @brief Check langchange mode
-	 * true return should be set languageMode
-	 */
-	function isLangChange()
-	{
-		if($this->languageMode) return true;
-		else return false;
-	}
-
-	/**
-	 * @brief Language settings
-	 * Cookies Since you set your phone to store language-specific file, file creation
-	 */
-	function setLangType()
-	{
-		$lang_supported = Context::get('lang_supported');
-		// Make sure that the language variables and parameters are valid
-		if($this->lang && isset($lang_supported[$this->lang]))
-		{
-			$langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			$langbuff = '<?php /**'.$this->lang.'**/ ?>';
-			FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
-		}
-	}
-
-	/**
-	 * @brief Information currently requested module settings
-	 */
-	function setModuleInfo(&$module_info)
-	{
-		if($this->module_info) return; 
-		$this->module_info = $module_info;
-	}
-
-	/**
-	 * @brief Set the module instance is currently running
-	 */
-	function setModuleInstance(&$oModule)
-	{
-		if($this->oModule) return;
-		// Save instance
-		$this->oModule = $oModule;
-		// Of the current module if there is a menu by menu
-		$menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
-		if(!file_exists($menu_cache_file)) return;
-
-		include $menu_cache_file;
-		// One-dimensional arrangement of menu changes
-		$this->getListedItems($menu->list, $listed_items, $node_list);
-
-		$this->listed_items = $listed_items;
-		$this->node_list = $node_list;
-		$this->menu = $menu->list;
-
-		$k = array_keys($node_list);
-		$v = array_values($node_list);
-		$this->index_mid = $k[0];
-		// The depth of the current menu, the top button to specify if one or more
-		$cur_menu_item = $listed_items[$node_list[$this->module_info->mid]];
-		if($cur_menu_item['parent_srl'])
-		{
-			$parent_srl = $cur_menu_item['parent_srl'];
-			if($parent_srl && $listed_items[$parent_srl])
-			{
-				$parent_item = $listed_items[$parent_srl];
-				if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), lang('cmd_go_upper'));
-			}
-		}
-		elseif (!$this->isNavigationMode())
-		{
-			$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), lang('cmd_view_sitemap'));
-		}
-	}
-
-	/**
-	 * @brief Access the browser's header to determine the return type of the browser
-	 * Mobile browser, if not null return
-	 */
-	function getBrowserType()
-	{
-		if(Context::get('smartphone')) return null;
-		// Determine the type of browser
-		$browserAccept = $_SERVER['HTTP_ACCEPT'];
-		$userAgent = $_SERVER['HTTP_USER_AGENT'];
-		$wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
-
-		if(stripos($userAgent, "SKT11") !== FALSE || stripos($browserAccept, "skt") !== FALSE)
-		{
-			Context::set('mobile_skt',1);
-			return "wml";
-		}
-		elseif(stripos($browserAccept, "hdml") !== FALSE) return "hdml";
-		elseif(stripos($userAgent, "cellphone") !== FALSE) return  "mhtml";
-		return null;
-	}
-
-	/**
-	 * @brief Specify charset
-	 */
-	function setCharSet($charset = 'UTF-8')
-	{
-		if(!$charset) $charset = 'UTF-8';
-		// SKT supports the euc-kr
-		if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
-
-		$this->charset = $charset;
-	}
-
-	/**
-	 * @brief Limited capacity of mobile devices, specifying a different virtual page
-	 */
-	function setMobilePage($page=1)
-	{
-		if(!$page) $page = 1;
-		$this->mobilePage = $page;
-	}
-
-	/**
-	 * @brief Mokrokhyeong child menu for specifying the data set
-	 */
-	function setChilds($childs)
-	{
-		// If more than nine the number of menu paging processing itself
-		$menu_count = count($childs);
-		if($menu_count>9)
-		{
-			$startNum = ($this->mobilePage-1)*9;
-			$idx = 0;
-			$new_childs = array();
-			foreach($childs as $k => $v)
-			{
-				if($idx >= $startNum && $idx < $startNum+9)
-				{
-					$new_childs[$k] = $v;
-				}
-				$idx ++;
-			}
-			$childs = $new_childs;
-
-			$this->totalPage = (int)(($menu_count-1)/9)+1;
-			// next/prevUrl specify
-			if($this->mobilePage>1)
-			{
-				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-				$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
-				$this->setPrevUrl($url, $text);
-			}
-
-			if($this->mobilePage<$this->totalPage)
-			{
-				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-				$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
-				$this->setNextUrl($url, $text);
-			}
-		} 
-		$this->childs = $childs;
-	}
-
-	/**
-	 * @brief Check the menu to be output
-	 */
-	function hasChilds()
-	{
-		return count($this->childs)?true:0;
-	}
-
-	/**
-	 * @brief Returns the child menu
-	 */
-	function getChilds()
-	{
-		return $this->childs;
-	}
-
-	/**
-	 * @brief Specify title
-	 */
-	function setTitle($title)
-	{
-		$oModuleController = getController('module');
-		$this->title = $title;
-		$oModuleController->replaceDefinedLangCode($this->title);
-	}
-
-	/**
-	 * @brief return title
-	 */
-	function getTitle()
-	{
-		return $this->title;
-	}
-
-	/**
-	 * @brief Content Cleanup
-	 * In HTML content, the ability to extract text and links
-	 */
-	function setContent($content)
-	{
-		$oModuleController = getController('module');
-		$allow_tag_array = array('<a>','<br>','<p>','<b>','<i>','<u>','<em>','<small>','<strong>','<big>','<table>','<tr>','<td>');
-		// Links/wrap, remove all tags except gangjoman
-		$content = strip_tags($content, implode($allow_tag_array));
-		// Margins tab removed
-		$content = str_replace("\t", "", $content);
-		// Repeat two more times the space and remove julnanumeul
-		$content = preg_replace('/( ){2,}/s', '', $content);
-		$content = preg_replace("/([\r\n]+)/s", "\r\n", $content);
-		$content = preg_replace(array("/<a/i","/<\/a/i","/<b/i","/<\/b/i","/<br/i"),array('<a','</a','<b','</b','<br'),$content);
-		$content = str_replace(array("<br>","<br />"), array("<br/>","<br/>"), $content);
-
-		while(strpos($content, '<br/><br/>'))
-		{
-			$content = str_replace('<br/><br/>','<br/>',$content);
-		}
-		// If the required size of a deck of mobile content to write down all the dividing pages
-		$contents = array();
-		while($content)
-		{
-			$tmp = $this->cutStr($content, $this->deckSize, '');
-			$contents[] = $tmp;
-			$content = substr($content, strlen($tmp));
-
-			//$content = str_replace(array('&','<','>','"','&amp;nbsp;'), array('&amp;','&lt;','&gt;','&quot;',' '), $content);
-
-			foreach($allow_tag_array as $tag)
-			{
-				if($tag == '<br>') continue;
-				$tag_open_pos = strpos($content, str_replace('>','',$tag));
-				$tag_close_pos = strpos($content, str_replace('<','</',$tag));
-				if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
-				{
-					$contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + strlen($tag) + 1);
-					$content = substr($content, $tag_close_pos + strlen($tag) + 1);
-				}
-			}
-
-			$tag_open_pos = strpos($content, '&');
-			$tag_close_pos = strpos($content, ';');
-			if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
-			{
-				$contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + 1);
-				$content = substr($content, $tag_close_pos + 1);
-			}
-		}
-
-		$this->totalPage = count($contents);
-		// next/prevUrl specify
-		if($this->mobilePage>1)
-		{
-			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-			$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
-			$this->setPrevUrl($url, $text);
-		}
-
-		if($this->mobilePage<$this->totalPage)
-		{
-			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-			$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
-			$this->setNextUrl($url, $text);
-		}
-
-		$this->content = $contents[$this->mobilePage-1];
-		$oModuleController->replaceDefinedLangCode($this->content);
-		$content = str_replace(array('$','\''), array('$$','&apos;'), $content);
-	}
-
-	/**
-	 * @brief cutting the number of byte functions
-	 */
-	function cutStr($string, $cut_size)
-	{
-		return preg_match('/.{'.$cut_size.'}/su', $string, $arr) ? $arr[0] : $string; 
-	}
-
-	/**
-	 * @brief Return content
-	 */
-	function getContent()
-	{
-		return $this->content;
-	}
-
-	/**
-	 * @brief Specifies the home url
-	 */
-	function setHomeUrl($url, $text)
-	{
-		if(!$url) $url = '#';
-		$this->homeUrl->url = $url;
-		$this->homeUrl->text = $text;
-	}
-
-	/**
-	 * @brief Specify upper url
-	 */
-	function setUpperUrl($url, $text)
-	{
-		if(!$url) $url = '#';
-		$this->upperUrl->url = $url;
-		$this->upperUrl->text = $text;
-	}
-
-	/**
-	 * @brief Specify prev url
-	 */
-	function setPrevUrl($url, $text)
-	{
-		if(!$url) $url = '#';
-		$this->prevUrl->url = $url;
-		$this->prevUrl->text = $text;
-	}
-
-	/**
-	 * @brief Specify next url
-	 */
-	function setNextUrl($url, $text)
-	{
-		if(!$url) $url = '#';
-		$this->nextUrl->url = $url;
-		$this->nextUrl->text = $text;
-	}
-
-	/**
-	 * @brief Next, Previous, Top button assignments other than
-	 */
-	function setEtcBtn($url, $text)
-	{
-		if(!$url) $url = '#';
-		$etc['url'] = $url;
-		$etc['text'] = htmlspecialchars($text);
-		$this->etcBtn[] = $etc;
-	}
-
-	/**
-	 * @brief display
-	 */
-	function display()
-	{
-		// Home button assignments
-		$this->setHomeUrl(getUrl(), lang('cmd_go_home'));
-		// Specify the title
-		if(!$this->title) $this->setTitle(Context::getBrowserTitle());
-
-		ob_start();
-		// Output header
-		$this->printHeader();
-		// Output title
-		$this->printTitle();
-		// Information output
-		$this->printContent();
-		// Button output
-		$this->printBtn();
-		// Footer output
-		$this->printFooter();
-
-		$content = ob_get_clean();
-		// After conversion output
-		if(strtolower($this->charset) == 'utf-8') print $content;
-		else print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
-
-		exit();
-	}
-
-	/**
-	 * @brief Move page
-	 */
-	function movepage($url)
-	{
-		header("location:$url");
-		exit();
-	}
-
-	/**
-	 * @brief And returns a list of serial numbers in
-	 */
-	function getNo()
-	{
-		$this->no++;
-		$str = $this->no;
-		return $str;
-	}
-
-	/**
-	 * @brief XE is easy to use Menu module is relieved during the function, value
-	 */
-	function getListedItems($menu, &$listed_items, &$node_list)
-	{
-		if(!count($menu)) return;
-		foreach($menu as $node_srl => $item)
-		{
-			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url']))
-			{
-				$mid = $item['mid'] = $item['url'];
-				$node_list[$mid] = $node_srl;
-			}
-			else
-			{
-				$mid = $item['mid'] = null;
-			}
-
-			$listed_items[$node_srl] = $item;
-			$this->getListedItems($item['list'], $listed_items, $node_list);
-		}
-	}
-
-	/**
-	 * @brief XE navigation output
-	 */
-	function displayNavigationContent()
-	{
-		$childs = array();
-
-		if($this->cmid)
-		{
-			$cur_item = $this->listed_items[$this->cmid];
-			$upper_srl = $cur_item['parent_srl'];;
-			$list = $cur_item['list'];;
-			$this->setUpperUrl(getUrl('cmid',$upper_srl), lang('cmd_go_upper'));
-			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
-			{
-				$obj = array();
-				$obj['href'] = getUrl('','mid',$cur_item['url']);
-				$obj['link'] = $obj['text'] = '['.$cur_item['text'].']';
-				$childs[] = $obj;
-			}
-
-		}
-		else
-		{
-			$list = $this->menu;
-			$upper_srl = 0;
-		}
-
-		if(count($list))
-		{
-			foreach($list as $key => $val)
-			{
-				if(!$val['text']) continue;
-				$obj = array();
-				if(!count($val['list']))
-				{
-					$obj['href'] = getUrl('','mid',$val['url']);
-				}
-				else
-				{
-					$obj['href'] = getUrl('cmid',$val['node_srl']);
-				}
-				$obj['link'] = $obj['text'] = $val['text'];
-				$childs[] = $obj;
-			}
-			$this->setChilds($childs);
-		}
-		// Output
-		$this->display();
-	}
-
-	/**
-	 * @brief Language Settings menu, the output
-	 */
-	function displayLangSelect()
-	{
-		$childs = array();
-
-		$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-		if($this->lang)
-		{
-			$this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-			Context::setLangType($this->lang);
-		}
-		$lang_supported = Context::get('lang_supported');
-		$lang_type = Context::getLangType();
-		$obj = array();
-		$obj['link'] = $obj['text'] = lang('president_lang').' : '.$lang_supported[$lang_type];
-		$obj['href'] = getUrl('sel_lang',$lang_type);
-		$childs[] = $obj;
-
-		if(is_array($lang_supported))
-		{
-			foreach($lang_supported as $key => $val)
-			{
-				$obj = array();
-				$obj['link'] = $obj['text'] = $val;
-				$obj['href'] = getUrl('sel_lang',$key);
-				$childs[] = $obj;
-			}
-		}
-
-		$this->setChilds($childs);
-
-		$this->display();
-	}
-
-	/**
-	 * @brief Module to create a class object of the WAP WAP ready
-	 */
-	function displayModuleContent()
-	{
-		// Create WAP class objects of the selected module
-		$oModule = &getWap($this->module_info->module);
-		if(!$oModule || !method_exists($oModule, 'procWAP') ) return;
-
-		$vars = get_object_vars($this->oModule);
-		if(count($vars)) foreach($vars as $key => $val) $oModule->{$key}  = $val;
-		// Run
-		$oModule->procWAP($this);
-		// Output
-		$this->display();
-	}
-
-	/**
-	 * @brief WAP content is available as a separate output if the final results
-	 */
-	function displayContent()
-	{
-		Context::set('layout','none');
-		// Compile a template
-		$oTemplate = new TemplateHandler();
-		$oContext = &Context::getInstance();
-
-		$content = $oTemplate->compile($this->oModule->getTemplatePath(), $this->oModule->getTemplateFile());
-		$this->setContent($content);
-		// Output
-		$this->display();
-	}
-}
-/* End of file mobile.class.php */
-/* Location: ./addons/mobile/classes/mobile.class.php */

addons/mobile/classes/wml.class.php

@@ -1,127 +0,0 @@
-<?php
-/**
- * WML Library ver 0.1
- * @author NAVER (developers@xpressengine.com) / lang_select : misol
- */
-class wap extends mobileXE
-{
-	/**
-	 * @brief constructor
-	 */
-	function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * @brief wml header output
-	 */
-	function printHeader()
-	{
-		header("Content-Type: text/vnd.wap.wml");
-		header("charset: ".$this->charset);
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		print("<?xml version=\"1.0\" encoding=\"".$this->charset."\"?><!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
-		// Card Title
-		printf("<wml>\n<card title=\"%s%s\">\n<p>\n",htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-	}
-
-	/**
-	 * @brief Output title
-	 */
-	function printTitle()
-	{
-		if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-		printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),htmlspecialchars($titlePageStr, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),"\n");
-	}
-
-	/**
-	 * @brief Output information
-	 * hasChilds() if there is a list of content types, otherwise output
-	 */
-	function printContent()
-	{
-		if($this->hasChilds())
-		{
-			foreach($this->getChilds() as $key => $val)
-			{
-				if(!$val['link']) continue;
-				printf('<do type="%s" label="%s"><go href="%s" /></do>%s', $this->getNo(), htmlspecialchars($val['text'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $val['href'], "\n");
-				if($val['extra']) printf("%s\n",$val['extra']);
-			}
-		}
-		else
-		{
-			printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
-		}
-		print('<br/>');
-	}
-
-	/**
-	 * @brief Button to output
-	 */
-	function printBtn()
-	{
-		if($this->nextUrl)
-		{
-			$url = $this->nextUrl;
-			printf('<do type="vnd.next" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-		}
-		if($this->prevUrl)
-		{
-			$url = $this->prevUrl;
-			printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-		}
-		// Others are not applicable in charge of the button output (array passed) type??
-		if($this->etcBtn)
-		{
-			if(is_array($this->etcBtn))
-			{
-				foreach($this->etcBtn as $key=>$val)
-				{
-					printf('<do type="vnd.btn%s" label="%s"><go href="%s"/></do>%s', $key, $val['text'], $val['url'], "\n");
-				}
-			}
-		}
-		// Select Language
-		if(!parent::isLangChange())
-		{
-			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.lang('select_lang'), $url, "\n");
-		}
-		else
-		{
-			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', lang('lang_return'), Context::get('return_uri'), "\n");
-		}
-		if($this->homeUrl)
-		{
-			$url = $this->homeUrl;
-			printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-		}
-		if($this->upperUrl)
-		{
-			$url = $this->upperUrl;
-			printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-		}
-	}
-	// Footer information output
-	function printFooter()
-	{
-		print("</p>\n</card>\n</wml>");
-	}
-	// And returns a list of serial numbers in
-	function getNo()
-	{
-		if(Context::get('mobile_skt')==1)
-		{
-			return "vnd.skmn".parent::getNo();
-		}
-		else
-		{
-			return parent::getNo();
-		}
-		return $str;
-	}
-}
-/* End of file wml.class.php */
-/* Location: ./addons/mobile/classes/wml.class.php */

addons/mobile/conf/info.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">모바일XE 애드온</title>
-    <title xml:lang="jp">モバイルXEアドオン</title>
-    <title xml:lang="zh-CN">手机XE插件</title>
-    <title xml:lang="en">Mobile XE</title>
-    <title xml:lang="vi">Mobile XE</title>
-    <title xml:lang="ru">Mobile XE</title>
-    <title xml:lang="zh-TW">XE行動上網</title>
-    <description xml:lang="ko">
-        모바일에서 접속시 헤더 정보를 분석하여 WAP 태그로 출력하는 애드온입니다.
-        wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
-    </description>
-    <description xml:lang="jp">
-        モバイル端末機からアクセス時、ヘッダー（header）情報を分析して「メニュー」と「モジュール」の関係を利用してWAPタグに変換表示するアドオンです。
-        wml, hdml, mhtmlをサポートし、その以外は対応していません。
-    </description>
-    <description xml:lang="zh-CN">
-        通过手机访问网站时将网页输出为WAP标签的插件。
-        支持语言：wml, hdml, mhtml
-    </description>
-    <description xml:lang="en">
-        This addon displays WAP tag by analyzing header information on mobile connection.
-        Only wml, hdml, mhtml formats are provided.
-    </description>
-    <description xml:lang="vi">
-        Addon này hiển thị WAP Tag bởi việc phân tích thông tin khi kết nối bằng di động.
-        Chỉ hỗ trợ cho các định dạng wml, hdml, mhtml.
-    </description>
-    <description xml:lang="ru">
-        Данный аддон показывает WAP теги, анализирую информацию мобильного соединения.
-        Поддерживаются только wml, hdml, mhtml форматы.
-    </description>
-    <description xml:lang="zh-TW">
-        透過行動工具上網時，會將網頁轉換為WAP標籤顯示。
-        只限於 wml, hdml, mhtml格式。
-    </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-		<name xml:lang="ru">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
-    </author>
-
-    <history version="0.1.1" date="2009-05-23">
-        <author email_address="misol221@paran.com" link="http://www.imsoo.net">
-            <name xml:lang="ko">misol</name>
-            <name xml:lang="jp">misol</name>
-            <name xml:lang="zh-CN">misol</name>
-            <name xml:lang="en">misol</name>
-            <name xml:lang="vi">misol</name>
-	    	<name xml:lang="ru">misol</name>
-            <name xml:lang="zh-TW">misol</name>
-        </author>
-        <log>언어선택 추가(WML, mHTML)</log>
-        <log>인코딩 설정 개선</log>
-        <log>그 외 소소한 개선들</log>
-    </history>
-
-    <extra_vars>
-        <var name="charset">
-            <title xml:lang="ko">문자셋</title>
-            <title xml:lang="jp">文字コード</title>
-            <title xml:lang="zh-CN">编码</title>
-            <title xml:lang="en">Charset</title>
-            <title xml:lang="vi">Charset</title>
-	    	<title xml:lang="ru">Charset</title>
-            <title xml:lang="zh-TW">編碼</title>
-            <description xml:lang="ko">모바일 기기의 경우 UTF-8 문자셋을 인식하지 못할 수 있습니다. 문자셋에 원하는 문자셋을 입력하면 자동으로 변환하여 출력하여 모바일에서 이상없이 출력하도록 합니다. 기본값은 UTF-8입니다. (*SK Telecom 휴대전화의 경우 euc-kr인코딩만 지원하므로, 강제로 euc-kr인코딩만 지원합니다.)</description>
-            <description xml:lang="jp">ある特定のモバイル機器ではutf-8文字コードの認識が出来ない場合があります。文字コードを設定すると、（日本語だけの場合）該当文字コードに自動変換して正常に表示出来るようになります。本アドオンのデフォルト値はUTF-8で、日本の携帯はshift-jisが一般的です。</description>
-            <description xml:lang="zh-CN">手机有时无法识别utf-8编码，这时输入相应的编码值即可自动转换。默认编码为UTF-8。</description>
-            <description xml:lang="en">utf-8 may be read with mobile tools. Mobile tools will display correct charset when you input charset you want. Default charset is UTF-8.</description>
-            <description xml:lang="vi">UTF-8 không thể đọc được cho các công cụ di động. Những công cụ di động sẽ trình bày Charset đúng khi bạn nhập vào Charset bạn muốn. Charset mặc định là UTF-8.</description>
-	    	<description xml:lang="ru">utf-8 may be read with mobile tools. Mobile tools will display correct charset when you input charset you want. Default charset is UTF-8.</description>
-            <description xml:lang="zh-TW">行動工具無法讀取utf-8編碼。當您輸入所想要的編碼時，行動工具將會正確的顯示。預設編碼是UTF-8.</description>
-        </var>
-    </extra_vars>
-</addon>

addons/mobile/lang/en.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = 'Selected Language';
-$lang->select_lang = 'Select Language';
-$lang->lang_return = 'Go Back';
-$lang->cmd_go_upper = 'Upper';
-$lang->cmd_go_home = 'Go Home';
-$lang->cmd_view_sitemap = 'View site map';

addons/mobile/lang/ja.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = '現在言語';
-$lang->select_lang = '言語選択';
-$lang->lang_return = '戻る';
-$lang->cmd_go_upper = '上位メニュー';
-$lang->cmd_go_home = 'トップへ';
-$lang->cmd_view_sitemap = 'サイトマップ';

addons/mobile/lang/ko.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = '현재 언어';
-$lang->select_lang = '언어 선택';
-$lang->lang_return = '돌아가기';
-$lang->cmd_go_upper = '상위';
-$lang->cmd_go_home = '홈으로';
-$lang->cmd_view_sitemap = '사이트맵 보기';

addons/mobile/lang/ru.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = 'Дейсвующй язык';
-$lang->select_lang = 'Выбор языка';
-$lang->lang_return = 'Вернуться';
-$lang->cmd_go_upper = 'Вверх';
-$lang->cmd_go_home = 'На главную страницу';
-$lang->cmd_view_sitemap = 'Посмотреть карту сайта';

addons/mobile/lang/vi.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = 'Chọn ngôn ngữ';
-$lang->select_lang = 'Chọn ngôn ngữ';
-$lang->lang_return = 'Trở lại';
-$lang->cmd_go_upper = 'Lên trên';
-$lang->cmd_go_home = 'Về trang chủ';
-$lang->cmd_view_sitemap = 'Xem sơ đồ Web';

addons/mobile/lang/zh-CN.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = '已选择语言';
-$lang->select_lang = '选择语言';
-$lang->lang_return = '返回';
-$lang->cmd_go_upper = '上一级';
-$lang->cmd_go_home = '首页';
-$lang->cmd_view_sitemap = '网站地图';

addons/mobile/lang/zh-TW.php

@@ -1,7 +0,0 @@
-<?php
-$lang->president_lang = '已選擇語言';
-$lang->select_lang = '選擇語言';
-$lang->lang_return = '返回';
-$lang->cmd_go_upper = '回上頁';
-$lang->cmd_go_home = '回首頁';
-$lang->cmd_view_sitemap = '網站地圖';

addons/mobile/mobile.addon.php

@@ -1,77 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-	exit();
-
-/**
- * @file mobile.addon.php
- * @author NAVER (developers@xpressengine.com)
- * @brief Mobile XE add-on
- *
- * If a mobile connection is made (see the header information), display contents with WAP tags
- *
- * Time to call
- *
- * before_module_proc > call when changing general settings for mobile
- *
- * after_module_proc > display mobile content
- * Condition
- * */
-// Ignore admin page
-if(Context::get('module') == 'admin')
-{
-	return;
-}
-// Manage when to call it
-if($called_position != 'before_module_proc' && $called_position != 'after_module_proc')
-{
-	return;
-}
-// Ignore if not mobile browser
-require_once(_XE_PATH_ . 'addons/mobile/classes/mobile.class.php');
-if(!mobileXE::getBrowserType())
-{
-	return;
-}
-// Generate mobile instance
-$oMobile = &mobileXE::getInstance();
-if(!$oMobile)
-{
-	return;
-}
-// Specify charset on the add-on settings 
-$oMobile->setCharSet($addon_info->charset);
-// Set module information
-$oMobile->setModuleInfo($this->module_info);
-// Register the current module object
-$oMobile->setModuleInstance($this);
-
-// Extract content and display/exit if navigate mode is or if WAP class exists
-if($called_position == 'before_module_proc')
-{
-	if($oMobile->isLangChange())
-	{
-		$oMobile->setLangType();
-		$oMobile->displayLangSelect();
-	}
-	// On navigation mode, display navigation content
-	if($oMobile->isNavigationMode())
-	{
-		$oMobile->displayNavigationContent();
-	}
-	// If you have a WAP class content output via WAP class
-	else
-	{
-		$oMobile->displayModuleContent();
-	}
-	// If neither navigation mode nor WAP class is, display the module's result
-}
-else if($called_position == 'after_module_proc')
-{
-	// Display
-	$oMobile->displayContent();
-}
-
-/* End of file mobile.addon.php */
-/* Location: ./addons/mobile/mobile.addon.php */

addons/oembed/conf/info.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-	<title xml:lang="ko">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="jp">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="en">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="vi">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="zh-CN">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="es">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="ru">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="ge">자동 embed 삽입 애드온(oEmbed)</title>
-	<title xml:lang="zh-TW">자동 embed 삽입 애드온(oEmbed)</title>
-	<version>1.0</version>
-	<date>2014-01-15</date>
-
-	<author email_address="developers@xpressengine.com" link="http://www.xpressengine.com/">
-		<name xml:lang="ko">NAVER</name>
-		<name xml:lang="jp">NAVER</name>
-		<name xml:lang="en">NAVER</name>
-		<name xml:lang="vi">NAVER</name>
-		<name xml:lang="zh-CN">NAVER</name>
-		<name xml:lang="es">NAVER</name>
-		<name xml:lang="ru">NAVER</name>
-		<name xml:lang="ge">NAVER</name>
-		<name xml:lang="zh-TW">NAVER</name>
-	</author>
-</addon>

addons/oembed/jquery.oembed.css

@@ -1,423 +0,0 @@
-div.oembedall-githubrepos  {
-	border: 1px solid #DDD;
-	border-radius: 4px 4px 4px 4px;
-	list-style-type: none;
-	margin: 0 0 10px;
-	padding: 8px 10px 0;
-	font: 13.34px/1.4 helvetica,arial,freesans,clean,sans-serif;
-	/*background: url("http://github.com/images/icons/public.png") no-repeat scroll 6px 9px transparent;*/
-	width : 452px;
-	background-color:#fff;
-}
-
-div.oembedall-githubrepos .oembedall-body {
-	background: -moz-linear-gradient(center top , #FAFAFA, #EFEFEF) repeat scroll 0 0 transparent;
-	background:  -webkit-gradient(linear,left top,left bottom,from(#FAFAFA),to(#EFEFEF));;
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	border-top: 1px solid #EEE;
-	margin-left: -10px;
-	margin-top: 8px;
-	padding: 5px 10px;
-	width: 100%;
-}
-
-div.oembedall-githubrepos h3 {
-	font-size: 14px;
-	margin: 0;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-div.oembedall-githubrepos p.oembedall-description {
-	color: #444;
-	font-size: 12px;
-	margin: 0 0 3px;
-}
-
-div.oembedall-githubrepos p.oembedall-updated-at {
-	color: #888;
-	font-size: 11px;
-	margin: 0;
-}
-
-div.oembedall-githubrepos ul.oembedall-repo-stats {
-	/*background: url("http://github.com/images/modules/pagehead/actions_fade.png") no-repeat scroll 0 0 transparent;*/
-	border: medium none;
-	float: right;
-	font-size: 11px;
-	font-weight: bold;
-	padding-left: 15px;
-	position: relative;
-	z-index: 5;
-	margin:0;
-}
-div.oembedall-githubrepos ul.oembedall-repo-stats li {
-	border: medium none;
-	color: #666;
-	display: inline-block;
-	list-style-type: none;
-	margin: 0 !important;
-}
-div.oembedall-githubrepos ul.oembedall-repo-stats li a {
-	background-color: transparent;
-	background-position: 5px -2px;
-	border: medium none;
-	color: #666 !important;
-	background-position: 5px -2px;
-	background-repeat: no-repeat;
-	border-left: 1px solid #DDD;
-	display: inline-block;
-	height: 21px;
-	line-height: 21px;
-	padding: 0 5px 0 23px;
-}
-
-
-div.oembedall-githubrepos ul.oembedall-repo-stats li:first-child a {
-	border-left: medium none;
-	margin-right: -3px;
-}
-div.oembedall-githubrepos ul.oembedall-repo-stats li a:hover {
-	background: none no-repeat scroll 5px -27px #4183C4;
-	color: #FFFFFF !important;
-	text-decoration: none;
-}
-div.oembedall-githubrepos ul.oembedall-repo-stats li:first-child a:hover {
-	border-bottom-left-radius: 3px;
-	border-top-left-radius: 3px;
-}
-ul.oembedall-repo-stats li:last-child a:hover {
-	border-bottom-right-radius: 3px;
-	border-top-right-radius: 3px;
-}
-div.oembedall-githubrepos ul.oembedall-repo-stats li.oembedall-watchers a {
-	/*background-image: url("http://github.com/images/modules/pagehead/repostat_watchers.png");*/
-}
-
-div.oembedall-githubrepos ul.oembedall-repo-stats li.oembedall-forks a {
-	/*background-image: url("http://github.com/images/modules/pagehead/repostat_forks.png");*/
-}
-
-
-span.oembedall-closehide{
-	background-color: #EEE;
-	border-radius: 2px;
-	cursor: pointer;
-	margin-right: 3px;
-	padding: 0 3px;
-}
-
-div.oembedall-container {
-	margin-top : 5px;
-	text-align: left;
-}
-
-.oembedall-ljuser {
-	font-weight: bold;
-}
-
-.oembedall-ljuser img {
-	vertical-align: bottom;
-	border: 0;
-	padding-right: 1px;
-}
-
-.oembedall-stoqembed {
-	border-bottom: 1px dotted #999999;
-	float: left;
-	overflow: hidden;
-	padding: 11px 0;
-	width: 730px;
-	line-height: 1;
-	background: none repeat scroll 0 0 #FFFFFF;
-	color: #000000;
-	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
-	font-size: 80%;
-	text-align: left;
-	margin: 0;
-	padding: 0;
-}
-
-.oembedall-stoqembed a {
-	color: #0077CC;
-	text-decoration: none;
-	margin: 0;
-	padding: 0;
-}
-.oembedall-stoqembed a:hover {
-	text-decoration: underline;
-}
-.oembedall-stoqembed a:visited {
-	color: #4A6B82;
-}
-
-.oembedall-stoqembed h3 {
-	font-family: Trebuchet MS,Liberation Sans,DejaVu Sans,sans-serif;
-	font-size: 130%;
-	font-weight: bold;
-	margin: 0;
-	padding: 0;
-}
-
-.oembedall-stoqembed .oembedall-reputation-score {
-	color: #444444;
-	font-size: 120%;
-	font-weight: bold;
-	margin-right: 2px;
-}
-
-
-.oembedall-stoqembed .oembedall-user-info {
-	height: 35px;
-	width: 185px;
-}
-.oembedall-stoqembed .oembedall-user-info .oembedall-user-gravatar32 {
-	float: left;
-	height: 32px;
-	width: 32px;
-}
-
-.oembedall-stoqembed .oembedall-user-info .oembedall-user-details {
-	float: left;
-	margin-left: 5px;
-	overflow: hidden;
-	white-space: nowrap;
-	width: 145px;
-}
-
-.oembedall-stoqembed .oembedall-question-hyperlink {
-	font-weight: bold;
-}
-
-.oembedall-stoqembed .oembedall-stats {
-	background: none repeat scroll 0 0 #EEEEEE;
-	margin: 0 0 0 7px;
-	padding: 4px 7px 6px;
-	width: 58px;
-}
-.oembedall-stoqembed .oembedall-statscontainer {
-	float: left;
-	margin-right: 8px;
-	width: 86px;
-}
-
-.oembedall-stoqembed .oembedall-votes {
-	color: #555555;
-	padding: 0 0 7px;
-	text-align: center;
-}
-
-.oembedall-stoqembed .oembedall-vote-count-post {
-	display: block;
-	font-size: 240%;
-	color: #808185;
-	display: block;
-	font-weight: bold;
-}
-
-
-.oembedall-stoqembed .oembedall-views {
-	color: #999999;
-	padding-top: 4px;
-	text-align: center;
-}
-
-.oembedall-stoqembed .oembedall-status {
-	margin-top: -3px;
-	padding: 4px 0;
-	text-align: center;
-	background: none repeat scroll 0 0 #75845C;
-	color: #FFFFFF;
-}
-
-.oembedall-stoqembed .oembedall-status strong {
-	color: #FFFFFF;
-	display: block;
-	font-size: 140%;
-}
-
-
-.oembedall-stoqembed .oembedall-summary {
-	float: left;
-	width: 635px;
-}
-
-.oembedall-stoqembed .oembedall-excerpt {
-	line-height: 1.2;
-	margin: 0;
-	padding: 0 0 5px;
-}
-
-.oembedall-stoqembed .oembedall-tags {
-	float: left;
-	line-height: 18px;
-}
-.oembedall-stoqembed .oembedall-tags a:hover {
-	text-decoration: none;
-}
-
-.oembedall-stoqembed .oembedall-post-tag {
-	background-color: #E0EAF1;
-	border-bottom: 1px solid #3E6D8E;
-	border-right: 1px solid #7F9FB6;
-	color: #3E6D8E;
-	font-size: 90%;
-	line-height: 2.4;
-	margin: 2px 2px 2px 0;
-	padding: 3px 4px;
-	text-decoration: none;
-	white-space: nowrap;
-}
-.oembedall-stoqembed .oembedall-post-tag:hover {
-	background-color: #3E6D8E;
-	border-bottom: 1px solid #37607D;
-	border-right: 1px solid #37607D;
-	color: #E0EAF1;
-}
-
-
-.oembedall-stoqembed .oembedall-fr {
-	float: right;
-}
-
-.oembedall-stoqembed .oembedall-statsarrow {
-	background-image: url("http://cdn.sstatic.net/stackoverflow/img/sprites.png?v=3");
-	background-repeat: no-repeat;
-	overflow: hidden;
-	background-position: 0 -435px;
-	float: right;
-	height: 13px;
-	margin-top: 12px;
-	width: 7px;
-}
-
-.oembedall-facebook1 {
-	border: #1A3C6C solid 1px;
-	padding:0px;
-	font: 13.34px/1.4 verdana;
-	width : 500px;
-
-}
-
-.oembedall-facebook2 {
-	background-color: #627add;
-}
-.oembedall-facebook2 a {
-	color: #e8e8e8;
-	text-decoration:none;
-}
-
-.oembedall-facebookBody {
-	background-color: #fff;
-	vertical-align: top;
-	padding: 5px;
-}
-
-.oembedall-facebookBody .contents {
-	display: inline-block;
-	width: 100%;
-}
-
-.oembedall-facebookBody div img {
-	float: left;
-	margin-right: 5px;
-}
-
-div.oembedall-lanyard{
-	-webkit-box-shadow: none;
-	-webkit-transition-delay: 0s;
-	-webkit-transition-duration: 0.4000000059604645s;
-	-webkit-transition-property: width;
-	-webkit-transition-timing-function: cubic-bezier(0.42, 0, 0.58, 1);
-	background-attachment: scroll;
-	background-clip: border-box;
-	background-color: transparent;
-	background-image: none;
-	background-origin: padding-box;
-	border-bottom-width: 0px;
-	border-left-width: 0px;
-	border-right-width: 0px;
-	border-top-width: 0px;
-	box-shadow: none;
-	color: #112644;
-	display: block;
-	float: left;
-	font-family: 'Trebuchet MS', Trebuchet, sans-serif;
-	font-size: 16px;
-	height: 253px;
-	line-height: 19px;
-	margin-bottom: 0px;
-	margin-left: 0px;
-	margin-right: 0px;
-	margin-top: 0px;
-	max-width: none;
-	min-height: 0px;
-	outline-color: #112644;
-	outline-style: none;
-	outline-width: 0px;
-	overflow-x: visible;
-	overflow-y: visible;
-	padding-bottom: 0px;
-	padding-left: 0px;
-	padding-right: 0px;
-	padding-top: 0px;
-	position: relative;
-	text-align: left;
-	vertical-align: baseline;
-	width: 804px;
-}
-
-div.oembedall-lanyard .tagline{
-	font-size: 1.5em;
-}
-
-div.oembedall-lanyard .wrapper{
-	overflow: hidden;
-	clear: both;
-}
-div.oembedall-lanyard .split{
-	float: left;
-	display: inline;
-
-}
-
-div.oembedall-lanyard .prominent-place .flag:link, div.oembedall-lanyard .prominent-place .flag:visited,div.oembedall-lanyard .prominent-place .flag:hover
-,div.oembedall-lanyard .prominent-place .flag:focus,div.oembedall-lanyard .prominent-place .flag:active {
-	float: left;
-	display: block;
-	width: 48px;
-	height: 48px;
-	position: relative;
-	top: -5px;
-	margin-right: 10px;
-}
-
-div.oembedall-lanyard .place-context {
-	font-size: 0.889em;
-}
-
-div.oembedall-lanyard .prominent-place .sub-place {
-	display: block;
-}
-
-div.oembedall-lanyard .prominent-place{
-	font-size: 1.125em;
-	line-height: 1.1em;
-	font-weight: normal;
-
-}
-
-div.oembedall-lanyard .main-date{
-	color: #8CB4E0;
-	font-weight: bold;
-	line-height: 1.1;
-
-}
-
-div.oembedall-lanyard .first{
-	margin-left: 0;
-	width: 48.57%;
-	margin: 0 0 0 2.857%;
-
-}

addons/oembed/jquery.oembed.js

@@ -1,956 +0,0 @@
-/*!
- * jquery oembed plugin
- *
- * Copyright (c) 2009 Richard Chamorro
- * Licensed under the MIT license
- *
- * Orignal Author: Richard Chamorro
- * Forked by Andrew Mee to Provide a slightly diffent kind of embedding experience
- */
-(function ($) {
-    $.fn.oembed = function (url, options, embedAction) {
-
-        settings = $.extend(true, $.fn.oembed.defaults, options);
-        var shortURLList = ["0rz.tw", "1link.in", "1url.com", "2.gp", "2big.at", "2tu.us", "3.ly", "307.to", "4ms.me", "4sq.com", "4url.cc", "6url.com", "7.ly", "a.gg", "a.nf", "aa.cx", "abcurl.net",
-            "ad.vu", "adf.ly", "adjix.com", "afx.cc", "all.fuseurl.com", "alturl.com", "amzn.to", "ar.gy", "arst.ch", "atu.ca", "azc.cc", "b23.ru", "b2l.me", "bacn.me", "bcool.bz", "binged.it",
-            "bit.ly", "bizj.us", "bloat.me", "bravo.ly", "bsa.ly", "budurl.com", "canurl.com", "chilp.it", "chzb.gr", "cl.lk", "cl.ly", "clck.ru", "cli.gs", "cliccami.info",
-            "clickthru.ca", "clop.in", "conta.cc", "cort.as", "cot.ag", "crks.me", "ctvr.us", "cutt.us", "dai.ly", "decenturl.com", "dfl8.me", "digbig.com",
-            "http:\/\/digg\.com\/[^\/]+$", "disq.us", "dld.bz", "dlvr.it", "do.my", "doiop.com", "dopen.us", "easyuri.com", "easyurl.net", "eepurl.com", "eweri.com",
-            "fa.by", "fav.me", "fb.me", "fbshare.me", "ff.im", "fff.to", "fire.to", "firsturl.de", "firsturl.net", "flic.kr", "flq.us", "fly2.ws", "fon.gs", "freak.to",
-            "fuseurl.com", "fuzzy.to", "fwd4.me", "fwib.net", "g.ro.lt", "gizmo.do", "gl.am", "go.9nl.com", "go.ign.com", "go.usa.gov", "goo.gl", "goshrink.com", "gurl.es",
-            "hex.io", "hiderefer.com", "hmm.ph", "href.in", "hsblinks.com", "htxt.it", "huff.to", "hulu.com", "hurl.me", "hurl.ws", "icanhaz.com", "idek.net", "ilix.in", "is.gd",
-            "its.my", "ix.lt", "j.mp", "jijr.com", "kl.am", "klck.me", "korta.nu", "krunchd.com", "l9k.net", "lat.ms", "liip.to", "liltext.com", "linkbee.com", "linkbun.ch",
-            "liurl.cn", "ln-s.net", "ln-s.ru", "lnk.gd", "lnk.ms", "lnkd.in", "lnkurl.com", "lru.jp", "lt.tl", "lurl.no", "macte.ch", "mash.to", "merky.de", "migre.me", "miniurl.com",
-            "minurl.fr", "mke.me", "moby.to", "moourl.com", "mrte.ch", "myloc.me", "myurl.in", "n.pr", "nbc.co", "nblo.gs", "nn.nf", "not.my", "notlong.com", "nsfw.in",
-            "nutshellurl.com", "nxy.in", "nyti.ms", "o-x.fr", "oc1.us", "om.ly", "omf.gd", "omoikane.net", "on.cnn.com", "on.mktw.net", "onforb.es", "orz.se", "ow.ly", "ping.fm",
-            "pli.gs", "pnt.me", "politi.co", "post.ly", "pp.gg", "profile.to", "ptiturl.com", "pub.vitrue.com", "qlnk.net", "qte.me", "qu.tc", "qy.fi", "r.ebay.com", "r.im", "rb6.me", "read.bi",
-            "readthis.ca", "reallytinyurl.com", "redir.ec", "redirects.ca", "redirx.com", "retwt.me", "ri.ms", "rickroll.it", "riz.gd", "rt.nu", "ru.ly", "rubyurl.com", "rurl.org",
-            "rww.tw", "s4c.in", "s7y.us", "safe.mn", "sameurl.com", "sdut.us", "shar.es", "shink.de", "shorl.com", "short.ie", "short.to", "shortlinks.co.uk", "shorturl.com",
-            "shout.to", "show.my", "shrinkify.com", "shrinkr.com", "shrt.fr", "shrt.st", "shrten.com", "shrunkin.com", "simurl.com", "slate.me", "smallr.com", "smsh.me", "smurl.name",
-            "sn.im", "snipr.com", "snipurl.com", "snurl.com", "sp2.ro", "spedr.com", "srnk.net", "srs.li", "starturl.com", "stks.co", "su.pr", "surl.co.uk", "surl.hu", "t.cn", "t.co", "t.lh.com",
-            "ta.gd", "tbd.ly", "tcrn.ch", "tgr.me", "tgr.ph", "tighturl.com", "tiniuri.com", "tiny.cc", "tiny.ly", "tiny.pl", "tinylink.in", "tinyuri.ca", "tinyurl.com", "tk.", "tl.gd",
-            "tmi.me", "tnij.org", "tnw.to", "tny.com", "to.ly", "togoto.us", "totc.us", "toysr.us", "tpm.ly", "tr.im", "tra.kz", "trunc.it", "twhub.com", "twirl.at",
-            "twitclicks.com", "twitterurl.net", "twitterurl.org", "twiturl.de", "twurl.cc", "twurl.nl", "u.mavrev.com", "u.nu", "u76.org", "ub0.cc", "ulu.lu", "updating.me", "ur1.ca",
-            "url.az", "url.co.uk", "url.ie", "url360.me", "url4.eu", "urlborg.com", "urlbrief.com", "urlcover.com", "urlcut.com", "urlenco.de", "urli.nl", "urls.im",
-            "urlshorteningservicefortwitter.com", "urlx.ie", "urlzen.com", "usat.ly", "use.my", "vb.ly", "vevo.ly", "vgn.am", "vl.am", "vm.lc", "w55.de", "wapo.st", "wapurl.co.uk", "wipi.es",
-            "wp.me", "x.vu", "xr.com", "xrl.in", "xrl.us", "xurl.es", "xurl.jp", "y.ahoo.it", "yatuc.com", "ye.pe", "yep.it", "yfrog.com", "yhoo.it", "yiyd.com", "youtu.be", "yuarel.com",
-            "z0p.de", "zi.ma", "zi.mu", "zipmyurl.com", "zud.me", "zurl.ws", "zz.gd", "zzang.kr", "›.ws", "✩.ws", "✿.ws", "❥.ws", "➔.ws", "➞.ws", "➡.ws", "➨.ws", "➯.ws", "➹.ws", "➽.ws"];
-
-        if ($('#jqoembeddata').length === 0) $('<span id="jqoembeddata"></span>').appendTo('body');
-
-        return this.each(function () {
-            var container = $(this),
-                resourceURL = (url && (!url.indexOf('http://') || !url.indexOf('https://'))) ? url : container.attr("href"),
-                provider;
-
-            if (embedAction) {
-                settings.onEmbed = embedAction;
-            }
-            else if (!settings.onEmbed) {
-                settings.onEmbed = function (oembedData) {
-                    $.fn.oembed.insertCode(this, settings.embedMethod, oembedData);
-                };
-            }
-
-            if (resourceURL !== null && resourceURL !== undefined) {
-                //Check if shorten URL
-                for (var j = 0, l = shortURLList.length; j < l; j++) {
-                    var regExp = new RegExp('://' + shortURLList[j] + '/', "i");
-                    
-                    provider = $.fn.oembed.getOEmbedProvider(resourceURL);
-
-                    if (!provider && window.location.protocol !== "https:" && resourceURL.match(regExp) !== null) {
-                        //AJAX to http://api.longurl.org/v2/expand?url=http://bit.ly/JATvIs&format=json&callback=hhh
-                        var ajaxopts = $.extend({
-                            url: "http://api.longurl.org/v2/expand",
-                            dataType: 'jsonp',
-                            data: {
-                                url: resourceURL,
-                                format: "json"
-                                //callback: "?"
-                            },
-                            success: function (data) {
-                                //this = $.fn.oembed;
-                                resourceURL = data['long-url'];
-                                provider = $.fn.oembed.getOEmbedProvider(data['long-url']);
-
-                                //remove fallback
-                                if (!!settings.fallback === false) {
-                                    provider = provider.name.toLowerCase() === 'opengraph' ? null : provider;
-                                }
-
-                                if (provider !== null) {
-                                    provider.params = getNormalizedParams(settings[provider.name]) || {};
-                                    provider.maxWidth = settings.maxWidth;
-                                    provider.maxHeight = settings.maxHeight;
-                                    embedCode(container, resourceURL, provider);
-                                } else {
-                                    settings.onProviderNotFound.call(container, resourceURL);
-                                }
-                            },
-                            error: function () {
-                                settings.onError.call(container, resourceURL)
-                            }
-                        }, settings.longUrlAjaxOptions || settings.ajaxOptions || {});
-
-                        $.ajax(ajaxopts);
-
-                        return container;
-                    }
-                }
-
-                //remove fallback
-                if (!!settings.fallback === false) {
-                    provider = provider.name.toLowerCase() === 'opengraph' ? null : provider;
-                }
-                if (provider !== null) {
-                    provider.params = getNormalizedParams(settings[provider.name]) || {};
-                    provider.maxWidth = settings.maxWidth;
-                    provider.maxHeight = settings.maxHeight;
-                    embedCode(container, resourceURL, provider);
-                } else {
-                    settings.onProviderNotFound.call(container, resourceURL);
-                }
-            }
-            return container;
-        });
-    };
-
-    var settings;
-
-    // Plugin defaults
-    $.fn.oembed.defaults = {
-        fallback: true,
-        maxWidth: null,
-        maxHeight: null,
-        includeHandle: true,
-        embedMethod: 'auto',
-        // "auto", "append", "fill"
-        onProviderNotFound: function () {
-        },
-        beforeEmbed: function () {
-        },
-        afterEmbed: function () {
-        },
-        onEmbed: false,
-        onError: function (a, b, c, d) {
-            console.log('err:', a, b, c, d)
-        },
-        ajaxOptions: {},
-        longUrlAjaxOptions: {}
-    };
-
-    /* Private functions */
-    function rand(length, current) { //Found on http://stackoverflow.com/questions/1349404/generate-a-string-of-5-random-characters-in-javascript
-        current = current ? current : '';
-        return length ? rand(--length, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz".charAt(Math.floor(Math.random() * 60)) + current) : current;
-    }
-
-    function getRequestUrl(provider, externalUrl) {
-        var url = provider.apiendpoint,
-            qs = "",
-            i;
-        url += (url.indexOf("?") <= 0) ? "?" : "&";
-        url = url.replace('#', '%23');
-
-        if (provider.maxWidth !== null && (typeof provider.params.maxwidth === 'undefined' || provider.params.maxwidth === null)) {
-            provider.params.maxwidth = provider.maxWidth;
-        }
-
-        if (provider.maxHeight !== null && (typeof provider.params.maxheight === 'undefined' || provider.params.maxheight === null)) {
-            provider.params.maxheight = provider.maxHeight;
-        }
-
-        for (i in provider.params) {
-            // We don't want them to jack everything up by changing the callback parameter
-            if (i == provider.callbackparameter)
-                continue;
-
-            // allows the options to be set to null, don't send null values to the server as parameters
-            if (provider.params[i] !== null)
-                qs += "&" + escape(i) + "=" + provider.params[i];
-        }
-
-        url += "format=" + provider.format + "&url=" + escape(externalUrl) + qs;
-        if (provider.dataType != 'json')
-            url += "&" + provider.callbackparameter + "=?";
-
-        return url;
-    }
-
-    function success(oembedData, externalUrl, container) {
-        $('#jqoembeddata').data(externalUrl, oembedData.code);
-        settings.beforeEmbed.call(container, oembedData);
-        settings.onEmbed.call(container, oembedData);
-        settings.afterEmbed.call(container, oembedData);
-    }
-
-    function embedCode(container, externalUrl, embedProvider) {
-        if ($('#jqoembeddata').data(externalUrl) != undefined && embedProvider.embedtag.tag != 'iframe') {
-            var oembedData = {code: $('#jqoembeddata').data(externalUrl)};
-            success(oembedData, externalUrl, container);
-        } else if (embedProvider.yql) {
-            var from = embedProvider.yql.from || 'htmlstring';
-            var url = embedProvider.yql.url ? embedProvider.yql.url(externalUrl) : externalUrl;
-            var query = 'SELECT * FROM ' + from
-                + ' WHERE url="' + (url) + '"'
-                + " and " + (/html/.test(from) ? 'xpath' : 'itemPath') + "='" + (embedProvider.yql.xpath || '/') + "'";
-            if (from == 'html')
-                query += " and compat='html5'";
-            var ajaxopts = $.extend({
-                url: "//query.yahooapis.com/v1/public/yql",
-                dataType: 'jsonp',
-                data: {
-                    q: query,
-                    format: "json",
-                    env: 'store://datatables.org/alltableswithkeys',
-                    callback: "?"
-                },
-                success: function (data) {
-                    var result;
-
-                    if (embedProvider.yql.xpath && embedProvider.yql.xpath == '//meta|//title|//link') {
-                        var meta = {};
-
-                        if (data.query == null) {
-                            data.query = {};
-                        }
-                        if (data.query.results == null) {
-                            data.query.results = {"meta": []};
-                        }
-                        for (var i = 0, l = data.query.results.meta.length; i < l; i++) {
-                            var name = data.query.results.meta[i].name || data.query.results.meta[i].property || null;
-                            if (name == null)continue;
-                            meta[name.toLowerCase()] = data.query.results.meta[i].content;
-                        }
-                        if (!meta.hasOwnProperty("title") || !meta.hasOwnProperty("og:title")) {
-                            if (data.query.results.title != null) {
-                                meta.title = data.query.results.title;
-                            }
-                        }
-                        if (!meta.hasOwnProperty("og:image") && data.query.results.hasOwnProperty("link")) {
-                            for (var i = 0, l = data.query.results.link.length; i < l; i++) {
-                                if (data.query.results.link[i].hasOwnProperty("rel")) {
-                                    if (data.query.results.link[i].rel == "apple-touch-icon") {
-                                        if (data.query.results.link[i].href.charAt(0) == "/") {
-                                            meta["og:image"] = url.match(/^(([a-z]+:)?(\/\/)?[^\/]+\/).*$/)[1] + data.query.results.link[i].href;
-                                        } else {
-                                            meta["og:image"] = data.query.results.link[i].href;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        result = embedProvider.yql.datareturn(meta);
-                    } else {
-                        result = embedProvider.yql.datareturn ? embedProvider.yql.datareturn(data.query.results) : data.query.results.result;
-                    }
-                    if (result === false)return;
-                    var oembedData = $.extend({}, result);
-                    oembedData.code = result;
-                    success(oembedData, externalUrl, container);
-                },
-                error: settings.onError.call(container, externalUrl, embedProvider)
-            }, settings.ajaxOptions || {});
-            $.ajax(ajaxopts);
-        } else if (embedProvider.templateRegex) {
-            if (embedProvider.embedtag.tag !== '') {
-                var flashvars = embedProvider.embedtag.flashvars || '';
-                var tag = embedProvider.embedtag.tag || 'embed';
-                var width = embedProvider.embedtag.width || 'auto';
-                var height = embedProvider.embedtag.height || 'auto';
-                var src = externalUrl.replace(embedProvider.templateRegex, embedProvider.apiendpoint);
-
-                if (!embedProvider.nocache) {
-                    src += '&jqoemcache=' + rand(5);
-                }
-
-                if (embedProvider.apikey) {
-                    src = src.replace('_APIKEY_', settings.apikeys[embedProvider.name]);
-                }
-
-                var code = $('<' + tag + '/>').attr('src', src).attr('width', width)
-                    .attr('height', height)
-                    .attr('allowfullscreen', embedProvider.embedtag.allowfullscreen || 'true')
-                    .attr('allowscriptaccess', embedProvider.embedtag.allowfullscreen || 'always')
-                    .css('max-height', settings.maxHeight || 'auto')
-                    .css('max-width', settings.maxWidth || 'auto');
-
-                if (tag == 'embed') {
-                    code.attr('type', embedProvider.embedtag.type || "application/x-shockwave-flash")
-                        .attr('flashvars', externalUrl.replace(embedProvider.templateRegex, flashvars));
-                }
-
-                if (tag == 'iframe') {
-                    code.attr('scrolling', embedProvider.embedtag.scrolling || "no")
-                        .attr('frameborder', embedProvider.embedtag.frameborder || "0");
-
-                }
-
-                success({code: code}, externalUrl, container);
-            } else if (embedProvider.apiendpoint) {
-                //Add APIkey if true
-                if (embedProvider.apikey)
-                    embedProvider.apiendpoint = embedProvider.apiendpoint.replace('_APIKEY_', settings.apikeys[embedProvider.name]);
-
-                ajaxopts = $.extend({
-                    url: externalUrl.replace(embedProvider.templateRegex, embedProvider.apiendpoint),
-                    dataType: 'jsonp',
-                    success: function (data) {
-                        var oembedData = $.extend({}, data);
-                        oembedData.code = embedProvider.templateData(data);
-                        success(oembedData, externalUrl, container);
-                    },
-                    error: settings.onError.call(container, externalUrl, embedProvider)
-                }, settings.ajaxOptions || {});
-                $.ajax(ajaxopts);
-            } else {
-                success({code: externalUrl.replace(embedProvider.templateRegex, embedProvider.template)}, externalUrl, container);
-            }
-        } else {
-
-            var requestUrl = getRequestUrl(embedProvider, externalUrl);
-            ajaxopts = $.extend({
-                url: requestUrl,
-                dataType: embedProvider.dataType || 'jsonp',
-                success: function (data) {
-                    var oembedData = $.extend({}, data);
-                    switch (oembedData.type) {
-                        case "file": //Deviant Art has this
-                        case "photo":
-                            oembedData.code = $.fn.oembed.getPhotoCode(externalUrl, oembedData);
-                            break;
-                        case "video":
-                        case "rich":
-                            oembedData.code = $.fn.oembed.getRichCode(externalUrl, oembedData);
-                            break;
-                        default:
-                            oembedData.code = $.fn.oembed.getGenericCode(externalUrl, oembedData);
-                            break;
-                    }
-                    success(oembedData, externalUrl, container);
-                },
-                error: settings.onError.call(container, externalUrl, embedProvider)
-            }, settings.ajaxOptions || {});
-            $.ajax(ajaxopts);
-        }
-    }
-
-    function getNormalizedParams(params) {
-        if (params === null) return null;
-        var key, normalizedParams = {};
-        for (key in params) {
-            if (key !== null) normalizedParams[key.toLowerCase()] = params[key];
-        }
-        return normalizedParams;
-    }
-
-    /* Public functions */
-    $.fn.oembed.insertCode = function (container, embedMethod, oembedData) {
-        if (oembedData === null)
-            return;
-
-        if (embedMethod === 'auto' && container.attr('href') !== null) {
-            embedMethod = 'append';
-        } else if (embedMethod == 'auto') {
-            embedMethod = 'replace';
-        }
-
-        switch (embedMethod) {
-            case "replace":
-                container.replaceWith(oembedData.code);
-                break;
-            case "fill":
-                container.html(oembedData.code);
-                break;
-            case "append":
-                container.wrap('<div class="oembedall-container"></div>');
-                var oembedContainer = container.parent();
-                if (settings.includeHandle) {
-                    $('<span class="oembedall-closehide">&darr;</span>').insertBefore(container).click(function () {
-                        var encodedString = encodeURIComponent($(this).text());
-                        $(this).html((encodedString == '%E2%86%91') ? '&darr;' : '&uarr;');
-                        $(this).parent().children().last().toggle();
-                    });
-                }
-                oembedContainer.append('<br/>');
-                try {
-                    oembedData.code.clone().appendTo(oembedContainer);
-                } catch (e) {
-                    oembedContainer.append(oembedData.code);
-                }
-                /* Make videos semi-responsive
-                 * If parent div width less than embeded iframe video then iframe gets shrunk to fit smaller width
-                 * If parent div width greater thans embed iframe use the max widht
-                 * - works on youtubes and vimeo
-                 */
-                if (settings.maxWidth) {
-                    var post_width = oembedContainer.parent().width();
-                    if (post_width < settings.maxWidth) {
-                        var iframe_width_orig = $('iframe', oembedContainer).width();
-                        var iframe_height_orig = $('iframe', oembedContainer).height();
-                        var ratio = iframe_width_orig / post_width;
-                        $('iframe', oembedContainer).width(iframe_width_orig / ratio);
-                        $('iframe', oembedContainer).height(iframe_height_orig / ratio);
-                    } else {
-                        if (settings.maxWidth) {
-                            $('iframe', oembedContainer).width(settings.maxWidth);
-                        }
-                        if (settings.maxHeight) {
-                            $('iframe', oembedContainer).height(settings.maxHeight);
-                        }
-                    }
-                }
-                break;
-        }
-    };
-
-    $.fn.oembed.getPhotoCode = function (url, oembedData) {
-        var code;
-        var alt = oembedData.title ? oembedData.title : '';
-        alt += oembedData.author_name ? ' - ' + oembedData.author_name : '';
-        alt += oembedData.provider_name ? ' - ' + oembedData.provider_name : '';
-
-        if (oembedData.url) {
-            code = '<div><a href="' + url + '" target=\'_blank\'><img src="' + oembedData.url + '" alt="' + alt + '"/></a></div>';
-        } else if (oembedData.thumbnail_url) {
-            var newURL = oembedData.thumbnail_url.replace('_s', '_b');
-            code = '<div><a href="' + url + '" target=\'_blank\'><img src="' + newURL + '" alt="' + alt + '"/></a></div>';
-        } else {
-            code = '<div>Error loading this picture</div>';
-        }
-
-        if (oembedData.html) {
-            code += "<div>" + oembedData.html + "</div>";
-        }
-
-        return code;
-    };
-
-    $.fn.oembed.getRichCode = function (url, oembedData) {
-        return oembedData.html;
-    };
-
-    $.fn.oembed.getGenericCode = function (url, oembedData) {
-        var title = ((oembedData.title) && (oembedData.title !== null)) ? oembedData.title : url;
-        var code = '<a href="' + url + '">' + title + '</a>';
-
-        if (oembedData.html) {
-            code += "<div>" + oembedData.html + "</div>";
-        }
-
-        return code;
-    };
-
-    $.fn.oembed.getOEmbedProvider = function (url) {
-        for (var i = 0; i < $.fn.oembed.providers.length; i++) {
-            for (var j = 0, l = $.fn.oembed.providers[i].urlschemes.length; j < l; j++) {
-                var regExp = new RegExp($.fn.oembed.providers[i].urlschemes[j], "i");
-
-                if (url.match(regExp) !== null)
-                    return $.fn.oembed.providers[i];
-            }
-        }
-        return null;
-    };
-
-    // Constructor Function for OEmbedProvider Class.
-    $.fn.oembed.OEmbedProvider = function (name, type, urlschemesarray, apiendpoint, extraSettings) {
-        this.name = name;
-        this.type = type; // "photo", "video", "link", "rich", null
-        this.urlschemes = urlschemesarray;
-        this.apiendpoint = apiendpoint;
-        this.maxWidth = 500;
-        this.maxHeight = 400;
-        extraSettings = extraSettings || {};
-
-        if (extraSettings.useYQL) {
-
-            if (extraSettings.useYQL == 'xml') {
-                extraSettings.yql = {
-                    xpath: "//oembed/html",
-                    from: 'xml',
-                    apiendpoint: this.apiendpoint,
-                    url: function (externalurl) {
-                        return this.apiendpoint + '?format=xml&url=' + externalurl
-                    },
-                    datareturn: function (results) {
-                        return results.html.replace(/.*\[CDATA\[(.*)\]\]>$/, '$1') || ''
-                    }
-                };
-            } else {
-                extraSettings.yql = {
-                    from: 'json',
-                    apiendpoint: this.apiendpoint,
-                    url: function (externalurl) {
-                        return this.apiendpoint + '?format=json&url=' + externalurl
-                    },
-                    datareturn: function (results) {
-                        if (results.json.type != 'video' && (results.json.url || results.json.thumbnail_url)) {
-                            return '<img src="' + (results.json.url || results.json.thumbnail_url) + '" />';
-                        }
-                        return results.json.html || ''
-                    }
-                };
-            }
-            this.apiendpoint = null;
-        }
-
-
-        for (var property in extraSettings) {
-            this[property] = extraSettings[property];
-        }
-
-        this.format = this.format || 'json';
-        this.callbackparameter = this.callbackparameter || "callback";
-        this.embedtag = this.embedtag || {tag: ""};
-
-
-    };
-
-    /*
-     * Function to update existing providers
-     *
-     * @param  {String}    name             The name of the provider
-     * @param  {String}    type             The type of the provider can be "file", "photo", "video", "rich"
-     * @param  {String}    urlshemesarray   Array of url of the provider
-     * @param  {String}    apiendpoint      The endpoint of the provider
-     * @param  {String}    extraSettings    Extra settings of the provider
-     */
-    $.fn.updateOEmbedProvider = function (name, type, urlschemesarray, apiendpoint, extraSettings) {
-        for (var i = 0; i < $.fn.oembed.providers.length; i++) {
-            if ($.fn.oembed.providers[i].name === name) {
-                if (type !== null) {
-                    $.fn.oembed.providers[i].type = type;
-                }
-                if (urlschemesarray !== null) {
-                    $.fn.oembed.providers[i].urlschemes = urlschemesarray;
-                }
-                if (apiendpoint !== null) {
-                    $.fn.oembed.providers[i].apiendpoint = apiendpoint;
-                }
-                if (extraSettings !== null) {
-                    $.fn.oembed.providers[i].extraSettings = extraSettings;
-                    for (var property in extraSettings) {
-                        if (property !== null && extraSettings[property] !== null) {
-                            $.fn.oembed.providers[i][property] = extraSettings[property];
-                        }
-                    }
-                }
-            }
-        }
-    };
-
-    /* Native & common providers */
-    $.fn.oembed.providers = [
-
-        //Video
-        new $.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?", "youtu\\.be/[\\w-]+", "youtube.com/embed"], '//www.youtube.com/embed/$1?wmode=transparent', {
-            templateRegex: /.*(?:v\=|be\/|embed\/)([\w\-]+)&?.*/, embedtag: {tag: 'iframe', width: '425', height: '349'}
-        }),
-
-        //new $.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?", "youtu\\.be/[\\w-]+"], 'http://www.youtube.com/oembed', {useYQL:'json'}),
-        //new $.fn.oembed.OEmbedProvider("youtubeiframe", "video", ["youtube.com/embed"],  "$1?wmode=transparent",
-        //  {templateRegex:/(.*)/,embedtag : {tag: 'iframe', width:'425',height: '349'}}),
-        new $.fn.oembed.OEmbedProvider("wistia", "video", ["wistia.com/medias/.+", "wistia.com/m/.+", "wistia.com/embed/.+", "wi.st/m/.+", "wi.st/embed/.+"], 'http://fast.wistia.com/oembed', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("xtranormal", "video", ["xtranormal\\.com/watch/.+"], "http://www.xtranormal.com/xtraplayr/$1/$2", {
-            templateRegex: /.*com\/watch\/([\w\-]+)\/([\w\-]+).*/, embedtag: {tag: 'iframe', width: '320', height: '269'}}),
-        new $.fn.oembed.OEmbedProvider("scivee", "video", ["scivee.tv/node/.+"], "http://www.scivee.tv/flash/embedCast.swf?", {
-            templateRegex: /.*tv\/node\/(.+)/, embedtag: {width: '480', height: '400', flashvars: "id=$1&type=3"}}),
-        new $.fn.oembed.OEmbedProvider("veoh", "video", ["veoh.com/watch/.+"], "http://www.veoh.com/swf/webplayer/WebPlayer.swf?version=AFrontend.5.7.0.1337&permalinkId=$1&player=videodetailsembedded&videoAutoPlay=0&id=anonymous", {
-            templateRegex: /.*watch\/([^\?]+).*/, embedtag: {width: '410', height: '341'}}),
-        new $.fn.oembed.OEmbedProvider("gametrailers", "video", ["gametrailers\\.com/video/.+"], "http://media.mtvnservices.com/mgid:moses:video:gametrailers.com:$2", {
-            templateRegex: /.*com\/video\/([\w\-]+)\/([\w\-]+).*/, embedtag: {width: '512', height: '288' }}),
-        new $.fn.oembed.OEmbedProvider("funnyordie", "video", ["funnyordie\\.com/videos/.+"], "http://player.ordienetworks.com/flash/fodplayer.swf?", {
-            templateRegex: /.*videos\/([^\/]+)\/([^\/]+)?/, embedtag: {width: 512, height: 328, flashvars: "key=$1"}}),
-        new $.fn.oembed.OEmbedProvider("colledgehumour", "video", ["collegehumor\\.com/video/.+"], "http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=$1&use_node_id=true&fullscreen=1",
-            {templateRegex: /.*video\/([^\/]+).*/, embedtag: {width: 600, height: 338}}),
-        new $.fn.oembed.OEmbedProvider("metacafe", "video", ["metacafe\\.com/watch/.+"], "http://www.metacafe.com/fplayer/$1/$2.swf",
-            {templateRegex: /.*watch\/(\d+)\/(\w+)\/.*/, embedtag: {width: 400, height: 345}}),
-        new $.fn.oembed.OEmbedProvider("bambuser", "video", ["bambuser\\.com\/channel\/.*\/broadcast\/.*"], "http://static.bambuser.com/r/player.swf?vid=$1",
-            {templateRegex: /.*bambuser\.com\/channel\/.*\/broadcast\/(\w+).*/, embedtag: {width: 512, height: 339 }}),
-        new $.fn.oembed.OEmbedProvider("twitvid", "video", ["twitvid\\.com/.+"], "http://www.twitvid.com/embed.php?guid=$1&autoplay=0",
-            {templateRegex: /.*twitvid\.com\/(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }}),
-        new $.fn.oembed.OEmbedProvider("aniboom", "video", ["aniboom\\.com/animation-video/.+"], "http://api.aniboom.com/e/$1",
-            {templateRegex: /.*animation-video\/(\d+).*/, embedtag: {width: 594, height: 334}}),
-        new $.fn.oembed.OEmbedProvider("vzaar", "video", ["vzaar\\.com/videos/.+", "vzaar.tv/.+"], "http://view.vzaar.com/$1/player?",
-            {templateRegex: /.*\/(\d+).*/, embedtag: {tag: 'iframe', width: 576, height: 324 }}),
-        new $.fn.oembed.OEmbedProvider("snotr", "video", ["snotr\\.com/video/.+"], "http://www.snotr.com/embed/$1",
-            {templateRegex: /.*\/(\d+).*/, embedtag: {tag: 'iframe', width: 400, height: 330}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("youku", "video", ["v.youku.com/v_show/id_.+"], "http://player.youku.com/player.php/sid/$1/v.swf",
-            {templateRegex: /.*id_(.+)\.html.*/, embedtag: {width: 480, height: 400}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("tudou", "video", ["tudou.com/programs/view/.+\/"], "http://www.tudou.com/v/$1/v.swf",
-            {templateRegex: /.*view\/(.+)\//, embedtag: {width: 480, height: 400}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("embedr", "video", ["embedr\\.com/playlist/.+"], "http://embedr.com/swf/slider/$1/425/520/default/false/std?",
-            {templateRegex: /.*playlist\/([^\/]+).*/, embedtag: {width: 425, height: 520}}),
-        new $.fn.oembed.OEmbedProvider("blip", "video", ["blip\\.tv/.+"], "//blip.tv/oembed/"),
-        new $.fn.oembed.OEmbedProvider("minoto-video", "video", ["http://api.minoto-video.com/publishers/.+/videos/.+", "http://dashboard.minoto-video.com/main/video/details/.+", "http://embed.minoto-video.com/.+"], "http://api.minoto-video.com/services/oembed.json", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("animoto", "video", ["animoto.com/play/.+"], "http://animoto.com/services/oembed"),
-        new $.fn.oembed.OEmbedProvider("hulu", "video", ["hulu\\.com/watch/.*"], "//www.hulu.com/api/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("ustream", "video", ["ustream\\.tv/recorded/.*"], "http://www.ustream.tv/oembed", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("videojug", "video", ["videojug\\.com/(film|payer|interview).*"], "http://www.videojug.com/oembed.json", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("sapo", "video", ["videos\\.sapo\\.pt/.*"], "http://videos.sapo.pt/oembed", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("vodpod", "video", ["vodpod.com/watch/.*"], "http://vodpod.com/oembed.js", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("vimeo", "video", ["www\.vimeo\.com\/groups\/.*\/videos\/.*", "www\.vimeo\.com\/.*", "vimeo\.com\/groups\/.*\/videos\/.*", "vimeo\.com\/.*"], "//vimeo.com/api/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("dailymotion", "video", ["dailymotion\\.com/.+"], '//www.dailymotion.com/services/oembed'),
-        new $.fn.oembed.OEmbedProvider("5min", "video", ["www\\.5min\\.com/.+"], 'http://api.5min.com/oembed.xml', {useYQL: 'xml'}),
-        new $.fn.oembed.OEmbedProvider("National Film Board of Canada", "video", ["nfb\\.ca/film/.+"], 'http://www.nfb.ca/remote/services/oembed/', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("qik", "video", ["qik\\.com/\\w+"], 'http://qik.com/api/oembed.json', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("revision3", "video", ["revision3\\.com"], "http://revision3.com/api/oembed/"),
-        new $.fn.oembed.OEmbedProvider("dotsub", "video", ["dotsub\\.com/view/.+"], "http://dotsub.com/services/oembed", {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("clikthrough", "video", ["clikthrough\\.com/theater/video/\\d+"], "http://clikthrough.com/services/oembed"),
-        new $.fn.oembed.OEmbedProvider("Kinomap", "video", ["kinomap\\.com/.+"], "http://www.kinomap.com/oembed"),
-        new $.fn.oembed.OEmbedProvider("VHX", "video", ["vhx.tv/.+"], "http://vhx.tv/services/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("bambuser", "video", ["bambuser.com/.+"], "http://api.bambuser.com/oembed/iframe.json"),
-        new $.fn.oembed.OEmbedProvider("justin.tv", "video", ["justin.tv/.+"], 'http://api.justin.tv/api/embed/from_url.json', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("vine", "video", ["vine.co/v/.*"], null,
-            {
-                templateRegex: /https?:\/\/w?w?w?.?vine\.co\/v\/([a-zA-Z0-9]*).*/,
-                template: '<iframe src="https://vine.co/v/$1/embed/postcard" width="600" height="600" allowfullscreen="true" allowscriptaccess="always" scrolling="no" frameborder="0"></iframe>' +
-                    '<script async src="//platform.vine.co/static/scripts/embed.js" charset="utf-8"></script>',
-                nocache: 1
-            }),
-        new $.fn.oembed.OEmbedProvider("boxofficebuz", "video", ["boxofficebuz\\.com\\/embed/.+"], "http://boxofficebuz.com/embed/$1/$2", {templateRegex: [/.*boxofficebuz\.com\/embed\/(\w+)\/([\w*\-*]+)/], embedtag: {tag: 'iframe', width: 480, height: 360 }}),
-        new $.fn.oembed.OEmbedProvider("clipsyndicate", "video", ["clipsyndicate\\.com/video/play/.+", "clipsyndicate\\.com/embed/iframe\?.+"], "http://eplayer.clipsyndicate.com/embed/iframe?pf_id=1&show_title=0&va_id=$1&windows=1", {templateRegex: [/.*www\.clipsyndicate\.com\/video\/play\/(\w+)\/.*/, /.*eplayer\.clipsyndicate\.com\/embed\/iframe\?.*va_id=(\w+).*.*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("coub", "video", ["coub\\.com/.+"], "http://www.coub.com/embed/$1?muted=false&autostart=false&originalSize=false&hideTopBar=false&noSiteButtons=false&startWithHD=false", {templateRegex: [/.*coub\.com\/embed\/(\w+)\?*.*/, /.*coub\.com\/view\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("discoverychannel", "video", ["snagplayer\\.video\\.dp\\.discovery\\.com/.+"], "http://snagplayer.video.dp.discovery.com/$1/snag-it-player.htm?auto=no", {templateRegex: [/.*snagplayer\.video\.dp\.discovery\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }}),
-        new $.fn.oembed.OEmbedProvider("telly", "video", ["telly\\.com/.+"], "http://www.telly.com/embed.php?guid=$1&autoplay=0", {templateRegex: [/.*telly\.com\/embed\.php\?guid=(\w+).*/, /.*telly\.com\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }}),
-        new $.fn.oembed.OEmbedProvider("minilogs", "video", ["minilogs\\.com/.+"], "http://www.minilogs.com/e/$1", {templateRegex: [/.*minilogs\.com\/e\/(\w+).*/, /.*minilogs\.com\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("viddy", "video", ["viddy\\.com/.+"], "http://www.viddy.com/embed/video/$1", {templateRegex: [/.*viddy\.com\/embed\/video\/(\.*)/, /.*viddy\.com\/video\/(\.*)/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("worldstarhiphop", "video", ["worldstarhiphop\\.com\/embed/.+"], "http://www.worldstarhiphop.com/embed/$1", {templateRegex: /.*worldstarhiphop\.com\/embed\/(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("zapiks", "video", ["zapiks\\.fr\/.+"], "http://www.zapiks.fr/index.php?action=playerIframe&media_id=$1&autoStart=fals", {templateRegex: /.*zapiks\.fr\/index.php\?[\w\=\&]*media_id=(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-
-        //Audio
-        new $.fn.oembed.OEmbedProvider("official.fm", "rich", ["official.fm/.+"], 'http://official.fm/services/oembed', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("chirbit", "rich", ["chirb.it/.+"], 'http://chirb.it/oembed.json', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("chirbit", "audio", ["chirb\\.it/.+"], "http://chirb.it/wp/$1", {templateRegex: [/.*chirb\.it\/wp\/(\w+).*/, /.*chirb\.it\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("Huffduffer", "rich", ["huffduffer.com/[-.\\w@]+/\\d+"], "http://huffduffer.com/oembed"),
-        new $.fn.oembed.OEmbedProvider("Spotify", "rich", ["open.spotify.com/(track|album|user)/"], "https://embed.spotify.com/oembed/"),
-        new $.fn.oembed.OEmbedProvider("shoudio", "rich", ["shoudio.com/.+", "shoud.io/.+"], "http://shoudio.com/api/oembed"),
-        new $.fn.oembed.OEmbedProvider("mixcloud", "rich", ["mixcloud.com/.+"], 'http://www.mixcloud.com/oembed/', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("rdio.com", "rich", ["rd.io/.+", "rdio.com"], "http://www.rdio.com/api/oembed/"),
-        new $.fn.oembed.OEmbedProvider("Soundcloud", "rich", ["soundcloud.com/.+", "snd.sc/.+"], "//soundcloud.com/oembed", {format: 'js'}),
-        new $.fn.oembed.OEmbedProvider("bandcamp", "rich", ["bandcamp\\.com/album/.+"], null,
-            {
-                yql: {
-                    xpath: "//meta[contains(@content, \\'EmbeddedPlayer\\')]",
-                    from: 'html',
-                    datareturn: function (results) {
-                        return results.meta ? '<iframe width="400" height="100" src="' + results.meta.content + '" allowtransparency="true" frameborder="0"></iframe>' : false;
-                    }
-                }
-            }),
-
-        //Photo
-        new $.fn.oembed.OEmbedProvider("deviantart", "photo", ["deviantart.com/.+", "fav.me/.+", "deviantart.com/.+"], "//backend.deviantart.com/oembed", {format: 'jsonp'}),
-        new $.fn.oembed.OEmbedProvider("skitch", "photo", ["skitch.com/.+"], null,
-            {
-                yql: {
-                    xpath: "json",
-                    from: 'json',
-                    url: function (externalurl) {
-                        return 'http://skitch.com/oembed/?format=json&url=' + externalurl
-                    },
-                    datareturn: function (data) {
-                        return $.fn.oembed.getPhotoCode(data.json.url, data.json);
-                    }
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("mobypicture", "photo", ["mobypicture.com/user/.+/view/.+", "moby.to/.+"], "http://api.mobypicture.com/oEmbed"),
-        new $.fn.oembed.OEmbedProvider("flickr", "photo", ["flickr\\.com/photos/.+"], "//flickr.com/services/oembed", {callbackparameter: 'jsoncallback'}),
-        new $.fn.oembed.OEmbedProvider("photobucket", "photo", ["photobucket\\.com/(albums|groups)/.+"], "http://photobucket.com/oembed/"),
-        new $.fn.oembed.OEmbedProvider("instagram", "photo", ["instagr\\.?am(\\.com)?/.+"], "//api.instagram.com/oembed"),
-        //new $.fn.oembed.OEmbedProvider("yfrog", "photo", ["yfrog\\.(com|ru|com\\.tr|it|fr|co\\.il|co\\.uk|com\\.pl|pl|eu|us)/.+"], "http://www.yfrog.com/api/oembed",{useYQL:"json"}),
-        new $.fn.oembed.OEmbedProvider("SmugMug", "photo", ["smugmug.com/[-.\\w@]+/.+"], "http://api.smugmug.com/services/oembed/"),
-        new $.fn.oembed.OEmbedProvider("dribbble", "photo", ["dribbble.com/shots/.+"], "http://api.dribbble.com/shots/$1?callback=?",
-            {
-                templateRegex: /.*shots\/([\d]+).*/,
-                templateData: function (data) {
-                    if (!data.image_teaser_url) {
-                        return false;
-                    }
-                    return  '<img src="' + data.image_teaser_url + '"/>';
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("chart.ly", "photo", ["chart\\.ly/[a-z0-9]{6,8}"], "http://chart.ly/uploads/large_$1.png",
-            {templateRegex: /.*ly\/([^\/]+).*/, embedtag: {tag: 'img'}, nocache: 1}),
-        //new $.fn.oembed.OEmbedProvider("stocktwits.com", "photo", ["stocktwits\\.com/message/.+"], "http://charts.stocktwits.com/production/original_$1.png?",
-        //  { templateRegex: /.*message\/([^\/]+).*/, embedtag: { tag: 'img'},nocache:1 }),
-        new $.fn.oembed.OEmbedProvider("circuitlab", "photo", ["circuitlab.com/circuit/.+"], "https://www.circuitlab.com/circuit/$1/screenshot/540x405/",
-            {templateRegex: /.*circuit\/([^\/]+).*/, embedtag: {tag: 'img'}, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("23hq", "photo", ["23hq.com/[-.\\w@]+/photo/.+"], "http://www.23hq.com/23/oembed", {useYQL: "json"}),
-        new $.fn.oembed.OEmbedProvider("img.ly", "photo", ["img\\.ly/.+"], "//img.ly/show/thumb/$1",
-            {templateRegex: /.*ly\/([^\/]+).*/, embedtag: {tag: 'img'}, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("twitgoo.com", "photo", ["twitgoo\\.com/.+"], "http://twitgoo.com/show/thumb/$1",
-            {templateRegex: /.*com\/([^\/]+).*/, embedtag: {tag: 'img'}, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("imgur.com", "photo", ["imgur\\.com/gallery/.+"], "http://imgur.com/$1l.jpg",
-            {templateRegex: /.*gallery\/([^\/]+).*/, embedtag: {tag: 'img'}, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("visual.ly", "rich", ["visual\\.ly/.+"], null,
-            {
-                yql: {
-                    xpath: "//a[@id=\\'gc_article_graphic_image\\']/img",
-                    from: 'htmlstring'
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("achewood", "photo", ["achewood\\.com\\/index.php\\?date=.+"], "http://www.achewood.com/comic.php?date=$1", {templateRegex: /.*achewood\.com\/index.php\?date=(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("fotokritik", "photo", ["fotokritik\\.com/.+"], "http://www.fotokritik.com/embed/$1", {templateRegex: [/.*fotokritik\.com\/embed\/(\w+).*/, /.*fotokritik\.com\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("giflike", "photo", ["giflike\\.com/.+"], "http://www.giflike.com/embed/$1", {templateRegex: [/.*giflike\.com\/embed\/(\w+).*/, /.*giflike\.com\/a\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-
-        //Rich
-        new $.fn.oembed.OEmbedProvider("twitter", "rich", ["twitter.com/.+"], "https://api.twitter.com/1/statuses/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("gmep", "rich", ["gmep.imeducate.com/.*", "gmep.org/.*"], "http://gmep.org/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("urtak", "rich", ["urtak.com/(u|clr)/.+"], "http://oembed.urtak.com/1/oembed"),
-        new $.fn.oembed.OEmbedProvider("cacoo", "rich", ["cacoo.com/.+"], "http://cacoo.com/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("dailymile", "rich", ["dailymile.com/people/.*/entries/.*"], "http://api.dailymile.com/oembed"),
-        new $.fn.oembed.OEmbedProvider("documentcloud", "rich", ["documentcloud.org/documents/.+"], "https://www.documentcloud.org/api/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("dipity", "rich", ["dipity.com/timeline/.+"], 'http://www.dipity.com/oembed/timeline/', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("sketchfab", "rich", ["sketchfab.com/show/.+"], 'http://sketchfab.com/oembed', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("speakerdeck", "rich", ["speakerdeck.com/.+"], 'http://speakerdeck.com/oembed.json', {useYQL: 'json'}),
-        new $.fn.oembed.OEmbedProvider("popplet", "rich", ["popplet.com/app/.*"], "http://popplet.com/app/Popplet_Alpha.swf?page_id=$1&em=1",
-            {
-                templateRegex: /.*#\/([^\/]+).*/,
-                embedtag: {
-                    width: 460,
-                    height: 460
-                }
-            }),
-
-        new $.fn.oembed.OEmbedProvider("pearltrees", "rich", ["pearltrees.com/.*"], "http://cdn.pearltrees.com/s/embed/getApp?",
-            {
-                templateRegex: /.*N-f=1_(\d+).*N-p=(\d+).*/,
-                embedtag: {
-                    width: 460,
-                    height: 460,
-                    flashvars: "lang=en_US&amp;embedId=pt-embed-$1-693&amp;treeId=$1&amp;pearlId=$2&amp;treeTitle=Diagrams%2FVisualization&amp;site=www.pearltrees.com%2FF"
-                }
-            }),
-
-        new $.fn.oembed.OEmbedProvider("prezi", "rich", ["prezi.com/.*"], "//prezi.com/bin/preziloader.swf?",
-            {
-                templateRegex: /.*com\/([^\/]+)\/.*/,
-                embedtag: {
-                    width: 550,
-                    height: 400,
-                    flashvars: "prezi_id=$1&amp;lock_to_path=0&amp;color=ffffff&amp;autoplay=no&amp;autohide_ctrls=0"
-                }
-            }),
-
-        new $.fn.oembed.OEmbedProvider("tourwrist", "rich", ["tourwrist.com/tours/.+"], null,
-            {
-                templateRegex: /.*tours.([\d]+).*/,
-                template: function (wm, tourid) {
-                    setTimeout(function () {
-                        if (loadEmbeds)loadEmbeds();
-                    }, 2000);
-                    return "<div id='" + tourid + "' class='tourwrist-tour-embed direct'></div> <script type='text/javascript' src='http://tourwrist.com/tour_embed.js'></script>";
-                }
-            }),
-
-        new $.fn.oembed.OEmbedProvider("meetup", "rich", ["meetup\\.(com|ps)/.+"], "http://api.meetup.com/oembed"),
-        new $.fn.oembed.OEmbedProvider("ebay", "rich", ["ebay\\.*"], "http://togo.ebay.com/togo/togo.swf?2008013100",
-            {
-                templateRegex: /.*\/([^\/]+)\/(\d{10,13}).*/,
-                embedtag: {
-                    width: 355,
-                    height: 300,
-                    flashvars: "base=http://togo.ebay.com/togo/&lang=en-us&mode=normal&itemid=$2&query=$1"
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("wikipedia", "rich", ["wikipedia.org/wiki/.+"], "http://$1.wikipedia.org/w/api.php?action=parse&page=$2&format=json&section=0&callback=?", {
-            templateRegex: /.*\/\/([\w]+).*\/wiki\/([^\/]+).*/,
-            templateData: function (data) {
-                if (!data.parse)
-                    return false;
-                var text = data.parse['text']['*'].replace(/href="\/wiki/g, 'href="http://en.wikipedia.org/wiki');
-                return  '<div id="content"><h3><a class="nav-link" href="http://en.wikipedia.org/wiki/' + data.parse['displaytitle'] + '">' + data.parse['displaytitle'] + '</a></h3>' + text + '</div>';
-            }
-        }),
-        new $.fn.oembed.OEmbedProvider("imdb", "rich", ["imdb.com/title/.+"], "http://www.imdbapi.com/?i=$1&callback=?",
-            {
-                templateRegex: /.*\/title\/([^\/]+).*/,
-                templateData: function (data) {
-                    if (!data.Title)
-                        return false;
-                    return  '<div id="content"><h3><a class="nav-link" href="http://imdb.com/title/' + data.imdbID + '/">' + data.Title + '</a> (' + data.Year + ')</h3><p>Rating: ' + data.imdbRating + '<br/>Genre: ' + data.Genre + '<br/>Starring: ' + data.Actors + '</p></div>  <div id="view-photo-caption">' + data.Plot + '</div></div>';
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("livejournal", "rich", ["livejournal.com/"], "http://ljpic.seacrow.com/json/$2$4?jsonp=?"
-            , {
-                templateRegex: /(http:\/\/(((?!users).)+)\.livejournal\.com|.*users\.livejournal\.com\/([^\/]+)).*/,
-                templateData: function (data) {
-                    if (!data.username)
-                        return false;
-                    return  '<div><img src="' + data.image + '" align="left" style="margin-right: 1em;" /><span class="oembedall-ljuser"><a href="http://' + data.username + '.livejournal.com/profile"><img src="http://www.livejournal.com/img/userinfo.gif" alt="[info]" width="17" height="17" /></a><a href="http://' + data.username + '.livejournal.com/">' + data.username + '</a></span><br />' + data.name + '</div>';
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("circuitbee", "rich", ["circuitbee\\.com/circuit/view/.+"], "http://c.circuitbee.com/build/r/schematic-embed.html?id=$1",
-            {
-                templateRegex: /.*circuit\/view\/(\d+).*/,
-                embedtag: {
-                    tag: 'iframe',
-                    width: '500',
-                    height: '350'
-                }
-            }),
-
-        new $.fn.oembed.OEmbedProvider("googlecalendar", "rich", ["www.google.com/calendar/embed?.+"], "$1",
-            {templateRegex: /(.*)/, embedtag: {tag: 'iframe', width: '800', height: '600' }}),
-        new $.fn.oembed.OEmbedProvider("jsfiddle", "rich", ["jsfiddle.net/[^/]+/?"], "http://jsfiddle.net/$1/embedded/result,js,resources,html,css/?",
-            {templateRegex: /.*net\/([^\/]+).*/, embedtag: {tag: 'iframe', width: '100%', height: '300' }}),
-        new $.fn.oembed.OEmbedProvider("jsbin", "rich", ["jsbin.com/.+"], "http://jsbin.com/$1/?",
-            {templateRegex: /.*com\/([^\/]+).*/, embedtag: {tag: 'iframe', width: '100%', height: '300' }}),
-        new $.fn.oembed.OEmbedProvider("jotform", "rich", ["form.jotform.co/form/.+"], "$1?",
-            {templateRegex: /(.*)/, embedtag: {tag: 'iframe', width: '100%', height: '507' }}),
-        new $.fn.oembed.OEmbedProvider("reelapp", "rich", ["reelapp\\.com/.+"], "http://www.reelapp.com/$1/embed",
-            {templateRegex: /.*com\/(\S{6}).*/, embedtag: {tag: 'iframe', width: '400', height: '338'}}),
-        new $.fn.oembed.OEmbedProvider("linkedin", "rich", ["linkedin.com/pub/.+"], "https://www.linkedin.com/cws/member/public_profile?public_profile_url=$1&format=inline&isFramed=true",
-            {templateRegex: /(.*)/, embedtag: {tag: 'iframe', width: '368px', height: 'auto'}}),
-        new $.fn.oembed.OEmbedProvider("timetoast", "rich", ["timetoast.com/timelines/[0-9]+"], "http://www.timetoast.com/flash/TimelineViewer.swf?passedTimelines=$1",
-            {templateRegex: /.*timelines\/([0-9]*)/, embedtag: { width: 550, height: 400}, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("pastebin", "rich", ["pastebin\\.com/[\\S]{8}"], "http://pastebin.com/embed_iframe.php?i=$1",
-            {templateRegex: /.*\/(\S{8}).*/, embedtag: {tag: 'iframe', width: '100%', height: 'auto'}}),
-        new $.fn.oembed.OEmbedProvider("mixlr", "rich", ["mixlr.com/.+"], "http://mixlr.com/embed/$1?autoplay=ae",
-            {templateRegex: /.*com\/([^\/]+).*/, embedtag: {tag: 'iframe', width: '100%', height: 'auto' }}),
-        new $.fn.oembed.OEmbedProvider("pastie", "rich", ["pastie\\.org/pastes/.+"], null, {yql: {xpath: '//pre[@class="textmate-source"]'}}),
-        new $.fn.oembed.OEmbedProvider("github", "rich", ["gist.github.com/.+"], "https://github.com/api/oembed"),
-        new $.fn.oembed.OEmbedProvider("github", "rich", ["github.com/[-.\\w@]+/[-.\\w@]+"], "https://api.github.com/repos/$1/$2?callback=?"
-            , {templateRegex: /.*\/([^\/]+)\/([^\/]+).*/,
-                templateData: function (data) {
-                    if (!data.data.html_url)return false;
-                    return  '<div class="oembedall-githubrepos"><ul class="oembedall-repo-stats"><li>' + data.data.language + '</li><li class="oembedall-watchers"><a title="Watchers" href="' + data.data.html_url + '/watchers">&#x25c9; ' + data.data.watchers + '</a></li>'
-                        + '<li class="oembedall-forks"><a title="Forks" href="' + data.data.html_url + '/network">&#x0265; ' + data.data.forks + '</a></li></ul><h3><a href="' + data.data.html_url + '">' + data.data.name + '</a></h3><div class="oembedall-body"><p class="oembedall-description">' + data.data.description + '</p>'
-                        + '<p class="oembedall-updated-at">Last updated: ' + data.data.pushed_at + '</p></div></div>';
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("facebook", "rich", ["facebook.com"], null
-            , {templateRegex: /.*\/([^\/]+)\/([^\/]+).*/,
-                template: function (url) {
-                    // adding script directly to DOM to make sure that it is loaded correctly.
-                    if (!$.fn.oembed.facebokScriptHasBeenAdded) {
-                        $('<div id="fb-root"></div>').appendTo('body');
-                        var script = document.createElement('script');
-                        script.type = 'text/javascript';
-                        script.text = '(function(d, s, id) {var js, fjs = d.getElementsByTagName(s)[0];if (d.getElementById(id)) return;js = d.createElement(s); js.id = id;js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";fjs.parentNode.insertBefore(js, fjs);}(document, "script", "facebook-jssdk"));';
-                        document.body.appendChild(script);
-                        $.fn.oembed.facebokScriptHasBeenAdded = true;
-                    }
-
-                    // returning template with url of facebook post.
-                    return '<div class="fb-post" data-href="' + url + '" data-width="520"><div class="fb-xfbml-parse-ignore"><a href="' + url + '"></div></div>';
-
-                }
-            }),
-        /*
-         // Saving old implementation of Facebook in case we will need it as example in the future.
-         new $.fn.oembed.OEmbedProvider("facebook", "rich", ["facebook.com/(people/[^\\/]+/\\d+|[^\\/]+$)"], "https://graph.facebook.com/$2$3/?callback=?"
-         ,{templateRegex:/.*facebook.com\/(people\/[^\/]+\/(\d+).*|([^\/]+$))/,
-         templateData : function(data){ if(!data.id)return false;
-         var out =  '<div class="oembedall-facebook1"><div class="oembedall-facebook2"><a href="http://www.facebook.com/">facebook</a> ';
-         if(data.from) out += '<a href="http://www.facebook.com/'+data.from.id+'">'+data.from.name+'</a>';
-         else if(data.link) out += '<a href="'+data.link+'">'+data.name+'</a>';
-         else if(data.username) out += '<a href="http://www.facebook.com/'+data.username+'">'+data.name+'</a>';
-         else out += '<a href="http://www.facebook.com/'+data.id+'">'+data.name+'</a>';
-         out += '</div><div class="oembedall-facebookBody"><div class="contents">';
-         if(data.picture) out += '<a href="'+data.link+'"><img src="'+data.picture+'"></a>';
-         else out += '<img src="https://graph.facebook.com/'+data.id+'/picture">';
-         if(data.from) out += '<a href="'+data.link+'">'+data.name+'</a>';
-         if(data.founded) out += 'Founded: <strong>'+data.founded+'</strong><br>';
-         if(data.category) out += 'Category: <strong>'+data.category+'</strong><br>';
-         if(data.website) out += 'Website: <strong><a href="'+data.website+'">'+data.website+'</a></strong><br>';
-         if(data.gender) out += 'Gender: <strong>'+data.gender+'</strong><br>';
-         if(data.description) out += data.description + '<br>';
-         out += '</div></div>';
-         return out;
-         }
-         }),
-         */
-        new $.fn.oembed.OEmbedProvider("stackoverflow", "rich", ["stackoverflow.com/questions/[\\d]+"], "http://api.stackoverflow.com/1.1/questions/$1?body=true&jsonp=?"
-            , {templateRegex: /.*questions\/([\d]+).*/,
-                templateData: function (data) {
-                    if (!data.questions)
-                        return false;
-                    var q = data.questions[0];
-                    var body = $(q.body).text();
-                    var out = '<div class="oembedall-stoqembed"><div class="oembedall-statscontainer"><div class="oembedall-statsarrow"></div><div class="oembedall-stats"><div class="oembedall-vote"><div class="oembedall-votes">'
-                        + '<span class="oembedall-vote-count-post"><strong>' + (q.up_vote_count - q.down_vote_count) + '</strong></span><div class="oembedall-viewcount">vote(s)</div></div>'
-                        + '</div><div class="oembedall-status"><strong>' + q.answer_count + '</strong>answer</div></div><div class="oembedall-views">' + q.view_count + ' view(s)</div></div>'
-                        + '<div class="oembedall-summary"><h3><a class="oembedall-question-hyperlink" href="http://stackoverflow.com/questions/' + q.question_id + '/">' + q.title + '</a></h3>'
-                        + '<div class="oembedall-excerpt">' + body.substring(0, 100) + '...</div><div class="oembedall-tags">';
-                    for (i in q.tags) {
-                        out += '<a title="" class="oembedall-post-tag" href="http://stackoverflow.com/questions/tagged/' + q.tags[i] + '">' + q.tags[i] + '</a>';
-                    }
-
-                    out += '</div><div class="oembedall-fr"><div class="oembedall-user-info"><div class="oembedall-user-gravatar32"><a href="http://stackoverflow.com/users/' + q.owner.user_id + '/' + q.owner.display_name + '">'
-                        + '<img width="32" height="32" alt="" src="http://www.gravatar.com/avatar/' + q.owner.email_hash + '?s=32&amp;d=identicon&amp;r=PG"></a></div><div class="oembedall-user-details">'
-                        + '<a href="http://stackoverflow.com/users/' + q.owner.user_id + '/' + q.owner.display_name + '">' + q.owner.display_name + '</a><br><span title="reputation score" class="oembedall-reputation-score">'
-                        + q.owner.reputation + '</span></div></div></div></div></div>';
-                    return out;
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("wordpress", "rich", ["wordpress\\.com/.+", "blogs\\.cnn\\.com/.+", "techcrunch\\.com/.+", "wp\\.me/.+"], "http://public-api.wordpress.com/oembed/1.0/?for=jquery-oembed-all"),
-        new $.fn.oembed.OEmbedProvider("screenr", "rich", ["screenr\.com"], "http://www.screenr.com/embed/$1",
-            {templateRegex: /.*\/([^\/]+).*/, embedtag: {tag: 'iframe', width: '650', height: 396}}) ,
-        new $.fn.oembed.OEmbedProvider("gigpans", "rich", ["gigapan\\.org/[-.\\w@]+/\\d+"], "http://gigapan.org/gigapans/$1/options/nosnapshots/iframe/flash.html",
-            {templateRegex: /.*\/(\d+)\/?.*/, embedtag: {tag: 'iframe', width: '100%', height: 400 }}),
-        new $.fn.oembed.OEmbedProvider("scribd", "rich", ["scribd\\.com/.+"], "http://www.scribd.com/embeds/$1/content?start_page=1&view_mode=list",
-            {templateRegex: /.*doc\/([^\/]+).*/, embedtag: {tag: 'iframe', width: '100%', height: 600}}),
-        new $.fn.oembed.OEmbedProvider("kickstarter", "rich", ["kickstarter\\.com/projects/.+"], "$1/widget/card.html",
-            {templateRegex: /([^\?]+).*/, embedtag: {tag: 'iframe', width: '220', height: 380}}),
-        new $.fn.oembed.OEmbedProvider("amazon", "rich", ["amzn.com/B+", "amazon.com.*/(B\\S+)($|\\/.*)"], "http://rcm.amazon.com/e/cm?t=_APIKEY_&o=1&p=8&l=as1&asins=$1&ref=qf_br_asin_til&fc1=000000&IS2=1&lt1=_blank&m=amazon&lc1=0000FF&bc1=000000&bg1=FFFFFF&f=ifr",
-            {
-                apikey: true,
-                templateRegex: /.*\/(B[0-9A-Z]+)($|\/.*)/,
-                embedtag: {
-                    tag: 'iframe',
-                    width: '120px',
-                    height: '240px'}
-            }),
-        new $.fn.oembed.OEmbedProvider("slideshare", "rich", ["slideshare\.net"], "//www.slideshare.net/api/oembed/2", {format: 'jsonp'}),
-        new $.fn.oembed.OEmbedProvider("roomsharejp", "rich", ["roomshare\\.jp/(en/)?post/.*"], "http://roomshare.jp/oembed.json"),
-        new $.fn.oembed.OEmbedProvider("lanyard", "rich", ["lanyrd.com/\\d+/.+"], null,
-            {
-                yql: {
-                    xpath: '(//div[@class="primary"])[1]',
-                    from: 'htmlstring',
-                    datareturn: function (results) {
-                        if (!results.result)
-                            return false;
-                        return '<div class="oembedall-lanyard">' + results.result + '</div>';
-                    }
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("asciiartfarts", "rich", ["asciiartfarts.com/\\d+.html"], null,
-            {
-                yql: {
-                    xpath: '//pre/font',
-                    from: 'htmlstring',
-                    datareturn: function (results) {
-                        if (!results.result)
-                            return false;
-                        return '<pre style="background-color:#000;">' + results.result + '</div>';
-                    }
-                }
-            }),
-        new $.fn.oembed.OEmbedProvider("coveritlive", "rich", ["coveritlive.com/"], null, {
-            templateRegex: /(.*)/,
-            template: '<iframe src="$1" allowtransparency="true" scrolling="no" width="615px" frameborder="0" height="625px"></iframe>'}),
-        new $.fn.oembed.OEmbedProvider("polldaddy", "rich", ["polldaddy.com/"], null, {
-            templateRegex: /(?:https?:\/\/w?w?w?.?polldaddy.com\/poll\/)([0-9]*)\//,
-            template: '<script async type="text/javascript" charset="utf-8" src="http://static.polldaddy.com/p/$1.js"></script>',
-            nocache: 1
-        }),
-        new $.fn.oembed.OEmbedProvider("360io", "rich", ["360\\.io/.+"], "http://360.io/$1", {templateRegex: /.*360\.io\/(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("bubbli", "rich", ["on\\.bubb\\.li/.+"], "http://on.bubb.li/$1", {templateRegex: /.*on\.bubb\.li\/(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("cloudup", "rich", ["cloudup\\.com/.+"], "http://cloudup.com/$1?chromeless", {templateRegex: [/.*cloudup\.com\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }}),
-        new $.fn.oembed.OEmbedProvider("codepen", "rich", ["codepen.io/.+"], "http://codepen.io/$1/embed/$2", {templateRegex: [/.*io\/(\w+)\/pen\/(\w+).*/, /.*io\/(\w+)\/full\/(\w+).*/], embedtag: {tag: 'iframe', width: '100%', height: '300'}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("googleviews", "rich", ["(.*maps\\.google\\.com\\/maps\\?).+(output=svembed).+(cbp=(.*)).*"], "https://maps.google.com/maps?layer=c&panoid=$3&ie=UTF8&source=embed&output=svembed&cbp=$5", {templateRegex: /(.*maps\.google\.com\/maps\?).+(panoid=(\w+)&).*(cbp=(.*)).*/, embedtag: {tag: 'iframe', width: 480, height: 360}, nocache: 1 }),
-        new $.fn.oembed.OEmbedProvider("googlemaps", "rich", ["google\\.com\/maps\/place/.+"], "http://maps.google.com/maps?t=m&q=$1&output=embed", {templateRegex: /.*google\.com\/maps\/place\/([\w\+]*)\/.*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("imajize", "rich", ["embed\\.imajize\\.com/.+"], "http://embed.imajize.com/$1", {templateRegex: /.*embed\.imajize\.com\/(.*)/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("mapjam", "rich", ["mapjam\\.com/.+"], "http://www.mapjam.com/$1", {templateRegex: /.*mapjam\.com\/(.*)/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("polar", "rich", ["polarb\\.com/.+"], "http://assets-polarb-com.a.ssl.fastly.net/api/v4/publishers/unknown/embedded_polls/iframe?poll_id=$1", {templateRegex: /.*polarb\.com\/polls\/(\w+).*/, embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-        new $.fn.oembed.OEmbedProvider("ponga", "rich", ["ponga\\.com/.+"], "https://www.ponga.com/embedded?id=$1", {templateRegex: [/.*ponga\.com\/embedded\?id=(\w+).*/, /.*ponga\.com\/(\w+).*/], embedtag: {tag: 'iframe', width: 480, height: 360 }, nocache: 1}),
-
-    ];
-})(jQuery);
-//This is needed for gravatar :(
-String.prototype.md5=function(){var a=function(a,b){var c=(a&65535)+(b&65535);var d=(a>>16)+(b>>16)+(c>>16);return d<<16|c&65535};var b=function(a,b){return a<<b|a>>>32-b};var c=function(c,d,e,f,g,h){return a(b(a(a(d,c),a(f,h)),g),e)};var d=function(a,b,d,e,f,g,h){return c(b&d|~b&e,a,b,f,g,h)};var e=function(a,b,d,e,f,g,h){return c(b&e|d&~e,a,b,f,g,h)};var f=function(a,b,d,e,f,g,h){return c(b^d^e,a,b,f,g,h)};var g=function(a,b,d,e,f,g,h){return c(d^(b|~e),a,b,f,g,h)};var h=function(b){var c,h,i,j,k,l=b.length;var m=1732584193;var n=-271733879;var o=-1732584194;var p=271733878;for(k=0;k<l;k+=16){c=m;h=n;i=o;j=p;m=d(m,n,o,p,b[k+0],7,-680876936);p=d(p,m,n,o,b[k+1],12,-389564586);o=d(o,p,m,n,b[k+2],17,606105819);n=d(n,o,p,m,b[k+3],22,-1044525330);m=d(m,n,o,p,b[k+4],7,-176418897);p=d(p,m,n,o,b[k+5],12,1200080426);o=d(o,p,m,n,b[k+6],17,-1473231341);n=d(n,o,p,m,b[k+7],22,-45705983);m=d(m,n,o,p,b[k+8],7,1770035416);p=d(p,m,n,o,b[k+9],12,-1958414417);o=d(o,p,m,n,b[k+10],17,-42063);n=d(n,o,p,m,b[k+11],22,-1990404162);m=d(m,n,o,p,b[k+12],7,1804603682);p=d(p,m,n,o,b[k+13],12,-40341101);o=d(o,p,m,n,b[k+14],17,-1502002290);n=d(n,o,p,m,b[k+15],22,1236535329);m=e(m,n,o,p,b[k+1],5,-165796510);p=e(p,m,n,o,b[k+6],9,-1069501632);o=e(o,p,m,n,b[k+11],14,643717713);n=e(n,o,p,m,b[k+0],20,-373897302);m=e(m,n,o,p,b[k+5],5,-701558691);p=e(p,m,n,o,b[k+10],9,38016083);o=e(o,p,m,n,b[k+15],14,-660478335);n=e(n,o,p,m,b[k+4],20,-405537848);m=e(m,n,o,p,b[k+9],5,568446438);p=e(p,m,n,o,b[k+14],9,-1019803690);o=e(o,p,m,n,b[k+3],14,-187363961);n=e(n,o,p,m,b[k+8],20,1163531501);m=e(m,n,o,p,b[k+13],5,-1444681467);p=e(p,m,n,o,b[k+2],9,-51403784);o=e(o,p,m,n,b[k+7],14,1735328473);n=e(n,o,p,m,b[k+12],20,-1926607734);m=f(m,n,o,p,b[k+5],4,-378558);p=f(p,m,n,o,b[k+8],11,-2022574463);o=f(o,p,m,n,b[k+11],16,1839030562);n=f(n,o,p,m,b[k+14],23,-35309556);m=f(m,n,o,p,b[k+1],4,-1530992060);p=f(p,m,n,o,b[k+4],11,1272893353);o=f(o,p,m,n,b[k+7],16,-155497632);n=f(n,o,p,m,b[k+10],23,-1094730640);m=f(m,n,o,p,b[k+13],4,681279174);p=f(p,m,n,o,b[k+0],11,-358537222);o=f(o,p,m,n,b[k+3],16,-722521979);n=f(n,o,p,m,b[k+6],23,76029189);m=f(m,n,o,p,b[k+9],4,-640364487);p=f(p,m,n,o,b[k+12],11,-421815835);o=f(o,p,m,n,b[k+15],16,530742520);n=f(n,o,p,m,b[k+2],23,-995338651);m=g(m,n,o,p,b[k+0],6,-198630844);p=g(p,m,n,o,b[k+7],10,1126891415);o=g(o,p,m,n,b[k+14],15,-1416354905);n=g(n,o,p,m,b[k+5],21,-57434055);m=g(m,n,o,p,b[k+12],6,1700485571);p=g(p,m,n,o,b[k+3],10,-1894986606);o=g(o,p,m,n,b[k+10],15,-1051523);n=g(n,o,p,m,b[k+1],21,-2054922799);m=g(m,n,o,p,b[k+8],6,1873313359);p=g(p,m,n,o,b[k+15],10,-30611744);o=g(o,p,m,n,b[k+6],15,-1560198380);n=g(n,o,p,m,b[k+13],21,1309151649);m=g(m,n,o,p,b[k+4],6,-145523070);p=g(p,m,n,o,b[k+11],10,-1120210379);o=g(o,p,m,n,b[k+2],15,718787259);n=g(n,o,p,m,b[k+9],21,-343485551);m=a(m,c);n=a(n,h);o=a(o,i);p=a(p,j)}return[m,n,o,p]};var i=function(a){var b="0123456789abcdef",c="",d,e=a.length*4;for(d=0;d<e;d++){c+=b.charAt(a[d>>2]>>d%4*8+4&15)+b.charAt(a[d>>2]>>d%4*8&15)}return c};var j=function(a){var b=(a.length+8>>6)+1;var c=[],d,e=b*16,f,g=a.length;for(d=0;d<e;d++){c.push(0)}for(f=0;f<g;f++){c[f>>2]|=(a.charCodeAt(f)&255)<<f%4*8}c[f>>2]|=128<<f%4*8;c[b*16-2]=g*8;return c};return i(h(j(this)))};

addons/oembed/oembed.addon.php

@@ -1,16 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-{
-	exit();
-}
-
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == 'HTML')
-{
-	Context::loadFile('./addons/oembed/jquery.oembed.css');
-	Context::loadFile(array('./addons/oembed/jquery.oembed.js', 'body', '', null), true);
-	Context::loadFile(array('./addons/oembed/oembed.js', 'body', '', null), true);
-}
-
-/* End of file */

addons/oembed/oembed.js

@@ -1,132 +0,0 @@
-/**
- * @file oembed.js
- * @brief javascript code for oembed addon
- * @author NAVER (developers@xpressengine.com)
- */
-(function($){
-	var protocol_re = '(https?|ftp|news|telnet|irc|mms)://';
-	var domain_re   = '(?:[\\w\\-]+\\.)+(?:[a-z]+)';
-	var max_255_re  = '(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])';
-	var ip_re       = '(?:'+max_255_re+'\\.){3}'+max_255_re;
-	var port_re     = '(?::([0-9]+))?';
-	var user_re     = '(?:/~[\\w-]+)?';
-	var path_re     = '((?:/[\\w!"$-/:-@]+)*)';
-	var hash_re     = '(?:#([\\w!-@]+))?';
-
-	var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+user_re+path_re+hash_re+')', 'ig');
-
-	var OEmbed = xe.createPlugin("OEmbed", {
-		targets : [],
-		init : function() {
-			this.targets = [];
-			this.enableAutoLink = false;
-			this.castedOembedA = false;
-			this.embedSetting = [];
-			// this.embedSetting.embedMethod = 'replace';
-		},
-		API_ONREADY : function() {
-			var thisPlugin = this;
-
-			// extract target text nodes
-			this.extractTargets($('.xe_content'));
-
-			if(this.oApp.getPlugin('autolink').length)
-			{
-				this.enableAutoLink = true;
-			}
-			thisPlugin.cast('OEMBEDA');
-
-			if(!this.enableAutoLink)
-			{
-				$(this.targets).each(function(){
-					thisPlugin.cast('OEMBED', [this]);
-				});
-			}
-		},
-		API_BEFORE_AUTOLINK : function(oSender, params) {
-			var thisPlugin = this;
-			thisPlugin.cast('OEMBEDA');
-		},
-		API_AFTER_AUTOLINK : function(oSender, params) {
-			this.oembed(params[0]);
-		},
-		API_OEMBED : function(oSender, params) {
-			if(this.enableAutoLink) return;
-			var thisPlugin = this;
-
-			var textNode = params[0];
-			if(!$(textNode).parent().length || $(textNode).parent().get(0).nodeName.toLowerCase() == 'a')
-			{
-				this.oembed($(textNode));
-				return;
-			}
-			var content  = textNode.nodeValue;
-			var dummy    = $('<span>');
-
-			content = content.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-			content = content.replace(url_regex, '<a href="$1" target="_blank">$1</a>');
-
-			$(textNode).before(dummy);
-			$(textNode).replaceWith(content);
-			params[0] = dummy.next('a');
-			dummy.remove();
-
-			this.oembed(params[0]);
-		},
-		API_OEMBEDA : function(oSender, params) {
-			if(this.castedOembedA) return;
-			var thisPlugin = this;
-
-			this.castedOembedA = true;
-
-			$('.read_body a').not('_oembed').each(function(){
-				thisPlugin.oembed($(this));
-			});
-		},
-		oembed : function(target) {
-			var thisPlugin = this;
-
-			if(!this.embedSetting.maxWidth)
-			{
-				this.embedSetting.maxWidth = $('.xe_content').width();
-			}
-
-			if(!target) return;
-			if(target && target.nodeType == 3) target = $(target);
-
-			target.oembed(null, thisPlugin.embedSetting).addClass('_oembed');
-		},
-		extractTargets : function(obj) {
-			var thisPlugin = this;
-			var wrap = $('.xe_content', obj);
-			if(wrap.length) {
-				this.extractTargets(wrap);
-				return;
-			}
-
-			$(obj)
-			.contents()
-			.each(function(){
-				var node_name = this.nodeName.toLowerCase();
-				if($.inArray(node_name, ['a', 'pre', 'xml', 'textarea', 'input', 'select', 'option', 'code', 'script', 'style', 'iframe', 'button', 'img', 'embed', 'object', 'ins']) != -1) return;
-
-				// FIX ME : When this meanless code wasn't executed, url_regex do not run correctly. why?
-				url_regex.exec('');
-
-				if(this.nodeType == 3) { // text node
-					var content = this.nodeValue;
-
-					if(content.length < 5) return;
-
-					if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(content)) return;
-
-					thisPlugin.targets.push(this);
-				} else {
-					thisPlugin.extractTargets(this);
-				}
-			});
-		}
-	});
-
-	xe.registerPlugin(new OEmbed());
-})(jQuery);

addons/openid_delegation_id/conf/info.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">OpenID delegation ID</title>
-    <title xml:lang="zh-CN">OpenID</title>
-    <title xml:lang="en">OpenID Delegation ID</title>
-    <title xml:lang="vi">OpenID Delegation ID</title>
-    <title xml:lang="ge">OpenID Delegation ID</title>
-    <title xml:lang="es">Delegación ID para OpenID</title>
-    <title xml:lang="jp">OpenIDアドオン</title>
-    <title xml:lang="ru">Открытый ID(OpenID)</title>
-    <title xml:lang="zh-TW">OpenID</title>
-    <description xml:lang="ko">
-        본인의 도메인을 사용하여 오픈아이디로 활용할 수 있도록 합니다.
-        꼭 설정을 통해서 openid provider관련 값을 입력후 사용해주세요.
-    </description>
-    <description xml:lang="zh-CN">
-        可以把本人的域名当分散式身份验证系统(OpenID)来使用。
-        必须在设置中输入openid provider相关值后再使用。
-    </description>
-    <description xml:lang="en">
-        This addon enables you to use your own domain name as an OpenID.
-        Just be sure to set the values related with openid provider before using.
-    </description>
-    <description xml:lang="vi">
-        Addon này cho phép bạn sử dụng tên miền của mình như một OpenID.
-        Hãy kiểm tra để đặt giá trị liên quan với OpenID trước khi sử dụng.
-    </description>
-    <description xml:lang="ge">
-        Dieses Addon ermöglicht es Ihnen, mit Ihrem eigenen Domain-Namen als OpenID.
-        Einfach sicher sein, dass die Werte im Zusammenhang mit OpenID-Provider, bevor Sie.
-    </description>
-    <description xml:lang="es">
-        Utlizando su propio dominio puede usar como OpenID.
-        Debe utilizar luego de ingresar los valores relacionado con openid provider a través de la configuracion.
-    </description>
-    <description xml:lang="jp">
-        保有しているオリジナルドメインをオープンＩＤとして活用することが出来ます。
-        必ず設定にて、OpenIDプロバイダーの関連情報を入力してから使用して下さい。
-    </description>
-    <description xml:lang="ru">
-        Этот аддон позволяет Вам использовать Ваше доменное имя как OpenID.
-        Прежде, чем использовать, установите значения, имеющие отношение к openid-провайдеру .
-    </description>
-    <description xml:lang="zh-TW">
-        可將原本的域名當做OpenID來使用。
-        必須在設置中輸入openid provider相關資料後再使用。
-    </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-        <name xml:lang="ge">NAVER</name>
-        <name xml:lang="es">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="ru">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
-    </author>
-
-    <extra_vars>
-        <var name="server">
-            <title xml:lang="ko">server</title>
-            <title xml:lang="zh-CN">server</title>
-            <title xml:lang="en">server</title>
-            <title xml:lang="vi">Server</title>
-            <title xml:lang="ge">server</title>
-            <title xml:lang="es">Servidor</title>
-            <title xml:lang="jp">server</title>
-            <title xml:lang="ru">server</title>
-            <title xml:lang="zh-TW">server</title>
-            <description xml:lang="ko">openid.server 값을 입력해 주세요.</description>
-            <description xml:lang="zh-CN">请输入 openid.server 值。</description>
-            <description xml:lang="vi">Hãy nhập OpenID Server của bạn.</description>
-			<description xml:lang="en">Please input your openid.server value.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre openid.server Wert.</description>
-            <description xml:lang="es">Ingrese el valor del openid.server.</description>
-            <description xml:lang="jp">openid.server値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.server</description>
-            <description xml:lang="zh-TW">請輸入 openid.server 值。</description>
-        </var>
-        <var name="delegate">
-            <title xml:lang="ko">delegate</title>
-            <title xml:lang="en">delegate</title>
-            <title xml:lang="vi">Delegate</title>
-            <title xml:lang="ge">delegate</title>
-            <title xml:lang="zh-CN">delegate</title>
-            <title xml:lang="es">delegado</title>
-            <title xml:lang="jp">delegate</title>
-            <title xml:lang="ru">delegate</title>
-            <title xml:lang="zh-TW">delegate</title>
-            <description xml:lang="ko">openid.delegate값을 입력해주세요.</description>
-            <description xml:lang="zh-CN">请输入 openid.delegate 值。</description>
-            <description xml:lang="vi">Hãy nhập OpenID Delegate của bạn.</description>
-			<description xml:lang="en">Please input your openid.delegate value.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre openid.delegate Wert.</description>
-            <description xml:lang="es">Ingresar el valor del openid.delegate</description>
-            <description xml:lang="jp">openid.delegate値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.delegate</description>
-            <description xml:lang="zh-TW">請輸入 openid.delegate 值。</description>
-        </var>
-        <var name="xrds">
-            <title xml:lang="ko">xrds</title>
-            <title xml:lang="zh-CN">xrds</title>
-            <title xml:lang="en">xrds</title>
-            <title xml:lang="vi">xrds</title>
-            <title xml:lang="ge">xrds</title>
-            <title xml:lang="es">xrds</title>
-            <title xml:lang="jp">xrds</title>
-            <title xml:lang="ru">xrds</title>
-            <title xml:lang="zh-TW">xrds</title>
-            <description xml:lang="ko">X-XRDS-Location값을 입력해주세요.</description>
-            <description xml:lang="zh-CN">请输入 X-XRDS-Location 值。</description>
-            <description xml:lang="en">Please input your X-XRDS-Location value.</description>
-            <description xml:lang="vi">Hãy nhập X-XRDS-Location của bạn.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre X-XRDS-Standort Wert.</description>
-            <description xml:lang="es">Ingresar el valor de X-XRDS-Location</description>
-            <description xml:lang="jp">X-XRDS-Location値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение X-XRDS-Локации.</description>
-            <description xml:lang="zh-TW">請輸入 X-XRDS-Location 值。</description>
-        </var>
-    </extra_vars>
-</addon>

addons/openid_delegation_id/openid_delegation_id.addon.php

@@ -1,38 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-	exit();
-
-/**
- * @file openid_delegation_id.addon.php
- * @author NAVER (developers@xpressengine.com)
- * @brief OpenID Delegation ID Add-on
- *
- * This enables to use openID as user's homepage or blog url.
- * Enter your open ID service information on the configuration.
- * */
-// Execute only wen called_position is before_module_init
-if($called_position != 'before_module_init')
-{
-	return;
-}
-// Get add-on settings(openid_delegation_id)
-if(!$addon_info->server || !$addon_info->delegate || !$addon_info->xrds)
-{
-	return;
-}
-
-$header_script = sprintf(
-		'<link rel="openid.server" href="%s" />' . "\n" .
-		'<link rel="openid.delegate" href="%s" />' . "\n" .
-		'<meta http-equiv="X-XRDS-Location" content="%s" />',
-		$addon_info->server,
-		$addon_info->delegate,
-		$addon_info->xrds
-);
-
-Context::addHtmlHeader($header_script);
-
-/* End of file openid_delegation_id.addon.php */
-/* Location: ./addons/openid_delegation_id/openid_delegation_id.addon.php */

addons/photoswipe/conf/info.xml

@@ -6,11 +6,11 @@
 		본문 이미지를 하나의 갤러리 처럼 볼 수 있도록 하는 애드온입니다.
 	</description>
 	<description xml:lang="en">
-		Swipe your images of an document on your screens.
+		Swipe your images of a post on your screen.
 	</description>
 	<license>MIT License (codes from http://photoswipe.com/), GPLv2 (other codes by Rhymix contributors)</license>
-	<version>1.0.1</version>
-	<date>2016-04-27</date>
+	<version>RX_VERSION</version>
+	<date>RX_CORE</date>
 
 	<author email_address="misol.kr@gmail.com" link="https://github.com/misol">
 		<name xml:lang="ko">misol</name>
@@ -20,4 +20,20 @@
 		<name xml:lang="ko">Rhymix contributors</name>
 		<name xml:lang="en">Rhymix contributors</name>
 	</author>
-</addon>
+	<extra_vars>
+		<var name="display_name" type="select">
+			<title xml:lang="ko">파일이름 출력 설정</title>
+			<title xml:lang="en">Display Filenames</title>
+			<description xml:lang="ko">넘겨보기 실행시 하단에 파일이름을 출력할 것인지 여부를 선택합니다. 기본값은 사용하도록 되어있습니다.</description>
+			<description xml:lang="en">Whether the PhotoSwipe displays the filenames or not. The default is to display.</description>
+			<options value="block">
+				<title xml:lang="ko">사용</title>
+				<title xml:lang="en">Display</title>
+			</options>
+			<options value="none">
+				<title xml:lang="ko">사용 안함</title>
+				<title xml:lang="en">Hide</title>
+			</options>
+		</var>
+	</extra_vars>
+</addon>

addons/photoswipe/photoswipe.addon.php

@@ -21,7 +21,10 @@ if($called_position == 'after_module_proc' && Context::getResponseMethod() == "H
 	Context::loadFile(array('./addons/photoswipe/rx_photoswipe.js', 'body', '', null), true);
 
 	$footer = FileHandler::readFile('./addons/photoswipe/PhotoSwipe/pswp.html');
-	Context::addHtmlFooter($footer);
+
+	$style_display = isset($addon_info->display_name) ? "<style>.pswp__caption__center {  display:{$addon_info->display_name} }</style>" : '<style>.pswp__caption__center {  display:block }</style>';
+
+	Context::addHtmlFooter($style_display . $footer);
 }
 
 /* End of file photoswipe.addon.php */

addons/photoswipe/rx_photoswipe.js

@@ -1,12 +1,14 @@
 /* Modified version of a http://photoswipe.com/documentation/getting-started.html example. Modified by misol for rhymix */
-var getPSImageSize = function(src) {
-	var testImg = new Image();
-	testImg.src = src;
-
+var getPSImageSize = function(el) {
 	var size = new Array();
-	size[0] = testImg.width;
-	size[1] = testImg.height;
-
+	size[0] = el.naturalWidth ? el.naturalWidth : (el.width ? el.width : 0);
+	size[1] = el.naturalHeight ? el.naturalHeight : (el.height ? el.height : 0);
+	if (!size[0] || !size[1]) {
+		var test = new Image();
+		test.src = el.src;
+		size[0] = test.naturalWidth ? test.naturalWidth : (test.width ? test.width : 1000);
+		size[1] = test.naturalHeight ? test.naturalHeight : (test.height ? test.height : 1000);
+	}
 	return size;
 }
 
@@ -23,7 +25,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 	// CSS selector for photoswipe items.
 	var ps_find_selector = 'img:not(' + ps_skip_elements + ps_skip_class + '), img' + ps_enroll_class;
 
-	// parse slide data (url, title, size ...) from DOM elements 
+	// parse slide data (url, title, size ...) from DOM elements
 	// (children of gallerySelector)
 	var parseThumbnailElements = function(el) {
 		var imgElements = $(el).find(ps_find_selector),
@@ -37,12 +39,12 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 
 			imgEl = imgElements.get(i); // <img> element
 
-			// include only element nodes 
-			if(imgEl.nodeType !== 1 || !$(imgEl).attr('data-pswp-pid')) {
+			// include only element nodes
+			if (imgEl.nodeType !== 1 || !imgEl.src || !$(imgEl).attr('data-pswp-pid')) {
 				continue;
 			}
 
-			size = getPSImageSize($(imgEl).attr('src'));
+			size = getPSImageSize(imgEl);
 
 			// create slide object
 			item = {
@@ -54,11 +56,11 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 
 			var ps_skip_alt_class = '.photoswipe-no-caption';
 			if(imgEl.alt && !$(imgEl).is(ps_skip_alt_class)) {
-				item.title = imgEl.alt; 
+				item.title = imgEl.alt;
 			}
 
 			if(imgEl.title && !$(imgEl).is(ps_skip_alt_class)) {
-				item.title = imgEl.title; 
+				item.title = imgEl.title;
 			}
 
 			item.el = imgEl; // save link to element for getThumbBoundsFn
@@ -85,7 +87,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 		if(!clickedListItem) {
 			return;
 		}
-		
+
 		e = e || window.event;
 		e.preventDefault ? e.preventDefault() : e.returnValue = false;
 
@@ -106,8 +108,8 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 		}*/
 
 		for (var i = 0; i < numChildNodes; i++) {
-			if(childNodes[i].nodeType !== 1 || !$(childNodes[i]).attr('data-pswp-pid')) { 
-				continue; 
+			if(childNodes[i].nodeType !== 1 || !$(childNodes[i]).attr('data-pswp-pid')) {
+				continue;
 			}
 
 			if(childNodes[i] === clickedListItem) {
@@ -138,7 +140,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 			if(!vars[i]) {
 				continue;
 			}
-			var pair = vars[i].split('=');  
+			var pair = vars[i].split('=');
 			if(pair.length < 2) {
 				continue;
 			}
@@ -170,7 +172,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 				// See Options -> getThumbBoundsFn section of documentation for more info
 				var thumbnail = items[index].el,
 					pageYScroll = window.pageYOffset || document.documentElement.scrollTop,
-					rect = thumbnail.getBoundingClientRect(); 
+					rect = thumbnail.getBoundingClientRect();
 
 				return {x:rect.left, y:rect.top + pageYScroll, w:rect.width};
 			},
@@ -189,7 +191,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 		// PhotoSwipe opened from URL
 		if(fromURL) {
 			if(options.galleryPIDs) {
-				// parse real index when custom PIDs are used 
+				// parse real index when custom PIDs are used
 				// http://photoswipe.com/documentation/faq.html#custom-pid-in-url
 				for(var j = 0; j < items.length; j++) {
 					if(items[j].pid == index) {
@@ -230,6 +232,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 		var regx_skip = /(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i;
 		var regx_allow_i6pngfix = /(?:common\/tpl\/images\/blank\.gif$)/i;
 
+		var isMobile = String(navigator.userAgent).match(/mobile/i);
 		var galleryImgEls = $(galleryElements[i]).find(ps_find_selector);
 		for(var j = 0, jl = galleryImgEls.length; j < jl; j++) {
 			// skip components
@@ -238,6 +241,11 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 			//$(galleryImgEls[j]).attr('data-pswp-uid', i+1);
 			$(galleryImgEls[j]).attr('data-pswp-pid', j+1);
 
+			// Fix stretching of image on mobile
+			if (isMobile) {
+				galleryImgEls[j].style.height = 'auto';
+				galleryImgEls[j].height = null;
+			}
 		}
 	}
 
@@ -256,4 +264,4 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
 
 
 // execute above function
-initPhotoSwipeFromDOM('.xe_content');
+initPhotoSwipeFromDOM('.rhymix_content, .xe_content');

addons/point_level_icon/conf/info.xml

@@ -45,8 +45,8 @@
         使用點數系統時，可以在用戶名前顯示等級圖案。
         等級圖案可以在模組 > 點數系統中進行選擇。
     </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <version>RX_VERSION</version>
+    <date>RX_CORE</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="ko">NAVER</name>

addons/point_level_icon/point_level_icon.addon.php

@@ -17,7 +17,7 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP
 	return;
 }
 
-require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php');
+require_once __DIR__ . '/point_level_icon.lib.php';
 
 $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', function($matches) use($addon_info) {
 	return pointLevelIconTrans($matches, $addon_info);

addons/point_level_icon/point_level_icon.lib.php

@@ -13,7 +13,7 @@ function pointLevelIconTrans($matches, $addon_info)
 		return $matches[0];
 	}
 
-	if($addon_info->icon_duplication != 'N')
+	if(!isset($addon_info->icon_duplication) || $addon_info->icon_duplication !== 'N')
 	{
 		// Check Group Image Mark
 		$oMemberModel = getModel('member');
@@ -28,41 +28,41 @@ function pointLevelIconTrans($matches, $addon_info)
 	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
 	{
 		// Get point configuration
-		if(!$GLOBALS['_pointConfig'])
+		if(!isset($GLOBALS['_pointConfig']))
 		{
-			$oModuleModel = getModel('module');
-			$GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
+			$GLOBALS['_pointConfig'] = getModel('module')->getModuleConfig('point') ?? new stdClass;
 		}
 		$config = $GLOBALS['_pointConfig'];
 
 		// Get point model
-		if(!$GLOBALS['_pointModel'])
+		if(!isset($GLOBALS['_pointModel']))
 		{
 			$GLOBALS['_pointModel'] = getModel('point');
 		}
-		$oPointModel = &$GLOBALS['_pointModel'];
+		$oPointModel = $GLOBALS['_pointModel'];
 
 		// Get points
-		if(!$oPointModel->isExistsPoint($member_srl))
+		$exists = false;
+		$point = $oPointModel->getPoint($member_srl, false, $exists);
+		if(!$exists)
 		{
 			return $matches[0];
 		}
 
-		$point = $oPointModel->getPoint($member_srl);
-
 		// Get level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 		$text = $matches[5];
 
 		// Get a path where level icon is
-		$level_icon = sprintf('%smodules/point/icons/%s/%d.gif', Context::getRequestUri(), $config->level_icon, $level);
+		$level_icon_type = $config->level_icon_type ?? 'gif';
+		$level_icon = sprintf('%smodules/point/icons/%s/%d.%s', Context::getRequestUri(), $config->level_icon, $level, $level_icon_type);
 
 		// Get per to go to the next level if not a top level
 		$per = NULL;
 		if($level < $config->max_level)
 		{
 			$next_point = $config->level_step[$level + 1];
-			$present_point = $config->level_step[$level];
+			$present_point = $config->level_step[$level] ?? 0;
 			if($next_point > 0)
 			{
 				$per = (int) (($point - $present_point) / ($next_point - $present_point) * 100);

addons/recaptcha/conf/info.xml

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">reCAPTCHA</title>
-    <title xml:lang="en">reCAPTCHA</title>
-    <description xml:lang="ko">구글 reCAPTCHA 서비스를 사용하여 자동 가입 스팸을 방지합니다.</description>
-    <description xml:lang="en">Prevent automated signups and spam with Google's reCAPTCHA service.</description>
-    <version>1.0.0</version>
-    <date>2016-05-27</date>
-    <author email_address="kijin@kijinsung.com" link="https://github.com/kijin">
-        <name xml:lang="ko">Kijin Sung</name>
-        <name xml:lang="en">Kijin Sung</name>
-    </author>
-    <extra_vars>
-        <var name="site_key" type="text">
-            <title xml:lang="ko">Site Key</title>
-            <title xml:lang="en">Site Key</title>
-        </var>
-        <var name="secret_key" type="text">
-            <title xml:lang="ko">Secret Key</title>
-            <title xml:lang="en">Secret Key</title>
-        </var>
-		<var name="use_signup" type="select">
-			<title xml:lang="ko">회원가입에 사용</title>
-			<title xml:lang="en">Use on Signup Form</title>
-            <options value="Y">
-                <title xml:lang="ko">예</title>
-                <title xml:lang="en">Yes</title>
-            </options>
-            <options value="N">
-                <title xml:lang="ko">아니오</title>
-                <title xml:lang="en">No</title>
-            </options>
-		</var>
-		<var name="use_recovery" type="select">
-			<title xml:lang="ko">ID/PW찾기에 사용</title>
-			<title xml:lang="en">Use on Account Recovery Form</title>
-            <options value="Y">
-                <title xml:lang="ko">예</title>
-                <title xml:lang="en">Yes</title>
-            </options>
-            <options value="N">
-                <title xml:lang="ko">아니오</title>
-                <title xml:lang="en">No</title>
-            </options>
-		</var>
-		<var name="use_document" type="select">
-			<title xml:lang="ko">글쓰기에 사용</title>
-			<title xml:lang="en">Use on New Document</title>
-            <options value="N">
-                <title xml:lang="ko">아니오</title>
-                <title xml:lang="en">No</title>
-            </options>
-            <options value="Y">
-                <title xml:lang="ko">예</title>
-                <title xml:lang="en">Yes</title>
-            </options>
-		</var>
-		<var name="use_comment" type="select">
-			<title xml:lang="ko">댓글쓰기에 사용</title>
-			<title xml:lang="en">Use on New Comment</title>
-            <options value="N">
-                <title xml:lang="ko">아니오</title>
-                <title xml:lang="en">No</title>
-            </options>
-            <options value="Y">
-                <title xml:lang="ko">예</title>
-                <title xml:lang="en">Yes</title>
-            </options>
-		</var>
-		<var name="target_users" type="select">
-			<title xml:lang="ko">사용 대상</title>
-			<title xml:lang="en">Target Users</title>
-            <options value="non_members">
-                <title xml:lang="ko">비회원만 사용</title>
-                <title xml:lang="en">Non-members Only</title>
-            </options>
-            <options value="everyone">
-                <title xml:lang="ko">모든 방문자에게 사용</title>
-                <title xml:lang="en">Everyone</title>
-            </options>
-		</var>
-		<var name="target_frequency" type="select">
-			<title xml:lang="ko">사용 빈도</title>
-			<title xml:lang="en">Target Frequency</title>
-            <options value="every_time">
-                <title xml:lang="ko">매번 사용</title>
-                <title xml:lang="en">Every Time</title>
-            </options>
-            <options value="first_time_only">
-                <title xml:lang="ko">방문자당 최초 1회만 사용</title>
-                <title xml:lang="en">First Time Only</title>
-            </options>
-		</var>
-        <var name="theme" type="select">
-            <title xml:lang="ko">테마</title>
-            <title xml:lang="en">Theme</title>
-            <options value="light">
-                <title xml:lang="ko">밝은 테마</title>
-                <title xml:lang="en">Light</title>
-            </options>
-            <options value="dark">
-                <title xml:lang="ko">어두운 테마</title>
-                <title xml:lang="en">Dark</title>
-            </options>
-        </var>
-        <var name="size" type="select">
-            <title xml:lang="ko">크기</title>
-            <title xml:lang="en">Size</title>
-            <options value="normal">
-                <title xml:lang="ko">보통</title>
-                <title xml:lang="en">Normal</title>
-            </options>
-            <options value="compact">
-                <title xml:lang="ko">작게</title>
-                <title xml:lang="en">Compact</title>
-            </options>
-        </var>
-    </extra_vars>
-</addon>

addons/recaptcha/lang/en.php

@@ -1,3 +0,0 @@
-<?php
-$lang->msg_recaptcha_server_error = 'An error occurred while verifying your reCAPTCHA response.';
-$lang->msg_recaptcha_invalid_response = 'Please check reCAPTCHA.';

addons/recaptcha/lang/ko.php

@@ -1,3 +0,0 @@
-<?php
-$lang->msg_recaptcha_server_error = 'reCAPTCHA 스팸방지 서버와 통신하는 도중 오류가 발생했습니다.';
-$lang->msg_recaptcha_invalid_response = 'reCAPTCHA 스팸방지 기능을 체크해 주십시오.';

addons/recaptcha/recaptcha.addon.php

@@ -1,57 +0,0 @@
-<?php
-
-if (!defined('RX_BASEDIR') || !$addon_info->site_key || !$addon_info->secret_key || $called_position !== 'before_module_init')
-{
-	return;
-}
-
-$current_action = Context::get('act');
-$current_member = Context::get('logged_info');
-
-if ($current_member->is_admin === 'Y')
-{
-	$enable_captcha = false;
-}
-elseif ($addon_info->target_users !== 'everyone' && $current_member->member_srl)
-{
-	$enable_captcha = false;
-}
-elseif ($addon_info->target_frequency !== 'every_time' && isset($_SESSION['recaptcha_authenticated']) && $_SESSION['recaptcha_authenticated'])
-{
-	$enable_captcha = false;
-}
-elseif ($addon_info->use_signup === 'Y' && preg_match('/^(?:disp|proc)Member(?:SignUp|Insert)/i', $current_action))
-{
-	$enable_captcha = true;
-}
-elseif ($addon_info->use_recovery === 'Y' && preg_match('/^(?:disp|proc)Member(?:FindAccount|ResendAuthMail)/i', $current_action))
-{
-	$enable_captcha = true;
-}
-elseif ($addon_info->use_document === 'Y' && preg_match('/^(?:disp|proc)Board(Write|InsertDocument)/i', $current_action))
-{
-	$enable_captcha = true;
-}
-elseif ($addon_info->use_comment === 'Y' && (preg_match('/^(?:disp|proc)Board(Content|InsertComment)/i', $current_action) || (!$current_action && Context::get('document_srl'))))
-{
-	$enable_captcha = true;
-}
-else
-{
-	$enable_captcha = false;
-}
-
-if ($enable_captcha)
-{
-	include_once __DIR__ . '/recaptcha.class.php';
-	reCAPTCHA::init($addon_info);
-	
-	if (strncasecmp('proc', $current_action, 4) === 0)
-	{
-		getController('module')->addTriggerFunction('moduleObject.proc', 'before', 'reCAPTCHA::check');
-	}
-	else
-	{
-		Context::set('captcha', new reCAPTCHA());
-	}
-}

addons/recaptcha/recaptcha.class.php

@@ -1,63 +0,0 @@
-<?php
-
-class reCAPTCHA
-{
-	protected static $verify = 'https://www.google.com/recaptcha/api/siteverify';
-	protected static $config = null;
-	protected static $scripts_added = false;
-	protected static $instances_inserted = 0;
-	protected static $sequence = 1;
-	
-	public static function init($config)
-	{
-		self::$config = $config;
-	}
-	
-	public static function check()
-	{
-		$response = Context::get('g-recaptcha-response');
-		if (!$response)
-		{
-			return new Object(-1, lang('recaptcha.msg_recaptcha_invalid_response'));
-		}
-		
-		$verify_request = \Requests::post(self::$verify, array(), array(
-			'secret' => self::$config->secret_key,
-			'response' => $response,
-			'remoteip' => \RX_CLIENT_IP,
-		));
-		
-		$verify = @json_decode($verify_request->body, true);
-		if ($verify && isset($verify['error-codes']) && in_array('invalid-input-response', $verify['error-codes']))
-		{
-			return new Object(-1, lang('recaptcha.msg_recaptcha_invalid_response'));
-		}
-		elseif (!$verify || !$verify['success'] || (isset($verify['error-codes']) && $verify['error-codes']))
-		{
-			return new Object(-1, lang('recaptcha.msg_recaptcha_server_error'));
-		}
-		else
-		{
-			$_SESSION['recaptcha_authenticated'] = true;
-			return true;
-		}
-	}
-	
-	public function __construct()
-	{
-		if (!self::$scripts_added)
-		{
-			self::$scripts_added = true;
-			Context::loadFile(array('./addons/recaptcha/recaptcha.js', 'body'));
-			Context::addHtmlFooter('<script src="https://www.google.com/recaptcha/api.js?render=explicit&amp;onload=reCaptchaCallback" async defer></script>');
-			$html = '<div id="recaptcha-config" data-sitekey="%s" data-theme="%s" data-size="%s"></div>';
-			$html = sprintf($html, escape(self::$config->site_key), self::$config->theme ?: 'light', self::$config->size ?: 'normal');
-			Context::addHtmlFooter($html);
-		}
-	}
-	
-	public function __toString()
-	{
-		return sprintf('<div id="recaptcha-instance-%d" class="g-recaptcha"></div>', self::$instances_inserted++);
-	}
-}

addons/recaptcha/recaptcha.js

@@ -1,40 +0,0 @@
-
-function reCaptchaCallback() {
-	var recaptcha_config = $("#recaptcha-config");
-	var recaptcha_instances = $(".g-recaptcha");
-	var recaptcha_instance_id = 1;
-	
-	if (recaptcha_instances.size() === 0) {
-		var autoinsert_candidates = $("form").filter(function() {
-			var actinput = $("input[name='act']", this);
-			if (actinput.size() && actinput.val() && actinput.val().match(/^proc.+(Insert(Document|Comment|)|FindAccount|ResendAuthMail)/i)) {
-				return true;
-			}
-			var procfilter = $(this).attr("onsubmit");
-			if (procfilter && procfilter.match(/procFilter\b.+\binsert/i)) {
-				return true;
-			}
-			return false;
-		});
-		autoinsert_candidates.each(function() {
-			var new_instance = $('<div class="g-recaptcha"></div>');
-			new_instance.attr("id", "recaptcha-instance-" + recaptcha_instance_id++);
-			var autoinsert_point = $(this).find("button[type='submit'],input[type='submit']").parent();
-			if (autoinsert_point.size()) {
-				new_instance.insertBefore(autoinsert_point);
-			} else {
-				new_instance.appendTo($(this));
-			}
-		});
-		var recaptcha_instances = $(".g-recaptcha");
-	}
-	
-	recaptcha_instances.each(function() {
-		var instance = $(this);
-		grecaptcha.render(instance.attr("id"), {
-			sitekey: recaptcha_config.data("sitekey"),
-			size: recaptcha_config.data("size"),
-			theme: recaptcha_config.data("theme")
-		});
-	});
-}

addons/resize_image/conf/info.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">본문내 이미지 조절 애드온</title>
-    <title xml:lang="jp">本文内イメージリーサイズアドオン</title>
-    <title xml:lang="zh-CN">内容区图片缩放插件</title>
-    <title xml:lang="en">Image Resizer</title>
-    <title xml:lang="vi">Thay đổi cỡ hình ảnh</title>
-    <title xml:lang="es">Imagen de control add-on bonmunnae</title>
-    <title xml:lang="ru">Аддон редактирования размера картинки в тексте</title>
-    <title xml:lang="ge">Image-Add-on bonmunnae</title>
-    <title xml:lang="zh-TW">圖片縮放</title>
-    <description xml:lang="ko">
-        본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
-    </description>
-    <description xml:lang="jp">
-        本文内に挿入されたイメージのサイズを本文の幅サイズに合わせてリーサイズし、クリックした時、オリジナルサイズのイメージを表示します。
-    </description>
-    <description xml:lang="zh-CN">
-        自动调整主题内容区内的图片大小，点击将显示原始大小的插件。
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ lấy lại kích thước nguyên bản của hình ảnh trong bài viết hoặc bình luận khi bạn bấm vào hình.
-    </description>
-	<description xml:lang="en">
-        This addon resizes images inserted in the article. When clicked, the original images are shown.
-    </description>
-    <description xml:lang="es">
-        La imagen corporal se inserta dentro del cuerpo para que se adapte al tamaño de la muestra original cuando hago clic en los add-ons.
-    </description>
-    <description xml:lang="ru">
-        Аддон, изменяющий размер картинки к размеру текста, при клике на картинку, появляется полное изображение.
-    </description>
-    <description xml:lang="ge">
-        Body Bild eingefügt im Inneren des Körpers zu passen die Größe des Originals zeigen, wenn ich darauf klicke auf das Add-ons.
-    </description>
-    <description xml:lang="zh-TW">
-        自動調整文章内的圖片大小，點擊圖片後會顯示原始大小。
-    </description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="es">NAVER</name>
-        <name xml:lang="ge">NAVER</name>
-        <name xml:lang="ru">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
-    </author>
-</addon>

addons/resize_image/css/resize_image.mobile.css

@@ -1 +0,0 @@
-.xe_content img{max-width:100%;height:auto !important}

addons/resize_image/js/resize_image.js

@@ -1,268 +0,0 @@
-/**
- * @brief 화면내에서 상위 영역보다 이미지가 크면 리사이즈를 하고 클릭시 원본을 보여줄수 있도록 변경
- **/
-(function($){
-
-var xScreen = null;
-
-// 슬라이드를 위한 블랙 스크린을 만들거나 반환하는 함수
-function getScreen() {
-	var body    = $(document.body);
-	var controls, imgframe, closebtn, prevbtn, nextbtn;
-	// 스크린이 없으면 스크린을 만든다.
-	if (!xScreen) {
-		// 검은 스크린
-		xScreen = $("<div>")
-			.attr("id","xe_gallery_screen")
-			.css({
-				position:"fixed",
-				display:"none",
-				backgroundColor:"black",
-				zIndex:500,
-				opacity:0.7
-			});
-
-		// 이미지를 보여주고 컨트롤 버튼을 다룰 레이어
-		controls = $("<div>")
-			.attr("id","xe_gallery_controls")
-			.css({
-				position:"fixed",
-				display:"none",
-				overflow:"hidden",
-				zIndex:510
-			});
-
-		// 이전 버튼
-		prevbtn = $('<button type="button" id="xe_gallery_prevbtn" />')
-			.css({
-				left: "10px",
-				backgroundPosition: "0 -64px"
-			})
-			.click(function(){xScreen.xePrev()})
-			.appendTo(controls);
-
-		// 닫기 버튼
-		closebtn = $('<button type="button" id="xe_gallery_closebtn" />')
-			.css({
-				top: "10px",
-				backgroundPosition: "0 0"
-			})
-			.click(function(){xScreen.xeHide()})
-			.appendTo(controls);
-
-		// 다음 버튼
-		nextbtn = $('<button type="button" id="xe_gallery_nextbtn" />')
-			.attr("id", "xe_gallery_nextbtn")
-			.css({
-				right: "10px",
-				backgroundPosition: "0 -128px"
-			})
-			.click(function(){xScreen.xeNext()})
-			.appendTo(controls);
-
-		// 버튼 공통 속성
-		controls.find(">button")
-			.css({
-				position : "absolute",
-				width : "64px",
-				height : "64px",
-				zIndex : 530,
-				cursor : "pointer",
-				border : 0,
-				margin : 0,
-				padding : 0,
-				backgroundColor: "transparent",
-				backgroundImage: "url(" + request_uri + "addons/resize_image/btn.png)",
-				backgroundRepeat: "no-repeat",
-				opacity: ".5",
-				filter: "alpha(opacity=50)"
-			})
-			.mouseover(function(){
-				$(this).css({
-					opacity: "1",
-					filter: "alpha(opacity=100)"
-				});
-			})
-			.mouseout(function(){
-				$(this).css({
-					opacity: ".5",
-					filter: "alpha(opacity=50)"
-				});
-			})
-			.focus(function(){
-				$(this).trigger('mouseover');
-			})
-			.blur(function(){
-				$(this).trigger('mouseout');
-			})
-			;
-
-		// 이미지 홀더
-		imgframe = $(new Image());
-		imgframe
-			.attr("id", "xe_gallery_holder")
-			.css({
-				border: '5px solid white',
-				zindex: 520,
-				maxWidth: 'none',
-				borderRadius: '5px',
-				boxShadow: '0 0 10px #000'
-			})
-			.appendTo(controls).draggable();
-
-		body.append(xScreen).append(controls);
-
-		imgframe.bind('load', function(){
-			var clientWidth  = $(window).width();
-			var clientHeight = $(window).height();
-			imgframe.css({
-				left : clientWidth/2 - imgframe.width()/2 + "px",
-				top  : clientHeight/2 - imgframe.height()/2 + "px"
-			});
-		});
-
-		// xScreen 객체를 확장한다.
-		xScreen.xeShow = function() {
-			var clientWidth  = $(window).width();
-			var clientHeight = $(window).height();
-			$("#xe_gallery_controls,#xe_gallery_screen").show().css({
-				top		: 0,
-				right   : 0,
-				bottom	: 0,
-				left	: 0
-			});
-			$("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top", Math.round(clientHeight/2 - 32) + "px");
-			this.xeMove(0);
-		};
-		xScreen.xeHide = function(event) {
-			xScreen.hide();
-			controls.hide();
-		};
-		xScreen.xePrev = function() {
-			this.xeMove(-1);
-		};
-		xScreen.xeNext = function() {
-			this.xeMove(1);
-		};
-		xScreen.xeMove = function(val) {
-			var clientWidth  = $(window).width();
-			var clientHeight = $(window).height();
-			this.index += val;
-			prevbtn.css("visibility", (this.index>0)?"visible":"hidden");
-			nextbtn.css("visibility", (this.index<this.list.size()-1)?"visible":"hidden");
-			//textyle 이미지 리사이즈 처리
-			var src = this.list.eq(this.index).attr("rawsrc");
-			if(!src) src = this.list.eq(this.index).attr("src");
-
-			imgframe.attr("src", src).removeAttr('width').removeAttr('height');
-			if(imgframe.width() > 0) {
-				imgframe.css({
-					left : clientWidth/2 - imgframe.width()/2 + "px",
-					top  : clientHeight/2 - imgframe.height()/2 + "px"
-				});
-			}
-
-			closebtn.css({
-				left : clientWidth/2 - 32 + "px",
-				top  : "10px"
-			}).focus();
-		};
-
-		// 스크린을 닫는 상황
-		$(document).keydown(function(e){
-			if(e.which == 27){
-				xScreen.xeHide();
-				return false;
-			} else {
-				return true;
-			}
-		});
-	} else {
-		controls = $("#xe_gallery_controls");
-		imgframe = $("#xe_gallery_holder");
-		closebtn = $("#xe_gallery_closebtn");
-		prevbtn  = $("#xe_gallery_prevbtn");
-		nextbtn  = $("#xe_gallery_nextbtn");
-	}
-	return xScreen;
-}
-
-// 이미지 슬라이드를 보는 함수
-function slideshow(event) {
-	var container  = $(this).closest('.xe_content');
-	var imglist    = container.find("img[rel=xe_gallery]");
-	var currentIdx = $.inArray($(this).get(0), imglist.get());
-	var xScreen    = getScreen();
-
-	// 스크린을 보여주고
-	xScreen.list  = imglist;
-	xScreen.index = currentIdx;
-	xScreen.xeShow();
-}
-
-/* Window Load */
-$(window).load(function(){
-	var regx_skip = /(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i;
-	var regx_allow_i6pngfix = /(?:common\/tpl\/images\/blank\.gif$)/i;
-	/**
-	 * 본문 폭 구하기 위한 개체
-	 * IE6에서 본문폭을 넘는 이미지가 있으면 그 크기로 구해지는 문제 우회용
-	 **/
-	var dummy = $('<div style="height:1px;overflow:hidden;opacity:0;display:block;clear:both"></div>');
-
-	/**
-	 * 리사이즈 실행 함수
-	 **/
-	function doResize(contentWidth, count) {
-		// 재시도 회수 제한
-		if(!count) count = 0;
-		if(count >= 10) return;
-
-		var $img = this;
-		var beforSize = {'width':$img.width(), 'height':$img.height()};
-
-		// 이미지 사이즈를 구하지 못했을 때 재시도
-		if(!beforSize.width || !beforSize.height) {
-			setTimeout(function() {
-				doResize.call($img, contentWidth, ++count)
-			}, 200);
-			return;
-		}
-
-		// 리사이즈 필요 없으면 리턴
-		if(beforSize.width <= contentWidth) return;
-
-		var resize_ratio = contentWidth / beforSize.width;
-
-		$img
-			.removeAttr('width').removeAttr('height')
-			.css({
-				'width':contentWidth,
-				'height':parseInt(beforSize.height * resize_ratio, 10)
-			});
-	}
-
-	$('.xe_content').each(function() {
-		var contentWidth = dummy.appendTo(this).width();
-		dummy.remove();
-		if(!contentWidth) return;
-
-		$('img', this).each(function() {
-			var $img = $(this);
-			var imgSrc = $img.attr('src');
-			if(regx_skip.test(imgSrc) && !regx_allow_i6pngfix.test(imgSrc)) return;
-			$img.attr('rel', 'xe_gallery');
-			doResize.call($img, contentWidth);
-		});
-
-		/* live 이벤트로 적용 (image_gallery 컴포넌트와의 호환 위함) */
-		$(this).on('mouseover', 'img[rel=xe_gallery]', function() {
-			var $img = $(this);
-			if(!$img.parent('a').length && !$img.attr('onclick')) {
-				$img.css('cursor', 'pointer').click(slideshow);
-			}
-		});
-	});
-});
-
-})(jQuery);

addons/resize_image/resize_image.addon.php

@@ -1,28 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-if(!defined('__XE__'))
-{
-	exit();
-}
-
-/**
- * @file resize_image.addon.php
- * @author NAVER (developers@xpressengine.com)
- * @brief Add-on to resize images in the body
- */
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && !isCrawler())
-{
-	if(Mobile::isFromMobilePhone())
-	{
-		Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
-	}
-	else
-	{
-		Context::loadJavascriptPlugin('ui');
-		Context::loadFile(array('./addons/resize_image/js/resize_image.js', 'body', '', null), true);
-	}
-}
-
-/* End of file resize_image.addon.php */
-/* Location: ./addons/resize_image/resize_image.addon.php */

classes/cache/CacheHandler.class.php

@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * CacheHandler
@@ -12,7 +11,7 @@ class CacheHandler extends Handler
 	 * Force file cache.
 	 */
 	protected $_always_use_file = false;
-	
+
 	/**
 	 * Get a instance of CacheHandler(for singleton)
 	 *
@@ -73,7 +72,7 @@ class CacheHandler extends Handler
 	 */
 	public function get($key, $modified_time = 0)
 	{
-		$value = Rhymix\Framework\Cache::get($key);
+		$value = Rhymix\Framework\Cache::get(strval($key));
 		return $value === null ? false : $value;
 	}
 
@@ -89,7 +88,7 @@ class CacheHandler extends Handler
 	 */
 	public function put($key, $obj, $valid_time = 0)
 	{
-		return Rhymix\Framework\Cache::set($key, $obj, $valid_time, $this->_always_use_file);
+		return Rhymix\Framework\Cache::set(strval($key), $obj, intval($valid_time), $this->_always_use_file);
 	}
 
 	/**
@@ -100,7 +99,7 @@ class CacheHandler extends Handler
 	 */
 	public function delete($key)
 	{
-		return Rhymix\Framework\Cache::delete($key);
+		return Rhymix\Framework\Cache::delete(strval($key));
 	}
 
 	/**
@@ -113,7 +112,7 @@ class CacheHandler extends Handler
 	 */
 	public function isValid($key, $modified_time = 0)
 	{
-		return Rhymix\Framework\Cache::exists($key);
+		return Rhymix\Framework\Cache::exists(strval($key));
 	}
 
 	/**
@@ -151,13 +150,10 @@ class CacheHandler extends Handler
 	 * Make invalid group key (like delete group key)
 	 *
 	 * @param string $keyGroupName Group name
-	 * @return void
+	 * @return bool
 	 */
 	public function invalidateGroupKey($keyGroupName)
 	{
-		return Rhymix\Framework\Cache::clearGroup($keyGroupName);
+		return Rhymix\Framework\Cache::clearGroup(strval($keyGroupName));
 	}
 }
-
-/* End of file CacheHandler.class.php */
-/* Location: ./classes/cache/CacheHandler.class.php */

classes/db/DBMysql_innodb.class.php

@@ -1,76 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-require_once('DBMysql.class.php');
-
-/**
- * Class to use MySQL innoDB DBMS
- * mysql innodb handling class
- *
- * Does not use prepared statements, since mysql driver does not support them
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db
- * @version 0.1
- */
-class DBMysql_innodb extends DBMysql
-{
-	/**
-	 * DB transaction start
-	 * this method is private
-	 * @return boolean
-	 */
-	function _begin($transactionLevel = 0)
-	{
-		$connection = $this->_getConnection('master');
-
-		if(!$transactionLevel)
-		{
-			$this->_query("START TRANSACTION", $connection);
-		}
-		else
-		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
-		}
-		return true;
-	}
-
-	/**
-	 * DB transaction rollback
-	 * this method is private
-	 * @return boolean
-	 */
-	function _rollback($transactionLevel = 0)
-	{
-		$connection = $this->_getConnection('master');
-
-		$point = $transactionLevel - 1;
-
-		if($point)
-		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
-		{
-			$this->_query("ROLLBACK", $connection);
-		}
-		return true;
-	}
-
-	/**
-	 * DB transaction commit
-	 * this method is private
-	 * @return boolean
-	 */
-	function _commit()
-	{
-		$connection = $this->_getConnection('master');
-		$this->_query("COMMIT", $connection);
-		return true;
-	}
-}
-
-DBMysql_innodb::$isSupported = function_exists('mysql_connect');
-
-/* End of file DBMysql_innodb.class.php */
-/* Location: ./classes/db/DBMysql_innodb.class.php */

classes/db/DBMysqli.class.php

@@ -1,413 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-require_once('DBMysql.class.php');
-
-/**
- * Class to use MySQLi DBMS as mysqli_*
- * mysql handling class
- *
- * Does not use prepared statements, since mysql driver does not support them
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db
- * @version 0.1
- */
-class DBMysqli extends DBMysql
-{
-	/**
-	 * DB Connect
-	 * this method is private
-	 * @param array $connection connection's value is db_hostname, db_port, db_database, db_userid, db_password
-	 * @return resource
-	 */
-	function __connect($connection)
-	{
-		// Attempt to connect
-		if($connection['port'])
-		{
-			$result = @mysqli_connect($connection['host'], $connection['user'], $connection['pass'], $connection['database'], $connection['port']);
-		}
-		else
-		{
-			$result = @mysqli_connect($connection['host'], $connection['user'], $connection['pass'], $connection['database']);
-		}
-		$error = mysqli_connect_errno();
-		if($error)
-		{
-			$this->setError($error, mysqli_connect_error());
-			return;
-		}
-		$this->charset = isset($connection['charset']) ? $connection['charset'] : 'utf8';
-		$this->db_version = $result->server_info;
-		mysqli_set_charset($result, $this->charset);
-		return $result;
-	}
-
-	/**
-	 * DB disconnection
-	 * this method is private
-	 * @param resource $connection
-	 * @return void
-	 */
-	function _close($connection)
-	{
-		mysqli_close($connection);
-	}
-
-	/**
-	 * Handles quatation of the string variables from the query
-	 * @param string $string
-	 * @return string
-	 */
-	function addQuotes($string)
-	{
-		if(!is_numeric($string))
-		{
-			$connection = $this->_getConnection('master');
-			$string = mysqli_escape_string($connection, $string);
-		}
-		return $string;
-	}
-
-	/**
-	 * Execute the query
-	 * this method is private
-	 * @param string $query
-	 * @param resource $connection
-	 * @return resource
-	 */
-	function __query($query, $connection)
-	{
-		if ($connection === null)
-		{
-			$this->setError(-1, 'Unable to connect to DB.');
-			return false;
-		}
-		if($this->use_prepared_statements == 'Y')
-		{
-			// 1. Prepare query
-			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
-			{
-				$types = '';
-				$params = array();
-				$this->_prepareQueryParameters($types, $params);
-
-				if(!empty($params))
-				{
-					$args[0] = $stmt;
-					$args[1] = $types;
-
-					$i = 2;
-					foreach($params as $key => $param)
-					{
-						$copy[$key] = $param;
-						$args[$i++] = &$copy[$key];
-					}
-
-					// 2. Bind parameters
-					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
-					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
-					}
-				}
-
-				// 3. Execute query
-				$status = mysqli_stmt_execute($stmt);
-
-				if(!$status)
-				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
-				}
-
-				// Return stmt for other processing - like retrieving resultset (_fetch)
-				return $stmt;
-				// mysqli_stmt_close($stmt);
-			}
-		}
-		// Run the query statement
-		$result = mysqli_query($connection, $query);
-		// Error Check
-		$error = mysqli_error($connection);
-		if($error)
-		{
-			$this->setError(mysqli_errno($connection), $error);
-		}
-		// Return result
-		return $result;
-	}
-
-	/**
-	 * Before execute query, prepare statement
-	 * this method is private
-	 * @param string $types
-	 * @param array $params
-	 * @return void
-	 */
-	function _prepareQueryParameters(&$types, &$params)
-	{
-		$types = '';
-		$params = array();
-		if(!$this->param)
-		{
-			return;
-		}
-
-		foreach($this->param as $k => $o)
-		{
-			$value = $o->getUnescapedValue();
-			$type = $o->getType();
-
-			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
-			{
-				continue;
-			}
-
-			switch($type)
-			{
-				case 'number' :
-					$type = 'i';
-					break;
-				case 'varchar' :
-					$type = 's';
-					break;
-				default:
-					$type = 's';
-			}
-
-			if(is_array($value))
-			{
-				foreach($value as $v)
-				{
-					$params[] = $v;
-					$types .= $type;
-				}
-			}
-			else
-			{
-				$params[] = $value;
-				$types .= $type;
-			}
-		}
-	}
-
-	/**
-	 * Fetch the result
-	 * @param resource $result
-	 * @param int|NULL $arrayIndexEndValue
-	 * @return array
-	 */
-	function _fetch($result, $arrayIndexEndValue = NULL)
-	{
-		if($this->use_prepared_statements != 'Y')
-		{
-			return parent::_fetch($result, $arrayIndexEndValue);
-		}
-		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
-		{
-			return $output;
-		}
-
-		// Prepared stements: bind result variable and fetch data
-		$stmt = $result;
-		$meta = mysqli_stmt_result_metadata($stmt);
-		$fields = mysqli_fetch_fields($meta);
-
-		/**
-		 * Mysqli has a bug that causes LONGTEXT columns not to get loaded
-		 * Unless store_result is called before
-		 * MYSQLI_TYPE for longtext is 252
-		 */
-		$longtext_exists = false;
-		foreach($fields as $field)
-		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
-			{
-				$field->name = 'repeat_' . $field->name;
-			}
-
-			// Array passed needs to contain references, not values
-			$row[$field->name] = "";
-			$resultArray[$field->name] = &$row[$field->name];
-
-			if($field->type == 252)
-			{
-				$longtext_exists = true;
-			}
-		}
-		$resultArray = array_merge(array($stmt), $resultArray);
-
-		if($longtext_exists)
-		{
-			mysqli_stmt_store_result($stmt);
-		}
-
-		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
-
-		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
-		{
-			$resultObject = new stdClass();
-
-			foreach($resultArray as $key => $value)
-			{
-				if($key === 0)
-				{
-					continue; // Skip stmt object
-				}
-				if(strpos($key, 'repeat_'))
-				{
-					$key = substr($key, 6);
-				}
-				$resultObject->$key = $value;
-			}
-
-			$rows[] = $resultObject;
-		}
-
-		mysqli_stmt_close($stmt);
-
-		if($arrayIndexEndValue)
-		{
-			foreach($rows as $row)
-			{
-				$output[$arrayIndexEndValue--] = $row;
-			}
-		}
-		else
-		{
-			$output = $rows;
-		}
-
-		if(count($output) == 1)
-		{
-			if(isset($arrayIndexEndValue))
-			{
-				return $output;
-			}
-			else
-			{
-				return $output[0];
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Handles insertAct
-	 * @param Object $queryObject
-	 * @param boolean $with_values
-	 * @return resource
-	 */
-	function _executeInsertAct($queryObject, $with_values = false)
-	{
-		if($this->use_prepared_statements != 'Y')
-		{
-			return parent::_executeInsertAct($queryObject);
-		}
-		$this->param = $queryObject->getArguments();
-		$result = parent::_executeInsertAct($queryObject, $with_values);
-		unset($this->param);
-		return $result;
-	}
-
-	/**
-	 * Handles updateAct
-	 * @param Object $queryObject
-	 * @param boolean $with_values
-	 * @return resource
-	 */
-	function _executeUpdateAct($queryObject, $with_values = false)
-	{
-		if($this->use_prepared_statements != 'Y')
-		{
-			return parent::_executeUpdateAct($queryObject);
-		}
-		$this->param = $queryObject->getArguments();
-		$result = parent::_executeUpdateAct($queryObject, $with_values);
-		unset($this->param);
-		return $result;
-	}
-
-	/**
-	 * Handles deleteAct
-	 * @param Object $queryObject
-	 * @param boolean $with_values
-	 * @return resource
-	 */
-	function _executeDeleteAct($queryObject, $with_values = false)
-	{
-		if($this->use_prepared_statements != 'Y')
-		{
-			return parent::_executeDeleteAct($queryObject);
-		}
-		$this->param = $queryObject->getArguments();
-		$result = parent::_executeDeleteAct($queryObject, $with_values);
-		unset($this->param);
-		return $result;
-	}
-
-	/**
-	 * Handle selectAct
-	 * In order to get a list of pages easily when selecting \n
-	 * it supports a method as navigation
-	 * @param Object $queryObject
-	 * @param resource $connection
-	 * @param boolean $with_values
-	 * @return Object
-	 */
-	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
-	{
-		if($this->use_prepared_statements != 'Y')
-		{
-			return parent::_executeSelectAct($queryObject, $connection);
-		}
-		$this->param = $queryObject->getArguments();
-		$result = parent::_executeSelectAct($queryObject, $connection, $with_values);
-		unset($this->param);
-		return $result;
-	}
-
-	/**
-	 * Get the ID generated in the last query
-	 * Return next sequence from sequence table
-	 * This method use only mysql
-	 * @return int
-	 */
-	function db_insert_id()
-	{
-		$connection = $this->_getConnection('master');
-		return mysqli_insert_id($connection);
-	}
-
-	/**
-	 * Fetch a result row as an object
-	 * @param resource $result
-	 * @return object
-	 */
-	function db_fetch_object(&$result)
-	{
-		return mysqli_fetch_object($result);
-	}
-
-	/**
-	 * Free result memory
-	 * @param resource $result
-	 * @return boolean Returns TRUE on success or FALSE on failure.
-	 */
-	function db_free_result(&$result)
-	{
-		return mysqli_free_result($result);
-	}
-
-}
-
-DBMysqli::$isSupported = function_exists('mysqli_connect');
-
-/* End of file DBMysqli.class.php */
-/* Location: ./classes/db/DBMysqli.class.php */

classes/db/DBMysqli_innodb.class.php

@@ -1,86 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-require_once('DBMysql.class.php');
-require_once('DBMysqli.class.php');
-
-/**
- * Class to use MySQLi innoDB DBMS as mysqli_*
- * mysql innodb handling class
- *
- * Does not use prepared statements, since mysql driver does not support them
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db
- * @version 0.1
- */
-class DBMysqli_innodb extends DBMysqli
-{
-	/**
-	 * DB transaction start
-	 * this method is private
-	 * @return boolean
-	 */
-	function _begin($transactionLevel = 0)
-	{
-		$connection = $this->_getConnection('master');
-
-		if(!$transactionLevel)
-		{
-			if(function_exists('mysqli_begin_transaction'))
-			{
-				mysqli_begin_transaction($connection);
-				$this->setQueryLog(array('query' => 'START TRANSACTION'));
-			}
-			else
-			{
-				$this->_query("START TRANSACTION" . $point, $connection);
-			}
-		}
-		else
-		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
-		}
-		return true;
-	}
-
-	/**
-	 * DB transaction rollback
-	 * this method is private
-	 * @return boolean
-	 */
-	function _rollback($transactionLevel = 0)
-	{
-		$connection = $this->_getConnection('master');
-		$point = $transactionLevel - 1;
-
-		if($point)
-		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
-		{
-			mysqli_rollback($connection);
-			$this->setQueryLog(array('query' => 'ROLLBACK'));
-		}
-		return true;
-	}
-
-	/**
-	 * DB transaction commit
-	 * this method is private
-	 * @return boolean
-	 */
-	function _commit()
-	{
-		$connection = $this->_getConnection('master');
-		mysqli_commit($connection);
-		$this->setQueryLog(array('query' => 'COMMIT'));
-		return true;
-	}
-}
-
-DBMysqli_innodb::$isSupported = function_exists('mysqli_connect');
-
-/* End of file DBMysqli.class.php */
-/* Location: ./classes/db/DBMysqli.class.php */

classes/db/queryparts/Query.class.php

@@ -1,677 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts
- * @version 0.1
- */
-class Query extends Object
-{
-
-	/**
-	 * Query id, defined in query xml file
-	 * @var string
-	 */
-	var $queryID;
-
-	/**
-	 * DML type, ex) INSERT, DELETE, UPDATE, SELECT
-	 * @var string
-	 */
-	var $action;
-
-	/**
-	 * priority level ex)LOW_PRIORITY, HIGHT_PRIORITY
-	 * @var string
-	 */
-	var $priority;
-
-	/**
-	 * column list
-	 * @var string|array
-	 */
-	var $columns;
-
-	/**
-	 * table list
-	 * @var string|array
-	 */
-	var $tables;
-
-	/**
-	 * condition list
-	 * @var string|array
-	 */
-	var $conditions;
-
-	/**
-	 * group list
-	 * @var string|array
-	 */
-	var $groups;
-
-	/**
-	 * order list
-	 * @var array
-	 */
-	var $orderby;
-
-	/**
-	 * limit count
-	 * @var int
-	 */
-	var $limit;
-
-	/**
-	 * argument list
-	 * @var array
-	 */
-	var $arguments = NULL;
-
-	/**
-	 * column list
-	 * @var array
-	 */
-	var $columnList = NULL;
-
-	/**
-	 * order by text
-	 * @var string
-	 */
-	var $_orderByString;
-
-	/**
-	 * constructor
-	 * @param string $queryID
-	 * @param string $action
-	 * @param string|array $columns
-	 * @param string|array $tables
-	 * @param string|array $conditions
-	 * @param string|array $groups
-	 * @param string|array $orderby
-	 * @param int $limit
-	 * @param string $priority
-	 * @return void
-	 */
-	function __construct($queryID = NULL
-	, $action = NULL
-	, $columns = NULL
-	, $tables = NULL
-	, $conditions = NULL
-	, $groups = NULL
-	, $orderby = NULL
-	, $limit = NULL
-	, $priority = NULL)
-	{
-		$this->queryID = $queryID;
-		$this->action = $action;
-		$this->priority = $priority;
-
-		if(!isset($tables))
-		{
-			return;
-		}
-
-		$this->columns = $this->setColumns($columns);
-		$this->tables = $this->setTables($tables);
-		$this->conditions = $this->setConditions($conditions);
-		$this->groups = $this->setGroups($groups);
-		$this->orderby = $this->setOrder($orderby);
-		$this->limit = $this->setLimit($limit);
-	}
-
-	function show()
-	{
-		return TRUE;
-	}
-
-	function setQueryId($queryID)
-	{
-		$this->queryID = $queryID;
-	}
-
-	function setAction($action)
-	{
-		$this->action = $action;
-	}
-
-	function setPriority($priority)
-	{
-		$this->priority = $priority;
-	}
-
-	function setColumnList($columnList)
-	{
-		$this->columnList = $columnList;
-		if(count($this->columnList) > 0)
-		{
-			$selectColumns = array();
-			$dbParser = DB::getParser();
-
-			foreach($this->columnList as $columnName)
-			{
-				$columnName = $dbParser->escapeColumn($columnName);
-				$selectColumns[] = new SelectExpression($columnName);
-			}
-			unset($this->columns);
-			$this->columns = $selectColumns;
-		}
-	}
-
-	function setColumns($columns)
-	{
-		if(!isset($columns) || count($columns) === 0)
-		{
-			$this->columns = array(new StarExpression());
-			return;
-		}
-
-		if(!is_array($columns))
-		{
-			$columns = array($columns);
-		}
-
-		$this->columns = $columns;
-	}
-
-	function setTables($tables)
-	{
-		if(!isset($tables) || count($tables) === 0)
-		{
-			$this->setError(TRUE);
-			$this->setMessage("You must provide at least one table for the query.");
-			return;
-		}
-
-		if(!is_array($tables))
-		{
-			$tables = array($tables);
-		}
-
-		$this->tables = $tables;
-	}
-
-	function setSubquery($subquery)
-	{
-		$this->subquery = $subquery;
-	}
-
-	function setConditions($conditions)
-	{
-		$this->conditions = array();
-		if(!isset($conditions) || count($conditions) === 0)
-		{
-			return;
-		}
-		if(!is_array($conditions))
-		{
-			$conditions = array($conditions);
-		}
-
-		foreach($conditions as $conditionGroup)
-		{
-			if($conditionGroup->show())
-			{
-				$this->conditions[] = $conditionGroup;
-			}
-		}
-	}
-
-	function setGroups($groups)
-	{
-		if(!isset($groups) || count($groups) === 0)
-		{
-			return;
-		}
-		if(!is_array($groups))
-		{
-			$groups = array($groups);
-		}
-
-		$this->groups = $groups;
-	}
-
-	function setOrder($order)
-	{
-		if(!isset($order) || count($order) === 0)
-		{
-			return;
-		}
-		if(!is_array($order))
-		{
-			$order = array($order);
-		}
-
-		$this->orderby = $order;
-	}
-
-	function getOrder()
-	{
-		return $this->orderby;
-	}
-
-	function setLimit($limit = NULL)
-	{
-		if(!isset($limit))
-		{
-			return;
-		}
-		$this->limit = $limit;
-	}
-
-	// START Fluent interface
-	/**
-	 * seleect set
-	 * @param string|array $columns
-	 * @return Query return Query instance
-	 */
-	function select($columns = NULL)
-	{
-		$this->action = 'select';
-		$this->setColumns($columns);
-		return $this;
-	}
-
-	/**
-	 * from set
-	 * @param string|array $tables
-	 * @return Query return Query instance
-	 */
-	function from($tables)
-	{
-		$this->setTables($tables);
-		return $this;
-	}
-
-	/**
-	 * where set
-	 * @param string|array $conditions
-	 * @return Query return Query instance
-	 */
-	function where($conditions)
-	{
-		$this->setConditions($conditions);
-		return $this;
-	}
-
-	/**
-	 * groupBy set
-	 * @param string|array $groups
-	 * @return Query return Query instance
-	 */
-	function groupBy($groups)
-	{
-		$this->setGroups($groups);
-		return $this;
-	}
-
-	/**
-	 * orderBy set
-	 * @param string|array $order
-	 * @return Query return Query instance
-	 */
-	function orderBy($order)
-	{
-		$this->setOrder($order);
-		return $this;
-	}
-
-	/**
-	 * limit set
-	 * @param int $limit
-	 * @return Query return Query instance
-	 */
-	function limit($limit)
-	{
-		$this->setLimit($limit);
-		return $this;
-	}
-
-	// END Fluent interface
-
-	function getAction()
-	{
-		return $this->action;
-	}
-
-	function getPriority()
-	{
-		return $this->priority ? 'LOW_PRIORITY' : '';
-	}
-
-	/**
-	 * Check if current query uses the click count attribute
-	 * For CUBRID, this statement uses the click count feature.
-	 * For the other databases, using this attribute causes a query
-	 * to produce both a select and an update
-	 */
-	function usesClickCount()
-	{
-		return count($this->getClickCountColumns()) > 0;
-	}
-
-	function getClickCountColumns()
-	{
-		$click_count_columns = array();
-		foreach($this->columns as $column)
-		{
-			if($column->show() && is_a($column, 'ClickCountExpression'))
-			{
-				$click_count_columns[] = $column;
-			}
-		}
-		return $click_count_columns;
-	}
-
-	/**
-	 * Return select sql
-	 * @param boolean $with_values
-	 * @return string
-	 */
-	function getSelectString($with_values = TRUE)
-	{
-		foreach($this->columns as $column)
-		{
-			if($column->show())
-			{
-				if($column->isSubquery())
-				{
-					$select[] = $column->toString($with_values) . ' as ' . $column->getAlias();
-				}
-				else
-				{
-					$select[] = $column->getExpression($with_values);
-				}
-			}
-		}
-		return trim(implode($select, ', '));
-	}
-
-	/**
-	 * Return update sql
-	 * @param boolean $with_values
-	 * @return string
-	 */
-	function getUpdateString($with_values = TRUE)
-	{
-		foreach($this->columns as $column)
-		{
-			if($column->show())
-			{
-				$update[] = $column->getExpression($with_values);
-			}
-		}
-
-		if(!$update) return;
-		return trim(implode($update, ', '));
-	}
-
-	/**
-	 * Return insert sql
-	 * @param boolean $with_values
-	 * @return string
-	 */
-	function getInsertString($with_values = TRUE)
-	{
-		$columnsList = '';
-		// means we have insert-select
-		if($this->subquery)
-		{
-			foreach($this->columns as $column)
-			{
-				$columnsList .= $column->getColumnName() . ', ';
-			}
-			$columnsList = substr($columnsList, 0, -2);
-			$selectStatement = $this->subquery->toString($with_values);
-			$selectStatement = substr($selectStatement, 1, -1);
-			return "($columnsList) \n $selectStatement";
-		}
-
-		$valuesList = '';
-		foreach($this->columns as $column)
-		{
-			if($column->show())
-			{
-				$columnsList .= $column->getColumnName() . ', ';
-				$valuesList .= $column->getValue($with_values) . ', ';
-			}
-		}
-		$columnsList = substr($columnsList, 0, -2);
-		$valuesList = substr($valuesList, 0, -2);
-
-		return "($columnsList) \n VALUES ($valuesList)";
-	}
-
-	function getTables()
-	{
-		return $this->tables;
-	}
-
-	/**
-	 * from table_a
-	 * from table_a inner join table_b on x=y
-	 * from (select * from table a) as x
-	 * from (select * from table t) as x inner join table y on y.x
-	 * @param boolean $with_values
-	 * @return string
-	 */
-	function getFromString($with_values = TRUE)
-	{
-		$from = '';
-		$simple_table_count = 0;
-		foreach($this->tables as $table)
-		{
-			if($table->isJoinTable() || !$simple_table_count)
-			{
-				$from .= $table->toString($with_values) . ' ';
-			}
-			else
-			{
-				$from .= ', ' . $table->toString($with_values) . ' ';
-			}
-
-			if(is_a($table, 'Subquery'))
-			{
-				$from .= $table->getAlias() ? ' as ' . $table->getAlias() . ' ' : ' ';
-			}
-
-			$simple_table_count++;
-		}
-		if(trim($from) == '')
-		{
-			return '';
-		}
-		return $from;
-	}
-
-	/**
-	 * Return where sql
-	 * @param boolean $with_values
-	 * @param boolean $with_optimization
-	 * @return string
-	 */
-	function getWhereString($with_values = TRUE, $with_optimization = TRUE)
-	{
-		$where = '';
-		$condition_count = 0;
-
-		foreach($this->conditions as $conditionGroup)
-		{
-			if($condition_count === 0)
-			{
-				$conditionGroup->setPipe("");
-			}
-			$condition_string = $conditionGroup->toString($with_values);
-			$where .= $condition_string;
-			$condition_count++;
-		}
-
-		if($with_optimization &&
-				(strstr($this->getOrderByString(), 'list_order') || strstr($this->getOrderByString(), 'update_order')))
-		{
-
-			if($condition_count !== 0)
-			{
-				$where = '(' . $where . ') ';
-			}
-
-			foreach($this->orderby as $order)
-			{
-				$colName = $order->getColumnName();
-				if(strstr($colName, 'list_order') || strstr($colName, 'update_order'))
-				{
-					$opt_condition = new ConditionWithoutArgument($colName, 2100000000, 'less', 'and');
-					if($condition_count === 0)
-					{
-						$opt_condition->setPipe("");
-					}
-					$where .= $opt_condition->toString($with_values) . ' ';
-					$condition_count++;
-				}
-			}
-		}
-
-		return trim($where);
-	}
-
-	/**
-	 * Return groupby sql
-	 * @return string
-	 */
-	function getGroupByString()
-	{
-		$groupBy = '';
-		if($this->groups)
-		{
-			if($this->groups[0] !== "")
-			{
-				$groupBy = implode(', ', $this->groups);
-			}
-		}
-		return $groupBy;
-	}
-
-	/**
-	 * Return orderby sql
-	 * @return string
-	 */
-	function getOrderByString()
-	{
-		if(!$this->_orderByString)
-		{
-			if(count($this->orderby) === 0)
-			{
-				return '';
-			}
-			$orderBy = '';
-			foreach($this->orderby as $order)
-			{
-				$orderBy .= $order->toString() . ', ';
-			}
-			$orderBy = substr($orderBy, 0, -2);
-			$this->_orderByString = $orderBy;
-		}
-		return $this->_orderByString;
-	}
-
-	function getLimit()
-	{
-		return $this->limit;
-	}
-
-	/**
-	 * Return limit sql
-	 * @return string
-	 */
-	function getLimitString()
-	{
-		$limit = '';
-		if(count($this->limit) > 0)
-		{
-			$limit = '';
-			$limit .= $this->limit->toString();
-		}
-		return $limit;
-	}
-
-	function getFirstTableName()
-	{
-		return $this->tables[0]->getName();
-	}
-
-	/**
-	 * Return argument list
-	 * @return array
-	 */
-	function getArguments()
-	{
-		if(!isset($this->arguments))
-		{
-			$this->arguments = array();
-
-			// Join table arguments
-			if(count($this->tables) > 0)
-			{
-				foreach($this->tables as $table)
-				{
-					if($table->isJoinTable() || is_a($table, 'Subquery'))
-					{
-						$args = $table->getArguments();
-						if($args)
-						{
-							$this->arguments = array_merge($this->arguments, $args);
-						}
-					}
-				}
-			}
-
-			// Column arguments
-			// The if is for delete statements, all others must have columns
-			if(count($this->columns) > 0)
-			{
-				foreach($this->columns as $column)
-				{
-					if($column->show())
-					{
-						$args = $column->getArguments();
-						if($args)
-						{
-							$this->arguments = array_merge($this->arguments, $args);
-						}
-					}
-				}
-			}
-
-			// Condition arguments
-			if(count($this->conditions) > 0)
-			{
-				foreach($this->conditions as $conditionGroup)
-				{
-					$args = $conditionGroup->getArguments();
-					if(count($args) > 0)
-					{
-						$this->arguments = array_merge($this->arguments, $args);
-					}
-				}
-			}
-
-			// Navigation arguments
-			if(count($this->orderby) > 0)
-			{
-				foreach($this->orderby as $order)
-				{
-					$args = $order->getArguments();
-					if(count($args) > 0)
-					{
-						$this->arguments = array_merge($this->arguments, $args);
-					}
-				}
-			}
-		}
-		return $this->arguments;
-	}
-
-}
-/* End of file Query.class.php */
-/* Location: ./classes/db/queryparts/Query.class.php */

classes/db/queryparts/Subquery.class.php

@@ -1,80 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts
- * @version 0.1
- */
-class Subquery extends Query
-{
-
-	/**
-	 * table alias
-	 * @var string
-	 */
-	var $alias;
-
-	/**
-	 * join type
-	 * @var string
-	 */
-	var $join_type;
-
-	/**
-	 * constructor
-	 * @param string $alias
-	 * @param string|array $columns
-	 * @param string|array $tables
-	 * @param string|array $conditions
-	 * @param string|array $groups
-	 * @param string|array $orderby
-	 * @param int $limit
-	 * @param string $join_type
-	 * @return void
-	 */
-	function __construct($alias, $columns, $tables, $conditions, $groups, $orderby, $limit, $join_type = null)
-	{
-		$this->alias = $alias;
-
-		$this->queryID = null;
-		$this->action = "select";
-
-		$this->columns = $columns;
-		$this->tables = $tables;
-		$this->conditions = $conditions;
-		$this->groups = $groups;
-		$this->orderby = $orderby;
-		$this->limit = $limit;
-		$this->join_type = $join_type;
-	}
-
-	function getAlias()
-	{
-		return $this->alias;
-	}
-
-	function isJoinTable()
-	{
-		if($this->join_type)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	function toString($with_values = true)
-	{
-		$oDB = &DB::getInstance();
-
-		return '(' . $oDB->getSelectSql($this, $with_values) . ')';
-	}
-
-	function isSubquery()
-	{
-		return true;
-	}
-
-}
-/* End of file Subquery.class.php */
-/* Location: ./classes/db/queryparts/Subquery.class.php */

classes/db/queryparts/condition/Condition.class.php

@@ -1,258 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/condition
- * @version 0.1
- */
-class Condition
-{
-
-	/**
-	 * column name
-	 * @var string
-	 */
-	var $column_name;
-	var $argument;
-
-	/**
-	 * operation can use 'equal', 'more', 'excess', 'less', 'below', 'like_tail', 'like_prefix', 'like', 'notlike_tail',
-	 * 'notlike_prefix', 'notlike', 'in', 'notin', 'not_in', 'and', 'or', 'xor', 'not', 'notequal', 'between'
-	 * 'null', 'notnull'
-	 * @var string
-	 */
-	var $operation;
-
-	/**
-	 * pipe can use 'and', 'or'...
-	 * @var string
-	 */
-	var $pipe;
-	var $_value;
-	var $_show;
-	var $_value_to_string;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param mixed $argument
-	 * @param string $operation
-	 * @param string $pipe
-	 * @return void
-	 */
-	function __construct($column_name, $argument, $operation, $pipe)
-	{
-		$this->column_name = $column_name;
-		$this->argument = $argument;
-		$this->operation = $operation;
-		$this->pipe = $pipe;
-	}
-
-	function getArgument()
-	{
-		return null;
-	}
-
-	/**
-	 * value to string
-	 * @param boolean $withValue
-	 * @return string
-	 */
-	function toString($withValue = true)
-	{
-		if(!isset($this->_value_to_string))
-		{
-			if(!$this->show())
-			{
-				$this->_value_to_string = '';
-			}
-			else if($withValue)
-			{
-				$this->_value_to_string = $this->toStringWithValue();
-			}
-			else
-			{
-				$this->_value_to_string = $this->toStringWithoutValue();
-			}
-		}
-		return $this->_value_to_string;
-	}
-
-	/**
-	 * change string without value
-	 * @return string
-	 */
-	function toStringWithoutValue()
-	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
-	}
-
-	/**
-	 * change string with value
-	 * @return string
-	 */
-	function toStringWithValue()
-	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
-	}
-
-	function setPipe($pipe)
-	{
-		$this->pipe = $pipe;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	function show()
-	{
-		if(!isset($this->_show))
-		{
-			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
-			{
-				$this->_show = false;
-			}
-			else
-			{
-				$this->_show = true;
-				switch($this->operation)
-				{
-					case 'equal' :
-					case 'more' :
-					case 'excess' :
-					case 'less' :
-					case 'below' :
-					case 'like_tail' :
-					case 'like_prefix' :
-					case 'like' :
-					case 'notlike_tail' :
-					case 'notlike_prefix' :
-					case 'notlike' :
-					case 'in' :
-					case 'notin' :
-					case 'not_in' :
-					case 'and':
-					case 'or':
-					case 'xor':
-					case 'not':
-					case 'notequal' :
-						// if variable is not set or is not string or number, return
-						if(!isset($this->_value))
-						{
-							$this->_show = false;
-							break;
-						}
-						if($this->_value === '')
-						{
-							$this->_show = false;
-							break;
-						}
-						$tmpArray = array('string' => 1, 'integer' => 1);
-						if(!isset($tmpArray[gettype($this->_value)]))
-						{
-							$this->_show = false;
-							break;
-						}
-						break;
-					case 'between' :
-						if(!is_array($this->_value))
-						{
-							$this->_show = false;
-							break;
-						}
-						if(count($this->_value) != 2)
-						{
-							$this->_show = false;
-							break;
-						}
-					case 'null':
-					case 'notnull':
-						break;
-					default:
-						// If operation is not one of the above, means the condition is invalid
-						$this->_show = false;
-				}
-			}
-		}
-		return $this->_show;
-	}
-
-	/**
-	 * Return condition string
-	 * @param int|string|array $value
-	 * @return string
-	 */
-	function getConditionPart($value)
-	{
-		$name = $this->column_name;
-		$operation = $this->operation;
-
-		switch($operation)
-		{
-			case 'equal' :
-				return $name . ' = ' . $value;
-				break;
-			case 'more' :
-				return $name . ' >= ' . $value;
-				break;
-			case 'excess' :
-				return $name . ' > ' . $value;
-				break;
-			case 'less' :
-				return $name . ' <= ' . $value;
-				break;
-			case 'below' :
-				return $name . ' < ' . $value;
-				break;
-			case 'like_tail' :
-			case 'like_prefix' :
-			case 'like' :
-				if(defined('__CUBRID_VERSION__')
-						&& __CUBRID_VERSION__ >= '8.4.1')
-					return $name . ' rlike ' . $value;
-				else
-					return $name . ' like ' . $value;
-				break;
-			case 'notlike_tail' :
-			case 'notlike_prefix' :
-			case 'notlike' :
-				return $name . ' not like ' . $value;
-				break;
-			case 'in' :
-				return $name . ' in ' . $value;
-				break;
-			case 'notin' :
-			case 'not_in' :
-				return $name . ' not in ' . $value;
-				break;
-			case 'notequal' :
-				return $name . ' <> ' . $value;
-				break;
-			case 'notnull' :
-				return $name . ' is not null';
-				break;
-			case 'null' :
-				return $name . ' is null';
-				break;
-			case 'and' :
-				return $name . ' & ' . $value;
-				break;
-			case 'or' :
-				return $name . ' | ' . $value;
-				break;
-			case 'xor' :
-				return $name . ' ^ ' . $value;
-				break;
-			case 'not' :
-				return $name . ' ~ ' . $value;
-				break;
-			case 'between' :
-				return $name . ' between ' . $value[0] . ' and ' . $value[1];
-				break;
-		}
-	}
-
-}
-/* End of file Condition.class.php */
-/* Location: ./classes/db/queryparts/condition/Condition.class.php */

classes/db/queryparts/condition/ConditionGroup.class.php

@@ -1,120 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/condition
- * @version 0.1
- */
-class ConditionGroup
-{
-
-	/**
-	 * condition list
-	 * @var array
-	 */
-	var $conditions;
-
-	/**
-	 * pipe can use 'and', 'or'...
-	 * @var string
-	 */
-	var $pipe;
-	var $_group;
-	var $_show;
-
-	/**
-	 * constructor
-	 * @param array $conditions
-	 * @param string $pipe
-	 * @return void
-	 */
-	function __construct($conditions, $pipe = "")
-	{
-		$this->conditions = array();
-		foreach($conditions as $condition)
-		{
-			if($condition->show())
-			{
-				$this->conditions[] = $condition;
-			}
-		}
-		if(count($this->conditions) === 0)
-		{
-			$this->_show = false;
-		}
-		else
-		{
-			$this->_show = true;
-		}
-
-		$this->pipe = $pipe;
-	}
-
-	function show()
-	{
-		return $this->_show;
-	}
-
-	function setPipe($pipe)
-	{
-		if($this->pipe !== $pipe)
-		{
-			$this->_group = null;
-		}
-		$this->pipe = $pipe;
-	}
-
-	/**
-	 * value to string
-	 * @param boolean $with_value
-	 * @return string
-	 */
-	function toString($with_value = true)
-	{
-		if(!isset($this->_group))
-		{
-			$cond_indx = 0;
-			$group = '';
-
-			foreach($this->conditions as $condition)
-			{
-				if($cond_indx === 0)
-				{
-					$condition->setPipe("");
-				}
-				$group .= $condition->toString($with_value) . ' ';
-				$cond_indx++;
-			}
-
-			if($this->pipe !== "" && trim($group) !== '')
-			{
-				$group = $this->pipe . ' (' . $group . ')';
-			}
-
-			$this->_group = $group;
-		}
-		return $this->_group;
-	}
-
-	/**
-	 * return argument list
-	 * @return array
-	 */
-	function getArguments()
-	{
-		$args = array();
-		foreach($this->conditions as $condition)
-		{
-			$arg = $condition->getArgument();
-			if($arg)
-			{
-				$args[] = $arg;
-			}
-		}
-		return $args;
-	}
-
-}
-/* End of file ConditionGroup.class.php */
-/* Location: ./classes/db/queryparts/condition/ConditionGroup.class.php */

classes/db/queryparts/condition/ConditionSubquery.class.php

@@ -1,28 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/condition
- * @version 0.1
- */
-class ConditionSubquery extends Condition
-{
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param mixed $argument
-	 * @param string $operation
-	 * @param string $pipe
-	 * @return void
-	 */
-	function __construct($column_name, $argument, $operation, $pipe = "")
-	{
-		parent::__construct($column_name, $argument, $operation, $pipe);
-		$this->_value = $this->argument->toString();
-	}
-
-}
-/* End of file ConditionSubquery.class.php */
-/* Location: ./classes/db/queryparts/condition/ConditionSubquery.class.php */

classes/db/queryparts/condition/ConditionWithArgument.class.php

@@ -1,99 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/condition
- * @version 0.1
- */
-class ConditionWithArgument extends Condition
-{
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param mixed $argument
-	 * @param string $operation
-	 * @param string $pipe
-	 * @return void
-	 */
-	function __construct($column_name, $argument, $operation, $pipe = "")
-	{
-		if($argument === null)
-		{
-			$this->_show = false;
-			return;
-		}
-		parent::__construct($column_name, $argument, $operation, $pipe);
-		$this->_value = $argument->getValue();
-	}
-
-	function getArgument()
-	{
-		if(!$this->show())
-			return;
-		return $this->argument;
-	}
-
-	/**
-	 * change string without value
-	 * @return string
-	 */
-	function toStringWithoutValue()
-	{
-		$value = $this->argument->getUnescapedValue();
-
-		if(is_array($value))
-		{
-			$q = '';
-			foreach($value as $v)
-			{
-				$q .= '?,';
-			}
-			if($q !== '')
-			{
-				$q = substr($q, 0, -1);
-			}
-			$q = '(' . $q . ')';
-		}
-		else
-		{
-			// Prepared statements: column names should not be sent as query arguments, but instead concatenated to query string
-			if($this->argument->isColumnName())
-			{
-				$q = $value;
-			}
-			else
-			{
-				$q = '?';
-			}
-		}
-		return $this->pipe . ' ' . $this->getConditionPart($q);
-	}
-
-	/**
-	 * @return boolean
-	 */
-	function show()
-	{
-		if(!isset($this->_show))
-		{
-			if(!$this->argument->isValid())
-			{
-				$this->_show = false;
-			}
-			if($this->_value === '\'\'')
-			{
-				$this->_show = false;
-			}
-			if(!isset($this->_show))
-			{
-				return parent::show();
-			}
-		}
-		return $this->_show;
-	}
-
-}
-/* End of file ConditionWithArgument.class.php */
-/* Location: ./classes/db/queryparts/condition/ConditionWithArgument.class.php */

classes/db/queryparts/condition/ConditionWithoutArgument.class.php

@@ -1,40 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/condition
- * @version 0.1
- */
-class ConditionWithoutArgument extends Condition
-{
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param mixed $argument
-	 * @param string $operation
-	 * @param string $pipe
-	 * @return void
-	 */
-	function __construct($column_name, $argument, $operation, $pipe = "")
-	{
-		parent::__construct($column_name, $argument, $operation, $pipe);
-		$tmpArray = array('in' => 1, 'notin' => 1, 'not_in' => 1);
-		if(isset($tmpArray[$operation]))
-		{
-			if(is_array($argument))
-			{
-				$argument = implode($argument, ',');
-			}
-			$this->_value = '(' . $argument . ')';
-		}
-		else
-		{
-			$this->_value = $argument;
-		}
-	}
-
-}
-/* End of file ConditionWithoutArgument.class.php */
-/* Location: ./classes/db/queryparts/condition/ConditionWithoutArgument.class.php */

classes/db/queryparts/expression/ClickCountExpression.class.php

@@ -1,62 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * ClickCountExpression
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class ClickCountExpression extends SelectExpression
-{
-
-	/**
-	 * click count
-	 * @var bool
-	 */
-	var $click_count;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param string $alias
-	 * @param bool $click_count
-	 * @return void
-	 */
-	function __construct($column_name, $alias = NULL, $click_count = false)
-	{
-		parent::__construct($column_name, $alias);
-
-		if(!is_bool($click_count))
-		{
-			// error_log("Click_count value for $column_name was not boolean", 0);
-			$this->click_count = false;
-		}
-		$this->click_count = $click_count;
-	}
-
-	function show()
-	{
-		return $this->click_count;
-	}
-
-	/**
-	 * Return column expression, ex) column = column + 1
-	 * @return string
-	 */
-	function getExpression()
-	{
-		$db_type = Context::getDBType();
-		if($db_type == 'cubrid')
-		{
-			return "INCR($this->column_name)";
-		}
-		else
-		{
-			return "$this->column_name";
-		}
-	}
-
-}
-/* End of file ClickCountExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/ClickCountExpression.class.php */

classes/db/queryparts/expression/DeleteExpression.class.php

@@ -1,63 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * DeleteExpression
- *
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- * @todo Fix this class 
- */
-class DeleteExpression extends Expression
-{
-
-	/**
-	 * column value
-	 * @var mixed
-	 */
-	var $value;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param mixed $value
-	 * @return void
-	 */
-	function __construct($column_name, $value)
-	{
-		parent::__construct($column_name);
-		$this->value = $value;
-	}
-
-	/**
-	 * Return column expression, ex) column = value
-	 * @return string
-	 */
-	function getExpression()
-	{
-		return "$this->column_name = $this->value";
-	}
-
-	function getValue()
-	{
-		// TODO Escape value according to column type instead of variable type
-		if(!is_numeric($this->value))
-		{
-			return "'" . $this->value . "'";
-		}
-		return $this->value;
-	}
-
-	function show()
-	{
-		if(!$this->value)
-		{
-			return false;
-		}
-		return true;
-	}
-
-}
-/* End of file DeleteExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/DeleteExpression.class.php */

classes/db/queryparts/expression/Expression.class.php

@@ -1,56 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * Expression
- * Represents an expression used in select/update/insert/delete statements
- * 
- *  Examples (expressions are inside double square brackets):
- *  	select [[columnA]], [[columnB as aliasB]] from tableA
- *  	update tableA set [[columnA = valueA]] where columnB = something
- *
- * @author Corina
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class Expression
-{
-
-	/**
-	 * column name
-	 * @var string
-	 */
-	var $column_name;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @return void
-	 */
-	function __construct($column_name)
-	{
-		$this->column_name = $column_name;
-	}
-
-	function getColumnName()
-	{
-		return $this->column_name;
-	}
-
-	function show()
-	{
-		return false;
-	}
-
-	/**
-	 * Return column expression, ex) column as alias
-	 * @return string
-	 */
-	function getExpression()
-	{
-		
-	}
-
-}
-/* End of file Expression.class.php */
-/* Location: ./classes/db/queryparts/expression/Expression.class.php */

classes/db/queryparts/expression/InsertExpression.class.php

@@ -1,74 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * InsertExpression
- *
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class InsertExpression extends Expression
-{
-
-	/**
-	 * argument
-	 * @var object
-	 */
-	var $argument;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param object $argument
-	 * @return void
-	 */
-	function __construct($column_name, $argument)
-	{
-		parent::__construct($column_name);
-		$this->argument = $argument;
-	}
-
-	function getValue($with_values = true)
-	{
-		if($with_values)
-		{
-			return $this->argument->getValue();
-		}
-		return '?';
-	}
-
-	function show()
-	{
-		if(!$this->argument)
-		{
-			return false;
-		}
-		$value = $this->argument->getValue();
-		if(!isset($value))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	function getArgument()
-	{
-		return $this->argument;
-	}
-
-	function getArguments()
-	{
-		if($this->argument)
-		{
-			return array($this->argument);
-		}
-		else
-		{
-			return array();
-		}
-	}
-
-}
-/* End of file InsertExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/InsertExpression.class.php */

classes/db/queryparts/expression/SelectExpression.class.php

@@ -1,70 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * SelectExpression
- * Represents an expresion that appears in the select clause
- *
- * 		$column_name can be:
- *  		- a table column name
- *  		- an sql function - like count(*)
- * 	  		- an sql expression - substr(column_name, 1, 8) or score1 + score2
- * 		$column_name is already escaped
- *
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class SelectExpression extends Expression
-{
-
-	/**
-	 * column alias name
-	 * @var string
-	 */
-	var $column_alias;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param string $alias
-	 * @return void
-	 */
-	function __construct($column_name, $alias = NULL)
-	{
-		parent::__construct($column_name);
-		$this->column_alias = $alias;
-	}
-
-	/**
-	 * Return column expression, ex) column as alias
-	 * @return string
-	 */
-	function getExpression()
-	{
-		return sprintf("%s%s", $this->column_name, $this->column_alias ? " as " . $this->column_alias : "");
-	}
-
-	function show()
-	{
-		return true;
-	}
-
-	function getArgument()
-	{
-		return null;
-	}
-
-	function getArguments()
-	{
-		return array();
-	}
-
-	function isSubquery()
-	{
-		return false;
-	}
-
-}
-/* End of file SelectExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/SelectExpression.class.php */

classes/db/queryparts/expression/StarExpression.class.php

@@ -1,37 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * StarExpression
- * Represents the * in 'select * from ...' statements 
- *
- * @author Corina
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class StarExpression extends SelectExpression
-{
-
-	/**
-	 * constructor, set the column to asterisk
-	 * @return void
-	 */
-	function __construct()
-	{
-		parent::__construct("*");
-	}
-
-	function getArgument()
-	{
-		return null;
-	}
-
-	function getArguments()
-	{
-		// StarExpression has no arguments
-		return array();
-	}
-
-}
-/* End of file StarExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/StarExpression.class.php */

classes/db/queryparts/expression/UpdateExpression.class.php

@@ -1,119 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * UpdateExpression
- *
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class UpdateExpression extends Expression
-{
-
-	/**
-	 * argument
-	 * @var object
-	 */
-	var $argument;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param object $argument
-	 * @return void
-	 */
-	function __construct($column_name, $argument)
-	{
-		parent::__construct($column_name);
-		$this->argument = $argument;
-	}
-
-	/**
-	 * Return column expression, ex) column = value
-	 * @return string
-	 */
-	function getExpression($with_value = true)
-	{
-		if($with_value)
-		{
-			return $this->getExpressionWithValue();
-		}
-		return $this->getExpressionWithoutValue();
-	}
-
-	/**
-	 * Return column expression, ex) column = value
-	 * @return string
-	 */
-	function getExpressionWithValue()
-	{
-		$value = $this->argument->getValue();
-		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
-		{
-			return "$this->column_name = $this->column_name $operation $value";
-		}
-		return "$this->column_name = $value";
-	}
-
-	/**
-	 * Return column expression, ex) column = ?
-	 * Can use prepare statement
-	 * @return string
-	 */
-	function getExpressionWithoutValue()
-	{
-		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
-		{
-			return "$this->column_name = $this->column_name $operation ?";
-		}
-		return "$this->column_name = ?";
-	}
-
-	function getValue()
-	{
-		// TODO Escape value according to column type instead of variable type
-		$value = $this->argument->getValue();
-		if(!is_numeric($value))
-		{
-			return "'" . $value . "'";
-		}
-		return $value;
-	}
-
-	function show()
-	{
-		if(!$this->argument)
-		{
-			return false;
-		}
-		$value = $this->argument->getValue();
-		if(!isset($value))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	function getArgument()
-	{
-		return $this->argument;
-	}
-
-	function getArguments()
-	{
-		if($this->argument)
-		{
-			return array($this->argument);
-		}
-		else
-		{
-			return array();
-		}
-	}
-
-}
-/* End of file UpdateExpression.class.php */
-/* Location: ./classes/db/queryparts/expression/UpdateExpression.class.php */

classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php

@@ -1,74 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * UpdateExpression
- *
- * @author Arnia Software
- * @package /classes/db/queryparts/expression
- * @version 0.1
- */
-class UpdateExpressionWithoutArgument extends UpdateExpression
-{
-
-	/**
-	 * argument
-	 * @var object
-	 */
-	var $argument;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param object $argument
-	 * @return void
-	 */
-	function __construct($column_name, $argument)
-	{
-		parent::__construct($column_name, $argument);
-		$this->argument = $argument;
-	}
-
-	function getExpression($with_value = true)
-	{
-		return "$this->column_name = $this->argument";
-	}
-
-	function getValue()
-	{
-		// TODO Escape value according to column type instead of variable type
-		$value = $this->argument;
-		if(!is_numeric($value))
-		{
-			return "'" . $value . "'";
-		}
-		return $value;
-	}
-
-	function show()
-	{
-		if(!$this->argument)
-		{
-			return false;
-		}
-		$value = $this->argument;
-		if(!isset($value))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	function getArgument()
-	{
-		return null;
-	}
-
-	function getArguments()
-	{
-		return array();
-	}
-
-}
-/* End of file UpdateExpressionWithoutArgument.class.php */
-/* Location: ./classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php */

classes/db/queryparts/limit/Limit.class.php

@@ -1,101 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/limit
- * @version 0.1
- */
-class Limit
-{
-
-	/**
-	 * start number
-	 * @var int
-	 */
-	var $start;
-
-	/**
-	 * list count
-	 * @var int
-	 */
-	var $list_count;
-
-	/**
-	 * page count
-	 * @var int
-	 */
-	var $page_count;
-
-	/**
-	 * current page
-	 * @var int
-	 */
-	var $page;
-
-	/**
-	 * constructor
-	 * @param int $list_count
-	 * @param int $page
-	 * @param int $page_count
-	 * @param int $offset
-	 * @return void
-	 */
-	function __construct($list_count, $page = NULL, $page_count = NULL, $offset = NULL)
-	{
-		$this->list_count = $list_count;
-		if($page)
-		{
-			$list_count_value = $list_count->getValue();
-			$page_value = $page->getValue();
-			$this->start = ($page_value - 1) * $list_count_value;
-			$this->page_count = $page_count;
-			$this->page = $page;
-		}
-		elseif($offset)
-		{
-			$this->start = $offset->getValue();
-		}
-	}
-
-	/**
-	 * In case you choose to use query limit in other cases than page select
-	 * @return boolean
-	 */
-	function isPageHandler()
-	{
-		if($this->page)
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	function getOffset()
-	{
-		return $this->start;
-	}
-
-	function getLimit()
-	{
-		return $this->list_count->getValue();
-	}
-
-	function toString()
-	{
-		if($this->page || $this->start)
-		{
-			return $this->start . ' , ' . $this->list_count->getValue();
-		}
-		else
-		{
-			return $this->list_count->getValue();
-		}
-	}
-
-}
-/* End of file Limit.class.php */
-/* Location: ./classes/db/limit/Limit.class.php */

classes/db/queryparts/order/OrderByColumn.class.php

@@ -1,74 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/order
- * @version 0.1
- */
-class OrderByColumn
-{
-
-	/**
-	 * column name
-	 * @var string
-	 */
-	var $column_name;
-
-	/**
-	 * sort order
-	 * @var string
-	 */
-	var $sort_order;
-
-	/**
-	 * constructor
-	 * @param string $column_name
-	 * @param string $sort_order
-	 * @return void
-	 */
-	function __construct($column_name, $sort_order)
-	{
-		$this->column_name = $column_name;
-		$this->sort_order = $sort_order;
-	}
-
-	function toString()
-	{
-		$result = $this->getColumnName();
-		$result .= ' ';
-		$result .= is_a($this->sort_order, 'Argument') ? $this->sort_order->getValue() : $this->sort_order;
-		return $result;
-	}
-
-	function getColumnName()
-	{
-		return is_a($this->column_name, 'Argument') ? $this->column_name->getValue() : $this->column_name;
-	}
-
-	function getPureColumnName()
-	{
-		return is_a($this->column_name, 'Argument') ? $this->column_name->getPureValue() : $this->column_name;
-	}
-
-	function getPureSortOrder()
-	{
-		return is_a($this->sort_order, 'Argument') ? $this->sort_order->getPureValue() : $this->sort_order;
-	}
-
-	function getArguments()
-	{
-		$args = array();
-		if(is_a($this->column_name, 'Argument'))
-		{
-			$args[] = $this->column_name;
-		}
-		if(is_a($this->sort_order, 'Argument'))
-		{
-			$args[] = $this->sort_order;
-		}
-	}
-
-}
-/* End of file OrderByColumn.class.php */
-/* Location: ./classes/db/order/OrderByColumn.class.php */

classes/db/queryparts/table/CubridTableWithHint.class.php

@@ -1,71 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class CubridTableWithHint extends Table
-{
-
-	/**
-	 * table name
-	 * @var string
-	 */
-	var $name;
-
-	/**
-	 * table alias
-	 * @var string
-	 */
-	var $alias;
-
-	/**
-	 * index hint list
-	 * @var array
-	 */
-	var $index_hints_list;
-
-	/**
-	 * constructor
-	 * @param string $name
-	 * @param string $alias
-	 * @param array $index_hints_list
-	 * @return void
-	 */
-	function __construct($name, $alias = NULL, $index_hints_list)
-	{
-		parent::__construct($name, $alias);
-		$this->index_hints_list = $index_hints_list;
-	}
-
-	/**
-	 * Return index hint string
-	 * @return string
-	 */
-	function getIndexHintString()
-	{
-		$result = '';
-
-		// Retrieve table prefix, to add it to index name
-		$prefix = config('db.master.prefix');
-
-		foreach($this->index_hints_list as $index_hint)
-		{
-			$index_hint_type = $index_hint->getIndexHintType();
-			if($index_hint_type !== 'IGNORE')
-			{
-				$result .= $this->alias . '.'
-						. '"' . $prefix . substr($index_hint->getIndexName(), 1)
-						. ($index_hint_type == 'FORCE' ? '(+)' : '')
-						. ', ';
-			}
-		}
-		$result = substr($result, 0, -2);
-		return $result;
-	}
-
-}
-/* End of file CubridTableWithHint.class.php */
-/* Location: ./classes/db/queryparts/table/CubridTableWithHint.class.php */

classes/db/queryparts/table/IndexHint.class.php

@@ -1,48 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class IndexHint
-{
-
-	/**
-	 * index name
-	 * @var string
-	 */
-	var $index_name;
-
-	/**
-	 * index hint type, ex) IGNORE, FORCE, USE...
-	 * @var string
-	 */
-	var $index_hint_type;
-
-	/**
-	 * constructor
-	 * @param string $index_name
-	 * @param string $index_hint_type
-	 * @return void
-	 */
-	function __construct($index_name, $index_hint_type)
-	{
-		$this->index_name = $index_name;
-		$this->index_hint_type = $index_hint_type;
-	}
-
-	function getIndexName()
-	{
-		return $this->index_name;
-	}
-
-	function getIndexHintType()
-	{
-		return $this->index_hint_type;
-	}
-
-}
-/* End of file IndexHint.class.php */
-/* Location: ./classes/db/queryparts/table/IndexHint.class.php */

classes/db/queryparts/table/JoinTable.class.php

@@ -1,71 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * class JoinTable
- * 		$conditions in an array of Condition objects 
- * 
- * @author Arnia Software
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class JoinTable extends Table
-{
-
-	/**
-	 * join type
-	 * @var string
-	 */
-	var $join_type;
-
-	/**
-	 * condition list
-	 * @var array
-	 */
-	var $conditions;
-
-	/**
-	 * constructor
-	 * @param string $name
-	 * @param string $alias
-	 * @param string $join_type
-	 * @param array $conditions
-	 * @return void
-	 */
-	function __construct($name, $alias, $join_type, $conditions)
-	{
-		parent::__construct($name, $alias);
-		$this->join_type = $join_type;
-		$this->conditions = $conditions;
-	}
-
-	function toString($with_value = true)
-	{
-		$part = $this->join_type . ' ' . $this->name;
-		$part .= $this->alias ? ' as ' . $this->alias : '';
-		$part .= ' on ';
-		foreach($this->conditions as $conditionGroup)
-		{
-			$part .= $conditionGroup->toString($with_value);
-		}
-		return $part;
-	}
-
-	function isJoinTable()
-	{
-		return true;
-	}
-
-	function getArguments()
-	{
-		$args = array();
-		foreach($this->conditions as $conditionGroup)
-		{
-			$args = array_merge($args, $conditionGroup->getArguments());
-		}
-		return $args;
-	}
-
-}
-/* End of file JoinTable.class.php */
-/* Location: ./classes/db/queryparts/table/JoinTable.class.php */

classes/db/queryparts/table/MssqlTableWithHint.class.php

@@ -1,66 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class MssqlTableWithHint extends Table
-{
-
-	/**
-	 * table name
-	 * @var string
-	 */
-	var $name;
-
-	/**
-	 * table alias
-	 * @var string
-	 */
-	var $alias;
-
-	/**
-	 * index hint type, ex) IGNORE, FORCE, USE...
-	 * @var array
-	 */
-	var $index_hints_list;
-
-	/**
-	 * constructor
-	 * @param string $name
-	 * @param string $alias
-	 * @param string $index_hints_list
-	 * @return void
-	 */
-	function __construct($name, $alias = NULL, $index_hints_list)
-	{
-		parent::__construct($name, $alias);
-		$this->index_hints_list = $index_hints_list;
-	}
-
-	function toString()
-	{
-		$result = parent::toString();
-
-		$index_hint_string = '';
-		$indexTypeList = array('USE' => 1, 'FORCE' => 1);
-		foreach($this->index_hints_list as $index_hint)
-		{
-			$index_hint_type = $index_hint->getIndexHintType();
-			if(isset($indexTypeList[$index_hint_type]))
-			{
-				$index_hint_string .= 'INDEX(' . $index_hint->getIndexName() . '), ';
-			}
-		}
-		if($index_hint_string != '')
-		{
-			$result .= ' WITH(' . substr($index_hint_string, 0, -2) . ') ';
-		}
-		return $result;
-	}
-
-}
-/* End of file MssqlTableWithHint.class.php */
-/* Location: ./classes/db/queryparts/table/MssqlTableWithHint.class.php */

classes/db/queryparts/table/MysqlTableWithHint.class.php

@@ -1,83 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class MysqlTableWithHint extends Table
-{
-
-	/**
-	 * table name
-	 * @var string
-	 */
-	var $name;
-
-	/**
-	 * table alias
-	 * @var string
-	 */
-	var $alias;
-
-	/**
-	 * index hint type, ex) IGNORE, FORCE, USE...
-	 * @var array
-	 */
-	var $index_hints_list;
-
-	/**
-	 * constructor
-	 * @param string $name
-	 * @param string $alias
-	 * @param string $index_hints_list
-	 * @return void
-	 */
-	function __construct($name, $alias = NULL, $index_hints_list)
-	{
-		parent::__construct($name, $alias);
-		$this->index_hints_list = $index_hints_list;
-	}
-
-	function toString()
-	{
-		$result = parent::toString();
-
-		$use_index_hint = '';
-		$force_index_hint = '';
-		$ignore_index_hint = '';
-		foreach($this->index_hints_list as $index_hint)
-		{
-			$index_hint_type = $index_hint->getIndexHintType();
-			if($index_hint_type == 'USE')
-			{
-				$use_index_hint .= $index_hint->getIndexName() . ', ';
-			}
-			else if($index_hint_type == 'FORCE')
-			{
-				$force_index_hint .= $index_hint->getIndexName() . ', ';
-			}
-			else if($index_hint_type == 'IGNORE')
-			{
-				$ignore_index_hint .= $index_hint->getIndexName() . ', ';
-			}
-		}
-		if($use_index_hint != '')
-		{
-			$result .= ' USE INDEX (' . substr($use_index_hint, 0, -2) . ') ';
-		}
-		if($force_index_hint != '')
-		{
-			$result .= ' FORCE INDEX (' . substr($force_index_hint, 0, -2) . ') ';
-		}
-		if($ignore_index_hint != '')
-		{
-			$result .= ' IGNORE INDEX (' . substr($ignore_index_hint, 0, -2) . ') ';
-		}
-		return $result;
-	}
-
-}
-/* End of file MysqlTableWithHint.class.php */
-/* Location: ./classes/db/queryparts/table/MysqlTableWithHint.class.php */

classes/db/queryparts/table/Table.class.php

@@ -1,59 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-/**
- * @author NAVER (developers@xpressengine.com)
- * @package /classes/db/queryparts/table
- * @version 0.1
- */
-class Table
-{
-
-	/**
-	 * table name
-	 * @var string
-	 */
-	var $name;
-
-	/**
-	 * table alias
-	 * @var string
-	 */
-	var $alias;
-
-	/**
-	 * constructor
-	 * @param string $name
-	 * @param string $alias
-	 * @return void
-	 */
-	function __construct($name, $alias = NULL)
-	{
-		$this->name = $name;
-		$this->alias = $alias;
-	}
-
-	function toString()
-	{
-		//return $this->name;
-		return sprintf("%s%s", $this->name, $this->alias ? ' as ' . $this->alias : '');
-	}
-
-	function getName()
-	{
-		return $this->name;
-	}
-
-	function getAlias()
-	{
-		return $this->alias;
-	}
-
-	function isJoinTable()
-	{
-		return false;
-	}
-
-}
-/* End of file Table.class.php */
-/* Location: ./classes/db/queryparts/table/Table.class.php */

classes/display/DisplayHandler.class.php

@@ -1,21 +1,15 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class DisplayHandler
+ * DisplayHandler
+ *
  * @author NAVER (developers@xpressengine.com)
- *  DisplayHandler is responsible for displaying the execution result. \n
- *  Depending on the request type, it can display either HTML or XML content.\n
- *  Xml content is simple xml presentation of variables in oModule while html content
- *   is the combination of the variables of oModue and template files/.
  */
 class DisplayHandler extends Handler
 {
 	public static $response_size = 0;
 	public static $debug_printed = 0;
-	var $content_size = 0; // /< The size of displaying contents
-	var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip
-	var $handler = NULL;
+	public $handler = NULL;
 
 	/**
 	 * print either html or xml content given oModule object
@@ -25,38 +19,50 @@ class DisplayHandler extends Handler
 	 */
 	public function printContent(&$oModule)
 	{
-		// Check if the gzip encoding supported
-		if(config('view.use_gzip') && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && extension_loaded('zlib') && $oModule->gzhandler_enable)
-		{
-			$this->gz_enabled = TRUE;
-		}
-
-		// Extract contents to display by the request method
+		// Extract contents to display by the response method
+		$responseMethod = Context::getResponseMethod();
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
 		}
-		elseif(Context::getRequestMethod() == 'JSON' || isset($_POST['_rx_ajax_compat']))
+		elseif($responseMethod == 'JSON' || isset($_POST['_rx_ajax_compat']))
 		{
 			$handler = new JSONDisplayHandler();
 		}
-		elseif(Context::getRequestMethod() == 'JS_CALLBACK')
+		elseif($responseMethod == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
 		}
-		elseif(Context::getRequestMethod() == 'XMLRPC')
+		elseif($responseMethod == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
-			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
-			{
-				$this->gz_enabled = FALSE;
-			}
+		}
+		elseif($responseMethod == 'RAW')
+		{
+			$handler = new RawDisplayHandler();
 		}
 		else
 		{
 			$handler = new HTMLDisplayHandler();
 		}
 
+		// Handle error location info
+		if ($location = $oModule->get('rx_error_location'))
+		{
+			if (!Rhymix\Framework\Debug::isEnabledForCurrentUser())
+			{
+				$oModule->unset('rx_error_location');
+			}
+			elseif (starts_with(\RX_BASEDIR, $location))
+			{
+				$oModule->add('rx_error_location', $location = substr($location, strlen(\RX_BASEDIR)));
+			}
+		}
+
+		// call a trigger before layout
+		ModuleHandler::triggerCall('layout', 'before', $oModule);
+
+		// apply layout
 		$output = $handler->toDoc($oModule);
 
 		// call a trigger before display
@@ -65,10 +71,10 @@ class DisplayHandler extends Handler
 
 		// execute add-on
 		$called_position = 'before_display_content';
-		$oAddonController = getController('addon');
+		$oAddonController = AddonController::getInstance();
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
 		if(file_exists($addon_file)) include($addon_file);
-		if($output === false || $output === null || $output instanceof Object)
+		if($output === false || $output === null || $output instanceof BaseObject)
 		{
 			$output = $original_output;
 		}
@@ -83,113 +89,151 @@ class DisplayHandler extends Handler
 
 		// header output
 		$httpStatusCode = $oModule->getHttpStatusCode();
-		if($httpStatusCode !== 200 && !in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK')))
+		$responseMethod = Context::getResponseMethod();
+		if($httpStatusCode !== 200 && !in_array($responseMethod, array('XMLRPC', 'JSON', 'JS_CALLBACK')))
 		{
 			self::_printHttpStatusCode($httpStatusCode);
 		}
 		else
 		{
-			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK' || isset($_POST['_rx_ajax_compat']))
+			if($responseMethod == 'JSON' || isset($_SERVER['HTTP_X_AJAX_COMPAT']) || isset($_POST['_rx_ajax_compat']))
 			{
-				if(strpos($_SERVER['HTTP_ACCEPT'], 'json') !== false)
-				{
-					self::_printJSONHeader();
-				}
+				self::_printJSONHeader();
 			}
-			elseif(Context::getRequestMethod() == 'XMLRPC')
+			elseif($responseMethod == 'XMLRPC')
 			{
 				self::_printXMLHeader();
 			}
+			elseif($responseMethod == 'RAW' && $content_type = Context::get('response_content_type'))
+			{
+				self::_printCustomContentTypeHeader($content_type);
+			}
 			else
 			{
 				self::_printHTMLHeader();
 			}
 		}
 
-		// disable gzip if output already exists
+		// Print security-related headers.
+		if($header_value = config('security.x_frame_options'))
+		{
+			header('X-Frame-Options: ' . $header_value);
+		}
+		if($header_value = config('security.x_content_type_options'))
+		{
+			header('X-Content-Type-Options: ' . $header_value);
+		}
+
+		// Print robot headers.
+		if (isset($oModule->module_info->robots_tag) && $oModule->module_info->robots_tag === 'noindex')
+		{
+			header('X-Robots-Tag: noindex');
+		}
+
+		// Flush the output buffer, and remove unnecessary whitespace at the beginning.
+		$buff = '';
 		while (ob_get_level())
 		{
-			ob_end_flush();
-		}
-		if(headers_sent())
-		{
-			$this->gz_enabled = FALSE;
-		}
-
-		// enable gzip using zlib extension
-		if($this->gz_enabled)
-		{
-			ini_set('zlib.output_compression', true);
+			$buff .= ob_get_clean();
 		}
+		$buff = ltrim($buff, "\n\r\t\v\x00\x20\u{FEFF}");
 
 		// call a trigger after display
-		self::$response_size = $this->content_size = strlen($output);
 		ModuleHandler::triggerCall('display', 'after', $output);
 
+		// Measure the response size.
+		self::$response_size = strlen((string)$output);
+
+		// Output buffered content only if the current page is HTML.
+		if ($handler instanceof HTMLDisplayHandler)
+		{
+			self::$response_size += strlen($buff);
+			echo $buff;
+		}
+
 		// Output the page content and debug data.
-		$debug = $this->getDebugInfo($output);
+		$debug = self::getDebugInfo($output);
 		print $output;
 		print $debug;
 	}
-	
+
 	/**
 	 * Get debug information.
-	 * 
+	 *
 	 * @return string
 	 */
-	public function getDebugInfo(&$output = null)
+	public static function getDebugInfo(&$output = null): string
 	{
 		// Check if debugging information has already been printed.
-		
+
 		if (self::$debug_printed)
 		{
-			return;
+			return '';
 		}
 		else
 		{
 			self::$debug_printed = 1;
 		}
-		
+
 		// Check if debugging is enabled for this request.
-		if (!config('debug.enabled') || !Rhymix\Framework\Debug::isEnabledForCurrentUser())
+		if (!Rhymix\Framework\Debug::isEnabledForCurrentUser())
 		{
-			return;
+			return '';
 		}
-		
+
 		// Do not display debugging information if there is no output.
-		$display_type = config('debug.display_type');
-		if ($output === null && $display_type !== 'file')
+		$display_types = config('debug.display_type') ?: [];
+		if ($display_types && !is_array($display_types))
 		{
-			return;
+			$display_types = array($display_types);
 		}
-		
-		// Print debug information.
-		switch ($display_type)
+		if ($output === null && !in_array('file', $display_types))
 		{
-			case 'panel':
+			return '';
+		}
+		if ($output === null)
+		{
+			$output = '';
+		}
+
+		// Print debug information.
+		$debug_output = '';
+		$response_type = Context::getResponseMethod();
+		foreach ($display_types as $display_type)
+		{
+			if ($display_type === 'panel')
+			{
 				$data = Rhymix\Framework\Debug::getDebugData();
 				$display_content = array_fill_keys(config('debug.display_content'), true);
-				if (count($display_content) && !isset($display_content['entries']))
+				if (!isset($display_content['request_info']))
+				{
+					unset($data->timestamp, $data->url, $data->request, $data->response, $data->memory, $data->timing);
+				}
+				if (!isset($display_content['entries']))
 				{
 					$data->entries = null;
 				}
-				if (count($display_content) && !isset($display_content['queries']))
+				if (!isset($display_content['errors']))
+				{
+					unset($data->errors);
+				}
+				if (!isset($display_content['queries']))
 				{
 					unset($data->queries);
 				}
-				if (count($display_content) && !isset($display_content['slow_queries']))
+				if (!isset($display_content['slow_queries']))
 				{
 					unset($data->slow_queries);
 				}
-				if (count($display_content) && !isset($display_content['slow_triggers']))
+				if (!isset($display_content['slow_triggers']))
 				{
 					unset($data->slow_triggers);
 				}
-				if (count($display_content) && !isset($display_content['slow_widgets']))
+				if (!isset($display_content['slow_widgets']))
 				{
 					unset($data->slow_widgets);
 				}
-				if (count($display_content) && !isset($display_content['slow_remote_requests']))
+				if (!isset($display_content['slow_remote_requests']))
 				{
 					unset($data->slow_remote_requests);
 				}
@@ -207,52 +251,42 @@ class DisplayHandler extends Handler
 						}
 					}
 				}
-				switch (Context::getResponseMethod())
+
+				switch ($response_type)
 				{
 					case 'HTML':
 						$json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0;
-						$panel_script = sprintf('<script src="%s%s?%s"></script>', RX_BASEURL, 'common/js/debug.js', filemtime(RX_BASEDIR . 'common/js/debug.js'));
-						if (isset($_SESSION['_rx_debug_previous']))
-						{
-							$panel_script .= "\n<script>\nvar rhymix_debug_previous = " . json_encode($_SESSION['_rx_debug_previous'], $json_options) . ";\n</script>";
-							unset($_SESSION['_rx_debug_previous']);
-						}
-						$panel_script .= "\n<script>\nvar rhymix_debug_content = " . json_encode($data, $json_options) . ";\n</script>";
+						$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>\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);
-						return;
+						break;
 					case 'JSON':
-						if (RX_POST && preg_match('/^proc/', Context::get('act')))
+						unset($_SESSION['_rx_debug_previous']);
+						if (preg_match('/^(.+)\}\n?$/', $output, $matches))
 						{
-							$data->ajax_module = Context::get('module');
-							$data->ajax_act = Context::get('act');
-							$_SESSION['_rx_debug_previous'] = $data;
+							$data = json_encode($data);
+							if (json_last_error() === JSON_ERROR_NONE)
+							{
+								$output = $matches[1] . ',"_rx_debug":' . $data . "}\n";
+							}
 						}
-						else
-						{
-							unset($_SESSION['_rx_debug_previous']);
-						}
-						if (preg_match('/^(.+)\}$/', $output, $matches))
-						{
-							$output = $matches[1] . ',"_rx_debug":' . json_encode($data) . '}';
-						}
-						return;
+						break;
 					default:
-						return;
+						break;
 				}
-			
-			case 'comment':
-			case 'file':
-			default:
-				if ($display_type === 'comment' && Context::getResponseMethod() !== 'HTML')
+			}
+			else
+			{
+				if ($display_type === 'comment' && $response_type !== 'HTML')
 				{
-					return;
+					continue;
 				}
 				ob_start();
 				$data = Rhymix\Framework\Debug::getDebugData();
 				$display_content = array_fill_keys(config('debug.display_content'), true);
 				include RX_BASEDIR . 'common/tpl/debug_comment.html';
-				$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL;
+				$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . "\n";
 				if ($display_type === 'file')
 				{
 					$log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php';
@@ -271,14 +305,17 @@ class DisplayHandler extends Handler
 					{
 						$phpheader = '';
 					}
-					FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a');
-					return '';
+					FileHandler::writeFile($log_filename, $phpheader . $content . "\n", 'a');
+					$debug_output .= '';
 				}
 				else
 				{
-					return '<!--' . PHP_EOL . $content . PHP_EOL . '-->';
+					$debug_output .= '<!--' . "\n" . $content . "\n" . '-->' . "\n";
 				}
+			}
 		}
+
+		return $debug_output;
 	}
 
 	/**
@@ -305,7 +342,19 @@ class DisplayHandler extends Handler
 	 */
 	public static function _printJSONHeader()
 	{
-		header("Content-Type: text/javascript; charset=UTF-8");
+		header("Content-Type: application/json; charset=UTF-8");
+	}
+
+	/**
+	 * print a custom Content-Type header.
+	 *
+	 * @param string $content_type
+	 * @return void
+	 */
+	public static function _printCustomContentTypeHeader($content_type)
+	{
+		$charset = (strpos($content_type, 'text/') === 0) ? '; charset=UTF-8' : '';
+		header('Content-Type: ' . $content_type . $charset);
 	}
 
 	/**
@@ -319,5 +368,3 @@ class DisplayHandler extends Handler
 	}
 
 }
-/* End of file DisplayHandler.class.php */
-/* Location: ./classes/display/DisplayHandler.class.php */

classes/display/HTMLDisplayHandler.php

@@ -1,34 +1,60 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class HTMLDisplayHandler
 {
+	/**
+	 * jQuery versions
+	 */
+	public const JQUERY_V2 = '2.2.4';
+	public const JQUERY_V2_MIGRATE = '1.4.1';
+	public const JQUERY_V3 = '3.6.3';
+	public const JQUERY_V3_MIGRATE = '3.4.0';
+
+	/**
+	 * Default viewport setting
+	 */
+	public const DEFAULT_VIEWPORT = 'width=device-width, initial-scale=1.0, user-scalable=yes';
+
 	/**
 	 * Reserved scripts
 	 */
 	public static $reservedCSS = '@\bcommon/css/(?:xe|rhymix|mobile)\.(?:min\.)?(?:s?css|less)$@';
 	public static $reservedJS = '@\bcommon/js/(?:jquery(?:-[123][0-9.x-]+)?|xe?|common|js_app|xml_handler|xml_js_filter)\.(?:min\.)?js$@';
-	
+
+	/**
+	 * List of scripts to block loading
+	 */
+	public static $blockedScripts = array(
+		'@(?:^|/)j[Qq]uery(?:-[0-9]+(?:\.[0-9x]+)*|-latest)?(?:\.min)?\.js$@',
+	);
+
 	/**
 	 * Replacement table for XE compatibility
 	 */
 	public static $replacements = array(
 		'@\bcommon/xeicon/@' => 'common/css/xeicon/',
+		'@\beditor/skins/xpresseditor/js/xe_textarea\.(?:min\.)?js@' => 'editor/skins/ckeditor/js/xe_textarea.js',
+		'@/lang$@' => '/lang/lang.xml',
 	);
 
+	/**
+	 * Image type information for SEO
+	 */
+	protected $_image_type = 'none';
+
 	/**
 	 * Produce HTML compliant content given a module object.\n
 	 * @param ModuleObject $oModule the module object
 	 * @return string compiled template string
 	 */
-	function toDoc(&$oModule)
+	public function toDoc(&$oModule)
 	{
-		$oTemplate = TemplateHandler::getInstance();
-
-		// compile module tpl
-		// deprecated themes skin
+		// SECISSUE https://github.com/xpressengine/xe-core/issues/1583
+		$oSecurity = new Security();
+		$oSecurity->encodeHTML('is_keyword', 'search_keyword', 'search_target', 'order_target', 'order_type');
 
 		$template_path = $oModule->getTemplatePath();
+		$template_file = $oModule->getTemplateFile();
 
 		if(!is_dir($template_path))
 		{
@@ -68,23 +94,30 @@ class HTMLDisplayHandler
 			}
 		}
 
-		$tpl_file = $oModule->getTemplateFile();
-
-		$output = $oTemplate->compile($template_path, $tpl_file);
-
-		// SECISSUE https://github.com/xpressengine/xe-core/issues/1583
-		$oSecurity = new Security();
-		$oSecurity->encodeHTML('is_keyword', 'search_keyword', 'search_target', 'order_target', 'order_type');
+		$oTemplate = new Rhymix\Framework\Template($template_path, $template_file);
+		$output = $oTemplate->compile();
 
 		// add .x div for adminitration pages
 		if(Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			$x_exclude_actions = array(
+				'dispPageAdminContentModify' => true,
+				'dispPageAdminMobileContentModify' => true,
+				'dispPageAdminMobileContent' => true,
+			);
+			$current_act = strval(Context::get('act'));
+			if(Context::get('module') != 'admin' && strpos($current_act, 'Admin') !== false && !isset($x_exclude_actions[$current_act]))
 			{
 				$output = '<div class="x">' . $output . '</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			// Wrap content in layout
+			$use_layout = Context::get('layout') !== 'none';
+			if (!$use_layout && isset($_REQUEST['layout']) && !self::isPartialPageRendering())
+			{
+				$use_layout = true;
+			}
+			if ($use_layout)
 			{
 				$start = microtime(true);
 
@@ -98,14 +131,13 @@ class HTMLDisplayHandler
 				// get the layout information currently requested
 				$oLayoutModel = getModel('layout');
 				$layout_info = Context::get('layout_info');
-				$layout_srl = $layout_info->layout_srl;
+				$layout_srl = $layout_info->layout_srl ?? 0;
 
 				// compile if connected to the layout
 				if($layout_srl > 0)
 				{
-
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if($layout_info && isset($layout_info->type) && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -119,16 +151,35 @@ class HTMLDisplayHandler
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
-					$layout_file = 'default_layout';
+					if ($layout_path === './common/tpl')
+					{
+						$layout_file = 'default_layout';
+					}
+					else
+					{
+						$layout_file = 'layout';
+					}
 				}
+
+				$oTemplate = new Rhymix\Framework\Template;
 				$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
 
+				// Add layout header script.
+				if ($layout_srl > 0)
+				{
+					$part_config = ModuleModel::getModulePartConfig('layout', $layout_srl);
+					if ($part_config && isset($part_config->header_script))
+					{
+						Context::addHtmlHeader($part_config->header_script, true);
+					}
+				}
+
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
 				if(substr_compare($realLayoutPath, '/', -1) !== 0)
@@ -139,85 +190,18 @@ class HTMLDisplayHandler
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				$GLOBALS['__layout_compile_elapsed__'] = microtime(true) - $start;
-
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
-				{
-					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
-				}
-			}
-		}
-		return $output;
-	}
-
-	/**
-	 * when display mode is HTML, prepare code before print.
-	 * @param string $output compiled template string
-	 * @return void
-	 */
-	function prepareToPrint(&$output)
-	{
-		if(Context::getResponseMethod() != 'HTML')
-		{
-			return;
-		}
-
-		$start = microtime(true);
-
-		// move <style ..></style> in body to the header
-		$output = preg_replace_callback('!<style(.*?)>(.*?)<\/style>!is', array($this, '_moveStyleToHeader'), $output);
-
-		// move <link ..></link> in body to the header
-		$output = preg_replace_callback('!<link(.*?)/?>!is', array($this, '_moveLinkToHeader'), $output);
-
-		// move <meta ../> in body to the header
-		$output = preg_replace_callback('!<meta(.*?)(?:\/|)>!is', array($this, '_moveMetaToHeader'), $output);
-
-		// change a meta fine(widget often put the tag like <!--Meta:path--> to the content because of caching)
-		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)(\?\$\_\_Context\-\>[a-z0-9\_\-\/\.\@\:]+)?-->/is', array($this, '_transMeta'), $output);
-
-		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
-		{
-			$url = parse_url(Context::getRequestUri());
-			$real_path = $url['path'];
-
-			$pattern = '/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$3/$4.$5$6', $output);
-
-			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
-
-			if(Context::get('vid'))
-			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
-				$output = preg_replace($pattern, '/?$1=', $output);
+				Rhymix\Framework\Debug::addTime('layout', microtime(true) - $start);
 			}
 		}
 
-		// prevent the 2nd request due to url(none) of the background-image
-		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
-
-		if(is_array(Context::get('INPUT_ERROR')))
-		{
-			$INPUT_ERROR = Context::get('INPUT_ERROR');
-			$keys = array_map(function($str) { return preg_quote($str, '@'); }, array_keys($INPUT_ERROR));
-			$keys = '(' . implode('|', $keys) . ')';
-
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
-		}
-
-		$GLOBALS['__trans_content_elapsed__'] = microtime(true) - $start;
-
-		// Remove unnecessary information
-		$output = preg_replace('/member\_\-([0-9]+)/s', 'member_0', $output);
-		
-		// Add OpenGraph metadata
+		// Add OpenGraph and Twitter metadata
 		if (config('seo.og_enabled') && Context::get('module') !== 'admin')
 		{
 			$this->_addOpenGraphMetadata();
+			if (config('seo.twitter_enabled'))
+			{
+				$this->_addTwitterMetadata();
+			}
 		}
 
 		// set icon
@@ -228,11 +212,106 @@ class HTMLDisplayHandler
 		Context::set('favicon_url', $favicon_url);
 		Context::set('mobicon_url', $mobicon_url);
 
+		// Only print the X-UA-Compatible meta tag if somebody is still using IE
+		if (preg_match('!Trident/7\.0!', $_SERVER['HTTP_USER_AGENT'] ?? ''))
+		{
+			Context::addMetaTag('X-UA-Compatible', 'IE=edge', true);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Check if partial page rendering (dropping the layout) is enabled.
+	 *
+	 * @return bool
+	 */
+	public static function isPartialPageRendering()
+	{
+		$ppr = config('view.partial_page_rendering') ?? 'internal_only';
+		if ($ppr === 'disabled')
+		{
+			return false;
+		}
+		elseif ($ppr === 'ajax_only' && empty($_SERVER['HTTP_X_REQUESTED_WITH']))
+		{
+			return false;
+		}
+		elseif ($ppr === 'internal_only' && (!isset($_SERVER['HTTP_REFERER']) || !Rhymix\Framework\URL::isInternalURL($_SERVER['HTTP_REFERER'])))
+		{
+			return false;
+		}
+		elseif ($ppr === 'except_robots' && isCrawler())
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * when display mode is HTML, prepare code before print.
+	 * @param string $output compiled template string
+	 * @return void
+	 */
+	public function prepareToPrint(&$output)
+	{
+		if(Context::getResponseMethod() != 'HTML')
+		{
+			return;
+		}
+
+		$start = microtime(true);
+
+		// move <style>...</style> in body to the header
+		$output = preg_replace_callback('!<style(.*?)>(.*?)<\/style>!is', array($this, '_moveStyleToHeader'), $output);
+
+		// move <link> and <meta> in body to the header
+		$output = preg_replace_callback('!<(link|meta)\b(.*?)>!is', array($this, '_moveLinkToHeader'), $output);
+
+		// change a meta fine(widget often put the tag like <!--Meta:path--> to the content because of caching)
+		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)(\?\$\_\_Context\-\>[a-z0-9\_\-\/\.\@\:\>]+)?-->/is', array($this, '_transMeta'), $output);
+
+		// handles a relative path generated by using the rewrite module
+		if(Context::isAllowRewrite())
+		{
+			$pattern = '/(action)=(["\'])(["\'])/s';
+			$output = preg_replace($pattern, '$1=$2' . \RX_BASEURL . '$3', $output);
+
+			$pattern = '/(action|poster|src|href)=(["\'])\.\/([^"\']*)(["\'])/s';
+			$output = preg_replace($pattern, '$1=$2' . \RX_BASEURL . '$3$4', $output);
+
+			$pattern = '/src=(["\'])((?:files\/(?:attach|cache|faceOff|member_extra_info|thumbnails)|addons|common|(?:m\.)?layouts|modules|widgets|widgetstyle)\/[^"\']+)(["\'])/s';
+			$output = preg_replace($pattern, 'src=$1' . \RX_BASEURL . '$2$3', $output);
+
+			$pattern = '/href=(["\'])(\?[^"\']+)/s';
+			$output = preg_replace($pattern, 'href=$1' . \RX_BASEURL . '$2', $output);
+		}
+
+		// prevent the 2nd request due to url(none) of the background-image
+		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
+
+		$INPUT_ERROR = Context::get('INPUT_ERROR');
+		if(is_array($INPUT_ERROR) && count($INPUT_ERROR))
+		{
+			$keys = array_map(function($str) { return preg_quote($str, '@'); }, array_keys($INPUT_ERROR));
+			$keys = '(' . implode('|', $keys) . ')';
+
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+		}
+
+		Rhymix\Framework\Debug::addTime('trans_content', microtime(true) - $start);
+
+		// Remove unnecessary information
+		$output = preg_replace('/member\_\-([0-9]+)/s', 'member_0', $output);
+
 		// convert the final layout
 		Context::set('content', $output);
-		Context::set('m', $is_mobile = Mobile::isFromMobilePhone() ? 1 : 0);
-		$oTemplate = TemplateHandler::getInstance();
-		if($is_mobile)
+		if(Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 		}
@@ -240,11 +319,19 @@ class HTMLDisplayHandler
 		{
 			$this->_loadDesktopJSCSS();
 		}
-		$output = $oTemplate->compile('./common/tpl', 'common_layout');
+		$oTemplate = new Rhymix\Framework\Template('./common/tpl', 'common_layout');
+		$output = $oTemplate->compile();
 
 		// replace the user-defined-language
-		$oModuleController = getController('module');
-		$oModuleController->replaceDefinedLangCode($output);
+		$output = Context::replaceUserLang($output);
+
+		// remove template path comment tag
+		/*
+		if(!Rhymix\Framework\Debug::isEnabledForCurrentUser())
+		{
+			$output = preg_replace('/\n<!-- Template (?:start|end) : .*? -->\r?\n/', "\n", $output);
+		}
+		*/
 	}
 
 	/**
@@ -255,6 +342,10 @@ class HTMLDisplayHandler
 	function _preserveValue($match)
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
+		if (!is_scalar($INPUT_ERROR[$match[3]]))
+		{
+			return $match[0];
+		}
 
 		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
 
@@ -324,8 +415,8 @@ class HTMLDisplayHandler
 	}
 
 	/**
-	 * add html style code extracted from html body to Context, which will be
-	 * printed inside <header></header> later.
+	 * Move <style> in the document body to the <head> section.
+	 *
 	 * @param array $matches
 	 * @return void
 	 */
@@ -339,25 +430,21 @@ class HTMLDisplayHandler
 	}
 
 	/**
-	 * add html link code extracted from html body to Context, which will be
-	 * printed inside <header></header> later.
+	 * Move <link> and <meta> in the document body to the <head> section.
+	 *
 	 * @param array $matches
 	 * @return void
 	 */
 	function _moveLinkToHeader($matches)
 	{
-		Context::addHtmlHeader($matches[0]);
-	}
-
-	/**
-	 * add meta code extracted from html body to Context, which will be
-	 * printed inside <header></header> later.
-	 * @param array $matches
-	 * @return void
-	 */
-	function _moveMetaToHeader($matches)
-	{
-		Context::addHtmlHeader($matches[0]);
+		if ($matches[1] === 'link' && preg_match('/\brel="([^"]+)"/', $matches[2], $rel) && $rel[1] !== 'stylesheet' && preg_match('/\bhref="([^"]+)"/', $matches[2], $href))
+		{
+			Context::addLink($href[1], $rel[1]);
+		}
+		else
+		{
+			Context::addHtmlHeader($matches[0]);
+		}
 	}
 
 	/**
@@ -371,7 +458,7 @@ class HTMLDisplayHandler
 		{
 			return '';
 		}
-		if($matches[3])
+		if($matches[3] ?? false)
 		{
 			$vars = Context::get(str_replace('?$__Context->', '', $matches[3]));
 			Context::loadFile(array($matches[2], null, null, null, $vars));
@@ -384,8 +471,7 @@ class HTMLDisplayHandler
 
 	/**
 	 * Add OpenGraph metadata tags.
-	 * 
-	 * @param string $output
+	 *
 	 * @return void
 	 */
 	function _addOpenGraphMetadata()
@@ -395,50 +481,89 @@ class HTMLDisplayHandler
 		$current_module_info = Context::get('current_module_info');
 		$site_module_info = Context::get('site_module_info');
 		$document_srl = Context::get('document_srl');
-		if ($document_srl)
+		$grant = Context::get('grant');
+		$permitted = isset($grant->access) ? $grant->access : false;
+		if (isset($grant->view) && !$grant->view)
 		{
-			$oDocument = Context::get('oDocument') ?: getModel('document')->getDocument($document_srl, false, false);
-			if (is_object($oDocument) && $oDocument->document_srl == $document_srl && (!method_exists($oDocument, 'isSecret') || !$oDocument->isSecret()))
+			$permitted = false;
+		}
+		if ($document_srl && $permitted)
+		{
+			if (isset($grant->consultation_read) && !$grant->consultation_read && $current_module_info->consultation === 'Y')
 			{
-				$page_type = 'article';
+				$permitted = false;
+			}
+			else
+			{
+				$oDocument = Context::get('oDocument') ?: DocumentModel::getDocument($document_srl, false, false);
+				if (is_object($oDocument) && $oDocument->document_srl == $document_srl)
+				{
+					$page_type = 'article';
+					if (method_exists($oDocument, 'isSecret') && $oDocument->isSecret())
+					{
+						$permitted = false;
+					}
+				}
 			}
 		}
-		
+
+		// Get existing metadata.
+		$og_data = array();
+		foreach (Context::getOpenGraphData() as $val)
+		{
+			$og_data[$val['property']] = $val['content'];
+		}
+
 		// Add basic metadata.
-		Context::addOpenGraphData('og:title', Context::getBrowserTitle());
+		Context::addOpenGraphData('og:title', $permitted ? Context::getBrowserTitle() : lang('msg_not_permitted'));
 		Context::addOpenGraphData('og:site_name', Context::getSiteTitle());
-		if ($page_type === 'article' && config('seo.og_extract_description'))
+		if (!isset($og_data['og:description']) || !Context::getMetaTag('description'))
 		{
-			$description = trim(utf8_normalize_spaces($oDocument->getContentText(200)));
+			if ($page_type === 'article' && $permitted && config('seo.og_extract_description'))
+			{
+				$description = trim(utf8_normalize_spaces($oDocument->getContentText(200)));
+			}
+			else
+			{
+				$description = Context::getMetaTag('description');
+			}
+			Context::addOpenGraphData('og:description', $description);
+			Context::addMetaTag('description', $description);
 		}
-		else
-		{
-			$description = Context::getMetaTag('description');
-		}
-		Context::addOpenGraphData('og:description', $description);
-		Context::addMetaTag('description', $description);
-		
+
 		// Add metadata about this page.
-		Context::addOpenGraphData('og:type', $page_type);
-		if ($page_type === 'article')
+		if (!isset($og_data['og:type']))
 		{
-			$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'document_srl', $document_srl);
+			Context::addOpenGraphData('og:type', $page_type);
 		}
-		elseif (($page = Context::get('page')) > 1)
+		if (!isset($og_data['og:url']) || !Context::getCanonicalURL())
 		{
-			$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
+			if ($page_type === 'article')
+			{
+				$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid, 'document_srl', $document_srl);
+			}
+			elseif (($page = Context::get('page')) > 1)
+			{
+				$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
+			}
+			elseif (isset($current_module_info->module_srl) && $current_module_info->module_srl == ($site_module_info->module_srl ?? 0))
+			{
+				$canonical_url = getNotEncodedFullUrl('');
+			}
+			else
+			{
+				if (Rhymix\Framework\Router::getRewriteLevel() === 2 && Context::getCurrentRequest()->url !== '')
+				{
+					$canonical_url = Rhymix\Framework\URL::getCurrentDomainURL(\RX_BASEURL . preg_replace('/\?.*$/', '', \RX_REQUEST_URL));
+				}
+				else
+				{
+					$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid);
+				}
+			}
+			Context::setCanonicalURL($canonical_url);
 		}
-		elseif ($current_module_info->module_srl == $site_module_info->module_srl)
-		{
-			$canonical_url = getFullUrl('');
-		}
-		else
-		{
-			$canonical_url = getFullUrl('', 'mid', $current_module_info->mid);
-		}
-		Context::addOpenGraphData('og:url', $canonical_url);
-		Context::setCanonicalURL($canonical_url);
-		
+
 		// Add metadata about the locale.
 		$lang_type = Context::getLangType();
 		$locales = (include \RX_BASEDIR . 'common/defaults/locales.php');
@@ -446,42 +571,55 @@ class HTMLDisplayHandler
 		{
 			Context::addOpenGraphData('og:locale', $locales[$lang_type]['locale']);
 		}
-		if ($page_type === 'article' && $oDocument->getLangCode() !== $lang_type && isset($locales[$oDocument->getLangCode()]))
+		if ($page_type === 'article' && $permitted && $oDocument->getLangCode() !== $lang_type && isset($locales[$oDocument->getLangCode()]))
 		{
 			Context::addOpenGraphData('og:locale:alternate', $locales[$oDocument->getLangCode()]);
 		}
-		
+
 		// Add image.
-		if ($page_type === 'article' && config('seo.og_extract_images'))
+		if ($document_images = Context::getMetaImages())
+		{
+			// pass
+		}
+		elseif ($page_type === 'article' && $permitted && config('seo.og_extract_images'))
 		{
 			if (($document_images = Rhymix\Framework\Cache::get("seo:document_images:$document_srl")) === null)
 			{
 				$document_images = array();
 				if ($oDocument->hasUploadedFiles())
 				{
-					foreach ($oDocument->getUploadedFiles() as $file)
+					$document_files = $oDocument->getUploadedFiles();
+					usort($document_files, function($a, $b) {
+						return ord($b->cover_image) - ord($a->cover_image);
+					});
+
+					foreach ($document_files as $file)
 					{
-						if ($file->isvalid !== 'Y' || !preg_match('/\.(?:bmp|gif|jpe?g|png)$/i', $file->uploaded_filename))
+						if ($file->isvalid !== 'Y' || !preg_match('/\.(?:bmp|gif|jpe?g|png|webp|mp4)$/i', $file->uploaded_filename))
 						{
 							continue;
 						}
-						list($width, $height) = @getimagesize($file->uploaded_filename);
-						if ($width < 100 && $height < 100)
+
+						if (str_starts_with($file->mime_type, 'video/'))
 						{
-							continue;
-						}
-						$image = array('filepath' => $file->uploaded_filename, 'width' => $width, 'height' => $height);
-						if ($file->cover_image === 'Y')
-						{
-							array_unshift($document_images, $image);
+							if ($file->thumbnail_filename)
+							{
+								list($width, $height) = @getimagesize($file->thumbnail_filename);
+								if ($width >= 100 || $height >= 100)
+								{
+									$document_images[] = array('filepath' => $file->thumbnail_filename, 'width' => $width, 'height' => $height);
+									break;
+								}
+							}
 						}
 						else
 						{
-							$document_images[] = $image;
-						}
-						if (count($document_images) >= 1)
-						{
-							break;
+							list($width, $height) = @getimagesize($file->uploaded_filename);
+							if ($width >= 100 || $height >= 100)
+							{
+								$document_images[] = array('filepath' => $file->uploaded_filename, 'width' => $width, 'height' => $height);
+								break;
+							}
 						}
 					}
 				}
@@ -492,14 +630,15 @@ class HTMLDisplayHandler
 		{
 			$document_images = null;
 		}
-		
+
 		if ($document_images)
 		{
-			$first_image = reset($document_images);
+			$first_image = array_first($document_images);
 			$first_image['filepath'] = preg_replace('/^.\\/files\\//', \RX_BASEURL . 'files/', $first_image['filepath']);
 			Context::addOpenGraphData('og:image', Rhymix\Framework\URL::getCurrentDomainURL($first_image['filepath']));
 			Context::addOpenGraphData('og:image:width', $first_image['width']);
 			Context::addOpenGraphData('og:image:height', $first_image['height']);
+			$this->_image_type = 'document';
 		}
 		elseif ($default_image = getAdminModel('admin')->getSiteDefaultImageUrl($site_module_info->domain_srl, $width, $height))
 		{
@@ -509,13 +648,79 @@ class HTMLDisplayHandler
 				Context::addOpenGraphData('og:image:width', $width);
 				Context::addOpenGraphData('og:image:height', $height);
 			}
+			$this->_image_type = 'site';
 		}
-		
-		// Add datetime for articles.
-		if ($page_type === 'article' && config('seo.og_use_timestamps'))
+		else
 		{
-			Context::addOpenGraphData('article:published_time', $oDocument->getRegdate('c'));
-			Context::addOpenGraphData('article:modified_time', $oDocument->getUpdate('c'));
+			$this->_image_type = 'none';
+		}
+
+		// Add tags and hashtags for articles.
+		if ($page_type === 'article' && $permitted)
+		{
+			$tags = $oDocument->getTags();
+			foreach ($tags as $tag)
+			{
+				if ($tag !== '')
+				{
+					Context::addOpenGraphData('og:article:tag', $tag);
+				}
+			}
+
+			if (config('seo.og_extract_hashtags'))
+			{
+				$hashtags = $oDocument->getHashtags();
+				foreach ($hashtags as $hashtag)
+				{
+					if (!in_array($hashtag, $tags))
+					{
+						Context::addOpenGraphData('og:article:tag', escape($hashtag, false));
+					}
+				}
+			}
+
+			Context::addOpenGraphData('og:article:section', Context::replaceUserLang($current_module_info->browser_title));
+		}
+
+		// Add author name for articles.
+		if ($page_type === 'article' && $permitted && config('seo.og_use_nick_name'))
+		{
+			Context::addMetaTag('author', $oDocument->getNickName());
+			Context::addOpenGraphData('og:article:author', $oDocument->getNickName());
+		}
+
+		// Add datetime for articles.
+		if ($page_type === 'article' && $permitted && config('seo.og_use_timestamps'))
+		{
+			Context::addOpenGraphData('og:article:published_time', $oDocument->getRegdate('c'));
+			Context::addOpenGraphData('og:article:modified_time', $oDocument->getUpdate('c'));
+		}
+	}
+
+	/**
+	 * Add Twitter metadata tags.
+	 *
+	 * @return void
+	 */
+	function _addTwitterMetadata()
+	{
+		$card_type = $this->_image_type === 'document' ? 'summary_large_image' : 'summary';
+		Context::addMetaTag('twitter:card', $card_type, false, false);
+
+		foreach(Context::getOpenGraphData() as $val)
+		{
+			if ($val['property'] === 'og:title')
+			{
+				Context::addMetaTag('twitter:title', $val['content'], false, false);
+			}
+			if ($val['property'] === 'og:description')
+			{
+				Context::addMetaTag('twitter:description', $val['content'], false, false);
+			}
+			if ($val['property'] === 'og:image' && $this->_image_type === 'document')
+			{
+				Context::addMetaTag('twitter:image', $val['content'], false, false);
+			}
 		}
 	}
 
@@ -523,21 +728,9 @@ class HTMLDisplayHandler
 	 * import basic .js files.
 	 * @return void
 	 */
-	function _loadDesktopJSCSS()
+	public function _loadDesktopJSCSS()
 	{
-		$lang_type = Context::getLangType();
 		$this->_loadCommonJSCSS();
-		
-		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
-		{
-			Context::loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
-			Context::loadFile(array("./modules/admin/tpl/css/admin.iefix.css", '', 'ie', 10), true);
-			Context::loadFile('./modules/admin/tpl/js/admin.js', true);
-			Context::loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);
-			Context::loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
-			Context::loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
-		}
 	}
 
 	/**
@@ -546,7 +739,6 @@ class HTMLDisplayHandler
 	private function _loadMobileJSCSS()
 	{
 		$this->_loadCommonJSCSS();
-		Context::loadFile(array('./common/css/mobile.css', '', '', -1500000), true);
 	}
 
 	/**
@@ -554,23 +746,49 @@ class HTMLDisplayHandler
 	 */
 	private function _loadCommonJSCSS()
 	{
-		Context::loadFile(array('./common/css/rhymix.scss', '', '', -1600000), true);
-		$original_file_list = array('x', 'common', 'js_app', 'xml_handler', 'xml_js_filter');
-		$jquery_version = preg_match('/MSIE [5-8]\./', $_SERVER['HTTP_USER_AGENT']) ? '1.11.3' : '2.1.4';
-		
+		if (config('view.jquery_version') === 3)
+		{
+			$jquery_version = self::JQUERY_V3;
+			$jquery_migrate_version = self::JQUERY_V3_MIGRATE;
+		}
+		else
+		{
+			$jquery_version = self::JQUERY_V2;
+			$jquery_migrate_version = self::JQUERY_V2_MIGRATE;
+		}
+
+		Context::loadFile(array('./common/css/rhymix.scss', '', '', -1600000000), true);
+
+		$original_file_list = array(
+			'plugins/jquery.migrate/jquery-migrate-' . $jquery_migrate_version . '.min.js',
+			'plugins/cookie/js.cookie.min.js',
+			'plugins/blankshield/blankshield.min.js',
+			'plugins/uri/URI.min.js',
+		);
+
+		if (str_contains($_SERVER['HTTP_USER_AGENT'] ?? '', 'Trident/'))
+		{
+			$original_file_list[] = 'polyfills/formdata.min.js';
+			$original_file_list[] = 'polyfills/promise.min.js';
+		}
+
+		$original_file_list[] = 'x.js';
+		$original_file_list[] = 'common.js';
+		$original_file_list[] = 'js_app.js';
+		$original_file_list[] = 'xml_handler.js';
+		$original_file_list[] = 'xml_js_filter.js';
+
 		if(config('view.minify_scripts') === 'none')
 		{
-			Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.js', 'head', '', -1730000), true);
-			Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.js', 'head', '', -1720000), true);
+			Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.js', 'head', '', -1800000000), true);
 			foreach($original_file_list as $filename)
 			{
-				Context::loadFile(array('./common/js/' . $filename . '.js', 'head', '', -1700000), true);
+				Context::loadFile(array('./common/js/' . $filename, 'head', '', -1700000000), true);
 			}
 		}
 		else
 		{
-			Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.min.js', 'head', '', -1730000), true);
-			Context::loadFile(array('./common/js/plugins/jquery.migrate/jquery-migrate-1.2.1.min.js', 'head', '', -1720000), true);
+			Context::loadFile(array('./common/js/jquery-' . $jquery_version . '.min.js', 'head', '', -1800000000), true);
 			$concat_target_filename = 'files/cache/assets/minified/rhymix.min.js';
 			if(file_exists(\RX_BASEDIR . $concat_target_filename))
 			{
@@ -578,20 +796,18 @@ class HTMLDisplayHandler
 				$original_mtime = 0;
 				foreach($original_file_list as $filename)
 				{
-					$original_mtime = max($original_mtime, filemtime(\RX_BASEDIR . 'common/js/' . $filename . '.js'));
+					$original_mtime = max($original_mtime, filemtime(\RX_BASEDIR . 'common/js/' . $filename));
 				}
 				if($concat_target_mtime > $original_mtime)
 				{
-					Context::loadFile(array('./' . $concat_target_filename, 'head', '', -100000), true);
+					Context::loadFile(array('./' . $concat_target_filename, 'head', '', -1700000000), true);
 					return;
 				}
 			}
 			Rhymix\Framework\Formatter::minifyJS(array_map(function($str) {
-				return \RX_BASEDIR . 'common/js/' . $str . '.js';
+				return \RX_BASEDIR . 'common/js/' . $str;
 			}, $original_file_list), \RX_BASEDIR . $concat_target_filename);
-			Context::loadFile(array('./' . $concat_target_filename, 'head', '', -100000), true);
+			Context::loadFile(array('./' . $concat_target_filename, 'head', '', -1700000000), true);
 		}
 	}
 }
-/* End of file HTMLDisplayHandler.class.php */
-/* Location: ./classes/display/HTMLDisplayHandler.class.php */

classes/display/JSCallbackDisplayHandler.php

@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class JSCallbackDisplayHandler
 {
@@ -21,5 +20,3 @@ class JSCallbackDisplayHandler
 </script>', Context::getJSCallbackFunc(), json_encode($variables));
 	}
 }
-/* End of file JSCallback.class.php */
-/* Location: ./classes/display/JSCallback.class.php */

classes/display/JSONDisplayHandler.php

@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class JSONDisplayHandler
 {
@@ -14,14 +13,23 @@ class JSONDisplayHandler
 		$variables = $oModule->getVariables();
 		$variables['error'] = $oModule->getError();
 		$variables['message'] = $oModule->getMessage();
-		
+
 		self::_convertCompat($variables, Context::getRequestMethod());
-		return json_encode($variables);
+		$result = json_encode($variables) . "\n";
+		if (json_last_error() != \JSON_ERROR_NONE)
+		{
+			trigger_error('JSON encoding error: ' . json_last_error_msg(), E_USER_WARNING);
+			return json_encode([
+				'error' => -1,
+				'message' => 'JSON encoding error',
+			]) . "\n";
+		}
+		return $result;
 	}
-	
+
 	/**
 	 * Convert arrays in a format that is compatible with XE.
-	 * 
+	 *
 	 * @param array $array
 	 * @param string $compat_type
 	 * @return array
@@ -51,10 +59,10 @@ class JSONDisplayHandler
 			}
 		}
 	}
-	
+
 	/**
 	 * Check if an array only has numeric keys.
-	 * 
+	 *
 	 * @param array $array
 	 * @return bool
 	 */
@@ -74,5 +82,3 @@ class JSONDisplayHandler
 		return true;
 	}
 }
-/* End of file JSONDisplayHandler.class.php */
-/* Location: ./classes/display/JSONDisplayHandler.class.php */

classes/display/RawDisplayHandler.php

@@ -0,0 +1,20 @@
+<?php
+
+class RawDisplayHandler
+{
+	function toDoc($oModule)
+	{
+		$tpl_path = $oModule->getTemplatePath();
+		$tpl_file = $oModule->getTemplateFile();
+		if ($tpl_path && $tpl_file)
+		{
+			$oTemplate = new Rhymix\Framework\Template($tpl_path, $tpl_file);
+			$output = $oTemplate->compile();
+		}
+		else
+		{
+			$output = '';
+		}
+		return $output;
+	}
+}

classes/display/VirtualXMLDisplayHandler.php

@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class VirtualXMLDisplayHandler
 {
@@ -57,13 +56,11 @@ class VirtualXMLDisplayHandler
 			$html[] = '  parent.location.href = ' . json_encode($output->url) . ';';
 			$html[] = '}';
 		}
-		
+
 		$html[] = '</script>';
 		$html[] = '</head><body></body></html>';
-		
-		return join(PHP_EOL, $html);
+
+		return join("\n", $html);
 	}
 
 }
-/* End of file VirtualXMLDisplayHandler.class.php */
-/* Location: ./classes/display/VirtualXMLDisplayHandler.class.php */

classes/display/XMLDisplayHandler.php

@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class XMLDisplayHandler
 {
@@ -19,21 +18,21 @@ class XMLDisplayHandler
 
 		$xmlDoc .= $this->_makeXmlDoc($variables);
 
-		$xmlDoc .= "</response>";
+		$xmlDoc .= "</response>\n";
 
 		return $xmlDoc;
 	}
 
 	/**
 	 * produce XML code given variable object\n
-	 * @param object $obj 
+	 * @param object $obj
 	 * @return string
 	 */
 	function _makeXmlDoc($obj)
 	{
-		if(!count($obj))
+		if (!countobj($obj))
 		{
-			return;
+			return '';
 		}
 
 		$xmlDoc = '';
@@ -63,5 +62,3 @@ class XMLDisplayHandler
 	}
 
 }
-/* End of file XMLDisplayHandler.class.php */
-/* Location: ./classes/display/XMLDisplayHandler.class.php */