Index: branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r7504 -r7590
--- branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7504)
+++ branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7590)
@@ -104,6 +104,10 @@
 									'OnMassDelete'			=>	Array('self' => 'delete', 'subitem' => 'add|edit'),
 									'OnMassClone'			=>	Array('self' => 'add', 'subitem' => 'add|edit'),
 
+									'OnCut'	=> array('self'=>'edit', 'subitem' => 'edit'),
+									'OnCopy'	=> array('self'=>'edit', 'subitem' => 'edit'),
+									'OnPaste'	=> array('self'=>'edit', 'subitem' => 'edit'),
+
 									'OnSelectItems'			=>	Array('self' => 'add|edit', 'subitem' => 'add|edit'),
 									'OnProcessSelected'		=>	Array('self' => 'add|edit', 'subitem' => 'add|edit'),
 									'OnSelectUser'			=>	Array('self' => 'add|edit', 'subitem' => 'add|edit'),
Index: branches/unlabeled/unlabeled-1.6.2/admin/browse/fw_menu.js
===================================================================
diff -u -r5561 -r7590
--- branches/unlabeled/unlabeled-1.6.2/admin/browse/fw_menu.js	(.../fw_menu.js)	(revision 5561)
+++ branches/unlabeled/unlabeled-1.6.2/admin/browse/fw_menu.js	(.../fw_menu.js)	(revision 7590)
@@ -14,7 +14,7 @@
  * Modified By Intechnic Corporation for use in In-Portal
  * 6/28/02
  *
- */ 
+ */
 function Menu(label)
 {
 	this.version = "990702 [xMenu; fw_menu.js]";
@@ -38,11 +38,12 @@
 	var $base_path = '';
 	var $base_tag = document.getElementsByTagName('BASE');
 	if ($base_tag.length) {
-		$base_path = $base_tag[0].href.replace('kernel/admin_templates', 'admin');
+		$base_path = $base_tag[0].href.replace('kernel/admin_templates', 'admin').replace('core/admin_templates', 'admin');
 	}
+//	alert('base: '+$base_tag[0].href+' => '+$base_path)
 
 	this.imagePath = $base_path + 'images/';
-   
+
 	this.childMenuIcon = "menu_arrow.gif";
 	this.items = new Array();
 	this.actions = new Array();
@@ -90,7 +91,7 @@
 		default:
 			this.types[this.types.length] = '';
 	}
-}     
+}
 
 function addMenuSeparator() {
    this.items[this.items.length] = "separator";
@@ -99,7 +100,7 @@
    this.menuItemBorder = 0;
 }
 
-// For NS6. 
+// For NS6.
 function FIND(item,called_from)
 {
    if (document.all) return(document.all[item]);
@@ -131,7 +132,7 @@
 			}
 			else
 			{
-				return false;	
+				return false;
 			}
 		}
 		else
@@ -141,11 +142,11 @@
    }
 
    window.fwHideMenuTimer = null;
-   if (!container) return;    window.triedToWriteMenus = true; 
+   if (!container) return;    window.triedToWriteMenus = true;
    container.isContainer = true;
    container.menus = new Array();
-   
-   for (var i=0; i<window.menus.length; i++) 
+
+   for (var i=0; i<window.menus.length; i++)
       container.menus[i] = window.menus[i];
    window.menus.length = 0;
    var countMenus = 0;
@@ -192,7 +193,7 @@
          menu.menuItemIndent = menu.menuItemIndent || defaultIndent;
          var itemProps = 'font-family:' + menu.fontFamily +';font-weight:' + menu.fontWeight + ';fontSize:' + menu.fontSize + ';';
          if (menu.fontStyle) itemProps += 'font-style:' + menu.fontStyle + ';';
-         if (document.all) 
+         if (document.all)
             itemProps += 'font-size:' + menu.fontSize + ';" onMouseOver="onMenuItemOver(null,this);" onClick="onMenuItemAction(null,this);';
          else if (!document.layers) {
             itemProps += 'font-size:' + menu.fontSize + 'px;'; // zilla wants 12px.
@@ -238,7 +239,7 @@
          if (lrs) {
             l.document.open("text/html");
             l.document.writeln(content);
-            l.document.close();  
+            l.document.close();
             content = '';
             theStat += "-";
             tsc++;
@@ -248,22 +249,22 @@
             }
             status = theStat;
          }
-         countItems++;  
+         countItems++;
       }
       if (lrs) {
          // focus layer
          var focusItem = new Layer(100, body);
          focusItem.visiblity="hidden";
          focusItem.document.open("text/html");
          focusItem.document.writeln("&nbsp;");
-         focusItem.document.close();   
+         focusItem.document.close();
       } else {
         content += '   <DIV ID="focusItem'+ countMenus +'" STYLE="position:absolute;left:0;top:0;visibility:hide;" onClick="onMenuItemAction(null,this);">&nbsp;</DIV>\n';
         content += '   </DIV>\n  </DIV>\n</DIV>\n';
       }
       i=x;
    }
