Index: trunk/kernel/units/categories/categories_event_handler.php
===================================================================
diff -u -r1566 -r2190
--- trunk/kernel/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 1566)
+++ trunk/kernel/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 2190)
@@ -86,6 +86,16 @@
$object->addFilter('status_filter', $object->TableName.'.Status = 1');
}
}
+
+ function GetPassedId(&$event)
+ {
+ if (defined('ADMIN')) return parent::getPassedID($event);
+
+ $ret = $this->Application->GetVar('m_cat_id');
+ if($ret) return $ret;
+
+ return parent::getPassedID($event);
+ }
}
?>
\ No newline at end of file
Index: trunk/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r1566 -r2190
--- trunk/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 1566)
+++ trunk/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 2190)
@@ -86,6 +86,16 @@
$object->addFilter('status_filter', $object->TableName.'.Status = 1');
}
}
+
+ function GetPassedId(&$event)
+ {
+ if (defined('ADMIN')) return parent::getPassedID($event);
+
+ $ret = $this->Application->GetVar('m_cat_id');
+ if($ret) return $ret;
+
+ return parent::getPassedID($event);
+ }
}
?>
\ No newline at end of file
Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -r1815 -r2190
--- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 1815)
+++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 2190)
@@ -33,7 +33,7 @@
'DBG_HANDLE_ERRORS'=>DBG_ZEND_PRESENT?0:1,
'DBG_SHOW_MEMORY_USAGE'=>1,
'DBG_IGNORE_STRICT_ERRORS'=>1,
- 'DOC_ROOT'=>$_SERVER['DOCUMENT_ROOT'],
+ 'DOC_ROOT'=>realpath($_SERVER['DOCUMENT_ROOT']),
'DBG_LOCAL_BASE_PATH'=>'w:');
foreach($dbg_constMap as $dbg_constName=>$dbg_constValue)
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r2144 -r2190
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 2144)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 2190)
@@ -101,6 +101,7 @@
Q29udGludWU=
Q3JlYXRlZCBPbg==
Q3JlZGl0cw==
+ ZGF5cw==
QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZSB0aGUgaXRlbShzKT8gVGhpcyBhY3Rpb24gY2Fubm90IGJlIHVuZG9uZS4=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tQnVsbGV0aW4gc2V0dGluZ3M=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgY2Vuc29yZWQgd29yZHMgYW5kIHRoZWlyIHJlcGxhY2VtZW50cw==
@@ -341,6 +342,7 @@
KEdNVCAtMDk6MDAp
TWFyZ2lucw==
TUI=
+ R3JvdXAgTWVtYmVyc2hpcCBFeHBpcmF0aW9uIFJlbWluZGVyIChkYXlzKQ==
TWFpbiBNZW51
TWV0cmlj
TWlzc2luZyBJbiBUaGVtZQ==
@@ -2015,36 +2017,36 @@
dGVzdCAy
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB2YWxpZGF0ZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiB2YWxpZGF0ZWQu
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IFVzZXIgcmVnaXN0ZXJlZAoKQSBuZXcgdXNlciAiPGlucDp0b3VzZXIgX0ZpZWxkPSJMb2dpbiIgLz4iIGhhcyByZWdpc3RlcmVkIGFuZCBpcyBwZW5kaW5nIGFkbWluaXN0cmF0aXZlIGFwcHJvdmFsLg==
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogUGFzc3dvcmQgcmVzZXQgY29uZmlybWF0aW9uCgpIZWxsbywNCg0KSXQgc2VlbXMgdGhhdCB5b3UgaGF2ZSByZXF1ZXN0ZWQgYSBwYXNzd29yZCByZXNldCBmb3IgeW91ciBJbi1wb3J0YWwgYWNjb3VudC4gSWYgeW91IHdvdWxkIGxpa2UgdG8gcHJvY2VlZCBhbmQgY2hhbmdlIHRoZSBwYXNzd29yZCwgcGxlYXNlIGNsaWNrIG9uIHRoZSBsaW5rIGJlbG93Og0KPGlucDptX2NvbmZpcm1fcGFzc3dvcmRfbGluayAvPg0KDQpZb3Ugd2lsbCByZWNlaXZlIGEgc2Vjb25kIGVtYWlsIHdpdGggeW91ciBuZXcgcGFzc3dvcmQgc2hvcnRseS4NCg0KSWYgeW91IGJlbGlldmUgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBlbWFpbCBpbiBlcnJvciwgcGxlYXNlIGlnbm9yZSB0aGlzIGVtYWlsLiBZb3VyIHBhc3N3b3JkIHdpbGwgbm90IGJlIGNoYW5nZWQgdW5sZXNzIHlvdSBoYXZlIGNsaWNrZWQgb24gdGhlIGFib3ZlIGxpbmsuDQo=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBkZW5pZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBkZW5pZWQu
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB2YWxpZGF0ZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiB2YWxpZGF0ZWQu
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogUGFzc3dvcmQgcmVzZXQgY29uZmlybWF0aW9uCgpIZWxsbywNCg0KSXQgc2VlbXMgdGhhdCB5b3UgaGF2ZSByZXF1ZXN0ZWQgYSBwYXNzd29yZCByZXNldCBmb3IgeW91ciBJbi1wb3J0YWwgYWNjb3VudC4gSWYgeW91IHdvdWxkIGxpa2UgdG8gcHJvY2VlZCBhbmQgY2hhbmdlIHRoZSBwYXNzd29yZCwgcGxlYXNlIGNsaWNrIG9uIHRoZSBsaW5rIGJlbG93Og0KPGlucDptX2NvbmZpcm1fcGFzc3dvcmRfbGluayAvPg0KDQpZb3Ugd2lsbCByZWNlaXZlIGEgc2Vjb25kIGVtYWlsIHdpdGggeW91ciBuZXcgcGFzc3dvcmQgc2hvcnRseS4NCg0KSWYgeW91IGJlbGlldmUgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBlbWFpbCBpbiBlcnJvciwgcGxlYXNlIGlnbm9yZSB0aGlzIGVtYWlsLiBZb3VyIHBhc3N3b3JkIHdpbGwgbm90IGJlIGNoYW5nZWQgdW5sZXNzIHlvdSBoYXZlIGNsaWNrZWQgb24gdGhlIGFib3ZlIGxpbmsuDQo=
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLVBvcnRhbCBSZWdpc3RyYXRpb24KCkRlYXIgPGlucDp0b3VzZXIgX0ZpZWxkPSJGaXJzdE5hbWUiIC8+IDxpbnA6dG91c2VyIF9GaWVsZD0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnA6bV9wYWdlX3RpdGxlIC8+LiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4=
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2hlY2sgb3V0IHRoaXMgc2l0ZQoKSGksDQoNClRoaXMgbWVzc2FnZSBoYXMgYmVlbiBzZW50IHRvIHlvdSBmcm9tIG9uZSBvZiB5b3VyIGZyaWVuZHMuDQpDaGVjayBvdXQgdGhpcyBzaXRlOiA8YSBocmVmPSI8aW5wOm1fdGhlbWVfdXJsIF9wYWdlPSJjdXJyZW50Ii8+Ij48aW5wOm1fcGFnZV90aXRsZSAvPjwvYT4h
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiB1bnN1YnNjcmliZWQKCllvdSBoYXZlIHN1Y2Nlc3NmdWxseSB1bnN1YnNyaWJlZCBmcm9tIDxpbnA6bV9wYWdlX3RpdGxlIC8+IG1haWxpbmcgbGlzdC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVGhlIHNpdGUgaGFzIGJlZW4gc3VnZ2VzdGVkCgpBIHZpc2l0b3Igc3VnZ2VzdGVkIHlvdXIgc2l0ZSB0byBhIGZyaWVuZC4=
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2hlY2sgb3V0IHRoaXMgc2l0ZQoKSGksDQoNClRoaXMgbWVzc2FnZSBoYXMgYmVlbiBzZW50IHRvIHlvdSBmcm9tIG9uZSBvZiB5b3VyIGZyaWVuZHMuDQpDaGVjayBvdXQgdGhpcyBzaXRlOiA8YSBocmVmPSI8aW5wOm1fdGhlbWVfdXJsIF9wYWdlPSJjdXJyZW50Ii8+Ij48aW5wOm1fcGFnZV90aXRsZSAvPjwvYT4h
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGFuZCB5b3VyIHBhc3N3b3JkIGlzICI8aW5wOnRvdXNlciBfRmllbGQ9InBhc3N3b3JkIiAvPiIuDQo=
- U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4=
- WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEEgY2F0ZWdvcnkgaGFzIGJlZW4gZGVsZXRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVsZXRlZC4=
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZWxldGVkCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBkZWxldGVkLg==
+ U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4=
+ WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEEgY2F0ZWdvcnkgaGFzIGJlZW4gZGVsZXRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVsZXRlZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhZGRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYWRkZWQu
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4=
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBhcHByb3ZlZAoKVXNlciAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg==
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogU3Vic2NyaXB0aW9uIGNvbmZpcm1hdGlvbgoKWW91IGhhdmUgc3Vic2NyaWJlZCB0byA8aW5wOm1fcGFnZV90aXRsZSAvPiBtYWlsaW5nIGxpc3Qu
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCllvdXIgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVuaWVkLg==
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB1bnN1YnNyaWJlZAoKQSB1c2VyIGhhcyB1bnN1YnNjcmliZWQu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQWNjZXNzIGRlbmllZAoKWW91ciByZWdpc3RyYXRpb24gdG8gPGlucDptX3BhZ2VfdGl0bGUgLz4gaGFzIGJlZW4gZGVuaWVkLg==
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCllvdXIgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVuaWVkLg==
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBhcHByb3ZlZAoKVXNlciAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg==
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu
- WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCkEgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGRlbmllZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg==
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCkEgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGRlbmllZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQgKHBlbmRpbmcpCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZCwgcGVuZGluZyB5b3VyIGNvbmZpcm1hdGlvbi4gIFBsZWFzZSByZXZpZXcgdGhlIGNhdGVnb3J5IGFuZCBhcHByb3ZlIG9yIGRlbnkgaXQu
- WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wOnRvdXNlciBfRmllbGQ9IkxvZ2luIiAvPiIgaGFzIGJlZW4gYWRkZWQu
-
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYXBwcm92ZWQu
+
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIG1vZGlmaWVkLg==
+ WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wOnRvdXNlciBfRmllbGQ9IkxvZ2luIiAvPiIgaGFzIGJlZW4gYWRkZWQu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSB1c2VyIGhhcyBzdWJzY3JpYmVkCgpBIHVzZXIgaGFzIHN1YnNjcmliZWQgdG8gPGlucDptX3BhZ2VfdGl0bGUgLz4gbWFpbGluZyBsaXN0Lg==
Index: trunk/kernel/units/categories/categories_tag_processor.php
===================================================================
diff -u -r1910 -r2190
--- trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 1910)
+++ trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2190)
@@ -240,203 +240,25 @@
}
}
-
- /* function PrintListTest($params)
+ function Meta($params)
{
- $stack_cat_id = $this->Application->GetVar('m_cat_id');
+ $name = getArrayValue($params, 'name');
+ $object =& $this->Application->recallObject($this->Prefix.'.-item');
- $prefix_special = $this->getPrefixSpecial();
- $list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List',$params);
+ $field = $object->GetField('Meta'.$name);
+ if ($field) return $field;
- if ( !($list->OriginalParams == $params) ) {
- $this->Application->removeObject($prefix_special);
- $list =& $this->Application->recallObject($prefix_special,$this->Prefix.'_List',$params);
- }
-
- $cat_id = $this->Application->GetVar('m_cat_id') ? $this->Application->GetVar('m_cat_id') : 0;
- $list->addFilter( 'category_scope_filter', 'ParentId = '.$this->Application->GetVar('m_cat_id') );
- $list->Query();
-
- $record_ids_array = array();
-
- foreach ($list->Records as $record_id){
- $record_ids_array[] = $record_id['CategoryId'];
+ switch ($name) {
+ case 'Description':
+ $conf = 'Category_MetaDesc';
+ break;
+ case 'Keywords':
+ $conf = 'Category_MetaKey';
+ break;
}
- $parent_records=$list->Records;
-
- $records_list = implode(', ', $record_ids_array);
-
- $or_filter =& $this->Application->makeClass('kMultipleFilter');
- $or_filter->setType(FLT_TYPE_OR);
- $or_filter->addFilter('parent_filter', 'ParentId IN ('.$records_list.')');
- $or_filter->addFilter('category_filter', 'CategoryId IN ('.$records_list.')');
- $list->clearFilters();
- $list->addFilter('parent_filter', $or_filter);
-
- $list->AddOrderField('CachedNavbar', 'ASC');
- $list->Query();
-
- $unsorted_cats=$list->Records;
- $parent_cats=array();
- $child_cats=array();
- $all_records=array();
-
-
- for ($i=0; $iRecords=$all_records;
-
- $o = '';
- $list->GoFirst();
-
- $block_params=$this->prepareTagParams($params);
- $block_params['name']=$params['block'];
- $block_params['pass_params']='true';
-
-
- while (!$list->EOL())
- {
- //if ($list->GetDBField('ParentId') == $cat_id) {
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
- $block_params['parent_id']=$list->GetDBField('CategoryId');
- $this->Application->SetVar('m_cat_id', $list->GetDBField('CategoryId') );
- // for edit/delete links using GET
- $o.= $this->Application->ParseBlock($block_params, 1);
- //}else{
- $list->GoNext();
- //}
- }
- $this->Application->SetVar('m_cat_id', $stack_cat_id);
-
- return $o;
+ return $this->Application->ConfigValue($conf);
}
-
- function ListSubCategories($params)
- {
- return $this->PrintSubCategories($params);
- }
-
- function PrintSubCategories($params){
- $list =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List',$params);
- $id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
- $o = '';
-
- $block_params=$this->prepareTagParams($params);
- $block_params['pass_params']='true';
-
- $parent_cat = $list->GetDBField('CategoryId');
-
- $is_first=1;
- $current_item=1;
- $show_more_link=true;
- $list->GoNext();
- while (!$list->EOL() && $list->GetDBField('ParentId') == $parent_cat)
- {
- if ($current_item > $params['max_sub_cats']){
- $is_first=0;
- if ($show_more_link && isset($params['block_more'])){
- $more_params=$this->prepareTagParams($params);
- $more_params['name']=$params['block_more'];
- $this->Application->SetVar( 'm_cat_id', $list->GetDBField('ParentId') );
- $o.= $this->Application->ParseBlock($more_params, 1);
- $show_more_link=false;
- }
- $list->GoNext();
- continue;
- }
-
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
- $block_params['is_first']=$is_first;
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField('CategoryId') );
- $this->Application->SetVar( 'm_cat_id', $list->GetDBField('CategoryId') );
- $o.= $this->Application->ParseBlock($block_params, 1);
- $list->GoNext();
- $is_first=0;
-
- $current_item++;
- }
-
- $list->GoPrev();
-// $this->Application->SetVar('m_cat_id', $parent_cat);
-
- return $o;
- }
-
- function PrintList2($params)
- {
- $list =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List',$params);
- $id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
-
- $list->Query();
- $o = '';
- $list->GoFirst();
-
- $direction = (isset($params['direction']) && $params['direction']=="H")?"H":"V";
- $columns = (isset($params['columns']))?$params['columns']:1;
-
- if ($columns>1 && $direction=="V") {
- $list->Records = $this->LinearToVertical($list->Records, $columns, $params['per_page']);
- }
-
- $list->GoFirst();
- if($list->EOL())
- {
- $block_params['name'] = 'no_categories';
- return $this->Application->ParseBlock($block_params);
- }
-
- $block_params=$this->prepareTagParams($params);
- $block_params['name']=$params['block'];
- $block_params['pass_params']='true';
-
- $block_start_row_params=$this->prepareTagParams($params);
- $block_start_row_params['name']=$params['row_start_block'];
-
- $block_end_row_params=$this->prepareTagParams($params);
- $block_end_row_params['name']=$params['row_end_block'];
-
- $i=0;
- while (!$list->EOL())
- {
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
-
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
-
- $list->UpdateFormattersSubFields();
-
- if ($i%$params['columns'] == 0) $o.= $this->Application->ParseBlock($block_start_row_params, 1);
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) );
- $o.= $this->Application->ParseBlock($block_params, 1);
- if (($i+1)%$params['columns'] == 0) $o.= $this->Application->ParseBlock($block_end_row_params, 1);
-
- $list->GoNext();
-
- $i++;
- }
-
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', '');
- return $o;
- }
-
- */
-
}
Index: trunk/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r1910 -r2190
--- trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 1910)
+++ trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2190)
@@ -240,203 +240,25 @@
}
}
-
- /* function PrintListTest($params)
+ function Meta($params)
{
- $stack_cat_id = $this->Application->GetVar('m_cat_id');
+ $name = getArrayValue($params, 'name');
+ $object =& $this->Application->recallObject($this->Prefix.'.-item');
- $prefix_special = $this->getPrefixSpecial();
- $list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List',$params);
+ $field = $object->GetField('Meta'.$name);
+ if ($field) return $field;
- if ( !($list->OriginalParams == $params) ) {
- $this->Application->removeObject($prefix_special);
- $list =& $this->Application->recallObject($prefix_special,$this->Prefix.'_List',$params);
- }
-
- $cat_id = $this->Application->GetVar('m_cat_id') ? $this->Application->GetVar('m_cat_id') : 0;
- $list->addFilter( 'category_scope_filter', 'ParentId = '.$this->Application->GetVar('m_cat_id') );
- $list->Query();
-
- $record_ids_array = array();
-
- foreach ($list->Records as $record_id){
- $record_ids_array[] = $record_id['CategoryId'];
+ switch ($name) {
+ case 'Description':
+ $conf = 'Category_MetaDesc';
+ break;
+ case 'Keywords':
+ $conf = 'Category_MetaKey';
+ break;
}
- $parent_records=$list->Records;
-
- $records_list = implode(', ', $record_ids_array);
-
- $or_filter =& $this->Application->makeClass('kMultipleFilter');
- $or_filter->setType(FLT_TYPE_OR);
- $or_filter->addFilter('parent_filter', 'ParentId IN ('.$records_list.')');
- $or_filter->addFilter('category_filter', 'CategoryId IN ('.$records_list.')');
- $list->clearFilters();
- $list->addFilter('parent_filter', $or_filter);
-
- $list->AddOrderField('CachedNavbar', 'ASC');
- $list->Query();
-
- $unsorted_cats=$list->Records;
- $parent_cats=array();
- $child_cats=array();
- $all_records=array();
-
-
- for ($i=0; $iRecords=$all_records;
-
- $o = '';
- $list->GoFirst();
-
- $block_params=$this->prepareTagParams($params);
- $block_params['name']=$params['block'];
- $block_params['pass_params']='true';
-
-
- while (!$list->EOL())
- {
- //if ($list->GetDBField('ParentId') == $cat_id) {
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
- $block_params['parent_id']=$list->GetDBField('CategoryId');
- $this->Application->SetVar('m_cat_id', $list->GetDBField('CategoryId') );
- // for edit/delete links using GET
- $o.= $this->Application->ParseBlock($block_params, 1);
- //}else{
- $list->GoNext();
- //}
- }
- $this->Application->SetVar('m_cat_id', $stack_cat_id);
-
- return $o;
+ return $this->Application->ConfigValue($conf);
}
-
- function ListSubCategories($params)
- {
- return $this->PrintSubCategories($params);
- }
-
- function PrintSubCategories($params){
- $list =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List',$params);
- $id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
- $o = '';
-
- $block_params=$this->prepareTagParams($params);
- $block_params['pass_params']='true';
-
- $parent_cat = $list->GetDBField('CategoryId');
-
- $is_first=1;
- $current_item=1;
- $show_more_link=true;
- $list->GoNext();
- while (!$list->EOL() && $list->GetDBField('ParentId') == $parent_cat)
- {
- if ($current_item > $params['max_sub_cats']){
- $is_first=0;
- if ($show_more_link && isset($params['block_more'])){
- $more_params=$this->prepareTagParams($params);
- $more_params['name']=$params['block_more'];
- $this->Application->SetVar( 'm_cat_id', $list->GetDBField('ParentId') );
- $o.= $this->Application->ParseBlock($more_params, 1);
- $show_more_link=false;
- }
- $list->GoNext();
- continue;
- }
-
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
- $block_params['is_first']=$is_first;
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField('CategoryId') );
- $this->Application->SetVar( 'm_cat_id', $list->GetDBField('CategoryId') );
- $o.= $this->Application->ParseBlock($block_params, 1);
- $list->GoNext();
- $is_first=0;
-
- $current_item++;
- }
-
- $list->GoPrev();
-// $this->Application->SetVar('m_cat_id', $parent_cat);
-
- return $o;
- }
-
- function PrintList2($params)
- {
- $list =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List',$params);
- $id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
-
- $list->Query();
- $o = '';
- $list->GoFirst();
-
- $direction = (isset($params['direction']) && $params['direction']=="H")?"H":"V";
- $columns = (isset($params['columns']))?$params['columns']:1;
-
- if ($columns>1 && $direction=="V") {
- $list->Records = $this->LinearToVertical($list->Records, $columns, $params['per_page']);
- }
-
- $list->GoFirst();
- if($list->EOL())
- {
- $block_params['name'] = 'no_categories';
- return $this->Application->ParseBlock($block_params);
- }
-
- $block_params=$this->prepareTagParams($params);
- $block_params['name']=$params['block'];
- $block_params['pass_params']='true';
-
- $block_start_row_params=$this->prepareTagParams($params);
- $block_start_row_params['name']=$params['row_start_block'];
-
- $block_end_row_params=$this->prepareTagParams($params);
- $block_end_row_params['name']=$params['row_end_block'];
-
- $i=0;
- while (!$list->EOL())
- {
- $block_params['cat_id'] = $list->GetDBField('CategoryId');
-
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
-
- $list->UpdateFormattersSubFields();
-
- if ($i%$params['columns'] == 0) $o.= $this->Application->ParseBlock($block_start_row_params, 1);
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) );
- $o.= $this->Application->ParseBlock($block_params, 1);
- if (($i+1)%$params['columns'] == 0) $o.= $this->Application->ParseBlock($block_end_row_params, 1);
-
- $list->GoNext();
-
- $i++;
- }
-
- $this->Application->SetVar( $this->getPrefixSpecial().'_id', '');
- return $o;
- }
-
- */
-
}
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r1815 -r2190
--- trunk/kernel/include/debugger.php (.../debugger.php) (revision 1815)
+++ trunk/kernel/include/debugger.php (.../debugger.php) (revision 2190)
@@ -33,7 +33,7 @@
'DBG_HANDLE_ERRORS'=>DBG_ZEND_PRESENT?0:1,
'DBG_SHOW_MEMORY_USAGE'=>1,
'DBG_IGNORE_STRICT_ERRORS'=>1,
- 'DOC_ROOT'=>$_SERVER['DOCUMENT_ROOT'],
+ 'DOC_ROOT'=>realpath($_SERVER['DOCUMENT_ROOT']),
'DBG_LOCAL_BASE_PATH'=>'w:');
foreach($dbg_constMap as $dbg_constName=>$dbg_constValue)