# HG changeset patch
# Parent ebc04ba83ec4069a6a4684a5f009a76f5bdfd29d
diff -r ebc04ba83ec4 -r 533c1e79dd59 adm/header.php
--- a/adm/header.php	Wed Oct 20 14:20:10 2010 +0900
+++ b/adm/header.php	Thu Oct 21 10:17:51 2010 +0900
@@ -122,6 +122,7 @@
 							<a class="menu_href" href="vtours.php">VTours</a>
 					    </div>
 					    <div id="menu_lvl_2">
+					    	<a class="menu_href" href="reg_users.php">Пользователи</a>
 							<a class="menu_href" href="user_objects.php">Пользовательские объекты</a>
 							<a class="menu_href" href="user_bids.php">Заявки</a>
 							<a class="menu_href" href="payments.php?only_last=Y">Платежи</a>
diff -r ebc04ba83ec4 -r 533c1e79dd59 adm/js/inc/objects.js
--- a/adm/js/inc/objects.js	Wed Oct 20 14:20:10 2010 +0900
+++ b/adm/js/inc/objects.js	Thu Oct 21 10:17:51 2010 +0900
@@ -1,18 +1,5 @@
 $(document).ready( function() {
-	
-	var onstreetscontainer = false;
-	var streets_container;
-	var inp_street;
-	
-	$("#a_show_search_form").click ( function() {
-		var div_search_form = $("#div_search_form");
-		if(div_search_form.css("display") == "none") {
-			div_search_form.css("display","");
-		} else {
-			div_search_form.css("display","none");			
-		}
-	});
-	
+		
 	$("#partner_filter").keyup( function() {
 		var filter = $(this).attr("value");
 		if(filter == "") {
@@ -134,56 +121,5 @@
 		});
 		alert("Значений вне диапазона: " + counter);
 	});
-		
-	$("input[id^='inp_street']").live("keyup focus", function() {
-		inp_street = $(this);
-		var mask = $(this).attr("value");
-		if($(this).attr("id") == "inp_street") {
-			var city_id = $("select[id='city_form'] option:selected").attr("value");
-			streets_container = $("#streets_container");
-		} else {
-			var city_id = "";
-			streets_container = $("#streets_container_search");
-		}
-		streets_container.live("mouseover", function() { onstreetscontainer = true;}).live("mouseout", function() { onstreetscontainer = false;});
-		if(mask.length > 2) {
-//			alert("action=get_streets_list&city=" + city_id +"&mask=" + mask);
-			$.ajax({
-				url		:	"ajax.php",
-				type	:	"POST",
-				data	:	"action=get_streets_list&city=" + city_id +"&mask=" + mask,
-				cache	:	false,
-				success	:	function(data) {
-					streets_container.children().detach();
-					var list = $.parseJSON(data);
-					if(list.length > 0) {
-						for(i = 0; i < list.length; i++) {
-							streets_container.append("<div class='autocomplete_option'>" + list[i] + "</div>");
-						}
-						streets_container.css("display","");
-					} else {
-						streets_container.css("display","none");
-						onstreetscontainer = false;
-					}
-				},
-			});
-		}
-	}).live("blur", function() {
-		if(!onstreetscontainer) {
-			streets_container.css("display","none");
-			streets_container.children().detach();
-			onstreetscontainer = false;
-		}
-	});
 	
-	$("div.autocomplete_option").live("click", function() {
-		inp_street.attr("value",$(this).text());
-		streets_container.css("display","none");
-		streets_container.children().detach();
-		onstreetscontainer = false;
-	});
-	
-	$.realtyObjects($.Params, $.ParamsBuildObj);
-	
-	$("tr.default").highlightRow($.cssSelected);
 });
\ No newline at end of file
diff -r ebc04ba83ec4 -r 533c1e79dd59 adm/objects.php
--- a/adm/objects.php	Wed Oct 20 14:20:10 2010 +0900
+++ b/adm/objects.php	Thu Oct 21 10:17:51 2010 +0900
@@ -446,7 +446,8 @@
 	
 //	print_r($sellers_list);
 
-	$smarty->assign("js_libs",array("AnyChart.js","objects.js"));	
+	$smarty->assign("js_libs",array("AnyChart.js","objects.js"));
+	$smarty->assign("js_global_libs", array("objects.js"));
 	$smarty->assign("nazn_list",${"{$_GET["base"]}_nazn_list"});
 	$smarty->assign("offers_list", array("lease" => "аренда", "sell" => "продажа"));
 	$smarty->assign("title_section",$title_section);
