Reorganised code layout

Separated class library and web interface code
Added a common config/database config to be referenced by all
subprojects

Fixed previous commit

.gitignore

@@ -2,6 +2,7 @@
 .buildpath
 .project
 .settings
-.htaccess
+/config.php
 /dbconfig.conf
-tmp/*
+/webui/.htaccess
+/webui/tmp/*

config.php.dist

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * HandBrakeCluster Library path
+ * 
+ * Specifies the absolute or relative path to the HandBrakeCluster library directory, relative to the webui root directory.
+ * Path must end with a trailing slash.
+ * 
+ * @var string
+ */
+define('HandBrakeCluster_Lib', '../lib/');
+
+/**
+ * HandBrakeCluster Database Configuration
+ * 
+ * Specifies the absolute or relative path to the HandBrakeCluster database configuration file. 
+ * This is a standard ini type file, containing the config required to connect to the database.
+ * 
+ * @var string
+ */
+define('HandBrakeCluster_DBConfig', '../dbconfig.conf');
+
+?>

dbconfig.conf.dist

@@ -0,0 +1,5 @@
+hostname = localhost
+username = handbrake
+password = handbrake
+dbname   = handbrake_cluster
+

htaccess.dist

@@ -1,3 +1,8 @@
+<Files dbconfig.conf>
+	Order Allow,Deny
+	Deny from all
+</Files>
+
 <IfModule mod_rewrite.c>
 
     RewriteEngine on

lib/HandBrakeCluster/Cache.class.php

@@ -9,8 +9,8 @@ class HandBrakeCluster_Cache {
         $this->config = $config;
         $this->cache_dir = $config->get('cache.base_dir');
         
-        if (is_dir($cache_dir)) {
+        if (is_dir($this->cache_dir)) {
-            if ( ! is_writeable($cache_dir)) {
+            if ( ! is_writeable($this->cache_dir)) {
                 throw new HandBrakeCluster_Exception_InvalidCacheDir();
             }
         } else {

lib/HandBrakeCluster/Job.class.php

@@ -52,7 +52,7 @@ class HandBrakeCluster_Job {
 
     public static function fromDatabaseRow($row) {
         return new HandBrakeCluster_Job(
-            HandBrakeCluster_Rips_Source::load($rips['source']),
+            HandBrakeCluster_Rips_Source::load($row['source']),
             $row['id'],
             $row['name'],
             $row['source'],

lib/HandBrakeCluster/Main.class.php

@@ -18,7 +18,7 @@ class HandBrakeCluster_Main {
     private function __construct() {
         $request_string = isset($_GET['l']) ? $_GET['l'] : '';
 
-        $this->config   = new HandBrakeCluster_Config("dbconfig.conf");
+        $this->config   = new HandBrakeCluster_Config(HandBrakeCluster_DBConfig);
         $this->database = new HandBrakeCluster_Database($this->config);
         $this->config->setDatabase($this->database);
 
@@ -126,12 +126,12 @@ class HandBrakeCluster_Main {
 
         // Special case: All exceptions are stored in the same file
         if (preg_match('/^HandBrakeCluster_Exception/', $classname)) {
-            require_once('HandBrakeCluster/Exceptions.class.php');
+            require_once(HandBrakeCluster_Lib . 'HandBrakeCluster/Exceptions.class.php');
             return;
         }
 
         // Replace any underscores with directory separators
-        $filename = preg_replace('/_/', '/', $classname);
+        $filename = HandBrakeCluster_Lib . preg_replace('/_/', '/', $classname);
 
         // Tack on the class file suffix
         $filename .= '.class.php';

webui/_inc.php

@@ -0,0 +1,6 @@
+<?php
+
+require_once '../config.php';
+require_once HandBrakeCluster_Lib . 'HandBrakeCluster/Main.class.php';
+
+?>

webui/index.php

@@ -1,6 +1,9 @@
 <?php
 
-require 'HandBrakeCluster/Main.class.php';
+define('HBCFile', 'index');
+
+require '_inc.php';
+
 try {
     $main = HandBrakeCluster_Main::instance();
     $smarty = $main->smarty();