- - ' . $this->_replaceInPhrase('current_rating', Array ('' . $rating2 . '', $this->ratingMaximal)) . '
'."\n";;
+ - ' . $this->_replaceInPhrase('current_rating', Array ('' . $rating2 . '', $this->ratingMaximal)) . '
'."\n";
- if (!$static && !$user_voted) {
+ if ( !$static && !$user_voted ) {
// allow to set rating when not static and user not voted before
for ($ncount = 1; $ncount <= $this->ratingMaximal; $ncount++) {
- $rater .= '- ' . $ncount . '
'."\n";
+ $rater .= '- ' . $ncount . '
' . "\n";
}
}
$msg_class = Array ();
- if ($static) {
+ if ( $static ) {
$msg_class[] = 'static';
}
- if ($user_voted) {
+ if ( $user_voted ) {
$msg_class[] = 'voted';
}
@@ -96,11 +98,11 @@
// 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 = '' . $rater . '
';
}
Index: units/helpers/recursive_helper.php
===================================================================
--- units/helpers/recursive_helper.php (revision 14590)
+++ units/helpers/recursive_helper.php (working copy)
@@ -39,7 +39,8 @@
$this->Conn->Query($sql);
$temp_handler =& $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
-
+ /* @var $temp_handler kTempTablesHandler */
+
// 2. delete items this have this category as primary
$delete_ids = $this->getCategoryItems($category_id, true);
@@ -106,9 +107,10 @@
}
/**
- * Complete cloning or category with subcategories and subitems
+ * Complete cloning or category with subcategories and sub-items
*
* @param int $category_id
+ * @param string $prefix
*/
function PasteCategory($category_id, $prefix = 'c')
{
@@ -117,16 +119,16 @@
$src_parent_path = $this->_getParentPath($category_id);
$dst_parent_path = $this->_getParentPath($backup_category_id);
- if (substr($dst_parent_path, 0, strlen($src_parent_path)) == $src_parent_path) {
+ if ( substr($dst_parent_path, 0, strlen($src_parent_path)) == $src_parent_path ) {
// target path contains source path -> recursion
- return ;
+ return;
}
// 1. clone category
- $temp_handler =& $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
+ $temp_handler =& $this->Application->recallObject($prefix . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler*/
- $temp_handler->BuildTables($prefix, Array($category_id));
- $new_category_id = array_pop( $temp_handler->CloneItems($prefix, '', Array($category_id)) );
+ $temp_handler->BuildTables($prefix, Array ($category_id));
+ $new_category_id = array_pop($temp_handler->CloneItems($prefix, '', Array ($category_id)));
$this->Application->SetVar('m_cat_id', $new_category_id);
$id_field = $this->Application->getUnitOption($prefix, 'IDField');
@@ -136,12 +138,14 @@
$paste_ids = $this->getCategoryItems($category_id, false);
foreach ($paste_ids as $item_prefix => $resource_ids) {
- if (!$item_prefix) {
+ if ( !$item_prefix ) {
// not ItemPrefix filled -> old categoryitem linking
continue;
}
- $item_object =& $this->Application->recallObject($item_prefix.'.-item', null, Array('skip_autoload' => true));
+ $item_object =& $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
+ /* @var $item_object kCatDBItem */
+
foreach ($resource_ids as $item_resource_id) {
$item_object->Load($item_resource_id, 'ResourceId');
$item_object->assignToCategory($new_category_id, false);
@@ -152,7 +156,7 @@
$paste_ids = $this->getCategoryItems($category_id, true);
foreach ($paste_ids as $item_prefix => $resource_ids) {
- if (!$item_prefix) {
+ if ( !$item_prefix ) {
// not ItemPrefix filled -> old categoryitem linking
continue;
}
@@ -164,12 +168,12 @@
}
// 4. do same stuff for each subcategory
- $sql = 'SELECT '.$id_field.'
- FROM '.$table_name.'
- WHERE ParentId = '.$category_id;
+ $sql = 'SELECT ' . $id_field . '
+ FROM ' . $table_name . '
+ WHERE ParentId = ' . $category_id;
$sub_categories = $this->Conn->GetCol($sql);
- if ($sub_categories) {
+ if ( $sub_categories ) {
foreach ($sub_categories as $sub_category_id) {
$this->PasteCategory($sub_category_id, $prefix);
}
Index: units/helpers/search_helper.php
===================================================================
--- units/helpers/search_helper.php (revision 14590)
+++ units/helpers/search_helper.php (working copy)
@@ -21,27 +21,34 @@
* Splits search phrase into keyword using quotes,plus and minus sings and spaces as split criteria
*
* @param string $keyword
- * @return string
+ * @return Array
+ * @access public
*/
- function splitKeyword($keyword)
+ public function splitKeyword($keyword)
{
- if ($this->Application->ConfigValue('CheckStopWords')) {
+ if ( $this->Application->ConfigValue('CheckStopWords') ) {
$keyword_after_remove = $this->_removeStopWords($keyword);
- if ($keyword_after_remove) {
+ if ( $keyword_after_remove ) {
// allow to search through stop word grid
$keyword = $keyword_after_remove;
}
}
+ $final = Array ();
$quotes_re = '/([+\-]?)"(.*?)"/';
$no_quotes_re = '/([+\-]?)([^ ]+)/';
- $quoted_kw = preg_match_all($quotes_re, $keyword, $res);
- foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+ preg_match_all($quotes_re, $keyword, $res);
+ foreach ($res[2] as $index => $kw) {
+ $final[$kw] = $res[1][$index];
+ }
$keyword = preg_replace($quotes_re, '', $keyword);
- $not_quoted_kw = preg_match_all($no_quotes_re, $keyword, $res);
- foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+ preg_match_all($no_quotes_re, $keyword, $res);
+ foreach ($res[2] as $index => $kw) {
+ $final[$kw] = $res[1][$index];
+ }
+
return $final;
}
@@ -86,6 +93,8 @@
break;
case '-':
+ $condition = Array ();
+
foreach ($fields as $field) {
$condition[] = $field . " NOT LIKE '%" . $keyword . "%' OR " . $field . ' IS NULL';
}
@@ -129,6 +138,7 @@
$sql_filter_type = $object->isVirtualField($field_name) ? 'having' : 'where';
$field_options = $object->GetFieldOptions($field_name);
+ $table_name = '';
$field_type = isset($field_options['type']) ? $field_options['type'] : 'string';
if (preg_match('/(.*)\.(.*)/', $field_name, $regs)) {
@@ -177,31 +187,41 @@
}
/**
- * Enter description here...
+ * Performs new search on a given grid
*
* @param kEvent $event
+ * @return void
+ * @access public
*/
- function performSearch(&$event)
+ public function performSearch(&$event)
{
$object =& $event->getObject();
+ /* @var $object kDBItem */
// process search keyword
- $search_keyword = $this->Application->GetVar( $event->getPrefixSpecial(true).'_search_keyword');
- $this->Application->StoreVar( $event->getPrefixSpecial().'_search_keyword', $search_keyword);
+ $search_keyword = $this->Application->GetVar($event->getPrefixSpecial(true) . '_search_keyword');
+ $this->Application->StoreVar($event->getPrefixSpecial() . '_search_keyword', $search_keyword);
$custom_filter = $this->processCustomFilters($event);
- if(!$search_keyword && $custom_filter === false) {
+ if ( !$search_keyword && $custom_filter === false ) {
$this->resetSearch($event);
- return true;
+ return ;
}
- if ($search_keyword) {
+ if ( $search_keyword ) {
$this->processAutomaticFilters($event, $search_keyword, $custom_filter);
}
}
-
+ /**
+ * Creates filtering sql clauses based on given search restrictions
+ *
+ * @param kEvent $event
+ * @param string $search_keyword
+ * @param Array $custom_filter
+ * @return void
+ */
function processAutomaticFilters(&$event, $search_keyword, $custom_filter)
{
$grid_name = $this->Application->GetVar('grid_name');
@@ -209,7 +229,9 @@
$search_fields = array_keys($grids[$grid_name]['Fields']);
$search_filter = Array();
+
$object =& $event->getObject();
+ /* @var $object kDBItem */
foreach ($search_fields as $search_field) {
$custom_search = isset($custom_filter[$search_field]);
@@ -609,7 +631,7 @@
*/
function processRangeField(&$object, $search_field, $value, $type)
{
- if (!strlen($value[$type])) {
+ if ( !strlen($value[$type]) ) {
return false;
}
@@ -618,9 +640,9 @@
$value[$type] = trim($value[$type], $dt_separator); // trim any
$tmp_value = explode($dt_separator, $value[$type], 2);
- if (count($tmp_value) == 1) {
+ if ( count($tmp_value) == 1 ) {
$time_format = $this->_getInputTimeFormat($options);
- if ($time_format) {
+ if ( $time_format ) {
// time is missing, but time format available -> guess time and add to date
$time = ($type == 'from') ? adodb_mktime(0, 0, 0) : adodb_mktime(23, 59, 59);
$time = adodb_date($time_format, $time);
@@ -629,6 +651,7 @@
}
$formatter =& $this->Application->recallObject($options['formatter']);
+ /* @var $formatter kFormatter */
$value_ts = $formatter->Parse($value[$type], $search_field, $object);
@@ -650,11 +673,13 @@
*/
function _getInputTimeFormat($field_options)
{
- if (array_key_exists('input_time_format', $field_options)) {
+ if ( array_key_exists('input_time_format', $field_options) ) {
return $field_options['input_time_format'];
}
$lang_current =& $this->Application->recallObject('lang.current');
+ /* @var $lang_current LanguagesItem */
+
return $lang_current->GetDBField('InputTimeFormat');
}
@@ -683,37 +708,46 @@
function SetComplexFilter(&$event, &$type_clauses, $types, $except_types)
{
$includes_or_filter =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
+ /* @var $includes_or_filter kMultipleFilter */
+
$excepts_and_filter =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
+ /* @var $excepts_and_filter kMultipleFilter */
$includes_or_filter_h =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
+ /* @var $includes_or_filter_h kMultipleFilter */
+
$excepts_and_filter_h =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
+ /* @var $excepts_and_filter_h kMultipleFilter */
- if ($types) {
+ if ( $types ) {
$types = explode(',', $types);
+
foreach ($types as $type) {
$type = trim($type);
- if (isset($type_clauses[$type])) {
- if ($type_clauses[$type]['having_filter']) {
- $includes_or_filter_h->addFilter('filter_'.$type, $type_clauses[$type]['include']);
- } else {
- $includes_or_filter->addFilter('filter_'.$type, $type_clauses[$type]['include']);
+ if ( isset($type_clauses[$type]) ) {
+ if ( $type_clauses[$type]['having_filter'] ) {
+ $includes_or_filter_h->addFilter('filter_' . $type, $type_clauses[$type]['include']);
}
+ else {
+ $includes_or_filter->addFilter('filter_' . $type, $type_clauses[$type]['include']);
+ }
}
}
}
- if ($except_types) {
+ if ( $except_types ) {
$except_types = explode(',', $except_types);
foreach ($except_types as $type) {
$type = trim($type);
- if (isset($type_clauses[$type])) {
- if ($type_clauses[$type]['having_filter']) {
- $excepts_and_filter_h->addFilter('filter_'.$type, $type_clauses[$type]['except']);
- } else {
- $excepts_and_filter->addFilter('filter_'.$type, $type_clauses[$type]['except']);
+ if ( isset($type_clauses[$type]) ) {
+ if ( $type_clauses[$type]['having_filter'] ) {
+ $excepts_and_filter_h->addFilter('filter_' . $type, $type_clauses[$type]['except']);
}
+ else {
+ $excepts_and_filter->addFilter('filter_' . $type, $type_clauses[$type]['except']);
+ }
}
}
}
Index: units/helpers/sections_helper.php
===================================================================
--- units/helpers/sections_helper.php (revision 14590)
+++ units/helpers/sections_helper.php (working copy)
@@ -66,9 +66,10 @@
/**
* Builds xml for tree in left frame in admin
*
- * @param Array $params
+ * @return void
+ * @access public
*/
- function BuildTree()
+ public function BuildTree()
{
if ( $this->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;
+ /* @var $children Array */
- $children = isset($section_data['children']) && $section_data['children'] ? $section_data['children'] : false;
- if ($children) {
+ 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: units/helpers/skin_helper.php
===================================================================
--- units/helpers/skin_helper.php (revision 14590)
+++ units/helpers/skin_helper.php (working copy)
@@ -108,8 +108,9 @@
* Returns fields of primary admin skin
*
* @return Array
+ * @access protected
*/
- function _getStyleInfo()
+ protected function _getStyleInfo()
{
$cache_key = 'primary_skin_info[%SkinSerial%]';
$ret = $this->Application->getCache($cache_key);
@@ -159,8 +160,9 @@
*
* @param bool $url
* @return string
+ * @access protected
*/
- function _getStylesheetPath($url = false)
+ protected function _getStylesheetPath($url = false)
{
if ($url) {
return $this->Application->BaseURL( str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) ) . 'user_files';
@@ -172,15 +174,16 @@
/**
* Returns full path to primary admin skin using given or last compiled date
*
- * @param string $url
+ * @param string|bool $url
* @param int $compile_date
* @return string
+ * @access public
*/
- function getSkinPath($url = false, $compile_date = null)
+ public function getSkinPath($url = false, $compile_date = null)
{
$style_info = $this->_getStyleInfo();
- if (!isset($compile_date)) {
+ if ( !isset($compile_date) ) {
$compile_date = $style_info['LastCompiled'];
}
Index: units/helpers/spam_helper.php
===================================================================
--- units/helpers/spam_helper.php (revision 14590)
+++ units/helpers/spam_helper.php (working copy)
@@ -150,6 +150,9 @@
WHERE '.$key_clause;
$this->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: units/helpers/template_helper.php
===================================================================
--- units/helpers/template_helper.php (revision 14590)
+++ units/helpers/template_helper.php (working copy)
@@ -82,7 +82,7 @@
if (!$this->Application->TemplatesCache->TemplateExists($t)) {
$cms_handler =& $this->Application->recallObject('st_EventHandler');
- /* @var $cms_handler StructureEventHandler */
+ /* @var $cms_handler CategoriesEventHandler */
$t = ltrim($cms_handler->GetDesignTemplate($t), '/');
}
@@ -173,8 +173,9 @@
// 1. get location of movable areas
$mask = '';
$start_pos = 0;
- $elements = Array ();
+ $elements = $area = Array ();
$areas = $this->_getDivPairs($data, 'movable-area');
+
foreach ($areas as $area_index => $area) {
// 1.1. get locations of all movable elements inside given area
$area_content = substr($area['data'], $area['open_len'], -$area['close_len']);
Index: units/helpers/themes_helper.php
===================================================================
--- units/helpers/themes_helper.php (revision 14590)
+++ units/helpers/themes_helper.php (working copy)
@@ -147,11 +147,12 @@
* Installs module(-s) language pack for given theme
*
* @param string $theme_path
- * @param string $module_name
+ * @param string|bool $module_name
+ * @return void
*/
function installThemeLanguagePack($theme_path, $module_name = false)
{
- if ($module_name === false) {
+ if ( $module_name === false ) {
$modules = $this->Application->ModuleInfo;
}
else {
@@ -162,13 +163,13 @@
/* @var $language_import_helper LanguageImportHelper */
foreach ($modules as $module_name => $module_info) {
- if ($module_name == 'In-Portal') {
+ if ( $module_name == 'In-Portal' ) {
continue;
}
$lang_file = $theme_path . '/' . $module_info['TemplatePath'] . '_install/english.lang';
- if (file_exists($lang_file)) {
+ if ( file_exists($lang_file) ) {
$language_import_helper->performImport($lang_file, '|0|', '', LANG_SKIP_EXISTING);
}
}
@@ -179,8 +180,10 @@
*
* @param int $theme_id
* @param string $theme_path
+ * @return Array
+ * @access protected
*/
- function getTemplateAliases($theme_id, $theme_path)
+ protected function getTemplateAliases($theme_id, $theme_path)
{
$template_aliases = Array ();
@@ -188,17 +191,17 @@
/* @var $xml_parser kXMLHelper */
foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
- if ($module_name == 'In-Portal') {
+ if ( $module_name == 'In-Portal' ) {
continue;
}
$xml_file = $theme_path . '/' . $module_info['TemplatePath'] . '_install/theme.xml';
- if (file_exists($xml_file)) {
+ if ( file_exists($xml_file) ) {
$xml_data = file_get_contents($xml_file);
$root_node =& $xml_parser->Parse($xml_data);
- if (!is_object($root_node) || !is_a($root_node, 'kXMLNode') || !$root_node->Children) {
+ if ( !is_object($root_node) || !is_a($root_node, 'kXMLNode') || !$root_node->Children ) {
// broken xml OR no aliases defined
continue;
}
@@ -207,22 +210,20 @@
do {
$template_path = trim($current_node->Data);
- $alias = '#' . $module_info['TemplatePath'] . strtolower($current_node->Name). '#';
+ $alias = '#' . $module_info['TemplatePath'] . strtolower($current_node->Name) . '#';
// remember alias in global theme mapping
$template_aliases[$alias] = $template_path;
// store alias in theme file record to use later in design dropdown
- $t_parts = Array (
- 'path' => dirname($template_path) == '.' ? '' : '/' . dirname($template_path),
- 'file' => basename($template_path),
- );
+ $t_parts = Array ('path' => dirname($template_path) == '.' ? ''
+ : '/' . dirname($template_path), 'file' => basename($template_path),);
$sql = 'UPDATE ' . TABLE_PREFIX . 'ThemeFiles
SET TemplateAlias = ' . $this->Conn->qstr($alias) . '
WHERE (ThemeId = ' . $theme_id . ') AND (FilePath = ' . $this->Conn->qstr($t_parts['path']) . ') AND (FileName = ' . $this->Conn->qstr($t_parts['file'] . '.tpl') . ')';
$this->Conn->Query($sql);
- } while (($current_node =& $current_node->NextSibling()));
+ } while ( ($current_node =& $current_node->NextSibling()) );
}
}
Index: units/helpers/user_helper.php
===================================================================
--- units/helpers/user_helper.php (revision 14590)
+++ units/helpers/user_helper.php (working copy)
@@ -59,7 +59,9 @@
$super_admin = ($username == 'super-root') && $this->verifySuperAdmin();
if ($this->Application->isAdmin && ($username == 'root') || ($super_admin && $username == 'super-root')) {
$root_password = $this->Application->ConfigValue('RootPass');
+
$password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+ /* @var $password_formatter kPasswordFormatter */
if ($root_password != $password_formatter->EncryptPassword($password, 'b38')) {
return LoginResult::INVALID_PASSWORD;
@@ -214,13 +216,18 @@
}
$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ /* @var $sync_manager UsersSyncronizeManager */
+
$sync_manager->performAction('LogoutUser');
$this->Application->HandleEvent($dummy, 'u:OnBeforeLogout');
$user_id = USER_GUEST;
$this->Application->SetVar('u.current_id', $user_id);
+
$object =& $this->Application->recallObject('u.current', null, Array('skip_autoload' => true));
+ /* @var $object UsersItem */
+
$object->Load($user_id);
$this->Application->DestroySession();
@@ -285,20 +292,23 @@
$this->event->SetRedirectParam('js_redirect', 1);
}
- // syncronize login
+ // synchronize login
$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ /* @var $sync_manager UsersSyncronizeManager */
+
$sync_manager->performAction('LoginUser', $username, $password);
}
/**
- * Sets correct interface language after sucessful login, based on user settings
+ * Sets correct interface language after successful login, based on user settings
*
- * @param kEvent $event
+ * @return void
+ * @access protected
*/
- function _processInterfaceLanguage()
+ protected function _processInterfaceLanguage()
{
- if (!$this->Application->isAdmin) {
- return ;
+ if ( !$this->Application->isAdmin ) {
+ return;
}
$is_root = $this->Application->RecallVar('user_id') == USER_ROOT;
@@ -315,9 +325,9 @@
$language_info = $this->Conn->GetRow($sql);
$language_id = $language_info && $language_info['LanguageId'] ? $language_info['LanguageId'] : $user_language_id;
- if ($user_language_id != $language_id) {
- // first admin login OR language was delelted or disabled
- if ($is_root) {
+ if ( $user_language_id != $language_id ) {
+ // first admin login OR language was deleted or disabled
+ if ( $is_root ) {
$this->Application->StorePersistentVar('AdminLanguage', $language_id);
}
else {
@@ -342,15 +352,18 @@
}
/**
- * Returns user object, used during login processings
+ * Returns user object, used during login processing
*
* @return UsersItem
+ * @access public
*/
- function &getUserObject()
+ public function &getUserObject()
{
$prefix_special = $this->Application->isAdmin ? 'u.current' : 'u'; // "u" used on front not to change theme
+
$object =& $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
-
+ /* @var $object UsersItem */
+
return $object;
}
Index: units/helpers/xml_helper.php
===================================================================
--- units/helpers/xml_helper.php (revision 14590)
+++ units/helpers/xml_helper.php (working copy)
@@ -28,14 +28,21 @@
*/
const XML_WITH_TEXT_NODES = 2;
- var $RootElement = null;
+ /**
+ * Root node after parsing xml document
+ *
+ * @var kXMLNode
+ * @access protected
+ */
+ protected $RootElement = null;
/**
- * Enter description here...
+ * Xml node, that is currently being processed
*
* @var kXMLNode
+ * @access protected
*/
- var $CurrentElement = null;
+ protected $CurrentElement = null;
var $Mode;
@@ -58,50 +65,39 @@
* @param int $mode
* @param bool $no_case_folding
* @return kXMLNode
+ * @access public
*/
- function &Parse($xml = null, $mode = self::XML_NO_TEXT_NODES, $no_case_folding = false)
+ public function &Parse($xml = null, $mode = self::XML_NO_TEXT_NODES, $no_case_folding = false)
{
$xml = trim($xml);
$this->Mode = !isset($mode) ? self::XML_NO_TEXT_NODES : $mode;
$this->Clear(); // in case if Parse method is called more then one time
$xml_parser = xml_parser_create();
- if ($no_case_folding) {
+ if ( $no_case_folding ) {
xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
}
- xml_set_element_handler( $xml_parser, Array(&$this, 'startElement'), Array(&$this, 'endElement') );
- xml_set_character_data_handler( $xml_parser, Array(&$this, 'characterData') );
+ xml_set_element_handler($xml_parser, Array (&$this, 'startElement'), Array (&$this, 'endElement'));
+ xml_set_character_data_handler($xml_parser, Array (&$this, 'characterData'));
if ( !xml_parse($xml_parser, $xml, 1) ) {
$class_name = $this->XMLNodeClassName;
$byte = xml_get_current_byte_index($xml_parser);
- $extract = '...' . mb_substr($xml, $byte-50, 50) . ' !!![' . mb_substr($xml, $byte, 1) . ']!!! '.mb_substr($xml, $byte+1, 50) . '...';
+ $extract = '...' . mb_substr($xml, $byte - 50, 50) . ' !!![' . mb_substr($xml, $byte, 1) . ']!!! ' . mb_substr($xml, $byte + 1, 50) . '...';
- $message = sprintf(
- 'XML error number %s: %s at line %d col %d, byte %d, extract: %s',
- xml_get_error_code($xml_parser),
- xml_error_string(xml_get_error_code($xml_parser)),
- xml_get_current_line_number($xml_parser),
- xml_get_current_column_number($xml_parser),
- xml_get_current_byte_index($xml_parser),
- $extract
- );
+ $message = sprintf('XML error number %s: %s at line %d col %d, byte %d, extract: %s', xml_get_error_code($xml_parser), xml_error_string(xml_get_error_code($xml_parser)), xml_get_current_line_number($xml_parser), xml_get_current_column_number($xml_parser), xml_get_current_byte_index($xml_parser), $extract);
- $this->RootElement =& new $class_name(
- 'ERROR',
- array(
- 'code' => xml_get_error_code($xml_parser),
- 'message' => $message
- )
- );
+ $this->RootElement =& new $class_name('ERROR', array ('code' => xml_get_error_code($xml_parser), 'message' => $message));
- trigger_error($message, E_USER_WARNING);
+ trigger_error($message, E_USER_WARNING);
}
xml_parser_free($xml_parser);
$root_copy = $this->RootElement;
+ /* @var $root_copy kXMLNode */
+
unset($this->RootElement);
unset($this->CurrentElement);
@@ -149,6 +145,8 @@
if ($this->Mode == self::XML_WITH_TEXT_NODES) {
$class_name = $this->XMLNodeClassName;
$text_node = new $class_name('_TEXT_');
+ /* @var $text_node kXMLNode */
+
$text_node->AppendData($Line);
$this->CurrentElement->AddChild( $text_node );
}
@@ -220,11 +218,12 @@
var $OriginalAttributes = array();
/**
- * List of node childnodes
+ * List of node child nodes
*
* @var Array
+ * @access public
*/
- var $Children = array();
+ public $Children = Array ();
/**
* Node content (usually text)
@@ -268,17 +267,17 @@
*/
var $CRC = null;
- function kXMLNode($name, $attrs = array())
+ function __construct($name, $attributes = Array())
{
$this->Name = strtoupper($name);
$this->OriginalName = $name;
- $this->OriginalAttributes = $attrs;
+ $this->OriginalAttributes = $attributes;
- foreach ($attrs as $attr => $value) {
- $this->Attributes[ strtoupper($attr) ] = $value;
+ foreach ($attributes as $attr => $value) {
+ $this->Attributes[strtoupper($attr)] = $value;
}
- $this->CRC = crc32($this->Name.join(array_keys($this->Attributes)).join(array_values($this->Attributes)));
+ $this->CRC = crc32($this->Name . implode('', array_keys($this->Attributes)) . implode('', array_values($this->Attributes)));
}
/**
@@ -367,9 +366,8 @@
function GetChildValue($path)
{
$child =& $this->GetChild($path);
- if ($child !== false) {
- return $child->Data;
- }
+
+ return $child !== false ? $child->Data : '';
}
/**
@@ -398,43 +396,54 @@
function &FindChild($name)
{
$name = strtoupper($name);
- if ($this->Name == $name) return $this;
- // if (isset($this->Children[$name])) return $this->Children[$name];
- // $children = array_keys($this->Children);
- foreach ($this->Children as $elem)
- {
+ if ( $this->Name == $name ) {
+ return $this;
+ }
+
+ /*if ( isset($this->Children[$name]) ) {
+ return $this->Children[$name];
+ }
+
+ $children = array_keys($this->Children);*/
+
+ foreach ($this->Children as $elem) {
+ /* @var $elem kXMLNode */
+
$child =& $elem->FindChild($name);
- if ($child !== false)
- {
+ if ( $child !== false ) {
return $child;
}
}
- if (isset($child) && is_object($child)) {
+ if ( isset($child) && is_object($child) ) {
$child->_destruct();
}
+
unset($child);
$false = false;
return $false;
}
/**
- * Retruns value of given child or value of it's attribute
+ * Returns value of given child or value of it's attribute
*
* @param string $name
* @param string $attr
* @return string
+ * @access public
*/
- function FindChildValue($name, $attr=null)
+ public function FindChildValue($name, $attr = null)
{
$child =& $this->FindChild($name);
- if ($child !== false) {
- if (isset($attr)) {
- return $child->Attributes[strtoupper($attr)];
+ if ( $child !== false ) {
+ if ( isset($attr) ) {
+ return $child->Attributes[ strtoupper($attr) ];
}
return $child->Data;
}
+
+ return '';
}
/**
Index: units/images/image_event_handler.php
===================================================================
--- units/images/image_event_handler.php (revision 14590)
+++ units/images/image_event_handler.php (working copy)
@@ -59,51 +59,81 @@
return parent::getMainSpecial($event);
}
- function customProcessing(&$event, $type)
+ /**
+ * Don't allow to delete primary category item image, when there are no more images
+ *
+ * @param kEvent $event
+ * @param string $type
+ * @return void
+ * @access protected
+ */
+ protected function customProcessing(&$event, $type)
{
- $object =& $event->GetObject();
- switch ($type)
- {
- case 'before' :
- if ($object->GetDBField('LocalImage'))
- {
- $object->SetDBField('Url', '');
- }
- else
- {
- $object->SetDBField('LocalPath', '');
- }
+ $object =& $event->getObject();
+ /* @var $object kDBItem */
- if ($object->GetDBField('LocalThumb'))
- {
- $object->SetDBField('ThumbUrl', '');
+ if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+ $ids = $event->getEventParam('ids');
+
+ $parent_info = $object->getLinkedInfo($event->Special);
+
+ $sql = 'SELECT ImageId
+ FROM ' . $object->TableName . '
+ WHERE DefaultImg = 1 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+ $primary_file_id = $this->Conn->GetOne($sql);
+
+ if ( $primary_file_id ) {
+ $file_id_index = array_search($primary_file_id, $ids);
+
+ if ( $file_id_index ) {
+ // allow deleting of primary product file, when there is another file to make primary
+ $sql = 'SELECT COUNT(*)
+ FROM ' . $object->TableName . '
+ WHERE DefaultImg = 0 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+ $non_primary_file_count = $this->Conn->GetOne($sql);
+
+ if ( $non_primary_file_count ) {
+ unset($ids[$file_id_index]);
+ }
}
- else
- {
- $object->SetDBField('ThumbPath', '');
- }
+ }
- if ($object->GetDBField('SameImages'))
- {
+ $event->setEventParam('ids', $ids);
+ }
+
+ switch ( $type ) {
+ case 'before' :
+ // empty unused fields
+ $object->SetDBField($object->GetDBField('LocalImage') ? 'Url' : 'LocalPath', '');
+ $object->SetDBField($object->GetDBField('LocalThumb') ? 'ThumbUrl' : 'ThumbPath', '');
+
+ if ( $object->GetDBField('SameImages') ) {
$object->SetDBField('LocalImage', 1);
$object->SetDBField('LocalPath', '');
$object->SetDBField('Url', '');
}
break;
- case 'after' :
- if ($object->GetDBField('DefaultImg') )
- {
- $sql = 'UPDATE '.$object->TableName.' SET DefaultImg=0 WHERE ResourceId='.
- $object->GetDBField('ResourceId').' AND ImageId<>'.
- $object->GetId();
- $res = $this->Conn->Query($sql);
+
+ case 'after':
+ // make sure, that there is only one primary image for the item
+ if ( $object->GetDBField('DefaultImg') ) {
+ $sql = 'UPDATE ' . $object->TableName . '
+ SET DefaultImg = 0
+ WHERE ResourceId = ' . $object->GetDBField('ResourceId') . ' AND ImageId <> ' . $object->GetID();
+ $this->Conn->Query($sql);
}
break;
- default:
}
}
- function ImageAction(&$event)
+ /**
+ * Performs temp-table related action on current image record
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function ImageAction(&$event)
{
$id = $event->getEventParam('id');
@@ -194,114 +224,96 @@
return $new_name;
}
- /**
- * Enter description here...
+ /**
+ * Sets primary image of user/category/category item
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnSetPrimary(&$event)
+ protected function OnSetPrimary(&$event)
{
$object =& $event->getObject();
+ /* @var $object kDBItem */
+
$object->SetDBField('DefaultImg', 1);
$object->Update();
}
/**
- * Enter description here...
+ * Occurs before updating item
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeItemUpdate(&$event)
+ protected function OnBeforeItemUpdate(&$event)
{
- $object =& $event->getObject();
-// $parent_info = $object->getLinkedInfo();
- $id = $object->GetDBField('ResourceId');
-// $id = $parent_info['ParentId'] ? $parent_info['ParentId'] : $this->Application->GetVar('p_id');
- $sql = 'SELECT ImageId FROM '.$object->TableName.' WHERE ResourceId='.$id.' AND DefaultImg=1';
- if(!$this->Conn->GetOne($sql))
- {
- $object->SetDBField('DefaultImg', 1);
- }
- if($object->GetDBField('DefaultImg') && $object->Validate())
- {
+ parent::OnBeforeItemUpdate($event);
- $sql = 'UPDATE '.$object->TableName.'
- SET DefaultImg = 0
- WHERE ResourceId = '.$id.' AND ImageId <> '.$object->GetDBField('ImageId');
- $this->Conn->Query($sql);
- $object->SetDBField('Enabled', 1);
- }
+ $this->processImageStatus($event);
}
- function OnAfterItemCreate(&$event)
+ /**
+ * Occurs after creating item
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnAfterItemCreate(&$event)
{
- $event->CallSubEvent('OnBeforeItemUpdate');
+ parent::OnAfterItemCreate($event);
+
+ $this->processImageStatus($event);
+
$object =& $event->getObject();
+ /* @var $object kDBItem */
+
$object->Update();
}
/**
- * Deletes all selected items.
- * Automatically recurse into sub-items using temp handler, and deletes sub-items
- * by calling its Delete method if sub-item has AutoDelete set to true in its config file
+ * Occurs before item changed
*
* @param kEvent $event
*/
- function OnMassDelete(&$event)
+ function processImageStatus(&$event)
{
- if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
- $event->status = kEvent::erFAIL;
- return;
- }
+ $object =& $event->getObject();
+ /* @var $object kDBItem */
- $event->status=kEvent::erSUCCESS;
+ $id = $object->GetDBField('ResourceId');
- $temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $sql = 'SELECT ImageId
+ FROM ' . $object->TableName . '
+ WHERE ResourceId = ' . $id . ' AND DefaultImg = 1';
+ $primary_image_id = $this->Conn->GetOne($sql);
- $event->setEventParam('ids', $this->StoreSelectedIDs($event) );
- $this->customProcessing($event, 'before');
- $ids = $event->getEventParam('ids');
-
- $object =& $event->getObject();
- $sql = 'SELECT ImageId FROM '.$object->TableName.' WHERE DefaultImg=1';
- $primary = $this->Conn->GetOne($sql);
- if( $primary && ($key = array_search($primary, $ids)) )
- {
- $sql = 'SELECT ImageId FROM '.$object->TableName.' WHERE DefaultImg=0';
- $res = $this->Conn->Query($sql);
- if($res)
- {
- unset($ids[$key]);
- }
+ if ( !$primary_image_id ) {
+ $object->SetDBField('DefaultImg', 1);
}
- if($ids)
- {
- $temp->DeleteItems($event->Prefix, $event->Special, $ids);
+ if ( $object->GetDBField('DefaultImg') && $object->Validate() ) {
+ $sql = 'UPDATE ' . $object->TableName . '
+ SET DefaultImg = 0
+ WHERE ResourceId = ' . $id . ' AND ImageId <> ' . $object->GetDBField('ImageId');
+ $this->Conn->Query($sql);
+
+ $object->SetDBField('Enabled', 1);
}
- $this->clearSelectedIDs($event);
}
- /*function OnAfterItemLoad(&$event)
+ /**
+ * Apply any custom changes to list's sql query
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ * @see kDBEventHandler::OnListBuild()
+ */
+ protected function SetCustomQuery(&$event)
{
- $object =& $event->getObject();
-
- if ( $object->GetDBField('ThumbPath') || $object->GetDBField('SameImages') )
- {
- // return local image or url
- $path = $object->GetDBField('LocalThumb') ? PROTOCOL.SERVER_NAME.BASE_PATH.$object->GetDBField('ThumbPath') : $object->GetDBField('ThumbUrl');
- if ( $object->GetDBField('LocalThumb') && !file_exists(FULL_PATH.$object->GetDBField('ThumbPath')) ) $path = '';
- }
- else { // if we need full which is not the same as thumb
- $path = $object->GetDBField('LocalImage') ? PROTOCOL.SERVER_NAME.BASE_PATH.$object->GetDBField('LocalPath') : $object->GetDBField('Url');
- if ( $object->GetDBField('LocalImage') && !file_exists(FULL_PATH.$object->GetDBField('LocalPath')) ) $path = '';
- }
-
- $object->SetDBField('ImageUrl', $path);
- }*/
-
- function SetCustomQuery(&$event)
- {
parent::SetCustomQuery($event);
$object =& $event->getObject();
Index: units/images/image_tag_processor.php
===================================================================
--- units/images/image_tag_processor.php (revision 14590)
+++ units/images/image_tag_processor.php (working copy)
@@ -21,22 +21,26 @@
*
* @param kDBList $object
* @param Array $block_params
+ * @return void
+ * @access protected
* @author Alex
*/
- function PrepareListElementParams(&$object, &$block_params)
+ protected function PrepareListElementParams(&$object, &$block_params)
{
$image_url = $this->ImageSrc($block_params);
- if (!$image_url) {
+ if ( !$image_url ) {
return ;
}
$parent_prefix = $this->Application->getUnitOption($object->Prefix, 'ParentPrefix');
+
$parent_item =& $this->Application->recallObject($parent_prefix);
+ /* @var $parent_item kDBItem */
$block_params['img_path'] = $image_url;
$image_dimensions = $this->ImageSize($block_params);
- $block_params['img_size'] = $image_dimensions ? $image_dimensions : ' width="'.$block_params['DefaultWidth'].'"';
- $block_params['alt'] = $object->GetField('AltName')? $object->GetField('AltName') : htmlspecialchars($this->getItemTitle($parent_item));
+ $block_params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $block_params['DefaultWidth'] . '"';
+ $block_params['alt'] = $object->GetField('AltName') ? $object->GetField('AltName') : htmlspecialchars($this->getItemTitle($parent_item));
$block_params['align'] = array_key_exists('align', $block_params) ? $block_params['align'] : 'left';
}
@@ -45,10 +49,12 @@
*
* @param kDBItem $object
* @return string
+ * @access protected
*/
- function getItemTitle(&$object)
+ protected function getItemTitle(&$object)
{
$title_field = $this->Application->getUnitOption($object->Prefix, 'TitleField');
+
return $object->GetField($title_field);
}
@@ -425,31 +431,34 @@
*
* @param Array $params
* @return string
+ * @access protected
*/
- function Image($params)
+ protected function Image($params)
{
$image_url = $this->ImageSrc($params);
- if (!$image_url) {
- return ;
+
+ if ( !$image_url ) {
+ return '';
}
$object =& $this->getObject($params);
+ /* @var $object kDBItem */
+
$params['img_path'] = $image_url;
$image_dimensions = $this->ImageSize($params);
- $params['img_size'] = $image_dimensions ? $image_dimensions : ' width="'.$params['DefaultWidth'].'"';
+ $params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $params['DefaultWidth'] . '"';
$params['alt'] = htmlspecialchars($object->GetField('AltName')); // really used ?
$params['name'] = $this->SelectParam($params, 'block,render_as');
$params['align'] = array_key_exists('align', $params) ? $params['align'] : 'left';
$params['no_editing'] = 1;
- if (!$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage')) {
- return false;
+ if ( !$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage') ) {
+ return '';
}
return $this->Application->ParseBlock($params);
}
-
/**
* Returns url for image in case when image source is url (for admin)
*
Index: units/images/images.php
===================================================================
--- units/images/images.php (revision 14590)
+++ units/images/images.php (working copy)
@@ -12,24 +12,31 @@
* See http://www.in-portal.org/license for copyright notices and details.
*/
- defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
- class ImagesItem extends kDBItem {
+class ImagesItem extends kDBItem {
- function Delete($id)
- {
- $this->Load($id);
- $local_path = FULL_PATH.$this->GetDBField('LocalPath');
- $thumb_path = FULL_PATH.$this->GetDBField('ThumbPath');
- if(file_exists($local_path))
- {
- unlink($local_path);
- }
- if(file_exists($thumb_path))
- {
- unlink($thumb_path);
- }
- return parent::Delete($id);
+ /**
+ * Deletes the record from database
+ *
+ * @param int $id
+ * @return bool
+ * @access public
+ */
+ public function Delete($id)
+ {
+ $this->Load($id);
+ $local_path = FULL_PATH . $this->GetDBField('LocalPath');
+ $thumb_path = FULL_PATH . $this->GetDBField('ThumbPath');
+
+ if ( file_exists($local_path) ) {
+ unlink($local_path);
}
- }
\ No newline at end of file
+ if ( file_exists($thumb_path) ) {
+ unlink($thumb_path);
+ }
+
+ return parent::Delete($id);
+ }
+}
\ No newline at end of file
Index: units/languages/languages_event_handler.php
===================================================================
--- units/languages/languages_event_handler.php (revision 14590)
+++ units/languages/languages_event_handler.php (working copy)
@@ -37,11 +37,13 @@
}
/**
- * Permission check override
+ * Checks user permission to execute given $event
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
if ($event->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: units/languages/languages_tag_processor.php
===================================================================
--- units/languages/languages_tag_processor.php (revision 14590)
+++ units/languages/languages_tag_processor.php (working copy)
@@ -32,10 +32,15 @@
$top_prefix = $this->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: units/logs/change_logs/changes_formatter.php
===================================================================
--- units/logs/change_logs/changes_formatter.php (revision 14590)
+++ units/logs/change_logs/changes_formatter.php (working copy)
@@ -12,64 +12,73 @@
* See http://www.in-portal.org/license for copyright notices and details.
*/
- defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
- class kChangesFormatter extends kFormatter {
+class kChangesFormatter extends kFormatter {
- function Format($value, $field_name, &$object, $format=null)
- {
- if ( is_null($value) ) {
- return '';
- }
+ /**
+ * Formats value of a given field
+ *
+ * @param string $value
+ * @param string $field_name
+ * @param kDBItem|kDBList $object
+ * @param string $format
+ * @return string
+ */
+ function Format($value, $field_name, &$object, $format = null)
+ {
+ if ( is_null($value) ) {
+ return '';
+ }
- $changes = unserialize($value);
+ $changes = unserialize($value);
- $res = '';
- if (!$changes) {
- return ;
- }
+ $res = '';
+ if ( !$changes ) {
+ return '';
+ }
- foreach ($changes as $field => $data) {
- $fld_translation = $this->Application->Phrase('la_fld_'.$field);
+ foreach ($changes as $field => $data) {
+ $fld_translation = $this->Application->Phrase('la_fld_' . $field);
- // remove translation link (added in debug mode)
- $fld_translation = preg_replace('/(.*?)<\/a>/', '\\2', $fld_translation);
+ // remove translation link (added in debug mode)
+ $fld_translation = preg_replace('/(.*?)<\/a>/', '\\2', $fld_translation);
- if ($fld_translation == '!'.strtoupper('la_fld_'.$field).'!') {
- // when phrase is not translated use field name as label
- $fld_translation = $field;
+ if ( $fld_translation == '!' . strtoupper('la_fld_' . $field) . '!' ) {
+ // when phrase is not translated use field name as label
+ $fld_translation = $field;
+ }
+
+ if ( is_array($data) ) {
+ if ( $format == 'auto_cut' ) {
+ $data = array_map(Array (&$this, 'cutValue'), $data);
}
- if (is_array($data)) {
- if ($format == 'auto_cut') {
- $data = array_map(Array (&$this, 'cutValue'), $data);
- }
-
- if (array_key_exists('old', $data) && array_key_exists('new', $data)) {
- $res .= "$fld_translation: {$data['old']} => {$data['new']}
\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: units/logs/session_logs/session_log_eh.php
===================================================================
--- units/logs/session_logs/session_log_eh.php (revision 14590)
+++ units/logs/session_logs/session_log_eh.php (working copy)
@@ -75,11 +75,14 @@
}
/**
- * Don't allow to delete other user's messages
+ * Apply custom processing to item
*
* @param kEvent $event
+ * @param string $type
+ * @return void
+ * @access protected
*/
- function customProcessing(&$event, $type)
+ protected function customProcessing(&$event, $type)
{
if ($event->Name == 'OnMassDelete' && $type == 'before') {
$ids = $event->getEventParam('ids');
Index: units/modules/modules_event_handler.php
===================================================================
--- units/modules/modules_event_handler.php (revision 14590)
+++ units/modules/modules_event_handler.php (working copy)
@@ -29,13 +29,18 @@
}
/**
- * List with one record if special passed
+ * Apply any custom changes to list's sql query
*
* @param kEvent $event
+ * @return void
+ * @access protected
+ * @see kDBEventHandler::OnListBuild()
*/
- function SetCustomQuery(&$event)
+ protected function SetCustomQuery(&$event)
{
$object =& $event->getObject();
+ /* @var $object kDBList */
+
if ($event->Special) {
$object->addFilter('current_module', 'Name = '.$event->Special);
}
Index: units/permissions/permissions_event_handler.php
===================================================================
--- units/permissions/permissions_event_handler.php (revision 14590)
+++ units/permissions/permissions_event_handler.php (working copy)
@@ -97,55 +97,63 @@
* Saves permissions while editing group
*
* @param kEvent $event
+ *
+ * @return void
+ * @access protected
*/
- function OnGroupSavePermissions(&$event)
+ protected function OnGroupSavePermissions(&$event)
{
- if (!$this->Application->CheckPermission('in-portal:user_groups.advanced:manage_permissions', 1)) {
+ if ( !$this->Application->CheckPermission('in-portal:user_groups.advanced:manage_permissions', 1) ) {
// no permission to save permissions
- return false;
+ return ;
}
$permissions = $this->Application->GetVar($event->getPrefixSpecial(true));
- if (!$permissions) {
- return false;
+ if ( !$permissions ) {
+ return ;
}
- $object =& $event->getObject( Array('skip_autoload' => true) );
+ $object =& $event->getObject( Array ('skip_autoload' => true) );
+ /* @var $object kDBItem */
+
$group_id = $this->Application->GetVar('g_id');
$permissions_helper =& $this->Application->recallObject('PermissionsHelper');
/* @var $permissions_helper kPermissionsHelper */
$permissions_helper->LoadPermissions($group_id, 0, 1, 'g');
- $delete_ids = Array();
- $create_sql = Array();
- $create_mask = '(%s,%s,'.$group_id.',%s,1,0)';
+ $delete_ids = $create_sql = Array ();
+ $create_mask = '(%s,%s,' . $group_id . ',%s,1,0)';
- $new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
- if($new_id > 0) $new_id = 0;
+ $new_id = (int)$this->Conn->GetOne('SELECT MIN(' . $object->IDField . ') FROM ' . $object->TableName);
+ if ( $new_id > 0 ) {
+ $new_id = 0;
+ }
--$new_id;
$sections_helper =& $this->Application->recallObject('SectionsHelper');
+ /* @var $sections_helper kSectionsHelper */
+
foreach ($permissions as $section_name => $section_permissions) {
$section_data =& $sections_helper->getSectionData($section_name);
- if ($section_data && isset($section_data['perm_prefix'])) {
+ if ( $section_data && isset($section_data['perm_prefix']) ) {
// using permission from other prefix
- $section_name = $this->Application->getUnitOption($section_data['perm_prefix'].'.main', 'PermSection');
+ $section_name = $this->Application->getUnitOption($section_data['perm_prefix'] . '.main', 'PermSection');
}
foreach ($section_permissions as $perm_name => $perm_value) {
-
- if (!$permissions_helper->isOldPermission($section_name, $perm_name)) {
- $perm_name = $section_name.'.'.$perm_name;
+ if ( !$permissions_helper->isOldPermission($section_name, $perm_name) ) {
+ $perm_name = $section_name . '.' . $perm_name;
}
$db_perm_value = $permissions_helper->getPermissionValue($perm_name);
- if ($db_perm_value == 1 && $perm_value == 0) {
+
+ if ( $db_perm_value == 1 && $perm_value == 0 ) {
// permission was disabled => delete it's record
$delete_ids[] = $permissions_helper->getPermissionID($perm_name);
}
- elseif ($db_perm_value == 0 && $perm_value == 1) {
+ elseif ( $db_perm_value == 0 && $perm_value == 1 ) {
// permission was enabled => created it's record
$create_sql[$perm_name] = sprintf($create_mask, $new_id--, $this->Conn->qstr($perm_name), $this->Conn->qstr($perm_value));
}
@@ -153,18 +161,17 @@
}
}
- $this->UpdatePermissions($event, $create_sql, Array(), $delete_ids);
+ $this->UpdatePermissions($event, $create_sql, Array (), $delete_ids);
- if ($this->Application->GetVar('advanced_save') == 1) {
+ if ( $this->Application->GetVar('advanced_save') == 1 ) {
// advanced permission popup [save button]
$this->finalizePopup($event);
// $event->redirect = 'incs/just_close';
}
- elseif ($this->Application->GetVar('section_name') != '') {
+ elseif ( $this->Application->GetVar('section_name') != '' ) {
// save simple permissions before opening advanced permission popup
$event->redirect = false;
}
-
}
/**
@@ -230,14 +237,16 @@
*/
function OnBeforeDeleteFromLive(&$event)
{
- if ($event->Prefix == 'c-perm') {
+ if ( $event->Prefix == 'c-perm' ) {
// only when saving category permissions, not group permissions
$foreign_keys = $event->getEventParam('foreign_key');
- if ((count($foreign_keys) == 1) && ($foreign_keys[0] == 0)) {
+ if ( (count($foreign_keys) == 1) && ($foreign_keys[0] == 0) ) {
// parent item has zero id
$temp_object =& $this->Application->recallObject('c');
- if ($temp_object->isLoaded()) {
+ /* @var $temp_object CategoriesItem */
+
+ if ( $temp_object->isLoaded() ) {
// category with id = 0 found in temp table
$event->status = kEvent::erFAIL;
}
Index: units/permissions/permissions_tag_processor.php
===================================================================
--- units/permissions/permissions_tag_processor.php (revision 14590)
+++ units/permissions/permissions_tag_processor.php (working copy)
@@ -21,6 +21,8 @@
$section_name = $params['section_name'];
$sections_helper =& $this->Application->recallObject('SectionsHelper');
+ /* @var $sections_helper kSectionsHelper */
+
$section_data =& $sections_helper->getSectionData($section_name);
return array_search($params['perm_name'], $section_data['permissions']) !== false;
@@ -31,6 +33,8 @@
$section_name = $params['section_name'];
$sections_helper =& $this->Application->recallObject('SectionsHelper');
+ /* @var $sections_helper kSectionsHelper */
+
$section_data =& $sections_helper->getSectionData($section_name);
$ret = false;
@@ -49,6 +53,8 @@
$perm_name = $params['perm_name'];
$sections_helper =& $this->Application->recallObject('SectionsHelper');
+ /* @var $sections_helper kSectionsHelper */
+
$section_data =& $sections_helper->getSectionData($section_name);
if ($section_data && isset($section_data['perm_prefix'])) {
@@ -57,6 +63,8 @@
}
$permissions_helper =& $this->Application->recallObject('PermissionsHelper');
+ /* @var $permissions_helper kPermissionsHelper */
+
if (!$permissions_helper->isOldPermission($section_name, $perm_name)) {
$perm_name = $section_name.'.'.$perm_name;
}
@@ -181,25 +189,29 @@
* Returns category name by ID
*
* @param Array $params
+ * @return string
+ * @access protected
*/
- function CategoryPath($params)
+ protected function CategoryPath($params)
{
$category_id = $params['cat_id'];
$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
$category_path = $this->Application->getCache($cache_key);
- if ($category_path === false) {
- // not chached
- if ($category_id > 0) {
+ if ( $category_path === false ) {
+ // not cached
+ if ( $category_id > 0 ) {
$id_field = $this->Application->getUnitOption('c', 'IDField');
$table_name = $this->Application->getUnitOption('c', 'TableName');
+
$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ /* @var $ml_formatter kMultiLanguage */
- $sql = 'SELECT '.$ml_formatter->LangFieldName('CachedNavbar').'
- FROM '.$table_name.'
- WHERE '.$id_field.' = '.$category_id;
+ $sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
+ FROM ' . $table_name . '
+ WHERE ' . $id_field . ' = ' . $category_id;
$cached_navbar = preg_replace('/^Content(&\|&){0,1}/i', '', $this->Conn->GetOne($sql));
- $category_path = trim($this->CategoryPath( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
+ $category_path = trim($this->CategoryPath(Array ('cat_id' => 0)) . ' > ' . str_replace('&|&', ' > ', $cached_navbar), ' > ');
}
else {
$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
Index: units/related_searches/related_searches_event_handler.php
===================================================================
--- units/related_searches/related_searches_event_handler.php (revision 14590)
+++ units/related_searches/related_searches_event_handler.php (working copy)
@@ -26,6 +26,7 @@
parent::OnNew($event);
$object =& $event->getObject();
+ /* @var $object kDBItem */
$table_info = $object->getLinkedInfo();
Index: units/relationship/relationship_event_handler.php
===================================================================
--- units/relationship/relationship_event_handler.php (revision 14590)
+++ units/relationship/relationship_event_handler.php (working copy)
@@ -39,6 +39,8 @@
parent::OnNew($event);
$object =& $event->getObject();
+ /* @var $object kDBItem */
+
$table_info = $object->getLinkedInfo();
$object->SetDBField('SourceId', $table_info['ParentId']);
@@ -59,50 +61,53 @@
function OnProcessSelected(&$event)
{
$dst_field = $this->Application->RecallVar('dst_field');
- if ($dst_field == 'TargetId') {
+
+ if ( $dst_field == 'TargetId' ) {
// prepare target_id & target_type
- $object =& $event->getObject( Array('skip_autoload' => true) );
+ $object =& $event->getObject(Array ('skip_autoload' => true));
+ $target_id = 0;
+ $target_prefix = false;
$selected_ids = $this->Application->GetVar('selected_ids');
- $target_prefix = false;
+
foreach ($selected_ids as $selected_prefix => $target_id) {
- if ($target_id > 0) {
+ if ( $target_id > 0 ) {
$target_prefix = $selected_prefix;
break;
}
}
- if (!$target_prefix) {
- $this->finalizePopup($event);
+ if ( !$target_prefix ) {
+ $event->SetRedirectParam('opener', 'u');
return;
}
$sql = 'SELECT ResourceId
- FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').'
- WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' IN ('.$target_id.')';
+ FROM ' . $this->Application->getUnitOption($target_prefix, 'TableName') . '
+ WHERE ' . $this->Application->getUnitOption($target_prefix, 'IDField') . ' IN (' . $target_id . ')';
$target_id = $this->Conn->GetOne($sql);
$target_type = $this->Application->getUnitOption($target_prefix, 'ItemType');
// don't add same relation twice
$table_info = $object->getLinkedInfo();
$sql = 'SELECT TargetId
- FROM '.$object->TableName.'
- WHERE (SourceId = '.$table_info['ParentId'].') AND (TargetId = '.$target_id.')';
+ FROM ' . $object->TableName . '
+ WHERE (SourceId = ' . $table_info['ParentId'] . ') AND (TargetId = ' . $target_id . ')';
$duplicate_relation = $this->Conn->GetOne($sql) == $target_id;
- $this->finalizePopup($event);
+ $event->SetRedirectParam('opener', 'u');
- if (!$duplicate_relation) {
+ if ( !$duplicate_relation ) {
// place correct template in opener stack
$source_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
- $template = $this->Application->getUnitOption($source_prefix, 'AdminTemplatePath').'/relations_edit';
+ $template = $this->Application->getUnitOption($source_prefix, 'AdminTemplatePath') . '/relations_edit';
- $redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type);
- $this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix);
+ $redirect_params = Array ($event->Prefix . '_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type);
+ $this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,' . $event->Prefix);
}
}
else {
- $this->finalizePopup($event);
+ $event->SetRedirectParam('opener', 'u');
}
}
@@ -110,22 +115,27 @@
* Set ItemName & ItemType virtual fields based on loaded item data
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnAfterItemLoad(&$event)
+ protected function OnAfterItemLoad(&$event)
{
+ parent::OnAfterItemLoad($event);
+
$object =& $event->getObject();
+ /* @var $object kDBItem */
$sql = 'SELECT Prefix
- FROM '.TABLE_PREFIX.'ItemTypes
- WHERE ItemType = '.$object->GetDBField('TargetType');
+ FROM ' . TABLE_PREFIX . 'ItemTypes
+ WHERE ItemType = ' . $object->GetDBField('TargetType');
$target_prefix = $this->Conn->GetOne($sql);
$title_field = $this->getTitleField($target_prefix);
$title_phrase = $this->Application->getUnitOption($target_prefix, 'TitlePhrase');
- $sql = 'SELECT '.$title_field.'
- FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').'
- WHERE ResourceId = '.$object->GetDBField('TargetId');
+ $sql = 'SELECT ' . $title_field . '
+ FROM ' . $this->Application->getUnitOption($target_prefix, 'TableName') . '
+ WHERE ResourceId = ' . $object->GetDBField('TargetId');
$object->SetDBField('ItemName', $this->Conn->GetOne($sql));
$object->SetDBField('ItemType', $this->Application->Phrase($title_phrase));
Index: units/reviews/reviews_event_handler.php
===================================================================
--- units/reviews/reviews_event_handler.php (revision 14590)
+++ units/reviews/reviews_event_handler.php (working copy)
@@ -36,8 +36,10 @@
* Checks REVIEW/REVIEW.PENDING permission by main object primary category (not current category)
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
if ($event->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: units/reviews/reviews_tag_processor.php
===================================================================
--- units/reviews/reviews_tag_processor.php (revision 14590)
+++ units/reviews/reviews_tag_processor.php (working copy)
@@ -53,7 +53,9 @@
function Field($params)
{
$field = $this->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: units/selectors/selectors_event_handler.php
===================================================================
--- units/selectors/selectors_event_handler.php (revision 14590)
+++ units/selectors/selectors_event_handler.php (working copy)
@@ -37,37 +37,45 @@
}
/**
- * Occures before an item has been cloned
+ * Occurs before an item has been cloned
* Id of newly created item is passed as event' 'id' param
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeClone(&$event)
+ protected function OnBeforeClone(&$event)
{
+ parent::OnBeforeClone($event);
+
$event->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,7 +87,7 @@
}*/
$original_checked = true;
- } while ($res !== false);
+ } while ( $res !== false );
$object->SetDBField($title_field, $new_name);
}
@@ -87,12 +95,16 @@
* 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);
- $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: units/selectors/selectors_tag_processor.php
===================================================================
--- units/selectors/selectors_tag_processor.php (revision 14590)
+++ units/selectors/selectors_tag_processor.php (working copy)
@@ -18,7 +18,9 @@
function PrintStyle($params)
{
- $object =& $this->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: units/site_domains/site_domain_eh.php
===================================================================
--- units/site_domains/site_domain_eh.php (revision 14590)
+++ units/site_domains/site_domain_eh.php (working copy)
@@ -17,11 +17,13 @@
class SiteDomainEventHandler extends kDBEventHandler {
/**
- * Permission check override
+ * Checks user permission to execute given $event
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
if ($event->Name == 'OnItemBuild') {
// check permission without using $event->getSection(),
@@ -104,11 +106,11 @@
*/
function LoadItem(&$event)
{
- if ($this->Application->isAdmin) {
+ if ( $this->Application->isAdmin ) {
// don't load domain data from cache
parent::LoadItem($event);
- return ;
+ return;
}
$object =& $event->getObject();
@@ -116,9 +118,9 @@
$id = (int)$this->getPassedID($event);
- if ($object->isLoaded() && ($object->GetID() == $id)) {
+ if ( $object->isLoaded() && ($object->GetID() == $id) ) {
// object is already loaded by same id
- return ;
+ return;
}
$site_helper =& $this->Application->recallObject('SiteHelper');
@@ -127,9 +129,11 @@
$site_domains = $site_helper->getSiteDomains();
$domain_data = array_key_exists($id, $site_domains) ? $site_domains[$id] : false;
- if ($object->LoadFromHash($domain_data)) {
+ if ( $object->LoadFromHash($domain_data) ) {
$actions =& $this->Application->recallObject('kActions');
- $actions->Set($event->getPrefixSpecial().'_id', $object->GetID() );
+ /* @var $actions Params */
+
+ $actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
}
else {
$object->setID($id);
@@ -162,8 +166,9 @@
$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
// remove grid columns
- $grids = $this->Application->getUnitOption($event->Prefix, 'Grids');
-
+ $grids = $this->Application->getUnitOption($event->Prefix, 'Grids', Array ());
+ /* @var $grids Array */
+
foreach ($grids as $grid_name => $grid_info) {
foreach ($remove_fields as $remove_field) {
if (array_key_exists($remove_field, $grid_info['Fields'])) {
@@ -180,12 +185,14 @@
* Delete cached information about site domains
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnSave(&$event)
+ protected function OnSave(&$event)
{
parent::OnSave($event);
- if ($event->status == kEvent::erSUCCESS) {
+ if ( $event->status == kEvent::erSUCCESS ) {
$this->_deleteCache();
}
}
@@ -207,11 +214,13 @@
}
/**
- * Set's required fields based on redirect mode
+ * Sets required fields based on redirect mode
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnAfterItemLoad(&$event)
+ protected function OnAfterItemLoad(&$event)
{
parent::OnAfterItemLoad($event);
@@ -222,8 +231,10 @@
* Set's required fields based on redirect mode
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeItemCreate(&$event)
+ protected function OnBeforeItemCreate(&$event)
{
parent::OnBeforeItemCreate($event);
@@ -234,8 +245,10 @@
* Set's required fields based on redirect mode
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeItemUpdate(&$event)
+ protected function OnBeforeItemUpdate(&$event)
{
parent::OnBeforeItemUpdate($event);
Index: units/skins/skin_eh.php
===================================================================
--- units/skins/skin_eh.php (revision 14590)
+++ units/skins/skin_eh.php (working copy)
@@ -82,8 +82,10 @@
* Don't make cloned skin primary
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeClone(&$event)
+ protected function OnBeforeClone(&$event)
{
parent::OnBeforeClone($event);
@@ -117,28 +119,31 @@
* [HOOK] Compile stylesheet file based on theme definitions
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnCompileStylesheet(&$event)
+ protected function OnCompileStylesheet(&$event)
{
- $object =& $event->getObject( Array('skip_autoload' => true) );
+ $object =& $event->getObject( Array ('skip_autoload' => true) );
+ /* @var $object kDBItem */
+
$object->SwitchToLive();
$ids = $event->MasterEvent->getEventParam('ids');
- if (!is_array($ids)) {
- $ids = explode(',', $ids);
+ if ( !is_array($ids) ) {
+ $ids = explode(',', $ids);
}
- if (!$ids) {
- return false;
+ if ( !$ids ) {
+ return ;
}
$skin_helper =& $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
- foreach($ids as $id) {
+ foreach ($ids as $id) {
$object->Load($id);
$skin_helper->compile($object);
}
}
-
}
\ No newline at end of file
Index: units/statistics/statistics_event_handler.php
===================================================================
--- units/statistics/statistics_event_handler.php (revision 14590)
+++ units/statistics/statistics_event_handler.php (working copy)
@@ -17,13 +17,17 @@
class StatisticsEventHandler extends kDBEventHandler {
/**
- * Allows to show statistics only of requrested type
+ * Allows to show statistics only of requested type
*
* @param kEvent $event
+ * @return void
+ * @access protected
+ * @see kDBEventHandler::OnListBuild()
*/
- function SetCustomQuery(&$event)
+ protected function SetCustomQuery(&$event)
{
$object =& $event->getObject();
+ /* @var $object kDBList */
if ($event->Special == 'summary') {
$object->addFilter('summary_filter', '%1$s.AdminSummary = 1');
Index: units/statistics/statistics_tag_processor.php
===================================================================
--- units/statistics/statistics_tag_processor.php (revision 14590)
+++ units/statistics/statistics_tag_processor.php (working copy)
@@ -45,6 +45,8 @@
case 'number':
// simple-specific postformatting
$lang =& $this->Application->recallObject('lang.current');
+ /* @var $lang LanguagesItem */
+
$value = $lang->formatNumber($value, $this->PostFormattingParams['precision']);
break;
@@ -102,6 +104,7 @@
}
$object =& $this->getObject();
+ /* @var $object kDBItem */
list($tag_name, $tag_params) = explode(' ', $tag, 2); // 1st - function, 2nd .. nth - params
preg_match_all('/([\${}a-zA-Z0-9_.-]+)=(["\']{1,1})(.*?)(?" type="" precision="2"
$lang =& $this->Application->recallObject('lang.current');
+ /* @var $lang LanguagesItem */
+
switch ($tag_params['type']) {
case 'date':
$this->PostFormatting = $lang->GetDBField('DateFormat');
Index: units/stylesheets/stylesheets_event_handler.php
===================================================================
--- units/stylesheets/stylesheets_event_handler.php (revision 14590)
+++ units/stylesheets/stylesheets_event_handler.php (working copy)
@@ -12,27 +12,33 @@
* See http://www.in-portal.org/license for copyright notices and details.
*/
- defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
- class StylesheetsEventHandler extends kDBEventHandler {
+class StylesheetsEventHandler extends kDBEventHandler {
- /**
- * [HOOK] Compile stylesheet file based on theme definitions
- *
- * @param kEvent $event
- */
- function OnCompileStylesheet(&$event)
- {
- $object =& $event->getObject( Array('skip_autoload' => true) );
- $object->SwitchToLive();
+ /**
+ * [HOOK] Compile stylesheet file based on theme definitions
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnCompileStylesheet(&$event)
+ {
+ $object =& $event->getObject( Array ('skip_autoload' => true) );
+ /* @var $object StylesheetsItem */
- $ids = explode(',', $event->MasterEvent->getEventParam('ids') );
+ $object->SwitchToLive();
- if(!$ids) return false;
- foreach($ids as $id)
- {
- $object->Load($id);
- $object->Compile();
- }
+ $ids = explode(',', $event->MasterEvent->getEventParam('ids'));
+
+ if ( !$ids ) {
+ return ;
}
- }
\ No newline at end of file
+
+ foreach ($ids as $id) {
+ $object->Load($id);
+ $object->Compile();
+ }
+ }
+}
\ No newline at end of file
Index: units/stylesheets/stylesheets_item.php
===================================================================
--- units/stylesheets/stylesheets_item.php (revision 14590)
+++ units/stylesheets/stylesheets_item.php (working copy)
@@ -20,6 +20,8 @@
function Compile()
{
$selector_item =& $this->Application->recallObject('selectors.item', 'selectors', Array('live_table'=>true, 'skip_autoload' => true) );
+ /* @var $selector_item SelectorsItem */
+
$parent_field = $this->Application->getUnitOption($selector_item->Prefix, 'ForeignKey');
$sql_template = 'SELECT '.$selector_item->IDField.' FROM '.$selector_item->TableName.' WHERE '.$parent_field.' = %s ORDER BY SelectorName ASC';
Index: units/theme_files/theme_file_eh.php
===================================================================
--- units/theme_files/theme_file_eh.php (revision 14590)
+++ units/theme_files/theme_file_eh.php (working copy)
@@ -34,11 +34,13 @@
}
/**
- * Changes permission section to one from REQUEST, not from config
+ * Checks user permission to execute given $event
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
if ($event->Name == 'OnLoadBlock' || $event->Name == 'OnSaveBlock') {
return $this->Application->isAdminUser;
@@ -51,8 +53,10 @@
* Loads template contents into virtual field
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnAfterItemLoad(&$event)
+ protected function OnAfterItemLoad(&$event)
{
parent::OnAfterItemLoad($event);
@@ -61,7 +65,7 @@
$filename = $this->_getTemplatePath($object);
- if (file_exists($filename)) {
+ if ( file_exists($filename) ) {
$object->SetDBField('FileContents', file_get_contents($filename));
}
else {
@@ -73,8 +77,10 @@
* Trim contents of edited template
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnBeforeItemUpdate(&$event)
+ protected function OnBeforeItemUpdate(&$event)
{
parent::OnBeforeItemUpdate($event);
Index: units/themes/themes_eh.php
===================================================================
--- units/themes/themes_eh.php (revision 14590)
+++ units/themes/themes_eh.php (working copy)
@@ -31,11 +31,13 @@
}
/**
- * Permission check override
+ * Checks user permission to execute given $event
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
if ($event->Name == 'OnItemBuild') {
// check permission without using $event->getSection(),
@@ -107,12 +109,14 @@
* Also rebuilds theme files, when enabled theme is saved
*
* @param kEvent $event
+ * @return void
+ * @access protected
*/
- function OnSave(&$event)
+ protected function OnSave(&$event)
{
parent::OnSave($event);
- if (($event->status != kEvent::erSUCCESS) || !$event->getEventParam('ids')) {
+ if ( ($event->status != kEvent::erSUCCESS) || !$event->getEventParam('ids') ) {
return ;
}
@@ -126,7 +130,7 @@
WHERE ' . $id_field . ' IN (' . $ids . ') AND (Enabled = 1)';
$enabled_themes = $this->Conn->GetOne($sql);
- if ($enabled_themes) {
+ if ( $enabled_themes ) {
$rebuild_event = new kEvent('adm:OnRebuildThemes');
$this->Application->HandleEvent($rebuild_event);
}
@@ -163,8 +167,11 @@
* Apply system filter to themes list
*
* @param kEvent $event
+ * @return void
+ * @access protected
+ * @see kDBEventHandler::OnListBuild()
*/
- function SetCustomQuery(&$event)
+ protected function SetCustomQuery(&$event)
{
parent::SetCustomQuery($event);
Index: units/thesaurus/thesaurus_eh.php
===================================================================
--- units/thesaurus/thesaurus_eh.php (revision 14590)
+++ units/thesaurus/thesaurus_eh.php (working copy)
@@ -20,8 +20,11 @@
* Shows only thesaurus terms, that matches searched keywords
*
* @param kEvent $event
+ * @return void
+ * @access protected
+ * @see kDBEventHandler::OnListBuild()
*/
- function SetCustomQuery(&$event)
+ protected function SetCustomQuery(&$event)
{
parent::SetCustomQuery($event);
Index: units/translator/translator_event_handler.php
===================================================================
--- units/translator/translator_event_handler.php (revision 14590)
+++ units/translator/translator_event_handler.php (working copy)
@@ -34,8 +34,10 @@
* Check permission of item, that being translated
*
* @param kEvent $event
+ * @return bool
+ * @access public
*/
- function CheckPermission(&$event)
+ public function CheckPermission(&$event)
{
list($prefix, $field) = $this->getPrefixAndField($event);
@@ -63,13 +65,23 @@
return Array($prefix, $field);
}
- function OnLoad(&$event)
+ /**
+ * Loads record to be translated
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnLoad(&$event)
{
list($obj_prefix, $field) = $this->getPrefixAndField($event);
$object =& $this->Application->recallObject($obj_prefix);
- $translator =& $this->Application->recallObject($event->getPrefixSpecial());
+ /* @var $object kDBItem */
+ $translator =& $event->getObject();
+ /* @var $translator kDBItem */
+
$def_lang = $this->Application->GetDefaultLanguageId();
$current_lang = $translator->GetDBField('Language');
@@ -88,6 +100,8 @@
$translator->SetDBField('Translation', $object->GetDBField('l'.$current_lang.'_'.$field));
$cur_lang =& $this->Application->recallObject('lang.current');
+ /* @var $cur_lang LanguagesItem */
+
$cur_lang->Load($current_lang);
$translator->SetDBField('Charset', $cur_lang->GetDBField('Charset'));
@@ -95,21 +109,35 @@
$event->redirect = false;
}
- function OnSaveAndClose(&$event)
+ /**
+ * Saves changes into temporary table and closes editing window
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnSaveAndClose(&$event)
{
$event->CallSubEvent('OnPreSave');
- $this->finalizePopup($event);
+
+ $event->SetRedirectParam('opener', 'u');
}
- function OnPreSave(&$event)
+ /**
+ * Saves edited item into temp table
+ * If there is no id, new item is created in temp table
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnPreSave(&$event)
{
- $translator =& $this->Application->recallObject($event->getPrefixSpecial());
+ $translator =& $event->getObject();
+ /* @var $translator kDBItem */
- $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
- if($items_info) $field_values = array_shift($items_info);
+ $translator->SetFieldsFromHash( $this->getSubmittedFields($event) );
- $translator->SetFieldsFromHash($field_values);
-
list($obj_prefix, $field) = $this->getPrefixAndField($event);
$object =& $this->Application->recallObject($obj_prefix);
@@ -117,17 +145,28 @@
$lang = $translator->GetDBField('Language');
- $object->SetFieldOptions('l'.$lang.'_'.$field, Array ());
- $object->SetDBField('l'.$lang.'_'.$field, $translator->GetDBField('Translation'));
+ $object->SetFieldOptions('l' . $lang . '_' . $field, Array ());
+ $object->SetDBField('l' . $lang . '_' . $field, $translator->GetDBField('Translation'));
$this->RemoveRequiredFields($object);
$object->Update();
}
- function OnChangeLanguage(&$event)
+ /**
+ * Changes current language in translation popup
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnChangeLanguage(&$event)
{
$event->CallSubEvent('OnPreSave');
- $translator =& $this->Application->recallObject($event->getPrefixSpecial());
- $translator->SetDBField('Language', $translator->GetDBField('SwitchLanguage'));
+
+ $object =& $event->getObject();
+ /* @var $object kDBItem */
+
+ $object->SetDBField('Language', $object->GetDBField('SwitchLanguage'));
+
$event->CallSubEvent('OnLoad');
$event->redirect = false;
}
Index: units/user_groups/user_groups_dbitem.php
===================================================================
--- units/user_groups/user_groups_dbitem.php (revision 14590)
+++ units/user_groups/user_groups_dbitem.php (working copy)
@@ -12,31 +12,31 @@
* See http://www.in-portal.org/license for copyright notices and details.
*/
- defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
- class UserGroups_DBItem extends kDBItem {
+class UserGroups_DBItem extends kDBItem {
- /**
- * 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, $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->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: units/user_groups/user_groups_eh.php
===================================================================
--- units/user_groups/user_groups_eh.php (revision 14590)
+++ units/user_groups/user_groups_eh.php (working copy)
@@ -111,8 +111,11 @@
* Don't allow primary group record deleting
*
* @param kEvent $event
+ * @param string $type
+ * @return void
+ * @access protected
*/
- function customProcessing(&$event, $type)
+ protected function customProcessing(&$event, $type)
{
if ($event->Name == 'OnMassDelete' && $type == 'before') {
$ids = $event->getEventParam('ids');
Index: units/user_profile/user_profile_tp.php
===================================================================
--- units/user_profile/user_profile_tp.php (revision 14590)
+++ units/user_profile/user_profile_tp.php (working copy)
@@ -120,16 +120,17 @@
*
* @param Array $params
* @return bool
+ * @access protected
*/
- function NotLastField($params)
+ protected function NotLastField($params)
{
- $counter = (int)$this->Application->GetVar($params['counter']);
+ $counter = (int)$this->Application->GetVar( $params['counter'] );
- return $counter < $this->ProfileFieldCount();
+ return $counter < $this->ProfileFieldCount($params);
}
/**
- * Because of persistant session table doesn't have ids, we use user id as id for each record
+ * Because of persistent session table doesn't have ids, we use user id as id for each record
*
* @param Array $params
* @return Array (id,field)
Index: units/visits/visits_event_handler.php
===================================================================
--- units/visits/visits_event_handler.php (revision 14590)
+++ units/visits/visits_event_handler.php (working copy)
@@ -34,27 +34,28 @@
* Registers user visit to site
*
* @param kEvent $event
+ *
+ * @return void
+ * @access protected
*/
- function OnRegisterVisit(&$event)
+ protected function OnRegisterVisit(&$event)
{
- if ($this->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());
}
}
@@ -62,45 +63,45 @@
* 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: units/visits/visits_tag_processor.php
===================================================================
--- units/visits/visits_tag_processor.php (revision 14590)
+++ units/visits/visits_tag_processor.php (working copy)
@@ -19,27 +19,41 @@
function UserFound($params)
{
$virtual_users = Array(USER_ROOT, USER_GUEST, 0);
- $object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
+
+ $object =& $this->getObject($params);
+ /* @var $object kDBItem */
+
return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users );
}
+ /**
+ * Returns link for user editing
+ *
+ * @param Array $params
+ *
+ * @return string
+ * @access protected
+ */
+ protected function UserLink($params)
+ {
+ $object =& $this->getObject($params);
+ /* @var $object kDBItem */
- function UserLink($params)
- {
- $object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
$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'
- );
+ if (!$user_id) {
+ return '';
+ }
- return $this->Application->HREF($params['edit_template'], '', $url_params);
- }
+ $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)
