Progress: continue working on user view and related

Add missing functions to relevant tag generation functions.
Add additional text and translations.
Add user access history.
Error handling in user view generation is incomplete.

diff --git a/common/standard/classes/standard_path.php b/common/standard/classes/standard_path.php
index 324959c940596cced472f22bfb3f3ad42fa2e8da..7f52e7250463dde7ebd25803e36f6795d63c8282 100644 (file)
--- a/common/standard/classes/standard_path.php
+++ b/common/standard/classes/standard_path.php
@@ -1294,6 +1294,8 @@ class c_standard_path extends c_base_path {
    *   The text or the text code to use as the table caption.
    *   If NULL, then no text is added..
    *   If adding additional markup, text should be added manually.
+   * @param array $arguments
+   *   (optional) An array of arguments to convert into text.
    * @param string|null $id
    *   (optional) An ID attribute to assign.
    *   If NULL, then this is not assigned.
@@ -1305,7 +1307,7 @@ class c_standard_path extends c_base_path {
    * @return c_base_markup_tag
    *   The generated markup tag.
    */
-  protected function pr_create_tag_table_header_cell($text, $id = NULL, $extra_class = NULL) {
+  protected function pr_create_tag_table_header_cell($text, $arguments = array(), $id = NULL, $extra_class = NULL) {
     $classes = array($this->settings['base_css'] . self::CSS_AS_TABLE_HEADER_CELL, self::CSS_AS_TABLE_HEADER_CELL);
     if (is_string($extra_class)) {
       $classes[] = $extra_class;
@@ -1393,6 +1395,8 @@ class c_standard_path extends c_base_path {
    *   The text or the text code to use as the table caption.
    *   If NULL, then no text is added..
    *   If adding additional markup, text should be added manually.
+   * @param array $arguments
+   *   (optional) An array of arguments to convert into text.
    * @param string|null $id
    *   (optional) An ID attribute to assign.
    *   If NULL, then this is not assigned.
@@ -1404,7 +1408,7 @@ class c_standard_path extends c_base_path {
    * @return c_base_markup_tag
    *   The generated markup tag.
    */
-  protected function pr_create_tag_table_cell($text, $id = NULL, $extra_class = NULL) {
+  protected function pr_create_tag_table_cell($text, $arguments = array(), $id = NULL, $extra_class = NULL) {
     $classes = array($this->settings['base_css'] . self::CSS_AS_TABLE_CELL, self::CSS_AS_TABLE_CELL);
     if (is_string($extra_class)) {
       $classes[] = $extra_class;

diff --git a/common/standard/paths/u/ja/user_view.php b/common/standard/paths/u/ja/user_view.php
index 222001119f6472fc549dc21660fd12205c2b95ff..9105a5e87ea31cfec226375a933b61ae8d3998db 100644 (file)
--- a/common/standard/paths/u/ja/user_view.php
+++ b/common/standard/paths/u/ja/user_view.php
@@ -137,6 +137,87 @@ class c_standard_path_user_view_ja extends c_standard_path_user_view {
       case 36:
         $string = '無効';
         break;
+      case 37:
+        $string = '接頭辞';
+        break;
+      case 38:
+        $string = '最初';
+        break;
+      case 39:
+        $string = '中間';
+        break;
+      case 40:
+        $string = '最終';
+        break;
+      case 41:
+        $string = 'サフィックス';
+        break;
+      case 42:
+        $string = 'フル';
+        break;
+      case 43:
+        $string = '未公開';
+        break;
+      case 44:
+        $string = 'ユーザーID';
+        break;
+      case 45:
+        $string = 'タイトル';
+        break;
+      case 46:
+        $string = 'タイプ';
+        break;
+      case 47:
+        $string = 'サブタイプ';
+        break;
+      case 48:
+        $string = '重大度';
+        break;
+      case 49:
+        $string = '施設';
+        break;
+      case 50:
+        $string = '詳細';
+        break;
+      case 51:
+        $string = '日付';
+        break;
+      case 52:
+        $string = 'クライアント';
+        break;
+      case 53:
+        $string = 'レスポンスコード';
+        break;
+      case 54:
+        $string = 'セッションユーザーID';
+        break;
+      case 55:
+        $string = 'リクエストパス';
+        break;
+      case 56:
+        $string = '引数を要求する';
+        break;
+      case 57:
+        $string = 'リクエストクライアント';
+        break;
+      case 58:
+        $string = 'リクエスト日';
+        break;
+      case 59:
+        $string = 'リクエストヘッダー';
+        break;
+      case 60:
+        $string = '応答ヘッダー';
+        break;
+      case 61:
+        $string = 'レスポンスコード';
+        break;
+      case 62:
+        $string = 'ユーザー履歴';
+        break;
+      case 63:
+        $string = 'アクセス履歴';
+        break;
     }
 
     if (!empty($arguments)) {

diff --git a/common/standard/paths/u/user_view.php b/common/standard/paths/u/user_view.php
index 1a38eb623b1e5ce89d703563a70afc7292a287a4..936179d7fc38e48c4b9834bd93ca498ba09d4ec7 100644 (file)
--- a/common/standard/paths/u/user_view.php
+++ b/common/standard/paths/u/user_view.php
@@ -329,6 +329,66 @@ class c_standard_path_user_view extends c_standard_path {
       case 43:
         $string = 'Undisclosed';
         break;
+      case 44:
+        $string = 'User ID';
+        break;
+      case 45:
+        $string = 'Title';
+        break;
+      case 46:
+        $string = 'Type';
+        break;
+      case 47:
+        $string = 'Sub-Type';
+        break;
+      case 48:
+        $string = 'Severity';
+        break;
+      case 49:
+        $string = 'Facility';
+        break;
+      case 50:
+        $string = 'Details';
+        break;
+      case 51:
+        $string = 'Date';
+        break;
+      case 52:
+        $string = 'Client';
+        break;
+      case 53:
+        $string = 'Response Code';
+        break;
+      case 54:
+        $string = 'Session User ID';
+        break;
+      case 55:
+        $string = 'Request Path';
+        break;
+      case 56:
+        $string = 'Request Arguments';
+        break;
+      case 57:
+        $string = 'Request Client';
+        break;
+      case 58:
+        $string = 'Request Date';
+        break;
+      case 59:
+        $string = 'Request Headers';
+        break;
+      case 60:
+        $string = 'Response Headers';
+        break;
+      case 61:
+        $string = 'Response Code';
+        break;
+      case 62:
+        $string = 'User History';
+        break;
+      case 63:
+        $string = 'Access History';
+        break;
     }
 
     if (!empty($arguments)) {
@@ -346,9 +406,9 @@ class c_standard_path_user_view extends c_standard_path {
    * @param c_base_users_user $user_id
    *   An object representing the user to view.
    *
-   * @return null|c_base_return_error
+   * @return null|array
    *   NULL is returned if no errors are found.
-   *   Errors are returned if found.
+   *   An array of errors are returned if found.
    */
   protected function p_do_execute_view(&$executed, $user) {
     $errors = NULL;
@@ -581,67 +641,58 @@ class c_standard_path_user_view extends c_standard_path {
       $fieldset = $this->pr_create_tag_fieldset(17, array(), self::CLASS_USER_VIEW_HISTORY, self::CLASS_USER_VIEW_HISTORY);
       $content = c_theme_html::s_create_tag(c_base_markup_tag::TYPE_DIVIDER, self::CSS_AS_FIELD_SET_CONTENT, array(self::CSS_AS_FIELD_SET_CONTENT));
 
+      // user history
       // @todo: implement code for processing and generating a table/list of history, with the ability to navigate additional entries.
-
-      $query_result = $this->database->do_query('select id, id_user, log_title, log_type, log_type_sub, log_severity, log_facility, log_details, log_date, request_client, response_code from v_log_users_self order by id desc limit 10');
+      $query_result = $this->database->do_query('select id, log_title, log_type, log_type_sub, log_severity, log_facility, log_date, request_client, response_code from v_log_users_self order by id desc limit 10');
 
       if (c_base_return::s_has_error($query_result)) {
         if (is_null($errors)) {
-          $errors = $query_result->get_error();
-        }
-        else {
-          c_base_return::s_copy_errors($query_result->get_error(), $errors);
+          $errors = array();
         }
 
-        $last_error = $this->database->get_last_error()->get_value_exact();
+        c_base_return::s_copy_errors($query_result->get_error(), $errors);
 
+        $last_error = $this->database->get_last_error()->get_value_exact();
         if (!empty($last_error)) {
-          $error = c_base_error::s_log(NULL, array('arguments' => array(':{database_error_message}' => $last_error, ':{function_name}' => __CLASS__ . '->' . __FUNCTION__)), i_base_error_messages::POSTGRESQL_ERROR);
-          $errors->set_error($error);
-          unset($error);
+          $errors[] = c_base_error::s_log(NULL, array('arguments' => array(':{database_error_message}' => $last_error, ':{function_name}' => __CLASS__ . '->' . __FUNCTION__)), i_base_error_messages::POSTGRESQL_ERROR);
         }
         unset($last_error);
       }
       else {
-        $tag_table = $this->pr_create_tag_table(17);
+        $tag_table = $this->pr_create_tag_table(62);
 
-        // @fixme: replace all text here with numeric ids for translation.
         $tag_table_header = $this->pr_create_tag_table_header();
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('ID'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('User ID'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Title'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Type'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Sub-Type'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Severity'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Facility'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Details'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Date'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Client'));
-        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell('Response Code'));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(18));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(45));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(46));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(47));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(48));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(49));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(51));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(52));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(53));
+
         $tag_table->set_tag($tag_table_header);
         unset($tag_table_header);
 
         $tag_table_body = $this->pr_create_tag_table_body();
 
-        // @fixme: below is just an example/test. Rewrite this, cleaning up the code and adding more appropriate sanitizers and structure.
         $columns = $query_result->fetch_row()->get_value();
         while (is_array($columns) && !empty($columns)) {
-          $row_timestamp = c_base_defaults_global::s_get_timestamp($columns[8], c_base_database::STANDARD_TIMESTAMP_FORMAT)->get_value_exact();
+          $row_timestamp = c_base_defaults_global::s_get_timestamp($columns[6], c_base_database::STANDARD_TIMESTAMP_FORMAT)->get_value_exact();
           $row_date = c_base_defaults_global::s_get_date(c_base_defaults_global::FORMAT_DATE_TIME_SECONDS_HUMAN, $row_timestamp)->get_value_exact();
           unset($row_timestamp);
 
           $tag_table_row = $this->pr_create_tag_table_row();
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[0])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[1])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell($columns[2]));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[3])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[4])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[5])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[6])));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell($columns[7])); // @todo: json_decode($columns[7], TRUE)
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell($row_date));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell($columns[9]));
-          $tag_table_row->set_tag($this->pr_create_tag_table_cell('' . ((int) $columns[10])));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[0]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[1]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[2]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[3]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[4]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[5]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $row_date));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[7]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[8]));
           unset($row_date);
 
           $tag_table_body->set_tag($tag_table_row);
