" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -r9419 -r9639
--- branches/RC/core/install/install_data.sql (.../install_data.sql) (revision 9419)
+++ branches/RC/core/install/install_data.sql (.../install_data.sql) (revision 9639)
@@ -67,7 +67,12 @@
INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
INSERT INTO ConfigurationAdmin VALUES ('UseSmallHeader', 'la_Text_Website', 'la_config_UseSmallHeader', 'checkbox', '', '', 10.21, 0, 0);
INSERT INTO ConfigurationAdmin VALUES ('User_Default_Registration_Country', 'la_Text_General', 'la_config_DefaultRegistrationCountry', 'select', NULL , '=+,SELECT DestName AS OptionName, DestId AS OptionValue FROM StdDestinations WHERE DestParentId IS NULL Order BY OptionName', 10.111, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportDelimiter', 'la_Text_CSV_Export', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_Tab,1=la_Comma,2=la_Semicolon,3=la_Space,4=la_Colon', 40.1, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEnclosure', 'la_Text_CSV_Export', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes,1=la_Quotes', 40.2, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportSeparator', 'la_Text_CSV_Export', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux,1=la_Windows', 40.3, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEncoding', 'la_Text_CSV_Export', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode,1=la_Regular', 40.4, 0, 1);
+
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Columns_Category', '2', 'In-Portal', 'Categories');
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DomainSelect','1','In-Portal','in-portal:configure_general');
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_general');
@@ -207,6 +212,10 @@
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseSmallHeader', '0', 'In-Portal', 'in-portal:configure_general');
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Default_Registration_Country', '', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportDelimiter', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_general');
INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r9419 -r9639
--- branches/RC/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 9419)
+++ branches/RC/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 9639)
@@ -1218,6 +1218,31 @@
}
}
+ function OnMassResetSettings(&$event)
+ {
+ if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+ return;
+ }
+
+ $event->status=erSUCCESS;
+ $ids = $this->StoreSelectedIDs($event);
+
+ $default_user_id = $this->Application->ConfigValue('DefaultSettingsUserId');
+ if (in_array($default_user_id, $ids)) {
+ array_splice($ids, array_search($default_user_id, $ids), 1);
+ }
+ if ($ids) {
+ $q = 'DELETE FROM '.TABLE_PREFIX.'PersistantSessionData WHERE PortalUserId IN ('.join(',', $ids).') AND
+ (VariableName LIKE "%_columns_%"
+ OR
+ VariableName LIKE "%_filter%"
+ OR
+ VariableName LIKE "%_PerPage%")';
+ $this->Conn->Query($q);
+ }
+ $this->clearSelectedIDs($event);
+ }
+
/**
* Checks, that currently loaded item is allowed for viewing (non permission-based)
*
Index: branches/RC/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r8929 -r9639
--- branches/RC/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 8929)
+++ branches/RC/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 9639)
@@ -7,6 +7,8 @@
document.body.style.overflow = 'hidden';
document.body.scroll = 'no'
+ var _Simultanious_Edit_Message = '';
+ var _DropTempUrl = '';
addLoadEvent(function() {Form.Init('scroll_container')});
}
Index: branches/RC/core/kernel/globals.php
===================================================================
diff -u -r9558 -r9639
--- branches/RC/core/kernel/globals.php (.../globals.php) (revision 9558)
+++ branches/RC/core/kernel/globals.php (.../globals.php) (revision 9639)
@@ -305,7 +305,7 @@
* @param unknown_type $post
* @return unknown
*/
- function curl_post($url, $post, $headers=null, $request_type = 'POST')
+ function curl_post($url, $post, $headers=null, $request_type = 'POST', $curl_options=null)
{
if( is_array($post) )
{
@@ -348,6 +348,11 @@
curl_setopt($ch,CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 90);
+ if (is_array($curl_options)) {
+ foreach ($curl_options as $option => $value) {
+ curl_setopt($ch, $option, $value);
+ }
+ }
$ret = curl_exec($ch);
$GLOBALS['curl_errorno'] = curl_errno($ch);
$GLOBALS['curl_error'] = curl_error($ch);
@@ -472,10 +477,30 @@
}
$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
+ $line = preg_replace('/'.preg_quote($enclosure).'([0-9\.]+)'.preg_quote($enclosure).'/', '$1', $line);
fwrite($filePointer, $line);
}
/**
+ * Enter description here...
+ *
+ * @param resource $filePointer the file resource to write to
+ * @param Array $data the data to write out
+ * @param string $delimiter the field separator
+ * @param string $enclosure symbol to enclose field data to
+ * @param string $recordSeparator symbols to separate records with
+ */
+ function getcsvline($data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
+ {
+ foreach($data as $field_index => $field_value) {
+ // replaces an enclosure with two enclosures
+ $data[$field_index] = str_replace($enclosure, $enclosure.$enclosure, $field_value);
+ }
+ $line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
+ $line = preg_replace('/'.preg_quote($enclosure).'([0-9\.]+)'.preg_quote($enclosure).'/', '$1', $line);
+ return $line;
+ }
+ /**
* Allows to replace #section# within any string with current section
*
* @param string $string
Index: branches/RC/core/units/skins/skin_eh.php
===================================================================
diff -u -r9313 -r9639
--- branches/RC/core/units/skins/skin_eh.php (.../skin_eh.php) (revision 9313)
+++ branches/RC/core/units/skins/skin_eh.php (.../skin_eh.php) (revision 9639)
@@ -49,7 +49,8 @@
$object =& $event->getObject( Array('skip_autoload' => true) );
$object->SwitchToLive();
- $ids = explode(',', $event->MasterEvent->getEventParam('ids') );
+ $ids = $event->MasterEvent->getEventParam('ids');
+ if (!is_array($ids)) $ids = explode(',', $ids);
if(!$ids) return false;
foreach($ids as $id)
Index: branches/RC/core/kernel/parser/construct_tags.php
===================================================================
diff -u -r9286 -r9639
--- branches/RC/core/kernel/parser/construct_tags.php (.../construct_tags.php) (revision 9286)
+++ branches/RC/core/kernel/parser/construct_tags.php (.../construct_tags.php) (revision 9639)
@@ -66,7 +66,7 @@
$inverse = $this->GetParam('inverse');
if ($prefix !== false) {
- $tag = new Tag('', $this->Parser);
+ $tag =& new Tag('', $this->Parser);
$tag->Tag = $function;
$tmp = $this->Application->processPrefix($prefix);
@@ -219,6 +219,7 @@
}
$this->Parser->UsedProcessors = null;*/
+ // because of unshift the code is added from bottom to top here, so read from the bottom below:
array_unshift($code, '$o = \'\';');
array_unshift($code, '$application->Parser->SetParams($params, false);');
array_unshift($code, '$application =& kApplication::Instance();');
@@ -233,6 +234,7 @@
array_unshift($code, '$params = array_merge_recursive2($defaults, $params);');
array_unshift($code, $defaults);
+ // ^^^^ read up from here ^^^^
$code[] = 'return $o;';
global $debugger;
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r9419 -r9639
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 9419)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 9639)
@@ -137,4 +137,14 @@
ADD Priority INT NOT NULL AFTER AdminInterfaceLang;
DELETE FROM PersistantSessionData WHERE VariableName = 'lang_columns_.';
-ALTER TABLE SessionData CHANGE VariableValue VariableValue longtext NOT NULL;
\ No newline at end of file
+ALTER TABLE SessionData CHANGE VariableValue VariableValue longtext NOT NULL;
+
+REPLACE INTO ConfigurationAdmin VALUES ('CSVExportDelimiter', 'la_Text_CSV_Export', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_Tab,1=la_Comma,2=la_Semicolon,3=la_Space,4=la_Colon', 40.1, 0, 1);
+REPLACE INTO ConfigurationAdmin VALUES ('CSVExportEnclosure', 'la_Text_CSV_Export', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes,1=la_Quotes', 40.2, 0, 1);
+REPLACE INTO ConfigurationAdmin VALUES ('CSVExportSeparator', 'la_Text_CSV_Export', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux,1=la_Windows', 40.3, 0, 1);
+REPLACE INTO ConfigurationAdmin VALUES ('CSVExportEncoding', 'la_Text_CSV_Export', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode,1=la_Regular', 40.4, 0, 1);
+
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportDelimiter', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_general');
Index: branches/RC/core/admin_templates/img/toolbar/tool_import.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/general/helpers/search_helper.php
===================================================================
diff -u -r8929 -r9639
--- branches/RC/core/units/general/helpers/search_helper.php (.../search_helper.php) (revision 8929)
+++ branches/RC/core/units/general/helpers/search_helper.php (.../search_helper.php) (revision 9639)
@@ -291,7 +291,7 @@
// update "custom filter" with values from submit: begin
$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
- $custom_filters = $this->Application->RecallPersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name);
+ $custom_filters = $this->Application->RecallPersistentVar($event->getPrefixSpecial().'_custom_filter.'.$view_name, ALLOW_DEFAULT_SETTINGS);
if ($custom_filters) {
$custom_filters = unserialize($custom_filters);
$custom_filter = isset($custom_filters[$grid_name]) ? $custom_filters[$grid_name] : Array ();
Index: branches/RC/core/units/general/helpers/priority_helper.php
===================================================================
diff -u -r8929 -r9639
--- branches/RC/core/units/general/helpers/priority_helper.php (.../priority_helper.php) (revision 8929)
+++ branches/RC/core/units/general/helpers/priority_helper.php (.../priority_helper.php) (revision 9639)
@@ -22,7 +22,10 @@
FROM '.$table_name;
if ($constrain) {
$sql .= ' WHERE '.$constrain;
+ }
+ if (!isset($object->Fields['OldPriority'])) {
+ $object->VirtualFields['OldPriority'] = Array('type' => 'int', 'default' => 0);
}
$items_count = $this->Conn->GetOne($sql);
@@ -32,19 +35,23 @@
$object->SetDBField('Priority', -$items_count);
$object->SetDBField('OldPriority', -$items_count);
}
+ else {
+ $object->SetDBField('OldPriority', $object->GetDBField('Priority'));
+ }
for ($i = 1; $i <= $items_count; $i++) {
$field_options['options'][-$i] = $i;
}
$object->SetFieldOptions('Priority', $field_options);
+ // storing prioriry right after load for comparing when updating
}
/**
* Updates priorities for changed items
*
* @param kEvent $event
- * @param Array $changes = Array (CategoryID => Array ('parent' => ..., 'new' => ..., 'old' => ...), ...)
+ * @param Array $changes = Array (ID => Array ('parent' => ..., 'new' => ..., 'old' => ...), ...)
* @param Array $new_ids = Array (temp_id => live_id)
* @param string $constrain
*/
@@ -55,8 +62,10 @@
$not_processed = array_keys($changes);
+ $ids = array();
foreach ($changes as $id => $pair) {
- $constrain = 'ParentId = '.$pair['parent'].' AND ';
+ array_push($ids, $id);
+ $constrain = isset($pair['parent']) ? 'ParentId = '.$pair['parent'].' AND ' : '';
if ($pair['old'] == 'new') {
// replace 0 with newly created item id (from $new_ids mapping)
@@ -65,7 +74,7 @@
$sql = 'SELECT MIN(Priority)
FROM '.$table_name.'
- WHERE '.$constrain.' CategoryId NOT IN ('.implode(',', $not_processed).')';
+ WHERE '.$constrain.' '.$id_field.' NOT IN ('.implode(',', $not_processed).')';
$min_priority = (int)$this->Conn->GetOne($sql) - 1;
if ($pair['new'] < $min_priority) {
@@ -75,31 +84,34 @@
}
if ($pair['new'] < $pair['old']) {
- $q = ' SET Priority = Priority + 1
- WHERE '.$constrain.'
+ $set = ' SET Priority = Priority + 1';
+ $where =' WHERE '.$constrain.'
Priority >= '.$pair['new'].'
AND
Priority < '.$pair['old'].'
AND
- CategoryId NOT IN ('.implode(',', $not_processed).')';
+ '.$id_field.' NOT IN ('.implode(',', $not_processed).')';
}
elseif ($pair['new'] > $pair['old']) {
- $q = ' SET Priority = Priority - 1
- WHERE '.$constrain.'
+ $set = ' SET Priority = Priority - 1';
+ $where =' WHERE '.$constrain.'
Priority > '.$pair['old'].'
AND
Priority <= '.$pair['new'].'
AND
- CategoryId NOT IN ('.implode(',', $not_processed).')';
+ '.$id_field.' NOT IN ('.implode(',', $not_processed).')';
}
else {
- $q = 'SET Priority = '.$pair['new'].' WHERE '.$id_field.' = '.$id;
+ $set = 'SET Priority = '.$pair['new'];
+ $where = ' WHERE '.$id_field.' = '.$id;
}
- $q = 'UPDATE '.$table_name.' '.$q;
+ $ids = array_merge($ids, $this->Conn->GetCol('SELECT '.$id_field.' FROM '.$table_name.$where));
+ $q = 'UPDATE '.$table_name.' '.$set.$where;
$this->Conn->Query($q);
unset( $not_processed[array_search($id, $not_processed)] );
}
+ return $ids;
}
/**
@@ -126,6 +138,7 @@
WHERE '.$id_field.' = '.$item_id;
$this->Conn->Query($sql);
}
+ return $items;
}
}
Index: branches/RC/core/admin_templates/js/simple_grid.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/js/simple_grid.js (revision 0)
+++ branches/RC/core/admin_templates/js/simple_grid.js (revision 9639)
@@ -0,0 +1,144 @@
+function SimpleGrid($id_prefix, $field_mask, $show_order) {
+ this.ItemIDs = new Array ();
+ this.NextNumber = 0;
+ this.IDPrefix = $id_prefix;
+ this.FieldMask = $field_mask;
+ this.Container = this.getControl('container');
+ this.ShowOrder = $show_order;
+}
+
+SimpleGrid.prototype.registerRecord = function ($id) {
+ var $prev_id = this.lastID();
+ if ($prev_id !== false) {
+ this.getControl('button_' + $prev_id).value = '-';
+ }
+
+ $id = parseInt($id);
+ this.ItemIDs.push($id);
+
+ if ($id < 0 && Math.abs($id) > Math.abs(this.NextNumber)) {
+ this.NextNumber = $id;
+ }
+
+ if (this.ShowOrder) {
+ this.getControl('number_'+$id).innerHTML = this.ItemIDs.length;
+ }
+
+ this.processRecordDependancies($id);
+}
+
+SimpleGrid.prototype.renumberRecords = function () {
+ if (!this.ShowOrder) {
+ return ;
+ }
+
+ var $i = 0;
+ while ($i < this.ItemIDs.length) {
+ this.getControl('number_' + this.ItemIDs[$i]).innerHTML = $i + 1;
+ $i++;
+ }
+}
+
+SimpleGrid.prototype.nextNumber = function () {
+ return --this.NextNumber;
+}
+
+SimpleGrid.prototype.lastID = function () {
+ return this.ItemIDs.length ? this.ItemIDs.slice(this.ItemIDs.length - 1)[0] : false;
+}
+
+SimpleGrid.prototype.toggleRecord = function ($item_id) {
+ if (this.lastID() == $item_id) {
+ this.addRecord();
+ }
+ else {
+ this.removeRecord($item_id);
+ }
+}
+
+SimpleGrid.prototype.getControl = function ($name) {
+ return document.getElementById(this.IDPrefix + '_' + $name);
+}
+
+SimpleGrid.prototype.getField = function ($id, $field_name, $prepend, $append) {
+ $prepend = isset($prepend) ? $prepend + '_' : '';
+ $append = isset($append) ? '_' + $append : '';
+
+ return document.getElementById($prepend + this.FieldMask.replace('#FIELD#', $field_name).replace('#ID#', $id) + $append);
+}
+
+SimpleGrid.prototype.markError = function ($item_id, $field_name, $error_found) {
+ if (!isset($error_found)) {
+ $error_found = true;
+ }
+
+ var $field = this.getField($item_id, $field_name);
+ if ($error_found) {
+ $field.style.backgroundColor = '#EF2C2C';
+
+ // TODO: duplicate focus events possible on one element, fix this later
+ addEvent($field, 'focus',
+ function($e) {
+ if (!$e) {
+ $e = window.event;
+ }
+
+ var $element = document.all ? $e.srcElement : $e.currentTarget;
+ $element.style.backgroundColor = '';
+ }
+
+ );
+ }
+ else {
+ $field.style.backgroundColor = '';
+ }
+}
+
+SimpleGrid.prototype.validateRecord = function ($item_id) {
+ return true;
+}
+
+SimpleGrid.prototype.validate = function () {
+ var $i = 0;
+ var $is_valid = true;
+ while ($i < this.ItemIDs.length) {
+ if (!this.validateRecord(this.ItemIDs[$i])) {
+ $is_valid = false;
+ }
+ $i++;
+ }
+
+ return $is_valid;
+}
+
+SimpleGrid.prototype.addRecord = function () {
+ var new_item_number = this.nextNumber();
+
+ var $item_mask = this.getControl('mask').value;
+ var $result_html = $item_mask.replace(/#NUMBER#/g, new_item_number);
+
+ var $div = document.createElement('DIV');
+ $div.id = this.IDPrefix + '_' + new_item_number;
+ this.getControl('container').appendChild($div);
+ $div.innerHTML = $result_html;
+
+ var $js_mask = this.getControl('js_mask').value;
+ var result_js = $js_mask.replace(/#NUMBER#/g, new_item_number);
+ eval(result_js);
+}
+
+SimpleGrid.prototype.removeRecord = function ($number) {
+ this.getControl('container').removeChild( this.getControl($number) );
+ var $index = array_search($number, this.ItemIDs);
+ this.ItemIDs.splice($index, 1);
+ this.renumberRecords();
+ this.updateTotals();
+}
+
+SimpleGrid.prototype.updateTotals = function () {
+ // prototype
+}
+
+SimpleGrid.prototype.processRecordDependancies = function ($id) {
+ // prototype
+}
Index: branches/RC/core/units/general/helpers/helpers_config.php
===================================================================
diff -u -r8929 -r9639
--- branches/RC/core/units/general/helpers/helpers_config.php (.../helpers_config.php) (revision 8929)
+++ branches/RC/core/units/general/helpers/helpers_config.php (.../helpers_config.php) (revision 9639)
@@ -23,5 +23,6 @@
Array('pseudo'=>'ImageHelper','class'=>'ImageHelper','file'=>'image_helper.php','build_event'=>'','require_classes'=>'kHelper'),
Array('pseudo'=>'CategoryHelper','class'=>'CategoryHelper','file'=>'category_helper.php','build_event'=>'','require_classes'=>'kHelper'),
+ Array('pseudo'=>'CSVHelper','class'=>'kCSVHelper','file'=>'csv_helper.php','build_event'=>'','require_classes'=>'kHelper'),
),
);
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/ajax_dropdown.js
===================================================================
diff -u -r9321 -r9639
--- branches/RC/core/admin_templates/js/ajax_dropdown.js (.../ajax_dropdown.js) (revision 9321)
+++ branches/RC/core/admin_templates/js/ajax_dropdown.js (.../ajax_dropdown.js) (revision 9639)
@@ -97,6 +97,7 @@
this.Box.style.overflow = 'auto';
this.Box.className = 'suggest-box'
+ this.Input.setAttribute('autocomplete', 'off');
// add onkeyup
var obj = this;
addEvent(this.Input, 'keyup', function(ev) {obj.KeyUp(ev)})
Index: branches/RC/core/admin_templates/js/application.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/js/application.js (revision 0)
+++ branches/RC/core/admin_templates/js/application.js (revision 9639)
@@ -0,0 +1,72 @@
+function kApplication() {
+ this.Hooks = new Array ();
+
+ addLoadEvent(
+ function () {
+ Application.processHooks('m:OnAfterWindowLoad');
+ }
+ );
+
+}
+
+kApplication.prototype.SetVar = function ($name, $value) {
+ set_hidden_field($name, $value);
+}
+
+// hidden fields are printed in footer, that's why use this in m:OnAfterWindowLoad hook
+kApplication.prototype.GetVar = function ($name) {
+ return get_hidden_field($name);
+}
+
+kApplication.prototype.setHook = function ($hook_to, $do_code, $hook_mode) {
+ if (!isset($hook_mode)) {
+ $hook_mode = hBEFORE;
+ }
+ if (typeof $hook_to == 'string') {
+ setArrayValue(this.Hooks, $hook_to, $hook_mode, $do_code);
+ }
+ else {
+ var $i = 0;
+ while ($i < $hook_to.length) {
+ this.setHook($hook_to[$i], $do_code, $hook_mode);
+ $i++;
+ }
+ }
+}
+
+kApplication.prototype.processHooks = function ($hook_to, $hook_mode) {
+ if (!isset($hook_mode)) {
+ $hook_mode = hBEFORE;
+ }
+
+ var $i = 0;
+ var $defined_hooks = getArrayValue(this.Hooks, $hook_to, $hook_mode);
+
+ while($i < $defined_hooks.length) {
+ var $do_event = new kEvent($hook_to);
+ $defined_hooks[$i]($do_event);
+ if (!$do_event.status) {
+ return false;
+ break;
+ }
+ $i++;
+ }
+ return true;
+}
+
+// =======================================
+
+function kEvent($params) {
+ if ($params.match(/([^.:]*)[.]{0,1}([^:]*):(.*)/, $params)) {
+ this.Prefix = RegExp.$1;
+ this.Special = RegExp.$2;
+ this.Name = RegExp.$3;
+ }
+ else {
+ this.Prefix = '';
+ this.Special = '';
+ this.Name = '';
+ }
+
+ this.status = true;
+}
\ No newline at end of file
Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r9359 -r9639
--- branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 9359)
+++ branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 9639)
@@ -783,7 +783,12 @@
return $this->Application->HREF($t, '', $vars, $index_file);
}
-
+ function MenuFrameWidth($params)
+ {
+ $w = $this->Application->ConfigValue('MenuFrameWidth');
+ if (!$w) $w = 200;
+ return $w;
+ }
function AdminSkin($params)
{
static $style;
@@ -857,6 +862,46 @@
$this->Application->RemoveVar('compile_errors');
return $o;
}
+
+ function ExportData($params)
+ {
+ $export_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $export_helper kCSVHelper */
+ $result = $export_helper->ExportData( $this->SelectParam($params, 'var,name,field') );
+ return ($result === false) ? '' : $result;
+ }
+ function ImportData($params)
+ {
+ $import_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $import_helper kCSVHelper */
+ $result = $import_helper->ImportData( $this->SelectParam($params, 'var,name,field') );
+ return ($result === false) ? '' : $result;
+ }
+
+ function PrintCSVNotImportedLines($params)
+ {
+ $import_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $import_helper kCSVHelper */
+ return $import_helper->GetNotImportedLines();
+ }
+
+ /**
+ * Returns input field name to
+ * be placed on form (for correct
+ * event processing)
+ *
+ * @param Array $params
+ * @return string
+ * @access public
+ */
+ function InputName($params)
+ {
+ list($id, $field) = $this->prepareInputName($params);
+
+ $ret = $this->getPrefixSpecial().'[0]['.$field.']'; // 0 always, as has no idfield
+ if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
+ return $ret;
+ }
}
?>
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/forms.js
===================================================================
diff -u -r9266 -r9639
--- branches/RC/core/admin_templates/js/forms.js (.../forms.js) (revision 9266)
+++ branches/RC/core/admin_templates/js/forms.js (.../forms.js) (revision 9639)
@@ -104,6 +104,35 @@
}
}
}
+
+ addEvent(window, 'unload', function() {
+ if (!unload_legal) { // it's set in submit_kernel_form - if we are submitting form, the unload is already handled
+ // if we got here, it means that we are closing window ilegally (through OS interace X button)
+// alert('closing window');
+ // we need to clear temp tables then
+
+ var req = Request.getRequest();
+ var $ajax_mark = (_DropTempUrl.indexOf('?') ? '&' : '?') + 'ajax=yes';
+ req.open('GET', _DropTempUrl + $ajax_mark, false); //!!!SYNCRONIOUS!!! REQUEST (3rd param = false!!!)
+ req.send(null);
+
+// window.opener.EditWindowClosed(_DropTempUrl);
+// alert('request sent, closing widow');
+ }
+ });
+
+ // we need to set unload_legal to true if we are refreshing current window, because onunload will still fire
+ addEvent(document, 'keydown', function(e) {
+ var code;
+ if (!e) var e = window.event;
+ if (e.keyCode) code = e.keyCode;
+ else if (e.which) code = e.which;
+ if (code == 116 || (e.ctrlKey && code == 82)) unload_legal = true; //F5 or Ctrl+R
+ });
+
+ if (_Simultanious_Edit_Message != '') {
+ alert(_Simultanious_Edit_Message);
+ }
}
Form.addControl = function(id, options) {
Index: branches/RC/core/admin_templates/js/dropdown_mapper.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/js/dropdown_mapper.js (revision 0)
+++ branches/RC/core/admin_templates/js/dropdown_mapper.js (revision 9639)
@@ -0,0 +1,129 @@
+function DropDownMapper(map, request, input_mask) {
+ this.Map = map;
+ this.Request = request;
+ this.InputMask = input_mask;
+ this.Objects = new Object();
+ this.WatchFields = [];
+ this.UpdateFields = {};
+ this.Init()
+}
+
+DropDownMapper.prototype.Init = function()
+{
+ this.AssignDrills(this.Map);
+ this.DrillDownRequests(this.Map,'root');
+ for (var i in this.WatchFields) {
+ var elem = document.getElementById(this.InputMask.replace('#FIELD#', this.WatchFields[i]));
+ elem.fieldName = this.WatchFields[i];
+ addEvent(elem, 'change', function(ev) {
+ var el = !is.ie ? ev.currentTarget : window.event.srcElement;
+ mapper.Changed(el.fieldName);
+ })
+ }
+}
+
+DropDownMapper.prototype.GetFilters = function(map, o)
+{
+ if (!map) map = this.Map;
+ if (!o) o = '';
+ for (var i in map) {
+ if (map[i].Field) o += escape(map[i].Field+'='+this.GetValue(map[i].Field)+'&');
+ if (map[i].Pass) { // additional fields to pass to the ajax query
+ for (var x in map[i].Pass) {
+ o += escape(map[i].Pass[x]+'='+this.GetValue(map[i].Pass[x])+'&');
+ }
+ }
+ if (map[i].SubNodes) {
+ o += this.GetFilters(map[i].SubNodes)
+ }
+ }
+ return o;
+}
+
+DropDownMapper.prototype.GetValue = function(field)
+{
+ elem = document.getElementById(this.InputMask.replace('#FIELD#', field));
+ if (elem.type && elem.type == 'checkbox') return elem.checked ? 1:0;
+ return elem.value;
+}
+
+DropDownMapper.prototype.Changed = function(field)
+{
+ var branch = this.FindBranch(field);
+ this.DrillDownRequests(branch, field);
+ if (this.UpdateFields[field]) {
+ for (var i in this.UpdateFields[field]) {
+ this.Objects[this.UpdateFields[field][i]].Query();
+ }
+ }
+}
+
+DropDownMapper.prototype.AssignDrills = function(map)
+{
+ var mapper = this;
+ for (var i in map) {
+ if ( map[i].Field ) {
+ this.WatchFields.push(map[i].Field);
+ if ( map[i].Pass ) {
+ for (var p in map[i].Pass) {
+ if (!in_array(map[i].Pass[p], this.WatchFields)) {
+ this.WatchFields.push(map[i].Pass[p]);
+ }
+ if (!this.UpdateFields[map[i].Pass[p]]) this.UpdateFields[map[i].Pass[p]] = new Array();
+ if (!in_array(map[i].Field, this.UpdateFields[map[i].Pass[p]])) {
+ this.UpdateFields[map[i].Pass[p]].push(map[i].Field);
+ }
+ }
+ }
+ }
+ if ( typeof(map[i].Dependent) == 'undefined' || i.Dependent ) {
+ var val = map[i].Value ? map[i].Value : null
+ var obj = new AjaxDropdownPreloader(this.Request, this.InputMask, null, map[i].Field, val );
+ obj.prepareURL = function()
+ {
+ return this.URL.replace('#QUESTIONED#', this.DependendField).replace('#FILTERS#', mapper.GetFilters().replace(/%26$/, ''))
+ }
+ this.Objects[map[i].Field] = obj;
+ }
+
+ if (typeof(map[i].SubNodes) == 'object') {
+ if ( typeof(map[i].Dependent) == 'undefined' || i.Dependent ) {
+ var ii = i; // we need this, otherwise AfterProcess will use the wrong i (be reference)
+ obj.AfterProcess = function() {
+// mapper.DrillDownRequests(map[ii].SubNodes, ii);
+ }
+ }
+ this.AssignDrills(map[i].SubNodes);
+ }
+ }
+}
+
+DropDownMapper.prototype.FindBranch = function(branch, map)
+{
+ if (!map) map = this.Map;
+ for (var i in map) {
+ if (typeof(map[i].SubNodes) == 'object') {
+ if (map[i].Field == branch) return map[i].SubNodes;
+ var res = this.FindBranch(branch, map[i].SubNodes);
+ if (res) return res;
+ }
+ }
+ return false;
+}
+
+DropDownMapper.prototype.DrillDownRequests = function(map,item)
+{
+ for (var i in map) {
+ if (map[i].Field && this.Objects[map[i].Field]) {
+ this.Objects[map[i].Field].Query();
+ }
+ else {
+ this.DrillDownRequests(map[i].SubNodes,item); //if there is no object for current item, try its children
+ }
+ }
+}
+
+DropDownMapper.prototype.QueryByField = function(field)
+{
+ this.Objects[field].Query();
+}
\ No newline at end of file
Index: branches/RC/core/admin_templates/img/toolbar/tool_import_f2.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/img/toolbar/tool_import_f3.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/img/toolbar/tool_export.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r9542 -r9639
--- branches/RC/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 9542)
+++ branches/RC/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 9639)
@@ -9,6 +9,12 @@
'OnSaveColumns' => array('self' => true),
'OnClosePopup' => array('self' => true),
'OnSaveSetting' => array('self' => true),
+ // export/import permissions is checked within events
+ 'OnExportCSV' => Array('self' => true),
+ 'OnGetCSV' => Array('self' => true),
+ 'OnCSVImportBegin' => Array('self' => true),
+ 'OnCSVImportStep' => Array('self' => true),
+ 'OnDropTempTablesByWID' => array('self' => true),
);
$this->permMapping = array_merge($this->permMapping, $permissions);
}
@@ -240,6 +246,14 @@
}
/**
+ * Occurs right before echoing the output, in Done method of application, used mainly as hook-to event
+ *
+ * @param kEvent $event
+ */
+ function OnBeforeShutdown(&$event)
+ {
+ }
+ /**
* Is called after tree was build (when not from cache)
*
* @param kEvent $event
@@ -249,6 +263,116 @@
}
+ /**
+ * Called by AJAX to perform CSV export
+ *
+ * @param kEvent $event
+ */
+ function OnExportCSV(&$event)
+ {
+ $export_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $export_helper kCSVHelper */
+
+ $prefix_special = $this->Application->GetVar('PrefixSpecial');
+ if(!$prefix_special) {
+ $prefix_special = $export_helper->ExportData('prefix');
+ }
+ $prefix_elems = split('\.|_', $prefix_special, 2);
+ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
+ if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) {
+ $this->Application->Redirect('no_permission');
+ }
+
+ $export_helper->PrefixSpecial = $prefix_special;
+ $export_helper->grid = $this->Application->GetVar('grid');
+ $export_helper->ExportStep();
+ $event->status = erSTOP;
+ }
+
+ /**
+ * Returning created by AJAX CSV file
+ *
+ * @param kEvent $event
+ */
+ function OnGetCSV(&$event)
+ {
+ $export_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $export_helper kCSVHelper */
+
+ $prefix_special = $export_helper->ExportData('prefix');
+ $prefix_elems = split('\.|_', $prefix_special, 2);
+ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
+
+ if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) {
+ $this->Application->Redirect('no_permission');
+ }
+
+ $export_helper->GetCSV();
+ }
+
+ /**
+ * Enter description here...
+ *
+ * @param kEvent $event
+ */
+ function OnCSVImportBegin(&$event)
+ {
+ $prefix_special = $this->Application->GetVar('PrefixSpecial');
+ $prefix_elems = split('\.|_', $prefix_special, 2);
+ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
+
+ if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) {
+ $this->Application->Redirect('no_permission');
+ }
+
+ $object =& $event->getObject( Array('skip_autoload' => true) );
+ /* @var $object kDBItem */
+ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+ $field_values = array_shift($items_info);
+ $object->SetFieldsFromHash($field_values);
+
+ $event->redirect = false;
+ $result = 'required';
+ if($object->GetDBField('ImportFile')) {
+ $import_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $import_helper kCSVHelper */
+ $import_helper->PrefixSpecial = $this->Application->GetVar('PrefixSpecial');
+ $import_helper->grid = $this->Application->GetVar('grid');
+ $result = $import_helper->ImportStart( $object->GetField('ImportFile', 'file_paths') );
+ if($result === true) {
+ $event->redirect = $this->Application->GetVar('next_template');
+ $event->SetRedirectParam('PrefixSpecial', $this->Application->GetVar('PrefixSpecial'));
+ $event->SetRedirectParam('grid', $this->Application->GetVar('grid'));
+ }
+ }
+
+ if($event->redirect === false) {
+ $object->SetError('ImportFile', $result);
+ $event->status = erFAIL;
+ }
+ }
+
+ /**
+ * Enter description here...
+ *
+ * @param kEvent $event
+ */
+ function OnCSVImportStep(&$event)
+ {
+ $import_helper =& $this->Application->recallObject('CSVHelper');
+ /* @var $export_helper kCSVHelper */
+
+ $prefix_special = $import_helper->ImportData('prefix');
+ $prefix_elems = split('\.|_', $prefix_special, 2);
+ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
+ if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) {
+ $this->Application->Redirect('no_permission');
+ }
+
+ $import_helper->ImportStep();
+ $event->status = erSTOP;
+ }
+
function OnCheckPrefixConfig(&$event)
{
$prefix = $this->Application->GetVar('config_prefix');
@@ -258,4 +382,69 @@
$event->redirect = false;
}
+ function OnUploadFile(&$event)
+ {
+ // Flash uploader does NOT send correct cookies, so we need to make our own check
+ $cookie_name = 'adm_'.$this->Application->ConfigValue('SessionCookieName');
+ $this->Application->HttpQuery->Cookie['cookies_on'] = 1;
+ $this->Application->HttpQuery->Cookie[$cookie_name] = $this->Application->GetVar('flashsid');
+
+ $admin_ses =& $this->Application->recallObject('Session.admin');
+ /* @var $admin_ses Session */
+ $user = $admin_ses->RecallVar('user_id');
+ $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ /* @var $perm_helper kPermissionsHelper */
+
+ /*if() {
+ $prefix_special = $this->Application->GetVar('PrefixSpecial');
+ $prefix_elems = split('\.|_', $prefix_special, 2);
+ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
+ $section = $perm_sections['main'];
+ }
+ else {*/
+ $section = $event->getSection();
+ /*}*/
+
+ if ($this->Application->GetVar('t') != 'import/import_start' && !$perm_helper->CheckUserPermission($user, $section.'.add') && !$perm_helper->CheckUserPermission($user, $section.'.edit')) {
+ $event->status = erPERM_FAIL;
+ header('HTTP/1.0 403 You don\'t have permissions to upload');
+ exit;
+ return;
+ }
+
+ if (!$cookie_name) $cookie_name = 'sid';
+
+ $value = $this->Application->GetVar('Filedata');
+ if (!$value) return ;
+ $tmp_path = WRITEABLE.'/tmp/';
+ $fname = $value['name'];
+ $id = $this->Application->GetVar('id');
+ if ($id) $fname = $id.'_'.$fname;
+
+ if (!is_writable($tmp_path)) {
+ header('HTTP/1.0 500 Write permissions not set on the server');
+ exit;
+ }
+
+ move_uploaded_file($value['tmp_name'], $tmp_path.$fname);
+ exit;
+ }
+
+ function OnDropTempTablesByWID(&$event)
+ {
+ $sid = $this->Application->GetSID();
+ $wid = $this->Application->GetVar('m_wid');
+ $tables = $this->Conn->GetCol('SHOW TABLES');
+ $mask_edit_table = '/'.TABLE_PREFIX.'ses_'.$sid.'_'.$wid.'_edit_(.*)$/';
+ foreach($tables as $table)
+ {
+ if( preg_match($mask_edit_table,$table,$rets) )
+ {
+ $this->Conn->Query('DROP TABLE IF EXISTS '.$table);
+ }
+ }
+ echo 'OK';
+ $event->status = erSTOP;
+ return ;
+ }
}
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r8929 -r9639
--- branches/RC/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 8929)
+++ branches/RC/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 9639)
@@ -1,5 +1,5 @@
-
+