From ea1346447f3d0d455ed5905132079d9cb5d7289d Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 27 Nov 2012 12:26:56 +1100 Subject: [PATCH] Fixes for KH 3.3 - to do with case file names --- application/classes/{auth/orm.php => Auth/ORM.php} | 0 application/classes/{auth/tsm.php => Auth/TSM.php} | 2 +- application/classes/{block.php => Block.php} | 0 application/classes/{breadcrumb.php => Breadcrumb.php} | 0 application/classes/{config.php => Config.php} | 0 .../{controller/default.php => Controller/Default.php} | 0 .../{controller/domain.php => Controller/Domain.php} | 6 +++--- .../{controller/library.php => Controller/Library.php} | 6 +++--- .../classes/{controller/login.php => Controller/Login.php} | 0 .../{controller/logout.php => Controller/Logout.php} | 0 .../classes/{controller/media.php => Controller/Media.php} | 0 .../classes/{controller/node.php => Controller/Node.php} | 6 +++--- .../{controller/server.php => Controller/Server.php} | 2 +- .../{controller/stgpool.php => Controller/Stgpool.php} | 6 +++--- .../templatedefault.php => Controller/TemplateDefault.php} | 0 .../classes/{controller/tree.php => Controller/Tree.php} | 0 .../{controller/welcome.php => Controller/Welcome.php} | 0 application/classes/{database.php => Database.php} | 0 .../{database/exception.php => Database/Exception.php} | 0 .../classes/{database/result.php => Database/Result.php} | 0 application/classes/{database/tsm.php => Database/TSM.php} | 0 .../classes/{database/tsm/db2.php => Database/TSM/DB2.php} | 1 + .../{database/tsm/result.php => Database/TSM/Result.php} | 0 .../classes/{database/tsm/set.php => Database/TSM/Set.php} | 0 .../{database/tsm/show.php => Database/TSM/Show.php} | 0 .../classes/{database/tsm => Database/Tsm}/dsmadmc.php | 2 +- application/classes/{form.php => Form.php} | 0 application/classes/{html.php => HTML.php} | 0 application/classes/{htmlrender.php => HTMLRender.php} | 0 .../classes/{http/exception => HTTP/Exception}/404.php | 0 application/classes/{headimages.php => HeadImages.php} | 0 application/classes/{jpgraph.php => JPGraph.php} | 0 .../classes/{jpgraph/gantt.php => JPGraph/Gantt.php} | 0 application/classes/{meta.php => Meta.php} | 0 application/classes/{model/actlog.php => Model/ACTLOG.php} | 0 application/classes/{model/admin.php => Model/ADMIN.php} | 0 .../{model/association.php => Model/ASSOCIATION.php} | 0 .../auth/userdefault.php => Model/Auth/UserDefault.php} | 0 .../classes/{model/clientopt.php => Model/CLIENTOPT.php} | 0 .../{model/copygroup/ar.php => Model/COPYGROUP/AR.php} | 0 .../{model/copygroup/bu.php => Model/COPYGROUP/BU.php} | 0 .../classes/{model/devclasses.php => Model/DEVCLASSES.php} | 0 application/classes/{model/domain.php => Model/DOMAIN.php} | 0 application/classes/{model/drive.php => Model/DRIVE.php} | 0 application/classes/{model/event.php => Model/EVENT.php} | 0 .../classes/{model/filespace.php => Model/FILESPACE.php} | 0 .../classes/{model/library.php => Model/LIBRARY.php} | 4 ++-- .../classes/{model/libvolume.php => Model/LIBVOLUME.php} | 0 application/classes/{model/media.php => Model/MEDIA.php} | 0 .../classes/{model/mgmtclass.php => Model/MGMTCLASS.php} | 0 application/classes/{model/node.php => Model/NODE.php} | 0 application/classes/{model/occ.php => Model/OCC.php} | 0 application/classes/{model/path.php => Model/PATH.php} | 0 .../schedule/client.php => Model/SCHEDULE/CLIENT.php} | 0 .../classes/{model/stgpool.php => Model/STGPOOL.php} | 0 .../classes/{model/summary.php => Model/SUMMARY.php} | 0 .../classes/{model/volhistory.php => Model/VOLHISTORY.php} | 0 application/classes/{model/volume.php => Model/VOLUME.php} | 0 .../{model/volumeusage.php => Model/VOLUMEUSAGE.php} | 0 application/classes/{orm.php => ORM.php} | 0 application/classes/{response.php => Response.php} | 0 application/classes/{script.php => Script.php} | 0 application/classes/{slot.php => Slot.php} | 0 application/classes/{sort.php => Sort.php} | 0 application/classes/{style.php => Style.php} | 0 .../classes/{systemmessage.php => SystemMessage.php} | 0 application/classes/{tsm.php => TSM.php} | 0 application/classes/TSM/ORM.php | 2 +- application/classes/{valid.php => Valid.php} | 0 application/classes/{lnapp/block.php => lnApp/Block.php} | 0 .../classes/{lnapp/breadcrumb.php => lnApp/Breadcrumb.php} | 0 application/classes/{lnapp/config.php => lnApp/Config.php} | 0 .../Controller/default.php => lnApp/Controller/Default.php} | 0 .../Controller/login.php => lnApp/Controller/Login.php} | 0 .../Controller/logout.php => lnApp/Controller/Logout.php} | 0 application/classes/{lnapp => lnApp}/Controller/Media.php | 0 .../Controller/TemplateDefault.php} | 2 +- .../Controller/tree.php => lnApp/Controller/Tree.php} | 0 application/classes/{lnapp/html.php => lnApp/HTML.php} | 0 .../classes/{lnapp/htmlrender.php => lnApp/HTMLRender.php} | 0 .../classes/{lnapp/headimages.php => lnApp/HeadImages.php} | 0 .../classes/{lnapp/jpgraph.php => lnApp/JPGraph.php} | 0 .../{lnapp/jpgraph/gantt.php => lnApp/JPGraph/Gantt.php} | 2 +- application/classes/{lnapp/meta.php => lnApp/Meta.php} | 0 application/classes/{lnapp/script.php => lnApp/Script.php} | 0 application/classes/{lnapp/sort.php => lnApp/Sort.php} | 0 application/classes/{lnapp/style.php => lnApp/Style.php} | 0 .../{lnapp/systemmessage.php => lnApp/SystemMessage.php} | 0 88 files changed, 21 insertions(+), 20 deletions(-) rename application/classes/{auth/orm.php => Auth/ORM.php} (100%) rename application/classes/{auth/tsm.php => Auth/TSM.php} (95%) rename application/classes/{block.php => Block.php} (100%) rename application/classes/{breadcrumb.php => Breadcrumb.php} (100%) rename application/classes/{config.php => Config.php} (100%) rename application/classes/{controller/default.php => Controller/Default.php} (100%) rename application/classes/{controller/domain.php => Controller/Domain.php} (92%) rename application/classes/{controller/library.php => Controller/Library.php} (93%) rename application/classes/{controller/login.php => Controller/Login.php} (100%) rename application/classes/{controller/logout.php => Controller/Logout.php} (100%) rename application/classes/{controller/media.php => Controller/Media.php} (100%) rename application/classes/{controller/node.php => Controller/Node.php} (94%) rename application/classes/{controller/server.php => Controller/Server.php} (98%) rename application/classes/{controller/stgpool.php => Controller/Stgpool.php} (93%) rename application/classes/{controller/templatedefault.php => Controller/TemplateDefault.php} (100%) rename application/classes/{controller/tree.php => Controller/Tree.php} (100%) rename application/classes/{controller/welcome.php => Controller/Welcome.php} (100%) rename application/classes/{database.php => Database.php} (100%) rename application/classes/{database/exception.php => Database/Exception.php} (100%) rename application/classes/{database/result.php => Database/Result.php} (100%) rename application/classes/{database/tsm.php => Database/TSM.php} (100%) rename application/classes/{database/tsm/db2.php => Database/TSM/DB2.php} (98%) rename application/classes/{database/tsm/result.php => Database/TSM/Result.php} (100%) rename application/classes/{database/tsm/set.php => Database/TSM/Set.php} (100%) rename application/classes/{database/tsm/show.php => Database/TSM/Show.php} (100%) rename application/classes/{database/tsm => Database/Tsm}/dsmadmc.php (99%) rename application/classes/{form.php => Form.php} (100%) rename application/classes/{html.php => HTML.php} (100%) rename application/classes/{htmlrender.php => HTMLRender.php} (100%) rename application/classes/{http/exception => HTTP/Exception}/404.php (100%) rename application/classes/{headimages.php => HeadImages.php} (100%) rename application/classes/{jpgraph.php => JPGraph.php} (100%) rename application/classes/{jpgraph/gantt.php => JPGraph/Gantt.php} (100%) rename application/classes/{meta.php => Meta.php} (100%) rename application/classes/{model/actlog.php => Model/ACTLOG.php} (100%) rename application/classes/{model/admin.php => Model/ADMIN.php} (100%) rename application/classes/{model/association.php => Model/ASSOCIATION.php} (100%) rename application/classes/{model/auth/userdefault.php => Model/Auth/UserDefault.php} (100%) rename application/classes/{model/clientopt.php => Model/CLIENTOPT.php} (100%) rename application/classes/{model/copygroup/ar.php => Model/COPYGROUP/AR.php} (100%) rename application/classes/{model/copygroup/bu.php => Model/COPYGROUP/BU.php} (100%) rename application/classes/{model/devclasses.php => Model/DEVCLASSES.php} (100%) rename application/classes/{model/domain.php => Model/DOMAIN.php} (100%) rename application/classes/{model/drive.php => Model/DRIVE.php} (100%) rename application/classes/{model/event.php => Model/EVENT.php} (100%) rename application/classes/{model/filespace.php => Model/FILESPACE.php} (100%) rename application/classes/{model/library.php => Model/LIBRARY.php} (97%) rename application/classes/{model/libvolume.php => Model/LIBVOLUME.php} (100%) rename application/classes/{model/media.php => Model/MEDIA.php} (100%) rename application/classes/{model/mgmtclass.php => Model/MGMTCLASS.php} (100%) rename application/classes/{model/node.php => Model/NODE.php} (100%) rename application/classes/{model/occ.php => Model/OCC.php} (100%) rename application/classes/{model/path.php => Model/PATH.php} (100%) rename application/classes/{model/schedule/client.php => Model/SCHEDULE/CLIENT.php} (100%) rename application/classes/{model/stgpool.php => Model/STGPOOL.php} (100%) rename application/classes/{model/summary.php => Model/SUMMARY.php} (100%) rename application/classes/{model/volhistory.php => Model/VOLHISTORY.php} (100%) rename application/classes/{model/volume.php => Model/VOLUME.php} (100%) rename application/classes/{model/volumeusage.php => Model/VOLUMEUSAGE.php} (100%) rename application/classes/{orm.php => ORM.php} (100%) rename application/classes/{response.php => Response.php} (100%) rename application/classes/{script.php => Script.php} (100%) rename application/classes/{slot.php => Slot.php} (100%) rename application/classes/{sort.php => Sort.php} (100%) rename application/classes/{style.php => Style.php} (100%) rename application/classes/{systemmessage.php => SystemMessage.php} (100%) rename application/classes/{tsm.php => TSM.php} (100%) rename application/classes/{valid.php => Valid.php} (100%) rename application/classes/{lnapp/block.php => lnApp/Block.php} (100%) rename application/classes/{lnapp/breadcrumb.php => lnApp/Breadcrumb.php} (100%) rename application/classes/{lnapp/config.php => lnApp/Config.php} (100%) rename application/classes/{lnapp/Controller/default.php => lnApp/Controller/Default.php} (100%) rename application/classes/{lnapp/Controller/login.php => lnApp/Controller/Login.php} (100%) rename application/classes/{lnapp/Controller/logout.php => lnApp/Controller/Logout.php} (100%) rename application/classes/{lnapp => lnApp}/Controller/Media.php (100%) rename application/classes/{lnapp/Controller/templatedefault.php => lnApp/Controller/TemplateDefault.php} (99%) rename application/classes/{lnapp/Controller/tree.php => lnApp/Controller/Tree.php} (100%) rename application/classes/{lnapp/html.php => lnApp/HTML.php} (100%) rename application/classes/{lnapp/htmlrender.php => lnApp/HTMLRender.php} (100%) rename application/classes/{lnapp/headimages.php => lnApp/HeadImages.php} (100%) rename application/classes/{lnapp/jpgraph.php => lnApp/JPGraph.php} (100%) rename application/classes/{lnapp/jpgraph/gantt.php => lnApp/JPGraph/Gantt.php} (98%) rename application/classes/{lnapp/meta.php => lnApp/Meta.php} (100%) rename application/classes/{lnapp/script.php => lnApp/Script.php} (100%) rename application/classes/{lnapp/sort.php => lnApp/Sort.php} (100%) rename application/classes/{lnapp/style.php => lnApp/Style.php} (100%) rename application/classes/{lnapp/systemmessage.php => lnApp/SystemMessage.php} (100%) diff --git a/application/classes/auth/orm.php b/application/classes/Auth/ORM.php similarity index 100% rename from application/classes/auth/orm.php rename to application/classes/Auth/ORM.php diff --git a/application/classes/auth/tsm.php b/application/classes/Auth/TSM.php similarity index 95% rename from application/classes/auth/tsm.php rename to application/classes/Auth/TSM.php index 41d3a4f..ac19992 100644 --- a/application/classes/auth/tsm.php +++ b/application/classes/Auth/TSM.php @@ -25,7 +25,7 @@ class Auth_TSM extends Auth_ORM { $username = $user; // Load the user - $user = ORM::factory('admin') + $user = ORM::factory('ADMIN') ->where('ADMIN_NAME','=',strtoupper($username)) ->cached(0) ->find(); diff --git a/application/classes/block.php b/application/classes/Block.php similarity index 100% rename from application/classes/block.php rename to application/classes/Block.php diff --git a/application/classes/breadcrumb.php b/application/classes/Breadcrumb.php similarity index 100% rename from application/classes/breadcrumb.php rename to application/classes/Breadcrumb.php diff --git a/application/classes/config.php b/application/classes/Config.php similarity index 100% rename from application/classes/config.php rename to application/classes/Config.php diff --git a/application/classes/controller/default.php b/application/classes/Controller/Default.php similarity index 100% rename from application/classes/controller/default.php rename to application/classes/Controller/Default.php diff --git a/application/classes/controller/domain.php b/application/classes/Controller/Domain.php similarity index 92% rename from application/classes/controller/domain.php rename to application/classes/Controller/Domain.php index e834317..9fcd1a8 100644 --- a/application/classes/controller/domain.php +++ b/application/classes/Controller/Domain.php @@ -10,12 +10,12 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Controller_DOMAIN extends Controller_TemplateDefault { +class Controller_Domain extends Controller_TemplateDefault { /** * Default Index for Controller */ public function action_index() { - $do = ORM::factory('domain'); + $do = ORM::factory('DOMAIN'); $output = ''; $output .= sprintf(_('This server has %s domains.'),$do->count_all()); @@ -50,7 +50,7 @@ class Controller_DOMAIN extends Controller_TemplateDefault { HTTP::redirect('domain'); } - $do = ORM::factory('domain',$domain_name); + $do = ORM::factory('DOMAIN',$domain_name); if (! $do->loaded()) { SystemMessage::add(array( 'title'=>_('Unknown DOMAIN_NAME'), diff --git a/application/classes/controller/library.php b/application/classes/Controller/Library.php similarity index 93% rename from application/classes/controller/library.php rename to application/classes/Controller/Library.php index e518b88..1fff750 100644 --- a/application/classes/controller/library.php +++ b/application/classes/Controller/Library.php @@ -10,12 +10,12 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Controller_LIBRARY extends Controller_TemplateDefault { +class Controller_Library extends Controller_TemplateDefault { /** * Default Index for Controller */ public function action_index() { - $lo = ORM::factory('library'); + $lo = ORM::factory('LIBRARY'); $output = ''; $output .= sprintf(_('This server has %s libraries.'),$lo->count_all()); @@ -50,7 +50,7 @@ class Controller_LIBRARY extends Controller_TemplateDefault { HTTP::redirect('library'); } - $lo = ORM::factory('library',$library); + $lo = ORM::factory('LIBRARY',$library); if (! $lo->loaded()) { SystemMessage::add(array( 'title'=>_('Unknown LIBRARY_NAME'), diff --git a/application/classes/controller/login.php b/application/classes/Controller/Login.php similarity index 100% rename from application/classes/controller/login.php rename to application/classes/Controller/Login.php diff --git a/application/classes/controller/logout.php b/application/classes/Controller/Logout.php similarity index 100% rename from application/classes/controller/logout.php rename to application/classes/Controller/Logout.php diff --git a/application/classes/controller/media.php b/application/classes/Controller/Media.php similarity index 100% rename from application/classes/controller/media.php rename to application/classes/Controller/Media.php diff --git a/application/classes/controller/node.php b/application/classes/Controller/Node.php similarity index 94% rename from application/classes/controller/node.php rename to application/classes/Controller/Node.php index 1b83ce1..53e1b6f 100644 --- a/application/classes/controller/node.php +++ b/application/classes/Controller/Node.php @@ -10,12 +10,12 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Controller_NODE extends Controller_TemplateDefault { +class Controller_Node extends Controller_TemplateDefault { /** * Default Index for Controller */ public function action_index() { - $no = ORM::factory('node'); + $no = ORM::factory('NODE'); $output = ''; $output .= sprintf(_('This server has %s defined nodes.'),$no->count_all()); @@ -50,7 +50,7 @@ class Controller_NODE extends Controller_TemplateDefault { HTTP::redirect('node'); } - $no = ORM::factory('node',$node_name); + $no = ORM::factory('NODE',$node_name); if (! $no->loaded()) { SystemMessage::add(array( 'title'=>_('Unknown NODE_NAME'), diff --git a/application/classes/controller/server.php b/application/classes/Controller/Server.php similarity index 98% rename from application/classes/controller/server.php rename to application/classes/Controller/Server.php index 09d76fb..439a01a 100644 --- a/application/classes/controller/server.php +++ b/application/classes/Controller/Server.php @@ -10,7 +10,7 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Controller_SERVER extends Controller_TemplateDefault { +class Controller_Server extends Controller_TemplateDefault { /** * Default Index for Controller */ diff --git a/application/classes/controller/stgpool.php b/application/classes/Controller/Stgpool.php similarity index 93% rename from application/classes/controller/stgpool.php rename to application/classes/Controller/Stgpool.php index 9854e81..3d65617 100644 --- a/application/classes/controller/stgpool.php +++ b/application/classes/Controller/Stgpool.php @@ -10,12 +10,12 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Controller_STGPOOL extends Controller_TemplateDefault { +class Controller_Stgpool extends Controller_TemplateDefault { /** * Default Index for Controller */ public function action_index() { - $so = ORM::factory('stgpool'); + $so = ORM::factory('STGPOOL'); $output = ''; $output .= sprintf(_('This server has %s stgpool pools.'),$so->count_all()); @@ -50,7 +50,7 @@ class Controller_STGPOOL extends Controller_TemplateDefault { HTTP::redirect('stgpool'); } - $so = ORM::factory('stgpool',$stgpool); + $so = ORM::factory('STGPOOL',$stgpool); if (! $so->loaded()) { SystemMessage::add(array( 'title'=>_('Unknown STGPOOL_NAME'), diff --git a/application/classes/controller/templatedefault.php b/application/classes/Controller/TemplateDefault.php similarity index 100% rename from application/classes/controller/templatedefault.php rename to application/classes/Controller/TemplateDefault.php diff --git a/application/classes/controller/tree.php b/application/classes/Controller/Tree.php similarity index 100% rename from application/classes/controller/tree.php rename to application/classes/Controller/Tree.php diff --git a/application/classes/controller/welcome.php b/application/classes/Controller/Welcome.php similarity index 100% rename from application/classes/controller/welcome.php rename to application/classes/Controller/Welcome.php diff --git a/application/classes/database.php b/application/classes/Database.php similarity index 100% rename from application/classes/database.php rename to application/classes/Database.php diff --git a/application/classes/database/exception.php b/application/classes/Database/Exception.php similarity index 100% rename from application/classes/database/exception.php rename to application/classes/Database/Exception.php diff --git a/application/classes/database/result.php b/application/classes/Database/Result.php similarity index 100% rename from application/classes/database/result.php rename to application/classes/Database/Result.php diff --git a/application/classes/database/tsm.php b/application/classes/Database/TSM.php similarity index 100% rename from application/classes/database/tsm.php rename to application/classes/Database/TSM.php diff --git a/application/classes/database/tsm/db2.php b/application/classes/Database/TSM/DB2.php similarity index 98% rename from application/classes/database/tsm/db2.php rename to application/classes/Database/TSM/DB2.php index fe21ee8..4e56b20 100644 --- a/application/classes/database/tsm/db2.php +++ b/application/classes/Database/TSM/DB2.php @@ -48,6 +48,7 @@ class Database_TSM_DB2 extends Database_TSM { $database,$hostname,$port,'TCPIP',$username,$password); $this->_connection = db2_connect($constring,NULL,NULL); +echo debug::vars(array('s'=>$constring,'em'=>db2_conn_errormsg()));die(); if ($this->_connection) { $result = DB::query(Database::SET,'SET SCHEMA='.$database)->execute(Kohana::config('config.client_type')); diff --git a/application/classes/database/tsm/result.php b/application/classes/Database/TSM/Result.php similarity index 100% rename from application/classes/database/tsm/result.php rename to application/classes/Database/TSM/Result.php diff --git a/application/classes/database/tsm/set.php b/application/classes/Database/TSM/Set.php similarity index 100% rename from application/classes/database/tsm/set.php rename to application/classes/Database/TSM/Set.php diff --git a/application/classes/database/tsm/show.php b/application/classes/Database/TSM/Show.php similarity index 100% rename from application/classes/database/tsm/show.php rename to application/classes/Database/TSM/Show.php diff --git a/application/classes/database/tsm/dsmadmc.php b/application/classes/Database/Tsm/dsmadmc.php similarity index 99% rename from application/classes/database/tsm/dsmadmc.php rename to application/classes/Database/Tsm/dsmadmc.php index 2c02f6d..1d06dc6 100644 --- a/application/classes/database/tsm/dsmadmc.php +++ b/application/classes/Database/Tsm/dsmadmc.php @@ -10,7 +10,7 @@ * @copyright (c) 2010 phpTSMadmin Development Team * @license http://phptsmadmin.sf.net/license.html */ -class Database_TSM_DSMADMC extends Database_TSM { +class Database_Tsm_dsmadmc extends Database_TSM { public function connect() { // Extract the connection parameters, adding required variabels extract($this->_config['connection'] + array( diff --git a/application/classes/form.php b/application/classes/Form.php similarity index 100% rename from application/classes/form.php rename to application/classes/Form.php diff --git a/application/classes/html.php b/application/classes/HTML.php similarity index 100% rename from application/classes/html.php rename to application/classes/HTML.php diff --git a/application/classes/htmlrender.php b/application/classes/HTMLRender.php similarity index 100% rename from application/classes/htmlrender.php rename to application/classes/HTMLRender.php diff --git a/application/classes/http/exception/404.php b/application/classes/HTTP/Exception/404.php similarity index 100% rename from application/classes/http/exception/404.php rename to application/classes/HTTP/Exception/404.php diff --git a/application/classes/headimages.php b/application/classes/HeadImages.php similarity index 100% rename from application/classes/headimages.php rename to application/classes/HeadImages.php diff --git a/application/classes/jpgraph.php b/application/classes/JPGraph.php similarity index 100% rename from application/classes/jpgraph.php rename to application/classes/JPGraph.php diff --git a/application/classes/jpgraph/gantt.php b/application/classes/JPGraph/Gantt.php similarity index 100% rename from application/classes/jpgraph/gantt.php rename to application/classes/JPGraph/Gantt.php diff --git a/application/classes/meta.php b/application/classes/Meta.php similarity index 100% rename from application/classes/meta.php rename to application/classes/Meta.php diff --git a/application/classes/model/actlog.php b/application/classes/Model/ACTLOG.php similarity index 100% rename from application/classes/model/actlog.php rename to application/classes/Model/ACTLOG.php diff --git a/application/classes/model/admin.php b/application/classes/Model/ADMIN.php similarity index 100% rename from application/classes/model/admin.php rename to application/classes/Model/ADMIN.php diff --git a/application/classes/model/association.php b/application/classes/Model/ASSOCIATION.php similarity index 100% rename from application/classes/model/association.php rename to application/classes/Model/ASSOCIATION.php diff --git a/application/classes/model/auth/userdefault.php b/application/classes/Model/Auth/UserDefault.php similarity index 100% rename from application/classes/model/auth/userdefault.php rename to application/classes/Model/Auth/UserDefault.php diff --git a/application/classes/model/clientopt.php b/application/classes/Model/CLIENTOPT.php similarity index 100% rename from application/classes/model/clientopt.php rename to application/classes/Model/CLIENTOPT.php diff --git a/application/classes/model/copygroup/ar.php b/application/classes/Model/COPYGROUP/AR.php similarity index 100% rename from application/classes/model/copygroup/ar.php rename to application/classes/Model/COPYGROUP/AR.php diff --git a/application/classes/model/copygroup/bu.php b/application/classes/Model/COPYGROUP/BU.php similarity index 100% rename from application/classes/model/copygroup/bu.php rename to application/classes/Model/COPYGROUP/BU.php diff --git a/application/classes/model/devclasses.php b/application/classes/Model/DEVCLASSES.php similarity index 100% rename from application/classes/model/devclasses.php rename to application/classes/Model/DEVCLASSES.php diff --git a/application/classes/model/domain.php b/application/classes/Model/DOMAIN.php similarity index 100% rename from application/classes/model/domain.php rename to application/classes/Model/DOMAIN.php diff --git a/application/classes/model/drive.php b/application/classes/Model/DRIVE.php similarity index 100% rename from application/classes/model/drive.php rename to application/classes/Model/DRIVE.php diff --git a/application/classes/model/event.php b/application/classes/Model/EVENT.php similarity index 100% rename from application/classes/model/event.php rename to application/classes/Model/EVENT.php diff --git a/application/classes/model/filespace.php b/application/classes/Model/FILESPACE.php similarity index 100% rename from application/classes/model/filespace.php rename to application/classes/Model/FILESPACE.php diff --git a/application/classes/model/library.php b/application/classes/Model/LIBRARY.php similarity index 97% rename from application/classes/model/library.php rename to application/classes/Model/LIBRARY.php index d088ce3..1f2a23a 100644 --- a/application/classes/model/library.php +++ b/application/classes/Model/LIBRARY.php @@ -29,7 +29,7 @@ class Model_LIBRARY extends TSM_ORM { ); public function slots() { - return $this->slots ? $this->slots : $this->slots = DB::query(Database::SHOW,'SHOW SLOTS '.$this)->execute(); + return $this->slots ? $this->slots : $this->slots = DB::query(Database::SHOW,'SHOW SLOTS '.$this)->execute(Kohana::$config->load('config')->client_type); } // Return a list of scratch volumes @@ -131,7 +131,7 @@ class Model_LIBRARY extends TSM_ORM { static $CACHE = array(); if (! isset($CACHE[__METHOD__])) - foreach (ORM::factory('volhistory')->where('TYPE','IN',Kohana::$config->load('config')->tsmdbtypes)->find_all() as $vho) + foreach (ORM::factory('VOLHISTORY')->where('TYPE','IN',Kohana::$config->load('config')->tsmdbtypes)->find_all() as $vho) $CACHE[__METHOD__][$vho->LIBVOLUME->LIBRARY_NAME ? 'IN' : 'OUT'][] = $vho; return isset($CACHE[__METHOD__][$inout]) ? $CACHE[__METHOD__][$inout] : array(); diff --git a/application/classes/model/libvolume.php b/application/classes/Model/LIBVOLUME.php similarity index 100% rename from application/classes/model/libvolume.php rename to application/classes/Model/LIBVOLUME.php diff --git a/application/classes/model/media.php b/application/classes/Model/MEDIA.php similarity index 100% rename from application/classes/model/media.php rename to application/classes/Model/MEDIA.php diff --git a/application/classes/model/mgmtclass.php b/application/classes/Model/MGMTCLASS.php similarity index 100% rename from application/classes/model/mgmtclass.php rename to application/classes/Model/MGMTCLASS.php diff --git a/application/classes/model/node.php b/application/classes/Model/NODE.php similarity index 100% rename from application/classes/model/node.php rename to application/classes/Model/NODE.php diff --git a/application/classes/model/occ.php b/application/classes/Model/OCC.php similarity index 100% rename from application/classes/model/occ.php rename to application/classes/Model/OCC.php diff --git a/application/classes/model/path.php b/application/classes/Model/PATH.php similarity index 100% rename from application/classes/model/path.php rename to application/classes/Model/PATH.php diff --git a/application/classes/model/schedule/client.php b/application/classes/Model/SCHEDULE/CLIENT.php similarity index 100% rename from application/classes/model/schedule/client.php rename to application/classes/Model/SCHEDULE/CLIENT.php diff --git a/application/classes/model/stgpool.php b/application/classes/Model/STGPOOL.php similarity index 100% rename from application/classes/model/stgpool.php rename to application/classes/Model/STGPOOL.php diff --git a/application/classes/model/summary.php b/application/classes/Model/SUMMARY.php similarity index 100% rename from application/classes/model/summary.php rename to application/classes/Model/SUMMARY.php diff --git a/application/classes/model/volhistory.php b/application/classes/Model/VOLHISTORY.php similarity index 100% rename from application/classes/model/volhistory.php rename to application/classes/Model/VOLHISTORY.php diff --git a/application/classes/model/volume.php b/application/classes/Model/VOLUME.php similarity index 100% rename from application/classes/model/volume.php rename to application/classes/Model/VOLUME.php diff --git a/application/classes/model/volumeusage.php b/application/classes/Model/VOLUMEUSAGE.php similarity index 100% rename from application/classes/model/volumeusage.php rename to application/classes/Model/VOLUMEUSAGE.php diff --git a/application/classes/orm.php b/application/classes/ORM.php similarity index 100% rename from application/classes/orm.php rename to application/classes/ORM.php diff --git a/application/classes/response.php b/application/classes/Response.php similarity index 100% rename from application/classes/response.php rename to application/classes/Response.php diff --git a/application/classes/script.php b/application/classes/Script.php similarity index 100% rename from application/classes/script.php rename to application/classes/Script.php diff --git a/application/classes/slot.php b/application/classes/Slot.php similarity index 100% rename from application/classes/slot.php rename to application/classes/Slot.php diff --git a/application/classes/sort.php b/application/classes/Sort.php similarity index 100% rename from application/classes/sort.php rename to application/classes/Sort.php diff --git a/application/classes/style.php b/application/classes/Style.php similarity index 100% rename from application/classes/style.php rename to application/classes/Style.php diff --git a/application/classes/systemmessage.php b/application/classes/SystemMessage.php similarity index 100% rename from application/classes/systemmessage.php rename to application/classes/SystemMessage.php diff --git a/application/classes/tsm.php b/application/classes/TSM.php similarity index 100% rename from application/classes/tsm.php rename to application/classes/TSM.php diff --git a/application/classes/TSM/ORM.php b/application/classes/TSM/ORM.php index 16724fb..b7d7d6d 100644 --- a/application/classes/TSM/ORM.php +++ b/application/classes/TSM/ORM.php @@ -35,7 +35,7 @@ abstract class TSM_ORM extends ORM { */ protected function _initialize() { // Set out DB connection configuration. - $this->_db_group = Kohana::$config->load('config.client_type'); + $this->_db_group = Kohana::$config->load('config')->client_type; // Adjustments for DSMADMC or DB2 connections if (array_key_exists($this->_db_group,$this->_tsm)) diff --git a/application/classes/valid.php b/application/classes/Valid.php similarity index 100% rename from application/classes/valid.php rename to application/classes/Valid.php diff --git a/application/classes/lnapp/block.php b/application/classes/lnApp/Block.php similarity index 100% rename from application/classes/lnapp/block.php rename to application/classes/lnApp/Block.php diff --git a/application/classes/lnapp/breadcrumb.php b/application/classes/lnApp/Breadcrumb.php similarity index 100% rename from application/classes/lnapp/breadcrumb.php rename to application/classes/lnApp/Breadcrumb.php diff --git a/application/classes/lnapp/config.php b/application/classes/lnApp/Config.php similarity index 100% rename from application/classes/lnapp/config.php rename to application/classes/lnApp/Config.php diff --git a/application/classes/lnapp/Controller/default.php b/application/classes/lnApp/Controller/Default.php similarity index 100% rename from application/classes/lnapp/Controller/default.php rename to application/classes/lnApp/Controller/Default.php diff --git a/application/classes/lnapp/Controller/login.php b/application/classes/lnApp/Controller/Login.php similarity index 100% rename from application/classes/lnapp/Controller/login.php rename to application/classes/lnApp/Controller/Login.php diff --git a/application/classes/lnapp/Controller/logout.php b/application/classes/lnApp/Controller/Logout.php similarity index 100% rename from application/classes/lnapp/Controller/logout.php rename to application/classes/lnApp/Controller/Logout.php diff --git a/application/classes/lnapp/Controller/Media.php b/application/classes/lnApp/Controller/Media.php similarity index 100% rename from application/classes/lnapp/Controller/Media.php rename to application/classes/lnApp/Controller/Media.php diff --git a/application/classes/lnapp/Controller/templatedefault.php b/application/classes/lnApp/Controller/TemplateDefault.php similarity index 99% rename from application/classes/lnapp/Controller/templatedefault.php rename to application/classes/lnApp/Controller/TemplateDefault.php index fdf71ac..e70d51e 100644 --- a/application/classes/lnapp/Controller/templatedefault.php +++ b/application/classes/lnApp/Controller/TemplateDefault.php @@ -121,7 +121,7 @@ abstract class lnApp_Controller_TemplateDefault extends Controller_Template { } // Bind our template meta variable - $this->meta = new meta; + $this->meta = new Meta; View::bind_global('meta',$this->meta); // Our default style sheet diff --git a/application/classes/lnapp/Controller/tree.php b/application/classes/lnApp/Controller/Tree.php similarity index 100% rename from application/classes/lnapp/Controller/tree.php rename to application/classes/lnApp/Controller/Tree.php diff --git a/application/classes/lnapp/html.php b/application/classes/lnApp/HTML.php similarity index 100% rename from application/classes/lnapp/html.php rename to application/classes/lnApp/HTML.php diff --git a/application/classes/lnapp/htmlrender.php b/application/classes/lnApp/HTMLRender.php similarity index 100% rename from application/classes/lnapp/htmlrender.php rename to application/classes/lnApp/HTMLRender.php diff --git a/application/classes/lnapp/headimages.php b/application/classes/lnApp/HeadImages.php similarity index 100% rename from application/classes/lnapp/headimages.php rename to application/classes/lnApp/HeadImages.php diff --git a/application/classes/lnapp/jpgraph.php b/application/classes/lnApp/JPGraph.php similarity index 100% rename from application/classes/lnapp/jpgraph.php rename to application/classes/lnApp/JPGraph.php diff --git a/application/classes/lnapp/jpgraph/gantt.php b/application/classes/lnApp/JPGraph/Gantt.php similarity index 98% rename from application/classes/lnapp/jpgraph/gantt.php rename to application/classes/lnApp/JPGraph/Gantt.php index af017e8..7f76b12 100644 --- a/application/classes/lnapp/jpgraph/gantt.php +++ b/application/classes/lnApp/JPGraph/Gantt.php @@ -67,7 +67,7 @@ class lnApp_JPGraph_Gantt extends JPGraph { // This will compile the gantt and output a URL that has the image public function draw($name) { // Sort our items by sort criteria. - sort::MAsort($this->_items,'sort,summary',0); + Sort::MAsort($this->_items,'sort,summary',0); $c = 0; $ls = ''; diff --git a/application/classes/lnapp/meta.php b/application/classes/lnApp/Meta.php similarity index 100% rename from application/classes/lnapp/meta.php rename to application/classes/lnApp/Meta.php diff --git a/application/classes/lnapp/script.php b/application/classes/lnApp/Script.php similarity index 100% rename from application/classes/lnapp/script.php rename to application/classes/lnApp/Script.php diff --git a/application/classes/lnapp/sort.php b/application/classes/lnApp/Sort.php similarity index 100% rename from application/classes/lnapp/sort.php rename to application/classes/lnApp/Sort.php diff --git a/application/classes/lnapp/style.php b/application/classes/lnApp/Style.php similarity index 100% rename from application/classes/lnapp/style.php rename to application/classes/lnApp/Style.php diff --git a/application/classes/lnapp/systemmessage.php b/application/classes/lnApp/SystemMessage.php similarity index 100% rename from application/classes/lnapp/systemmessage.php rename to application/classes/lnApp/SystemMessage.php