@@ -658,6 +709,65 @@ class c_standard_path_user_view extends c_standard_path {
         unset($tag_table);
       }
 
+
+      // access history
+      // @todo: implement code for processing and generating a table/list of history, with the ability to navigate additional entries.
+      $query_result = $this->database->do_query('select id, request_path, request_arguments, request_date, request_client, response_code from v_log_user_activity_self order by id desc limit 10');
+
+      if (c_base_return::s_has_error($query_result)) {
+        if (is_null($errors)) {
+          $errors = array();
+        }
+
+        c_base_return::s_copy_errors($query_result->get_error(), $errors);
+
+        $last_error = $this->database->get_last_error()->get_value_exact();
+        if (!empty($last_error)) {
+          $errors[] = c_base_error::s_log(NULL, array('arguments' => array(':{database_error_message}' => $last_error, ':{function_name}' => __CLASS__ . '->' . __FUNCTION__)), i_base_error_messages::POSTGRESQL_ERROR);
+        }
+        unset($last_error);
+      }
+      else {
+        $tag_table = $this->pr_create_tag_table(62);
+
+        $tag_table_header = $this->pr_create_tag_table_header();
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(18));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(55));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(56));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(58));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(57));
+        $tag_table_header->set_tag($this->pr_create_tag_table_header_cell(61));
+
+        $tag_table->set_tag($tag_table_header);
+        unset($tag_table_header);
+
+        $tag_table_body = $this->pr_create_tag_table_body();
+
+        // @fixme: below is just an example/test. Rewrite this, cleaning up the code and adding more appropriate sanitizers and structure.
+        $columns = $query_result->fetch_row()->get_value();
+        while (is_array($columns) && !empty($columns)) {
+          $tag_table_row = $this->pr_create_tag_table_row();
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[0]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[1]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[2]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[3]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[4]));
+          $tag_table_row->set_tag($this->pr_create_tag_table_cell((string) $columns[5]));
+
+          $tag_table_body->set_tag($tag_table_row);
+          unset($tag_table_row);
+
+          $columns = $query_result->fetch_row()->get_value();
+        }
+        unset($columns);
+
+        $tag_table->set_tag($tag_table_body);
+        unset($tag_table_body);
+
+        $content->set_tag($tag_table);
+        unset($tag_table);
+      }
+
       $fieldset->set_tag($content);
       unset($content);
 
@@ -673,5 +783,7 @@ class c_standard_path_user_view extends c_standard_path {
 
     $executed->set_output($this->html);
     unset($this->html);
+
+    return $errors;
   }
 }