Bug #14, Controller namespace - code standard fix PSR-2 [iet:3633574]

IET-OU · Jun 22, 2015 · f164b41 · f164b41
1 parent 02db0c3
commit f164b41
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     */
-    class About extends MY_Controller
+    class About extends \IET_OU\Open_Media_Player\MY_Controller
     {
         #const LAYOUT = 'ouice_2';
@@ Expand Down @@