17.11.2015 sync

sergomanov · Nov 17, 2015 · 19b0145 · 19b0145
1 parent a606e6d
commit 19b0145
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 213 deletions.
diff --git a/www/charts.php b/www/charts.php
@@ -237,7 +237,7 @@ function showTooltip(x, y, contents) {
 if ($resultry=mysqli_query($con,"SELECT * FROM `developments` WHERE mode = '$mode' AND address = '$address'  AND unixtime >='$datetimein' AND unixtime <='$datetimeout'"))  {  $rowcountty=mysqli_num_rows($resultry);  }
 	  $res9 = mysqli_query($con,"SELECT * FROM `developments` WHERE mode = '$mode' AND address = '$address'  AND unixtime >='$datetimein' AND unixtime <='$datetimeout' "); 
 
-if($rowcountty<20){
+if($rowcountty<99){
 if($res9){ 	while($row9 = mysqli_fetch_assoc($res9)){
 	$utime7=$row9['unixtime'];
 	$vale79=$row9['vale'];
@@ -246,7 +246,7 @@ function showTooltip(x, y, contents) {
 	echo "[".$utime7.",".$per."],";
 }}
 } else {
-$coltec=0;$col_per=ceil($rowcountty/20);$gl=0;
+$coltec=0;$col_per=ceil($rowcountty/99);$gl=0;
 if($res9){ 	while($row9 = mysqli_fetch_assoc($res9)){
 	$coltec++;
 	$utime7=$row9['unixtime'];

diff --git a/www/feditor/attached/image/20151014/20151014160137_24381.png b/www/feditor/attached/image/20151014/20151014160137_24381.png
diff --git a/www/index.php b/www/index.php
@@ -81,10 +81,10 @@
      border: 1px solid #00aeef;  font-size: 14px;border-radius: 1px;  box-shadow: none;  color: #fff;  cursor: pointer;  ">Восстановление</div>
 	 </div>
 		 <div class="form-input form-input-login">
-		 <input type="text" name="login" value="demo" />
+		 <input type="text" name="login"  />
 		                </div>
 						 <div class="form-input form-input-pass">
-		 <input type="password" name="passwd" value="demo" id="" />
+		 <input type="password" name="passwd"  id="" />
 		 <input type="submit" value="Войти →" name="send" style="  font-size: 13px;"/>
 		 </div>
 		  <div class="form-input form-input-checkbox"><input type="checkbox" name="remember" value="on" id="saveme"> <label for="saveme">Запомнить меня</label></div>

diff --git a/www/log.php b/www/log.php
@@ -55,7 +55,7 @@
 					<td>
 					<?php	echo "Тип: ".$row['mode']."<br>"; ?>
 					<?php	echo $row['address'].": "; ?>
-					<gcol><?php	$rtype = mysqli_query($con,"SELECT * FROM namedev WHERE address='$M_address' "); while($rowr = mysqli_fetch_assoc($rtype)) {echo ": ".$rowr['name'];} ?></gcol><br>
+					<gcol><?php	$rtype = mysqli_query($con,"SELECT * FROM namedev WHERE address='$M_address' AND id_user = '$G_id_user' "); while($rowr = mysqli_fetch_assoc($rtype)) {echo ": ".$rowr['name'];} ?></gcol><br>
 					<?php	echo "Значение: ".$row['vale']; ?>
 					</td>
 

diff --git a/www/map.php b/www/map.php
@@ -4,7 +4,7 @@
 </div>
 
 <a class="roundbutton" id="key1"  href="button.php"  style="bottom: 12px;left: 5px;" value="-"><i class="icon-cog" style="font-size: 26px;"></i></a>
-<a class="roundbutton" id="key2" href="ymap.php"  style="bottom: 70px;left: 5px;" value="-"><i class="icon-globe-1" style="font-size: 26px;"></i></a>
+
 
 <?php if(isset($_GET['edit'])){ ?>
 <a href="main.php" id="key5" title="Закончить редактирование" onclick="send();"  class="s3-hide-panel" style="background-color: #ffa800!important;height: 60px;  padding: 15px 16px 17px;"><i class="icon-move-2"></i> </a>	

diff --git a/www/runtime.php b/www/runtime.php
@@ -342,7 +342,7 @@ function signal_run($address,$mode,$vale,$db_host,$db_login ,$db_passwd,$db_name
 
 
 //---------------------------------- Команда ONLINE ---------------------------------------------------------   
-$time_period=time()-600;       
+$time_period=time()-1300;       
 $unixtime=time();                                           
 $res_W = mysqli_query($con,"SELECT * FROM `namedev` WHERE unixtime < '$time_period' AND unixtime!=0 AND state!=0");
 if($res_W) {   while($row_W = mysqli_fetch_assoc($res_W))