-   if (document.layers) {     
+   if (document.layers) {
       container.clip.width = window.innerWidth;
       container.clip.height = window.innerHeight;
       container.onmouseout = mouseoutMenu;
@@ -334,7 +335,7 @@
       } else {
          container.document.open("text/html");
          container.document.writeln(content);
-         container.document.close();   
+         container.document.close();
       }
       if (!FIND("menuLayer0")) return;
       var menuCount = 0;
@@ -356,14 +357,14 @@
             var l = FIND("menuItem" + menuCount);
             l.Menu = container.menus[x];
             if (l.addEventListener) { // ns6
-               l.style.width = menu.menuItemWidth; 
+               l.style.width = menu.menuItemWidth;
                l.style.height = menu.menuItemHeight;
                l.style.top = top;
                l.addEventListener("mouseover", onMenuItemOver, false);
                l.addEventListener("click", onMenuItemAction, false);
                l.addEventListener("mouseout", mouseoutMenu, false);
             } else { //ie
-               l.style.pixelWidth = menu.menuItemWidth;  
+               l.style.pixelWidth = menu.menuItemWidth;
                l.style.pixelHeight = menu.menuItemHeight;
                l.style.pixelTop = top;
             }
@@ -389,11 +390,11 @@
             var sep = FIND("menuSeparator" + menuCount);
             if (sep) {
                sep.style.clip = "rect(0 " + (menu.menuItemWidth - 3) + " 1 0)";
-               sep.style.width = sep.style.pixelWidth = menu.menuItemWidth;   
+               sep.style.width = sep.style.pixelWidth = menu.menuItemWidth;
                sep.style.backgroundColor = menu.bgColor;
                sep = FIND("menuSeparatorLite" + menuCount);
                sep.style.clip = "rect(1 " + (menu.menuItemWidth - 3) + " 2 0)";
-               sep.style.width = sep.style.pixelWidth = menu.menuItemWidth;   
+               sep.style.width = sep.style.pixelWidth = menu.menuItemWidth;
                sep.style.backgroundColor = menu.menuLiteBgColor;
                l.style.height = l.style.pixelHeight = menu.menuItemHeight/2;
                l.isSeparator = true
@@ -421,10 +422,10 @@
          s.height = s.pixelHeight  = menu.menuHeight+(menu.menuBorder*4);
       }
    }
-   if (document.captureEvents) { 
+   if (document.captureEvents) {
       document.captureEvents(Event.MOUSEUP);
    }
-   if (document.addEventListener) { 
+   if (document.addEventListener) {
       document.addEventListener("mouseup", onMenuItemOver, false);
    }
    if (document.layers && window.innerWidth) {
@@ -438,10 +439,10 @@
 }
 
 function NS4resize() {
-   if (NS4sIW < window.innerWidth || 
-      NS4sIW > window.innerWidth || 
-      NS4sIH > window.innerHeight || 
-      NS4sIH < window.innerHeight ) 
+   if (NS4sIW < window.innerWidth ||
+      NS4sIW > window.innerWidth ||
+      NS4sIH > window.innerHeight ||
+      NS4sIH < window.innerHeight )
    {
       window.location.reload();
    }
@@ -481,7 +482,7 @@
          if (a.Menu.bgImageUp) {
             a.style.background = "url(" + a.Menu.bgImageUp +")";;
          }
-      } 
+      }
       if (l.isSeparator) return;
       l.style.backgroundColor = l.menuHiliteBgColor;
       l.zIndex = 100;  // magic IE 4.5 mac happy doohicky. jba
@@ -539,7 +540,7 @@
 }
 
 function FW_showMenu(menu, x, y, child) {
-   if (!window.fwWroteMenu) 
+   if (!window.fwWroteMenu)
    {
        alert('No Menu Written');
        return;
@@ -557,18 +558,18 @@
          var l = child;
       }
       if (!l) return;
-      for (var i=0; i<l.layers.length; i++) {            
-         if (!l.layers[i].isHilite) 
+      for (var i=0; i<l.layers.length; i++) {
+         if (!l.layers[i].isHilite)
             l.layers[i].visibility = "inherit";
-         if (l.layers[i].document.layers.length > 0) 
+         if (l.layers[i].document.layers.length > 0)
             FW_showMenu(null, "relative", "relative", l.layers[i]);
       }
       if (l.parentLayer) {
-         if (x != "relative") 
+         if (x != "relative")
             l.parentLayer.left = x || window.pageX || 0;
-         if (l.parentLayer.left + l.clip.width > window.innerWidth) 
+         if (l.parentLayer.left + l.clip.width > window.innerWidth)
             l.parentLayer.left -= (l.parentLayer.left + l.clip.width - window.innerWidth);
-         if (y != "relative") 
+         if (y != "relative")
             l.parentLayer.top = y || window.pageY || 0;
          if (l.parentLayer.isContainer) {
             l.Menu.xOffset = window.pageXOffset;
@@ -581,17 +582,17 @@
       l.visibility = "inherit";
       if (l.Menu) l.Menu.container.visibility = "inherit";
    } else if (FIND("menuItem0")) {
-      var l = menu.menuLayer || menu;  
+      var l = menu.menuLayer || menu;
       hideActiveMenus();
       if (typeof(l) == "string") {
          l = FIND(l);
       }
       window.ActiveMenu = l;
       var s = l.style;
       s.visibility = "inherit";
-      if (x != "relative") 
+      if (x != "relative")
          s.left = s.pixelLeft = x || (window.pageX + document.body.scrollLeft) || 0;
-      if (y != "relative") 
+      if (y != "relative")
          s.top = s.pixelTop = y || (window.pageY + document.body.scrollTop) || 0;
       l.Menu.xOffset = document.body.scrollLeft;
       l.Menu.yOffset = document.body.scrollTop;
@@ -697,7 +698,7 @@
             childMenu.left = l.parentLayer.left + l.parentLayer.clip.width  + l.Menu.menuLayer.left -5;
          }
          var w = childMenu.clip.width+childMenu.left-l.Menu.container.clip.left;
-         if (w > l.Menu.container.clip.width)  
+         if (w > l.Menu.container.clip.width)
             l.Menu.container.clip.width = w;
          var h = childMenu.clip.height+childMenu.top-l.Menu.container.clip.top;
          if (h > l.Menu.container.clip.height) l.Menu.container.clip.height = h;
@@ -714,7 +715,7 @@
 //                                        alert(left + parseInt(s.width) - document.body.scrollLeft)
             if (left + parseInt(s.width) > document.body.scrollLeft + document.body.offsetWidth)
                left -= parseInt(s.width) + l.offsetWidth - 5;
-            s.left = left;               
+            s.left = left;
 
 
          } else { // zilla case
@@ -724,7 +725,7 @@
 //            alert()
             if (left + parseInt(s.width) > document.body.offsetWidth)
                left -= parseInt(s.width) + l.offsetWidth - 5;
-            s.left = left;               
+            s.left = left;
          }
          childMenu.style.visibility = "inherit";
       } else {
@@ -759,4 +760,4 @@
 {
 	if(variable==null) return false;
 	return (typeof(variable)=='undefined')?false:true;
-} 
+}
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -r6142 -r7590
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 6142)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7590)
@@ -2,6 +2,8 @@
 	<div id="<inp2:m_param name="item_prefix"/>_div" prefix="<inp2:m_param name="item_prefix"/>" group_id="-1" class="catalog-tab"></div>
 	<script type="text/javascript">$PermManager.registerTab('<inp2:m_param name="item_prefix"/>');</script>
 <inp2:m_else/>
