From 971f9009126e2c29ea0dbc9ba3d1910ffb76705f Mon Sep 17 00:00:00 2001
From: Colin Kiegel <kiegel@gmx.de>
Date: Thu, 2 Apr 2015 20:59:04 +0200
Subject: [PATCH] remove dysfunctional reminescents of old PEAR ITX Templates

---
 Services/Init/classes/class.ilInitialisation.php | 12 ++----------
 .../class.ilMembershipCronNotifications.php      | 15 +++------------
 Services/UICore/classes/class.ilTemplateITX.php  | 16 ----------------
 include/inc.check_pear.php                       |  9 +--------
 setup/include/inc.setup_header.php               | 14 +++-----------
 5 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100755 Services/UICore/classes/class.ilTemplateITX.php

diff --git a/Services/Init/classes/class.ilInitialisation.php b/Services/Init/classes/class.ilInitialisation.php
index f5af44bc3dc5..e25f922f26f7 100644
--- a/Services/Init/classes/class.ilInitialisation.php
+++ b/Services/Init/classes/class.ilInitialisation.php
@@ -63,16 +63,8 @@ protected static function requireCommonIncludes()
 		if(ilContext::usesTemplate())
 		{
 			// HTML_Template_IT support
-			@include_once "HTML/Template/ITX.php";		// new implementation
-			if (class_exists("HTML_Template_ITX"))
-			{
-				include_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
-			}
-			else
-			{
-				include_once "HTML/ITX.php";		// old implementation
-				include_once "./Services/UICore/classes/class.ilTemplateITX.php";
-			}
+			require_once "HTML/Template/ITX.php";
+			require_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
 			require_once "./Services/UICore/classes/class.ilTemplate.php";
 		}		
 				
diff --git a/Services/Membership/classes/class.ilMembershipCronNotifications.php b/Services/Membership/classes/class.ilMembershipCronNotifications.php
index ce1db57a4e49..c2391bcb7d2c 100644
--- a/Services/Membership/classes/class.ilMembershipCronNotifications.php
+++ b/Services/Membership/classes/class.ilMembershipCronNotifications.php
@@ -187,18 +187,9 @@ protected function sendMail($a_user_id, $a_ref_id, array $news)
 			$cont_loc->setTextOnly(true);
 			
 			// #9954/#10044
-			// see ilInitialisation::requireCommonIncludes()
-			@include_once "HTML/Template/ITX.php";		// new implementation
-			if (class_exists("HTML_Template_ITX"))
-			{
-				include_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
-			}
-			else
-			{
-				include_once "HTML/ITX.php";		// old implementation
-				include_once "./Services/UICore/classes/class.ilTemplateITX.php";
-			}
-			require_once "./Services/UICore/classes/class.ilTemplate.php";			
+			require_once "HTML/Template/ITX.php";
+			require_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
+			require_once "./Services/UICore/classes/class.ilTemplate.php";
 			$loc = "[".$cont_loc->getHTML()."]";
 						
 			if($counter > 1)
diff --git a/Services/UICore/classes/class.ilTemplateITX.php b/Services/UICore/classes/class.ilTemplateITX.php
deleted file mode 100755
index e819b2171bff..000000000000
--- a/Services/UICore/classes/class.ilTemplateITX.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */
-
-
-/**
-* Dummy class that inherits from old ITX PEAR Class (see header.inc)
-*/
-class ilTemplateX extends IntegratedTemplateExtension
-{
-	function callConstructor()
-	{
-		$this->IntegratedTemplateExtension();
-	}
-}
-
-?>
diff --git a/include/inc.check_pear.php b/include/inc.check_pear.php
index 0e1f9055b29a..77fb02a0cd91 100755
--- a/include/inc.check_pear.php
+++ b/include/inc.check_pear.php
@@ -35,16 +35,9 @@
 @include_once("MDB2.php");
 @include_once("MDB2/Driver/mysql.php");
 
-// wrapper for php 4.3.2 & higher
-@include_once "HTML/Template/ITX.php";
+require_once "HTML/Template/ITX.php";
 $tpl_class_name = "HTML_Template_ITX";
 $html_templ_it = true;
-if (!class_exists("HTML_Template_ITX"))
-{
-	include_once "HTML/ITX.php";
-	$tpl_class_name = "IntegratedTemplate";
-	$html_templ_it = class_exists("HTML_Template_ITX");
-}
 
 $include_paths = ini_get("include_path");
 
diff --git a/setup/include/inc.setup_header.php b/setup/include/inc.setup_header.php
index 109f03e4df36..01e1b7bbd843 100755
--- a/setup/include/inc.setup_header.php
+++ b/setup/include/inc.setup_header.php
@@ -48,17 +48,9 @@
 
 // wrapper for php 4.3.2 & higher
 
-@include_once "HTML/Template/ITX.php";		// new implementation
-if (class_exists("HTML_Template_ITX"))
-{
-	include_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
-}
-else
-{
-	include_once "HTML/ITX.php";		// old implementation
-	include_once "./Services/UICore/classes/class.ilTemplateITX.php";
-}
-require_once "./setup/classes/class.ilTemplate.php";	// modified class. needs to be merged with base template class 
+require_once "HTML/Template/ITX.php";
+require_once "./Services/UICore/classes/class.ilTemplateHTMLITX.php";
+require_once "./setup/classes/class.ilTemplate.php";	// modified class. needs to be merged with base template class
 
 require_once "./setup/classes/class.ilLanguage.php";	// modified class. needs to be merged with base language class 
 require_once "./Services/Logging/classes/class.ilLog.php";