Merge pull request #8 from ofirgalcon/resolved-1

add architecture display
munkireport · Feb 9, 2021 · 7fdb14a · 7fdb14a
2 parents c8e6aaf + d6456fe
commit 7fdb14a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -3,7 +3,7 @@
     "signed_by": "Signed By",
     "obtained_from": "Obtained From",
     "last_modified": "Last Modified",
-    "runtime_environment": "Runtime Environment",
+    "runtime_environment": "Architecture",
     "has64bit": "64-Bit",
     "mac_app_store": "Mac App Store",
     "identified_developer": "Identified Developer",

diff --git a/scripts/applications.py b/scripts/applications.py
@@ -51,8 +51,10 @@ def flatten_applications_info(array):
                 device['signed_by'] = obj[item][0]
             elif item == 'has64BitIntelCode' and obj[item] == 'yes':
                 device['has64bit'] = 1
-            elif item == 'arch_kind' and (obj[item] == 'arch_i64' or obj[item] == 'arch_i32_i64' or obj[item] == 'arch_arm_i64' or obj[item] == 'arch_ios'):
-                device['has64bit'] = 1
+            elif item == 'arch_kind':
+                device['runtime_environment'] = obj[item]
+                if (obj[item] == 'arch_i64' or obj[item] == 'arch_i32_i64' or obj[item] == 'arch_arm_i64' or obj[item] == 'arch_ios'):
+                    device['has64bit'] = 1
         out.append(device)
     return out
 

diff --git a/views/applications_listing.php b/views/applications_listing.php
@@ -18,6 +18,7 @@
 			<th data-i18n="applications.obtained_from" data-colname='applications.obtained_from'></th>
 			<th data-i18n="applications.last_modified" data-colname='applications.last_modified'></th>
 			<th data-i18n="applications.has64bit" data-colname='applications.has64bit'></th>
+			<th data-i18n="applications.runtime_environment" data-colname='applications.runtime_environment'></th>
 			<th data-i18n="path" data-colname='applications.path'></th>
 			<th data-i18n="info" data-colname='applications.info'></th>
 		  </tr>

diff --git a/views/applications_tab.php b/views/applications_tab.php
@@ -11,6 +11,7 @@
           <th data-i18n="applications.obtained_from"></th>
           <th data-i18n="applications.last_modified"></th>
           <th data-i18n="applications.has64bit"></th>
+          <th data-i18n="applications.runtime_environment"></th>
           <th data-i18n="path"></th>
           <th data-i18n="info"></th>
 		</tr>
@@ -26,6 +27,7 @@
           <td><?php echo str_replace(array('unknown','mac_app_store','apple','identified_developer'), array('Unknown','Mac App Store','Apple','Identified Developer'), $item->obtained_from); ?></td>
           <td><?php echo date("Y-m-d H:i:s", $item->last_modified); ?></td>
           <td><?php echo str_replace(array('1','0'), array('Yes','No'), $item->has64bit); ?></td>
+          <td><?php echo str_replace(array('arch_i64','arch_i32_i64','arch_i32','arch_arm_i64','arch_ios'), array('Intel','Intel','Intel','Universal','Silicon'), $item->runtime_environment); ?></td>
           <td><?php echo $item->path; ?></td>
           <td><?php echo $item->info; ?></td>
         </tr>