\n"; - } - else { - $res .= "$fld_translation: {$data['new']}
\n"; - } + if ( array_key_exists('old', $data) && array_key_exists('new', $data) ) { + $res .= "$fld_translation: {$data['old']} => {$data['new']}
\n"; } else { - if ($format == 'auto_cut') { - $data = $this->cutValue($data); - } - - $res .= "$fld_translation: {$data}
\n"; + $res .= "$fld_translation: {$data['new']}
\n"; } + } + else { + if ( $format == 'auto_cut' ) { + $data = $this->cutValue($data); + } + $res .= "$fld_translation: {$data}
\n"; } - return $res; } - function cutValue($data) - { - if (strlen($data) > 200) { - $data = substr($data, 0, 50) . ' ...'; - } + return $res; + } - return $data; + function cutValue($data) + { + if ( strlen($data) > 200 ) { + $data = substr($data, 0, 50) . ' ...'; } - } \ No newline at end of file + + return $data; + } +} \ No newline at end of file Index: branches/5.2.x/core/units/thesaurus/thesaurus_eh.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/thesaurus/thesaurus_eh.php (.../thesaurus_eh.php) (revision 14244) +++ branches/5.2.x/core/units/thesaurus/thesaurus_eh.php (.../thesaurus_eh.php) (revision 14628) @@ -1,6 +1,6 @@ _Params[$name] = $val; } @@ -79,11 +80,11 @@ * Gets parameter value by parameter name * * @param string $name Name of variable to retrieve - * @param int $default default value returned in case if varible not present + * @param mixed $default default value returned in case if variable not present * @return string * @access public */ - function Get($name, $default = false) + public function Get($name, $default = false) { return isset($this->_Params[$name]) ? $this->_Params[$name] : $default; } Index: branches/5.2.x/core/units/content/content_eh.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 14244) +++ branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ Index: branches/5.2.x/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r14585 -r14628 --- branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14585) +++ branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ Application->GetVar('section_name'); + $sections_helper =& $this->Application->recallObject('SectionsHelper'); + /* @var $sections_helper kSectionsHelper */ + $section_data =& $sections_helper->getSectionData($section_name); $block_params = array_merge($section_data, Array('name' => $params['render_as'], 'section_name' => $section_name)); @@ -326,8 +329,7 @@ $params[$param_name] = kUtil::replaceModuleSection($param_value); } - $m =& $this->Application->recallObject('m_TagProcessor'); - return $m->ModuleInclude($params); + return $this->Application->ProcessParsedTag('m', 'ModuleInclude', $params); } function TodayDate($params) @@ -493,71 +495,83 @@ // user can override default parameters (except pass_through of course) $params = array_merge($default_params, $params); - $main_processor =& $this->Application->recallObject('m_TagProcessor'); - return $main_processor->T($params); + return $this->Application->ProcessParsedTag('m', 'T', $params); } function TimeFrame($params) { $w = adodb_date('w'); $m = adodb_date('m'); $y = adodb_date('Y'); + //FirstDayOfWeek is 0 for Sunday and 1 for Monday $fdow = $this->Application->ConfigValue('FirstDayOfWeek'); - if ($fdow && $w == 0) $w = 7; - $today_start = adodb_mktime(0,0,0,adodb_date('m'),adodb_date('d'),$y); - $first_day_of_this_week = $today_start - ($w - $fdow)*86400; - $first_day_of_this_month = adodb_mktime(0,0,0,$m,1,$y); - $this_quater = ceil($m/3); - $this_quater_start = adodb_mktime(0,0,0,$this_quater*3-2,1,$y); - switch ($params['type']) { + if ( $fdow && $w == 0 ) { + $w = 7; + } + $today_start = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), $y); + $first_day_of_this_week = $today_start - ($w - $fdow) * 86400; + $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y); + $this_quater = ceil($m / 3); + $this_quater_start = adodb_mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y); + + switch ( $params['type'] ) { case 'last_week_start': - $timestamp = $first_day_of_this_week - 86400*7; + $timestamp = $first_day_of_this_week - 86400 * 7; break; + case 'last_week_end': $timestamp = $first_day_of_this_week - 1; break; case 'last_month_start': - $timestamp = $m == 1 ? adodb_mktime(0,0,0,12,1,$y-1) : adodb_mktime(0,0,0,$m-1,1,$y); + $timestamp = $m == 1 ? adodb_mktime(0, 0, 0, 12, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 1, 1, $y); break; + case 'last_month_end': - $timestamp = $first_day_of_this_month = adodb_mktime(0,0,0,$m,1,$y) - 1; + $timestamp = $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y) - 1; break; case 'last_quater_start': - $timestamp = $this_quater == 1 ? adodb_mktime(0,0,0,10,1,$y-1) : adodb_mktime(0,0,0,($this_quater-1)*3-2,1,$y); + $timestamp = $this_quater == 1 ? adodb_mktime(0, 0, 0, 10, 1, $y - 1) : adodb_mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y); break; + case 'last_quater_end': $timestamp = $this_quater_start - 1; break; case 'last_6_months_start': - $timestamp = $m <= 6 ? adodb_mktime(0,0,0,$m+6,1,$y-1) : adodb_mktime(0,0,0,$m-6,1,$y); + $timestamp = $m <= 6 ? adodb_mktime(0, 0, 0, $m + 6, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 6, 1, $y); break; case 'last_year_start': - $timestamp = adodb_mktime(0,0,0,1,1,$y-1); + $timestamp = adodb_mktime(0, 0, 0, 1, 1, $y - 1); break; + case 'last_year_end': - $timestamp = adodb_mktime(23,59,59,12,31,$y-1); + $timestamp = adodb_mktime(23, 59, 59, 12, 31, $y - 1); break; + + default: + $timestamp = 0; + break; } - - if (isset($params['format'])) { + if ( isset($params['format']) ) { $format = $params['format']; - if(preg_match("/_regional_(.*)/", $format, $regs)) - { + + if ( preg_match("/_regional_(.*)/", $format, $regs) ) { $lang =& $this->Application->recallObject('lang.current'); + /* @var $lang LanguagesItem */ + $format = $lang->GetDBField($regs[1]); } + return adodb_date($format, $timestamp); } return $timestamp; - } /** @@ -813,14 +827,21 @@ return $skin_helper->AdminSkinTag($params); } - function PrintCompileErrors($params) + /** + * Prints errors, discovered during mass template compilation + * + * @param $params + * @return string + * @access protected + */ + protected function PrintCompileErrors($params) { $block_params = $this->prepareTagParams($params); $block_params['name'] = $params['render_as']; $errors = $this->Application->RecallVar('compile_errors'); - if (!$errors) { - return ; + if ( !$errors ) { + return ''; } $ret = ''; Index: branches/5.2.x/core/units/category_items/category_items_dbitem.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/category_items/category_items_dbitem.php (.../category_items_dbitem.php) (revision 14244) +++ branches/5.2.x/core/units/category_items/category_items_dbitem.php (.../category_items_dbitem.php) (revision 14628) @@ -1,6 +1,6 @@ getLinkedInfo(); + return '(CategoryId=' . $this->GetID() . ' AND ' . $table_info['ForeignKey'] . '=' . $table_info['ParentId'] . ')'; + } - /** - * Returns part of SQL WHERE clause identifing the record, ex. id = 25 - * - * @access public - * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method - * @return void - * @see kDBItem::Load() - * @see kDBItem::Update() - * @see kDBItem::Delete() - */ - function GetKeyClause($method=null) - { - $table_info = $this->getLinkedInfo(); - return '(CategoryId='.$this->ID.' AND '.$table_info['ForeignKey'].'='.$table_info['ParentId'].')'; - } - - /** - * Generate and set new temporary id - * - * @access private - */ - function setTempID() - { - // don't set temp id for this item - } - - } \ No newline at end of file + /** + * Generate and set new temporary id + * + * @return void + * @access public + */ + public function setTempID() + { + // don't set temp id for this item + } +} \ No newline at end of file Index: branches/5.2.x/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 14244) +++ branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ Init($event->Prefix, '-item'); + $object =& $event->getObject(); + /* @var $object kDBItem */ $title_field = 'SelectorName'; $new_name = $object->GetDBField($title_field); $original_checked = false; $foreign_key = $event->getEventParam('foreign_key'); // in case if whole stylesheet is cloned - if($foreign_key === false) $foreign_key = $object->GetDBField('StylesheetId'); // in case if selector is copied ifself + if ( $foreign_key === false ) { + $foreign_key = $object->GetDBField('StylesheetId'); + } // in case if selector is copied ifself do { if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) { - $new_name = $regs[1].'-'.($regs[2]+1); + $new_name = $regs[1] . '-' . ($regs[2] + 1); } - elseif ($original_checked) { - $new_name = $new_name.'-1'; + elseif ( $original_checked ) { + $new_name = $new_name . '-1'; } // if we are cloning in temp table this will look for names in temp table, // since object' TableName contains correct TableName (for temp also!) // if we are cloning live - look in live - $query = ' SELECT '.$title_field.' - FROM '.$object->TableName.' - WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$foreign_key; + $query = ' SELECT ' . $title_field . ' + FROM ' . $object->TableName . ' + WHERE ' . $title_field . ' = ' . $this->Conn->qstr($new_name) . ' AND StylesheetId = ' . $foreign_key; $res = $this->Conn->GetOne($query); @@ -79,20 +87,24 @@ }*/ $original_checked = true; - } while ($res !== false); + } while ( $res !== false ); $object->SetDBField($title_field, $new_name); } /** * Show base styles or block styles * * @param kEvent $event + * @return void + * @access protected + * @see kDBEventHandler::OnListBuild() */ - function SetCustomQuery(&$event) + protected function SetCustomQuery(&$event) { $object =& $event->getObject(); - switch ($event->Special) - { + /* @var $object kDBList */ + + switch ( $event->Special ) { case 'base': $object->addFilter('type_filter', '%1$s.Type = 1'); break; @@ -104,22 +116,30 @@ } /** - * Enter description here... + * Occurs before updating item * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { + parent::OnBeforeItemUpdate($event); + $this->SerializeSelectorData($event); } /** - * Enter description here... + * Occurs before creating item * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(&$event) { + parent::OnBeforeItemCreate($event); + $this->SerializeSelectorData($event); } @@ -134,17 +154,21 @@ } /** - * Enter description here... + * Occurs after creating item * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemCreate(&$event) + protected function OnAfterItemCreate(&$event) { + parent::OnAfterItemCreate($event); + $this->UnserializeSelectorData($event); } /** - * Get's special of main item for linking with subitem + * Gets special of main item for linking with sub-item * * @param kEvent $event * @return string @@ -173,19 +197,22 @@ function SaveChanges(&$event) { $object =& $event->getObject( Array('skip_autoload' => true) ); + /* @var $object kDBItem */ - $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - if($items_info) - { - list($id,$field_values) = each($items_info); - if ($id == 0) { - $parent_id = getArrayValue($field_values,'ParentId'); - if($parent_id) $object->Load($parent_id); + $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); + if ( $items_info ) { + list($id, $field_values) = each($items_info); + + if ( $id == 0 ) { + $parent_id = getArrayValue($field_values, 'ParentId'); + if ( $parent_id ) { + $object->Load($parent_id); + } $object->SetFieldsFromHash($field_values); $object->Create(); - $this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID() ); + $this->Application->SetVar($event->getPrefixSpecial() . '_id', $object->GetID()); } else { $object->Load($id); @@ -214,20 +241,26 @@ * Extract styles * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemLoad(&$event) + protected function OnAfterItemLoad(&$event) { + parent::OnAfterItemLoad($event); + $object =& $event->getObject(); + /* @var $object kDBItem */ + $selector_data = $object->GetDBField('SelectorData'); - if($selector_data) - { + + if ( $selector_data ) { $selector_data = unserialize($selector_data); $object->SetDBField('SelectorData', $selector_data); } - else - { - $selector_data = Array(); + else { + $selector_data = Array (); } + $this->AddParentProperties($event, $selector_data); } @@ -239,12 +272,18 @@ function SerializeSelectorData(&$event) { $object =& $event->getObject(); + /* @var $object kDBItem */ + $selector_data = $object->GetDBField('SelectorData'); - if(!$selector_data) $selector_data = Array(); + if ( !$selector_data ) { + $selector_data = Array (); + } $selector_data = $this->RemoveParentProperties($event, $selector_data); - if( !kUtil::IsSerialized($selector_data) ) $selector_data = serialize($selector_data); + if ( !kUtil::IsSerialized($selector_data) ) { + $selector_data = serialize($selector_data); + } $object->SetDBField('SelectorData', $selector_data); } @@ -257,10 +296,18 @@ function UnserializeSelectorData(&$event) { $object =& $event->getObject(); + /* @var $object kDBItem */ + $selector_data = $object->GetDBField('SelectorData'); - if(!$selector_data) $selector_data = Array(); - if( kUtil::IsSerialized($selector_data) ) $selector_data = unserialize($selector_data); + if ( !$selector_data ) { + $selector_data = Array (); + } + + if ( kUtil::IsSerialized($selector_data) ) { + $selector_data = unserialize($selector_data); + } + $selector_data = $this->AddParentProperties($event, $selector_data); $object->SetDBField('SelectorData', $selector_data); @@ -291,33 +338,37 @@ function RemoveParentProperties(&$event, $selector_data) { $object =& $event->getObject(); + /* @var $object kDBItem */ + $parent_id = $object->GetDBField('ParentId'); - if($parent_id) - { - $sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id; + + if ( $parent_id ) { + $sql = 'SELECT SelectorData + FROM ' . $object->TableName . ' + WHERE ' . $object->IDField . ' = ' . $parent_id; $base_selector_data = $this->Conn->GetOne($sql); - if( kUtil::IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data); + if ( kUtil::IsSerialized($base_selector_data) ) { + $base_selector_data = unserialize($base_selector_data); + } - foreach($selector_data as $prop_name => $prop_value) - { - if( !$prop_value || getArrayValue($base_selector_data,$prop_name) == $prop_value ) - { + foreach ($selector_data as $prop_name => $prop_value) { + if ( !$prop_value || getArrayValue($base_selector_data, $prop_name) == $prop_value ) { unset($selector_data[$prop_name]); } } - $object->SetDBField('SelectorData', $selector_data); - return $selector_data; } - else - { - foreach($selector_data as $prop_name => $prop_value) - { - if(!$prop_value) unset($selector_data[$prop_name]); + else { + foreach ($selector_data as $prop_name => $prop_value) { + if ( !$prop_value ) { + unset($selector_data[$prop_name]); + } } - $object->SetDBField('SelectorData', $selector_data); - return $selector_data; } + + $object->SetDBField('SelectorData', $selector_data); + + return $selector_data; } /** @@ -328,20 +379,26 @@ function AddParentProperties(&$event, $selector_data) { $object =& $event->getObject(); + /* @var $object kDBItem */ + $parent_id = $object->GetDBField('ParentId'); - if($parent_id) - { - $sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id; + if ( $parent_id ) { + $sql = 'SELECT SelectorData + FROM ' . $object->TableName . ' + WHERE ' . $object->IDField . ' = ' . $parent_id; $base_selector_data = $this->Conn->GetOne($sql); - if( kUtil::IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data); + if ( kUtil::IsSerialized($base_selector_data) ) { + $base_selector_data = unserialize($base_selector_data); + } - $selector_data = kUtil::array_merge_recursive($base_selector_data,$selector_data); - + $selector_data = kUtil::array_merge_recursive($base_selector_data, $selector_data); $object->SetDBField('SelectorData', $selector_data); + return $selector_data; } - return $selector_data; + + return Array (); } /** @@ -352,10 +409,12 @@ function OnResetToBase(&$event) { $object =& $event->getObject(); + /* @var $object SelectorsItem */ + $object->SetFieldsFromHash( $this->getSubmittedFields($event) ); $object->ResetStyle(); - $event->SetRedirectParam('pass', 'all,'.$event->getPrefixSpecial()); + $event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial()); } /** @@ -366,14 +425,14 @@ function OnMassResetToBase(&$event) { $object =& $event->getObject( Array('skip_autoload' => true) ); + /* @var $object SelectorsItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - if($items_info) - { - foreach($items_info as $id => $field_values) - { + + if ( $items_info ) { + foreach ($items_info as $id => $field_values) { $object->Load($id); - $object->ResetStyle(); + $object->ResetStyle(); } } } Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php =================================================================== diff -u -r14572 -r14628 --- branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 14572) +++ branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ setEventParam('PermSection', $this->Application->GetVar('section')); return parent::CheckPermission($event); @@ -31,10 +33,11 @@ * Apply any custom changes to list's sql query * * @param kEvent $event + * @return void * @access protected - * @see OnListBuild + * @see kDBEventHandler::OnListBuild() */ - function SetCustomQuery(&$event) + protected function SetCustomQuery(&$event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -57,50 +60,55 @@ } /** - * Enter description here... + * Performs validation of configuration variable value * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { static $default_field_options = null; + parent::OnBeforeItemUpdate($event); + $object =& $event->getObject(); /* @var $object kDBItem */ // ability to validate each configuration variable separately - if (!isset($default_field_options)) { + if ( !isset($default_field_options) ) { $default_field_options = $object->GetFieldOptions('VariableValue'); } $new_field_options = $default_field_options; $validation = $object->GetDBField('Validation'); - if ($validation) { + + if ( $validation ) { $new_field_options = array_merge($new_field_options, unserialize($validation)); } + $object->SetFieldOptions('VariableValue', $new_field_options); // if password field is empty, then don't update - if ($object->GetDBField('ElementType') == 'password') { - if (trim($object->GetDBField('VariableValue')) == '') { + if ( $object->GetDBField('ElementType') == 'password' ) { + if ( trim($object->GetDBField('VariableValue')) == '' ) { $field_options = $object->GetFieldOptions('VariableValue'); $field_options['skip_empty'] = 1; $object->SetFieldOptions('VariableValue', $field_options); - }else { + } + else { $password_formatter =& $this->Application->recallObject('kPasswordFormatter'); + /* @var $password_formatter kPasswordFormatter */ + $object->SetDBField('VariableValue', $password_formatter->EncryptPassword($object->GetDBField('VariableValue'), 'b38')); } } - $field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - - $state_country_hash = Array ( - 'Comm_State' => 'Comm_Country', - 'Comm_Shipping_State' => 'Comm_Shipping_Country' - ); - $field_name = $object->GetDBField('VariableName'); - if (array_key_exists($field_name, $state_country_hash)) { + $field_values = $this->Application->GetVar($event->getPrefixSpecial(true)); + $state_country_hash = Array ('Comm_State' => 'Comm_Country', 'Comm_Shipping_State' => 'Comm_Shipping_Country'); + + if ( array_key_exists($field_name, $state_country_hash) ) { // if this is state field $sql = 'SELECT VariableId FROM ' . $this->Application->getUnitOption('conf', 'TableName') . ' @@ -110,16 +118,16 @@ $check_state = $object->GetDBField('VariableValue'); $check_country = $field_values[$country_variable_id]['VariableValue']; - if (!$check_country || !$check_state) { - return true; + if ( !$check_country || !$check_state ) { + return; } $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $state_iso = $cs_helper->getStateIso($check_state, $check_country); - if ($state_iso !== false) { + if ( $state_iso !== false ) { $object->SetDBField('VariableValue', $state_iso); } else { @@ -128,13 +136,12 @@ } } - if ($object->GetDBField('VariableName') == 'AdminConsoleInterface') { + if ( $object->GetDBField('VariableName') == 'AdminConsoleInterface' ) { $can_change = $this->Application->ConfigValue('AllowAdminConsoleInterfaceChange'); - if (($object->GetDBField('VariableValue') != $object->GetOriginalField('VariableValue')) && !$can_change) { + if ( ($object->GetDBField('VariableValue') != $object->GetOriginalField('VariableValue')) && !$can_change ) { $object->SetError('VariableValue', 'not_allowed', 'la_error_OperationNotAllowed'); } - } } Index: branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php (.../customfield_formatter.php) (revision 14244) +++ branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php (.../customfield_formatter.php) (revision 14628) @@ -1,6 +1,6 @@ GetFieldOptions($field_name); Index: branches/5.2.x/core/units/helpers/rating_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/rating_helper.php (.../rating_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/rating_helper.php (.../rating_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Application->getUnitOption($object->Prefix, 'PermItemPrefix'); $static = !$this->Application->CheckPermission($perm_prefix . '.RATE', 0, $object->GetDBField('CategoryId')); @@ -60,47 +62,47 @@ /* @var $spam_helper SpamHelper */ $config_mapping = $this->Application->getUnitOption($object->Prefix, 'ConfigMapping'); - $review_settings = $config_mapping['RatingDelayValue'].':'.$config_mapping['RatingDelayInterval']; + $review_settings = $config_mapping['RatingDelayValue'] . ':' . $config_mapping['RatingDelayInterval']; $spam_helper->InitHelper($object->GetDBField('ResourceId'), 'Rating', $review_settings, $object->GetCol('ResourceId')); $user_voted = $spam_helper->InSpamControl(); // now draw the rating bar - $unit_selected_width = $additional_style? $this->ratingSmallUnitWidth : $this->ratingUnitWidth; + $unit_selected_width = $additional_style ? $this->ratingSmallUnitWidth : $this->ratingUnitWidth; $rating_width = $total_votes ? @number_format($total_rating / $total_votes, 2) * $unit_selected_width : 0; $rating1 = $total_votes ? @number_format($total_rating / $total_votes, 1) : 0; $rating2 = $total_votes ? @number_format($total_rating / $total_votes, 2) : 0; $rater = ''; // this part is disabled for now, will be addressed once properly review // $rater .= '
' . - $this->_replaceInPhrase('vote_title', Array(''.$rating1.'', $this->ratingMaximal)) . ' ('. $this->_replaceInPhrase('vote_count', Array($total_votes)) . ')
'; + $this->_replaceInPhrase('vote_title', Array ('' . $rating1 . '', $this->ratingMaximal)) . ' (' . $this->_replaceInPhrase('vote_count', Array ($total_votes)) . ') '; - $rater .= ' '.$additional_msg.''; + $rater .= ' ' . $additional_msg . ''; - if ($show_div) { + if ( $show_div ) { // adds div around rating stars (when drawing rating first time) $rater = ''; } Index: branches/5.2.x/core/kernel/managers/request_manager.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/kernel/managers/request_manager.php (.../request_manager.php) (revision 14244) +++ branches/5.2.x/core/kernel/managers/request_manager.php (.../request_manager.php) (revision 14628) @@ -1,6 +1,6 @@ Application->EventManager->verifyEventPrefix($event, true) ) { - return ; + $false = false; + + return $false; } $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); $event_handler =& $this->Application->recallObject($event->Prefix . '_EventHandler'); /* @var $event_handler kEventHandler */ - if (($this->Application->RecallVar('user_id') == USER_ROOT) || $event_handler->CheckPermission($event)) { + if ( ($this->Application->RecallVar('user_id') == USER_ROOT) || $event_handler->CheckPermission($event) ) { $this->Application->HandleEvent($event); } Index: branches/5.2.x/core/units/selectors/selectors_tag_processor.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 14244) +++ branches/5.2.x/core/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params ); + $object =& $this->getObject($params); + /* @var $object SelectorsItem */ + $style_data = $object->GetDBField( $params['field'] ); $ret = $object->CompileStyleBody( getArrayValue($params,'inline') ? STYLE_INLINE : STYLE_PREVIEW ); @@ -62,34 +64,50 @@ return $ret; } - function PredefinedOptions($params) + /** + * Prints list a all possible field options + * + * @param Array $params + * @return string + * @access protected + */ + protected function PredefinedOptions($params) { $field = $params['field']; - $object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params); + $object =& $this->getObject($params); + /* @var $object kDBItem */ + $value = $object->GetDBField($field); - $subfield = getArrayValue($params,'subfield'); - if($subfield && $subfield != '$subfield') $value = $value[$subfield]; + $subfield = getArrayValue($params, 'subfield'); + + if ( $subfield && $subfield != '$subfield' ) { + $value = $value[$subfield]; + } - $value_field = getArrayValue($params,'value_field'); - if(!$value_field) $value_field = $field; + $value_field = getArrayValue($params, 'value_field'); + if ( !$value_field ) { + $value_field = $field; + } - $options = $object->GetFieldOptions($value_field); - $block_params['name'] = $params['block']; $block_params['field'] = $params['field']; $block_params['pass_params'] = 'true'; $selected_param_name = getArrayValue($params, 'selected_param'); - if (!$selected_param_name) $selected_param_name = $params['selected']; + if ( !$selected_param_name ) { + $selected_param_name = $params['selected']; + } $selected = $params['selected']; $o = ''; - foreach ($options['options'] as $key => $val) { + $options = $object->GetFieldOption($value_field, 'options'); + + foreach ($options as $key => $val) { $block_params['key'] = $key; $block_params['option'] = $val; $block_params['field_name'] = $this->InputName($params); - $block_params[$selected_param_name] = ( $key == $value ? ' '.$selected : ''); + $block_params[$selected_param_name] = ($key == $value ? ' ' . $selected : ''); $block_params['PrefixSpecial'] = $this->getPrefixSpecial(); $o .= $this->Application->ParseBlock($block_params, 1); } Index: branches/5.2.x/core/units/helpers/filenames_helper.php =================================================================== diff -u -r14585 -r14628 --- branches/5.2.x/core/units/helpers/filenames_helper.php (.../filenames_helper.php) (revision 14585) +++ branches/5.2.x/core/units/helpers/filenames_helper.php (.../filenames_helper.php) (revision 14628) @@ -1,6 +1,6 @@ SelectParam($params, 'name,field'); - $object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params); + $object =& $this->getObject($params); + /* @var $object kDBItem */ - $value = $object->GetDBField($field); + $value = $object->GetDBField($this->SelectParam($params, 'name,field')); - if ($value) return 'checked'; - if (is_null($value)) return $params['default']; + if ( $value ) { + return 'checked'; + } + + if ( is_null($value) ) { + return $params['default']; + } return ''; } function MaxUploadSize($params) { - return round(MAX_UPLOAD_SIZE/1024/1024).' Mb'; + return round(MAX_UPLOAD_SIZE / 1024 / 1024) . ' Mb'; } } \ No newline at end of file Index: branches/5.2.x/core/units/reviews/reviews_event_handler.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 14244) +++ branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ Name == 'OnAddReview' || $event->Name == 'OnCreate') { $perm_helper =& $this->Application->recallObject('PermissionsHelper'); @@ -87,9 +89,13 @@ $res = $this->Application->CheckPermission($perm_prefix . '.ADD', 0, $perm_category) || $this->Application->CheckPermission($perm_prefix . '.MODIFY', 0, $perm_category); break; + + default: + $res = false; + break; } - if (!$res) { + if ( !$res ) { $event->status = kEvent::erPERM_FAIL; } @@ -167,54 +173,50 @@ * @access protected * @see OnListBuild */ - function SetCustomQuery(&$event) + protected function SetCustomQuery(&$event) { $object =& $event->getObject(); /* @var $object kDBList */ - if (!$this->Application->isAdminUser) { - $object->addFilter('active', '%1$s.Status = '.STATUS_ACTIVE); + if ( !$this->Application->isAdminUser ) { + $object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE); } - switch ($event->Special) - { + switch ( $event->Special ) { case 'showall': $object->clearFilters(); break; case 'item': // used ? $object->clearFilters(); - $info = $object->getLinkedInfo(); - $this->Application->setUnitOption($info['ParentPrefix'], 'AutoLoad', true); - $parent =& $this->Application->recallObject($info['ParentPrefix']); - $object->addFilter('item_reviews', '%1$s.ItemId = '.$parent->GetDBField('ResourceId')); + $parent_info = $object->getLinkedInfo(); + + $parent =& $this->Application->recallObject($parent_info['ParentPrefix']); + /* @var $parent kDBItem */ + + $object->addFilter('item_reviews', '%1$s.ItemId = ' . $parent->GetDBField('ResourceId')); break; - case 'products': // used in In-Portal (Sturcture & Data -> Reviews section) - $object->removeFilter('parent_filter'); // this is important + case 'products': // used in In-Portal (Structure & Data -> Reviews section) + $object->removeFilter('parent_filter'); // this is important $object->addFilter('product_reviews', 'pr.ResourceId IS NOT NULL'); break; - - /*case 'product': - $object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId'); // for LEFT JOIN - break;*/ } - if (preg_match('/(.*)-rev/', $event->Prefix, $regs)) { + if ( preg_match('/(.*)-rev/', $event->Prefix, $regs) ) { // "Structure & Data" -> "Reviews" (section in K4) $item_type = $this->Application->getUnitOption($regs[1], 'ItemType'); $object->addFilter('itemtype_filter', '%1$s.ItemType = ' . $item_type); - if ($this->Application->isAdmin) { + if ( $this->Application->isAdmin ) { // temporarily solution so we can see sub-items on separate grid in Admin $object->removeFilter('parent_filter'); - } + } } - if ($event->getEventParam('type') == 'current_user') { -// $object->removeFilter('active'); - $object->addFilter('current_user', '%1$s.CreatedById = '.$this->Application->RecallVar('user_id')); - $object->addFilter('current_ip', '%1$s.IPAddress = "'.$_SERVER['REMOTE_ADDR'].'"'); + if ( $event->getEventParam('type') == 'current_user' ) { + $object->addFilter('current_user', '%1$s.CreatedById = ' . $this->Application->RecallVar('user_id')); + $object->addFilter('current_ip', '%1$s.IPAddress = "' . $_SERVER['REMOTE_ADDR'] . '"'); } } @@ -256,9 +258,13 @@ * Prefills all fields on front-end * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(&$event) { + parent::OnBeforeItemCreate($event); + $object =& $event->getObject(); /* @var $object kDBItem */ @@ -269,7 +275,7 @@ $object->SetDBField('ItemType', $item_type); $object->SetDBField('Module', $this->Application->findModule('Var', $parent_info['ParentPrefix'], 'Name')); - if ($this->Application->isAdminUser) { + if ( $this->Application->isAdminUser ) { // don't perform spam control on admin return ; } @@ -279,14 +285,14 @@ $spam_helper->InitHelper($parent_info['ParentId'], 'Review', 0); - if ($spam_helper->InSpamControl()) { + if ( $spam_helper->InSpamControl() ) { $event->status = kEvent::erFAIL; $object->SetError('ReviewText', 'too_frequent', 'lu_ferror_review_duplicate'); - return ; + return; } $rating = $object->GetDBField('Rating'); - if ($rating < 1 || $rating > 5) { + if ( $rating < 1 || $rating > 5 ) { $object->SetDBField('Rating', null); } @@ -301,13 +307,19 @@ * Sets correct rating value * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { + parent::OnBeforeItemUpdate($event); + $object =& $event->getObject(); + /* @var $object kDBItem */ $rating = $object->GetDBField('Rating'); - if (!$rating) { + + if ( !$rating ) { $object->SetDBField('Rating', null); } } @@ -316,27 +328,33 @@ * Updates item review counter * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemCreate(&$event) + protected function OnAfterItemCreate(&$event) { + parent::OnAfterItemCreate($event); + $this->updateSubitemCounters($event); - if (!$this->Application->isAdminUser) { + if ( !$this->Application->isAdminUser ) { $spam_helper =& $this->Application->recallObject('SpamHelper'); /* @var $spam_helper SpamHelper */ $object =& $event->getObject(); + /* @var $object kDBItem */ + $parent_info = $object->getLinkedInfo(); $config_mapping = $this->Application->getUnitOption($event->Prefix, 'ConfigMapping'); - $review_settings = $config_mapping['ReviewDelayValue'].':'.$config_mapping['ReviewDelayInterval']; + $review_settings = $config_mapping['ReviewDelayValue'] . ':' . $config_mapping['ReviewDelayInterval']; $spam_helper->InitHelper($parent_info['ParentId'], 'Review', $review_settings); $spam_helper->AddToSpamControl(); $review_status = $object->GetDBField('Status'); - if ($review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING) { + if ( $review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING ) { $email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING'); $this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById')); $this->Application->EmailEventAdmin($email_event); Index: branches/5.2.x/core/units/languages/languages_event_handler.php =================================================================== diff -u -r14585 -r14628 --- branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14585) +++ branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ Name == 'OnItemBuild') { // check permission without using $event->getSection(), @@ -204,18 +206,21 @@ } /** - * Occurse before updating item + * Occurs before updating item * * @param kEvent $event - * @access public + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { $object =& $event->getObject(); + /* @var $object kDBItem */ + $status_fields = $this->Application->getUnitOption($event->Prefix, 'StatusField'); $status_field = array_shift($status_fields); - if ($object->GetDBField('PrimaryLang') == 1 && $object->GetDBField($status_field) == 0) { + if ( $object->GetDBField('PrimaryLang') == 1 && $object->GetDBField($status_field) == 0 ) { $object->SetDBField($status_field, 1); } } @@ -224,8 +229,11 @@ * Shows only enabled languages on front * * @param kEvent $event + * @return void + * @access protected + * @see kDBEventHandler::OnListBuild() */ - function SetCustomQuery(&$event) + protected function SetCustomQuery(&$event) { $object =& $event->getObject(); /* @var $object kDBList */ @@ -255,8 +263,10 @@ * Copy labels from another language * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemCreate(&$event) + protected function OnAfterItemCreate(&$event) { parent::OnAfterItemCreate($event); @@ -265,14 +275,14 @@ $src_language = $object->GetDBField('CopyFromLanguage'); - if ($object->GetDBField('CopyLabels') && $src_language) { + if ( $object->GetDBField('CopyLabels') && $src_language ) { $dst_language = $object->GetID(); // 1. schedule data copy after OnSave event is executed $var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid'); $pending_actions = $this->Application->RecallVar($var_name, Array ()); - if ($pending_actions) { + if ( $pending_actions ) { $pending_actions = unserialize($pending_actions); } @@ -286,24 +296,28 @@ * Saves language from temp table to live * * @param kEvent $event + * @return void + * @access protected */ - function OnSave(&$event) + protected function OnSave(&$event) { parent::OnSave($event); - if ($event->status != kEvent::erSUCCESS) { - return ; + if ( $event->status != kEvent::erSUCCESS ) { + return; } $var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid'); $pending_actions = $this->Application->RecallVar($var_name, Array ()); - if ($pending_actions) { + if ( $pending_actions ) { $pending_actions = unserialize($pending_actions); } // create multilingual columns for phrases & email events table first (actual for 6+ language) $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + /* @var $ml_helper kMultiLanguageHelper */ + $ml_helper->createFields('phrases'); $ml_helper->createFields('emailevents'); @@ -333,16 +347,22 @@ * done in OnPreSaveCreated * * @param kEvent $event + * @return void + * @access protected */ - function OnPreCreate(&$event) + protected function OnPreCreate(&$event) { parent::OnPreCreate($event); $object =& $event->getObject(); + /* @var $object kDBItem */ + $object->SetDBField('CopyLabels', 1); - $live_table = $this->Application->getUnitOption($event->Prefix, 'TableName'); - $primary_lang_id = $this->Conn->GetOne('SELECT '.$object->IDField.' FROM '.$live_table.' WHERE PrimaryLang = 1'); + $sql = 'SELECT ' . $object->IDField . ' + FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' + WHERE PrimaryLang = 1'; + $primary_lang_id = $this->Conn->GetOne($sql); $object->SetDBField('CopyFromLanguage', $primary_lang_id); } @@ -351,18 +371,21 @@ * Sets new language mark * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeDeleteFromLive(&$event) + protected function OnBeforeDeleteFromLive(&$event) { + parent::OnBeforeDeleteFromLive($event); + $id_field = $this->Application->getUnitOption($event->Prefix, 'IDField'); - $table_name = $this->Application->getUnitOption($event->Prefix, 'TableName'); $sql = 'SELECT ' . $id_field . ' - FROM ' . $table_name . ' + FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' WHERE ' . $id_field . ' = ' . $event->getEventParam('id'); $id = $this->Conn->GetOne($sql); - if (!$id) { + if ( !$id ) { $this->Application->SetVar('new_language', 1); } } @@ -556,11 +579,10 @@ */ function OnBeforeItemDelete(&$event) { - $del_id = $event->getEventParam('id'); - $object =& $event->getObject(array('skip_autload' => true)); - $object->Load($del_id); + $object =& $event->getObject(); + /* @var $object kDBItem */ - if ($object->GetDBField('PrimaryLang') || $object->GetDBField('AdminInterfaceLang') || $del_id == $this->Application->GetVar('m_lang')) { + if ( $object->GetDBField('PrimaryLang') || $object->GetDBField('AdminInterfaceLang') || $object->GetID() == $this->Application->GetVar('m_lang') ) { $event->status = kEvent::erFAIL; } } Index: branches/5.2.x/core/units/user_groups/user_groups_dbitem.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/user_groups/user_groups_dbitem.php (.../user_groups_dbitem.php) (revision 14244) +++ branches/5.2.x/core/units/user_groups/user_groups_dbitem.php (.../user_groups_dbitem.php) (revision 14628) @@ -1,6 +1,6 @@ getLinkedInfo($this->Special, true); - if ($table_info) { - // we have parent info, then use it - $keys_hash = Array( - $this->IDField => $this->ID, - $table_info['ForeignKey'] => $table_info['ParentId'], - ); - } - return parent::GetKeyClause($method, $keys_hash); + /** + * Returns part of SQL WHERE clause identifying the record, ex. id = 25 + * + * @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method + * @param Array $keys_hash alternative, then item id, keys hash to load item by + * @see kDBItem::Load() + * @see kDBItem::Update() + * @see kDBItem::Delete() + * + * @return string + * @access protected + */ + protected function GetKeyClause($method = null, $keys_hash = null) + { + $table_info = $this->getLinkedInfo($this->Special, true); + + if ( $table_info ) { + // we have parent info, then use it + $keys_hash = Array ($this->IDField => $this->GetID(), $table_info['ForeignKey'] => $table_info['ParentId']); } - } \ No newline at end of file + return parent::GetKeyClause($method, $keys_hash); + } +} \ No newline at end of file Index: branches/5.2.x/core/units/helpers/form_submission_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/form_submission_helper.php (.../form_submission_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/form_submission_helper.php (.../form_submission_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject('form', null, Array ('skip_autoload' => true)); /* @var $form kDBItem */ - if (!$form->isLoaded() || ($form->GetID() != $form_id)) { + if ( !$form->isLoaded() || ($form->GetID() != $form_id) ) { $form->Load($form_id); } Index: branches/5.2.x/core/units/helpers/permissions_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/permissions_helper.php (.../permissions_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/permissions_helper.php (.../permissions_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject($prefix.'_EventHandler'); + /* @var $event_handler kEventHandler */ + return $event_handler->CheckPermission( new kEvent($perm_event) ); } Index: branches/5.2.x/core/units/fck/fck_eh.php =================================================================== diff -u -r14572 -r14628 --- branches/5.2.x/core/units/fck/fck_eh.php (.../fck_eh.php) (revision 14572) +++ branches/5.2.x/core/units/fck/fck_eh.php (.../fck_eh.php) (revision 14628) @@ -1,6 +1,6 @@ Application->isAdminUser) { // this limits all event execution only to logged-in users in admin @@ -101,15 +103,15 @@ } $fck_helper =& $this->Application->recallObject('FCKHelper'); - /* @var fck_helper fckFCKHelper*/ + /* @var $fck_helper fckFCKHelper*/ - if (!$fck_helper->IsAllowedExtension($folder, $new_name)) { + if ( !$fck_helper->IsAllowedExtension($folder, $new_name) ) { echo 203; return; } - if (!rename($sServerDir.$old_name,$sServerDir.$new_name)) { - // echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name; + if ( !rename($sServerDir . $old_name, $sServerDir . $new_name) ) { +// echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name; echo 205; return; } @@ -192,16 +194,24 @@ } } - function OnUploadFile(&$event) + /** + * Uploads a file from FCK file browser + * + * @param kEvent $event + * @return void + * @access protected + */ + protected function OnUploadFile(&$event) { $event->status = kEvent::erSTOP; - if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { + if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { return; } $fck_helper =& $this->Application->recallObject('FCKHelper'); - /* @var fck_helper fckFCKHelper*/ + /* @var $fck_helper fckFCKHelper*/ + $fck_helper->UploadFile(); } } \ No newline at end of file Index: branches/5.2.x/core/kernel/event_manager.php =================================================================== diff -u -r14428 -r14628 --- branches/5.2.x/core/kernel/event_manager.php (.../event_manager.php) (revision 14428) +++ branches/5.2.x/core/kernel/event_manager.php (.../event_manager.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject('kActions'); - $actions->Set('events['.$prefix_special.']',$event_name); + /* @var $actions Params */ + + $actions->Set('events[' . $prefix_special . ']', $event_name); } /** Index: branches/5.2.x/core/kernel/session/inp_session.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/kernel/session/inp_session.php (.../inp_session.php) (revision 14244) +++ branches/5.2.x/core/kernel/session/inp_session.php (.../inp_session.php) (revision 14628) @@ -1,6 +1,6 @@ SessionTimeout = $this->Application->ConfigValue('SessionTimeout'); @@ -24,40 +32,49 @@ $this->SetCookiePath($path); $cookie_name = $this->Application->ConfigValue('SessionCookieName'); - if (!$cookie_name) { + + if ( !$cookie_name ) { $cookie_name = 'sid'; } $admin_session = ($this->Application->isAdmin && $special !== 'front') || ($special == 'admin'); - if ($admin_session) { + if ( $admin_session ) { $cookie_name = 'adm_' . $cookie_name; } $this->SetCookieName($cookie_name); - $this->SetCookieDomain(SERVER_NAME); - if ($admin_session) { + if ( $admin_session ) { $mode = self::smAUTO; } - elseif (defined('IS_INSTALL') && IS_INSTALL) { + elseif ( defined('IS_INSTALL') && IS_INSTALL ) { $mode = self::smCOOKIES_ONLY; } else { $ses_mode = $this->Application->ConfigValue('CookieSessions'); - if ($ses_mode == 2) $mode = self::smAUTO; - if ($ses_mode == 1) $mode = self::smCOOKIES_ONLY; - if ($ses_mode == 0) $mode = self::smGET_ONLY; + if ( $ses_mode == 2 ) { + $mode = self::smAUTO; + } + elseif ( $ses_mode == 1 ) { + $mode = self::smCOOKIES_ONLY; + } + elseif ( $ses_mode == 0 ) { + $mode = self::smGET_ONLY; + } + else { + $mode = self::smAUTO; + } } $this->SetMode($mode); parent::Init($prefix, $special); - if (!$this->Application->isAdmin && $this->GetField('PortalUserId') <= 0) { - $group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup'); + if ( !$this->Application->isAdmin && $this->GetField('PortalUserId') <= 0 ) { + $group_list = $this->Application->ConfigValue('User_GuestGroup') . ',' . $this->Application->ConfigValue('User_LoggedInGroup'); $this->SetField('GroupId', $this->Application->ConfigValue('User_GuestGroup')); $this->SetField('GroupList', $group_list); } Index: branches/5.2.x/core/units/reviews/reviews_tag_processor.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 14244) +++ branches/5.2.x/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ SelectParam($params, 'name,field'); - $object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params); + + $object =& $this->getObject($params); + /* @var $object kDBItem */ if ($field == 'ReviewText') { if ($object->GetDBField('TextFormat') == 1) { Index: branches/5.2.x/core/units/related_searches/related_searches_event_handler.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/related_searches/related_searches_event_handler.php (.../related_searches_event_handler.php) (revision 14244) +++ branches/5.2.x/core/units/related_searches/related_searches_event_handler.php (.../related_searches_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ getObject(); + /* @var $object kDBItem */ $table_info = $object->getLinkedInfo(); Index: branches/5.2.x/core/units/languages/languages_tag_processor.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 14244) +++ branches/5.2.x/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ Application->GetTopmostPrefix($this->Prefix); if( substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't' && !$edit_direct ) { - $object =& $this->getObject(); + $object =& $this->getObject($params); + /* @var $object kDBItem */ + return $object->GetDBField('Charset'); } + $lang_current =& $this->Application->recallObject('lang.current'); + /* @var $lang_current LanguagesItem */ + return $lang_current->GetDBField('Charset'); } @@ -98,17 +103,18 @@ /** * Returns path where exported languages should be saved * - * @param unknown_type $params + * @param Array $params + * @return string + * @access protected */ - function ExportPath($params) + protected function ExportPath($params) { + $ret = EXPORT_PATH . '/'; - $ret = EXPORT_PATH.'/'; - - if( getArrayValue($params,'as_url') ) - { - $ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret); + if ( getArrayValue($params, 'as_url') ) { + $ret = str_replace(FULL_PATH . '/', $this->Application->BaseURL(), $ret); } + return $ret; } Index: branches/5.2.x/core/units/helpers/sections_helper.php =================================================================== diff -u -r14560 -r14628 --- branches/5.2.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 14560) +++ branches/5.2.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Application->isCachingType(CACHING_TYPE_MEMORY) ) { $data = $this->Application->getCache('master:sections_parsed', false, CacheSettings::$sectionsParsedRebuildTime); @@ -105,10 +106,11 @@ foreach ($prefixes as $prefix) { $config =& $this->Application->UnitConfigReader->configData[$prefix]; - if (array_key_exists('ConfigPriority', $config)) { + if ( array_key_exists('ConfigPriority', $config) ) { $prioritized_prefixes[$prefix] = $config['ConfigPriority']; continue; } + $this->_processPrefixSections($prefix); } @@ -118,20 +120,24 @@ $this->_processPrefixSections($prefix); } - // 2. apply section ajustments + // 2. apply section adjustments foreach ($prefixes as $prefix) { $config =& $this->Application->UnitConfigReader->configData[$prefix]; - $section_ajustments = getArrayValue($config, 'SectionAdjustments'); - if (!$section_ajustments) continue; + $section_adjustments = getArrayValue($config, 'SectionAdjustments'); + /* @var $section_adjustments Array */ - foreach ($section_ajustments as $section_name => $ajustment_params) { - if (is_array($ajustment_params)) { - if (!array_key_exists($section_name, $this->Tree)) { - // don't process ajustments for non-existing sections + if ( !$section_adjustments ) { + continue; + } + + foreach ($section_adjustments as $section_name => $adjustment_params) { + if ( is_array($adjustment_params) ) { + if ( !array_key_exists($section_name, $this->Tree) ) { + // don't process adjustments for non-existing sections continue; } - $this->Tree[$section_name] = kUtil::array_merge_recursive($this->Tree[$section_name], $ajustment_params); + $this->Tree[$section_name] = kUtil::array_merge_recursive($this->Tree[$section_name], $adjustment_params); } else { // then remove section @@ -146,52 +152,46 @@ $parent_section = $section_params['parent']; $section_order = "{$section_params['priority']}"; - if (!isset($parent_section)) { + if ( !isset($parent_section) ) { // don't process parent section of "in-portal:root" section continue; } - if (!array_key_exists('children', $this->Tree[$parent_section])) { + if ( !array_key_exists('children', $this->Tree[$parent_section]) ) { $this->Tree[$parent_section]['children'] = Array (); } - if (array_key_exists($section_order, $this->Tree[$parent_section]['children'])) { - trigger_error( - 'Section "' . $section_name . '" has replaced section "' . - $this->Tree[$parent_section]['children'][$section_order] . - '" (parent section: "' . $parent_section . - '"; duplicate priority: ' . $section_order . ')', - E_USER_WARNING - ); + if ( array_key_exists($section_order, $this->Tree[$parent_section]['children']) ) { + trigger_error('Section "' . $section_name . '" has replaced section "' . $this->Tree[$parent_section]['children'][$section_order] . '" (parent section: "' . $parent_section . '"; duplicate priority: ' . $section_order . ')', E_USER_WARNING); } $this->Tree[$parent_section]['children'][$section_order] = $section_name; - if ($section_params['type'] == stTAB) { + if ( $section_params['type'] == stTAB ) { // if this is tab, then mark parent section as TabOnly $this->Tree[$parent_section]['tabs_only'] = true; } - // 3.2. process icons here, because they also can be ajusted - if (isset($section_params['icon']) && preg_match('/([^:]+):(.*)/', $section_params['icon'], $regs)) { + // 3.2. process icons here, because they also can be adjusted + if ( isset($section_params['icon']) && preg_match('/([^:]+):(.*)/', $section_params['icon'], $regs) ) { $this->Tree[$section_name]['icon'] = $regs[2]; $this->Tree[$section_name]['icon_module'] = $regs[1]; // set "icon_module" used in "combined_header" block - $module_folder = trim( $this->Application->findModule('Name', $regs[1], 'Path'), '/'); + $module_folder = trim($this->Application->findModule('Name', $regs[1], 'Path'), '/'); - if ($module_folder == '') { + if ( $module_folder == '' ) { $module_folder = 'core'; } } else { $module_folder = $this->Application->getUnitOption($section_params['SectionPrefix'], 'ModuleFolder'); - if (!array_key_exists('icon_module', $section_params)) { + if ( !array_key_exists('icon_module', $section_params) ) { // set "icon_module" used in "combined_header" block $this->Tree[$section_name]['icon_module'] = $this->Application->findModule('Path', $module_folder . '/', 'Name'); } } // this is to display HELP icon instead of missing one.. can be replaced with some other icon to draw attention - $icon_file = $module_folder.'/admin_templates/img/icons/icon24_'.$this->Tree[$section_name]['icon']; + $icon_file = $module_folder . '/admin_templates/img/icons/icon24_' . $this->Tree[$section_name]['icon']; /*$core_file = FULL_PATH.'/core/admin_templates/img/icons/icon24_' . $this->Tree[$section_name]['icon'].'.png'; if ($module_folder != 'core' && file_exists($core_file) && file_exists(FULL_PATH.'/'.$icon_file.'.png')) { @@ -200,13 +200,13 @@ } }*/ - if (!file_exists(FULL_PATH . '/' . $icon_file . '.png')) { + if ( !file_exists(FULL_PATH . '/' . $icon_file . '.png') ) { $this->Tree[$section_name]['icon'] = 'help'; $this->Tree[$section_name]['icon_module'] = 'core'; } } - $this->Application->HandleEvent( new kEvent('adm:OnAfterBuildTree') ); + $this->Application->HandleEvent(new kEvent('adm:OnAfterBuildTree')); if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) { $this->Application->setCache('master:sections_parsed', serialize($this->Tree)); @@ -220,12 +220,12 @@ { $config =& $this->Application->UnitConfigReader->configData[$prefix]; $sections = getArrayValue($config, 'Sections'); - if (!$sections) { + /* @var $sections Array */ + + if ( !$sections ) { return ; } -// echo 'Prefix: ['.$prefix.'] has ['.count($sections).'] sections'; - foreach ($sections as $section_name => $section_params) { // we could also skip not allowed sections here in future if ( isset($section_params['SectionPrefix']) ) { @@ -237,35 +237,37 @@ else { $section_prefix = $prefix; } + $section_params['SectionPrefix'] = $section_prefix; $section_params['url']['m_opener'] = 'r'; $section_params['url']['no_pass_through'] = 1; $pass_section = getArrayValue($section_params, 'url', 'pass_section'); - if ($pass_section) { + if ( $pass_section ) { unset($section_params['url']['pass_section']); $section_params['url']['section'] = $section_name; - if (!isset($section_params['url']['module'])) { - $module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name'); + + if ( !isset($section_params['url']['module']) ) { + $module_name = $this->Application->findModule('Path', $config['ModuleFolder'] . '/', 'Name'); $section_params['url']['module'] = $module_name; } } - if (!isset($section_params['url']['t'])) { + if ( !isset($section_params['url']['t']) ) { $section_params['url']['t'] = 'index'; } - if (!isset($section_params['onclick'])) { + if ( !isset($section_params['onclick']) ) { $section_params['onclick'] = 'checkEditMode()'; } - if (!isset($section_params['container'])) { + if ( !isset($section_params['container']) ) { $section_params['container'] = 0; // for js tree printing to xml } - $current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array(); + $current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array (); - if ($current_data) { + if ( $current_data ) { trigger_error('Section "' . $section_name . '" declaration (originally defined in "' . $current_data['SectionPrefix'] . '") was overwriten from "' . $prefix . '"', E_USER_WARNING); } @@ -294,19 +296,21 @@ * Returns first child, that is not a folder * * @param string $section_name - * @param Array $tree - * @return stirng + * @param bool $check_permission + * @return string + * @access public */ - function getFirstChild($section_name, $check_permission = false) + public function getFirstChild($section_name, $check_permission = false) { $section_data =& $this->getSectionData($section_name); - $children = isset($section_data['children']) && $section_data['children'] ? $section_data['children'] : false; - if ($children) { + /* @var $children Array */ + + if ( $children ) { // get 1st child ksort($children, SORT_NUMERIC); - foreach ($children as $child_priority => $child_section) { - if (!$this->sectionVisible($child_section, $check_permission)) { + foreach ($children as $child_section) { + if ( !$this->sectionVisible($child_section, $check_permission) ) { continue; } Index: branches/5.2.x/core/units/groups/groups_event_handler.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 14244) +++ branches/5.2.x/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBList */ @@ -53,8 +56,10 @@ * Refreshes left tree on save * * @param kEvent $event + * @return void + * @access protected */ - function OnSave(&$event) + protected function OnSave(&$event) { parent::OnSave($event); Index: branches/5.2.x/core/units/visits/visits_event_handler.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 14244) +++ branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 14628) @@ -1,6 +1,6 @@ Application->isAdmin || !$this->Application->ConfigValue('UseVisitorTracking')) { - // admin logins are not registred in visits list - return true; + if ( $this->Application->isAdmin || !$this->Application->ConfigValue('UseVisitorTracking') || $this->Application->RecallVar('visit_id') ) { + // admin logins are not registered in visits list + return ; } - if ($this->Application->RecallVar('visit_id')) { - return true; - } + $object =& $event->getObject(Array ('skip_autoload' => true)); + /* @var $object kDBItem */ - $object =& $event->getObject( Array('skip_autoload' => true) ); - $object->SetDBField('VisitDate_date', adodb_mktime() ); - $object->SetDBField('VisitDate_time', adodb_mktime() ); - $object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER') ); - $object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR'] ); + $object->SetDBField('VisitDate_date', adodb_mktime()); + $object->SetDBField('VisitDate_time', adodb_mktime()); + $object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER')); + $object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']); - if ($object->Create()) { - $this->Application->StoreVar('visit_id', $object->GetID() ); - $this->Application->SetVar('visits_id', $object->GetID() ); + if ( $object->Create() ) { + $this->Application->StoreVar('visit_id', $object->GetID()); + $this->Application->SetVar('visits_id', $object->GetID()); } } /** * Apply any custom changes to list's sql query * * @param kEvent $event + * @return void * @access protected - * @see OnListBuild + * @see kDBEventHandler::OnListBuild() */ - function SetCustomQuery(&$event) + protected function SetCustomQuery(&$event) { $object =& $event->getObject(); + /* @var $object kDBList */ $types = $event->getEventParam('types'); - if($types == 'myvisitors') - { + if ( $types == 'myvisitors' ) { $user_id = $this->Application->RecallVar('user_id'); - $object->addFilter('myitems_user1','au.PortalUserId = '.$user_id); - $object->addFilter('myitems_user2','au.PortalUserId >0'); + $object->addFilter('myitems_user1', 'au.PortalUserId = ' . $user_id); + $object->addFilter('myitems_user2', 'au.PortalUserId >0'); //$object->AddGroupByField('VisitDate'); $object->AddGroupByField('%1$s.VisitId'); - } - if($types == 'myvisitororders' && $event->Special == 'incommerce') - { + if ( $types == 'myvisitororders' && $event->Special == 'incommerce' ) { $user_id = $this->Application->RecallVar('user_id'); - $object->addFilter('myitems_orders','ord.OrderId IS NOT NULL'); - $object->addFilter('myitems_user1','au.PortalUserId = '.$user_id); - $object->addFilter('myitems_user2','au.PortalUserId >0'); - $object->addFilter('myitems_orders_processed','ord.Status = 4'); + $object->addFilter('myitems_orders', 'ord.OrderId IS NOT NULL'); + $object->addFilter('myitems_user1', 'au.PortalUserId = ' . $user_id); + $object->addFilter('myitems_user2', 'au.PortalUserId >0'); + $object->addFilter('myitems_orders_processed', 'ord.Status = 4'); } } /** - * Apply some special processing to - * object beeing recalled before using - * it in other events that call prepareObject + * Apply some special processing to object being + * recalled before using it in other events that + * call prepareObject * - * @param kBase $object + * @param kDBItem|kDBList $object * @param kEvent $event + * @return void * @access protected */ - function prepareObject(&$object, &$event) + protected function prepareObject(&$object, &$event) { $types = $event->getEventParam('types'); if(method_exists($object, 'AddGroupByField')) Index: branches/5.2.x/core/units/helpers/geocode_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/geocode_helper.php (.../geocode_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/geocode_helper.php (.../geocode_helper.php) (revision 14628) @@ -1,6 +1,6 @@ GetFromCache($address, $city, $state, $zip); -// $zip_info = $this->GetFromCache($address, $city, $state, $zip); - if (!$zip_info && !$force_cache) { + if ( !$zip_info && !$force_cache ) { list($lon, $lat, $zip4, $dpbc, $carrier, $geocode_answer) = $this->QueryCoordinatesFromGoogle($address, $city, $state, $zip); - if ($lon != '' && $lat != '') { + if ( $lon != '' && $lat != '' ) { // valid position returned by geocode => add to cache $fields_hash = Array( - 'zipcode' => $zip4, - 'address' => $address, - 'city' => $city, - 'state' => $state, - 'lat' => $lat, - 'lon' => $lon, - 'zip4' => $zip4, - 'dpbc' => $dpbc, - 'carrier' => $carrier, - 'geocode_answer' => $geocode_answer, - ); - $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'ZipCodes'); - return Array($lon, $lat, $zip4, $dpbc, $carrier); + 'zipcode' => $zip4, + 'address' => $address, + 'city' => $city, + 'state' => $state, + 'lat' => $lat, + 'lon' => $lon, + 'zip4' => $zip4, + 'dpbc' => $dpbc, + 'carrier' => $carrier, + 'geocode_answer' => $geocode_answer, + ); + + $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'ZipCodes'); + return Array ($lon, $lat, $zip4, $dpbc, $carrier); } else { // bad case, rie call failed => no data retrieved return false; } } - return Array($zip_info['lon'], $zip_info['lat'], getArrayValue($zip_info, 'zip4'), getArrayValue($zip_info, 'dpbc'), getArrayValue($zip_info, 'carrier')); + return Array ($zip_info['lon'], $zip_info['lat'], getArrayValue($zip_info, 'zip4'), getArrayValue($zip_info, 'dpbc'), getArrayValue($zip_info, 'carrier')); } /** @@ -173,14 +176,14 @@ * @param string $city * @param string $state * @param int $zip - * @return Array (lon, lat) + * @return Array|bool (lon, lat) */ function GetFromCache($address, $city, $state, $zip) { $zip = substr($zip, 0, 5); // use only first 5 digits $sql = 'SELECT lon, lat - FROM '.TABLE_PREFIX.'ZipCodes - WHERE zipcode = '.$this->Conn->qstr($zip); + FROM ' . TABLE_PREFIX . 'ZipCodes + WHERE zipcode = ' . $this->Conn->qstr($zip); return $this->Conn->GetRow($sql); } } \ No newline at end of file Index: branches/5.2.x/core/kernel/utility/formatters/filesize_formatter.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/kernel/utility/formatters/filesize_formatter.php (.../filesize_formatter.php) (revision 14244) +++ branches/5.2.x/core/kernel/utility/formatters/filesize_formatter.php (.../filesize_formatter.php) (revision 14628) @@ -1,6 +1,6 @@ = 1099511627776) { Index: branches/5.2.x/core/units/email_events/email_event_tp.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/email_events/email_event_tp.php (.../email_event_tp.php) (revision 14244) +++ branches/5.2.x/core/units/email_events/email_event_tp.php (.../email_event_tp.php) (revision 14628) @@ -1,6 +1,6 @@ Application->isDebugMode()) { - $grids = $this->Application->getUnitOption($this->Prefix, 'Grids'); + if ( !$this->Application->isDebugMode() ) { + $grids = $this->Application->getUnitOption($this->Prefix, 'Grids', Array ()); + /* @var $grids Array */ foreach ($grids as $grid_name => $grid_data) { - if (array_key_exists('Enabled', $grid_data['Fields'])) { + if ( array_key_exists('Enabled', $grid_data['Fields']) ) { unset($grids[$grid_name]['Fields']['Enabled']); } } Index: branches/5.2.x/core/units/helpers/country_states_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/country_states_helper.php (.../country_states_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/country_states_helper.php (.../country_states_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Conn->GetOne($sql); } + /** + * Checks, that entered state matches entered country + * + * @param kEvent $event + * @param string $state_field + * @param string $country_field + * @param bool $auto_required + * @return void + */ function CheckStateField(&$event, $state_field, $country_field, $auto_required = true) { $object =& $event->getObject(); /* @var $object kDBItem */ $country_iso = $object->GetDBField($country_field); - if ($auto_required) { + if ( $auto_required ) { $object->setRequired($state_field, $this->CountryHasStates($country_iso)); } $state = $object->GetDBField($state_field); - if ($country_iso && $state) { + if ( $country_iso && $state ) { $state_iso = $this->getStateIso($state, $country_iso); - if ($state_iso !== false) { + if ( $state_iso !== false ) { // replace state name with it's ISO code $object->SetDBField($state_field, $state_iso); } Index: branches/5.2.x/core/units/helpers/spam_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/spam_helper.php (.../spam_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/spam_helper.php (.../spam_helper.php) (revision 14628) @@ -1,6 +1,6 @@ ExpirationCache[$this->DataType] = $this->Conn->GetCol($sql, 'ItemResourceId'); } + else { + $key_clause = ''; + } $cache =& $this->ExpirationCache[$this->DataType]; $expires = array_key_exists($this->ResourceId, $cache) ? $cache[$this->ResourceId] : false; Index: branches/5.2.x/core/units/helpers/image_helper.php =================================================================== diff -u -r14585 -r14628 --- branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 14585) +++ branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 14628) @@ -1,6 +1,6 @@ extensionMatch($value['name'], $options['file_types']) ) { // match by file extensions $error_params = Array ( 'file_name' => $value['name'], 'file_types' => $options['file_types'], ); + $object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params); } - elseif (getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types'])) { + elseif ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) ) { // match by mime type provided by web-browser $error_params = Array ( 'file_type' => $value['type'], 'allowed_types' => $options['allowed_types'], ); + $object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat', $error_params); } - elseif ($value['size'] > $max_filesize) { + elseif ( $value['size'] > $max_filesize ) { $object->SetError($field_name, 'bad_file_size', 'la_error_FileTooLarge'); } - elseif (!is_writable($this->FullPath)) { + elseif ( !is_writable($this->FullPath) ) { $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } else { $real_name = $this->_ensureUniqueFilename($this->FullPath, $value['name']); - $file_name = $this->FullPath.$real_name; - if (!move_uploaded_file($value['tmp_name'], $file_name)) { + $file_name = $this->FullPath . $real_name; + if ( !move_uploaded_file($value['tmp_name'], $file_name) ) { $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } else { @chmod($file_name, 0666); - if (getArrayValue($options, 'size_field')) { + + if ( getArrayValue($options, 'size_field') ) { $object->SetDBField($options['size_field'], $value['size']); } - if (getArrayValue($options, 'orig_name_field')) { + + if ( getArrayValue($options, 'orig_name_field') ) { $object->SetDBField($options['orig_name_field'], $value['name']); } - if (getArrayValue($options, 'content_type_field')) { + + if ( getArrayValue($options, 'content_type_field') ) { $object->SetDBField($options['content_type_field'], $value['type']); } - $ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath.$real_name; + $ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath . $real_name; + // delete previous file, when new file is uploaded under same field /*$previous_file = isset($value['upload']) ? $value['upload'] : false; if ($previous_file && file_exists($this->FullPath.$previous_file)) { @@ -178,7 +187,7 @@ } } - if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE)) { + if ( (count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE) ) { $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file', $value); } Index: branches/5.2.x/core/units/helpers/json_helper.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/helpers/json_helper.php (.../json_helper.php) (revision 14244) +++ branches/5.2.x/core/units/helpers/json_helper.php (.../json_helper.php) (revision 14628) @@ -1,6 +1,6 @@ getType($data); - switch ($type) { + switch ( $type ) { case 'object': - $data = '{'.$this->processData($data, $type).'}'; + $data = '{' . $this->processData($data, $type) . '}'; break; case 'array': - $data = '['.$this->processData($data, $type).']'; + $data = '[' . $this->processData($data, $type) . ']'; break; default: - if (is_int($data) || is_float($data)) { + if ( is_int($data) || is_float($data) ) { $data = (string)$data; - } elseif (is_string($data)) { - $data = '"'.$this->escape($data).'"'; - } elseif (is_bool($data)) { + } + elseif ( is_string($data) ) { + $data = '"' . $this->escape($data) . '"'; + } + elseif ( is_bool($data) ) { $data = $data ? 'true' : 'false'; - } else { + } + else { $data = 'null'; } } + return $data; } /** * Enter description here... * - * @param unknown_type $input - * @param unknown_type $type - * @return unknown + * @param Array $data + * @param string $type + * @return string */ function processData($data, $type) { - $output = Array(); + $output = Array (); // If data is an object - it should be converted as a key => value pair - if ($type == 'object'){ - foreach($data as $key => $value) { - $output[] = '"'.$key.'": '.$this->encode($value); + if ( $type == 'object' ) { + foreach ($data as $key => $value) { + $output[] = '"' . $key . '": ' . $this->encode($value); } - } else { - foreach($data as $key => $value) { + } + else { + foreach ($data as $value) { $output[] = $this->encode($value); } } - return implode(',', $output);; + + return implode(',', $output); } /** * Function determines type of variable * - * @param unknown_type $data - * @return unknown + * @param mixed $data + * @return string */ function getType(&$data) { Index: branches/5.2.x/core/kernel/application.php =================================================================== diff -u -r14609 -r14628 --- branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14609) +++ branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14628) @@ -1,6 +1,6 @@ ModuleInfo as $module_name => $module_info) { - $contants_file = FULL_PATH . '/' . $module_info['Path'] . 'constants.php'; + $constants_file = FULL_PATH . '/' . $module_info['Path'] . 'constants.php'; - if (file_exists($contants_file)) { - kUtil::includeOnce($contants_file); + if (file_exists($constants_file)) { + kUtil::includeOnce($constants_file); } } Index: branches/5.2.x/core/units/visits/visits_tag_processor.php =================================================================== diff -u -r14244 -r14628 --- branches/5.2.x/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 14244) +++ branches/5.2.x/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params ); + + $object =& $this->getObject($params); + /* @var $object kDBItem */ + return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users ); } - - function UserLink($params) + /** + * Returns link for user editing + * + * @param Array $params + * + * @return string + * @access protected + */ + protected function UserLink($params) { - $object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params ); + $object =& $this->getObject($params); + /* @var $object kDBItem */ + $user_id = $object->GetDBField( $params['user_field'] ); - if ($user_id) { - $url_params = Array ( - 'm_opener' => 'd', - 'u_mode' => 't', - 'u_event' => 'OnEdit', - 'u_id' => $user_id, - 'pass' => 'all,u' - ); - - return $this->Application->HREF($params['edit_template'], '', $url_params); + if (!$user_id) { + return ''; } + + $url_params = Array ( + 'm_opener' => 'd', + 'u_mode' => 't', + 'u_event' => 'OnEdit', + 'u_id' => $user_id, + 'pass' => 'all,u' + ); + + return $this->Application->HREF($params['edit_template'], '', $url_params); } function getDateLimitClause($field) Index: branches/5.2.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r14585 -r14628 --- branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 14585) +++ branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + /* @var $cat_object kDBList */ + $sql = 'SELECT '.$this->getTitleField().' FROM '.$cat_object->TableName.' WHERE CategoryId = '.(int)$this->Application->GetVar('m_cat_id'); @@ -213,13 +215,16 @@ function getTitleField() { $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + /* @var $ml_formatter kMultiLanguage */ + return $ml_formatter->LangFieldName('Name'); } /** * Returns symlinked category for given category * - * @param $category_id + * @param int $category_id + * @return int */ function getCategorySymLink($category_id) { @@ -536,42 +541,41 @@ * * @param Array $params * @return string + * @access protected */ - function SaveWarning($params) + protected function SaveWarning($params) { - if ($this->Prefix == 'st') { + if ( $this->Prefix == 'st' ) { // don't use this method for other prefixes then Category, that use this tag processor return parent::SaveWarning($params); } $main_prefix = getArrayValue($params, 'main_prefix'); - if ($main_prefix && $main_prefix != '$main_prefix') { + if ( $main_prefix && $main_prefix != '$main_prefix' ) { $top_prefix = $main_prefix; } else { $top_prefix = $this->Application->GetTopmostPrefix($this->Prefix); } - $temp_tables = substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't'; - $modified = $this->Application->RecallVar($top_prefix.'_modified'); + $temp_tables = substr($this->Application->GetVar($top_prefix . '_mode'), 0, 1) == 't'; + $modified = $this->Application->RecallVar($top_prefix . '_modified'); - if (!$temp_tables) { - $this->Application->RemoveVar($top_prefix.'_modified'); + if ( !$temp_tables ) { + $this->Application->RemoveVar($top_prefix . '_modified'); return ''; } $block_name = $this->SelectParam($params, 'render_as,name'); - if ($block_name) { + if ( $block_name ) { $block_params = $this->prepareTagParams($params); $block_params['name'] = $block_name; $block_params['edit_mode'] = $temp_tables ? 1 : 0; $block_params['display'] = $temp_tables && $modified ? 1 : 0; return $this->Application->ParseBlock($block_params); } - else { - return $temp_tables && $modified ? 1 : 0; - } - return ; + + return $temp_tables && $modified ? 1 : 0; } /** @@ -602,6 +606,8 @@ function IsRootCategory($params) { $object =& $this->getObject($params); + /* @var $object CategoriesItem */ + return $object->IsRoot(); } @@ -681,19 +687,19 @@ { static $current_path = null; - if (!isset($current_path)) { + if ( !isset($current_path) ) { $sql = 'SELECT ParentPath FROM ' . TABLE_PREFIX . 'Category WHERE CategoryId = ' . (int)$this->Application->GetVar('m_cat_id'); $current_path = $this->Conn->GetOne($sql); } - if (array_key_exists('parent_path', $params)) { + if ( array_key_exists('parent_path', $params) ) { $test_path = $params['parent_path']; } else { $template = $params['template']; - if ($template) { + if ( $template ) { // when using from "c:CachedMenu" tag $sql = 'SELECT ParentPath FROM ' . TABLE_PREFIX . 'Category @@ -703,16 +709,18 @@ else { // when using from "c:PrintList" tag $cat_id = array_key_exists('cat_id', $params) && $params['cat_id'] ? $params['cat_id'] : false; - if ($cat_id === false) { + if ( $cat_id === false ) { // category not supplied -> get current from PrintList $category =& $this->getObject($params); } else { - if ("$cat_id" == 'Root') { + if ( "$cat_id" == 'Root' ) { $cat_id = $this->Application->findModule('Name', $params['module'], 'RootCat'); } $category =& $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true)); + /* @var $category CategoriesItem */ + $category->Load($cat_id); } @@ -769,8 +777,8 @@ $row_data = $this->Application->getCache($cache_key); - if ($row_data === false) { - if ($local && ($category_id > 0)) { + if ( $row_data === false ) { + if ( $local && ($category_id > 0) ) { // scan only current category & it's children list ($tree_left, $tree_right) = $this->Application->getTreeIndex($category_id); @@ -789,17 +797,20 @@ $this->Application->setCache($cache_key, $row_data); } - if (!$row_data) { + if ( !$row_data ) { return ''; } - $date = $row_data[ $row_data['NewDate'] > $row_data['ModDate'] ? 'NewDate' : 'ModDate' ]; + $date = $row_data[$row_data['NewDate'] > $row_data['ModDate'] ? 'NewDate' : 'ModDate']; // format date $format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat'; - if (preg_match("/_regional_(.*)/", $format, $regs)) { + + if ( preg_match("/_regional_(.*)/", $format, $regs) ) { $lang =& $this->Application->recallObject('lang.current'); - if ($regs[1] == 'DateTimeFormat') { + /* @var $lang LanguagesItem */ + + if ( $regs[1] == 'DateTimeFormat' ) { // combined format $format = $lang->GetDBField('DateFormat') . ' ' . $lang->GetDBField('TimeFormat'); } @@ -902,19 +913,20 @@ * * @param Array $params * @return string + * @access protected */ - function SpellingSuggestions($params) + protected function SpellingSuggestions($params) { $keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) ); - if (!$keywords) { - return ; + if ( !$keywords ) { + return ''; } // 1. try to get already cached suggestion $cache_key = 'search.suggestion[%SpellingDictionary%]:' . $keywords; $suggestion = $this->Application->getCache($cache_key); - if ($suggestion !== false) { + if ( $suggestion !== false ) { return $suggestion; } @@ -927,8 +939,9 @@ WHERE MisspelledWord = ' . $this->Conn->qstr($keywords); $suggestion = $this->Conn->GetOne($sql); - if ($suggestion !== false) { + if ( $suggestion !== false ) { $this->Application->setCache($cache_key, $suggestion); + return $suggestion; } @@ -939,22 +952,20 @@ $curl_helper =& $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ - $xml_data = $curl_helper->Send($url . urlencode($keywords)); + $xml_data = $curl_helper->Send( $url . urlencode($keywords) ); $xml_helper =& $this->Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ $root_node =& $xml_helper->Parse($xml_data); + /* @var $root_node kXMLNode */ $result = $root_node->FindChild('RESULT'); /* @var $result kXMLNode */ - if (is_object($result)) { + if ( is_object($result) ) { // webservice responded -> save in local database - $fields_hash = Array ( - 'MisspelledWord' => $keywords, - 'SuggestedCorrection' => $result->Data, - ); + $fields_hash = Array ('MisspelledWord' => $keywords, 'SuggestedCorrection' => $result->Data); $this->Conn->doInsert($fields_hash, $table_name); $this->Application->setCache($cache_key, $result->Data); @@ -1075,7 +1086,7 @@ * Returns page object based on requested params * * @param Array $params - * @return PagesItem + * @return CategoriesItem */ function &_getPage($params) { @@ -1323,14 +1334,14 @@ /** * Includes admin css and js, that are required for cms usage on Front-Edn * - * * @param Array $params * @return string + * @access protected */ - function EditingScripts($params) + protected function EditingScripts($params) { - if ($this->Application->GetVar('admin_scripts_included') || !EDITING_MODE) { - return ; + if ( $this->Application->GetVar('admin_scripts_included') || !EDITING_MODE ) { + return ''; } $this->Application->SetVar('admin_scripts_included', 1); @@ -1344,17 +1355,16 @@ $js_url . '/../incs/cms.css', ); - $css_compressed = $minify_helper->CompressScriptTag( Array ('files' => implode('|', $to_compress)) ); + $css_compressed = $minify_helper->CompressScriptTag(Array ('files' => implode('|', $to_compress))); $ret = '' . "\n"; - if (EDITING_MODE == EDITING_MODE_DESIGN) { + if ( EDITING_MODE == EDITING_MODE_DESIGN ) { $ret .= ' '; } - $ret .= '' . "\n"; $ret .= '' . "\n"; @@ -1389,19 +1399,19 @@ $ret .= "var \$use_popups = " . ($use_popups > 0 ? 'true' : 'false') . ";\n"; $ret .= "var \$modal_windows = " . ($use_popups == 2 ? 'true' : 'false') . ";\n"; - if (EDITING_MODE != EDITING_MODE_BROWSE) { + if ( EDITING_MODE != EDITING_MODE_BROWSE ) { $ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n"; $ret .= 'TB.closeHtml = \'
\';' . "\n"; - $url_params = Array('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', '__NO_REWRITE__' => 1, 'no_amp' => 1); + $url_params = Array ('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', '__NO_REWRITE__' => 1, 'no_amp' => 1); $browse_url = $this->Application->HREF('catalog/catalog', ADMIN_DIRECTORY, $url_params, 'index.php'); $browse_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $browse_url); $ret .= ' var topmost = window.top; topmost.document.title = document.title + \' - ' . addslashes($this->Application->Phrase('la_AdministrativeConsole', false)) . '\'; - t = \''.$this->Application->GetVar('t').'\'; + t = \'' . $this->Application->GetVar('t') . '\'; if (window.parent.frames["menu"] != undefined) { if ( $.isFunction(window.parent.frames["menu"].SyncActive) ) { @@ -1413,7 +1423,7 @@ $ret .= '' . "\n"; - if (EDITING_MODE != EDITING_MODE_BROWSE) { + if ( EDITING_MODE != EDITING_MODE_BROWSE ) { // add form, so admin scripts could work $ret .= '