+	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	if ($request_visible) {
 		document.getElementById('<inp2:m_get name="item_prefix"/>_div').setAttribute('group_id', <inp2:m_get name="group_id"/>);
 	}
@@ -15,44 +17,44 @@
 			<td>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
-			
+
 			<td>
 				<!-- Inherited checkbox -->
 				<input
 						type="hidden"
 						id="<inp2:PermInputName sub_key="inherited"/>"
 						name="<inp2:PermInputName sub_key="inherited"/>"
 						value="<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">1<inp2:m_else/>0</inp2:m_if>" />
-						
-				<input 
+
+				<input
 						type="checkbox"
-						id="_cb_<inp2:PermInputName sub_key="inherited"/>" 
+						id="_cb_<inp2:PermInputName sub_key="inherited"/>"
 						<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">checked</inp2:m_if>
 						onchange="update_checkbox(this, document.getElementById('<inp2:PermInputName sub_key="inherited"/>'));"
 						onclick="inherited_click('<inp2:m_param name="PermissionName"/>', <inp2:m_param name="InheritedValue"/>, this.checked, '_cb_<inp2:PermInputName sub_key="value"/>')" />
 			</td>
-			
+
 			<td>
 				<inp2:CategoryPath cat_id="$InheritedFrom"/>
 			</td>
-			
+
 			<td>
 				<!-- Access checkbox -->
 				<input
 						type="hidden"
 						id="<inp2:PermInputName sub_key="value"/>"
 						name="<inp2:PermInputName sub_key="value"/>"
 						value="<inp2:m_if check="m_ParamEquals" name="Value" value="1">1<inp2:m_else/>0</inp2:m_if>" />
-						
-				<input 
+
+				<input
 						type="checkbox"
-						id="_cb_<inp2:PermInputName sub_key="value"/>" 
+						id="_cb_<inp2:PermInputName sub_key="value"/>"
 						<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">disabled="disabled"</inp2:m_if>
 						<inp2:m_if check="m_ParamEquals" name="Value" value="1">checked</inp2:m_if>
 						onchange="update_checkbox(this, document.getElementById('<inp2:PermInputName sub_key="value"/>'));"
 						onclick="update_light('<inp2:m_param name="PermissionName"/>', this.checked)" />
 			</td>
-			
+
 			<td>
 				<img id="light_<inp2:m_param name="PermissionName"/>" src="img/perm_<inp2:m_if check="m_ParamEquals" name="Value" value="1">green<inp2:m_else/>red</inp2:m_if>.gif"/>
 			</td>
Index: branches/unlabeled/unlabeled-1.8.2/kernel/units/reviews/reviews_event_handler.php
===================================================================
diff -u -r6842 -r7590
--- branches/unlabeled/unlabeled-1.8.2/kernel/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 6842)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 7590)
@@ -183,20 +183,31 @@
 				$object->ErrorMsgs['too_frequent'] = $this->Application->Phrase('lu_ferror_review_duplicate');
 			}
 		}
-		
+
 		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemCreate(&$event)
