#17049 - Remove deprecated codes in Legacy files.

diff --git a/public_html/include/functions.php b/public_html/include/functions.php
index 2db1541..91bc1c3 100644 (file)
--- a/public_html/include/functions.php
+++ b/public_html/include/functions.php
@@ -41,11 +41,6 @@ function xoops_getrequest($name)
  */
 function xoops_header($closehead = true)
 {
-       $root =& XCube_Root::getSingleton();
-       $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem');
-       if ($renderSystem != null) {
-               $renderSystem->showXoopsHeader($closehead);
-       }
 }
 
 /**
@@ -53,11 +48,6 @@ function xoops_header($closehead = true)
  */
 function xoops_footer()
 {
-       $root =& XCube_Root::getSingleton();
-       $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem');
-       if ($renderSystem != null) {
-               $renderSystem->showXoopsFooter();
-       }
 }
 
 function xoops_error($message, $title='', $style='errorMsg')

diff --git a/public_html/modules/legacy/kernel/Legacy_Controller.class.php b/public_html/modules/legacy/kernel/Legacy_Controller.class.php
index 2d7ec20..1a243d3 100644 (file)
--- a/public_html/modules/legacy/kernel/Legacy_Controller.class.php
+++ b/public_html/modules/legacy/kernel/Legacy_Controller.class.php
@@ -981,15 +981,6 @@ curity();
                        $this->executeForward(XOOPS_URL . '/');
                }
        }
-
-       /**
-        * @deprecated
-        * @see setStrategy()
-        */
-       function switchStateCompulsory(&$strategy)
-       {
-               $this->setStrategy($strategy);
-       }
        
        /**
         * CAUTION!!

diff --git a/public_html/modules/legacy/kernel/Legacy_TextFilter.class.php b/public_html/modules/legacy/kernel/Legacy_TextFilter.class.php
index e87ab77..e911174 100644 (file)
--- a/public_html/modules/legacy/kernel/Legacy_TextFilter.class.php
+++ b/public_html/modules/legacy/kernel/Legacy_TextFilter.class.php
@@ -36,19 +36,6 @@ class Legacy_TextFilter extends XCube_TextFilter
      * @var XCube_Delegate
      */
     var $mMakePostXCodeConvertTable = null;
-    /**
-     * @var XCube_Delegate
-     * @deprecated  keep compatible with XC2.1 Beta3
-     */
-    var $mXCodePre = null;
-    /**
-     * @var XCube_Delegate
-     * @deprecated  keep compatible with XC2.1 Beta3. Legacy 2.2.0 will not support this.
-     * @todo
-     *    This is a deprecated member.
-     */
-    var $mMakeClickablePre = null;
-
 
     var $mClickablePatterns = array();
     var $mClickableReplacements = array();
