Changeset 9236
- Timestamp:
- 08/12/08 07:59:39 (4 months ago)
- Files:
-
- trunk/jaws/html/include/Jaws/Crypt.php (modified) (2 diffs)
- trunk/jaws/html/include/Jaws/Gadget.php (modified) (11 diffs)
- trunk/jaws/html/include/Jaws/Plugin.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/jaws/html/include/Jaws/Crypt.php
r9235 r9236 54 54 $result = $this->Generate_RSA_KeyPair($key_len, $this->wrapper); 55 55 if (Jaws_Error::isError($result)) { 56 $GLOBALS['app']->Registry->Set('enabled', 'false', ' Crypt');56 $GLOBALS['app']->Registry->Set('enabled', 'false', 'Jaws_Crypt'); 57 57 $GLOBALS['app']->Registry->Commit('core'); 58 58 if (isset($GLOBALS['log'])) { … … 62 62 } 63 63 64 $GLOBALS['app']->Registry->Set('pvt_key', $this->pvt_key->toString(), ' Crypt');65 $GLOBALS['app']->Registry->Set('pub_key', $this->pub_key->toString(), ' Crypt');66 $GLOBALS['app']->Registry->Set('key_start_date', time(), ' Crypt');64 $GLOBALS['app']->Registry->Set('pvt_key', $this->pvt_key->toString(), 'Jaws_Crypt'); 65 $GLOBALS['app']->Registry->Set('pub_key', $this->pub_key->toString(), 'Jaws_Crypt'); 66 $GLOBALS['app']->Registry->Set('key_start_date', time(), 'Jaws_Crypt'); 67 67 $GLOBALS['app']->Registry->Commit('core'); 68 68 } else { trunk/jaws/html/include/Jaws/Gadget.php
r9235 r9236 485 485 $GLOBALS['app']->Registry->Get('main_gadget') != $gadget 486 486 ) { 487 $GLOBALS['app']->Registry->Set(' /gadgets/' . $gadget . '/enabled', 'false');487 $GLOBALS['app']->Registry->Set('enabled', 'false', $gadget, JAWS_REGISTRY_GADGET); 488 488 } 489 489 $GLOBALS['app']->Registry->Commit('core'); //Commit all changes to core … … 528 528 $model->UninstallACLs(); 529 529 530 $GLOBALS['app']->Registry->DeleteKey(' /gadgets/' . $gadget . '/enabled');531 $GLOBALS['app']->Registry->DeleteKey(' /gadgets/' . $gadget . '/version');532 $GLOBALS['app']->Registry->DeleteKey(' /gadgets/' . $gadget . '/requires');530 $GLOBALS['app']->Registry->DeleteKey('enabled', $gadget, JAWS_REGISTRY_GADGET); 531 $GLOBALS['app']->Registry->DeleteKey('version', $gadget, JAWS_REGISTRY_GADGET); 532 $GLOBALS['app']->Registry->DeleteKey('requires', $gadget, JAWS_REGISTRY_GADGET); 533 533 $GLOBALS['app']->Registry->Commit($gadget); //Commit all changes 534 534 $GLOBALS['app']->Registry->Commit('core'); //Commit all changes to core … … 598 598 $pull = str_replace(',' . $gadget, '', $pull); 599 599 } 600 $GLOBALS['app']->Registry->Set(' /gadgets/enabled_items', $pull);600 $GLOBALS['app']->Registry->Set('enabled_gadgets', $pull); 601 601 602 602 $gadgets = $GLOBALS['app']->Registry->Get('allowurl_gadgets'); … … 604 604 $gadgets = str_replace(','.$gadget, '', $gadgets); 605 605 } 606 $GLOBALS['app']->Registry->Set(' /gadgets/allowurl_items', $gadgets);606 $GLOBALS['app']->Registry->Set('allowurl_gadgets', $gadgets); 607 607 608 608 //Autoload stuff … … 611 611 $gadgets = str_replace(','.$gadget, '', $gadgets); 612 612 } 613 $GLOBALS['app']->Registry->Set(' /gadgets/autoload_items', $gadgets);613 $GLOBALS['app']->Registry->Set('autoload_gadgets', $gadgets); 614 614 615 615 //Delete the layout items … … 668 668 if (!in_array($gadget, $gadgets)) { 669 669 $data .= ',' . $gadget; 670 $GLOBALS['app']->Registry->Set(' /gadgets/allowurl_items', $data);670 $GLOBALS['app']->Registry->Set('allowurl_gadgets', $data); 671 671 } 672 672 } elseif (in_array($gadget, $gadgets)) { … … 674 674 $data = str_replace(','.$gadget, '', $data); 675 675 } 676 $GLOBALS['app']->Registry->Set(' /gadgets/allowurl_items', $data);676 $GLOBALS['app']->Registry->Set('allowurl_gadgets', $data); 677 677 } 678 678 … … 684 684 if (!in_array($gadget, $gadgets)) { 685 685 $data .= ',' . $gadget; 686 $GLOBALS['app']->Registry->Set(' /gadgets/autoload_items', $data);686 $GLOBALS['app']->Registry->Set('autoload_gadgets', $data); 687 687 } 688 688 } elseif (in_array($gadget, $gadgets)) { … … 690 690 $data = str_replace(','.$gadget, '', $data); 691 691 } 692 $GLOBALS['app']->Registry->Set(' /gadgets/autoload_items', $data);692 $GLOBALS['app']->Registry->Set('autoload_gadgets', $data); 693 693 } 694 694 … … 790 790 if (!in_array($gadget, $gadgets)) { 791 791 $data .= ',' . $gadget; 792 $GLOBALS['app']->Registry->Set(' /gadgets/allowurl_items', $data);792 $GLOBALS['app']->Registry->Set('allowurl_gadgets', $data); 793 793 } 794 794 } … … 800 800 if (!in_array($gadget, $gadgets)) { 801 801 $data .= ',' . $gadget; 802 $GLOBALS['app']->Registry->Set(' /gadgets/autoload_items', $data);802 $GLOBALS['app']->Registry->Set('autoload_gadgets', $data); 803 803 } 804 804 } trunk/jaws/html/include/Jaws/Plugin.php
r9235 r9236 197 197 $items = $GLOBALS['app']->Registry->Get('enabled_plugins'); 198 198 if (!in_array($plugin, explode(',', $items))) { 199 $GLOBALS['app']->Registry->Set( $pluginskey, $items.','.$plugin);199 $GLOBALS['app']->Registry->Set('enabled_plugins', $items.','.$plugin); 200 200 } 201 201 … … 270 270 } 271 271 272 $GLOBALS['app']->Registry->Set(' /plugins/parse_text/enabled_items', $new);273 $GLOBALS['app']->Registry->DeleteKey(' /plugins/parse_text/' . $plugin . '/enabled');274 $GLOBALS['app']->Registry->DeleteKey(' /plugins/parse_text/' . $plugin . '/use_in');272 $GLOBALS['app']->Registry->Set('enabled_plugins', $new); 273 $GLOBALS['app']->Registry->DeleteKey('enabled', $plugin, JAWS_REGISTRY_PLUGIN); 274 $GLOBALS['app']->Registry->DeleteKey('use_in', $plugin, JAWS_REGISTRY_PLUGIN); 275 275 276 276 require_once $file;