+		{
+			$object =& $event->getObject();
+			$object->SetDBField('Module', $this->Application->findModule('Var',$this->Application->getUnitOption($this->Prefix, 'ParentPrefix'), 'Name'));
+		}
+
+		/**
 		 * Returns current user id for reviews, for logic ask Kostja T.
 		 *
 		 * @return int
 		 */
 		function getUserID()
 		{
 			$user_id = $this->Application->RecallVar('user_id');
-			
+
 			if ($user_id == 0) {
 				$user_id = -2;
 			}
-			
+
 			return $user_id;
 		}
 	}
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -r7368 -r7590
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 7368)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 7590)
@@ -24,10 +24,10 @@
 							}
 					 	) );
 
-					a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+				/*	a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 							reset_form('adm', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 						}
-				 	) );
+				 	) );*/
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
Index: branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_config.php
===================================================================
diff -u -r5560 -r7590
--- branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 5560)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 7590)
@@ -26,6 +26,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4 =>  'mode',
 											),
 
 
Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -r6142 -r7590
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 6142)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7590)
@@ -2,6 +2,8 @@
 	<div id="<inp2:m_param name="item_prefix"/>_div" prefix="<inp2:m_param name="item_prefix"/>" group_id="-1" class="catalog-tab"></div>
 	<script type="text/javascript">$PermManager.registerTab('<inp2:m_param name="item_prefix"/>');</script>
 <inp2:m_else/>
+	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	if ($request_visible) {
 		document.getElementById('<inp2:m_get name="item_prefix"/>_div').setAttribute('group_id', <inp2:m_get name="group_id"/>);
 	}
@@ -15,44 +17,44 @@
 			<td>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
-			
+
 			<td>
 				<!-- Inherited checkbox -->
 				<input
 						type="hidden"
 						id="<inp2:PermInputName sub_key="inherited"/>"
 						name="<inp2:PermInputName sub_key="inherited"/>"
 						value="<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">1<inp2:m_else/>0</inp2:m_if>" />
-						
-				<input 
+
+				<input
 						type="checkbox"
-						id="_cb_<inp2:PermInputName sub_key="inherited"/>" 
+						id="_cb_<inp2:PermInputName sub_key="inherited"/>"
 						<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">checked</inp2:m_if>
 						onchange="update_checkbox(this, document.getElementById('<inp2:PermInputName sub_key="inherited"/>'));"
 						onclick="inherited_click('<inp2:m_param name="PermissionName"/>', <inp2:m_param name="InheritedValue"/>, this.checked, '_cb_<inp2:PermInputName sub_key="value"/>')" />
 			</td>
-			
+
 			<td>
 				<inp2:CategoryPath cat_id="$InheritedFrom"/>
 			</td>
-			
+
 			<td>
 				<!-- Access checkbox -->
 				<input
 						type="hidden"
 						id="<inp2:PermInputName sub_key="value"/>"
 						name="<inp2:PermInputName sub_key="value"/>"
 						value="<inp2:m_if check="m_ParamEquals" name="Value" value="1">1<inp2:m_else/>0</inp2:m_if>" />
-						
-				<input 
+
+				<input
 						type="checkbox"
-						id="_cb_<inp2:PermInputName sub_key="value"/>" 
+						id="_cb_<inp2:PermInputName sub_key="value"/>"
 						<inp2:m_if check="m_ParamEquals" name="Inherited" value="1">disabled="disabled"</inp2:m_if>
 						<inp2:m_if check="m_ParamEquals" name="Value" value="1">checked</inp2:m_if>
 						onchange="update_checkbox(this, document.getElementById('<inp2:PermInputName sub_key="value"/>'));"
 						onclick="update_light('<inp2:m_param name="PermissionName"/>', this.checked)" />
 			</td>
-			
+
 			<td>
 				<img id="light_<inp2:m_param name="PermissionName"/>" src="img/perm_<inp2:m_if check="m_ParamEquals" name="Value" value="1">green<inp2:m_else/>red</inp2:m_if>.gif"/>
 			</td>
Index: branches/unlabeled/unlabeled-1.8.2/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -r6842 -r7590
--- branches/unlabeled/unlabeled-1.8.2/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 6842)
+++ branches/unlabeled/unlabeled-1.8.2/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 7590)
@@ -183,20 +183,31 @@
 				$object->ErrorMsgs['too_frequent'] = $this->Application->Phrase('lu_ferror_review_duplicate');
 			}
 		}
-		
+
 		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemCreate(&$event)
+		{
+			$object =& $event->getObject();
+			$object->SetDBField('Module', $this->Application->findModule('Var',$this->Application->getUnitOption($this->Prefix, 'ParentPrefix'), 'Name'));
+		}
+
+		/**
 		 * Returns current user id for reviews, for logic ask Kostja T.
 		 *
 		 * @return int
 		 */
 		function getUserID()
 		{
 			$user_id = $this->Application->RecallVar('user_id');
-			
+
 			if ($user_id == 0) {
 				$user_id = -2;
 			}
-			
+
 			return $user_id;
 		}
 	}