@@ -66,8 +53,6 @@ class Legacy_TextFilter extends XCube_TextFilter
        /**
         * @public
         * @brief Constructor
-        * @todo
-        *    This method keeps a deprecated delegate.
         */
     function Legacy_TextFilter()
        {
@@ -90,14 +75,6 @@ class Legacy_TextFilter extends XCube_TextFilter
         $this->mMakePostXCodeConvertTable =& new XCube_Delegate;
         $this->mMakePostXCodeConvertTable->register('Legacy_TextFilter.MakePostXCodeConvertTable');
         $this->mMakePostXCodeConvertTable->add('Legacy_TextFilter::makePostXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_2);
-
-        //@deprecated
-        //Todo: For keeping compatible with XC2.1 Beta3
-        $this->mMakeClickablePre =& new XCube_Delegate();
-        $this->mMakeClickablePre->register('MyTextSanitizer.MakeClickablePre');
-
-        $this->mXCodePre =& new XCube_Delegate();
-        $this->mXCodePre->register('MyTextSanitizer.XoopsCodePre');
     }
     
     function getInstance(&$instance) {
@@ -173,16 +150,6 @@ class Legacy_TextFilter extends XCube_TextFilter
             //      'replacements' [I/O] : &Array of replacing string
             //
             $this->mMakeClickableConvertTable->call(new XCube_Ref($this->mClickablePatterns), new XCube_Ref($this->mClickableReplacements));
-
-            // Delegate Call 'MyTextSanitizer.MakeClickablePre'
-            //  Delegate may replace makeClickable conversion table
-            //  Args : 
-            //      'patterns'     [I/O] : &Array of pattern RegExp
-            //      'replacements' [I/O] : &Array of replacing string
-            //
-            //  Todo: For Compatiblitiy to XC2.1 Beta3
-            //
-            $this->mMakeClickablePre->call(new XCube_Ref($this->mClickablePatterns), new XCube_Ref($this->mClickableReplacements));
         }
         $text = preg_replace($this->mClickablePatterns, $this->mClickableReplacements, $text);
         return $text;
@@ -218,18 +185,6 @@ class Legacy_TextFilter extends XCube_TextFilter
             //                             replacements[1] for $allowimage = 1;
             //
             $this->mMakeXCodeConvertTable->call(new XCube_Ref($this->mXCodePatterns), new XCube_Ref($this->mXCodeReplacements));
-
-            // RaiseEvent 'MyTextSanitizer.XoopsCodePre'
-            //  Delegate may replace conversion table
-            //  Args : 
-            //      'patterns'     [I/O] : &Array of pattern RegExp
-            //      'replacements' [I/O] : &Array of replacing string
-            //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
-            //
-            //Todo: For Compatiblitiy to XC2.1 Beta3
-            $this->mXCodePre->call(new XCube_Ref($this->mXCodePatterns), new XCube_Ref($this->mXCodeReplacements[0]), 0);
-            $dummy = array();
-            $this->mXCodePre->call(new XCube_Ref($dummy), new XCube_Ref($this->mXCodeReplacements[1]), 1);
         }
         if (empty($this->mXCodeCheckImgPatterns)) {
             // RaiseEvent 'Legacy_TextFilter.MakeXCodeCheckImgPatterns'

diff --git a/public_html/modules/legacy/kernel/object.php b/public_html/modules/legacy/kernel/object.php
index f4abd8e..4f381d1 100644 (file)
--- a/public_html/modules/legacy/kernel/object.php
+++ b/public_html/modules/legacy/kernel/object.php
@@ -137,14 +137,6 @@ class XoopsSimpleObject extends AbstractXoopsObject
        {
                $this->assignVars($values);
        }
-
-       /**
-        * @deprecated
-        */     
-       function getVar($key)
-       {
-               return $this->getShow($key);
-       }
        
        /**
         * Return HTML string for displaying only by HTML.

diff --git a/public_html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php b/public_html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
index b4dfb3e..eee37bf 100644 (file)
--- a/public_html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
+++ b/public_html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
@@ -405,88 +405,7 @@ class Legacy_RenderSystem extends XCube_RenderSystem
        // There must not be the following functions here!
        //
        //
-
-       /**
-        * @deprecated
-        */
-       function sendHeader()
-       {
-               header('Content-Type:text/html; charset='._CHARSET);
-               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');
-       }
-
-       /**
-        * @deprecated
-        */
-       function showXoopsHeader($closeHead=true)
-       {
-               global $xoopsConfig;
-               if ($xoopsConfig['gzip_compression'] == 1) {
-                       ob_start("ob_gzhandler");
-               } else {
-                       ob_start();
-               }
-
-               $this->sendHeader();
-               $this->_renderHeader($closeHead);
-       }
-       
-       // TODO never direct putput
-       /**
-        * @deprecated
-        */
-       function _renderHeader($closehead=true)
-       {
-               global $xoopsConfig, $xoopsTheme, $xoopsConfigMetaFooter;
-
-               echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>";
-
-               echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'._LANGCODE.'" lang="'._LANGCODE.'">
-               <head>
-               <meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />
-               <meta http-equiv="content-language" content="'._LANGCODE.'" />
-               <meta name="robots" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_robots']).'" />
-               <meta name="keywords" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_keywords']).'" />
-               <meta name="description" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_desc']).'" />
-               <meta name="rating" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_rating']).'" />
-               <meta name="author" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_author']).'" />
-               <meta name="copyright" content="'.htmlspecialchars($xoopsConfigMetaFooter['meta_copyright']).'" />
-               <meta name="generator" content="XOOPS" />
-               <title>'.htmlspecialchars($xoopsConfig['sitename']).'</title>
-               <script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script>
-               ';
-               $themecss = getcss($xoopsConfig['theme_set']);
-               echo '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/xoops.css" />';
-               if ($themecss) {
-                       echo '<link rel="stylesheet" type="text/css" media="all" href="'.$themecss.'" />';
-                       //echo '<style type="text/css" media="all"><!-- @import url('.$themecss.'); --></style>';
-               }
-               if ($closehead) {
-                       echo '</head><body>';
-               }
-       }
        
-       /**
-        * @deprecated
-        */
-       function _renderFooter()
-       {
-               echo '</body></html>';
-           ob_end_flush();
-       }
-       
-       /**
-        * @deprecated
-        */
-       function showXoopsFooter()
-       {
-               $this->_renderFooter();
-       }
-
        function &createRenderTarget($type = LEGACY_RENDER_TARGET_TYPE_MAIN, $option = null)
        {
                $renderTarget = null;