Changeset 9235
- Timestamp:
- 08/12/08 07:42:11 (4 months ago)
- Files:
-
- trunk/jaws/html/include/Jaws.php (modified) (2 diffs)
- trunk/jaws/html/include/Jaws/ACL.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Crypt.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/FTP.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Gadget.php (modified) (18 diffs)
- trunk/jaws/html/include/Jaws/InitApplication.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Layout.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Mail.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Plugin.php (modified) (3 diffs)
- trunk/jaws/html/include/Jaws/Registry.php (modified) (4 diffs)
- trunk/jaws/html/include/Jaws/Session.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Session/Cache.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Session/Web.php (modified) (4 diffs)
- trunk/jaws/html/include/Jaws/Shared.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/URLMapping.php (modified) (2 diffs)
- trunk/jaws/html/include/Jaws/User.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/Widgets/TextArea.php (modified) (2 diffs)
- trunk/jaws/html/include/Jaws/Widgets/TinyMCE.php (modified) (1 diff)
- trunk/jaws/html/include/Jaws/XSS.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/jaws/html/include/Jaws.php
r9232 r9235 493 493 $installedGadgets = array(); 494 494 495 $gs = explode(',', $GLOBALS['app']->Registry->Get(' /gadgets/enabled_items'));496 $ci = explode(',', $GLOBALS['app']->Registry->Get(' /gadgets/core_items'));495 $gs = explode(',', $GLOBALS['app']->Registry->Get('enabled_gadgets')); 496 $ci = explode(',', $GLOBALS['app']->Registry->Get('enabled_core_gadgets')); 497 497 $ci = str_replace(' ', '', $ci); 498 498 … … 801 801 function RunAutoload() 802 802 { 803 $data = $GLOBALS['app']->Registry->Get(' /gadgets/autoload_items');803 $data = $GLOBALS['app']->Registry->Get('autoload_gadgets'); 804 804 $gadgets = explode(',', $data); 805 805 foreach($gadgets as $gadgetName) { trunk/jaws/html/include/Jaws/ACL.php
r7922 r9235 425 425 function LoadAllFiles() 426 426 { 427 $gs = explode(',', $GLOBALS['app']->Registry->Get(' /gadgets/enabled_items'));428 $ci = explode(',', $GLOBALS['app']->Registry->Get(' /gadgets/core_items'));427 $gs = explode(',', $GLOBALS['app']->Registry->Get('enabled_gadgets')); 428 $ci = explode(',', $GLOBALS['app']->Registry->Get('enabled_core_gadgets')); 429 429 430 430 $ci = str_replace(' ', '', $ci); trunk/jaws/html/include/Jaws/Crypt.php
r9232 r9235 42 42 return new Jaws_Error('$GLOBALS[\'app\'] not available', 'CRYPT', JAWS_ERROR_ERROR); 43 43 } 44 if ($GLOBALS['app']->Registry->Get(' /crypt/enabled') != 'true') {44 if ($GLOBALS['app']->Registry->Get('enabled', 'Jaws_Crypt') != 'true') { 45 45 return false; 46 46 } 47 47 48 $pvt_key = $GLOBALS['app']->Registry->Get(' /crypt/pvt_key');49 $pub_key = $GLOBALS['app']->Registry->Get(' /crypt/pub_key');50 $key_len = $GLOBALS['app']->Registry->Get(' /crypt/key_len');51 $key_age = $GLOBALS['app']->Registry->Get(' /crypt/key_age');52 $key_start_date = $GLOBALS['app']->Registry->Get(' /crypt/key_start_date');48 $pvt_key = $GLOBALS['app']->Registry->Get('pvt_key', 'Jaws_Crypt'); 49 $pub_key = $GLOBALS['app']->Registry->Get('pub_key', 'Jaws_Crypt'); 50 $key_len = $GLOBALS['app']->Registry->Get('key_len', 'Jaws_Crypt'); 51 $key_age = $GLOBALS['app']->Registry->Get('key_age', 'Jaws_Crypt'); 52 $key_start_date = $GLOBALS['app']->Registry->Get('key_start_date', 'Jaws_Crypt'); 53 53 if (time() > ($key_start_date + $key_age)) { 54 54 $result = $this->Generate_RSA_KeyPair($key_len, $this->wrapper); trunk/jaws/html/include/Jaws/FTP.php
r7922 r9235 84 84 function LoadFTPSettings() 85 85 { 86 $this->_hostname = $GLOBALS['app']->Registry->Get(' /network/ftp_host');87 $this->_port = $GLOBALS['app']->Registry->Get(' /network/ftp_port');88 $this->_passive = $GLOBALS['app']->Registry->Get(' /network/ftp_mode') == 'passive';89 $this->_username = $GLOBALS['app']->Registry->Get(' /network/ftp_user');90 $this->_password = $GLOBALS['app']->Registry->Get(' /network/ftp_pass');91 $this->_root = $GLOBALS['app']->Registry->Get(' /network/ftp_root');86 $this->_hostname = $GLOBALS['app']->Registry->Get('ftp_host', 'Jaws_FTP'); 87 $this->_port = $GLOBALS['app']->Registry->Get('ftp_port', 'Jaws_FTP'); 88 $this->_passive = $GLOBALS['app']->Registry->Get('ftp_mode', 'Jaws_FTP') == 'passive'; 89 $this->_username = $GLOBALS['app']->Registry->Get('ftp_user', 'Jaws_FTP'); 90 $this->_password = $GLOBALS['app']->Registry->Get('ftp_pass', 'Jaws_FTP'); 91 $this->_root = $GLOBALS['app']->Registry->Get('ftp_root', 'Jaws_FTP'); 92 92 93 93 return true; trunk/jaws/html/include/Jaws/Gadget.php
r9232 r9235 318 318 // is an empty action? 319 319 if (empty($this->_Action) || $this->_Action == 'DefaultAction') { 320 $this->_Action = $GLOBALS['app']->Registry->Get(' /gadgets/' . $this->_Name . '/default_action');320 $this->_Action = $GLOBALS['app']->Registry->Get('default_action', $this->_Name, JAWS_REGISTRY_GADGET); 321 321 if (empty($this->_Action)) { 322 322 $this->_Action = 'DefaultAction'; … … 400 400 } 401 401 402 $plugins = $GLOBALS['app']->Registry->Get(' /plugins/parse_text/enabled_items');402 $plugins = $GLOBALS['app']->Registry->Get('enabled_plugins'); 403 403 if (!Jaws_Error::isError($plugins) && !empty($plugins)) { 404 404 $plugins = explode(',', $plugins); … … 407 407 if (file_exists($file)) { 408 408 $GLOBALS['app']->Registry->LoadFile($plugin, 'plugins'); 409 $use_in = $GLOBALS['app']->Registry->Get(' /plugins/parse_text/' . $plugin . '/use_in');409 $use_in = $GLOBALS['app']->Registry->Get('use_in', $plugin, JAWS_REGISTRY_PLUGIN); 410 410 if (!Jaws_Error::isError($use_in) && ($use_in == '*' || in_array($gadget, explode(',', $use_in)))) { 411 411 if (!isset($GLOBALS['plugins'][$plugin]['obj'])) { … … 450 450 // Check if gadget is enabled 451 451 ///FIXME check for errors 452 if ($GLOBALS['app']->Registry->Get(' /gadgets/' . $gadget . '/enabled') != 'true') {452 if ($GLOBALS['app']->Registry->Get('enabled', $gadget, JAWS_REGISTRY_GADGET) != 'true') { 453 453 Jaws_Error::Fatal('Gadget is not enabled', __FILE__, __LINE__); 454 454 } … … 482 482 483 483 if ( 484 $GLOBALS['app']->Registry->Get(' /gadgets/' . $gadget . '/enabled') == 'true' &&484 $GLOBALS['app']->Registry->Get('enabled', $gadget, JAWS_REGISTRY_GADGET) == 'true' && 485 485 $GLOBALS['app']->Registry->Get('main_gadget') != $gadget 486 486 ) { … … 555 555 // Check if it's a core gadget, thus can't be removed. 556 556 ///FIXME check for errors 557 $core = $GLOBALS['app']->Registry->Get(' /gadgets/core_items');557 $core = $GLOBALS['app']->Registry->Get('enabled_core_gadgets'); 558 558 if (stristr($core, $gadget)) { 559 559 return false; … … 594 594 function _commonDisableGadget($gadget) 595 595 { 596 $pull = $GLOBALS['app']->Registry->Get(' /gadgets/enabled_items');596 $pull = $GLOBALS['app']->Registry->Get('enabled_gadgets'); 597 597 if (stristr($pull, $gadget)) { 598 598 $pull = str_replace(',' . $gadget, '', $pull); … … 600 600 $GLOBALS['app']->Registry->Set('/gadgets/enabled_items', $pull); 601 601 602 $gadgets = $GLOBALS['app']->Registry->Get(' /gadgets/allowurl_items');602 $gadgets = $GLOBALS['app']->Registry->Get('allowurl_gadgets'); 603 603 if (stristr($gadgets, $gadget)) { 604 604 $gadgets = str_replace(','.$gadget, '', $gadgets); … … 607 607 608 608 //Autoload stuff 609 $gadgets = $GLOBALS['app']->Registry->Get(' /gadgets/autoload_items');609 $gadgets = $GLOBALS['app']->Registry->Get('autoload_gadgets'); 610 610 if (stristr($gadgets, $gadget)) { 611 611 $gadgets = str_replace(','.$gadget, '', $gadgets); … … 650 650 } 651 651 652 $currentVersion = $GLOBALS['app']->Registry->Get(' /gadgets/'.$gadget.'/version');652 $currentVersion = $GLOBALS['app']->Registry->Get('version', $gadget, JAWS_REGISTRY_GADGET); 653 653 $newVersion = $info->GetVersion(); 654 654 … … 663 663 $GLOBALS['app']->Registry->Commit($gadget); 664 664 665 $data = $GLOBALS['app']->Registry->Get(' /gadgets/allowurl_items');665 $data = $GLOBALS['app']->Registry->Get('allowurl_gadgets'); 666 666 $gadgets = explode(',', $data); 667 667 if ($info->AllowListURL()) { … … 679 679 //Autoload feature 680 680 $autoloadFeature = file_exists(JAWS_PATH . 'gadgets/' . $gadget . '/Autoload.php'); 681 $data = $GLOBALS['app']->Registry->Get(' /gadgets/autoload_items');681 $data = $GLOBALS['app']->Registry->Get('autoload_gadgets'); 682 682 $gadgets = explode(',', $data); 683 683 if ($autoloadFeature) { … … 745 745 $core = $info->GetAttribute('core_gadget'); 746 746 747 $enabled = '/gadgets/' . $gadget . '/enabled'; 748 $status = $GLOBALS['app']->Registry->Get($enabled); 747 $status = $GLOBALS['app']->Registry->Get('enabled', $gadget, JAWS_REGISTRY_GADGET); 749 748 if ($status !== null) { 750 749 $GLOBALS['app']->Registry->Set('enabled', 'true', $gadget, JAWS_REGISTRY_GADGET); … … 764 763 } 765 764 765 $enabled = '/gadgets/' . $gadget . '/enabled'; 766 766 // Applying the keys that every gadget gets 767 767 $requires = implode($req, ', '); … … 777 777 } 778 778 779 $type = ($core && !is_null($core)) ? ' core_items' : 'enabled_items';780 $items = $GLOBALS['app']->Registry->Get( '/gadgets/' .$type);779 $type = ($core && !is_null($core)) ? 'enabled_core_gadgets' : 'enabled_gadgets'; 780 $items = $GLOBALS['app']->Registry->Get($type); 781 781 $gadgets = explode(',', $items); 782 782 if (!in_array($gadget, $gadgets)) { 783 783 $items .= ',' . $gadget; 784 $GLOBALS['app']->Registry->Set( '/gadgets/' .$type, $items);784 $GLOBALS['app']->Registry->Set($type, $items); 785 785 } 786 786 787 787 if ($info->AllowListURL()) { 788 $data = $GLOBALS['app']->Registry->Get(' /gadgets/allowurl_items');788 $data = $GLOBALS['app']->Registry->Get('allowurl_gadgets'); 789 789 $gadgets = explode(',', $data); 790 790 if (!in_array($gadget, $gadgets)) { … … 796 796 $autoloadFeature = file_exists(JAWS_PATH . 'gadgets/' . $gadget . '/Autoload.php'); 797 797 if ($autoloadFeature) { 798 $data = $GLOBALS['app']->Registry->Get(' /gadgets/autoload_items');798 $data = $GLOBALS['app']->Registry->Get('autoload_gadgets'); 799 799 $gadgets = explode(',', $data); 800 800 if (!in_array($gadget, $gadgets)) { … … 826 826 827 827 ///FIXME registry get has to be checked for errors 828 $items = trim($GLOBALS['app']->Registry->Get(' /gadgets/enabled_items'));828 $items = trim($GLOBALS['app']->Registry->Get('enabled_gadgets')); 829 829 if (!empty($items) && substr($items,-1) != ',') { 830 830 $items .= ','; 831 831 } 832 832 833 $items.= $GLOBALS['app']->Registry->Get(' /gadgets/core_items');833 $items.= $GLOBALS['app']->Registry->Get('enabled_core_gadgets'); 834 834 if (is_dir(JAWS_PATH . 'gadgets/' . $gadget) && 835 $GLOBALS['app']->Registry->Get(' /gadgets/'.$gadget.'/enabled') == 'true' &&835 $GLOBALS['app']->Registry->Get('enabled', $gadget, JAWS_REGISTRY_GADGET) == 'true' && 836 836 in_array($gadget, explode(',', $items))) 837 837 { … … 858 858 } 859 859 860 $current_version = $GLOBALS['app']->Registry->Get(' /gadgets/'.$gadget.'/version');860 $current_version = $GLOBALS['app']->Registry->Get('version', $gadget, JAWS_REGISTRY_GADGET); 861 861 $gadget_version = $info->GetVersion();; 862 862 trunk/jaws/html/include/Jaws/InitApplication.php
r9184 r9235 74 74 $GLOBALS['app']->create(); 75 75 76 if ($GLOBALS['app']->Registry->Get(' /version') != JAWS_VERSION) {76 if ($GLOBALS['app']->Registry->Get('version') != JAWS_VERSION) { 77 77 header('Location: upgrade/index.php'); 78 78 } trunk/jaws/html/include/Jaws/Layout.php
r9232 r9235 488 488 function PutGadget($gadget, $action, $section, $requested = false) 489 489 { 490 $enabled = $GLOBALS['app']->Registry->Get(' /gadgets/' . $gadget . '/enabled');490 $enabled = $GLOBALS['app']->Registry->Get('enabled', $gadget, JAWS_REGISTRY_GADGET); 491 491 if (Jaws_Error::isError($enabled)) { 492 492 $enabled = 'false'; trunk/jaws/html/include/Jaws/Mail.php
r8027 r9235 106 106 107 107 // Get the Mail settings data from Registry 108 $this->mailer = $GLOBALS['app']->Registry->Get(' /network/mailer');109 $this->from_email = $GLOBALS['app']->Registry->Get(' /network/from_email');110 $this->from_name = $GLOBALS['app']->Registry->Get(' /network/from_name');108 $this->mailer = $GLOBALS['app']->Registry->Get('mailer', 'Jaws_Mail'); 109 $this->from_email = $GLOBALS['app']->Registry->Get('from_email', 'Jaws_Mail'); 110 $this->from_name = $GLOBALS['app']->Registry->Get('from_name', 'Jaws_Mail'); 111 111 112 112 $params = array(); 113 $params['sendmail_path'] = $GLOBALS['app']->Registry->Get(' /network/sendmail_path');114 $params['sendmail_args'] = $GLOBALS['app']->Registry->Get(' /network/sendmail_args');115 $params['host'] = $GLOBALS['app']->Registry->Get(' /network/smtp_host');116 $params['port'] = $GLOBALS['app']->Registry->Get(' /network/smtp_port');117 $params['auth'] = $GLOBALS['app']->Registry->Get(' /network/smtp_auth')== 'true';118 $params['pipelining'] = $GLOBALS['app']->Registry->Get(' /network/pipelining') == 'true';119 $params['username'] = $GLOBALS['app']->Registry->Get(' /network/smtp_user');120 $params['password'] = $GLOBALS['app']->Registry->Get(' /network/smtp_pass');113 $params['sendmail_path'] = $GLOBALS['app']->Registry->Get('sendmail_path', 'Jaws_Mail'); 114 $params['sendmail_args'] = $GLOBALS['app']->Registry->Get('sendmail_args', 'Jaws_Mail'); 115 $params['host'] = $GLOBALS['app']->Registry->Get('smtp_host', 'Jaws_Mail'); 116 $params['port'] = $GLOBALS['app']->Registry->Get('smtp_port', 'Jaws_Mail'); 117 $params['auth'] = $GLOBALS['app']->Registry->Get('smtp_auth', 'Jaws_Mail') == 'true'; 118 $params['pipelining'] = $GLOBALS['app']->Registry->Get('pipelining', 'Jaws_Mail') == 'true'; 119 $params['username'] = $GLOBALS['app']->Registry->Get('smtp_user', 'Jaws_Mail'); 120 $params['password'] = $GLOBALS['app']->Registry->Get('smtp_pass', 'Jaws_Mail'); 121 121 122 122 $this->params = $params; trunk/jaws/html/include/Jaws/Plugin.php
r8517 r9235 186 186 $pluginkey = '/plugins/parse_text/' . $plugin . '/enabled'; 187 187 $pluginusein = '/plugins/parse_text/' . $plugin . '/use_in'; 188 $pluginskey = '/plugins/parse_text/enabled_items';189 188 190 189 if ( … … 196 195 197 196 // Put it in the enabled plugin record 198 $items = $GLOBALS['app']->Registry->Get( $pluginskey);197 $items = $GLOBALS['app']->Registry->Get('enabled_plugins'); 199 198 if (!in_array($plugin, explode(',', $items))) { 200 199 $GLOBALS['app']->Registry->Set($pluginskey, $items.','.$plugin); … … 266 265 267 266 268 $pull = $GLOBALS['app']->Registry->Get(' /plugins/parse_text/enabled_items');267 $pull = $GLOBALS['app']->Registry->Get('enabled_plugins'); 269 268 if (stristr($pull, $plugin)) { 270 269 $new = eregi_replace(',' . $plugin, '', $pull); trunk/jaws/html/include/Jaws/Registry.php
r9232 r9235 122 122 * @return bool true when the key was found, else false 123 123 */ 124 function KeyExists($name, $comp = ' ', $type = JAWS_REGISTRY_CORE)124 function KeyExists($name, $comp = 'Jaws', $type = JAWS_REGISTRY_CORE) 125 125 { 126 126 return array_key_exists($name, $this->_Registry[$type][$comp]); … … 136 136 * @return string The value of the key 137 137 */ 138 function Get($name, $comp = ' ', $type = JAWS_REGISTRY_CORE)138 function Get($name, $comp = 'Jaws', $type = JAWS_REGISTRY_CORE) 139 139 { 140 140 return $this->KeyExists($name, $comp, $type) ? $this->_Registry[$type][$comp][$name] : null; … … 192 192 * @param string $type The type of the component, (core, plugin or a gadget) 193 193 */ 194 function Set($name, $value, $comp = ' ', $type = JAWS_REGISTRY_CORE)194 function Set($name, $value, $comp = 'Jaws', $type = JAWS_REGISTRY_CORE) 195 195 { 196 196 if (!$this->KeyExists($name, $comp, $type)) { … … 233 233 * @param string $type The type of the component, (core, plugin or a gadget) 234 234 */ 235 function NewKey($name, $value, $comp = ' ', $type = JAWS_REGISTRY_CORE)235 function NewKey($name, $value, $comp = 'Jaws', $type = JAWS_REGISTRY_CORE) 236 236 { 237 237 if (!$this->KeyExists($name, $comp, $type)) { trunk/jaws/html/include/Jaws/Session.php
r9232 r9235 315 315 $this->SetAttribute('type', APP_TYPE); 316 316 $this->SetAttribute('life_time', $remember? 317 (int)$GLOBALS['app']->Registry->Get(' /policy/session_remember_timeout')*3600 : 0);317 (int)$GLOBALS['app']->Registry->Get('remember_timeout', 'Jaws_Session')*3600 : 0); 318 318 $this->SetAttribute('updatetime', time()); 319 319 $this->SetAttribute('username', $info['username']); trunk/jaws/html/include/Jaws/Session/Cache.php
r8018 r9235 173 173 { 174 174 $params = array(); 175 $params['expired'] = time() - ($GLOBALS['app']->Registry->Get(' /policy/session_idle_timeout') * 60);175 $params['expired'] = time() - ($GLOBALS['app']->Registry->Get('idle_timeout', 'Jaws_Session') * 60); 176 176 $sql = "DELETE FROM [[session]] WHERE [updatetime] < ({expired} - [life_time])"; 177 177 $result = $GLOBALS['db']->queryAll($sql, $params); trunk/jaws/html/include/Jaws/Session/Web.php
r9232 r9235 66 66 // Create cookie 67 67 $this->SetCookie(JAWS_SESSION_ID, $this->_SessionID, 68 $remember? 60*(int)$GLOBALS['app']->Registry->Get(' /policy/session_remember_timeout') : 0);68 $remember? 60*(int)$GLOBALS['app']->Registry->Get('remember_timeout', 'Jaws_Session') : 0); 69 69 } 70 70 … … 78 78 function SetCookie($name, $value, $minutes = 0) 79 79 { 80 $secure = $GLOBALS['app']->Registry->Get('cookie_secure', ' Session') == 'false';81 $path = $GLOBALS['app']->Registry->Get('cookie_path', ' Session');82 $domain = $GLOBALS['app']->Registry->Get('cookie_domain', ' Session');83 $version = $GLOBALS['app']->Registry->Get('cookie_version', ' Session');80 $secure = $GLOBALS['app']->Registry->Get('cookie_secure', 'Jaws_Session') == 'false'; 81 $path = $GLOBALS['app']->Registry->Get('cookie_path', 'Jaws_Session'); 82 $domain = $GLOBALS['app']->Registry->Get('cookie_domain', 'Jaws_Session'); 83 $version = $GLOBALS['app']->Registry->Get('cookie_version', 'Jaws_Session'); 84 84 $name = $name.'_'.md5($GLOBALS['app']->getSiteURL().'_'.$version); 85 85 setcookie($name, $value, (($minutes ==0)? 0 : time() +(60 * $minutes)), $GLOBALS['app']->getSiteURL(true, true) . '/'); … … 92 92 function GetCookie($name) 93 93 { 94 $version = $GLOBALS['app']->Registry->Get('cookie_version', ' Session');94 $version = $GLOBALS['app']->Registry->Get('cookie_version', 'Jaws_Session'); 95 95 $name = $name.'_'.md5($GLOBALS['app']->getSiteURL().'_'.$version); 96 96 if (isset($_COOKIE[$name])) { … … 107 107 function DestroyCookie($name) 108 108 { 109 $secure = $GLOBALS['app']->Registry->Get('cookie_secure', ' Session') == 'false';110 $path = $GLOBALS['app']->Registry->Get('cookie_path', ' Session');111 $domain = $GLOBALS['app']->Registry->Get('cookie_domain', ' Session');112 $version = $GLOBALS['app']->Registry->Get('cookie_version', ' Session');109 $secure = $GLOBALS['app']->Registry->Get('cookie_secure', 'Jaws_Session') == 'false'; 110 $path = $GLOBALS['app']->Registry->Get('cookie_path', 'Jaws_Session'); 111 $domain = $GLOBALS['app']->Registry->Get('cookie_domain', 'Jaws_Session'); 112 $version = $GLOBALS['app']->Registry->Get('cookie_version', 'Jaws_Session'); 113 113 $name = $name.'_'.md5($GLOBALS['app']->getSiteURL().'_'.$version); 114 114 setcookie($name, '', time() - 36000, $GLOBALS['app']->getSiteURL(true, true) . '/'); trunk/jaws/html/include/Jaws/Shared.php
r7922 r9235 578 578 } 579 579 } else { 580 $res = $GLOBALS['app']->Registry->Get(' /Shared/default_rule');580 $res = $GLOBALS['app']->Registry->Get('default_rule', 'Jaws_Shared'); 581 581 if ($res == 'ACCEPT') { 582 582 return true; trunk/jaws/html/include/Jaws/URLMapping.php
r9232 r9235 39 39 { 40 40 if ($enabled === null) { 41 $enabled = ($GLOBALS['app']->Registry->Get(' /map/enabled') == 'true');41 $enabled = ($GLOBALS['app']->Registry->Get('enabled', 'Jaws_URLMapping') == 'true'); 42 42 } 43 43 44 44 if ($use_file === null) { 45 $use_file = ($GLOBALS['app']->Registry->Get(' /map/use_file')== 'true');45 $use_file = ($GLOBALS['app']->Registry->Get('use_file', 'Jaws_URLMapping') == 'true'); 46 46 } 47 47 48 48 if ($use_rewrite === null) { 49 $use_rewrite = ($GLOBALS['app']->Registry->Get(' /map/use_rewrite') == 'true');49 $use_rewrite = ($GLOBALS['app']->Registry->Get('use_rewrite', 'Jaws_URLMapping') == 'true'); 50 50 } 51 51 52 52 if ($use_aliases === null) { 53 $use_aliases = ($GLOBALS['app']->Registry->Get(' /map/use_aliases') == 'true');53 $use_aliases = ($GLOBALS['app']->Registry->Get('use_aliases', 'Jaws_URLMapping') == 'true'); 54 54 } 55 55 56 56 if ($to_use === null) { 57 $to_use = $GLOBALS['app']->Registry->Get(' /map/map_to_use');57 $to_use = $GLOBALS['app']->Registry->Get('map_to_use', 'Jaws_URLMapping'); 58 58 } 59 59 60 60 if ($extension === null) { 61 $extension = $GLOBALS['app']->Registry->Get(' /map/extensions');61 $extension = $GLOBALS['app']->Registry->Get('extensions', 'Jaws_URLMapping'); 62 62 } 63 63 … … 230 230 { 231 231 $this->_loaded_from_gadgets = false; 232 $gadgets = $GLOBALS['app']->Registry->Get(' /gadgets/enabled_items');233 $cgadgets = $GLOBALS['app']->Registry->Get(' /gadgets/core_items');232 $gadgets = $GLOBALS['app']->Registry->Get('enabled_items'); 233 $cgadgets = $GLOBALS['app']->Registry->Get('core_items'); 234 234 235 235 $gadgets = explode(',', $gadgets); trunk/jaws/html/include/Jaws/User.php
r8187 r9235 42 42 } 43 43 44 if ($result['bad_passwd_count'] >= $GLOBALS['app']->Registry->Get(' /policy/passwd_bad_count') &&45 ((time() - $result['last_access']) <= $GLOBALS['app']->Registry->Get(' /policy/passwd_lockedout_time')))44 if ($result['bad_passwd_count'] >= $GLOBALS['app']->Registry->Get('passwd_bad_count', 'Jaws_Policy') && 45 ((time() - $result['last_access']) <= $GLOBALS['app']->Registry->Get('passwd_lockedout_time', 'Jaws_Policy'))) 46 46 { 47 47 return new Jaws_Error(_t('GLOBAL_ERROR_LOGIN_LOCKED_OUT')); trunk/jaws/html/include/Jaws/Widgets/TextArea.php
r7922 r9235 192 192 function extraBuild() 193 193 { 194 $availablePlugins = explode(',', $GLOBALS['app']->Registry->Get(' /plugins/parse_text/enabled_items'));194 $availablePlugins = explode(',', $GLOBALS['app']->Registry->Get('enabled_plugins')); 195 195 foreach ($availablePlugins as $plugin) { 196 196 if (empty($plugin)) { … … 199 199 200 200 $file = JAWS_PATH . 'plugins/' . $plugin . '/' . $plugin . '.php'; 201 $use_in = '/plugins/parse_text/' . $plugin . '/use_in';202 201 $GLOBALS['app']->Registry->LoadFile($plugin, 'plugins'); 203 if (file_exists($file) && 204 ( 205 in_array($this->_Gadget, explode(',', $GLOBALS['app']->Registry->Get($use_in))) || 206 $GLOBALS['app']->Registry->Get($use_in) == '*' 207 ) 208 ) { 202 $use_in = $GLOBALS['app']->Registry->Get('use_in', $plugin, JAWS_REGISTRY_PLUGIN); 203 if (file_exists($file) && (in_array($this->_Gadget, explode(',', $use_in)) || $use_in == '*')) { 209 204 require_once $file; 210 205 $plugintmp = new $plugin(); 211 206 $plugincontrol = $plugintmp->GetWebControl($this->_Name); 212 213 207 if (is_object($plugincontrol)) { 214 208 $plugincontrolValue = $plugincontrol->Get(); trunk/jaws/html/include/Jaws/Widgets/TinyMCE.php
r8607 r9235 154 154 /* 155 155 $pluginTemplate = file_get_contents(JAWS_PATH . 'libraries/tinymce/plugin_template.js'); 156 $availablePlugins = explode(',', $GLOBALS['app']->Registry->Get(' /plugins/parse_text/enabled_items'));156 $availablePlugins = explode(',', $GLOBALS['app']->Registry->Get('enabled_plugins')); 157 157 foreach ($availablePlugins as $plugin) { 158 158 $file = JAWS_PATH . 'plugins/' . $plugin . '/' . $plugin . '.php'; 159 $use_in = '/plugins/parse_text/' . $plugin . '/use_in';160 159 $GLOBALS['app']->Registry->LoadFile($plugin, 'plugins'); 161 if (file_exists($file) && 162 (in_array($this->_Gadget, explode(',', $GLOBALS['app']->Registry->Get($use_in))) || 163 $GLOBALS['app']->Registry->Get($use_in) == '*')) 164 { 160 $use_in = $GLOBALS['app']->Registry->Get('use_in', $plugin, JAWS_REGISTRY_PLUGIN); 161 if (file_exists($file) && (in_array($this->_Gadget, explode(',', $use_in)) || $use_in == '*')) { 165 162 require_once $file; 166 163 $plugintmp = new $plugin(); 167 164 $plugincontrol = $plugintmp->GetWebControl("'".$this->TextArea->getID()."'"); 168 169 165 if (is_object($plugincontrol)) { 170 166 $plugincontrolValue = $plugincontrol->Get(); trunk/jaws/html/include/Jaws/XSS.php
r7922 r9235 32 32 33 33 if (is_null($strict)) { 34 $strict = ($GLOBALS['app']->Registry->Get(' /policy/xss_parsing_level') == "paranoid")? true : false;34 $strict = ($GLOBALS['app']->Registry->Get('xss_parsing_level', 'Jaws_Policy') == "paranoid")? true : false; 35 35 } 36 36
