Merge branch 'v2.0' into 'master'

CI server - Split project class

See merge request !61

public_html/deployment/classes/base.class.php

@@ -9,6 +9,10 @@ require_once 'user.class.php';
  */
 class base {
 
+    /**
+     * logged in user
+     * @var object
+     */
     var $oUser=false;
     
     /**

public_html/deployment/classes/projectlist.class.php

@@ -11,7 +11,7 @@
   ###################################################################### */
 
 require_once 'base.class.php';
-require_once 'project.class.php';
+require_once 'project_gui.class.php';
 
 /**
  * class for project overview
@@ -93,7 +93,7 @@ class projectlist extends base{
         ksort($aProjectLabels);
         
         foreach (array_values($aProjectLabels) as $sPrj) {
-            $oPrj = new project($sPrj);
+            $oPrj = new projectgui($sPrj);
             $sPrjFilter.='<option value="' . $sPrj . '">' . $oPrj->getLabel() . '</option>';
 
             $sOutPhases = '';

public_html/deployment/pages/act_accept.php

@@ -10,10 +10,10 @@
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 
 // --- Checks
-$oPrj = new project($aParams["prj"]);
+$oPrj = new projectgui($aParams["prj"]);
 
 if (array_key_exists("par3", $aParams)) {
     $sPhase = $aParams["par3"];

public_html/deployment/pages/act_build.php

@@ -12,12 +12,12 @@
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 require_once("./classes/formgen.class.php");
 set_time_limit(0);
 
 // --- Checks
-$oPrj = new project($aParams["prj"]);
+$oPrj = new projectgui($aParams["prj"]);
 
 $sOut = '';
 

public_html/deployment/pages/act_delete.php

@@ -13,10 +13,10 @@
   2014-03-24  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 require_once("./classes/formgen.class.php");
 
-$oPrj = new project($sPrj);
+$oPrj = new projectgui($sPrj);
 
 $sOut = '<h3>' . t('page-delete-project-info') . '</h3>';
 

public_html/deployment/pages/act_deploy.php

@@ -10,12 +10,12 @@
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 require_once("./classes/formgen.class.php");
 require_once("./inc_functions.php");
 
 // --- Checks
-$oPrj = new project($aParams["prj"]);
+$oPrj = new projectgui($aParams["prj"]);
 
 $sOut = '';
 if (array_key_exists("par3", $aParams)) {

public_html/deployment/pages/act_overview.php

@@ -29,8 +29,8 @@ if (!array_key_exists("prj", $aParams)) {
     // ----------------------------------------------------------------------
     // overview of a single project
     // ----------------------------------------------------------------------
-    require_once("./classes/project.class.php");
-    $oPrj = new project($aParams["prj"]);
+    require_once("./classes/project_gui.class.php");
+    $oPrj = new projectgui($aParams["prj"]);
     
     $iCountOfBranches=0;
     $iCountOfBuildErrors=count($oPrj->getBuildErrors());

public_html/deployment/pages/act_phase.php

@@ -11,13 +11,13 @@
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 require_once("./inc_functions.php");
 require_once("./classes/config-replacement.class.php");
 
 
 // --- Checks
-$oPrj = new project($aParams["prj"]);
+$oPrj = new projectgui($aParams["prj"]);
 
 $sOut = '';
 if (isset($aParams["par3"])) {

public_html/deployment/pages/act_setup.php

@@ -12,7 +12,7 @@
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
-require_once("./classes/project.class.php");
+require_once("./classes/project_gui.class.php");
 require_once("./inc_functions.php");
 $sOut = '';
 
@@ -37,8 +37,8 @@ $aMask=array(
 
 /**
  * hide entries in config array
- * @param type $aMask
- * @param type $aConfig
+ * @param array $aMask
+ * @param array $aConfig
  * @return type
  */
 function maskEntries($aMask, $aConfig){
@@ -196,7 +196,7 @@ if ($aParams["prj"] == "all") {
         if ($aParams["par3"]=="new") {
             $sOut.='<h2>'.t("page-setup-info-new-project").'</h2>'
                     . '<p>'.t("page-setup-info-new-project-introtext").'</p><hr>';
-            $oPrj = new project();
+            $oPrj = new projectgui();
 
             if (array_key_exists("setupaction", $aParams) && $aParams["setupaction"] == "create") {
                 $sError = $oPrj->create($aParams["id"]);
@@ -329,7 +329,7 @@ if ($aParams["prj"] == "all") {
     // ------------------------------------------------------------
     // setup page of a an existing project
     // ------------------------------------------------------------
-    $oPrj = new project($aParams["prj"]);
+    $oPrj = new projectgui($aParams["prj"]);
     /*
     $sOut.='<div style="float: right">'
                 // . 'aParams:<pre>'.print_r($aParams, true).'</pre>'