Navigation

← Previous Changeset
Next Changeset →

Changeset 14

Timestamp:

11/12/07 05:26:46 (1 year ago)

Author:

SergeyZ

Message:

Build 6.0.0003 final

Files:

trunk/admin/browseMusic.php (modified) (1 diff)
trunk/admin/browsePhoto.php (modified) (1 diff)
trunk/admin/browseVideo.php (modified) (1 diff)
trunk/admin/db.php (modified) (1 diff)
trunk/inc/admin.inc.php (modified) (1 diff)
trunk/inc/db.inc.php (modified) (1 diff)
trunk/install/index.php (modified) (1 diff)
trunk/ray/modules/chat/app/admin.swf (modified) (previous)
trunk/ray/modules/chat/app/user.swf (modified) (previous)
trunk/ray/modules/chat/inc/actions.inc.php (modified) (3 diffs)
trunk/ray/modules/chat/inc/functions.inc.php (modified) (2 diffs)
trunk/ray/modules/chat/skins/default.swf (modified) (previous)
trunk/ray/modules/global/app/holder.swf (modified) (previous)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/admin/browseMusic.php

r7	r14
134	134	$sCode .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
135	135
136		~~$sStyle = ' style="border: 2px solid #CC0000;"';~~
137	136	if (mysql_num_rows($rData))
138	137	{
139	138	while ($aData = mysql_fetch_array($rData))
140	139	{
141		$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ~~$sStyle~~ ;
	140	$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ' style="border: 2px solid #CC0000;"' ;
142	141	$sProf = '<a href="'.$site['url'].'profile_edit.php?ID='.$aData['medProfId'].'">'.$aData['NickName'].'</a>';
143	142	$sCode .= '<div class="browseUnit"'.$sStyle.'>';

trunk/admin/browsePhoto.php

r7	r14
134	134	$sCode .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
135	135
136		~~$sStyle = ' style="border: 2px solid #CC0000;"';~~
137	136	if (mysql_num_rows($rData))
138	137	{
139	138	while ($aData = mysql_fetch_array($rData))
140	139	{
141		$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ~~$sStyle~~ ;
	140	$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ' style="border: 2px solid #CC0000;"' ;
142	141	$sImage = $site['sharingImages'].$aData['medID'].'_t.'.$aData['medExt'];
143	142	$sProf = '<a href="'.$site['url'].'profile_edit.php?ID='.$aData['medProfId'].'">'.$aData['NickName'].'</a>';

trunk/admin/browseVideo.php

r7	r14
133	133	$sCode .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
134	134
135		~~$sStyle = ' style="border: 2px solid #CC0000;"';~~
136	135	if (mysql_num_rows($rData))
137	136	{
138	137	while ($aData = mysql_fetch_array($rData))
139	138	{
140		$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ~~$sStyle~~ ;
	139	$sStyle = $aData['Approved'] == 'true' ? ' style="border: 2px solid #00CC00;"' : ' style="border: 2px solid #CC0000;"' ;
141	140	$sProf = '<a href="'.$site['url'].'profile_edit.php?ID='.$aData['medProfId'].'">'.$aData['NickName'].'</a>';
142	141	$sCode .= '<div class="browseUnit"'.$sStyle.'>';

trunk/admin/db.php

r7	r14
246	246	<tr class="table">
247	247	<td align="center" colspan="2">
248		<input type="submit" value="S~~end reques~~t" class="no" />
	248	<input type="submit" value="Submit" class="no" />
249	249	<input type="hidden" name="DatabasesRestore" value="YES" />
250	250	</td>

trunk/inc/admin.inc.php

r12	r14
1074	1074	$sCacheFile = $dir['cache'] . 'user' . $ID . '.php';
1075	1075	@unlink( $sCacheFile );
1076		reparseObjTags( 'profile', $iID );
	1076	reparseObjTags( 'profile', $ID );
1077	1077	}
1078	1078

trunk/inc/db.inc.php

r10	r14
23	23
24	24	define( 'DB_FULL_VISUAL_PROCESSING', true );
25		define( 'DB_FULL_DEBUG_MODE', ~~tru~~e );
	25	define( 'DB_FULL_DEBUG_MODE', false );
26	26	define( 'DB_DO_EMAIL_ERROR_REPORT', true );
27	27

trunk/install/index.php

r13	r14
24	24	/----------Vars----------------/
25	25	$aConf = array();
26		$aConf['release'] = '06.11.07';
	26	$aConf['release'] = '12.11.07';
27	27	$aConf['iVersion'] = '6.0';
28	28	$aConf['iPatch'] = '0003';

trunk/ray/modules/chat/inc/actions.inc.php

r5	r14
90	90	break;
91	91
92		/**
93		* Authorize user.
94		*/
95		case 'userAuthorize':
96		if(loginUser($sId, $sPassword) == TRUE_VAL && doBan("check", $sId) != TRUE_VAL)
97		{
98		$sResult = getValue("SELECT `ID` FROM `" . MODULE_DB_PREFIX . "Profiles` WHERE `ID`='" . $sId . "'");
99		if(empty($sResult)) getResult("INSERT INTO `" . MODULE_DB_PREFIX . "Profiles` SET `ID`='" . $sId . "', `Smileset`='" . $sDefSmileset . "'");
100		$sContents .= parseXml($aXmlTemplates['result'], TRUE_VAL);
101		}
102		else
103		$sContents .= parseXml($aXmlTemplates['result'], FALSE_VAL);
104		break;
105
106		/**
107		* Get user info.
108		*/
109		case 'userInfo':
110		$aUserInfo = getUserInfo($sId);
111		$sType = getUserType($sId);
112		$sContents .= parseXml($aXmlTemplates['user'], $sId, "new", $aUserInfo['nick'], $aUserInfo['sex'], $aUserInfo['age'], $aUserInfo['desc'], $aUserInfo['photo'], $aUserInfo['profile'], $sType, 0);
113		break;
114
115		/**
116		* Get sounds
117		*/
118		case 'getSounds':
119		$sFileName = $sModulesPath . $sModule . "/xml/sounds.xml";
120		if(file_exists($sFileName))
121		{
122		$rHandle = fopen($sFileName, "rt");
123		$sContents = fread($rHandle, filesize($sFileName)) ;
124		fclose($rHandle);
125		}
126		else $sContents = "<items></items>";
127
128		break;
129
130		/**
	92	/**
	93	* Authorize user.
	94	*/
	95	case 'userAuthorize':
	96	if(loginUser($sId, $sPassword) == TRUE_VAL && doBan("check", $sId) != TRUE_VAL)
	97	{
	98	$sResult = getValue("SELECT `ID` FROM `" . MODULE_DB_PREFIX . "Profiles` WHERE `ID`='" . $sId . "'");
	99	if(empty($sResult)) getResult("INSERT INTO `" . MODULE_DB_PREFIX . "Profiles` SET `ID`='" . $sId . "', `Smileset`='" . $sDefSmileset . "'");
	100	$sContents = parseXml($aXmlTemplates['result'], TRUE_VAL);
	101	}
	102	else $sContents = parseXml($aXmlTemplates['result'], FALSE_VAL);
	103	break;
	104
	105	/**
	106	* Get user info.
	107	*/
	108	case 'userInfo':
	109	$aUserInfo = getUserInfo($sId);
	110	$sType = getUserType($sId);
	111	$sContents = parseXml($aXmlTemplates['user'], $sId, "new", $aUserInfo['nick'], $aUserInfo['sex'], $aUserInfo['age'], $aUserInfo['desc'], $aUserInfo['photo'], $aUserInfo['profile'], $sType, 0);
	112	break;
	113
	114	/**
	115	* Get sounds
	116	*/
	117	case 'getSounds':
	118	$sFileName = $sModulesPath . $sModule . "/xml/sounds.xml";
	119	if(file_exists($sFileName))
	120	{
	121	$rHandle = fopen($sFileName, "rt");
	122	$sContents = fread($rHandle, filesize($sFileName));
	123	fclose($rHandle);
	124	}
	125	else $sContents = makeGroup("", "items");
	126	break;
	127
	128	/**
131	129	* gets smilesets
132	130	*/
133		case 'getSmilesets':
134		$sUserSmileset = getValue("SELECT `Smileset` FROM `" . MODULE_DB_PREFIX . "Profiles` WHERE `ID`='" . $sId . "'");
135		$sUserSmileset = !empty($sUserSmileset) ? $sUserSmileset : $sDefSmileset;
136		if ($rDirHandle = opendir($sSmilesetsPath))
137		while (false !== ($sDir = readdir($rDirHandle)))
138		if($sDir != "." && $sDir != ".." && is_dir($sSmilesetsPath . $sDir) && file_exists($sSmilesetsPath . $sDir . "/config.xml"))
139		$sSmilesets .= parseXml($aXmlTemplates['smileset'], $sDir, $sSmilesetsUrl . $sDir . "/", ($sDir == $sUserSmileset) ? TRUE_VAL : FALSE_VAL);
140		$sContents .= makeGroup($sSmilesets, "smilesets");
141		closedir($rDirHandle);
142		break;
143
144		/**
145		* Sets default smileset.
146		*/
147		case 'setSmileset':
148		getResult("UPDATE `" . MODULE_DB_PREFIX . "Profiles` SET `Smileset`='" . $sSmileset . "' WHERE `ID`='" . $sId . "'");
149		break;
	131	case 'getSmilesets':
	132	$sContents = makeGroup("", "smilesets");
	133	$aSmilesets = array();
	134	if($rDirHandle = opendir($sSmilesetsPath))
	135	while(false !== ($sDir = readdir($rDirHandle)))
	136	if($sDir != "." && $sDir != ".." && is_dir($sSmilesetsPath . $sDir) && file_exists($sSmilesetsPath . $sDir . "/config.xml"))
	137	$aSmilesets[] = $sDir;
	138	closedir($rDirHandle);
	139	if(count($aSmilesets) == 0) break;
	140
	141	if(!in_array($sDefSmileset, $aSmilesets)) $sDefSmileset = $aSmilesets[0];
	142	$sUserSmileset = getValue("SELECT `Smileset` FROM `" . MODULE_DB_PREFIX . "Profiles` WHERE `ID`='" . $sId . "'");
	143	if(empty($sUserSmileset)) $sUserSmileset = $sDefSmileset;
	144
	145	$sContents = "";
	146	for($i=0; $i<count($aSmilesets); $i++)
	147	$sContents .= parseXml($aXmlTemplates['smileset'], $aSmilesets[$i], $sSmilesetsUrl . $aSmilesets[$i] . "/", ($aSmilesets[$i] == $sUserSmileset) ? TRUE_VAL : FALSE_VAL);
	148	$sContents = makeGroup($sContents, "smilesets");
	149	break;
	150
	151	/**
	152	* Sets default smileset.
	153	*/
	154	case 'setSmileset':
	155	getResult("UPDATE `" . MODULE_DB_PREFIX . "Profiles` SET `Smileset`='" . $sSmileset . "' WHERE `ID`='" . $sId . "'");
	156	break;
150	157
151	158	/**
…	…
162	169	*/
163	170	case 'createRoom':
164		$sContents .= doRoom('insert', $sId, 0, $sRoom) == TRUE_VAL ? parseXml($aXmlTemplates['result'], TRUE_VAL, getLastInsertId()) : parseXml($aXmlTemplates['result'], FALSE_VAL);
	171	$iRoomId = doRoom('insert', $sId, 0, $sRoom);
	172	if(empty($iRoomId)) $sContents = parseXml($aXmlTemplates['result'], "msgErrorCreatingRoom", FAILED_VAL);
	173	else $sContents = parseXml($aXmlTemplates['result'], $iRoomId, SUCCESS_VAL);
165	174	break;
166	175
…	…
301	310	if( ($bAdmin && loginAdmin($sNick, $sPassword)) \|\| (!$bAdmin && loginUser($sModeratorId, $sPassword) && getUserType($sModeratorId) == CHAT_TYPE_MODER) )
302	311	{
303		~~if($sParamValue == TRUE_VAL) doBan('ban', $sId); else doBan(~~'unban', $sId);
304		$sContents .= parseXml($aXmlTemplates['result'], TRUE_VAL);
305		}
306		~~else $sContents .~~= parseXml($aXmlTemplates['result'], FALSE_VAL);
	312	doBan($sParamValue == TRUE_VAL ? 'ban' : 'unban', $sId);
	313	$sContents = parseXml($aXmlTemplates['result'], TRUE_VAL);
	314	}
	315	else $sContents = parseXml($aXmlTemplates['result'], FALSE_VAL);
307	316	break;
308	317

trunk/ray/modules/chat/inc/functions.inc.php

r5	r14
16	16	function doBan($sSwitch, $iId = "0")
17	17	{
18		global $aXmlTemplates;
19		switch($sSwitch)
20		{
21		case 'check': //--- check if user specified by ID is banned or not.
22		return getValue("SELECT `Banned` FROM `" . MODULE_DB_PREFIX ."Profiles` WHERE `ID` = '" . $iId . "' LIMIT 1") == "true" ? TRUE_VAL : FALSE_VAL;
23		break;
24		case 'ban': //--- ban the user specified by ID.
25		return getResult("REPLACE `" . MODULE_DB_PREFIX . "Profiles` SET `ID`='" . $iId . "', `Banned`='true'");
26		break;
27		case 'unban': //--- unban the user, specified by ID.
28		default:
29		return getResult("UPDATE `" . MODULE_DB_PREFIX . "Profiles` SET `Banned`='false' WHERE `ID` = '" . $iId . "'");
30		break;
31		}
	18	global $sModule;
	19	global $aXmlTemplates;
	20	global $sDefSmileset;
	21
	22	$sBan = FALSE_VAL;
	23	switch($sSwitch)
	24	{
	25	case 'check': //--- check if user specified by ID is banned or not.
	26	return getValue("SELECT `Banned` FROM `" . MODULE_DB_PREFIX ."Profiles` WHERE `ID` = '" . $iId . "' LIMIT 1");
	27
	28	case 'ban': //--- ban the user specified by ID.
	29	$sBan = TRUE_VAL;
	30	//break shouldn't be here
	31	case 'unban': //--- unban the user, specified by ID.
	32	default:
	33	$sUserId = getValue("SELECT `ID` FROM `" . MODULE_DB_PREFIX ."Profiles` WHERE `ID` = '" . $iId . "' LIMIT 1");
	34	if(empty($sUserId))
	35	{
	36	$sDefType = getSettingValue($sModule, "defaultType");
	37	$sSql = "INSERT INTO `" . MODULE_DB_PREFIX . "Profiles`(`ID`, `Banned`, `Type`, `Smileset`) VALUES('" . $iId . "', '" . $sBan . "', '" . $sDefType . "', '" . $sDefSmileset . "')";
	38	}
	39	else $sSql = "UPDATE `" . MODULE_DB_PREFIX . "Profiles` SET `Banned`='" . $sBan . "'";
	40	return getResult($sSql);
	41	}
32	42	}
33	43
…	…
78	88	{
79	89	switch ($sSwitch)
80		{
81		case 'insert':
82		$aCurRoom = getArray("SELECT `ID`, `Status` FROM `" . MODULE_DB_PREFIX . "Rooms` WHERE `Name`='" . $sRoom . "'");
83		if(!empty($aCurRoom['ID']) && $aCurRoom['Status'] == ROOM_STATUS_DELETE)
84		$sQuery = "UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `OwnerID`='" . $iUserId . "', `When`=UNIX_TIMESTAMP(), `Status`='" . ROOM_STATUS_NORMAL . "' WHERE `ID`='" . $aCurRoom['ID'] . "'";
85		else if(empty($aCurRoom['ID']))
86		$sQuery = "INSERT INTO `" . MODULE_DB_PREFIX . "Rooms` (`ID`, `Name`, `OwnerID`, `When`, `Status`) VALUES ('" . $iRoomId . "', '" . addslashes($sRoom) . "', '" . $iUserId . "', UNIX_TIMESTAMP(), '" . ROOM_STATUS_NORMAL . "')";
87		break;
88		case 'delete':
89		$sQuery = "UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `When`=UNIX_TIMESTAMP(), `Status`='" . ROOM_STATUS_DELETE . "' WHERE `ID` = '" . $iRoomId . "'";
90		break;
91		}
92		$rResult = $sQuery != "" ? getResult($sQuery) : "";
93		return !$rResult ? FALSE_VAL : TRUE_VAL;
	90	{
	91	case 'insert':
	92	$aCurRoom = getArray("SELECT `ID`, `Status` FROM `" . MODULE_DB_PREFIX . "Rooms` WHERE `Name`='" . $sRoom . "'");
	93	if(!empty($aCurRoom['ID']) && $aCurRoom['Status'] == ROOM_STATUS_DELETE)
	94	{
	95	getResult("UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `OwnerID`='" . $iUserId . "', `When`=UNIX_TIMESTAMP(), `Status`='" . ROOM_STATUS_NORMAL . "' WHERE `ID`='" . $aCurRoom['ID'] . "'");
	96	return $aCurRoom['ID'];
	97	}
	98	else if(empty($aCurRoom['ID']))
	99	{
	100	getResult("INSERT INTO `" . MODULE_DB_PREFIX . "Rooms` (`ID`, `Name`, `OwnerID`, `When`, `Status`) VALUES ('" . $iRoomId . "', '" . addslashes($sRoom) . "', '" . $iUserId . "', UNIX_TIMESTAMP(), '" . ROOM_STATUS_NORMAL . "')");
	101	return getLastInsertId();
	102	}
	103	else
	104	return 0;
	105	break;
	106	case 'delete':
	107	$sQuery = "UPDATE `" . MODULE_DB_PREFIX . "Rooms` SET `When`=UNIX_TIMESTAMP(), `Status`='" . ROOM_STATUS_DELETE . "' WHERE `ID` = '" . $iRoomId . "'";
	108	getResult($sQuery);
	109	break;
	110	}
94	111	}
95	112

Navigation

Changeset 14

Legend:

Download in other formats: