Index: trunk/kernel/units/general/cat_event_handler.php =================================================================== diff -u -r1566 -r1583 --- trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 1566) +++ trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 1583) @@ -13,7 +13,7 @@ $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard', implode(',', $ids)); $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard_mode', 'copy'); - $this->Application->StoreVar('clipboard', 'COPY-0.'.TABLE_PREFIX.'Products.ResourceId=0'); + $this->Application->StoreVar('clipboard', 'COPY-0.'.$object->TableName.'.ResourceId=0'); $event->redirect_params = Array('opener' => 's', 'pass_events'=>true); //do not go up - STAY } @@ -25,7 +25,7 @@ $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard', implode(',', $ids)); $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard_mode', 'cut'); - $this->Application->StoreVar('clipboard', 'CUT-0.'.TABLE_PREFIX.'Products.ResourceId=0'); + $this->Application->StoreVar('clipboard', 'CUT-0.'.$object->TableName.'.ResourceId=0'); $event->redirect_params = Array('opener' => 's', 'pass_events'=>true); //do not go up - STAY } Index: trunk/core/units/general/cat_event_handler.php =================================================================== diff -u -r1566 -r1583 --- trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 1566) +++ trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 1583) @@ -13,7 +13,7 @@ $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard', implode(',', $ids)); $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard_mode', 'copy'); - $this->Application->StoreVar('clipboard', 'COPY-0.'.TABLE_PREFIX.'Products.ResourceId=0'); + $this->Application->StoreVar('clipboard', 'COPY-0.'.$object->TableName.'.ResourceId=0'); $event->redirect_params = Array('opener' => 's', 'pass_events'=>true); //do not go up - STAY } @@ -25,7 +25,7 @@ $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard', implode(',', $ids)); $this->Application->StoreVar($event->getPrefixSpecial().'_clipboard_mode', 'cut'); - $this->Application->StoreVar('clipboard', 'CUT-0.'.TABLE_PREFIX.'Products.ResourceId=0'); + $this->Application->StoreVar('clipboard', 'CUT-0.'.$object->TableName.'.ResourceId=0'); $event->redirect_params = Array('opener' => 's', 'pass_events'=>true); //do not go up - STAY } Index: trunk/core/units/general/my_application.php =================================================================== diff -u -r1566 -r1583 --- trunk/core/units/general/my_application.php (.../my_application.php) (revision 1566) +++ trunk/core/units/general/my_application.php (.../my_application.php) (revision 1583) @@ -1,46 +1,46 @@ -registerClass('Inp1Parser',MODULES_PATH.'/kernel/units/general/inp1_parser.php','Inp1Parser'); - - $this->registerClass('InpSession',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','Session'); - $this->registerClass('InpSessionStorage',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','SessionStorage'); - - $this->registerClass('kCatDBItem',MODULES_PATH.'/kernel/units/general/cat_dbitem.php'); - $this->registerClass('kCatDBList',MODULES_PATH.'/kernel/units/general/cat_dblist.php'); - $this->registerClass('kCatDBEventHandler',MODULES_PATH.'/kernel/units/general/cat_event_handler.php'); - $this->registerClass('InpLoginEventHandler',MODULES_PATH.'/kernel/units/general/inp_login_event_handler.php','login_EventHandler'); - $this->registerClass('InpDBEventHandler',MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php','kDBEventHandler'); - $this->registerClass('InpTempTablesHandler',MODULES_PATH.'/kernel/units/general/inp_temp_handler.php','kTempTablesHandler'); - $this->registerClass('InpUnitConfigReader',MODULES_PATH.'/kernel/units/general/inp_unit_config_reader.php','kUnitConfigReader'); - - $this->registerClass('InpCustomFieldsHelper',MODULES_PATH.'/kernel/units/general/custom_fields.php','InpCustomFieldsHelper'); - $this->registerClass('kCountryStatesHelper',MODULES_PATH.'/kernel/units/general/country_states.php','CountryStatesHelper'); - } - - /** - * Checks if user is logged in, and creates - * user object if so. User object can be recalled - * later using "u" prefix. Also you may - * get user id by getting "u_id" variable. - * - * @access private - */ - function ValidateLogin() - { - $session =& $this->recallObject('Session'); - $user_id = $session->GetField('PortalUserId'); - if (!$user_id) $user_id = -2; - $this->SetVar('u_id', $user_id); - $this->StoreVar('user_id', $user_id); - } - } - +registerClass('Inp1Parser',MODULES_PATH.'/kernel/units/general/inp1_parser.php','Inp1Parser'); + + $this->registerClass('InpSession',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','Session'); + $this->registerClass('InpSessionStorage',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','SessionStorage'); + + $this->registerClass('kCatDBItem',MODULES_PATH.'/kernel/units/general/cat_dbitem.php'); + $this->registerClass('kCatDBList',MODULES_PATH.'/kernel/units/general/cat_dblist.php'); + $this->registerClass('kCatDBEventHandler',MODULES_PATH.'/kernel/units/general/cat_event_handler.php'); + $this->registerClass('InpLoginEventHandler',MODULES_PATH.'/kernel/units/general/inp_login_event_handler.php','login_EventHandler'); + $this->registerClass('InpDBEventHandler',MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php','kDBEventHandler'); + $this->registerClass('InpTempTablesHandler',MODULES_PATH.'/kernel/units/general/inp_temp_handler.php','kTempTablesHandler'); + $this->registerClass('InpUnitConfigReader',MODULES_PATH.'/kernel/units/general/inp_unit_config_reader.php','kUnitConfigReader'); + + $this->registerClass('InpCustomFieldsHelper',MODULES_PATH.'/kernel/units/general/custom_fields.php','InpCustomFieldsHelper'); + $this->registerClass('kCountryStatesHelper',MODULES_PATH.'/kernel/units/general/country_states.php','CountryStatesHelper'); + } + + /** + * Checks if user is logged in, and creates + * user object if so. User object can be recalled + * later using "u" prefix. Also you may + * get user id by getting "u_id" variable. + * + * @access private + */ + function ValidateLogin() + { + $session =& $this->recallObject('Session'); + $user_id = $session->GetField('PortalUserId'); + if (!$user_id) $user_id = -2; + $this->SetVar('u_id', $user_id); + $this->StoreVar('user_id', $user_id); + } + } + ?> \ No newline at end of file Index: trunk/kernel/units/general/my_application.php =================================================================== diff -u -r1566 -r1583 --- trunk/kernel/units/general/my_application.php (.../my_application.php) (revision 1566) +++ trunk/kernel/units/general/my_application.php (.../my_application.php) (revision 1583) @@ -1,46 +1,46 @@ -registerClass('Inp1Parser',MODULES_PATH.'/kernel/units/general/inp1_parser.php','Inp1Parser'); - - $this->registerClass('InpSession',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','Session'); - $this->registerClass('InpSessionStorage',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','SessionStorage'); - - $this->registerClass('kCatDBItem',MODULES_PATH.'/kernel/units/general/cat_dbitem.php'); - $this->registerClass('kCatDBList',MODULES_PATH.'/kernel/units/general/cat_dblist.php'); - $this->registerClass('kCatDBEventHandler',MODULES_PATH.'/kernel/units/general/cat_event_handler.php'); - $this->registerClass('InpLoginEventHandler',MODULES_PATH.'/kernel/units/general/inp_login_event_handler.php','login_EventHandler'); - $this->registerClass('InpDBEventHandler',MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php','kDBEventHandler'); - $this->registerClass('InpTempTablesHandler',MODULES_PATH.'/kernel/units/general/inp_temp_handler.php','kTempTablesHandler'); - $this->registerClass('InpUnitConfigReader',MODULES_PATH.'/kernel/units/general/inp_unit_config_reader.php','kUnitConfigReader'); - - $this->registerClass('InpCustomFieldsHelper',MODULES_PATH.'/kernel/units/general/custom_fields.php','InpCustomFieldsHelper'); - $this->registerClass('kCountryStatesHelper',MODULES_PATH.'/kernel/units/general/country_states.php','CountryStatesHelper'); - } - - /** - * Checks if user is logged in, and creates - * user object if so. User object can be recalled - * later using "u" prefix. Also you may - * get user id by getting "u_id" variable. - * - * @access private - */ - function ValidateLogin() - { - $session =& $this->recallObject('Session'); - $user_id = $session->GetField('PortalUserId'); - if (!$user_id) $user_id = -2; - $this->SetVar('u_id', $user_id); - $this->StoreVar('user_id', $user_id); - } - } - +registerClass('Inp1Parser',MODULES_PATH.'/kernel/units/general/inp1_parser.php','Inp1Parser'); + + $this->registerClass('InpSession',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','Session'); + $this->registerClass('InpSessionStorage',MODULES_PATH.'/kernel/units/general/inp_ses_storage.php','SessionStorage'); + + $this->registerClass('kCatDBItem',MODULES_PATH.'/kernel/units/general/cat_dbitem.php'); + $this->registerClass('kCatDBList',MODULES_PATH.'/kernel/units/general/cat_dblist.php'); + $this->registerClass('kCatDBEventHandler',MODULES_PATH.'/kernel/units/general/cat_event_handler.php'); + $this->registerClass('InpLoginEventHandler',MODULES_PATH.'/kernel/units/general/inp_login_event_handler.php','login_EventHandler'); + $this->registerClass('InpDBEventHandler',MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php','kDBEventHandler'); + $this->registerClass('InpTempTablesHandler',MODULES_PATH.'/kernel/units/general/inp_temp_handler.php','kTempTablesHandler'); + $this->registerClass('InpUnitConfigReader',MODULES_PATH.'/kernel/units/general/inp_unit_config_reader.php','kUnitConfigReader'); + + $this->registerClass('InpCustomFieldsHelper',MODULES_PATH.'/kernel/units/general/custom_fields.php','InpCustomFieldsHelper'); + $this->registerClass('kCountryStatesHelper',MODULES_PATH.'/kernel/units/general/country_states.php','CountryStatesHelper'); + } + + /** + * Checks if user is logged in, and creates + * user object if so. User object can be recalled + * later using "u" prefix. Also you may + * get user id by getting "u_id" variable. + * + * @access private + */ + function ValidateLogin() + { + $session =& $this->recallObject('Session'); + $user_id = $session->GetField('PortalUserId'); + if (!$user_id) $user_id = -2; + $this->SetVar('u_id', $user_id); + $this->StoreVar('user_id', $user_id); + } + } + ?> \ No newline at end of file Index: trunk/core/kernel/processors/main_processor.php =================================================================== diff -u -r1560 -r1583 --- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 1560) +++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 1583) @@ -104,7 +104,8 @@ $params['t'] = $params['template']; unset($params['template']); } - if (!isset($params['pass'])) $params['pass'] = 'm'; + if (!isset($params['pass']) && !isset($params['no_pass'])) $params['pass'] = 'm'; + if (isset($params['no_pass'])) unset($params['no_pass']); return $this->T($params); }