Index: branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_config.php
===================================================================
diff -u -r5560 -r7590
--- branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 5560)
+++ branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 7590)
@@ -26,6 +26,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4 =>  'mode',
 											),
 
 
Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r7504 -r7590
--- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7504)
+++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 7590)
@@ -105,7 +105,12 @@
 			$block_params['label'] = addslashes( $this->Application->Phrase($filter_params['label']) );
 			if (getArrayValue($view_filter,$filter_key)) {
 				$submit = 0;
-				$status = $group_params['element_type'] == 'checkbox' ? '[\'img/check_on.gif\']' : '[\'img/menu_dot.gif\']';
+				if ($params['old_style']) {
+					$status = $group_params['element_type'] == 'checkbox' ? 1 : 2;
+				}
+				else {
+					$status = $group_params['element_type'] == 'checkbox' ? '[\'img/check_on.gif\']' : '[\'img/menu_dot.gif\']';
+				}
 			}
 			else {
 				$submit = 1;
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r7474 -r7590
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7474)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7590)
@@ -240,7 +240,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="viewmenu_filter_block"/>
-	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('<inp2:m_param name="label"/>','<inp2:m_param name="filter_action"/>','<inp2:m_param name="filter_status"/>');
+	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('<inp2:m_param name="label" js_escape="1"/>','<inp2:m_param name="filter_action"/>','<inp2:m_param name="filter_status"/>');
 <inp2:m_blockend/>
 
 <inp2:m_block name="viewmenu_filter_separator"/>
@@ -257,7 +257,7 @@
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('All','filters_remove_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('None','filters_apply_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuSeparator();
-			<inp2:$PrefixSpecial_DrawFilterMenu item_block="viewmenu_filter_block" spearator_block="viewmenu_filter_separator" ajax="$ajax"/>
+			<inp2:$PrefixSpecial_DrawFilterMenu old_style="1" item_block="viewmenu_filter_block" spearator_block="viewmenu_filter_separator" ajax="$ajax"/>
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">
Index: branches/unlabeled/unlabeled-1.13.2/kernel/admin_templates/popups/translator.tpl
===================================================================
diff -u -r7394 -r7590
--- branches/unlabeled/unlabeled-1.13.2/kernel/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7394)
+++ branches/unlabeled/unlabeled-1.13.2/kernel/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7590)
@@ -22,7 +22,6 @@
 <script language="javascript" src="js/in-portal.js"></script>
 <script language="javascript" src="js/toolbar.js"></script>
 <script language="javascript" src="js/grid.js"></script>
-<script language="javascript" src="js/tabs.js"></script>
 <script language="javascript">
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
Index: branches/unlabeled/unlabeled-1.22.2/kernel/include/itemreview.php
===================================================================
diff -u -r4150 -r7590
--- branches/unlabeled/unlabeled-1.22.2/kernel/include/itemreview.php	(.../itemreview.php)	(revision 4150)
+++ branches/unlabeled/unlabeled-1.22.2/kernel/include/itemreview.php	(.../itemreview.php)	(revision 7590)
@@ -4,17 +4,17 @@
 {
         $count = 0;
         $sql = "SELECT count(*) as DupCount FROM $SourceTable WHERE IPAddress='$ip' and ItemId=$id";
-        $adodbConnection = &GetADODBConnection(); 
+        $adodbConnection = &GetADODBConnection();
         $rs = $adodbConnection->Execute($sql);
         if($rs)
         {
             $count = $rs->fields["DupCount"];
         }
-        return ($count>0);           
+        return ($count>0);
 }
 
 RegisterPrefix("clsItemReview","review","kernel/include/itemreview.php");
