From 3e7e5671263cdb0e45906a530d541f0863efbaf0 Mon Sep 17 00:00:00 2001 From: Kenji ITO Date: Tue, 8 Nov 2016 17:39:11 +0900 Subject: [PATCH] Removed PEAR settings and configurations --- language/english.php | 4 -- language/english_utf-8.php | 4 -- language/japanese_utf-8.php | 4 -- public_html/admin/install/config-install.php | 5 -- public_html/docs/english/changes.html | 1 + public_html/docs/english/config.html | 21 -------- public_html/docs/japanese/changes.html | 6 ++- public_html/docs/japanese/config.html | 14 ------ public_html/lib-common.php | 15 ------ sql/updates/mysql_2.1.1_to_2.1.2.php | 51 ++++++++++--------- sql/updates/pgsql_2.1.1_to_2.1.2.php | 52 +++++++++++--------- 11 files changed, 62 insertions(+), 115 deletions(-) diff --git a/language/english.php b/language/english.php index 96b03f66f..f3aa2b52a 100644 --- a/language/english.php +++ b/language/english.php @@ -2026,8 +2026,6 @@ 'path_data' => "Data", 'path_images' => "Images", 'path_editors' => "Advanced Editors", - 'path_pear' => "Path Pear", - 'have_pear' => "Have Pear?", 'mail_settings' => "Mail Settings", 'dbdump_filename_prefix' => 'Backup File Name Prefix', 'dbdump_tables_only' => 'Only Backup Table Structure', @@ -2329,7 +2327,6 @@ 'fs_paths' => 'Paths', 'fs_theme' => 'Theme', 'fs_mail' => 'Mail', - 'fs_pear' => 'Pear', 'fs_database_backup' => 'Database Backup', 'fs_users' => 'Users', 'fs_misc' => 'Miscellaneous', @@ -2383,7 +2380,6 @@ 'tab_paths' => 'Paths', 'tab_theme' => 'Theme', 'tab_mail' => 'Mail', - 'tab_pear' => 'Pear', 'tab_database' => 'Database', 'tab_users' => 'Users', 'tab_misc' => 'Miscellaneous', diff --git a/language/english_utf-8.php b/language/english_utf-8.php index 4d3d467ca..8ae08a4e7 100644 --- a/language/english_utf-8.php +++ b/language/english_utf-8.php @@ -2025,8 +2025,6 @@ 'path_data' => "Data", 'path_images' => "Images", 'path_editors' => "Advanced Editors", - 'path_pear' => "Path Pear", - 'have_pear' => "Have Pear?", 'mail_settings' => "Mail Settings", 'dbdump_filename_prefix' => 'Backup File Name Prefix', 'dbdump_tables_only' => 'Only Backup Table Structure', @@ -2328,7 +2326,6 @@ 'fs_paths' => 'Paths', 'fs_theme' => 'Theme', 'fs_mail' => 'Mail', - 'fs_pear' => 'Pear', 'fs_database_backup' => 'Database Backup', 'fs_users' => 'Users', 'fs_misc' => 'Miscellaneous', @@ -2382,7 +2379,6 @@ 'tab_paths' => 'Paths', 'tab_theme' => 'Theme', 'tab_mail' => 'Mail', - 'tab_pear' => 'Pear', 'tab_database' => 'Database', 'tab_users' => 'Users', 'tab_misc' => 'Miscellaneous', diff --git a/language/japanese_utf-8.php b/language/japanese_utf-8.php index 3c84c9335..50db9aff7 100644 --- a/language/japanese_utf-8.php +++ b/language/japanese_utf-8.php @@ -2030,8 +2030,6 @@ 'path_data' => 'データ', 'path_images' => '画像', 'path_editors' => 'アドバンストエディター', - 'path_pear' => 'PEARのパス', - 'have_pear' => 'PEARをインストールしている', 'mail_settings' => 'メール設定', 'dbdump_filename_prefix' => 'バックアップファイル名の接頭子', 'dbdump_tables_only' => 'テーブル構造のバックアップのみを行う', @@ -2333,7 +2331,6 @@ 'fs_paths' => 'パス', 'fs_theme' => 'テーマ', 'fs_mail' => 'メール', - 'fs_pear' => 'PEAR', 'fs_database_backup' => 'データベースのバックアップ', 'fs_users' => 'ユーザー', 'fs_misc' => 'その他', @@ -2387,7 +2384,6 @@ 'tab_paths' => 'パス', 'tab_theme' => 'テーマ', 'tab_mail' => 'メール', - 'tab_pear' => 'PEAR', 'tab_database' => 'データベース', 'tab_users' => 'ユーザー', 'tab_misc' => 'その他', diff --git a/public_html/admin/install/config-install.php b/public_html/admin/install/config-install.php index 67459d013..ac20ba806 100644 --- a/public_html/admin/install/config-install.php +++ b/public_html/admin/install/config-install.php @@ -94,11 +94,6 @@ function install_config() $c->add('path_images','','text',0,3,NULL,130,TRUE, $me, 3); $c->add('path_editors','','text',0,3,NULL,132,TRUE, $me, 3); - $c->add('tab_pear', NULL, 'tab', 0, 4, NULL, 0, TRUE, $me, 4); - $c->add('fs_pear', NULL, 'fieldset', 0, 4, NULL, 0, TRUE, $me, 4); - $c->add('have_pear',FALSE,'select',0,4,1,135,TRUE, $me, 4); - $c->add('path_pear','','text',0,4,NULL,140,TRUE, $me, 4); - $c->add('tab_database', NULL, 'tab', 0, 5, NULL, 0, TRUE, $me, 5); $c->add('fs_database_backup', NULL, 'fieldset', 0, 5, NULL, 0, TRUE, $me, 5); $c->add('dbdump_filename_prefix','geeklog_db_backup','text',0,5,NULL,170,TRUE, $me, 5); diff --git a/public_html/docs/english/changes.html b/public_html/docs/english/changes.html index 6ab2565f3..1e2180e7d 100644 --- a/public_html/docs/english/changes.html +++ b/public_html/docs/english/changes.html @@ -39,6 +39,7 @@

