/[drupal]/contributions/modules/og_collections/og_collections.module

Diff of /contributions/modules/og_collections/og_collections.module

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.2.2.9,
Sun Apr  6 22:13:40 2008 UTC
+revision 1.2.2.10,
Thu Apr 17 21:16:42 2008 UTC
 Line 1
  <?php
- // $Id: og_collections.module,v 1.2.2.8 2008/04/06 00:08:09 sdboyer Exp $
+ // $Id: og_collections.module,v 1.2.2.9 2008/04/06 22:13:40 sdboyer Exp $
  /**
   * @file og_collections.module
 Line 12
   * their own duplicate set of the panels in the collection.
   */
- class og_collection {
+ /**
-   public $version, $grouptype;
+  * Defines one of the two main classes for this module: the Collection class.
-   private $modified;
+  *
-   // will $modified help?
+  */
+ abstract class og_collection {
+   protected $version, $grouptype, $defaults;
-   // saves changes to the default collection
+   /**
-   function __construct() {
+    * Declaring as abstract allows us to programatically ensure that even empty
-     $this->grouptype = 'default';
+    * og_collection objects are still loaded with exactly the right parameters
-     $result = db_fetch_array(db_query("SELECT * FROM {og_collections} WHERE grouptype = 'default'"));
+    *
-     $this->version = $result['version'];
+    */
-     $pcpanel_data = array_filter($result, !in_array('grouptype', 'version', 'defaults'));
+   protected function __construct() {
-     if (!empty($pcpanel_data)) {
+     $pcpanels = self::pcpanels_list();
-       $this->load($pcpanel_data);
+     foreach ($pcpanels as $pcpname) {
-     }
+       $this->$pcpname = new og_pcpanel_empty();
-     else {
-       throw new og_collections_exception('nopcpanel');
      }
    }
-   // reduce to single, using private variable and sleep function.
+   /**
-   function save_all() { // @TODO add some verification?
+    * Return an associative array of pcpnames, keyed by their corresponding pcpid.
-     foreach ($this as $member => $value) {
+    *
-       if ($member == ('version' || 'grouptype')) {
+    * @param bool $refresh
-         continue;
+    *  The list is cached using a static var, and will only be refreshed from the variables table if explicitly told to do so
+    * @return mixed $pcpanels
+    *  Returns FALSE if no pcpanels have been defined
+    */
+   public static function pcpanels_list($refresh = FALSE) {
+     static $pcpanels = array();
+     if (empty($pcpanels) || $refresh) {
+       $result = db_query("SELECT * FROM {og_collections_pcpanel_join}"); // TODO switch this to a variable_set call
+       if ($result != FALSE) {
+         while ($pcpanel = db_fetch_array($result)) {
+           $pcpanels[$pcpanel['pcpid']] = $pcpanel['pcpname'];
+         }
        }
-       $this->save($value);
+       else $pcpanels = FALSE;
+     }
+     return $pcpanels;
+   }
+   function array_of_pcpanels($sort = TRUE) {
+     $pcpanels = og_collection::pcpanels_list();
+     foreach ($pcpanels as $pcpname) {
+       $pcpanels_array[$pcpname] = $this->$pcpname;
+     }
+     if ($sort) {
+       uasort($pcpanels_array, 'og_collections_sort_collection');
      }
+     return $pcpanels_array;
    }
-   // saves an individual collection
+   protected function get_collection_metavalues() {
-   function save($pcpid) {
+     $collection_values = db_fetch_array(db_query("SELECT defaults, version FROM {og_collections} WHERE grouptype = '%s'", $this->grouptype));
-     db_query("UPDATE {og_collections} SET pcpid_%d = '%s' WHERE grouptype = '%s'", $pcpid, serialize($this->$pcpid), $this->grouptype);
+     $this->version = $collection_values['version'];
+     $this->defaults = unserialize($collection_values['defaults']);
    }
-   // loads the relevant pcpanel data into the default collection
+   // reduce to single, using private variable and sleep function.
-   protected function load($pcpanel_data) {
+   function save_all() {
-     foreach ($pcpanel_data as $pcpname => $data) {
+     foreach ($this as $member => $value) {
-       $this->$pcpname = new og_pcpanel();
+       if ($member instanceof og_pcpanel) {
-       $settings = unserialize($data);
+         $this->save_one($value);
-       $this->$pcpname->og_pcpanel_load($settings['did']);
-       foreach ($settings as $setting => $val) {
-         $this->$pcpname->$setting = $val;
        }
      }
    }
-   public static function load_single($pcpname, $grouptype = 'default') {
+   // saves an individual og_pcpanel
-     return $result = unserialize(db_result(db_query("SELECT '%s' FROM {og_collections} WHERE grouptype = '%s'", $pcpname, $grouptype)));
+   function save_one($pcpid) {
+     db_query("UPDATE {og_collections} SET %s = '%s' WHERE grouptype = '%s'", $this->$pcpid->pcpname, serialize($this->$pcpid), $this->grouptype);
    }
-   // performs the collection instantiation routine
+   function load_all_pcpanels() {
-   function instantiate($nid) {
+     foreach (og_collection::pcpanels_list() as $pcpid => $pcpname) {
+       $this->load_pcpanel($pcpname);
+     }
    }
-   // @TODO need to do this. This will need to record version data on not only the pcpanel's abstracted data, but the displays themselves...
+   function load_pcpanel($pcpname) {
-   function new_version() {
+     $this->$pcpname = new og_pcpanel(array($pcpname, $this->grouptype));
+     $this->$pcpname->fill();
+   }
+   function create_version() {
+     foreach (self::pcpanels_list() as $pcpid => $pcpname) {
+       $this->$pcpname->load_display();
+       $this->$pcpname->display->did = 'new'; // FIXME need to switch this over so that displays are recorded elsewhere, on their own...ick
+     }
+     db_query("INSERT INTO {og_collections_versions} (grouptype, vid, created, data) VALUES ('%s', %d, %d, '%s')", $this->grouptype, $this->vid++, time(), serialize($this));
+   }
+   public static function og_panels_fields() {
+     return array(
+       "did" => "%d",
+       "nid" => "%d",
+       "published" => "%d",
+       "page_title" => "'%s'",
+       "path" => "'%s'",
+       "default_page" => "%d",
+       "show_blocks" => "%d",
+       "weight" => "%d",
+     );
+   }
+   function get_pcpanel_stats() {
+     $h = $e = $d = $t = 0;
+     foreach (self::pcpanels_list() as $pcpname) {
+       if ($this->$pcpname->default_page) $h++;
+       $this->$pcpname->enabled ? $e++ : $d++;
+       $t++;
+     }
+     return array('homepage' => $h, 'enabled' => $e, 'disabled' => $d, 'total' => $t);
+   }
+   /**
+    * Will work for now anyway
+    *
+    * @param unknown_type $member
+    * @return unknown
+    */
+   function __get($member) {
+     static $classvars = array();
+     if (empty($classvars)) {
+       $classvars = array_keys(get_class_vars('og_collection'));
+     }
+     switch (TRUE) {
+       case (is_numeric($member) && $member != 0):
+         $pcp_list = og_collection::pcpanels_list();
+         if (isset($pcp_list[$member])) {
+           return $this->$pcpname;
+         }
+         $exception = 'There is no pcpanel that corresponds to the provided pcpid.'; // let this keep running in case the numeric argument corresponds to something else
+       case (in_array($member, og_collection::pcpanels_list())):
+         return $this->load_pcpanel($member);
+       case (in_array($member, $classvars) && isset($this->$member)):
+         return $this->$member;
+     }
+     if (isset($exception)) {
+       throw new Exception($exception); // FIXME need to make my own extension of the exceptions class
+     }
    }
-   function __clone() {
+   // TODO REALLY? isn't this just a default?
+   function __isset($member) {
+     return isset($this->$member);
    }
  } // end og_collection class declaration
+ /**
+  * Defines the subclass for the default group collection.
+  *
+  * Note that this is used in BOTH of og_collections' operating modes.
+  *
+  */
+ class og_collection_default extends og_collection {
+   private $modified;
+   function __construct() {
+     parent::__construct();
+     $this->grouptype = 'default';
+     $this->version = db_result(db_query("SELECT version FROM {og_collections} WHERE grouptype = 'default'"));
+   }
+ }
+ /**
+  * Defines the subclass for group type-specific collections.
+  *
+  */
  class og_collection_typed extends og_collection {
-   private $defaults;
+   private $modified;
    function __construct($grouptype) {
+     parent::__construct();
      $this->grouptype = $grouptype;
-     $result = db_fetch_array(db_query("SELECT * FROM {og_collections} WHERE grouptype = '%s'", $grouptype));
+     $this->get_collection_metavalues();
-     $this->version = $result['version'];
+   }
-     // this is where we load the most up-to-date version of the pcpanels for those which are using the default collection's did
+   function load_all_pcpanels() {
-     $this->defaults = unserialize($result['defaults']);
+     parent::load_all_pcpanels();
-     if (!empty($defaults)) {
+     $this->insert_default_dids();
-       foreach ($defaults as $pcpname) {
+   }
-         $this->$pcpname = new og_pcpanel();
-         $this->$pcpname->og_pcpanel_load(db_result(db_query("SELECT did FROM {og_collections_pcpanels} WHERE pcpname = '%s' AND grouptype = 'default'", $pcpname)));
+   /**
-         foreach (unserialize($result[$pcpname]) as $setting => $val) {
+    * Load the default dids directly from their values in og_collections_pcpanels, to ensure they're always up to date
-           $this->$pcpname->$setting = $val;
+    *
-         }
+    */
-       }
+   private function insert_default_dids() { // TODO not sure if this will return them all in a single array, or over the individual rows...oh well. If there's a way to get it to do it in a single array, though, let's do that!
-       $result = array_diff_keys($result, array_flip($defaults));
+     $ph = array_fill(0, count($this->defaults), "'%s'");
+     $result = db_query("SELECT did, pcpname FROM {og_collections_pcpanel} WHERE grouptype = 'default' AND pcpname IN (". implode(', ', $ph) .")", $this->defaults);
+     while ($data = db_fetch_array($result)) {
+       $dids[$data['pcpname']] = $data['did'];
      }
-     $pcpanel_data = array_filter($result, !in_array('grouptype', 'version', 'defaults'));
+     foreach ($this->defaults as $pcpname) {
-     if (!empty($pcpanel_data)) { // loads any pcpanels that aren't reliant on the default
+       if ($dids[$pcpname] != $this->$pcpname->did) {
-       parent::load($pcpanel_data);
+         $this->$pcpname = new og_pcpanel($dids['pcpname']);
+         $this->$pcpname->fill();
+       }
      }
    }
-   function revert_pcpanel() {
+   function relink_pcpanel($pcpname) {
+     $this->load_pcpanel($pcpname);
+     panels_delete_display($this->$pcpname->did);
+     $defcollectioncfg = new og_collection_default();
+     db_query("DELETE FROM {og_collections_pcpanel} WHERE pcpid = %d AND grouptype = '%s'", $this->$pcpname->pcpid, $this->$pcpname->grouptype);
+     $this->$pcpname->did = $defcollectioncfg->$pcpname->did;
+     $this->$pcpname->usedef = TRUE;
+     unset($this->defaults[$this->$pcpname->pcpid]);
+     $this->$pcpname->save();
    }
+   function delink_pcpanel($pcpanel) {
+     $code = panels_export_display($pcpanel->display);
+     eval($code);
+     panels_save_display($display);
+     $pcpanel->did = $display->did;
+     $pcpanel->linked = FALSE;
+     db_query("INSERT INTO {og_collections_pcpanel} (did, pcpid, pcpname, grouptype, version) VALUES (%d, %d, '%s', '%s', %d", $this->did, $this->pcpid, $this->pcpname, $this->grouptype, 0);
+     $this->save();
+     og_collection::pcpanels_list(TRUE); // TODO superfluous?
+   }
+ }
+ class og_collection_new extends og_collection {
  }
  class og_pcpanel {
-   public $default, $enabled, $weight, $did, $page_title, $path, $published, $show_blocks, $display, $context, $content_types, $version;
+   public $default_page, $enabled, $weight, $did, $page_title, $path, $published, $show_blocks, $version, $pcpname, $grouptype, $pcpid, $linked;
-   private $pcpname, $grouptype;
+   private $modified;
-   // @FIXME This is an ugly hack way of accomplishing this, surely something in php's OOP would accomodate a better method? Can't figure out how, though...
+ /**
-   function __construct($op = FALSE) {
+  * Construct an og_pcpanel.
-     if ($op == 'new') {
+  *
-       $this->pcpid = db_next_id("{og_collections_pcpanel}_pcpid");
+  * //TODO fix this, you split these into subclasses
-       $display = panels_save_display(panels_new_display());
+  *
-       $this->did = $display->did;
+  * @param mixed $arg
-       $this->display = $display;
+  *    If we're 'load'ing, then must EITHER pass a valid pcpanel Display id (did), OR:
-       $this->grouptype = 'default';
+  *    An array containing FIRST the pcpid OR the pcpname; AND SECOND the group type, if a typed collection is being requested
-       db_query("INSERT INTO {og_collections_pcpanel} (did, pcpid, grouptype, version) VALUES (%d, %d, '%s', %d", $this->did, $this->pcpid, $this->grouptype, 0);
+  *    If nothing gets passed in, we're just creating an empty og_pcpanel object.
-     }
+  * @return bool FALSE
-     elseif ($op == 'export') {
+  *   if the object fails to perform the requested $op.
+  */
+   function __construct($arg = NULL) {
+     if (!is_null($arg)) {
+       try {
+         if (is_array($arg)) {
+           $this->get_by_other($arg[0], $arg[1]);
+         }
+         else {
+           $this->get_by_did($arg);
+         }
+       }
+       catch (Exception $e) {
+         return FALSE;
+       }
      }
    }
    // There remain some oustanding issues with PHP's __sleep() magic method related to including protected/private variables.
    // See http://us.php.net/manual/en/language.oop5.magic.php#81492 for workaround details.
    function __sleep() {
-     return array('default', 'enabled', 'weight', 'did', 'page_title', 'path', 'published', 'show_blocks', 'pcpid');
+     return array('default_page', 'enabled', 'weight', 'did', 'page_title', 'path', 'published', 'show_blocks', 'pcpid', 'linked');
    }
    // Doing it this way requires some double query-ness. Is this avoidable?
    function __wakeup() {
-     $this->load();
+     // $this->get_by_did($this->did);
    }
-   // Saves the pcpanel data into the relevant collections & pcpanel fields
+   /**
-   function save() {
+    * Return the portion of pcpanel object data that is stored
-     db_query("UPDATE {og_collections_pcpanel} SET pcpid = %d, grouptype = '%s', version = %d WHERE did = %d", $this->pcpid, $this->grouptype, $this->version, $this->did);
+    * in the collections table as an associative array
+    *
+    */
+   private function to_collection_array() {
+     $members = array('default_page', 'enabled', 'weight', 'did', 'page_title', 'path', 'published', 'show_blocks', 'pcpid', 'linked');
+     foreach ($members as $member) {
+       $pcpanel_as_array[$member] = $this->$member;
+     }
+     return $pcpanel_as_array;
+   }
+   function save($compare_values = NULL) {
+     if (!is_null($compare_values)) {
+       foreach ($compare_values as $setting => $value) {
+         if ($this->$setting != $value) {
+           $this->$setting = $value;
+           $this->modified = TRUE;
+         }
+       }
+     }
+     if ($this->modified || is_null($compare_values)) {
+       $this->write_to_db();
+     }
    }
-   // loads the pcpanel fields that are in the pcpanel table and stores them in the current object
+   private function write_to_db() {
-   function load() {
+     db_query("UPDATE {og_collections_pcpanel} SET pcpid = %d, pcpname = '%s', grouptype = '%s', version = %d WHERE did = %d", $this->pcpid, $this->pcpname, $this->grouptype, $this->version, $this->did);
-     if ($did = $this->did) { // __get snags the did if it's not loaded. wraps the whole function, b/c if there's no did, we can't load
+     db_query("UPDATE {og_collections} SET %s = '%s' WHERE grouptype = '%s'", $this->pcpname, serialize($this->to_collection_array()), $this->grouptype);
-       $result = db_fetch_array(db_query("SELECT * FROM {og_collections_pcpanel} WHERE did = %d", $this->did));
+   }
-       $this->pcpid = $result['pcpid'];
+   function load_display() {
+     panels_load_include('plugins');
+     $this->display = panels_load_display($this->did);
+     $this->context = $this->display->context = array('og_panels' => panels_context_create_empty('group')); // TODO going to need to change this context stuff to reflect the new complexity
+   }
+   // FIXME IDIOT, why don't you just load all the damn collectioncfgs and remove them that way...use an empty if need be!!!
+   function change_pcpname($newname) {
+     db_query("UPDATE {og_collections_pcpanel_join}, {og_collections_pcpanel} SET pcpname = '%s' WHERE pcpid = %d", $newname, $this->pcpid);
+     $result = db_query("SELECT defaults, grouptype FROM {og_collections} WHERE grouptype <> 'default'");
+     while ($row = db_fetch_array($result)) {
+       $defaults = unserialize($row['defaults']);
+       $defaults[$this->pcpid] = $newname;
+       db_query("UPDATE {og_collections} SET defaults = '%s' WHERE grouptype = '%s'", serialize($defaults), $row['grouptype']);
+     }
+     db_query("ALTER TABLE {og_collections} CHANGE %s %s text", $this->pcpname, $newname);
+     og_collection::pcpanels_list(TRUE);
+   }
+   /**
+    * Adds fields to the collectioncfg table to accomodate new pcpanels.
+    *
+    */
+   protected function add_pcpanel_column() {
+     switch ($GLOBALS['db_type']) {
+       case 'mysql':
+       case 'mysqli':
+         db_query("ALTER TABLE {og_collections} ADD COLUMN %s text", $this->pcpname);
+       break;
+       case 'pgsql':
+         db_add_column($ret, 'og_collections', $fieldname, 'text');
+       break;
+     }
+     $result = db_query("SELECT defaults, grouptype FROM {og_collections} WHERE grouptype <> 'default'");
+     while ($row = db_fetch_array($result)) {
+       $defaults = unserialize($row['defaults']);
+       $defaults[$this->pcpid] = $this->pcpname;
+       db_query("UPDATE {og_collections} SET defaults = '%s' WHERE grouptype = '%s'", serialize($defaults), $row['grouptype']);
+     }
+     db_query("INSERT INTO {og_collections_pcpanel_join} (pcpid, pcpname) VALUES (%d, '%s'", $this->pcpid, $this->pcpname);
+     og_collection::pcpanels_list(TRUE);
+   }
+   protected function drop_pcpanel_column() {
+     db_query("ALTER TABLE {og_collections} DROP $fieldname");
+     $result = db_query("SELECT defaults, grouptype FROM {og_collections} WHERE grouptype <> 'default'");
+     while ($row = db_fetch_array($result)) {
+       $defaults = unserialize($row['defaults']);
+       unset($defaults[$this->pcpid]);
+       db_query("UPDATE {og_collections} SET defaults = '%s' WHERE grouptype = '%s'", serialize($defaults), $row['grouptype']);
+     }
+     db_query("DELETE FROM {og_collections_pcpanel_join} WHERE pcpid = %d", $this->pcpid);
+     og_collection::pcpanels_list(TRUE);
+   }
+   protected function get_by_did($did) {
+     $result = db_fetch_array(db_query("SELECT * FROM {og_collections_pcpanel} WHERE did = %d", $did));
+     if ($result !== FALSE) {
+       $this->pcpid = (int) $result['pcpid'];
        $this->grouptype = $result['grouptype'];
-       $this->version = $result['version'];
+       $this->version = (int) $result['version'];
        $this->pcpname = $result['pcpname'];
+     }
+     else {
+       throw new Exception('Bad display id provided.');
      }
    }
-   function fill() {
+   protected function get_by_other($pcparg, $grouptype = 'default') {
-     $data = og_collection::load_single($this->pcpname, $this->grouptype); // TODO kind of an inelegant hack. Any better way of doing this?
+     $this->grouptype = $grouptype;
-     foreach ($data as $setting => $value) {
+     if (is_numeric($pcparg)) {
-       $this->$setting = $value;
+       $this->pcpid = $pcparg;
+       $field = 'pcpid';
+       $queryval = '%d';
+     }
+     else {
+       $this->pcpname = $pcparg;
+       $field = 'pcpname';
+       $queryval = "'%s'";
+     }
+     $result = db_fetch_array(db_query("SELECT * FROM {og_collections_pcpanel} WHERE $field = $queryval AND grouptype = '%s'", $pcparg, $grouptype));
+     if ($result !== FALSE) {
+       $this->pcpid = (int) $result['pcpid'];
+       $this->version = (int) $result['version'];
+       $this->pcpname = $result['pcpname'];
+       $this->did = $result['did'];
+     }
+     else {
+       throw new Exception('Bad pcparg and grouptype argument combo.');
      }
    }
-   // magic method for snaggign whichever members
+   function fill($override = FALSE) {
+     $pcpanel_data = unserialize(db_result(db_query("SELECT %s FROM {og_collections} WHERE grouptype = '%s'", $this->pcpname, $this->grouptype)));
+     foreach ($pcpanel_data as $setting => $value) {
+       if (!isset($this->$setting) || $override) { // only add the value if the member is not yet set, or an override has been explicitly requested
+         $this->$setting = $value;
+       }
+     }
+   }
+   // magic method for snagging certain requested members on demand
    function __get($member) {
      switch ($member) {
-       case 'did':
-         if (isset($this->pcpid, $this->grouptype)) { // @FIXME need to expand this to include the pcpname
-           return $this->did = db_result(db_query("SELECT did FROM {og_collections_pcpanel} WHERE pcpid = %d AND grouptype = '%s'", $this->pcpid, $this->grouptype));
-         }
-         else {
-           $exception = 'Not enough information to get retrieve pcpanel data (missing pcpid or grouptype).'; // TODO what about default?
-         }
-         break;
        case 'pcpid':
-       case 'grouptype':
+         return $this->pcpid = db_result(db_query("SELECT pcpid FROM {og_collections_pcpanel_join} WHERE pcpname = '%s'", $this->pcpname));
-       case 'pcpname':
-         if (isset($this->did)) {
-           return $this->$member = db_result(db_query("SELECT '%s' FROM {og_collections_pcpanel} WHERE did = %d", $member, $this->did));
-         }
-         else {
-           $exception = 'Not enough information to get retrieve pcpanel data (missing did).';
-         }
-         break;
-       case 'display':
-         return $this->display = panels_load_display($this->did);
+       case 'display':
        case 'context':
-         $this->display->context = array('og_panels' => panels_context_create_empty('group'));
+         $this->load_display();
-         return $this->context = $this->display->context;
+         return $member == 'display' ? $this->display : $this->context;
        case 'content_types':
-         $this->display->content_types = panels_common_get_allowed_types('og_panels', $this->context);
+         panels_load_include('common');
-         return $this->content_types = $this->display->content_types;
+         return $this->content_types = $this->display->content_types = panels_common_get_allowed_types('og_panels', $this->context);
        default:
-         $exception = 'Invalid member requested.';
+         throw new Exception('Either an invalid og_pcpanel element was requested (probably due to a typo), or an as-yet unset element was requested that cannot be loaded on the fly.');
          break;
      }
-     if (isset($exception)) {
+   }
-       throw new Exception($exception);
+   function __set($member, $value) {
+     // used to indicate that a change has been made somewhere in the configuration. flags the object for saving later, if the method is called
+     if ($member == 'modified') {
+       $this->modified = $value;
      }
    }
  } // end og_pcpanel class declaration
  class og_pcpanel_new extends og_pcpanel {
+   function __construct() {
+     $this->pcpid = 'new';// db_next_id("{og_collections_pcpanel}_pcpid"); CAN'T USE THIS YET, only when it's saved
+   }
+   function save($init_values) {
+     $display = panels_new_display();
+     panels_save_display();
+     $this->did = $display->did;
+     $this->pcpid = db_next_id("{og_collections_pcpanel}_pcpid");
+     $this->grouptype = 'default';
+     db_query("INSERT INTO {og_collections_pcpanel} (did, pcpid, grouptype, version) VALUES (%d, %d, '%s', %d", $this->did, $this->pcpid, $this->grouptype, 0);
+     parent::add_pcpanel_column();
+     foreach (array_keys(og_collections_group_types(TRUE)) as $grouptype) {
+       parent::save($init_values);
+     }
+   }
  }
- class og_pcpanel_export extends og_pcpanel {
+ // FIXME this is just a plain cheap trick. do better!
+ class og_pcpanel_transport extends og_pcpanel {
+   function __sleep() {
+     $tosleep = array_keys(get_object_vars($this));
+     return $tosleep;
+   }
+ }
+ class og_pcpanel_empty extends og_pcpanel {
+   function __contruct() {
+     // nothing - it's an empty! this is just here so it doesn't inherit
+   }
  }
-Line 323 
 function og_collections_menu($may_cache)
+Line 595 
 function og_collections_menu($may_cache)
          }
        }
        $items[] = array(
-         'path' => 'admin/og/og_collections/pcpanel',
+         'path' => 'admin/og/og_collections/pcpanel/form',
-         'callback' => 'og_collections_pcpanel_manage',
+         'callback' => 'drupal_get_form',
+         'callback_arguments' => array('og_collections_pcpanel_form'),
          'type' => MENU_CALLBACK,
          'access' => user_access('manage og collections'),
        );
-     }
+       $items[] = array(
+         'path' => 'admin/og/og_collections/pcpanel/edit',
+         'callback' => 'og_collections_pcpanel_edit',
+         'type' => MENU_CALLBACK,
+         'access' => user_access('manage og collections'),
+       );
+       $items[] = array(
+         'path' => 'admin/og/og_collections/pcpanel/delete',
+         'callback' => 'drupal_get_form',
+         'callback arguments' => array('og_collections_pcpanel_delete_confirm'),
+         'type' => MENU_CALLBACK,
+         'access' => user_access('manage og collections'),
+       );
+       $items[] = array(
+         'path' => 'admin/og/og_collections/pcpanel/relink',
+         'callback' => 'drupal_get_form',
+         'callback arguments' => array('og_collections_pcpanel_relink_confirm'),
+         'type' => MENU_CALLBACK,
+         'access' => user_access('manage og collections'),
+       );
+     }
    }
    return $items;
  }
-Line 372 
 function og_collections_group_types($def
+Line 665 
 function og_collections_group_types($def
  function og_collections_admin_collectioncfg($type) {
    $group_types = og_collections_group_types(TRUE);
    drupal_set_title("'". $group_types[$type] ."' Collection");
-   if (og_collections_check_for_pcpanels()) {
+   if (!og_collection::pcpanels_list()) {
      drupal_set_message("You need to create at least one pre-configured panel for OG Collections to operate properly. Use this form to create your first one.");
      drupal_get_destination();
      drupal_goto('admin/og/og_collections/pcpanel/form');
-Line 398 
 function og_collections_admin_collection
+Line 691 
 function og_collections_admin_collection
   *  The group type for which the collection settings are being edited.
   *
   */
- function og_collections_collectioncfg_table($type) {
+ function og_collections_collectioncfg_table($type = 'default') {
-   $collectioncfg = $type == 'default' ? new og_collection() : new og_collection_typed($type);
+   $collectioncfg = $type == 'default' ? new og_collection_default() : new og_collection_typed($type); // FIXME this should be dependent on the global setting, NOT the individual $type value
-   $form['typevar'] = array('#type' => 'hidden', '#value' => $type);
+   $collectioncfg->load_all_pcpanels();
-   // $form['#action'] = arg(3) ? url('admin/og/og_collections/'. $theme_key) : url('admin/build/block');
+   $form['old_default_page'] = array('#type' => 'hidden', '#value' => 0); // initialize to 0 in case no home page is set
+   $form['typevar'] = array('#type' => 'hidden', '#value' => $type);
    $form['#tree'] = TRUE;
    // TODO add a default tab as a means of allowing people to add/remove panel pre-configured panels?
-   foreach ($collectioncfg as $pcpid => $pcpanel) {
+   foreach ($collectioncfg->array_of_pcpanels() as $pcpname => $pcpanel) {
-     $pcpanel = og_collections_load_pcpanel($pcpanel['did'], FALSE, $type);
+     $pcpid = $pcpanel->pcpid;
-     $form[$pcpid]['page_title'] = array('#value' => '#'. $pcpid .': '. $pcpanel->page_title);
+     $form[$pcpid]['page_title'] = array('#value' => $pcpanel->page_title .' (<em>'. $pcpanel->pcpname .'</em>)'); // TODO switch to 'description' font?
      $form[$pcpid]['weight'] = array('#type' => 'weight', '#default_value' => $pcpanel->weight ? $pcpanel->weight : 0);
      $form[$pcpid]['edit'] = array('#value' => l(t('Edit'), "admin/og/og_collections/pcpanel/form/$type/$pcpid", array(), drupal_get_destination()));
+     $form[$pcpid]['enabled'] = array('#type' => 'checkbox', '#default_value' => $pcpanel->enabled);
+     $form[$pcpid]['show_blocks'] = array('#type' => 'checkbox', '#default_value' => $pcpanel->show_blocks);
+     $form[$pcpid]['published'] = array('#type' => 'checkbox', '#default_value' => $pcpanel->published);
      if ($type == 'default') {
        $form[$pcpid]['delete'] = array('#value' => l(t('Delete'), "admin/og/og_collections/pcpanel/delete/$pcpid", array(), drupal_get_destination()));
      }
-     if ($pcpanel->default_page == 1) {
+     if ($pcpanel->default_page == TRUE) {
        $default_page = $pcpid;
+       $form['old_default_page'] = array('#type' => 'hidden', '#value' => $pcpid);
      }
-     if ($pcpanel->active == 1) {
+     $options[$pcpid] = '';
-       $activelist[] = $pcpid;
-     }
-     if ($pcpanel->published == 1) {
-       $publist[] = $pcpid;
-     }
-     if ($pcpanel->show_blocks == 1) {
-       $blklist[] = $pcpid;
-     }
-     $optionshome[$pcpid] = '';
    }
-   $options = $optionshome;
+   // TODO Temporarily disabling this - talk to Moshe about trying to change this to the more intuitive config I have here
-   $optionshome[0] = t('<em>(Do not replace the group homepage with a pre-configured panel)</em>');
+   // $options = $optionshome;
-   // $form[0]; // need to add something here that allows people to DESELECT something as the homepage
+   // $optionshome[0] = t('<em>(Do not replace the group homepage with a pre-configured panel)</em>');
-   $form['active'] = array(
-     '#type' => 'checkboxes',
-     '#options' => $options,
-     '#default_value' => $activelist ? $activelist : NULL,
-   );
    $form['default_page'] = array(
      '#type' => 'radios',
-     '#options' => $optionshome,
-     '#default_value' => $default_page ? $default_page : 0,
-   );
-   $form['published'] = array(
-     '#type' => 'checkboxes',
-     '#options' => $options,
-     '#default_value' => $publist ? $publist : NULL,
-   );
-   $form['show_blocks'] = array(
-     '#type' => 'checkboxes',
      '#options' => $options,
-     '#default_value' => $blklist ? $blklist : NULL,
+     '#default_value' => $default_page ? $default_page : 0,
    );
    $form['submit'] = array(
      '#type' => 'submit',
-Line 464 
 function og_collections_collectioncfg_ta
+Line 739 
 function og_collections_collectioncfg_ta
   */
  function theme_og_collections_collectioncfg_table($form) {
    $isdefault = $form['typevar']['#value'] == 'default' ? TRUE : FALSE;
-   foreach (element_children($form) as $pcpid) {
+   foreach (array_intersect(element_children($form), array_keys(og_collection::pcpanels_list())) as $pcpid) {
-     if (is_numeric($pcpid)) {
+     $row = array(
-       $rows[] = array(
+       drupal_render($form[$pcpid]['page_title']),
-         drupal_render($form[$pcpid]['page_title']),
+       drupal_render($form['default_page'][$pcpid]),
-         drupal_render($form['default_page'][$pcpid]),
+       drupal_render($form[$pcpid]['enabled']),
-         drupal_render($form['active'][$pcpid]),
+       drupal_render($form[$pcpid]['published']),
-         drupal_render($form['published'][$pcpid]),
+       drupal_render($form[$pcpid]['show_blocks']),
-         drupal_render($form['show_blocks'][$pcpid]),
+       drupal_render($form[$pcpid]['weight']),
-         drupal_render($form[$pcpid]['weight']),
+       drupal_render($form[$pcpid]['edit']),
-         drupal_render($form[$pcpid]['edit']),
+     );
-         drupal_render($form[$pcpid]['delete']), // TODO figure out a way to get rid of this if !$isdefault
+     if ($isdefault) {
-       );
+       $row[] = drupal_render($form[$pcpid]['delete']);
      }
+     $rows[] = $row;
+     unset($row);
    }
    $output = drupal_render($form);
-   $oper = $isdefault ? array('data' => t('Operations'), 'align' => 'center', 'colspan' => 2) : array('data' => t('Operations'), 'align' => 'center', 'colspan' => 1);
+   $header = array(t('Panel Name'), t('Home Page'), t('Enabled'), t('Published'), t('Show Blocks'), t('Weight'), array('data' => t('Operations'), 'align' => 'center', 'colspan' => $isdefault ? 2 : 1));
-   $header = array(t('Panel Name'), t('Home Page'), t('Enabled'), t('Published'), t('Show Blocks'), t('Weight'), $oper);
    return theme('table', $header, $rows) . $output;
  }
- function og_collections_collectioncfg_table_validate($form_id, $form_values, $form) {
+ /**
-   // what kind of validation actually needs to be done here? any?
+  * Specialized sort function. Sorts a given collectioncfg $conf array by the following criteria:
+  * 1. Default Page status
+  * 2. Active status (enabled/disabled in the current pre-configured panel)
+  * 3. Weight
+  */
+ function og_collections_sort_collection($a, $b) {
+   if ($b->default_page) {
+     return TRUE;
+   }
+   elseif ($a->default_page) {
+     return FALSE;
+   }
+   $active = $b->enabled - $a->enabled;
+   if ($active) {
+     return $active;
+   }
+   // if ($a['active']) return ($a['weight'] - $b['weight']);
+   return ($a->weight - $b->weight);
  }
+ /**
+  * Submit form changes to class methods for saving to the db.
+  *
+  * TODO once I switch to a js gui frontend, see if the 'modified' value is easier to record dynamically
+  *
+  */
  function og_collections_collectioncfg_table_submit($form_id, $form_values) {
-   $type = $form_values['typevar'];
+   $collectioncfg = $form_values['typevar'] == 'default' ? new og_collection_default() : new og_collection_typed($type); // FIXME this should be dependent on the global setting, NOT the individual $type value
-   $collectioncfg = og_collections_load_collectioncfg($type);
+   $collectioncfg->load_all_pcpanels();
-   foreach (array_keys($collectioncfg) as $pcpid) {
+   if ($form_values['default_page'] != $form_values['old_default_page']) {
-     $collectioncfg[$pcpid]['active'] = (int) $form_values['default_page'] == $pcpid ? 1 : $form_values['active'][$pcpid] ? 1 : 0; // ensures that pcpanels set to be home pages are also active
+     $form_values[$form_values['default_page']]['default_page'] = TRUE;
-     $collectioncfg[$pcpid]['default_page'] = (int) $form_values['default_page'] == $pcpid ? 1 : 0;
+     $form_values[$form_values['old_default_page']]['default_page'] = FALSE;
-     $collectioncfg[$pcpid]['weight'] = (int) $form_values[$pcpid]['weight'];
-     $collectioncfg[$pcpid]['published'] = (int) $form_values['default_page'] == $pcpid ? 1 : ($form_values['published'][$pcpid]) == $pcpid ? 1 : 0; // ensures that pcpanels set to be home pages are also published
-     $collectioncfg[$pcpid]['show_blocks'] = (int) ($form_values['show_blocks'][$pcpid]) == $pcpid ? 1 : 0;
    }
-   if (og_collections_save_collectioncfg($type, $collectioncfg, array_keys($collectioncfg))) {
+   foreach (og_collection::pcpanels_list() as $pcpid => $pcpname) {
-     drupal_set_message(t("Updated '$type' Collection."));
+     $collectioncfg->$pcpname->compare_then_save($form_values[$pcpid]);
    }
+   drupal_set_message(t("Updated !type Collection.", array('!type' => $form_values['typevar'])));
  }
  /**
   * Render the page containing pcpanel-specific configuration links.
   *
-  * @ingroup themeable
   * @param string $type
   *  The group type for which the collection settings are being edited.
   * @return string $output
   *  String of HTML that has (already) been rendered by the theme('page') function... TODO split this into a separate function so it can be themed
   */
  function og_collections_admin_pcpanelsetup($type) {
    $group_types = og_collections_group_types(TRUE);
    drupal_set_title("'". $group_types[$type] ."' Panels Collection");
-   if (count(db_fetch_array(db_query("SELECT * FROM {og_collections} WHERE grouptype = 'default'"))) == 1) {
+   if (!og_collection::pcpanels_list()) {
-     drupal_set_message("You need to create at least one group panel pre-configured panel before you can start configuring them! Use this form to create one.");
+     drupal_set_message("You need to HAVE at least one one group pre-configured panel before you can configure it! Use this form to create one.");
-     drupal_get_destination();
      drupal_goto('admin/og/og_collections/pcpanel/form');
    }
    $collectionsetting = variable_get('og_collections_settings', FALSE);
-Line 533 
 function og_collections_admin_pcpanelset
+Line 831 
 function og_collections_admin_pcpanelset
                  <p>These are just guidelines. At any time, you can remove a type-specific pre-configured panel and cause the group type to begin using Default again instead. You can also copy panel pre-configured panel settings from one group type to another, if you want. But, NOTE that <strong>both of these options are completely irreversible</strong> short of restoring your database from a <a href=\"http://drupal.org/project/backup_migrate\">backup</a>.</p>";
     $linktext = 'adding a new pre-configured panel';
    }
-   $output = t($helptext, array('!link' => l(t($linktext), 'admin/og/og_collections/pcpanel/form', array(), drupal_get_destination())));
-   // looks like we may not need a form, as no data gets submitted or changed directly on this page...begin form substitution!
+   $output = t($helptext, array('!link' => l(t($linktext), 'admin/og/og_collections/pcpanel/form', array(), drupal_get_destination())));
-   $collectioncfg = og_collections_load_collectioncfg($type);
+   // $output .= theme_og_collections_admin_pcpanelsetup($type, FIXME make this themeable
+   $collectioncfg = strtolower($type) == 'default' ? new og_collection_default() : new og_collection_typed($type); // FIXME this should be dependent on the global setting, NOT the individual $type value
+   $collectioncfg->load_all_pcpanels();
    $multi = $collectionsetting == 2 ? TRUE : FALSE;
    $isdefault = strtolower($type) == 'default' ? TRUE : FALSE;
+   $stats = $collectioncfg->get_pcpanel_stats(TRUE);
+   // build configuration table
-   if (!$isdefault) {
+   $rows = array();
-     foreach ($collectioncfg as $pcpid => $pcpanel) {
+   $last_pcpanel = 'none';
-       $pcpanel = og_collections_load_pcpanel($pcpanel['did'], FALSE, $type);
+   foreach ($collectioncfg->array_of_pcpanels() as $pcpname => $pcpanel) {
-       if ($pcpanel->active) {
+     if ($pcpanel->default_page) {
-         $row = array();
+       $rows[] = array(array('data' => t('Group Home Page Panel'), 'class' => 'region', 'colspan' => $isdefault ? 4 : 6));
-         $row['page_title'] = $pcpanel->page_title;
+       $last_status = 'home';
-         $row['usedef'] = $pcpanel->usedef ? 'Yes' : 'No';
+     }
-         $row['default_page'] = $pcpanel->default_page ? 'Yes' : 'No';
+     elseif ($pcpanel->enabled) {
-         $row['content'] = l(t('Content'), "admin/og/og_collections/pcpanel/content/$type/$pcpid", array(), drupal_get_destination());
+       if ($last_status == 'home' || 'none') {
-         $row['layout'] = l(t('Layout'), "admin/og/og_collections/pcpanel/layout/$type/$pcpid", array(), drupal_get_destination());
+         $rows[] = array(array('data' => t('Enabled Pre-Configured Panels'), 'class' => 'region', 'colspan' => $isdefault ? 4 : 6));
-         $row['layset'] = l(t('Layout Settings'), "admin/og/og_collections/pcpanel/layset/$type/$pcpid", array(), drupal_get_destination());
+       }
-         $row['revert'] = $pcpanel->usedef ? 'Already Tied' : l(t('Revert'), "admin/og/og_collections/pcpanel/revert/$type/$pcpid", array(), drupal_get_destination());
+       $last_status = 'enabled';
-         $row['mirror'] = 'Coming Soon';
+     }
+     elseif ($last_status = 'enabled' || 'home') {
-         $rows[] = $row;
+       $rows[] = array(array('data' => t('Disabled Pre-Configured Panels'), 'class' => 'region', 'colspan' => $isdefault ? 4 : 6));
-       }
+       $last_status = 'disabled';
      }
-   }
+     $pcpid = $pcpanel->pcpid;
-   else {
+     $row['page_title'] = $pcpanel->page_title;
-     foreach ($collectioncfg as $pcpid => $pcpanel) {
+     // $row['default_page'] = $pcpanel->default_page ? 'Yes' : 'No';
-       $pcpanel = og_collections_load_pcpanel($pcpanel['did'], FALSE);
+     if (!$isdefault) {
-       if ($pcpanel->active) {
+       $linked_to_default = in_array($pcpname, $collectioncfg->defaults);
-         $row = array();
+       $row['usedef'] = $pcpanel->linked ? 'Yes' : 'No';
-         $row['page_title'] = $pcpanel->page_title;
+       $row['relink'] = $pcpanel->linked ? 'Already Linked' : l(t('Restore Link'), "admin/og/og_collections/pcpanel/relink/$pcpanel->did", array(), drupal_get_destination());
-         $row['default_page'] = $pcpanel->default_page ? 'Yes' : 'No';
+       // $row['import'] = 'Coming Soon'; TODO do it or don't, but don't let it sit
-         $row['content'] = l(t('Content'), "admin/og/og_collections/pcpanel/content/$pcpid", array(), drupal_get_destination());
+     }
-         $row['layout'] = l(t('Layout'), "admin/og/og_collections/pcpanel/layout/$pcpid", array(), drupal_get_destination());
+     if ($pcpanel->enabled) {
-         $row['layset'] = l(t('Layout Settings'), "admin/og/og_collections/pcpanel/layset/$pcpid", array(), drupal_get_destination());
+       $edit_url = $pcpid . ($isdefault ? '' : "/". $type);
-         $row['mirror'] = 'Coming Soon';
+       $row['content'] = l(t('Panel Content'), "admin/og/og_collections/pcpanel/edit/content/$edit_url", array(), drupal_get_destination());
+       $row['layout'] = l(t('Panel Layout'), "admin/og/og_collections/pcpanel/edit/layout/$edit_url", array(), drupal_get_destination());
-         $rows[] = $row; // any utility in making the rows array associative?
+       $row['layset'] = l(t('Panel Layout Settings'), "admin/og/og_collections/edit/pcpanel/layset/$edit_url", array(), drupal_get_destination());
-       }
      }
+     else {
+       $row['filler'] = array('data'=> t('<em>This pre-configured is currently disabled and cannot be operated upon.</em>'), 'align' => 'center', 'colspan' => 3);
+     }
+     $rows[] = $row;
+     unset ($row);
    }
-   if ($isdefault) {
+   $header = array(t('Panel Name'));
-     $header = array(t('Panel Name'), t('Home Page?'), t('Edit Content'), t('Edit Layout'), t('Edit Layout Settings'), t('Import Template'));
+   if (!$isdefault) {
-   }
+     $header[] = t('Tied to Default');
-   else {
+     $header[] = t('Relink with Default');
-     $header = array(t('Panel Name'), t('Tied to Default'), t('Home Page?'), t('Edit Content'), t('Edit Layout'), t('Edit Layout Settings'), t('Revert to Default'), t('Import Template'));
+     // $header[] = t('Import');
    }
-   $linktext = "admin/og/og_collections/collectioncfg";
+   $header[] = array('data' => t('Panel Editing Operations'), 'align' => 'center', 'colspan' => 3);
-   $linktext .= $isdefault ? "" : "/$type";
    $output .= theme('table', $header, $rows);
-   $output .= t('<p>Pre-configured panels that have been disabled in !panpcpanel will not appear in the above list. You must enable them before you can edit them here.</p>', array('!panpcpanel' => l(t('Panel Templates'), $linktext)));
    return $output;
  }
  /*
   * Form to add/edit a pre-configured panel. if a $did is passed in, it edits that pcpanel. if there's no $did, it creates a new pcpanel.
   */
- function og_collections_pcpanel_form($did = NULL) {
+ function og_collections_pcpanel_form($did = 0) {
-   if ($did) {
+   $pcpanel = $did === 0 ? new og_pcpanel_new() : new og_pcpanel($did);
-     $pcpanel = og_collections_load_pcpanel($did, FALSE);
+   $form['did'] = array('#type' => 'value', '#value' => $did);
+   if (!$did) {
+     $form['#redirect'] = FALSE;
    }
+   $form['pcpanel_data'] = array('#type' => 'value', '#value' => serialize($pcpanel));
    drupal_set_title($did ? "Configure $pcpanel->page_title Template" : "Add New Pre-Configured Panel");
-   $form['page_title'] = array(
+   $form['#tree'] = TRUE;
+   $form['pcpvals']['pcpname'] = array(
+     '#title' => t('Panel System Name'),
+     '#type' => 'textfield',
+     '#required' => TRUE,
+     '#default_value' => $pcpanel->pcpname,
+     '#description' => t('The internal system name for this pre-configured panel. Only sitewide OG Collections administrators will ever see this value. Alphanumerics, dashes, and underscores only.'),
+     '#size' => 32,
+   );
+   $form['pcpvals']['page_title'] = array(
      '#title' => t('Panel Name Title'),
      '#type' => 'textfield',
      '#required' => TRUE,
-     '#default_value' => $did ? $pcpanel->page_title : NULL,
+     '#default_value' => $pcpanel->page_title,
-     '#disabled' => $pcpanel->default_page ? TRUE : FALSE,
+     '#description' => t('The default title for og panels (and corresponding navigation tabs) that are instantiated from this pre-configured panel.'),
-     '#description' => t('The title for the page and of the tab that will be used by default when this pre-configured panel is instantiated.'),
      '#size' => 32,
    );
-   $form['path'] = array(
+   $form['pcpvals']['path'] = array(
      '#title' => t('Default Path'),
      '#type' => 'textfield',
      '#default_value' => $pcpanel->default_page ? '' : $pcpanel->path,
      '#required' => $pcpanel->default_page ? FALSE : TRUE,
-     '#description' => $pcpanel->default_page ? t('This pre-configured panel is currently set to act as the group home page and therefore cannot be assigned a default path.') : t('The sub-path (appearing after the root group path) this pre-configured panel will appear at upon instantiation.'),
+     '#description' => $pcpanel->default_page ? t('This pre-configured panel is currently set to act as the group home page and therefore cannot be assigned a default path.') : t('The default path where og panels instantiated by this pre-configured panel will reside.'),
      '#disabled' => $pcpanel->default_page ? TRUE : FALSE,
      '#size' => 32,
    );
-   $form['show_blocks'] = array(
+   $form['pcpvals']['show_blocks'] = array(
      '#title' => t('Show blocks'),
      '#type' => 'checkbox',
-     '#default_value' => $did ? $pcpanel->show_blocks : TRUE,
+     '#default_value' => $pcpanel->show_blocks,
-     '#description' => t('If unchecked, unmodified instantiations of this pre-configured panel will NOT show the standard group blocks.'),
+     '#description' => t('If unchecked, OG Panels instantiated by this pre-configured panel will hide group blocks by default.'),
    );
-   $form['published'] = array(
+   $form['pcpvals']['published'] = array(
      '#type' => 'checkbox',
      '#title' => t('Published'),
-     '#default_value' => $did ? $pcpanel->published : FALSE,
+     '#default_value' => $pcpanel->published,
-     '#description' => t('If unchecked, instantiations of this pre-configured panel will initially be unpublished and viewable only by site or group administrators. Keeping this unchecked is wise if the page contains information that is not automatically present on group creation, and having this page accessible but empty would reflect poorly on the group.'),
+     '#description' => t('If unchecked, OG Panels instantiated by this pre-configured panel will initially be unpublished and viewable only by site or group administrators. Keeping this unchecked is wise if the page contains information that is not automatically present on group creation, and having this page accessible but empty would reflect poorly on the group.'),
    );
+   if (2 == $collectionsetting = variable_get('og_collections_settings', FALSE)) {
+     if (!$did) {
+       $form['pcpvals']['enabled'] = array(
+         '#type' => 'checkbox',
+         '#title' => t('Enabled (in the Collection)'),
+         '#default_value' => FALSE,
+         '#description' => t("Check this box to automatically set this pre-configured panel as 'Enabled' in each one of your OG Collections. The other values ('Published', 'Show Blocks,' and the rest) will be applied to this pre-configured panel in all your Collections whether this box is checked or not."),
+       );
+     }
+     else {
+       $form['propagate'] = array(
+         '#title' => t('Apply these settings to all Collections'),
+         '#type' => 'checkbox',
+         '#default_value' => FALSE,
+         '#description' => t("Check this box if you want the changes you have made to this pre-configured panel to be applied across all Collections. Note that this has NO effect on the panel display configurations (content, layout, layout settings) whatsoever, nor does it affect any default linking/delinking you may have done. It simply 'resets' the overall configuration for this pre-configured panel to be the same across all your Collections."),
+       );
+     }
+   }
    $form['submit'] = array(
      '#type' => 'submit',
-     '#value' => $did ? t('Update Pre-configured Panel') : t('Create Pre-configured Panel'),
+     '#value' => is_null($did) ? t('Update Pre-configured Panel') : t('Create Pre-configured Panel'),
    );
-   $form['did'] = array('#type' => 'value', '#value' => $did);
    return $form;
  }
- // FIXME NEED a validation function to ensure that paths entered are valid.
+ function og_collections_pcpanel_form_validate($form_id, $form) {
- function og_collections_pcpanel_form_validate($form_id, $form_values, $form) {
+   global $form_values;
+   $pcpanel = unserialize($form_values['pcpanel_data']);
+   $pathblacklist = array('view', 'edit', 'delete', 'outline', 'load', 'render', 'clone');
+   if (in_array($form_values['pcpvals']['path'], $pathblacklist)) {
+     form_error($form['pcpvals']['path'], t('%path is a reserved system path, and cannot be used for a group page. Please enter another path.', array('%path' => $form_values['path'])));
+   }
+   else if (preg_match("/[^A-Za-z0-9-]/", $form_values['pcpvals']['path'])) {
+     form_error($form['pcpvals']['path'], t("Panel paths may only contain alphanumeric characters and dashes."));
+   }
+   else if (db_result(db_query("SELECT path FROM {og_collections_pcpanel} WHERE path = '%s' AND 'grouptype' = '%s' AND did <> %d", $form_values['pcpvals']['path'], $form_values['did'], $pcpanel->grouptype))) {
+     form_error($form['pcpvals']['path'], t("That path is currently in use by another one of your group's pages. Please enter another path."));
+   }
+   if (preg_match("/[^A-Za-z0-9_-]/", $form_values['pcpvals']['pcpname'])) {
+     form_error($form['pcpvals']['pcpname'], t("System names can only contain alphanumeric characters, underscores, and dashes."));
+   }
+   elseif (!preg_match("/[A-Za-z_-]/", $form_values['pcpvals']['pcpname'])) {
+     form_error($form['pcpvals']['pcpname'], t("System names must contain at least one non-numeric character."));
+   }
+   elseif (db_result(db_query("SELECT pcpname FROM {og_collections_pcpanel} WHERE pcpname = '%s' AND did <> %d", $form_values['pcpvals']['pcpname']))) {
+     form_error($form['pcpvals']['pcpname'], t("That internal system name is already in use by another pre-configured panel. Please choose another."));
+   }
  }
  /**
   * Creates a new panel pre-configured panel, or modifies an existing one. Also ensures that all relevant
-  * collectioncfgs are updated with the new panel information.
+  * collections are updated with the new panel information.
   **/
  function og_collections_pcpanel_form_submit($form_id, $form_values) {
-   if ($form_values['did']) {
+   $pcpanel = unserialize($form_values['pcpanel_data']);
-     $pcpanel = og_collections_load_pcpanel($form_values['did'], FALSE);
+   if ($pcpanel instanceof og_pcpanel_new) {
-     $pcpanel->page_title = $form_values['page_title'];
+     $pcpanel->save($form_values['pcpvals']);
-     $pcpanel->path = $form_values['path'];
+     drupal_set_message(t("The pre-configured panel '%title' was created, and has been added to the Default collection. You must now select a default layout.", array('%title' => $pcpanel->title)));
-     $pcpanel->show_blocks = $form_values['show_blocks'];
+     return array('admin/og/og_collections/pcpanel/edit/layout/'. $pcpanel->pcpid, 'destination=/admin/og/og_collections/collectioncfg');
-     $pcpanel->published = $form_values['published'];
+   }
-     og_collections_save_pcpanel($pcpanel);
+   elseif ($pcpanel instanceof og_pcpanel) {
-     drupal_set_message(t('Pre-configured panel "'. $pcpanel->panel_title .'" has successfully been updated.'));
+     drupal_set_message(t("The pre-configured panel '%title' was updated."));
-     return 'admin/og/og_collections/collectioncfg'; // TODO return to the page that the edit was called from?
+     if ($form_values['propagate']) {
-   }
+       foreach (array_keys(og_collections_group_types(TRUE)) as $grouptype) {
-   else {
+         $pcpanel->grouptype = $grouptype;
-     // Create a new display in the default grouptype
+         $pcpanel->save($form_values['pcpvals']);
-     $display = panels_new_display();
-     panels_save_display($display);
-     // grouptype doesn't need to be included; column defaults to 'default', and new panel pcpanels are always in the default grouptype
-     $pcpid = db_next_id("{og_collections_pcpanel}_pcpid");
-     og_collections_manage_db('pcpid_'. $pcpid, 'add');
-     db_query("INSERT INTO {og_collections_pcpanel} (did, pcpid) VALUES (%d, %d)", $display->did, $pcpid);
-     drupal_set_message(t("The pre-configured panel '%title' created, and has been added to the Default collection. You must now select a default layout.", array('%title' => $form_values['page_title'])));
-     // Update all collectioncfgs to reflect new pre-configured panel. might be worth turning this into a hook at some point, at least in the generalized module.
-     // if this mass-update method is useful somewhere else, split it out into some separate function
-     $conf = array(
-       'active' => 0,
-       'default_page' => 0,
-       'weight' => 0,
-       'did' => $display->did,
-       'usedef' => 1,
-       'page_title' => $form_values['page_title'],
-       'path' => $form_values['path'],
-       'published' => $form_values['published'],
-       'show_blocks' =>  $form_values['show_blocks'],
-       'grouptype' => 'default',
-     );
-     $group_types = og_collections_group_types(TRUE);
-     foreach (array_keys($group_types) as $type) {
-       $collectioncfg = og_collections_load_collectioncfg($type);
-       $collectioncfg[$pcpid] = $conf;
-       og_collections_save_collectioncfg($type, $collectioncfg, array($pcpid));
-     }
-     drupal_get_destination();
-     return 'admin/og/og_collections/pcpanel/layout/'. $pcpid; // redirect to layout selection
-   }
- }
- /**
-  * Central pre-configured panel management function, redirects requests based on supplemental args; takes any number of args that can be passed to the
-  * 'admin/og/og_collections/pcpanel' URL and dispatches them appropriately
-  */
- function og_collections_pcpanel_manage() {
-   $args = func_get_args();
-   $op = array_shift($args);
-   $dest = drupal_get_destination();
-   $error = $success = '';
-   $collectionsetting = variable_get('og_collections_settings', FALSE);
-   $multi = $collectionsetting == 1 ? FALSE : TRUE;
-   switch ($op) {
-     case 'form':
-       if (!empty($args[0]) && !empty($args[1])) {
-         if (is_string($args[0]) && is_numeric($args[1])) {
-           if ($pcpanel = og_collections_load_pcpanel(array($args[0], $args[1]))) {
-             $output = drupal_get_form('og_collections_pcpanel_form', $pcpanel->did);
-           }
-           else {
-             $error = 'No pre-configured panel was loaded with the arguments provided.';
-             break;
-           }
-         }
-         else {
-           $error = 'The arguments provided were in an invalid format.';
-           break;
-         }
-       }
-       else {
-         $output = drupal_get_form('og_collections_pcpanel_form');
-       }
-       return $output;
-     case 'layout':
-     case 'content': // FIXME display_edit.inc in Panels needs to be updated with a different return value if the form is cancelled. Or something.
-     case 'layset':
-       if (is_numeric($args[0])) { // editing the default version of a pre-configured panel
-         list($pcpid) = $args;
-         $result = _og_collections_pcpanel_edit($op, $pcpid, $error, $success);
        }
-       elseif (is_string($args[0])) { // editing a group type specific version of a pre-configured panel
+     }
-         list($type, $pcpid) = $args;
+     else {
-         $result = _og_collections_pcpanel_edit($op, $pcpid, $error, $success, $type);
+       $pcpanel->save($form_values['pcpvals']);
-       }
+     }
-       if ($result) {
-         return $result; // only anything is returned into result is when the form strings need to be returned for processing
-       }
-       // all other situations (errors, success, whatever), result in a break
-     break;
-     case 'revert': // reverting a given page pcpanel to default and re-linking it
-       if (!$multi) {
-         $error = 'Reversion is pointless if you are using only one collection for all your group types. How did you even GET here!?!'; // =)
-         break;
-       }
-       if (isset($args[0], $args[1])) {
-         if (is_string($args[0]) && is_numeric($args[1])) {
-           $pcpanel = og_collections_load_pcpanel(array($args[0], $args[1]), FALSE);
-           return drupal_get_form('og_collections_pcpanel_revert_confirm', $pcpanel);
-         }
-       }
-     break;
-     case 'delete': // delete a given pcpanel
-       if (!isset($args[0]) || !is_numeric($args[0])) {
-         $error = 'A valid pcpid must be supplied if you want to delete a pre-configured panel.';
-         break;
-       }
-       if ($multi) {
-         $dids = db_num_rows(db_query("SELECT * FROM {og_collections_pcpanel} WHERE pcpid = %d", $args[0]));
-         drupal_set_message(t('WARNING: Deleting this pre-configured panel will remove it for ALL group types. This will result in the automatic, irreversible deletion of the <strong>%dids</strong> uniquely configured display(s) that correspond to this pre-configured panel. If you just want the pre-configured panel to not be instantiated for a particular group type, simply disable it on the !link', array('%dids' => $dids, '!link' => l(t('Panel Templates'), 'admin/og/og_collections/collectioncfg'))));
-       }
-     return drupal_get_form('og_collections_pcpanel_delete_confirm', $args[0], $multi);
-     break;
-   }
-   if (!empty($error)) {
-     drupal_set_message($error, 'error');
-     drupal_goto();
-   }
-   elseif (!empty($success)) {
-     drupal_set_message($success);
-     drupal_goto();
    }
  }
- function og_collections_pcpanel_revert_confirm($pcpanel) {
+ function og_collections_pcpanel_relink_confirm($did) {
-   $form['pcpid'] = array('#type' => 'value', '#value' => $pcpanel->pcpid);
+   $pcpanel = new og_pcpanel_transport($did);
-   $form['type'] = array('#type' => 'value', '#value' => $pcpanel->grouptype);
+   $form['pcpanel_data'] = array('#type' => 'value', '#value' => serialize($pcpanel));
-   $form['page_title'] = array('#type' => 'value', '#value' => $pcpanel->page_title);
    return confirm_form($form,
-     t('Are you sure you want to revert the type-specific pre-configured panel %title back to the Default type?', array('%title' => $pcpanel->page_title)),
+     t('Are you sure you want to relink the type-specific pre-configured panel %title back to the Default type?', array('%title' => $pcpanel->page_title)),
      "admin/og/og_collections/pcpanelsetup/$pcpanel->grouptype",
-     t('This action CANNOT be undone; any custom type-specific changes you have made to this pre-configured panel will be PERMANENTLY lost.'),
+     t('Any layout, layout settings, or content customizations you have made since delinking this pre-configured panel from the Default collection will be PERMANENTLY lost.'),
-     t('Revert'), t('Cancel')
+     t('Relink'), t('Cancel')
-   );
+   ); // TODO implement that restore feature
  }
- function og_collections_pcpanel_revert_confirm_submit($form_id, $form_values) {
+ function og_collections_pcpanel_relink_confirm_submit($form_id, $form_values) {
-   $pcpanel = og_collections_load_pcpanel(array($form_values['type'], $form_values['pcpid']), FALSE);
+   $pcpanel = unserialize($form_values['pcpanel_data']);
-   $defcollectioncfg = og_collections_load_collectioncfg();
+   $collectioncfg = new og_collection_typed($pcpanel->grouptype);
-   $collectioncfg = og_collections_load_collectioncfg($pcpanel->grouptype);
+   $collectioncfg->relink_pcpanel($pcpanel->pcpname);
-   $collectioncfg[$pcpanel->pcpid]['usedef'] = 1;
+   return 'admin/og/og_collections/pcpanelsetup/'. $pcpanel->grouptype;
-   $collectioncfg[$pcpanel->pcpid]['did'] = $defcollectioncfg[$pcpanel->pcpid]['did'];
-   panels_delete_display($pcpanel->did);
-   db_query("DELETE FROM {og_collections_pcpanel} WHERE pcpid = %d AND grouptype = '%s'", $pcpanel->pcpid, $pcpanel->grouptype);
-   og_collections_save_collectioncfg($pcpanel->grouptype, $collectioncfg, array($pcpanel->pcpid));
  }
  function og_collections_pcpanel_delete_confirm($pcpid) {
-   $collectioncfg = og_collections_load_collectioncfg();
+   $pcpanel = new og_pcpanel(array($pcpid, 'default'));
-   $form['pcpid'] = array('#type' => 'value', '#value' => $pcpid);
+   $form['pcpanel_data'] = array('#type' => 'value', '#value' => serialize($pcpanel));
-   $form['page_title'] = array('#type' => 'value', '#value' => $collectioncfg[$pcpid]['page_title'] ? $collectioncfg[$pcpid]['page_title'] : '');
    return confirm_form($form,
-     t('Are you sure you want to delete the %title pre-configured panel?', array('%title' => $collectioncfg[$pcpid]['page_title'] ? $collectioncfg[$pcpid]['page_title'] : '')),
+     t("Are you sure you want to delete the '%title' pre-configured panel?", array('%title' => $pcpanel->pcpname)),
-     isset($_GET['destination']) ? $_GET['destination'] : 'admin/og/og_collections/collectioncfg',
+     'admin/og/og_collections/collectioncfg',
      t('This action CANNOT be undone.'),
      t('Delete'), t('Cancel')
    );
-Line 830 
 function og_collections_pcpanel_delete($
+Line 1065 
 function og_collections_pcpanel_delete($
    og_collections_manage_db('pcpid_'. $pcpid, 'drop');
  }
- /**
+ function og_collections_pcpanel_edit ($op, $pcpid, $type = 'default') {
-  * Passthrough & handle the Panels API for all three types of panels editing: content, layout, and layout settings.
+       // $error .= 'ERROR: Bad pcpid provided. The pre-configured panel you are attempting to edit does not exist.';
-  *
+   $pcpanel = new og_pcpanel(array($pcpid, $type));
-  * @param string $op
+   if ($pcpanel->linked) {
-  *   string indicating the type of panels editing operation that is being called.
-  * @param int $pcpid
-  * @param string $error
-  * @param string $success
-  * @param string $type
-  * @return mixed
-  *   Returns different variables depending on the stage of the process.
-  */
- function _og_collections_pcpanel_edit($op, $pcpid, &$error, &$success, $type = 'default') {
-   if (!$pcpanel = og_collections_load_pcpanel(array($type, $pcpid), TRUE)) {
-     if ($type == 'default' || !$pcpanel = og_collections_load_pcpanel(array('default', $pcpid), TRUE, $type)) { // only way this happens is with a bad pcpid. error out.
-       $error .= 'ERROR: Bad pcpid provided. The pre-configured panel you are attempting to edit does not exist.';
-       return FALSE;
-     }
-     $isnew = TRUE;
      if (isset($_POST['op']) && $_POST['op'] == 'Cancel') {
-       $success = t('Operation cancelled. A collection-specific panel has NOT been created; your pre-configured panel is still tied to the Default.');
+       drupal_set_message(t('Operation cancelled. A collection-specific panel has NOT been created; your pre-configured panel is still tied to the Default.'));
-       return $success;
+       drupal_goto();
      }
      else {
        $group_types = og_collections_group_types();
        $newdisplay = 'NOTE: The !grouptype collection is currently tied to the Default type for this panel. If you save changes on this page, a version of this pre-configured panel specific to the !grouptype collection will be generated, and this panel\'s link to the Default pre-configured panel will be broken.';
-       drupal_set_message(t($newdisplay, array('!grouptype' => $group_types[$type])));
+       drupal_set_message(t($newdisplay, array('!grouptype' => $group_types[$pcpanel->grouptype])));
      }
    }
    switch ($op) {
      case 'content':
-       $saved = panels_edit($pcpanel->display, NULL, $pcpanel->display->content_types);
+       $saved = panels_edit($pcpanel->display, NULL, $pcpanel->content_types);
        break;
      case 'layout':
        $saved = panels_edit_layout($pcpanel->display, t('Save'), NULL);
-Line 872 
 function _og_collections_pcpanel_edit($o
+Line 1092 
 function _og_collections_pcpanel_edit($o
    }
    if (!isset($_POST['op'])) {
-     $error = FALSE;
      if ($op == 'content') {
        print theme('page', $saved, FALSE);
        return FALSE;
      }
      return $saved;
    }
-   elseif ($_POST['op'] == 'Save' && is_object($saved)) { // if it's not an object at this stage, something's wrong. error out
+   elseif ($_POST['op'] == 'Save') {
-     if ($isnew) {
+     $collectioncfg = $type == 'default' ?  new og_collection_default() : new og_collection_typed($type);
-       $pcpanel->display = og_collections_export_display($pcpanel->display);
+     if ($pcpanel->linked) {
-       panels_save_display($pcpanel->display);
+       $collectioncfg->delink_pcpanel($pcpanel);
-       $pcpanel->usedef = 0;
-       $pcpanel->did = $pcpanel->display->did;
-       $pcpanel->grouptype = $type;
-       og_collections_save_pcpanel($pcpanel, TRUE);
      }
-     $success = 'The settings for this pre-configured panel have been successfully updated.';
+     $collectioncfg->save();
+     drupal_set_message(t('The settings for this pre-configured panel have been successfully updated.'));
    }
    else {
-         $error .= 'An unknown error occurred, causing the panels edit function to return an unidentified string. No changes have been saved to the pre-configured panel, but changes MAY have been saved to the panels display.'; // returns string on errors
+         // $error .= 'An unknown error occurred, causing the panels edit function to return an unidentified string. No changes have been saved to the pre-configured panel, but changes MAY have been saved to the panels display.'; // returns string on errors
    }
  }
-Line 924 
 function og_collections_admin() {
+Line 1141 
 function og_collections_admin() {
    $form['og_collections']['collectionsetting'] = array(
      '#type' => 'radios',
      '#title' => t('Group Collections Settings'),
      '#options' => $options,
      '#default_value' => $ops,
      '#required' => TRUE,
    );
-Line 937 
 function og_collections_admin() {
+Line 1154 
 function og_collections_admin() {
  function og_collections_admin_submit($form, $form_values) {
    variable_set('og_collections_settings', $form_values['collectionsetting']);
-   if ($form_values['collectionsetting'] == 0) {
+   switch ($form_values['collectionsetting']) {
-     $msg = t('Group Collections have been disabled. Any pre-configured panel configuration you have done will be accessible if you reactive Group Collections.');
+     case 0:
-   }
+       $msg = t('Group Collections have been disabled. Any pre-configured panels you have created will be accessible if you reactive Group Collections.');
-   else if ($form_values['collectionsetting'] == 1) {
+     case 1:
-     $msg = t('Group Collections have been enabled, using one collection for all group types. You can configure your collection in !ogpanel.', array('!ogpanel' => l(t('Panel Templates'), 'admin/og/og_collections/collectioncfg')));
+       $msg = t('Group Collections have been enabled, using one collection for all group types. You can configure your collection in !ogpanel.', array('!ogpanel' => l(t('Panel Templates'), 'admin/og/og_collections/collectioncfg')));
-   }
+     case 2:
-   else if ($form_values['collectionsetting'] == 2) {
+       $msg = t("Group Collections have been enabled, with one pre-configured panel allowed per group type. You can configure all of your collections in !ogpanel.", array('!ogpanel' => l(t('OG Collections Configuration'), 'admin/og/og_collections/collectioncfg')));
-     $msg = t("Group Collections have been enabled, with one pre-configured panel allowed per group type. You can configure all of your collections in !ogpanel. Make sure to set up pre-configured panels for all desired group types now, as there is currently no way to retrofit existing groups with pre-configured panels you update later.", array('!ogpanel' => l(t('OG Collections Configuration'), 'admin/og/og_collections/collectioncfg')));
    }
    drupal_set_message($msg);
    cache_clear_all('*', 'cache_menu', TRUE);
-Line 965 
 function og_collections_nodeapi(&$node,
+Line 1181 
 function og_collections_nodeapi(&$node,
    switch ($op) {
      case 'insert':
        if ($collectionsetting = variable_get('og_collections_settings', FALSE)) {
-         $group_types = og_collections_group_types();
+         if (in_array($node->type, array_keys(og_collections_group_types()))) {
-         if (in_array($node->type, array_keys($group_types))) {
            $multi = $collectionsetting == 1 ? FALSE : TRUE;
-           $defaultcfg = og_collections_load_collectioncfg(); // we'll need the default regardless of $multi
+           og_collections_instantiate_collection($node->nid, $multi ? $node-type : 'default');
-           if ($multi) {
-             $collectioncfg = og_collections_load_collectioncfg($node->type);
-             foreach ($collectioncfg as $pcpid => $conf) {
-               if (!empty($conf['active'])) {
-                 $toinsert[$pcpid] = !empty($conf['usedef']) ? $defaultcfg[$pcpid]['did'] : $conf['did']; // $conf will theoretically have the right $did either way, but this is the surefire way
-               }
-             }
-           }
-           else {
-             $collectioncfg = $defaultcfg;
-             foreach ($collectioncfg as $pcpid => $conf) {
-               if (!empty($conf['active'])) {
-                 $toinsert[$pcpid] = $conf['did'];
-               }
              }