Changeset 15638 for tags

Timestamp:

10/20/11 03:14:15 (7 months ago)

Author:

Alexander Levitskiy

Message:

opening chat password protected rooms error - FIXED
#2681

Location:

tags/7.0/flash/modules/chat

Files:

• app/admin.swf (modified) (previous)
• app/user.swf (modified) (previous)
• inc/actions.inc.php (modified) (2 diffs)
• inc/functions.inc.php (modified) (3 diffs)

tags/7.0/flash/modules/chat/inc/actions.inc.php

@@ -296 +296 @@
     */
     case 'getRooms':
+        doRoom('deleteTemp');
         $sContents = makeGroup(getRooms("all", $sId), "rooms");
         break;
@@ -304 +305 @@
     */
     case 'createRoom':
-        $iRoomId = doRoom('insert', $sId, 0, $sRoom, $sPassword, $sDesc);
+        $iRoomId = doRoom('insert', $sId, 0, $sRoom, $sPassword, $sDesc, process_db_input($_REQUEST['temp']) == TRUE_VAL);
         if(empty($iRoomId)) $sContents = parseXml($aXmlTemplates['result'], "msgErrorCreatingRoom", FAILED_VAL);
         else                $sContents = parseXml($aXmlTemplates['result'], $iRoomId, SUCCESS_VAL);

tags/7.0/flash/modules/chat/inc/functions.inc.php

@@ -148 +148 @@
  * Actions with specified room
  */
-function doRoom($sSwitch, $sUserId = "", $iRoomId = 0, $sTitle = "", $sPassword = "", $sDesc = "")
+function doRoom($sSwitch, $sUserId = "", $iRoomId = 0, $sTitle = "", $sPassword = "", $sDesc = "", $bTemp = false)
 {
     $iCurrentTime = time();
@@ -155 +155 @@
         case 'insert':
             $aCurRoom = getArray("SELECT * FROM `" . MODULE_DB_PREFIX . "Rooms` WHERE `Name`='" . $sTitle . "'");
+            $sStatus = $bTemp ? ROOM_STATUS_DELETE : ROOM_STATUS_NORMAL;
             if(!empty($aCurRoom['ID']) && $sUserId == $aCurRoom['OwnerID'])
             {
-                getResult("UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `Name`='" . $sTitle . "', `Password`='" . $sPassword . "', `Desc`='" . $sDesc . "', `OwnerID`='" . $sUserId . "', `When`='" . $iCurrentTime . "', `Status`='" . ROOM_STATUS_NORMAL . "' WHERE `ID`='" . $aCurRoom['ID'] . "'");
+                getResult("UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `Name`='" . $sTitle . "', `Password`='" . $sPassword . "', `Desc`='" . $sDesc . "', `OwnerID`='" . $sUserId . "', `When`='" . $iCurrentTime . "', `Status`='" . $sStatus . "' WHERE `ID`='" . $aCurRoom['ID'] . "'");
                 return $aCurRoom['ID'];
             }
             else if(empty($aCurRoom['ID']))
             {
-                getResult("INSERT INTO `" . MODULE_DB_PREFIX . "Rooms` (`ID`, `Name`, `Password`, `Desc`, `OwnerID`, `When`) VALUES ('" . $iRoomId . "', '" . $sTitle . "', '" . $sPassword . "', '" . $sDesc . "', '" . $sUserId . "', '" . $iCurrentTime . "')");
+                getResult("INSERT INTO `" . MODULE_DB_PREFIX . "Rooms` (`ID`, `Name`, `Password`, `Desc`, `OwnerID`, `When`, `Status`) VALUES ('" . $iRoomId . "', '" . $sTitle . "', '" . $sPassword . "', '" . $sDesc . "', '" . $sUserId . "', '" . $iCurrentTime . "', '" . $sStatus . "')");
                 return getLastInsertId();
             }
@@ -187 +188 @@
         case 'exit':
             getResult("UPDATE `" . MODULE_DB_PREFIX . "RoomsUsers` SET `When`='" . $iCurrentTime . "', `Status`='" . ROOM_STATUS_DELETE . "' WHERE `Room`='" . $iRoomId . "' AND `User`='" . $sUserId . "' LIMIT 1");
+            break;
+
+        case 'deleteTemp':
+            if(useServer())
+                getResult("DELETE FROM `" . MODULE_DB_PREFIX . "Rooms` WHERE `Status`='" . ROOM_STATUS_DELETE . "' AND `When`<" . ($iCurrentTime - 24*60*60));
             break;
     }