Changeset 13482 for modules/branches

Timestamp:

02/20/12 07:02:25 (1 year ago)

Author:

mbrevda

Message:

upstream changes - add hookable templates so that any module can offer templates for backups

Files:

• modules/branches/2.10/backup/functions.inc/templates.php (modified) (4 diffs)
• modules/branches/2.10/package.php (modified) (1 diff)

modules/branches/2.10/backup/functions.inc/templates.php

@@ -22 +22 @@
-  }
-  
-te
+ct
-  $sql = 'DELETE FROM backup_details WHERE server = ?';
-  $ret = $db->query($sql, $id);
@@ -35 +35 @@
-  global $db;
-  
-server
-server
+template
+template
-
-  switch ($id) {
-    case '':
-$ret =
+return
-          'id'    => '',
-          'name'    => '',
+          'data'    => array(),
-          'desc'    => '',
-          'items'   => array(),
-          'immortal'  => ''
-          );
-      return $ret;
-      break;
-    case 'all':
-    case 'all_detailed':
+      $templates = array();
-      $ret = sql('SELECT * FROM backup_templates ORDER BY name', 'getAll', DB_FETCHMODE_ASSOC);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if ($id == 'all_detailed') {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      return $templates;
-      break;
-    default:
+      //if the id is preceded by a module name, ask that module for the details
+      if (strpos($id, '-') !== false) {
+        
+        //get data by breaking up backup id
+        list($mod, $id) = explode('-', $id);
+    
+        //return template data if $mod's function exsists
+        if (function_exists($mod . '_hook_backup_get_template')) {
+          return backup_template_sanitize(
+                call_user_func($mod . '_hook_backup_get_template', $id),
+                $mod
+              );
+        }
+        
+      }
+      
-      $sql = 'SELECT * FROM backup_templates WHERE id = ?';
-      $ret = $db->getAll($sql, array($id), DB_FETCHMODE_ASSOC);
@@ -105 +147 @@
-      }
-
-
-
-
-
+
+
-      return $ret;
-      break;
@@ -278 +318 @@
-  
-}
+
+/**
+ *
+ * Sanatize a template and ensures it is in format we excpet
+ * @pram array - a template
+ * @pram string - module name, default to backup
+ *
+ * @returns mixed - the sanatized template or fals on error
+ */
+function backup_template_sanitize($temp, $mod = 'backup') {
+
+  //backup's id's are just a number. Add the module name for consistancy with hooks
+  //this can get a bit tricky - make sure we dotn already have a mod name set!
+  if ($mod == 'backup' && strpos($temp['id'], '-') === false) {
+    $temp['id'] = 'backup-' . $temp['id'];
+  }
+  $id = explode('-', $temp['id']);
+
+  //ensure we have a name
+  $temp['name'] = $temp['name'] ? $temp['name'] : $id[0] . ' ' . $id[1];
+              
+  //hooked templates are ALWAYS immortal
+  //partly as we dont have delete hooks, and partly because there is no
+  //need for modules to create templates that are NOT hard coded
+  if ($mod != 'backup') {
+    $temp['immortal'] = 'true';
+  }
+  
+  //unserialize data
+  if (!isset($temp['data'])) {
+    $temp['data'] = array();
+  } elseif(is_string($temp['data'])) {
+    $temp['data'] = unserialize($temp['data']);
+  } 
+
+  return $temp;
+}
-?>

modules/branches/2.10/package.php

@@ -440 +440 @@
-  $final_status[$mod] = $mod . ' version ' . $ver 
-            . ' has been sucsessfuly packaged!' . PHP_EOL;
-
+PHP_EOL . 
-  
-}