DB-Lib erweitert

diff --git a/domainverwaltung-web/web/lib/database_functions.php b/domainverwaltung-web/web/lib/database_functions.php
index 224b1c5a720427b6cf2ed66f0f235756b118b9f4..d5c0b99a181d00247063eb1b45c3e593703ae198 100644 (file)
--- a/domainverwaltung-web/web/lib/database_functions.php
+++ b/domainverwaltung-web/web/lib/database_functions.php
@@ -2,6 +2,8 @@
 
 if (DB_TYPE == "mysql") {
        require ("db/database_functions_mysql.php");
 
 if (DB_TYPE == "mysql") {
        require ("db/database_functions_mysql.php");

+} elseif (DB_TYPE == "pgsql") {
+    require ("db/database_functions_pgsql.php");

 }
 
 require ("db/database_functions_insert.php");
 }
 
 require ("db/database_functions_insert.php");


@@ -9,4 +11,117 @@ require ("db/database_functions_select.php");
 require ("db/database_functions_update.php");
 require ("db/database_functions_delete.php");
 
 require ("db/database_functions_update.php");
 require ("db/database_functions_delete.php");
 

+$selectFromViewTodoShortOverview = "SELECT * FROM ticket.view_todo_short_overview;";
+
+$selectFromDtStatus = "SELECT * FROM ticket.dt_status;";
+
+$selectFromDtUser = "SELECT * FROM ticket.dt_user;";
+
+$selectFromDtUserWithNames = "SELECT id, name_user FROM ticket.dt_user;";
+
+$selectFromDtProject = "SELECT * FROM ticket.dt_project;";
+
+$selectFromDtDomain = "SELECT * FROM ticket.dt_domain;";
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getProjectNameOfIssue($connect_dbms_handle, $id) {
+    
+    $project = "";
+    
+    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
+    if ($fk_project[0][0] != null ) {
+        $project_arr = getData($connect_dbms_handle, generateSelect(array("name_project"), "ticket.dt_project", array("id=".$fk_project[0][0]), null));
+        $project = $project_arr[0][0];
+    }
+    return $project;
+}
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getDomainIdOfIssue($connect_dbms_handle, $id) {
+    
+    $fk_domain = getData($connect_dbms_handle, generateSelect(array("fk_domain"), "ticket.dt_issue", array("id=".$id), null));
+    if ($fk_domain[0][0] == null ) {
+        return 0;
+    }
+    return $fk_domain[0][0];
+}
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getProjectIdOfIssue($connect_dbms_handle, $id) {
+    
+    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
+    if ($fk_project[0][0] == null ) {
+        return 0;
+    }
+    return $fk_project[0][0];
+}
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getIssueOfProject($connect_dbms_handle, $project) {
+    
+    $where_clause = "";
+    
+    $issue_ids = getData($connect_dbms_handle, generateSelect(array("id"), "ticket.dt_issue", array("fk_project=".$project), null));
+    if ($issue_ids[0][0] == null ) {
+        return 0;
+    } else {
+        //var_dump($issue_ids);
+        foreach ($issue_ids as $issue_id) {
+            $where_clause .= $issue_id[0].", ";
+        }
+        $where_clause = "id in (".substr($where_clause, 0, strlen($where_clause)-2).")";
+        $issues = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
+        
+    }
+    return $issues;
+}
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getIssueOfDomain($connect_dbms_handle, $domain) {
+    
+    $where_clause = "";
+    
+    $issue_ids = getData($connect_dbms_handle, generateSelect(array("id"), "ticket.dt_issue", array("fk_domain=".$domain), null));
+    if ($issue_ids[0][0] == null ) {
+        return 0;
+    } else {
+        //var_dump($issue_ids);
+        foreach ($issue_ids as $issue_id) {
+            $where_clause .= $issue_id[0].", ";
+        }
+        $where_clause = "id in (".substr($where_clause, 0, strlen($where_clause)-2).")";
+        $issues = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
+        
+    }
+    return $issues;
+}
+
+/**
+ * @param connect_dbms_handle
+ * @param id
+ */
+function getAssigneeIdOfIssue($connect_dbms_handle, $id) {
+    
+    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_assignee"), "ticket.dt_issue", array("id=".$id), null));
+    if ($fk_project[0][0] == null ) {
+        return 0;
+    }
+    return $fk_project[0][0];
+}
+

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file

