- submitting details code review;

- fixed small notices and CSS;

includes/admin/assets/css/um-admin-modal.css

@@ -123,10 +123,22 @@
 }
 
 .um-admin-infobox p {
-	border-top: 1px solid #e5e5e5;
 	padding-top: 15px;
 }
 
+.um-admin-infobox > p:not(:first-child) {
+	border-top: 1px solid #e5e5e5;
+}
+
+.um-admin-infobox > .um-row > p {
+	border-top: 1px solid #e5e5e5;
+}
+
+.um-admin-infobox > p:first-child {
+	margin-top: 0;
+	padding-top: 0;
+}
+
 .um-admin-infobox label {
 	font-weight: bold;
 	display: block;

includes/core/class-fields.php

@@ -3686,6 +3686,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		function array_sort_by_column( $arr, $col, $dir = SORT_ASC ) {
 			$sort_col = array();
 			foreach ( $arr as $key => $row ) {
+				if ( $key == 'form_id' ) {
+					continue;
+				}
+
 				if ( isset( $row[ $col ] ) ) {
 					$sort_col[ $key ] = $row[ $col ];
 				}

includes/um-short-functions.php

@@ -788,29 +788,26 @@ function um_user_submitted_registration_formatted( $style = false ){
 	}
 
 	// Timestamp
-    $output .= um_user_submited_display( true, 'timestamp', 'Date Submitted' );
+	$output .= um_user_submited_display( 'timestamp', __( 'Date Submitted', 'ultimate-member' ) );
-    $output .= um_user_submited_display( true, 'form_id', 'Form', $submitted_data );
+	$output .= um_user_submited_display( 'form_id', __( 'Form', 'ultimate-member' ), $submitted_data );
 
 	if ( isset( $submitted_data ) && is_array( $submitted_data ) ) {
 
-		$fields = UM()->query()->get_attr( 'custom_fields', $submitted_data["form_id"] );
+		$fields = UM()->query()->get_attr( 'custom_fields', $submitted_data['form_id'] );
 
 		if ( isset( $fields ) ) {
 
-        	$pw_fields = array();
+			$fields['form_id'] = array( 'title' => __( 'Form', 'ultimate-member' ) );
-
-        	$fields['form_id'] = array('title' => 'Form' );
 
 			$rows = array();
 
 			UM()->fields()->get_fields = $fields;
 
 			foreach ( $fields as $key => $array ) {
-				if ( $array['type'] == 'row' ) {
+				if ( isset( $array['type'] ) && $array['type'] == 'row' ) {
 					$rows[ $key ] = $array;
 					unset( UM()->fields()->get_fields[ $key ] ); // not needed now
 				}
-
 			}
 
 			if ( empty( $rows ) ) {
@@ -824,8 +821,6 @@ function um_user_submitted_registration_formatted( $style = false ){
 				);
 			}
 
-            $arr_fields_in_order = array();
-
 			foreach ( $rows as $row_id => $row_array ) {
 
 				$row_fields = UM()->fields()->get_fields_by_row( $row_id );
@@ -852,6 +847,10 @@ function um_user_submitted_registration_formatted( $style = false ){
 
 						if ( is_array( $subrow_fields ) ) {
 
+							if ( isset( $subrow_fields['form_id'] ) ) {
+								unset( $subrow_fields['form_id'] );
+							}
+
 							$subrow_fields = UM()->fields()->array_sort_by_column( $subrow_fields, 'position' );
 
 							if ( $cols_num == 1 ) {
@@ -859,7 +858,7 @@ function um_user_submitted_registration_formatted( $style = false ){
 								$col1_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 1 );
 								if ( $col1_fields ) {
 									foreach ( $col1_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
@@ -868,14 +867,14 @@ function um_user_submitted_registration_formatted( $style = false ){
 								$col1_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 1 );
 								if ( $col1_fields ) {
 									foreach ( $col1_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
 								$col2_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 2 );
 								if ( $col2_fields ) {
 									foreach ( $col2_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
@@ -884,21 +883,21 @@ function um_user_submitted_registration_formatted( $style = false ){
 								$col1_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 1 );
 								if ( $col1_fields ) {
 									foreach ( $col1_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
 								$col2_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 2 );
 								if ( $col2_fields ) {
 									foreach ( $col2_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
 								$col3_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 3 );
 								if ( $col3_fields ) {
 									foreach ( $col3_fields as $key => $data ) {
-											$output .= um_user_submited_display( true, $key, $data['title'] );
+										$output .= um_user_submited_display( $key, $data['title'] );
 									}
 								}
 
@@ -928,32 +927,39 @@ function um_user_submitted_registration_formatted( $style = false ){
 
 /**
  * Prepare template
- * @param  boolean $style 
+ *
  * @param  string  $k
  * @param  string  $title
  * @param  array   $data
+ * @param  boolean $style
  * @return string
  *
  * @since  2.1.4 
  */
-function um_user_submited_display( $style = false, $k, $title, $data = array() ){
+function um_user_submited_display( $k, $title, $data = array(), $style = true ) {
-    
 	$output = '';
 
 	if ( 'form_id' == $k ) {
-    	$v = get_the_title( $data['form_id'] )." - Form ID#: ".$data['form_id'];
+		$v = sprintf( __( '%s - Form ID#: %s', 'ultimate-member' ), get_the_title( $data['form_id'] ), $data['form_id'] );
 	} else {
 		$v = um_user( $k );
 	}
 
 	if ( strstr( $k, 'user_pass' ) || in_array( $k, array( 'g-recaptcha-response', 'request', '_wpnonce', '_wp_http_referer' ) ) ) {
-		return;
+		return '';
 	}
 
-   
+	if ( ! $v ) {
+		if ( $style ) {
+			return "<p><label>$title: </label><span>" . __( '(empty)', 'ultimate-member' ) ."</span></p>";
+		} else {
+			return '';
+		}
+	}
 
 	if ( UM()->fields()->get_field_type( $k ) == 'image' || UM()->fields()->get_field_type( $k ) == 'file' ) {
 		$file = basename( $v );
+
 		$filedata = get_user_meta( um_user( 'ID' ), $k . "_metadata", true );
 
 		$baseurl = UM()->uploader()->get_upload_base_url();
@@ -984,7 +990,7 @@ function um_user_submited_display( $style = false, $k, $title, $data = array() )
 		if ( ! $v ) {
 			$v = __( '(empty)', 'ultimate-member' );
 		}
-		$output .= "<p><label>$title</label><span>$v</span></p>";
+		$output .= "<p><label>$title: </label><span>$v</span></p>";
 	} else {
 		$output .= "$title: $v" . "<br />";
 	}