Removed PEAR settings and configurations

Geeklog-Core · Nov 8, 2016 · 3e7e567 · 3e7e567
1 parent ee449ab
commit 3e7e567
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 115 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -39,6 +39,7 @@ <h3>Major New Features and Improvements</h3>
     <li>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</li>
     <li>Blocks can display based on visitor device type</li>
     <li>Template variable {device_movile} added which returns true if viewing device is considered mobile (phone and tablet)</li>
+    <li>Remove PEAR settings.  PEAR libraries are now managed by way of composer</li>
     <li>Numerous bug and security fixes.</li>
 </ul>
 

diff --git a/public_html/docs/english/config.html b/public_html/docs/english/config.html
@@ -269,27 +269,6 @@ <h3><a name="site_paths">Site: Paths</a></h3>
     <td valign="top">Path where all WYSIWYG editors reside.</td></tr>
 </table>
 
-<h3><a name="site_pear">Site: PEAR</a></h3>
-
-<table border="1" width="100%">
-<tr><th style="width:8%">Variable</th>
-    <th style="width:29%">Default Value</th>
-    <th style="width:63%">Description</th></tr>
-<tr><td valign="top"><a name="desc_have_pear">have_pear</a></td>
-    <td valign="top"><code>false</code></td>
-    <td valign="top">Whether you have <a href="http://pear.php.net/">PEAR</a>
-        installed on your server (<code>= true</code>) or not
-        (<code>= false</code>). When set to <code>false</code>, Geeklog will
-        use the PEAR packages installed in <code>$_CONF['path_pear']</code>
-        (see below)</td></tr>
-<tr><td valign="top"><a name="desc_path_pear">path_pear</a></td>
-    <td valign="top"><span class="tt">/path/to/geeklog/system/pear/</span></td>
-    <td valign="top">When <code>$_CONF['have_pear']</code> (see above) is set
-        to <code>false</code>, this is the path where Geeklog expects to find
-        the <a href="http://pear.php.net/">PEAR</a> packages it requires (e.g.
-        PEAR::Mail for sending emails).</td></tr>
-</table>
-
 <h3><a name="site_database">Site: Database</a></h3>
 
 <table border="1" width="100%">

diff --git a/public_html/docs/japanese/changes.html b/public_html/docs/japanese/changes.html
@@ -35,7 +35,11 @@ <h3>主要な新機能と改善点</h3>
   <li>Added an ability to change article template file with the topic (feature request #275, code provided by @hostellerie)</li>
   <li>Added the ability to search poll comments (feature request #394)</li>
   <li>Added a new config option $_CONF['gravatar_identicon'] to specify a default gravatar icon type (bug #579)</li>
-  <li></li>
+  <li>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</li>
+  <li>Blocks can display based on visitor device type</li>
+  <li>Template variable {device_movile} added which returns true if viewing device is considered mobile (phone and tablet)</li>
+  <li>Remove PEAR settings.  PEAR libraries are now managed by way of composer</li>
+  <li>Numerous bug and security fixes.</li>
 </ul>
 
 

diff --git a/public_html/docs/japanese/config.html b/public_html/docs/japanese/config.html
@@ -241,20 +241,6 @@ <h3><a name="site_paths">サイト: パス</a></h3>
     <td valign="top"><acronym title="What You See Is What You Get">WYSIWYG</acronym>エディタのあるディレクトリを指定します。</td></tr>
 </table>
 
-<h3><a name="site_pear">サイト: PEAR</a></h3>
-
-<table>
-<tr><th style="width:25%">項目(変数)</th>
-    <th style="width:25%">デフォルト</th>
-    <th style="width:50%">説明</th></tr>
-<tr><td valign="top"><a name="desc_have_pear">PEARをインストールしている(have_pear)</a></td>
-    <td valign="top">いいえ(<code>false</code>)</td>
-    <td valign="top"><a href="http://pear.php.net/">PEAR</a>を独自にサーバーにインストールしているかどうかを指定します。「いいえ」にすると、Geeklogは<code>$_CONF['path_pear']</code>(下記参照)に同梱されているPEARパッケージを使用します。</td></tr>
-<tr><td valign="top"><a name="desc_path_pear">PEARのパス(path_pear)</a></td>
-    <td valign="top"><span class="tt">/path/to/geeklog/system/pear/</span></td>
-    <td valign="top">上記の「PEARをインストールしている」が「いいえ」のとき、Geeklogが必要とする<a href="http://pear.php.net/">PEAR</a>パッケージ(メール送信時のPEAR::Mailなど)を探すパスを指定します。</td></tr>
-</table>
-
 <h3><a name="site_database">Site: Database</a></h3>
 
 <table border="1" width="100%">

diff --git 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
@@ -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,46 +81,52 @@ 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);
     $c->del('allow_mysqldump', $me);
     $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
@@ -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,46 +70,52 @@ 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);
     $c->del('allow_mysqldump', $me);
     $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;
 }