diff -r ebc04ba83ec4 -r 533c1e79dd59 adm/partners.php
--- a/adm/partners.php	Wed Oct 20 14:20:10 2010 +0900
+++ b/adm/partners.php	Thu Oct 21 10:17:51 2010 +0900
@@ -237,8 +237,8 @@
 #/изменение партнера
 
 if($_POST["add_user"] && $id) {
-	include_once 'trinity_conf.php';
-	$db_link = $old_db_link;
+	include_once("trinity_conf.php");
+//	$db_link = $old_db_link;
 	$reg_user = new reg_user($db_link);
 	$reg_user->id = $_POST["user_id"];
 	$reg_user->load();
@@ -479,8 +479,8 @@
  
    echo "<h5>Пользователи партнера:</h5>";
   
-   include_once 'trinity_conf.php';
-   $db_link = $old_db_link;
+   include_once("trinity_conf.php");
+//   $db_link = $old_db_link;
    $reg_users = new reg_users($db_link);
    $reg_users->seller_id = $id;
    $user_list = $reg_users->get_list();
diff -r ebc04ba83ec4 -r 533c1e79dd59 cabinet.php
--- a/cabinet.php	Wed Oct 20 14:20:10 2010 +0900
+++ b/cabinet.php	Thu Oct 21 10:17:51 2010 +0900
@@ -1543,61 +1543,7 @@
 			}
 		break;
 		case "my_objects":
-			if(!(($logged_user->status == "partner") and ($logged_user->services & 2))) die(header("Location: cabinet.php"));
-			include_once("myObjConf.php");
-			switch($_GET["do"]) {
-				default:
-					$selectors = array();
-					$selectors[] = new ObjSelector("seller_id",$logged_user->seller_id);
-					$counters = array();
-					foreach($allowed_bases as $base) {
-						$obj_list = $obj_manager->query($base,$selectors);
-						if(count($obj_list) > 0) $counters[$base] = count($obj_list);
-					}
-					$smarty->assign("counters",$counters);
-					$smarty->assign("do","default");
-				break;
-				case "search":
-					if(!in_array($_GET["base"],$allowed_bases)) die(header("Location: cabinet.php?action=my_objects"));
-					$query = "";
-					$orders_arr = array();
-					$selectors = array();
-					$selectors[] = new ObjSelector("seller_id",$logged_user->seller_id);
-					foreach($display_fields[$_GET["base"]] as $field => $val) {
-						if($val) {
-							$orders_arr[$field] = "asc";
-						}
-					}
-					foreach($search_fields[$_GET["base"]] as $field => $val) {
-						if($val) {
-							if(!empty($_GET[$field])) {
-								if($field == "street") {
-									$selectors[] = new ObjSelector($field,"%{$_GET[$field]}%","like");
-								}  else {
-									$selectors[] = new ObjSelector($field,$_GET[$field]);
-								}
-							}
-							$query .= "&$field={$_GET[$field]}";
-						}
-					}
-					if ($_GET["order_by"]) $order_by = $_GET["order_by"]; else $order_by = "id";
-					if ($_GET["order"]) $order = $_GET["order"]; else $order = "asc";
-					$orders_arr[$order_by] = invert_order($order);
-					$obj_list = $obj_manager->query($_GET["base"],$selectors, array($order_by, $order));
-					$smarty->assign("base",$_GET["base"]);
-					$smarty->assign("orders_arr",$orders_arr);
-					$smarty->assign("obj_list",$obj_list);
-					$smarty->assign("display_fields",$display_fields[$_GET["base"]]);
-					$smarty->assign("search_fields",$search_fields[$_GET["base"]]);
-					$smarty->assign("types_list",${"{$_GET["base"]}_types_list"});
-					$smarty->assign("res_count",count($obj_list));
-					$smarty->assign("get_data",$_GET);
-					$smarty->assign("url_prefix","cabinet.php?action=my_objects&do=search");
-					$smarty->assign("do","search");					
-				break;
-			}
-			$smarty->assign("fields_table_titles",$fields_table_titles);
-			$smarty->assign("action","my_objects");
+			include_once("cabinet/my_objects.php");
 		break; 
 	}