diff --git a/domainverwaltung-web/web/lib/db/database_functions_insert.php b/domainverwaltung-web/web/lib/db/database_functions_insert.php
index 4e9005620d8fcb1b858302098e2b376dd7182b25..2dd4fa1bc888904b915a62343206ed9edbc74e5c 100644 (file)
--- a/domainverwaltung-web/web/lib/db/database_functions_insert.php
+++ b/domainverwaltung-web/web/lib/db/database_functions_insert.php
@@ -2,20 +2,37 @@
 
 
 function generateInsertSchema($schema, $table, $values) {
 
 
 function generateInsertSchema($schema, $table, $values) {

-       $insert_str = "INSERT INTO ".$schema.".".$table." VALUES (";
-
-       //print_r($values);
-       $anzValues = count($values);
-       for ($i = 0 ; $i < $anzValues; $i++) {
-               $insert_str .= $values[$i];
-               if ($i < $anzValues-1) {
-                       $insert_str .= ", ";
-               }
-       }
+    $insert_str = "INSERT INTO ".$schema.".".$table." VALUES (";
+    
+    //print_r($values);
+    $anzValues = count($values);
+    for ($i = 0 ; $i < $anzValues; $i++) {
+        $insert_str .= $values[$i];
+        if ($i < ($anzValues-1)) {
+            $insert_str .= ", ";
+        }
+    }
+    
+    $insert_str .= ");";
+    //echo debugPrint($insert_str);
+    return $insert_str;
+}

 
 

-       $insert_str .= ");";
-       //echo debugPrint($insert_str);
-       return $insert_str;
+function generateInsertSchemaReturn($schema, $table, $values, $return) {
+    $insert_str = "INSERT INTO ".$schema.".".$table." VALUES (";
+    
+    //print_r($values);
+    $anzValues = count($values);
+    for ($i = 0 ; $i < $anzValues; $i++) {
+        $insert_str .= $values[$i];
+        if ($i < ($anzValues-1)) {
+            $insert_str .= ", ";
+        }
+    }
+    
+    $insert_str .= ") ".$return.";";
+    //echo debugPrint($insert_str);
+    return $insert_str;

 }
 
 function generateInsert($table, $values) {
 }
 
 function generateInsert($table, $values) {

diff --git a/domainverwaltung-web/web/lib/db/database_functions_pgsql.php b/domainverwaltung-web/web/lib/db/database_functions_pgsql.php
index 7eb2a35e46ccbf0f56f746a6c58a87539d53f950..9d584c7d80712619d414eb2c6f2f328603e66554 100644 (file)
--- a/domainverwaltung-web/web/lib/db/database_functions_pgsql.php
+++ b/domainverwaltung-web/web/lib/db/database_functions_pgsql.php
@@ -4,9 +4,9 @@
  * Mit PostgresSQL verbinden */
 function getDBConnection() {
 
  * Mit PostgresSQL verbinden */
 function getDBConnection() {
 

-       $str_connection = "host=".HOST." db=".DB." user=".USER." pass=".PASS;
+       $str_connection = "host=".HOST." port=5432 dbname=".DB." user=".USER." password=".PASS." ";

        // mit DB verbinden
        // mit DB verbinden

-       $connect_dbms_handle = @pg_connect($str_connection) or die('Verbindungsaufbau fehlgeschlagen: ');
+       $connect_dbms_handle = @pg_connect($str_connection) or die('Verbindungsaufbau fehlgeschlagen: ' . pg_last_error());

 
        if ($connect_dbms_handle) {
                return $connect_dbms_handle;
 
        if ($connect_dbms_handle) {
                return $connect_dbms_handle;


@@ -56,10 +56,10 @@ function getData ($dbms_connection, $db_query) {
 
        // DB Abfage starten
        //echo $db_query;
 
        // DB Abfage starten
        //echo $db_query;

-       $res_sql_result = pg_query ($db_query, $dbms_connection);
+       $res_sql_result = pg_query ($dbms_connection, $db_query);

        // Gültigkeit der DB Abfage testen
        if ($res_sql_result) {
        // Gültigkeit der DB Abfage testen
        if ($res_sql_result) {

-               //echo "<li>".$res_sql_result;
+               //echo "<p>".$res_sql_result."</p>";

                while ($arr_sql_data = pg_fetch_row($res_sql_result)) {
                        //echo debugPrint($arr_sql_data);
                        array_push ($return_arr_data, $arr_sql_data);
                while ($arr_sql_data = pg_fetch_row($res_sql_result)) {
                        //echo debugPrint($arr_sql_data);
                        array_push ($return_arr_data, $arr_sql_data);

diff --git a/domainverwaltung-web/web/lib/db/database_functions_select.php b/domainverwaltung-web/web/lib/db/database_functions_select.php
index d118a5c09cbc41789b1c97874816272ba8b0fe15..2f65c4607e7a6768a8d4cfd7803eed8eb0133225 100644 (file)
--- a/domainverwaltung-web/web/lib/db/database_functions_select.php
+++ b/domainverwaltung-web/web/lib/db/database_functions_select.php
@@ -1,19 +1,46 @@
 <?php
 <?php

+function generateSelect ($selectedFields, $table) {
+       $select_str = "SELECT ";
+       
+       if (is_array($selectedFields)) {
+               //print_r($selectedFields);
+       $anzFields = count($selectedFields);
+       for ($i = 0 ; $i < $anzFields; $i++) {
+               $select_str .= $selectedFields[$i];
+               if ($i < $anzFields-1) {
+                       $select_str .= ", ";
+               }
+       }
+       } else {
+           $select_str .= "*";
+       }
+       
+       $select_str .= " FROM ".SCHEMA.".".$table;
+       
+       $select_str .= ";";
+
+       //echo $select_str;
+       return $select_str;
+}

 
 
 
 

-function generateSelect ($selectedFields, $table, $whereClause, $orderClause) {
+function generateSelectWhereOrder ($selectedFields, $table, $whereClause, $orderClause) {

        $select_str = "SELECT ";
 
        $select_str = "SELECT ";
 

-       //print_r($selectedFields);
-       $anzFields = count($selectedFields);
-       for ($i = 0 ; $i < $anzFields; $i++) {
-               $select_str .= $selectedFields[$i];
-               if ($i < $anzFields-1) {
-                       $select_str .= ", ";
-               }
+       if (is_array($selectedFields)) {
+           //print_r($selectedFields);
+       $anzFields = count($selectedFields);
+       for ($i = 0 ; $i < $anzFields; $i++) {
+               $select_str .= $selectedFields[$i];
+               if ($i < $anzFields-1) {
+                       $select_str .= ", ";
+               }
+       }
+       } else {
+           $select_str .= "*";

        }
 
        }
 

-       $select_str .= " FROM ".$table;
+       $select_str .= " FROM ".SCHEMA.".".$table;

 
        if ($whereClause != null) {
                $select_str .= " WHERE ";
 
        if ($whereClause != null) {
                $select_str .= " WHERE ";


@@ -42,7 +69,8 @@ function generateSelect ($selectedFields, $table, $whereClause, $orderClause) {
        }
 
        $select_str .= ";";
        }
 
        $select_str .= ";";

-       //echo debugPrint($select_str);
+
+       //echo $select_str;

        return $select_str;
 }
 
        return $select_str;
 }
 

diff --git a/domainverwaltung-web/web/lib/db/database_functions_update.php b/domainverwaltung-web/web/lib/db/database_functions_update.php
index dc10d563346f39f58a736ed6bf9960cb11622d4e..8f0d2fc8725b61361ec608a31e0245fda5a17a97 100644 (file)
--- a/domainverwaltung-web/web/lib/db/database_functions_update.php
+++ b/domainverwaltung-web/web/lib/db/database_functions_update.php
@@ -1,4 +1,35 @@
 <?php
 
 <?php
 

-
+function generateUpdateSchema($schema, $table, $values, $whereClause) {
+    $update_str = "UPDATE ".$schema.".".$table." SET ";
+    
+    //print_r($values);
+    $anzValues = count($values);
+    for ($i = 0 ; $i < $anzValues; $i++) {
+        $update_str .= $values[$i][0];
+        $update_str .= " = ";
+        $update_str .= $values[$i][1];
+        if ($i < ($anzValues-1)) {
+            $update_str .= ", ";
+        }
+    }
+    
+    if ($whereClause != null) {
+        $update_str .= " WHERE ";
+        
+        //print_r($whereClause);
+        $anzWheres = count($whereClause);
+        for ($i = 0 ; $i < $anzWheres; $i++) {
+            $update_str .= $whereClause[$i];
+            if ($i < $anzWheres-1) {
+                $update_str .= " AND ";
+            }
+        }
+    }
+    
+    
+    $update_str .= ";";
+    //echo debugPrint($update_str);
+    return $update_str;
+}

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file

diff --git a/domainverwaltung-web/web/lib/gui/gui_functions_button.php b/domainverwaltung-web/web/lib/gui/gui_functions_button.php
index 383c18d4e9910b091e8cc716442921ca966fe888..20ae213a10a1c151e3b9e3d5dc5c9f5d18a650c8 100644 (file)
--- a/domainverwaltung-web/web/lib/gui/gui_functions_button.php
+++ b/domainverwaltung-web/web/lib/gui/gui_functions_button.php
@@ -34,12 +34,14 @@ function makeButton($ref_button_name, $ref_value_button, $ref_html_button, $ref_
                echo "\n";
        }
 
                echo "\n";
        }
 

+       $str_id = $ref_id == null ? " " : " id=\"".$ref_id."\" ";

        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";
        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";

+       $str_tabindex = $ref_tabindex == null ? " " : " tabindex=\"".$ref_tabindex."\" ";

        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 
        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 

-       echo "<button id=\"".$ref_id."\"".$str_class."name=\"".$ref_button_name."\" type=\"".$ref_type."\" tabindex=\"".$ref_tabindex."\" ";
+       echo "<button ".$str_id.$str_class.$str_tabindex."name=\"".$ref_button_name."\" type=\"".$ref_type."\" ";

        if ($ref_value_button != null) {
                echo " value=\"".$ref_value_button."\"";
        }
        if ($ref_value_button != null) {
                echo " value=\"".$ref_value_button."\"";
        }

diff --git a/domainverwaltung-web/web/lib/gui/gui_functions_input.php b/domainverwaltung-web/web/lib/gui/gui_functions_input.php
index 45c4d88eaa8a652e639ee8dcf88595541c89570d..0777c68aa6d7edc6c26aea929ea44b59b2550833 100644 (file)
--- a/domainverwaltung-web/web/lib/gui/gui_functions_input.php
+++ b/domainverwaltung-web/web/lib/gui/gui_functions_input.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-/** $ref_input_name                 Name des <input>
+/** $ref_name                       Name des <input>

  *  $ref_value_input                Daten; null möglich
  *  $ref_id                         Id des <input>
  *  $ref_class                      Class des <input>; null möglich
  *  $ref_value_input                Daten; null möglich
  *  $ref_id                         Id des <input>
  *  $ref_class                      Class des <input>; null möglich


@@ -17,7 +17,7 @@
  *  $ref_newline_flag               true, wenn <label> ueber <input> stehen soll
  *  $ref_intend                     Anz. Tabs einrücken
  * */
  *  $ref_newline_flag               true, wenn <label> ueber <input> stehen soll
  *  $ref_intend                     Anz. Tabs einrücken
  * */

-function makeInput($ref_input_name, $ref_value_input, $ref_id, $ref_class, $ref_tabindex, $ref_type, $ref_size, $ref_maxlength, $ref_javascript, $ref_mandantory, $ref_labeltitle, $ref_p_flag, $ref_newline_flag, $ref_intend) {
+function makeInput($ref_name, $ref_value_input, $ref_id, $ref_class, $ref_tabindex, $ref_type, $ref_size, $ref_maxlength, $ref_javascript, $ref_mandantory, $ref_labeltitle, $ref_p_flag, $ref_newline_flag, $ref_intend) {

 
        $intend = make_intend_str($ref_intend);
 
 
        $intend = make_intend_str($ref_intend);
 


@@ -33,21 +33,26 @@ function makeInput($ref_input_name, $ref_value_input, $ref_id, $ref_class, $ref_
        }
        
        if ($ref_labeltitle != null) {
        }
        
        if ($ref_labeltitle != null) {

-               echo "<label for=\"".$ref_input_name."\">".$ref_labeltitle."</label>";
+               echo "<label for=\"".$ref_name."\">".$ref_labeltitle."</label>";

                if ($ref_newline_flag) {
                        echo "<br />";
                }
                echo "\n";
        }
 
                if ($ref_newline_flag) {
                        echo "<br />";
                }
                echo "\n";
        }
 

+       $str_id = $ref_id == null ? " " : " id=\"".$ref_id."\" ";

        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";
        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";

+       $str_tabindex = $ref_tabindex == null ? " " : " tabindex=\"".$ref_tabindex."\" ";

        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 
        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 

-       echo "<input id=\"".$ref_id."\"".$str_class."name=\"".$ref_input_name."\" type=\"".$ref_type."\" size=\"".$ref_size."\" maxlength=\"".$ref_maxlength."\" tabindex=\"".$ref_tabindex."\" ";
-       if ($ref_value_input != null) {
-               echo " value=\"".$ref_value_input."\"";
+       echo "<input ".$str_id.$str_class.$str_tabindex.$str_javascript."name=\"".$ref_name."\" type=\"".$ref_type."\" size=\"".$ref_size."\" maxlength=\"".$ref_maxlength."\" ";
+
+       if (isset($_POST[$ref_name]) && strlen($_POST[$ref_name]) > 0) {
+           echo " value=\"".$_POST[$ref_name]."\"";
+       } else if ($ref_value_input != null ){
+           echo " value=\"".$ref_value_input."\"";

        }
        echo "/>\n";
 
        }
        echo "/>\n";
 

diff --git a/domainverwaltung-web/web/lib/gui/gui_functions_select.php b/domainverwaltung-web/web/lib/gui/gui_functions_select.php
index 404a90b2e0439288406d4af40f6e391b3bd86646..6a6c2485e321443cac7abf19c885488428551a74 100644 (file)
--- a/domainverwaltung-web/web/lib/gui/gui_functions_select.php
+++ b/domainverwaltung-web/web/lib/gui/gui_functions_select.php
@@ -42,12 +42,14 @@ function makeSelect($ref_select_name, $ref_value_array, $ref_id, $ref_class, $re
                echo "\n";
        }
 
                echo "\n";
        }
 

+       $str_id = $ref_id == null ? " " : " id=\"".$ref_id."\" ";

        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";
        $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";

+       $str_tabindex = $ref_tabindex == null ? " " : " tabindex=\"".$ref_tabindex."\" ";

        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 
        $str_javascript = $ref_javascript == null ? " " : " onchange=\"".$ref_javascript."\" ";
 
        echo $intend."\t";
 

-       echo "<select id=\"".$ref_id."\"".$str_class."name=\"".$ref_select_name."\" size=\"".$ref_int_size."\" tabindex=\"".$ref_tabindex."\" ";
+       echo "<select ".$str_id.$str_class.$str_tabindex.$str_javascript."name=\"".$ref_select_name."\" size=\"".$ref_int_size."\" "." ";

        if ($ref_multiple == true) {
                echo "multiple=\"multiple\" ";
        }
        if ($ref_multiple == true) {
                echo "multiple=\"multiple\" ";
        }


@@ -61,7 +63,7 @@ function makeSelect($ref_select_name, $ref_value_array, $ref_id, $ref_class, $re
                for ($i=0; $i<count($ref_value_array); $i++) {
                        echo $intend;
                        echo "\t\t<option value=\"".($multiDimensionalArrayFlag ? $ref_value_array[$i][0] : $i)."\"";
                for ($i=0; $i<count($ref_value_array); $i++) {
                        echo $intend;
                        echo "\t\t<option value=\"".($multiDimensionalArrayFlag ? $ref_value_array[$i][0] : $i)."\"";

-                       if ($i == $ref_int_preselect) {
+                       if (($multiDimensionalArrayFlag ? $ref_value_array[$i][0] : ($i+1)) == $ref_int_preselect) { // $i-1 deshalb, weil das Array mit dem 0-ten Element beginnt, der Value aber mit 1 anfängt

                                echo " selected";
                        }
                        echo ">".($multiDimensionalArrayFlag ? $ref_value_array[$i][1] : $ref_value_array[$i])."</option>\n";
                                echo " selected";
                        }
                        echo ">".($multiDimensionalArrayFlag ? $ref_value_array[$i][1] : $ref_value_array[$i])."</option>\n";

diff --git a/domainverwaltung-web/web/lib/gui/gui_functions_textarea.php b/domainverwaltung-web/web/lib/gui/gui_functions_textarea.php
index a491700c612d4037ebcfb0c5635877db7865c4b7..f733cac36d2471991deb859fcbd9af68e87edc3c 100644 (file)
--- a/domainverwaltung-web/web/lib/gui/gui_functions_textarea.php
+++ b/domainverwaltung-web/web/lib/gui/gui_functions_textarea.php
@@ -1,25 +1,66 @@
 <?php
 
 
 <?php
 
 

-function make_textarea($ref_name, $ref_type, $ref_cols, $ref_rows, $ref_tabindex, $ref_id, $ref_labeltitle, $ref_class, $ref_classerrorextension, $ref_error_label, $ref_mandantory, $ref_intend, $ref_p_flag) {
+/**
+ *  $ref_name                        Name der <trxtarea>
+ *  $ref_value_input                Daten; null möglich
+ *  $ref_id                         Id des <input>
+ *  $ref_class                      Class des <input>; null möglich
+ *  $ref_tabindex                   Tabindex in der <form>
+ * 
+ * @param unknown $ref_classerrorextension
+ * @param unknown $ref_error_label
+ * @param unknown $ref_cols
+ * @param unknown $ref_rows
+ * 
+ *  $ref_javascript                 Javascript; null möglich
+ * 
+ *  $ref_mandantory                 Pflichtfeldmarkierung; null möglich
+ *  $ref_labeltitle                 <label>-Text; null möglich
+ *  $ref_p_flag                     true, wenn alles in <p> soll
+ *  $ref_newline_flag               true, wenn <label> ueber <input> stehen soll
+ *  $ref_intend                     Anz. Tabs einrücken
+ */
+function makeTextarea($ref_name, $ref_value_input, $ref_id, $ref_class, $ref_tabindex, $ref_classerrorextension, $ref_error_label, $ref_cols, $ref_rows, $ref_javascript, $ref_mandantory, $ref_labeltitle, $ref_p_flag, $ref_newline_flag, $ref_intend) {

 
        if ($ref_p_flag) {
                echo make_intend($ref_intend)."<p>\n";
        }
 
        if ($ref_p_flag) {
                echo make_intend($ref_intend)."<p>\n";
        }

+       

        echo make_intend($ref_intend)."\t";
        echo make_intend($ref_intend)."\t";

+       

        if ($ref_mandantory) {
                echo "*";
        }
        if ($ref_mandantory) {
                echo "*";
        }

-       echo "<label for=\"".$ref_name."\">".$ref_labeltitle."</label><br />\n";
-       echo make_intend($ref_intend)."\t<textarea class=\"".$ref_class;
+       
+       if ($ref_labeltitle != null) {
+           echo "<label for=\"".$ref_name."\">".$ref_labeltitle."</label>";
+           if ($ref_newline_flag) {
+               echo "<br />";
+           }
+           echo "\n";
+       }
+       
+       echo make_intend($ref_intend)."\t<textarea ";
+       

        if ($ref_error_label == $ref_name) {
                echo $ref_classerrorextension;
        }
        if ($ref_error_label == $ref_name) {
                echo $ref_classerrorextension;
        }

-       echo "\" type=\"".$ref_type."\" name=\"".$ref_name."\" cols=\"".$ref_cols."\" rows=\"".$ref_rows."\" tabindex=\"".$ref_tabindex."\" id=\"".$ref_id."\" >\n";
+       
+       $str_id = $ref_id == null ? " " : " id=\"".$ref_id."\" ";
+       $str_class = $ref_class == null ? " " : " class=\"".$ref_class."\" ";
+       $str_tabindex = $ref_tabindex == null ? " " : " tabindex=\"".$ref_tabindex."\" ";
+       
+       echo " ".$str_id.$str_class.$str_tabindex."name=\"".$ref_name."\" cols=\"".$ref_cols."\" rows=\"".$ref_rows."\" >\n";
+       

        if (isset($_POST[$ref_name]) && strlen($_POST[$ref_name]) > 0) {
                echo $_POST[$ref_name];
        if (isset($_POST[$ref_name]) && strlen($_POST[$ref_name]) > 0) {
                echo $_POST[$ref_name];

+       } else if ($ref_value_input != null ){
+           echo $ref_value_input;

        }
        }

-       echo make_intend($ref_intend)."\t</textarea>\n";
+       
+       echo "</textarea>\n";
+       

        if ($ref_p_flag) {
                echo make_intend($ref_intend)."</p>\n";
        }
        if ($ref_p_flag) {
                echo make_intend($ref_intend)."</p>\n";
        }

diff --git a/domainverwaltung-web/web/lib/gui_functions.php b/domainverwaltung-web/web/lib/gui_functions.php
index e196561723403ffbff77ffbfdd25391ba2451f36..a8c94681eefe1b294ce9ae9482d9eb053116d4ac 100644 (file)
--- a/domainverwaltung-web/web/lib/gui_functions.php
+++ b/domainverwaltung-web/web/lib/gui_functions.php
@@ -6,4 +6,97 @@ require ("gui/gui_functions_input.php");
 require ("gui/gui_functions_select.php");
 require ("gui/gui_functions_textarea.php");
 
 require ("gui/gui_functions_select.php");
 require ("gui/gui_functions_textarea.php");
 

+function getIssuebox ($ref_issue, $connect_dbms_handle, $ref_stati_arr, $ref_page) {
+    
+    $j=0;
+    
+    $id             = $ref_issue[$j++];
+    $domain         = $ref_issue[$j++];
+    $titel          = $ref_issue[$j++];
+    $deadline_data  = $ref_issue[$j++];
+    $deadline = $deadline_data;
+    //echo strtotime($deadline_data);
+    if (strtotime($deadline_data) != strtotime("31.12.9999 00:00:00")) {
+        if ((date("U", strtotime($deadline_data))+date("Z")) % 86400 == 0) {
+            $deadline   = date("o-m-d", strtotime($deadline_data));
+        }
+    } else {
+        $deadline = "---";
+    }
+    //echo $deadline;
+    
+    
+    $wichtigkeit    = $ref_issue[$j++];
+    $dringlichkeit  = $ref_issue[$j++];
+    $bewertung      = $ref_issue[$j++];
+    $aufwand_data   = $ref_issue[$j++];
+    $aufwand        = date("G \h i\'", strtotime($aufwand_data));
+    
+    $datum_data     = $ref_issue[$j++];
+    //echo strtotime($datum_data);
+    if (strtotime($datum_data) != strtotime("31.12.9999 00:00:00")) {
+        if ((date("U", strtotime($datum_data))+date("Z")) % 86400 == 0) {
+            $datum      = date("o-m-d", strtotime($datum_data));
+        } else {
+            $datum      = date("o-m-d", strtotime($datum_data));
+            $datum_zeit = date("H:i:s", strtotime($datum_data));
+        }
+    } else {
+        $datum = "---";
+        $datum_zeit = "00:00:00";
+    }
+    
+    $status         = $ref_issue[$j++];
+    $keywords       = $ref_issue[$j++];
+
+    $domain_id     = getDomainIdOfIssue($connect_dbms_handle, $id);
+    
+    $project_id     = getProjectIdOfIssue($connect_dbms_handle, $id);
+    $project        = getProjectNameOfIssue($connect_dbms_handle, $id);
+    
+    $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$id), array("erstellt asc")));
+    //var_dump($comments_arr);
+
+    echo "<form name=\"issue_".$id."\" id=\"issue_".$id."\" action=\"".$ref_page."\" method=\"post\">\n";
+    echo "<div class=\"issuebox\">";
+    
+    echo "<div class=\"boxelem\"><span class=\"boxelemdescr\">Domain:</span><br />";
+    echo "<a class=\"link\" href=\"domain.php?domaindetail=".$domain_id."\">".$domain."</a></div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Projekt:</span><br />";
+    echo "<a class=\"link\" href=\"project.php?projectdetail=".$project_id."\">".$project."</a></div>\n";
+    echo "<div class=\"boxelem right\"><span class=\"boxelemdescr\">Issue-ID:</span><br />".$id."</div>\n";
+    echo "<div class=\"boxelem headline col3\">";
+    echo "<a class=\"link tooltip\" href=\"issue.php?issuedetail=".$id."\">".$titel."<span class=\"tooltiptext\">".$comments_arr[0][2]."</span></a></div>\n";
+
+    if ($keywords != null && strlen($keywords) > 0) {
+        echo "<div class=\"boxelem keywords col3\">".$keywords."</div>\n";
+    }
+
+    echo "<div class=\"boxelem\"><span class=\"boxelemdescr\">Deadline:</span></div>\n";
+    echo "<div class=\"boxelem\">";
+    makeInput("issue_deadline_".$id, $deadline, null, "inputbtn", null, "date", 0, 0, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    echo "</div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Bewertung:</span>".$bewertung."</div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Aufwand:</span><br />".$aufwand."</div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Wichtigkeit:</span><br />";
+    makeSelect("issue_wichtigkeit_".$id, null, null, "selectbtn", null, 1, 10, $wichtigkeit, false, 1, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    echo "</div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Dringlichkeit:</span><br />";
+    makeSelect("issue_dringlichkeit_".$id, null, null, "selectbtn", null, 1, 10, $dringlichkeit, false, 1, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    echo "</div>\n";
+    echo "<div class=\"boxelem center col2\"><span class=\"boxelemdescr\">let's do it:</span><br />";
+    makeInput("issue_executiondate_".$id, $datum, null, "inputbtn", null, "date", 0, 0, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    //if (!($datum_zeit == null || strlen($datum_zeit) == 0 || $datum_zeit == "")) {
+        //echo "<br />";
+    makeInput("issue_executiondate_time_".$id, $datum_zeit, null, "inputbtn", null, "time", 0, 0, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    //}
+    echo "</div>\n";
+    echo "<div class=\"boxelem center\"><span class=\"boxelemdescr\">Status:</span><br />";
+    makeSelect("issue_status_".$id, $ref_stati_arr, null, "selectbtn", null, 0, 0, $status, false, 1, "document.forms['issue_".$id."'].submit();", null, null, false, false, 0);
+    echo "</div>\n\n";
+    
+    echo "</div>\n";
+    echo "</form>\n\n";
+}
+

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file

diff --git a/domainverwaltung-web/web/lib/header.php b/domainverwaltung-web/web/lib/header.php
new file mode 100644 (file)
index 0000000..4fbdfbc
--- /dev/null
+++ b/domainverwaltung-web/web/lib/header.php
@@ -0,0 +1,19 @@
+<?php\r
+\r
+$connect_dbms_handle = getDBConnection();\r
+\r
+$current_user=1;\r
+?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de">\r
+\r
+<head>\r
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />\r
+<meta http-equiv="expires" content="0" /> \r
+\r
+<title>LetsDoIt!</title>\r
+\r
+<link rel="stylesheet" href="stylesheet/ticket_main.css" type="text/css" media="screen, projection\" />\r
+</head>\r
+\r
+<body>
\ No newline at end of file

diff --git a/domainverwaltung-web/web/lib/session/session_functions.php b/domainverwaltung-web/web/lib/session/session_functions.php
index f88d5b2d16e5a1c7b89abaa24c862400d83f240f..fd325c632c9a22e538726ab0910ea24eaa06ed07 100644 (file)
--- a/domainverwaltung-web/web/lib/session/session_functions.php
+++ b/domainverwaltung-web/web/lib/session/session_functions.php
@@ -21,7 +21,7 @@ function sessionHandling($scriptname, $dbms_connection) {
        if ($_SESSION['sess_user'] == "guest") {
                $session_user = "0";
        } else {
        if ($_SESSION['sess_user'] == "guest") {
                $session_user = "0";
        } else {

-               $session_user = "(SELECT login_id FROM frauke.login WHERE login_name='".$_SESSION['sess_user']."')";
+               $session_user = "(SELECT login_id FROM login WHERE login_name='".$_SESSION['sess_user']."')";

        }
 
        sql_data($dbms_connection, generateInsert(SCHEMA, "session", array("'".$sid."'", $session_user, "now()", "'".$scriptname."'")));
        }
 
        sql_data($dbms_connection, generateInsert(SCHEMA, "session", array("'".$sid."'", $session_user, "now()", "'".$scriptname."'")));

diff --git a/domainverwaltung-web/web/lib/util/util_functions.php b/domainverwaltung-web/web/lib/util/util_functions.php
index 35f936410fa39c2c39a9b9d06e845e8533de804f..6c3bbb0c12e73c5282152463401c87d209a22e60 100644 (file)
--- a/domainverwaltung-web/web/lib/util/util_functions.php
+++ b/domainverwaltung-web/web/lib/util/util_functions.php
@@ -4,11 +4,7 @@ function debugPrint($param) {
        echo "<p>";
        if (is_array($param)) {
                if ($asList) {
        echo "<p>";
        if (is_array($param)) {
                if ($asList) {

-                       echo "<ol>";
-                       foreach ($param as $p) {
-                               echo "<li>".$p."_</li>";
-                       }
-                       echo "</ol>";
+                   debugPrintAsList($param);

                } else {
                        echo "_";
                        foreach ($param as $p) {
                } else {
                        echo "_";
                        foreach ($param as $p) {


@@ -22,9 +18,9 @@ function debugPrint($param) {
 }
 
 function debugPrintAsList($param) {
 }
 
 function debugPrintAsList($param) {

-       echo "<ol>";
+       echo "<ol>\n";

        foreach ($param as $p) {
        foreach ($param as $p) {

-               echo "<li>".$p."_</li>";
+               echo "<li>".$p."_</li>\n";

        }
        echo "</ol>\n";
 }
        }
        echo "</ol>\n";
 }


@@ -64,4 +60,66 @@ function make_intend_str($ref_count) {
        return $intend;
 }
 
        return $intend;
 }
 

+function checkDeadlineAfterExecutionDate ($newissue_executiondate, $newissue_deadline) {
+    if  (strtotime($newissue_executiondate) > strtotime($newissue_deadline)+86399) {
+        echo "Deadline (".strtotime($newissue_executiondate).") kann nicht vor dem Ausführungsdatum (".(strtotime($newissue_deadline)+86399).") liegen.";
+        return false;
+    }
+    return true;
+}
+
+function handleQuickUpdate ($ref_POST, $connect_dbms_handle) {
+    $update_arr = array();
+    $issue = 0;
+    
+    foreach (array_keys($ref_POST) as $post) {
+        //echo $post." => ".$_POST[$post]."\n";
+        $change = explode ("_", $post);
+        $issue += $change[count($change)-1];
+        
+        //echo $issue;
+    }
+    
+    $issue = $issue / count(array_keys($ref_POST));
+    //echo $issue;
+    
+    $issue_deadline =       $ref_POST['issue_deadline_'.$issue];
+    if ($issue_deadline != "" && strlen($issue_deadline) > 0) {
+        array_push($update_arr, array("deadline", "'".$issue_deadline." 00:00:00'"));
+    }
+    
+    $issue_executiondate_date = $ref_POST['issue_executiondate_'.$issue];
+    $issue_executiondate_time = $ref_POST['issue_executiondate_time_'.$issue];
+    //echo $issue_executiondate_time;
+    if ($issue_executiondate_time == "00:00:00" || $issue_executiondate_time == "") {
+        $issue_executiondate_time = "00:00:00";
+    } else {
+        $issue_executiondate_time .= ":00";
+    }
+    $issue_executiondate = $issue_executiondate_date." ".$issue_executiondate_time;
+    //echo $issue_executiondate;
+    array_push($update_arr, array("executiondate", "'".$issue_executiondate."'"));
+    
+    $issue_status =         $ref_POST['issue_status_'.$issue];
+    array_push($update_arr, array("fk_status", $issue_status));
+    
+    $issue_wichtigkeit =    $ref_POST['issue_wichtigkeit_'.$issue];
+    array_push($update_arr, array("importance", $issue_wichtigkeit));
+    
+    $issue_dringlichkeit =  $ref_POST['issue_dringlichkeit_'.$issue];
+    array_push($update_arr, array("urgency", $issue_dringlichkeit));
+    
+    array_push($update_arr, array("edited", "now()"));
+    
+    $sqlupdate = generateUpdateSchema("ticket", "dt_issue", $update_arr, array("id=".$issue));
+    //echo $sqlupdate;
+    $sqlupdate_result = getBooleanData($connect_dbms_handle, $sqlupdate);
+    //echo $sqlinsert_result;
+    
+    $sqllog = generateInsertSchema("ticket", "dt_sqllog", array("DEFAULT", "now()", "'".addslashes(str_replace("'", "\"", $sqlupdate))."'", $current_user, "'".uniqid()."'", "'".$page."'"));
+    $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog);
+    //echo $sqllog_result;
+    
+    return $issue;
+}

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file

diff --git a/serveradmin_webserveradmin_mailserveradmin.dia b/serveradmin_webserveradmin_mailserveradmin.dia
new file mode 100644 (file)
index 0000000..86b2163
Binary files /dev/null and b/serveradmin_webserveradmin_mailserveradmin.dia differ