feat(setup) Delete setup main.inc

Not directly related but we might as well clean this one up at the same time.

issue #5951

html/setup.php

@@ -101,8 +101,7 @@ IconTheme::loadThemes('themes');
 /* Fake user bypassing acl system */
 $ui = new userinfoNoAuth('setup');
 /* Call setup */
-$display = "";
-require_once("../setup/main.inc");
+setup::mainInc();
 
 $focus = '<script type="text/javascript">';
 $focus .= 'next_msg_dialog();';

setup/class_setup.inc

@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2019  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -292,5 +292,24 @@ class setup
       $this->o_steps[$this->i_config]->is_completed = $completed;
     }
   }
+
+  static function mainInc()
+  {
+    global $setup, $display;
+
+    $display = '';
+
+    /* Create a new setup class if necessary  */
+    if (!session::is_set('setup') || (isset($_GET['reset']) && ($_GET['reset'] == 1))) {
+      session::set('setup', new setup());
+    }
+    $setup = session::get('setup');
+
+    /* Execute formular */
+    $setup->save_object();
+    $display = $setup->execute();
+
+    /* Store changes  in session */
+    session::set('setup', $setup);
+  }
 }
-?>

setup/main.inc

-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-/* Create a new setup class if necessary  */
-if (!session::is_set('setup') || (isset($_GET['reset']) && $_GET['reset'] == 1)) {
-  session::set('setup', new setup());
-}
-$setup = session::get('setup');
-
-/* Execute formular */
-$setup->save_object();
-$display = $setup->execute();
-
-/* Store changes  in session */
-session::set('setup', $setup);
-
-?>