issue96, move config check to phpfspot main class

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

1 files changed, 1 insertions, 78 deletions

diff --git a/phpfspot_cfg.php.dist b/phpfspot_cfg.php.dist
index b08c123..93aaff4 100644
--- a/phpfspot_cfg.php.dist
+++ b/phpfspot_cfg.php.dist
@@ -95,86 +95,9 @@ class PHPFSPOT_CFG {
 
    public function __construct()
    {
-      if(!isset($this->page_title) || $this->page_title == "")
-         $this->showError("Please set \$page_title in phpfspot_cfg");
-   
-      if(!isset($this->base_path) || $this->base_path == "")
-         $this->showError("Please set \$base_path in phpfspot_cfg");
-
-      if(!isset($this->web_path) || $this->web_path == "")
-         $this->showError("Please set \$web_path in phpfspot_cfg");
-
-      if(!isset($this->thumb_path) || $this->thumb_path == "")
-         $this->showError("Please set \$thumb_path in phpfspot_cfg");
-
-      if(!isset($this->smarty_path) || $this->smarty_path == "")
-         $this->showError("Please set \$smarty_path in phpfspot_cfg");
-
-      if(!isset($this->fspot_db) || $this->fspot_db == "")
-         $this->showError("Please set \$fspot_db in phpfspot_cfg");
-
-      if(!isset($this->db_access) || $this->db_access == "")
-         $this->showError("Please set \$db_access in phpfspot_cfg");
-
-      if(!isset($this->phpfspot_db) || $this->phpfspot_db == "")
-         $this->showError("Please set \$phpfspot_db in phpfspot_cfg");
-
-      if(!isset($this->thumb_width) || $this->thumb_width == "")
-         $this->showError("Please set \$thumb_width in phpfspot_cfg");
-
-      if(!isset($this->thumb_height) || $this->thumb_height == "")
-         $this->showError("Please set \$thumb_height in phpfspot_cfg");
-
-      if(!isset($this->photo_width) || $this->photo_width == "")
-         $this->showError("Please set \$photo_width in phpfspot_cfg");
-
-      if(!isset($this->mini_width) || $this->mini_width == "")
-         $this->showError("Please set \$mini_width in phpfspot_cfg");
-
-      if(!isset($this->thumbs_per_page))
-         $this->showError("Please set \$thumbs_per_page in phpfspot_cfg");
-
-      if(!isset($this->path_replace_from) || $this->path_replace_from == "")
-         $this->showError("Please set \$path_replace_from in phpfspot_cfg");
-
-      if(!isset($this->path_replace_to) || $this->path_replace_to == "")
-         $this->showError("Please set \$path_replace_to in phpfspot_cfg");
-
-      if(!isset($this->hide_tags))
-         $this->showError("Please set \$hide_tags in phpfspot_cfg");
-
-      if(!isset($this->theme_name))
-         $this->showError("Please set \$theme_name in phpfspot_cfg");
-
-      if(!isset($this->logging))
-         $this->showError("Please set \$logging in phpfspot_cfg");
-
-      if(isset($this->logging) && $this->logging == 'logfile') {
-
-         if(!isset($this->log_file))
-            $this->showError("Please set \$log_file because you set logging = log_file in phpfspot_cfg");
-
-         if(!is_writeable($this->log_file))
-            $this->showError("The specified \$log_file ". $log_file ." is not writeable!");
-
-      }
-
-      if(isset($this->error_found) && $this->error_found)
-         exit(1);
-
-      /* check for pending slash on web_path */
-      if(!preg_match("/\/$/", $this->web_path))
-         $this->web_path.= "/";
 
    } // __construct()
 
-   private function showError($text)
-   {
-      print $text ."<br />\n";
-      $this->error_found = 1;
-
-   } // showError()
-
-}
+} // class PHPFSPOT_CFG
 
 ?>