Skip to content
Snippets Groups Projects
Commit e99ee994 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

split project class into gui and non gui

parent 805c3713
No related branches found
No related tags found
1 merge request!61CI server - Split project class
...@@ -9,6 +9,10 @@ require_once 'user.class.php'; ...@@ -9,6 +9,10 @@ require_once 'user.class.php';
*/ */
class base { class base {
/**
* logged in user
* @var object
*/
var $oUser=false; var $oUser=false;
/** /**
......
This diff is collapsed.
This diff is collapsed.
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
###################################################################### */ ###################################################################### */
require_once 'base.class.php'; require_once 'base.class.php';
require_once 'project.class.php'; require_once 'project_gui.class.php';
/** /**
* class for project overview * class for project overview
...@@ -93,7 +93,7 @@ class projectlist extends base{ ...@@ -93,7 +93,7 @@ class projectlist extends base{
ksort($aProjectLabels); ksort($aProjectLabels);
foreach (array_values($aProjectLabels) as $sPrj) { foreach (array_values($aProjectLabels) as $sPrj) {
$oPrj = new project($sPrj); $oPrj = new projectgui($sPrj);
$sPrjFilter.='<option value="' . $sPrj . '">' . $oPrj->getLabel() . '</option>'; $sPrjFilter.='<option value="' . $sPrj . '">' . $oPrj->getLabel() . '</option>';
$sOutPhases = ''; $sOutPhases = '';
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
2013-11-08 Axel <axel.hahn@iml.unibe.ch> 2013-11-08 Axel <axel.hahn@iml.unibe.ch>
###################################################################### */ ###################################################################### */
require_once("./classes/project.class.php"); require_once("./classes/project_gui.class.php");
// --- Checks // --- Checks
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
if (array_key_exists("par3", $aParams)) { if (array_key_exists("par3", $aParams)) {
$sPhase = $aParams["par3"]; $sPhase = $aParams["par3"];
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
2013-11-08 Axel <axel.hahn@iml.unibe.ch> 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("./classes/formgen.class.php");
set_time_limit(0); set_time_limit(0);
// --- Checks // --- Checks
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
$sOut = ''; $sOut = '';
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
2014-03-24 Axel <axel.hahn@iml.unibe.ch> 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"); require_once("./classes/formgen.class.php");
$oPrj = new project($sPrj); $oPrj = new projectgui($sPrj);
$sOut = '<h3>' . t('page-delete-project-info') . '</h3>'; $sOut = '<h3>' . t('page-delete-project-info') . '</h3>';
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
2013-11-08 Axel <axel.hahn@iml.unibe.ch> 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("./classes/formgen.class.php");
require_once("./inc_functions.php"); require_once("./inc_functions.php");
// --- Checks // --- Checks
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
$sOut = ''; $sOut = '';
if (array_key_exists("par3", $aParams)) { if (array_key_exists("par3", $aParams)) {
......
...@@ -29,8 +29,8 @@ if (!array_key_exists("prj", $aParams)) { ...@@ -29,8 +29,8 @@ if (!array_key_exists("prj", $aParams)) {
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// overview of a single project // overview of a single project
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
require_once("./classes/project.class.php"); require_once("./classes/project_gui.class.php");
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
$iCountOfBranches=0; $iCountOfBranches=0;
$iCountOfBuildErrors=count($oPrj->getBuildErrors()); $iCountOfBuildErrors=count($oPrj->getBuildErrors());
......
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
2013-11-08 Axel <axel.hahn@iml.unibe.ch> 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("./inc_functions.php");
require_once("./classes/config-replacement.class.php"); require_once("./classes/config-replacement.class.php");
// --- Checks // --- Checks
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
$sOut = ''; $sOut = '';
if (isset($aParams["par3"])) { if (isset($aParams["par3"])) {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
2013-11-08 Axel <axel.hahn@iml.unibe.ch> 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("./inc_functions.php");
$sOut = ''; $sOut = '';
...@@ -37,8 +37,8 @@ $aMask=array( ...@@ -37,8 +37,8 @@ $aMask=array(
/** /**
* hide entries in config array * hide entries in config array
* @param type $aMask * @param array $aMask
* @param type $aConfig * @param array $aConfig
* @return type * @return type
*/ */
function maskEntries($aMask, $aConfig){ function maskEntries($aMask, $aConfig){
...@@ -196,7 +196,7 @@ if ($aParams["prj"] == "all") { ...@@ -196,7 +196,7 @@ if ($aParams["prj"] == "all") {
if ($aParams["par3"]=="new") { if ($aParams["par3"]=="new") {
$sOut.='<h2>'.t("page-setup-info-new-project").'</h2>' $sOut.='<h2>'.t("page-setup-info-new-project").'</h2>'
. '<p>'.t("page-setup-info-new-project-introtext").'</p><hr>'; . '<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") { if (array_key_exists("setupaction", $aParams) && $aParams["setupaction"] == "create") {
$sError = $oPrj->create($aParams["id"]); $sError = $oPrj->create($aParams["id"]);
...@@ -329,7 +329,7 @@ if ($aParams["prj"] == "all") { ...@@ -329,7 +329,7 @@ if ($aParams["prj"] == "all") {
// ------------------------------------------------------------ // ------------------------------------------------------------
// setup page of a an existing project // setup page of a an existing project
// ------------------------------------------------------------ // ------------------------------------------------------------
$oPrj = new project($aParams["prj"]); $oPrj = new projectgui($aParams["prj"]);
/* /*
$sOut.='<div style="float: right">' $sOut.='<div style="float: right">'
// . 'aParams:<pre>'.print_r($aParams, true).'</pre>' // . 'aParams:<pre>'.print_r($aParams, true).'</pre>'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment