Latest changes with code cleanup

Author: Jason Smith

pkplugins/pkplugins.info

@@ -2,4 +2,4 @@ name="Patternkit plugin - Red Hat Base"
 description="Adds patternkit patterns to panels as content types."
 package="Presentation Framework"
 core=7.x
-version=7.x-1.0
+version=7.x-1.1

pkplugins/pkplugins.install

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Install file for ct_article module.
@@ -13,60 +14,5 @@ function pkplugins_schema() {
   // Add the redhat_pkplugins caching table.
   $schema['cache_pkplugins'] = drupal_get_schema_unprocessed('system', 'cache');
 
-//  // Add the redhat_pkplugins module html artifact table.
-//  $schema['pkplugins_artifacts'] = array(
-//    'description' => 'The artifact table for pkplugins. Provides a failover for origin unavailability.',
-//    'fields'      => array(
-//      'uuid'    => array(
-//        'type' => 'char',
-//        'length' => 36,
-//        'not null' => TRUE,
-//        'default' => '',
-//        'description' => 'The Universally Unique Identifier.',
-//      ),
-//      'content'     => array(
-//        'description' => 'The artifact of interest.',
-//        'type'        => 'longtext',
-//        'default'     => '',
-//      ),
-//      'type'    => array(
-//        'description' => 'The {node_type} of this node.',
-//        'type'        => 'varchar',
-//        'length'      => 32,
-//        'not null'    => TRUE,
-//        'default'     => '',
-//      ),
-//      'title'   => array(
-//        'description' => 'The title of this node, always treated a non-markup plain text.',
-//        'type'        => 'varchar',
-//        'length'      => 255,
-//        'not null'    => TRUE,
-//        'default'     => '',
-//      ),
-//      'created' => array(
-//        'description' => 'The Unix timestamp when the node was created.',
-//        'type'        => 'int',
-//        'not null'    => TRUE,
-//        'default'     => 0,
-//      ),
-//      'changed' => array(
-//        'description' => 'The Unix timestamp when the node was most recently saved.',
-//        'type'        => 'int',
-//        'not null'    => TRUE,
-//        'default'     => 0,
-//      ),
-//    ),
-//    'indexes'     => array(
-//      'node_changed' => array('changed'),
-//      'node_created' => array('created'),
-//    ),
-//    'unique keys' => array(
-//      'nid_vid' => array('nid', 'vid'),
-//      'vid'     => array('vid'),
-//    ),
-//    'primary key' => array('nid'),
-//  );
-
   return $schema;
 }
-

pkplugins/pkplugins.module

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Patternkit wrapper/abstraction for panels.
@@ -53,12 +54,12 @@ function pkplugins_flush_metadata_cache() {
 /**
  * Utility function to get all Patternkit module metadata.
  *
- * @param null $subtype
+ * @param string|null $subtype
  *   If specified, return only metadata for this subtype.
  * @param bool $reset
  *   Optionally force the meta data to be reloaded.
  *
- * @return array|stdClass
+ * @return array|object
  *   Array of metadata objects found or object if specific module requested.
  */
 function _pkplugins_get_metadata($subtype = NULL, $reset = FALSE) {
@@ -78,23 +79,24 @@ function _pkplugins_get_metadata($subtype = NULL, $reset = FALSE) {
         $patternkit_host . '/api/patterns',
         array(
           'headers' => array('Content-Type' => 'application/json'),
-          'timeout' => 10
+          'timeout' => 10,
         )
       );
       if (!empty($patterns) && empty($patterns->error) && $patterns->code == 200) {
-        $cached_metadata = (array)json_decode($patterns->data);
+        $cached_metadata = (array) json_decode($patterns->data);
 
         // Cache the data so that we don't have to build it again.
         // (if cache enabled, otherwise just a slow, redundant memcache set).
         if ($pkplugins_cache_enabled == TRUE) {
           cache_set('pkplugins_pk_metadata', $cached_metadata, 'cache', CACHE_PERMANENT);
         }
-      } else {
+      }
+      else {
         _pkplugins_show_error(
           'Patternkit failed to load metadata from service (%service_uri): %error',
           array(
             '%service_uri' => $patternkit_host . '/api/patterns',
-            '%error' => !empty($patterns->error) ? $patterns->error : $patterns->code
+            '%error'       => !empty($patterns->error) ? $patterns->error : $patterns->code,
           )
         );
         return NULL;
@@ -129,18 +131,16 @@ function _pkplugins_get_metadata($subtype = NULL, $reset = FALSE) {
  *
  * @param string $msg
  *   The message to display (with t vars as appropriate).
- * @param array  $vars
+ * @param array $vars
  *   Optional array of replacement text appropriate for use in t function.
  * @param string $status
  *   Status for the error message. Passed to drupal_set_message.
  */
-function _pkplugins_show_error($msg, $vars = array(), $status = 'error') {
+function _pkplugins_show_error($msg, array $vars = array(), $status = 'error') {
   if (variable_get('pkplugins_show_errors', FALSE) && user_is_logged_in()) {
-    drupal_set_message(t($msg, $vars), $status);
+    drupal_set_message(format_string($msg, $vars), $status);
   }
   if (variable_get('pkplugins_log_errors', FALSE)) {
     watchdog('pkplugins', $msg, $vars, WATCHDOG_ERROR);
   }
 }
-
-