-     
+
 class clsItemReview extends clsParsedItem
 {
     function clsItemReview($ReviewId=NULL,$table="ItemReview")
@@ -46,25 +46,25 @@
             $Errors->AddError("error.fieldIsRequired",'ReviewText',"","",get_class($this),"Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_Pending))
         {
             $Error->AddError("error.fieldIsRequired",'Pending',"","",get_class($this),"Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_IPAddress))
         {
             $Error->AddError("error.fieldIsRequired",'IPAddress',"","",get_class($this),"Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_ItemId))
         {
             $Error->AddError("error.fieldIsRequired",'ItemId',"","",get_class($this),"Validate");
             $dataValid = false;
         }
-        
+
         if(!isset($this->m_CreatedById))
         {
             $Error->AddError("error.fieldIsRequired",'CreatedBy',"","",get_class($this),"Validate");
@@ -83,7 +83,7 @@
             $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
             return false;
         }
-                
+
         $sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ReviewId = '%s'",$Id);
         if( $GLOBALS['debuglevel'] ) echo $sql."<br>";
         $result = $this->adodbConnection->Execute($sql);
@@ -97,8 +97,8 @@
             $this->SetFromArray($data);
         $this->Clean();
         return TRUE;
-    }    
-  
+    }
+
     function MoveUp()
     {
         $this->Increment("Priority");
@@ -110,14 +110,14 @@
     }
 
     function ParseObject($element)
-    { 
+    {
         global $objConfig, $objCatList, $rootURL, $objUsers, $objModules;
 
         $extra_attribs = ExtraAttributes($element->attributes);
-        
+
         if(strtolower($element->name)==$this->TagPrefix)
-        {          
-            $field = strtolower($element->attributes["_field"]); 
+        {
+            $field = strtolower($element->attributes["_field"]);
             switch($field)
             {
             case 'itemname':
@@ -126,25 +126,25 @@
             	$module_info=$module_info[$this->Get('Module')];
             	$ret=$db->GetOne('SELECT '.$module_info['ItemNameField'].' FROM '.GetTablePrefix().$module_info['MainTable'].' WHERE ResourceId='.$this->Get('ItemId'));
             	break;
-            
+
             case 'itemlink':
             	$db=&GetADODBConnection();
             	$module_info=$objModules->ExecuteFunction('GetModuleInfo','rel_list');
             	$module_info=$module_info[$this->Get('Module')];
             	$prefix=$db->GetOne('SELECT Var FROM '.$objModules->SourceTable.' WHERE Name=\''.$this->Get('Module').'\'');
-            	
+
             	$id=$db->GetOne('SELECT '.$module_info['MainTable'].'Id FROM '.GetTablePrefix().$module_info['MainTable'].' WHERE ResourceId='.$this->Get('ItemId'));
             	$GLOBALS[$prefix.'_var_list_update'][ $module_info['EnvIDField'] ]=$id;
-    			
+
             	/*$env_unparsed=explode(':',$_REQUEST['env']);
             	m_ParseEnv($tmp[1]);*/
-            	
+
             	$url=rtrim(GetIndexUrl(2),'index.php');
-            	
+
                 $ret = $url.strtolower($this->Get('Module')).'/admin/'.$module_info['EditFile'].'?env='.BuildEnv();
                 unset($GLOBALS[$prefix.'_var_list_update'][ $module_info['EnvIDField'] ]);
             	break;
-            	
+
             case "id":
             	/*
             	@field:review.id
@@ -168,17 +168,17 @@
 		    	{
 		    	  $ret = inp_htmlize($this->Get("ReviewText"));
 		    	}
-		    	else 
+		    	else
 		    	{
                 	$ret = $this->Get("ReviewText");
 		    	}
-		    	
+
 		    	$cut_first_chars=$element->GetAttributeByName('_CutFirst');
 		    	if($cut_first_chars && strlen($ret)>$cut_first_chars)
 		    	{
 		    		$ret=substr($ret,0,$cut_first_chars).' ...';
 		    	}
-                break;		
+                break;
 		    case "ip":
 		    	/*
 		    	@field:review.ip
@@ -192,23 +192,23 @@
 		    	@description: Returns the review pening status
 		    	*/
                 $ret = $this->Get("Pending");
-                break;		
+                break;
             case "item_type":
             	/*
             	@field:review.item_type
             	@description:Returns the name of the reviewed item type
             	*/
                 $type =& $objItemTypes->GetItem($this->Get("ItemType"));
                 if(is_object($type))
-                  $ret = $type->Get("ItemName");                
+                  $ret = $type->Get("ItemName");
             break;
             case "date":
             	/*
   				@field:review.date
   				@description:Returns the date/time the review was created
   				@attrib:_tz:bool:Convert the date to the user's local time
   				@attrib:_part::Returns part of the date.  The following options are available: month,day,year,time_24hr,time_12hr
-            	*/               
+            	*/
                 $d = $this->Get("CreatedOn");
                 if($element->GetAttributeByName('_tz'))
                 {
@@ -221,9 +221,9 @@
                     $ret = ExtractDatePart($part,$d);
                 }
                 else
-                {                
+                {
                   if($d<=0)
-                  {                  
+                  {
                     $ret = "";
                   }
                   else
@@ -243,18 +243,18 @@
                 }
                 if($this->Get("CreatedById")>0)
                 {
-                  $u =& $objUsers->GetItem($this->Get("CreatedById"));                
-                  $e = new clsHtmlTag(); 
+                  $u =& $objUsers->GetItem($this->Get("CreatedById"));
+                  $e = new clsHtmlTag();
                   $e->name = $u->TagPrefix;
                   $e->attributes = $element->attributes;
                   $e->attributes["_field"] = $userfield;
                   $ret = $u->ParseObject($e);
                 }
-                else 
+                else
                   if($userfield=="login")
                     $ret = "root";
             break;
-            
+
              case "admin_icon":
                 if( $element->GetAttributeByName('fulltag') )
                 {
@@ -265,7 +265,7 @@
                     $ret = $this->StatusIcon();
                 }
             	break;
-            	
+
             default:
                     $tag = $this->TagPrefix."_".$field;
                     $ret = "Undefined: ".$tag->name;
@@ -274,7 +274,7 @@
         }
         else
         {
-           $ret = $element->Execute();           
+           $ret = $element->Execute();
         }
         return $ret;
     }
@@ -290,26 +290,26 @@
             $ret .= "icon16_review_disabled.gif";
             break;
           case STATUS_PENDING:
-            $ret .= "icon16_review_pending.gif";  
+            $ret .= "icon16_review_pending.gif";
             break;
           case STATUS_ACTIVE:
             $ret .= "icon16_review.gif";
             break;
         }
         return $ret;
     }
-    
+
     function parsetag($tag)
-    {	
+    {
         global $objConfig, $objUsers, $objItemTypes;
         if(is_object($tag))
-        {        
+        {
             $tagname = $tag->name;
         }
         else
             $tagname = $tag;
         switch($tagname)
-        {	
+        {
             case "review_id":
                 return $this->Get("ReviewId");
                 break;
@@ -318,13 +318,13 @@
                 break;
 		    case "review_text":
                 return $this->Get("ReviewText");
-                break;		
+                break;
 		    case "review_ip_address":
 			    return $this->Get("IPAddress");
                 break;
 		    case "review_pending":
                 return $this->Get("Pending");
-                break;		
+                break;
             case "review_item_type":
                 $type =& $objItemTypes->GetItem($this->Get("ItemType"));
                 $res = $type->Get("ItemName");
@@ -333,7 +333,7 @@
             case "review_created_date":
                 return LangDate($this->Get('CreatedOn'), 0, true);
                 break;
-                
+
             case "review_created_time":
                 if ($this->Get('CreatedOn') <= 0) {
                     return '';
@@ -343,10 +343,10 @@
 
 		    case "review_created_date_month":
                 return adodb_date("m", $this->Get("CreatedOn"));
-                break;		
+                break;
 		    case "review_created_date_day":
                 return adodb_date("d", $this->Get("CreatedOn"));
-                break;		
+                break;
 		    case "review_created_date_year":
                 return adodb_date("Y", $this->Get("CreatedOn"));
                 break;
@@ -368,7 +368,15 @@
     {
         global $objItemTypes, $objMessageList;
 
-        $type =& $objItemTypes->GetItem($this->Get("ItemType"));
+        $types = array(
+        	'In-Link' => 4,
+        	'In-Bulletin' => 3,
+        	'In-Commerce' => 11,
+        	'In-News' => 2,
+        );
+        $type_id = $types[$this->Get('Module')];
+
+        $type =& $objItemTypes->GetItem($type_id);
         $res = $type->Get("ItemName");
         $EventName = $res.$Suffix;
 
@@ -378,7 +386,7 @@
             if($Event->Get("Enabled")=="1")
             {
                 $Event->Item = $this;
-                return $Event->SendToUser($ToUserId);                
+                return $Event->SendToUser($ToUserId);
             }
         }
     }
@@ -387,7 +395,16 @@
     {
         global $objItemTypes, $objMessageList;
 
-        $type =& $objItemTypes->GetItem($this->Get("ItemType"));
+        $types = array(
+        	'In-Link' => 4,
+        	'In-Bulletin' => 3,
+        	'In-Commerce' => 11,
+        	'In-News' => 2,
+        );
+        $type_id = $types[$this->Get('Module')];
+
+        $type =& $objItemTypes->GetItem($type_id);
+
         $res = $type->Get("ItemName");
         $EventName = $res; //.$Suffix;
 
@@ -427,7 +444,7 @@
     {
     	$GLOBALS['m_var_list']['reviews_page']=$this->Page;
     }
-    
+
     function ItemCount()
     {
       return $this->NumItems();
@@ -461,7 +478,7 @@
         if($TodayOnly)
         {
             $today = adodb_mktime(0,0,0,adodb_date('m'),adodb_date('d'),adodb_date('Y'));
-            $sql .= ' AND CreatedOn >= '.$today; 
+            $sql .= ' AND CreatedOn >= '.$today;
         }
         return (int)$this->adodbConnection->GetOne($sql);
     }
@@ -508,49 +525,49 @@
                        $Priority, $ItemId,$ItemType,$CreatedById,$TextFormat=0,$Module)
     {
         global $objSession;
-    	
-    	$r = new clsItemReview(NULL,$this->SourceTable);     
-        
-        $ReviewText = str_replace("env=".$objSession->GetSessionKey(), "env=",$ReviewText);   
+
+    	$r = new clsItemReview(NULL,$this->SourceTable);
+
+        $ReviewText = str_replace("env=".$objSession->GetSessionKey(), "env=",$ReviewText);
         //$r->debuglevel = 1;
 
         $r->Set(array("CreatedOn","ReviewText","Status", "IPAddress",
                       "Priority","ItemId","ItemType","CreatedById","TextFormat","Module"),
                 array($CreatedOn,$ReviewText,$Status, $IPAddress,
-                      $Priority, $ItemId,$ItemType,$CreatedById,$TextFormat,$Module));                      
-        $r->Create();                
+                      $Priority, $ItemId,$ItemType,$CreatedById,$TextFormat,$Module));
+        $r->Create();
         array_push($this->Items,$r);
         if($Status==1)
         {
             $r->SendUserEventMail("REVIEW.ADD",$CreatedById);
-            $r->SendAdminEventMail("REVIEW.ADD");      
+            $r->SendAdminEventMail("REVIEW.ADD");
         }
         else
         {
             $r->SendUserEventMail("REVIEW.ADD.PENDING",$CreatedById);
-            $r->SendAdminEventMail("REVIEW.ADD.PENDING");      
+            $r->SendAdminEventMail("REVIEW.ADD.PENDING");
         }
 
         return $r;
     }
 
-    function EditReview($ReviewId,$CreatedOn,$ReviewText, $Status, 
+    function EditReview($ReviewId,$CreatedOn,$ReviewText, $Status,
                         $IPAddress, $Priority, $ItemId,$ItemType,$CreatedById,$TextFormat,$Module='')
     {
         global $objSession;
-        
+
         $r = $this->GetItem($ReviewId);
         if($CreatedById==0)
           $CreatedById = $r->Get("CreatedById");
-        $r->Set(array("ReviewId","CreatedOn","ReviewText","Status", 
+        $r->Set(array("ReviewId","CreatedOn","ReviewText","Status",
                       "IPAddress", "Priority", "ItemId","ItemType","CreatedById","TextFormat"),
                 array($ReviewId,$CreatedOn,$ReviewText,$Status,
                       $IPAddress, $Priority, $ItemId,$ItemType,$CreatedById,$TextFormat));
         if($Module) $r->Set('Module',$Module);
-                      
+
         $r->Update();
         //$r->SendUserEventMail("REVIEW.MODIFY",$objSession->Get("PortalUserId"));
-        $r->SendAdminEventMail("REVIEW.MODIFY");      
+        $r->SendAdminEventMail("REVIEW.MODIFY");
         return $r;
     }
 
@@ -584,7 +601,7 @@
     	$idlist = array();
     	$sql = 'SELECT * FROM '.$edit_table;
     	$this->Clear();
-    	
+
     	// get all items in edit-table
     	$rs = $this->adodbConnection->Execute($sql);
     	while($rs && !$rs->EOF)
@@ -593,18 +610,18 @@
     		$c = $this->AddItemFromArray($data);
     		$c->Dirty();
     		$c->Update();
-    		
+
     		$idlist[] = $c->Get("ReviewId");
     		$rs->MoveNext();
     	}
-    	
+
     	//echo "DEL REVIEW SQL: $sql<br>";
-    	
+
     	$this->PurgeEditTable();
-    	
+
     	unset($GLOBALS['_CopyFromEditTable']);
     }
-    
+
     function CopyFromEditTable($ResourceId, $saveEditTable = false)
     {
     	global $objSession;
@@ -639,9 +656,9 @@
     	$sql = "DELETE FROM ".$this->SourceTable." WHERE ItemId=$ResourceId ".(count($idlist) > 0 ? "AND ReviewId NOT IN (".implode(",",$idlist).")" : "");
     	//echo "DEL REVIEW SQL: $sql<br>";
     	$this->adodbConnection->Execute($sql);
-    	
+
     	if(!$saveEditTable) $this->PurgeEditTable();
-    	
+
     	unset($GLOBALS['_CopyFromEditTable']);
     }
 
@@ -650,8 +667,8 @@
     	$edit_table = $GLOBALS['objSession']->GetEditTable($this->SourceTable);
     	@$this->adodbConnection->Execute("DROP TABLE IF EXISTS ".$edit_table);
     }
-    
 
+
     function GetPageLinkList(&$UpdateVar,$dest_template=NULL,$page = NULL,$PagesToList=10,$HideEmpty=TRUE)
     {
         global $objConfig, $var_list_update, $var_list;
@@ -716,26 +733,26 @@
           $UpdateVar["rp"]=$this->Page+$PagesToList;
           $next_url = HREF_Wrapper();
           $o .= "<A HREF=\"$next_url\"> &gt;&gt;</A>";
-        }                               
+        }
         unset($UpdateVar,$var_list_update["t"] );
-        return $o;       
+        return $o;
     }
-	
+
     function AdminPrintItems($template)
 	{
 	    // prints item listing for admin (browse/advanced view) tabs
 	    $o = '<table border="0" cellspacing="2" width="100%"><tbody><tr>';
-	
+
 		$i = 1;
-	    
+
 	    $topleft		=	0;
 	    $topright		=	0;
 	    $rightcount		=	0;
 	    $total_items	=	$this->NumItems();
 	    $topleft		=	ceil($total_items / 2);
 	    $topright		=	$total_items - $topleft;
-	  
-	    for($x = 0; $x < $topleft; $x++) 
+
+	    for($x = 0; $x < $topleft; $x++)
 	    {
 	        //printingleft
 	        $item = $this->Items[$x];
@@ -746,13 +763,13 @@
 			}
 			$o .= $item->AdminParseTemplate($template);
 			$i++;
-	        
+
 	        //printingright
-	        if ($rightcount < $topright && ( ($x + $topleft) < $total_items) ) 
+	        if ($rightcount < $topright && ( ($x + $topleft) < $total_items) )
 	        {
 	            $item = $this->Items[ $x + $topleft ];
 				if ($i > 2)
-				{	
+				{
 				    $o.="</tr>\n<tr>";
 				    $i = 1;
 				}
@@ -761,7 +778,7 @@
 	            $rightcount++;
 	        }
 	    }
-		$o .= "\n</tr></tbody></table>\n";   
+		$o .= "\n</tr></tbody></table>\n";
 
 		return $o;
 	}
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7502 -r7590
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7502)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7590)
@@ -102,7 +102,7 @@
 ToolBarButton.prototype.EditTitle = function() {
 	if (this.TranslateLink !== false) {
 		var $links = this.TranslateLink;
-		
+
 		$links = $links.split('::');
 		var $i = 0;
 		while ($i < $links.length) {
@@ -116,16 +116,16 @@
 				else {
 					window.location.href = 'http://' + $link;
 				}
-				
+
 				// edit one phrase at a time
 				break;
 			}
 			$i++;
 		}
-		
+
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -268,7 +268,7 @@
 	this.Module = $module ? $module : 'core';
 	this.IconPrefix = icon_prefix ? icon_prefix : 'tool_';
 	this.Buttons = new Array();
-	this.UseLabels = $use_toolbarlabels ? $use_toolbarlabels : false;
+	this.UseLabels = typeof($use_toolbarlabels) != 'undefined' ? $use_toolbarlabels : false;
 }
 
 ToolBar.prototype.AddButton = function(a_button)