From b0cbbd4d587859e562b8b4b35d8040e04799112c Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 23 Nov 2006 06:52:22 +0000
Subject: [PATCH] Part 2 of changing file names to match class names

---
 campcaster/src/modules/alib/var/Alib.php             |  4 +---
 campcaster/src/modules/alib/var/ObjClasses.php       |  2 +-
 campcaster/src/modules/alib/var/Subjects.php         |  2 +-
 campcaster/src/modules/alib/var/example/alib_h.php   |  6 +++---
 campcaster/src/modules/alib/var/install/install.php  | 12 +++++++-----
 .../src/modules/alib/var/install/uninstall.php       | 12 +++++++-----
 campcaster/src/modules/alib/var/m2treeTest.php       |  4 ++--
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/campcaster/src/modules/alib/var/Alib.php b/campcaster/src/modules/alib/var/Alib.php
index 4cc02b25b..a299ec0b4 100644
--- a/campcaster/src/modules/alib/var/Alib.php
+++ b/campcaster/src/modules/alib/var/Alib.php
@@ -1,13 +1,11 @@
 <?php
-require_once 'subj.php';
+require_once('Subjects.php');
 
 define('USE_ALIB_CLASSES', TRUE);
 define('ALIBERR_NOTLOGGED', 30);
 define('ALIBERR_NOTEXISTS', 31);
 
 /**
- * Alib class
- *
  * Authentication/authorization class
  *
  * @author Tomas Hlava <th@red2head.com>
diff --git a/campcaster/src/modules/alib/var/ObjClasses.php b/campcaster/src/modules/alib/var/ObjClasses.php
index 75dd08fb5..add9261c5 100644
--- a/campcaster/src/modules/alib/var/ObjClasses.php
+++ b/campcaster/src/modules/alib/var/ObjClasses.php
@@ -1,5 +1,5 @@
 <?php
-require_once "m2tree.php";
+require_once("M2tree.php");
 
 /**
  * ObjClass class
diff --git a/campcaster/src/modules/alib/var/Subjects.php b/campcaster/src/modules/alib/var/Subjects.php
index 5bf68ad49..b97b03dae 100644
--- a/campcaster/src/modules/alib/var/Subjects.php
+++ b/campcaster/src/modules/alib/var/Subjects.php
@@ -1,5 +1,5 @@
 <?php
-require_once("class.php");
+require_once("ObjClasses.php");
 define('ALIBERR_NOTGR', 20);
 define('ALIBERR_BADSMEMB', 21);
 
diff --git a/campcaster/src/modules/alib/var/example/alib_h.php b/campcaster/src/modules/alib/var/example/alib_h.php
index 623d54ff9..bbc3dbe94 100644
--- a/campcaster/src/modules/alib/var/example/alib_h.php
+++ b/campcaster/src/modules/alib/var/example/alib_h.php
@@ -3,9 +3,9 @@
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Pragma: no-cache");
 session_start();
-require_once 'conf.php';
-require_once 'DB.php';
-require_once '../alib.php';
+require_once('conf.php');
+require_once('DB.php');
+require_once('../Alib.php');
 
 #PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 #PEAR::setErrorHandling(PEAR_ERROR_PRINT, "%s<hr>\n");
diff --git a/campcaster/src/modules/alib/var/install/install.php b/campcaster/src/modules/alib/var/install/install.php
index 7982c15fe..a342316d3 100644
--- a/campcaster/src/modules/alib/var/install/install.php
+++ b/campcaster/src/modules/alib/var/install/install.php
@@ -3,13 +3,15 @@
  * @author $Author$
  * @version  $Revision$
  */
-require_once '../example/conf.php';
-require_once 'DB.php';
-require_once '../alib.php';
+require_once('../example/conf.php');
+require_once('DB.php');
+require_once('../Alib.php');
 
 function errCallback($err)
 {
-    if(assert_options(ASSERT_ACTIVE)==1) return;
+    if (assert_options(ASSERT_ACTIVE)==1) {
+    	return;
+    }
     echo "ERROR:\n";
     echo "request: "; print_r($_REQUEST);
     echo "gm:\n".$err->getMessage()."\ndi:\n".$err->getDebugInfo()."\nui:\n".$err->getUserInfo()."\n</pre>\n";
@@ -18,7 +20,7 @@ function errCallback($err)
 
 
 $dbc = DB::connect($config['dsn'], TRUE);
-if(PEAR::isError($dbc)){
+if (PEAR::isError($dbc)) {
     echo "Database connection problem.\n";
     echo "Check if database '{$config['dsn']['database']}' exists with corresponding permissions.\n";
     echo "Database access is defined by 'dsn' values in conf.php.\n";
diff --git a/campcaster/src/modules/alib/var/install/uninstall.php b/campcaster/src/modules/alib/var/install/uninstall.php
index 2b0c55f6a..b4a5e1789 100644
--- a/campcaster/src/modules/alib/var/install/uninstall.php
+++ b/campcaster/src/modules/alib/var/install/uninstall.php
@@ -3,13 +3,15 @@
  * @author $Author$
  * @version  $Revision$
  */
-require_once '../example/conf.php';
-require_once 'DB.php';
-require_once '../alib.php';
+require_once('../example/conf.php');
+require_once('DB.php');
+require_once('../Alib.php');
 
 function errCallback($err)
 {
-    if(assert_options(ASSERT_ACTIVE)==1) return;
+    if (assert_options(ASSERT_ACTIVE)==1) {
+    	return;
+    }
     echo "ERROR:\n";
     echo "request: "; print_r($_REQUEST);
     echo "gm:\n".$err->getMessage()."\ndi:\n".$err->getDebugInfo()."\nui:\n".$err->getUserInfo()."\n</pre>\n";
@@ -18,7 +20,7 @@ function errCallback($err)
 
 
 $dbc = DB::connect($config['dsn'], TRUE);
-if(PEAR::isError($dbc)){
+if (PEAR::isError($dbc)) {
     echo "Database connection problem.\n";
     echo "Check if database '{$config['dsn']['database']}' exists with corresponding permissions.\n";
     echo "Database access is defined by 'dsn' values in conf.php.\n";
diff --git a/campcaster/src/modules/alib/var/m2treeTest.php b/campcaster/src/modules/alib/var/m2treeTest.php
index e57755b61..7c93d7add 100644
--- a/campcaster/src/modules/alib/var/m2treeTest.php
+++ b/campcaster/src/modules/alib/var/m2treeTest.php
@@ -1,7 +1,7 @@
 <?php
-require_once"m2tree.php";
+require_once("M2tree.php");
 
-class M2treeTest extends M2tree{
+class M2treeTest extends M2tree {
     function _test_init()
     {
         for($i=1; $i<=3; $i++){