From f164b415399456d1458d2f3d4e5b9d0c1ae002a2 Mon Sep 17 00:00:00 2001
From: Nick Freear <nfreear@yahoo.co.uk>
Date: Mon, 22 Jun 2015 21:24:46 +0100
Subject: [PATCH] Bug #14, Controller namespace - code standard fix PSR-2
 [iet:3633574]

---
 application/controllers/about.php          | 2 +-
 application/controllers/build.php          | 2 +-
 application/controllers/demo.php           | 2 +-
 application/controllers/embed.php          | 2 +-
 application/controllers/localize.php       | 2 +-
 application/controllers/media_redirect.php | 2 +-
 application/controllers/obj_to_oup.php     | 2 +-
 application/controllers/oembed.php         | 2 +-
 application/controllers/scripts.php        | 2 +-
 application/controllers/services.php       | 2 +-
 application/controllers/svg.php            | 2 +-
 application/controllers/timedtext.php      | 4 ++--
 application/controllers/uptime.php         | 2 +-
 application/controllers/xml_namespace.php  | 2 +-
 application/core/MY_Controller.php         | 7 +++----
 15 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/application/controllers/about.php b/application/controllers/about.php
index 6f74153..2b82da3 100644
--- a/application/controllers/about.php
+++ b/application/controllers/about.php
@@ -7,7 +7,7 @@
 */
 
 
-class About extends MY_Controller
+class About extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     #const LAYOUT = 'ouice_2';
diff --git a/application/controllers/build.php b/application/controllers/build.php
index 74f6ad4..2f81c51 100644
--- a/application/controllers/build.php
+++ b/application/controllers/build.php
@@ -18,7 +18,7 @@
 * @author N.D.Freear, 17 April 2012, -04-25.
 */
 
-class Build extends MY_Controller
+class Build extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     protected $_closure_template = <<<EOF
diff --git a/application/controllers/demo.php b/application/controllers/demo.php
index 2957951..6e5cf5e 100644
--- a/application/controllers/demo.php
+++ b/application/controllers/demo.php
@@ -7,7 +7,7 @@
  * @copyright Copyright 2011 The Open University.
  */
 
-class Demo extends MY_Controller
+class Demo extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     public function __construct()
diff --git a/application/controllers/embed.php b/application/controllers/embed.php
index 9521663..9fd8dd7 100644
--- a/application/controllers/embed.php
+++ b/application/controllers/embed.php
@@ -10,7 +10,7 @@
 require_once APPPATH.'libraries/ouplayer_lib.php';
 
 
-class Embed extends MY_Controller
+class Embed extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     protected $_debug;
diff --git a/application/controllers/localize.php b/application/controllers/localize.php
index ddb1b08..0579af6 100644
--- a/application/controllers/localize.php
+++ b/application/controllers/localize.php
@@ -10,7 +10,7 @@
  *   http://embed.open.ac.uk/localize/po/zh-cn/download  -- Opens in poEdit if installed.
  */
 
-class Localize extends MY_Controller
+class Localize extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     const TEMPLATE = 'ouplayer.pot';
diff --git a/application/controllers/media_redirect.php b/application/controllers/media_redirect.php
index 1ae89eb..2de6c80 100644
--- a/application/controllers/media_redirect.php
+++ b/application/controllers/media_redirect.php
@@ -10,7 +10,7 @@
  */
 
 
-class Media_redirect extends MY_Controller
+class Media_redirect extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     protected $redirect_codes = array(
diff --git a/application/controllers/obj_to_oup.php b/application/controllers/obj_to_oup.php
index 6f5b4e4..436736e 100644
--- a/application/controllers/obj_to_oup.php
+++ b/application/controllers/obj_to_oup.php
@@ -8,7 +8,7 @@
  */
 
 
-class Obj_to_oup extends MY_Controller
+class Obj_to_oup extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     public function index()
diff --git a/application/controllers/oembed.php b/application/controllers/oembed.php
index 6e55067..419b75c 100644
--- a/application/controllers/oembed.php
+++ b/application/controllers/oembed.php
@@ -7,7 +7,7 @@
  */
 
 
-class Oembed extends MY_Controller
+class Oembed extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     public function __construct()
diff --git a/application/controllers/scripts.php b/application/controllers/scripts.php
index 6712ffa..873a4e3 100644
--- a/application/controllers/scripts.php
+++ b/application/controllers/scripts.php
@@ -10,7 +10,7 @@
 http://www.mnot.net/cache_docs/
  */
 
-class Scripts extends MY_Controller
+class Scripts extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     public function __construct()
diff --git a/application/controllers/services.php b/application/controllers/services.php
index fff9942..b1de0b4 100644
--- a/application/controllers/services.php
+++ b/application/controllers/services.php
@@ -10,7 +10,7 @@
 ini_set('display_errors', true);
 
 
-class Services extends MY_Controller
+class Services extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     /** Output JSON/ JSON-P.
diff --git a/application/controllers/svg.php b/application/controllers/svg.php
index 3334c78..84bfa7e 100644
--- a/application/controllers/svg.php
+++ b/application/controllers/svg.php
@@ -9,7 +9,7 @@
 *
 */
 
-class Svg extends MY_Controller
+class Svg extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     protected $_whitelist;
diff --git a/application/controllers/timedtext.php b/application/controllers/timedtext.php
index 51331eb..1b04c9a 100644
--- a/application/controllers/timedtext.php
+++ b/application/controllers/timedtext.php
@@ -1,4 +1,4 @@
-<?php
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 /**
  * Captions/timed-text controller.
  *
@@ -15,7 +15,7 @@
 define('TTML_NS', 'http://www.w3.org/2006/10/ttaf1');
 
 
-class Timedtext extends MY_Controller
+class Timedtext extends \IET_OU\Open_Media_Player\MY_Controller
 {
  #CI_Controller {
 
diff --git a/application/controllers/uptime.php b/application/controllers/uptime.php
index 6fbd365..83e228a 100644
--- a/application/controllers/uptime.php
+++ b/application/controllers/uptime.php
@@ -13,7 +13,7 @@
  * @package Uptime
  */
 
-class Uptime extends MY_Controller
+class Uptime extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     /** Uptime page, for both podcast and OU-embed data sources/DBs.
diff --git a/application/controllers/xml_namespace.php b/application/controllers/xml_namespace.php
index 3fac717..90dd84b 100644
--- a/application/controllers/xml_namespace.php
+++ b/application/controllers/xml_namespace.php
@@ -18,7 +18,7 @@
  */
 
 
-class Xml_namespace extends MY_Controller
+class Xml_namespace extends \IET_OU\Open_Media_Player\MY_Controller
 {
 
     // List of live/test/dev. servers for which we display the namespace page.
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index e47fb22..f9a58fe 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -1,7 +1,6 @@
-<?php defined('BASEPATH') or exit('No direct script access allowed');
-
-//  if (! defined('BASEPATH')) exit('No direct script access allowed');
+<?php namespace IET_OU\Open_Media_Player;
 
+defined('BASEPATH') or exit('No direct script access allowed');
 /**
  * OU Media Player.
  *
@@ -12,7 +11,7 @@
  */
 
 
-class MY_Controller extends CI_Controller
+class MY_Controller extends \CI_Controller
 {
 
     public $firephp;