Major New Features and Improvements

  • Added ability for Geeklog to detect device type (mobile or computer) of visitor. This can be used by blocks to display only for a certain device type
  • Blocks can display based on visitor device type
  • Template variable {device_movile} added which returns true if viewing device is considered mobile (phone and tablet)
    • +
  • Remove PEAR settings. PEAR libraries are now managed by way of composer
  • Numerous bug and security fixes.
    • diff --git a/public_html/docs/english/config.html b/public_html/docs/english/config.html index b9f1b835e..b031dcd7c 100644 --- a/public_html/docs/english/config.html +++ b/public_html/docs/english/config.html @@ -269,27 +269,6 @@

    Site: Paths

    Path where all WYSIWYG editors reside. -

    Site: PEAR

    - - - - - - - - - - - -
    VariableDefault ValueDescription
    have_pearfalseWhether you have PEAR - installed on your server (= true) or not - (= false). When set to false, Geeklog will - use the PEAR packages installed in $_CONF['path_pear'] - (see below)
    path_pear/path/to/geeklog/system/pear/When $_CONF['have_pear'] (see above) is set - to false, this is the path where Geeklog expects to find - the PEAR packages it requires (e.g. - PEAR::Mail for sending emails).
    -

    Site: Database

    diff --git a/public_html/docs/japanese/changes.html b/public_html/docs/japanese/changes.html index 18f851da9..f4bf07be6 100644 --- a/public_html/docs/japanese/changes.html +++ b/public_html/docs/japanese/changes.html @@ -35,7 +35,11 @@

    主要な新機能と改善点

  • Added an ability to change article template file with the topic (feature request #275, code provided by @hostellerie)
  • Added the ability to search poll comments (feature request #394)
  • Added a new config option $_CONF['gravatar_identicon'] to specify a default gravatar icon type (bug #579)
    • -
  • +
  • Added ability for Geeklog to detect device type (mobile or computer) of visitor. This can be used by blocks to display only for a certain device type
    • +
  • Blocks can display based on visitor device type
    • +
  • Template variable {device_movile} added which returns true if viewing device is considered mobile (phone and tablet)
    • +
  • Remove PEAR settings. PEAR libraries are now managed by way of composer
    • +
  • Numerous bug and security fixes.
    • diff --git a/public_html/docs/japanese/config.html b/public_html/docs/japanese/config.html index e40ff59b8..c75c2fb51 100644 --- a/public_html/docs/japanese/config.html +++ b/public_html/docs/japanese/config.html @@ -241,20 +241,6 @@

    サイト: パス

    WYSIWYGエディタのあるディレクトリを指定します。
    -

    サイト: PEAR

    - - - - - - - - - - - -
    項目(変数)デフォルト説明
    PEARをインストールしている(have_pear)いいえ(false)PEARを独自にサーバーにインストールしているかどうかを指定します。「いいえ」にすると、Geeklogは$_CONF['path_pear'](下記参照)に同梱されているPEARパッケージを使用します。
    PEARのパス(path_pear)/path/to/geeklog/system/pear/上記の「PEARをインストールしている」が「いいえ」のとき、Geeklogが必要とするPEARパッケージ(メール送信時のPEAR::Mailなど)を探すパスを指定します。
    -

    Site: Database

    diff --git a/public_html/lib-common.php b/public_html/lib-common.php index be668a9ac..e8cefc8fb 100755 --- a/public_html/lib-common.php +++ b/public_html/lib-common.php @@ -155,21 +155,6 @@ $_INPUT = new Geeklog\Input(false); // request variables with magic_quotes_gpc handled $_FINPUT = new Geeklog\Input(true); // request variables with magic_quotes_gpc handled and COM_applyBasicFilter applied -// If needed, add our PEAR path to the list of include paths -if (!$_CONF['have_pear']) { - $curPHPIncludePath = get_include_path(); - if (empty($curPHPIncludePath)) { - $curPHPIncludePath = $_CONF['path_pear']; - } else { - $curPHPIncludePath = $_CONF['path_pear'] . PATH_SEPARATOR - . $curPHPIncludePath; - } - - if (set_include_path($curPHPIncludePath) === false) { - COM_errorLog('set_include_path failed - there may be problems using the PEAR classes.', 1); - } -} - // Set the web server's timezone TimeZoneConfig::setSystemTimeZone(); diff --git a/sql/updates/mysql_2.1.1_to_2.1.2.php b/sql/updates/mysql_2.1.1_to_2.1.2.php index a42e798bd..825236b13 100644 --- a/sql/updates/mysql_2.1.1_to_2.1.2.php +++ b/sql/updates/mysql_2.1.1_to_2.1.2.php @@ -12,7 +12,7 @@ $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD `device` VARCHAR( 15 ) NOT NULL DEFAULT 'all' AFTER `blockorder`"; // Add `language_items` table -$_SQL[] =" +$_SQL[] = " CREATE TABLE {$_TABLES['language_items']} ( id INT(11) NOT NULL AUTO_INCREMENT, var_name VARCHAR(30) NOT NULL, @@ -68,7 +68,6 @@ /** * Add new config options - * */ function update_ConfValuesFor212() { @@ -82,28 +81,28 @@ function update_ConfValuesFor212() // Add extra setting to hide_main_page_navigation $c->del('hide_main_page_navigation', $me); - $c->add('hide_main_page_navigation','false','select',1,7,36,1310,TRUE, $me, 7); - + $c->add('hide_main_page_navigation', 'false', 'select', 1, 7, 36, 1310, true, $me, 7); + // New OAuth Service - $c->add('github_login',0,'select',4,16,1,368,TRUE, $me, 16); - $c->add('github_consumer_key','','text',4,16,NULL,369,TRUE, $me, 16); - $c->add('github_consumer_secret','','text',4,16,NULL,370,TRUE, $me, 16); + $c->add('github_login', 0, 'select', 4, 16, 1, 368, true, $me, 16); + $c->add('github_consumer_key', '', 'text', 4, 16, null, 369, true, $me, 16); + $c->add('github_consumer_secret', '', 'text', 4, 16, null, 370, true, $me, 16); // New mobile cache - $c->add('cache_templates',TRUE,'select',2,10,1,220,TRUE, $me, 10); + $c->add('cache_templates', true, 'select', 2, 10, 1, 220, true, $me, 10); // New Block Autotag permissions - $c->add('autotag_permissions_block', array(2, 2, 0, 0), '@select', 7, 41, 28, 1920, TRUE, $me, 37); - + $c->add('autotag_permissions_block', array(2, 2, 0, 0), '@select', 7, 41, 28, 1920, true, $me, 37); + // New search config option - $c->add('search_use_topic',FALSE,'select',0,6,1,677,TRUE, $me, 6); + $c->add('search_use_topic', false, 'select', 0, 6, 1, 677, true, $me, 6); // New url routing option - $c->add('url_routing',0,'select',0,0,37,1850,TRUE, $me, 0); - + $c->add('url_routing', 0, 'select', 0, 0, 37, 1850, true, $me, 0); + // Add mail charset - $c->add('mail_charset', '', 'text', 0, 1, NULL, 195, TRUE, $me, 1); - + $c->add('mail_charset', '', 'text', 0, 1, null, 195, true, $me, 1); + // Delete MYSQL Dump Tab, section, and config options $c->del('tab_mysql', $me); $c->del('fs_mysql', $me); @@ -111,17 +110,23 @@ function update_ConfValuesFor212() $c->del('mysqldump_path', $me); $c->del('mysqldump_options', $me); $c->del('mysqldump_filename_mask', $me); - + // Add Database Backup config options - $c->add('tab_database', NULL, 'tab', 0, 5, NULL, 0, TRUE, $me, 5); - $c->add('fs_database_backup', NULL, 'fieldset', 0, 5, NULL, 0, TRUE, $me, 5); - $c->add('dbdump_filename_prefix','geeklog_db_backup','text',0,5,NULL,170,TRUE, $me, 5); - $c->add('dbdump_tables_only',0,'select',0,5,0,175,TRUE, $me, 5); - $c->add('dbdump_gzip',1,'select',0,5,0,180,TRUE, $me, 5); - $c->add('dbdump_max_files',10,'text',0,5,NULL,185,TRUE, $me, 5); + $c->add('tab_database', null, 'tab', 0, 5, null, 0, true, $me, 5); + $c->add('fs_database_backup', null, 'fieldset', 0, 5, null, 0, true, $me, 5); + $c->add('dbdump_filename_prefix', 'geeklog_db_backup', 'text', 0, 5, null, 170, true, $me, 5); + $c->add('dbdump_tables_only', 0, 'select', 0, 5, 0, 175, true, $me, 5); + $c->add('dbdump_gzip', 1, 'select', 0, 5, 0, 180, true, $me, 5); + $c->add('dbdump_max_files', 10, 'text', 0, 5, null, 185, true, $me, 5); // Add gravatar_identicon - $c->add('gravatar_identicon','identicon','select',5,27,38,1620,FALSE, $me, 27); + $c->add('gravatar_identicon', 'identicon', 'select', 5, 27, 38, 1620, false, $me, 27); + + // Delete PEAR Tab, section and config options + $c->del('tab_pear', $me); + $c->del('fs_pear', $me); + $c->del('have_pear', $me); + $c->del('path_pear', $me); return true; } diff --git a/sql/updates/pgsql_2.1.1_to_2.1.2.php b/sql/updates/pgsql_2.1.1_to_2.1.2.php index fe35a2f58..0f86c8983 100644 --- a/sql/updates/pgsql_2.1.1_to_2.1.2.php +++ b/sql/updates/pgsql_2.1.1_to_2.1.2.php @@ -55,10 +55,8 @@ $_SQL[] = "ALTER TABLE {$_TABLES['syndication']} CHANGE `topic` `topic` VARCHAR(75) NOT NULL default '::all'"; $_SQL[] = "ALTER TABLE {$_TABLES['syndication']} CHANGE `header_tid` `header_tid` VARCHAR(75) NOT NULL default 'none'"; - /** * Add new config options - * */ function update_ConfValuesFor212() { @@ -72,28 +70,28 @@ function update_ConfValuesFor212() // Add extra setting to hide_main_page_navigation $c->del('hide_main_page_navigation', $me); - $c->add('hide_main_page_navigation','false','select',1,7,36,1310,TRUE, $me, 7); - + $c->add('hide_main_page_navigation', 'false', 'select', 1, 7, 36, 1310, true, $me, 7); + // New OAuth Service - $c->add('github_login',0,'select',4,16,1,368,TRUE, $me, 16); - $c->add('github_consumer_key','','text',4,16,NULL,369,TRUE, $me, 16); - $c->add('github_consumer_secret','','text',4,16,NULL,370,TRUE, $me, 16); + $c->add('github_login', 0, 'select', 4, 16, 1, 368, true, $me, 16); + $c->add('github_consumer_key', '', 'text', 4, 16, null, 369, true, $me, 16); + $c->add('github_consumer_secret', '', 'text', 4, 16, null, 370, true, $me, 16); // New mobile cache - $c->add('cache_templates',TRUE,'select',2,10,1,220,TRUE, $me, 10); - + $c->add('cache_templates', true, 'select', 2, 10, 1, 220, true, $me, 10); + // New Block Autotag permissions - $c->add('autotag_permissions_block', array(2, 2, 0, 0), '@select', 7, 41, 28, 1920, TRUE, $me, 37); - + $c->add('autotag_permissions_block', array(2, 2, 0, 0), '@select', 7, 41, 28, 1920, true, $me, 37); + // New search config option - $c->add('search_use_topic',FALSE,'select',0,6,1,677,TRUE, $me, 6); - + $c->add('search_use_topic', false, 'select', 0, 6, 1, 677, true, $me, 6); + // New url routing option - $c->add('url_routing',0,'select',0,0,37,1850,TRUE, $me, 0); + $c->add('url_routing', 0, 'select', 0, 0, 37, 1850, true, $me, 0); // Add mail charset - $c->add('mail_charset', '', 'text', 0, 1, NULL, 195, TRUE, $me, 1); - + $c->add('mail_charset', '', 'text', 0, 1, null, 195, true, $me, 1); + // Delete MYSQL Dump Tab, section, and config options $c->del('tab_mysql', $me); $c->del('fs_mysql', $me); @@ -101,17 +99,23 @@ function update_ConfValuesFor212() $c->del('mysqldump_path', $me); $c->del('mysqldump_options', $me); $c->del('mysqldump_filename_mask', $me); - + // Add Database Backup config options - $c->add('tab_database', NULL, 'tab', 0, 5, NULL, 0, TRUE, $me, 5); - $c->add('fs_database_backup', NULL, 'fieldset', 0, 5, NULL, 0, TRUE, $me, 5); - $c->add('dbdump_filename_prefix','geeklog_db_backup','text',0,5,NULL,170,TRUE, $me, 5); - $c->add('dbdump_tables_only',0,'select',0,5,0,175,TRUE, $me, 5); - $c->add('dbdump_gzip',1,'select',0,5,0,180,TRUE, $me, 5); - $c->add('dbdump_max_files',10,'text',0,5,NULL,185,TRUE, $me, 5); + $c->add('tab_database', null, 'tab', 0, 5, null, 0, true, $me, 5); + $c->add('fs_database_backup', null, 'fieldset', 0, 5, null, 0, true, $me, 5); + $c->add('dbdump_filename_prefix', 'geeklog_db_backup', 'text', 0, 5, null, 170, true, $me, 5); + $c->add('dbdump_tables_only', 0, 'select', 0, 5, 0, 175, true, $me, 5); + $c->add('dbdump_gzip', 1, 'select', 0, 5, 0, 180, true, $me, 5); + $c->add('dbdump_max_files', 10, 'text', 0, 5, null, 185, true, $me, 5); // Add gravatar_identicon - $c->add('gravatar_identicon','identicon','select',5,27,38,1620,FALSE, $me, 27); + $c->add('gravatar_identicon', 'identicon', 'select', 5, 27, 38, 1620, false, $me, 27); + + // Delete PEAR Tab, section and config options + $c->del('tab_pear', $me); + $c->del('fs_pear', $me); + $c->del('have_pear', $me); + $c->del('path_pear', $me); return true; }