Produced by Araxis Merge on Mon May 18 06:28:30 2009 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | D:\Dolphin-v.6.1.5\modules | phpmc.aemod | Thu Apr 23 04:12:46 2009 UTC |
2 | Mon May 18 06:28:30 2009 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 0 | 0 |
Changed | 0 | 0 |
Inserted | 0 | 0 |
Removed | 1 | 1 |
Whitespace | All differences in whitespace within lines are ignored |
---|---|
Character case | Differences in character case are ignored |
Line endings | Differences in line endings (CR and LF characters) are significant |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | INSERT INT O `Modules ` VALUES ( '', 'phpmc ', 'global $mods;\r\ n\r\n/**\r \n* ''Mod uleDirecto ry''\r\n* Specif ies name o f director y, where c hat is loc ated\r\n* (string)\r \n*/\r\n\r \n$mods['' phpmc''][' 'ModuleDir ectory''] = ''chat/' ';', '/**\ r\n* FuncU pdate proc edure for phpMyChat\ r\n* \r\n* @param string $UserIde ntifier me mber ID or admin nam e (depend on $IsAdmi n paramete r)\r\n* \r \n* @param bo olean $IsA dmin Defines whether us er is a si mple membe r or admin \r\n*/\r\n \r\nglobal $dir;\r\n global $mo ds;\r\nglo bal $site; \r\nglobal $PHPBIN;\ r\nglobal $prof; // If prof.in c.php was included a lready\r\n \r\nrequir e_once($di r[''inc''] .''prof.in c.php''); // To retr eive count ry name\r\ n\r\n$comm andLineArg s = new CC ommandLine Args;\r\n\ r\n$comman dLineArgs- >AddArgume nt(''updat e''); //Ac tion\r\n\r \nif ($IsA dmin)\r\n{ \r\n // $UserId entifier i s interpre ted as an admin name \r\n $adm inInfo = d b_arr("SEL ECT `Name` ,\r\n `Passwor d`\r\n F ROM Admins \r\n WHERE ` Name` = '' ".$UserIde ntifier."' '");\r\n\r \n if (! $admin Info)\r\n {\r\n mo dules_err( "FuncUpdat e error: U nknown adm in ID [{$U serIdentif ier}]");\r \n }\ r\n\r\n $comma ndLineArgs ->AddArgum ent($admin Info[''Nam e'']);\r\n $c ommandLine Args->AddA rgument($a dminInfo[' 'Password' ']);\r\n \r\n $c ommandLine Args->AddA rgument(_t (''_Dolphi n Administ rator'')); // Real n ame\r\n $c ommandLine Args->AddA rgument('' ''); // Co untry\r\n $comma ndLineArgs ->AddArgum ent($site[ ''url'']); // URL (s ite addres s)\r\n $comma ndLineArgs ->AddArgum ent($site[ ''email''] ); // E-ma il\r\n $c ommandLine Args->AddA rgument(1) ; // Show email\r\n $comma ndLineArgs ->AddArgum ent(2); // Sex (unde fined)\r\n }\r\nelse \r\n{\r\n // $Us erIdentifi er is inte rpreted as a profile ID\r\n $UserIdent ifier = (i nt)$UserId entifier;\ r\n \r \n $use rInfo = db _arr("SELE CT `NickNa me`, \r\n `Pass word`, \r\ n `Em ail`, \r\n ` RealName`, \r\n `Country` ,\r\n `Sex` \r\ n FROM `Pr ofiles`\r\ n WHER E `ID` = { $UserIdent ifier}");\ r\n\r\n if (! $userInfo) \r\n {\ r\n module s_err("Fun cUpdate er ror: Unkno wn user ID [{$UserId entifier}] ");\r\n }\r\n\ r\n $commandLi neArgs->Ad dArgument( $userInfo[ ''NickName '']);\r\n $comma ndLineArgs ->AddArgum ent($userI nfo[''Pass word'']);\ r\n $c ommandLine Args->AddA rgument($u serInfo['' RealName'' ]); \r\n $command LineArgs-> AddArgumen t($prof['' countries' '][$userIn fo[''Count ry'']]);\r \n $commandLi neArgs->Ad dArgument( $site[''ur l''].''pro file.cmd.p hp?ID=''.$ UserIdenti fier); // set user U RL as path of profil e view pag e\r\n $com mandLineAr gs->AddArg ument($use rInfo[''Em ail'']);\r \n $commandLi neArgs->Ad dArgument( ! (bool)ge tParam(''a non_mode'' )); // set ''Show em ail'' agai nst of ano nymouse mo de\r\n $commandLi neArgs->Ad dArgument( $userInfo[ ''Sex'']); \r\n }\r\n\r\n$ commandLin eArgs->Add Argument(( int)$IsAdm in);\r\n\r \nif (chdi r($dir[''r oot''] . $ mods[''php mc''][''Ch atDirector y'']))\r\n {\r\n $scriptRet urnValue = ''value_w as_not_set '';\r\n ex ec("{$PHPB IN} -f php mc_registe r.cmd.php ".$command LineArgs-> GetCommand Line(), $s criptOutpu t, $script ReturnValu e);\r\n if ($scriptR eturnValue !== 0)\r\ n {\ r\n echo " phpmc_regi ster.cmd.p hp output: <br /> \\ n";\r\n fo reach ($sc riptOutput as $outpu tLine)\r\n {\r\n ec ho $output Line.''<br />\\n'';\ r\n }\r\ n echo ''- ---------- ---------- ---------- ---------- - <br /><b r />'';\r\ n modules_ err("FuncU pdate(): e xec({$PHPB IN} -f php mc_registe r.cmd.php ".$command LineArgs-> GetCommand Line().") returned " .$scriptRe turnValue) ;\r\n } \r\n}\r\ nelse \r\n {\r\n modu les_err("F uncUpdate( ): chdir({ $dir[''roo t'']}{$mod s[''phpmc' '][''ChatD irectory'' ]} returne d false"); \r\n}', '/ **\r\n* Fu ncDel proc edure for phpMyChat\ r\n* \r\n* @param string $UserIdent ifier memb er ID or a dmin name (depend on $IsAdmin parameter) \r\n* \r\n * @param bool ean $IsAdm in Defines wh ether user is a simp le member or admin\r \n*/\r\n\r \nglobal $ dir;\r\ngl obal $mods ;\r\ngloba l $site;\r \nglobal $ PHPBIN;\r\ n\r\n$comm andLineArg s = new CC ommandLine Args;\r\n\ r\n$comman dLineArgs- >AddArgume nt(''delet e''); //Ac tion\r\n\r \nif ($IsA dmin)\r\n{ \r\n // $User Identifier is interp reted as a n admin na me\r\n $a dminInfo = db_arr("S ELECT `Nam e`\r\n F ROM Admins \r\n WHERE ` Name` = '' ".$UserIde ntifier."' '");\r\n if (! $adm inInfo)\r\ n {\r\n modules_er r("FuncUpd ate error: Unknown a dmin ID [{ $UserIdent ifier}]"); \r\n }\r\n\r\n $com mandLineAr gs->AddArg ument($adm inInfo[''N ame'']);\r \n}\r\nels e \r\n{\r\ n // $ UserIdenti fier is in terpreted as a profi le ID\r\n $UserIde ntifier = (int)$User Identifier ;\r\n \r\n $u serInfo = db_arr("SE LECT `Nick Name` \r\n FROM `Profiles `\r\n WHERE `ID` = {$UserI dentifier} ");\r\n if (! $use rInfo)\r\n {\r\n modules_er r("FuncUpd ate error: Unknown u ser ID [{$ UserIdenti fier}]");\ r\n }\r\n\r\n $com mandLineAr gs->AddArg ument($use rInfo[''Ni ckName'']) ;\r\n}\r\n \r\nif (ch dir($dir[' 'root''] . $mods[''p hpmc'']['' ChatDirect ory'']))\r \n{\r\n $scriptRet urnValue = ''value_w as_not_set '';\r\n ex ec("{$PHPB IN} -f php mc_registe r.cmd.php ".$command LineArgs-> GetCommand Line(), $s criptOutpu t, $script ReturnValu e);\r\n if ($scriptR eturnValue !== 0)\r\ n {\ r\n echo " phpmc_regi ster.cmd.p hp output: <br /> \\ n";\r\n fo reach ($sc riptOutput as $outpu tLine)\r\n {\r\n ec ho $output Line.''<br />\\n'';\ r\n }\r\ n echo ''- ---------- ---------- ---------- ---------- - <br /><b r />'';\r\ n modules_ err("FuncU pdate(): e xec({$PHPB IN} -f php mc_registe r.cmd.php ".$command LineArgs-> GetCommand Line().") returned " .$scriptRe turnValue) ;\r\n } \r\n}\r\ nelse \r\n {\r\n modu les_err("F uncUpdate( ): chdir({ $dir[''roo t'']}{$mod s[''phpmc' '][''ChatD irectory'' ]} returne d false"); \r\n}', '/ **\r\n* Fu ncUpdate p rocedure f or phpMyCh at\r\n* \r \n* @param string $UserIdent ifier memb er ID or a dmin name (depend on $IsAdmin parameter) \r\n* \r\n * @param bool ean $IsAdm in Defines wh ether user is a simp le member or admin\r \n*/\r\n\r \nglobal $ dir;\r\ngl obal $mods ;\r\ngloba l $site;\r \nglobal $ PHPBIN;\r\ nglobal $p rof; // If prof.inc. php was in cluded alr eady\r\n\r \nrequire_ once($dir[ ''inc''].' 'prof.inc. php''); // To retrei ve country name\r\n\ r\n$comman dLineArgs = new CCom mandLineAr gs;\r\n\r\ n$commandL ineArgs->A ddArgument (''update' '); //Acti on\r\n\r\n if ($IsAdm in)\r\n{ \r\n // $UserIden tifier is interprete d as an ad min name\r \n $admin Info = db_ arr("SELEC T `Name`,\ r\n `Password` \r\n FRO M Admins\r \n WHERE `Na me` = ''". $UserIdent ifier."''" );\r\n\r\n if ( ! $adminIn fo)\r\n {\r\n modu les_err("F uncUpdate error: Unk nown admin ID [{$Use rIdentifie r}]");\r\n }\r\ n\r\n $command LineArgs-> AddArgumen t($adminIn fo[''Name' ']);\r\n $com mandLineAr gs->AddArg ument($adm inInfo[''P assword''] );\r\n \r \n $com mandLineAr gs->AddArg ument(_t(' '_aeDating Administr ator'')); // Real na me\r\n $comma ndLineArgs ->AddArgum ent(''''); // Countr y\r\n $commandLi neArgs->Ad dArgument( $site[''ur l'']); // URL (site address)\r \n $commandLi neArgs->Ad dArgument( $site[''em ail'']); / / E-mail\r \n $comma ndLineArgs ->AddArgum ent(1); // Show emai l\r\n $commandLi neArgs->Ad dArgument( 2); // Sex (undefine d)\r\n}\r\ nelse \r\n {\r\n // $UserId entifier i s interpre ted as a p rofile ID\ r\n $Use rIdentifie r = (int)$ UserIdenti fier;\r\n \r\n $userInf o = db_arr ("SELECT ` NickName`, \r\n `Password `, \r\n `Email` , \r\n `Real Name`,\r\n `Co untry`,\r\ n ` Sex` \r\n FR OM `Profil es`\r\n WHERE `I D` = {$Use rIdentifie r}");\r\n\ r\n if (! $use rInfo)\r\n {\r\n modules_er r("FuncUpd ate error: Unknown u ser ID [{$ UserIdenti fier}]");\ r\n }\r\n\r\n $com mandLineAr gs->AddArg ument($use rInfo[''Ni ckName'']) ;\r\n $commandLi neArgs->Ad dArgument( $userInfo[ ''Password '']);\r\n $comma ndLineArgs ->AddArgum ent($userI nfo[''Real Name'']); \r\n $c ommandLine Args->AddA rgument($p rof[''coun tries''][$ userInfo[' 'Country'' ]]);\r\n $com mandLineAr gs->AddArg ument($sit e[''url''] .''profile .cmd.php?I D=''.$User Identifier ); // set user URL a s path of profile vi ew page\r\ n $command LineArgs-> AddArgumen t($userInf o[''Email' ']);\r\n $com mandLineAr gs->AddArg ument(! (b ool)getPar am(''anon_ mode'')); // set ''S how email' ' against of anonymo use mode\r \n $com mandLineAr gs->AddArg ument($use rInfo[''Se x'']); \r\n}\r\ n\r\n$comm andLineArg s->AddArgu ment((int) $IsAdmin); \r\n\r\nif (chdir($d ir[''root' '] . $mods [''phpmc'' ][''ChatDi rectory''] ))\r\n{\r\ n $scr iptReturnV alue = ''v alue_was_n ot_set'';\ r\n exec(" {$PHPBIN} -f phpmc_r egister.cm d.php ".$c ommandLine Args->GetC ommandLine (), $scrip tOutput, $ scriptRetu rnValue);\ r\n if ($s criptRetur nValue !== 0)\r\n {\r\n echo "phpm c_register .cmd.php o utput: <br /> \\n";\ r\n foreac h ($script Output as $outputLin e)\r\n {\r\n echo $ outputLine .''<br />\ \n'';\r\n }\r\n ec ho ''----- ---------- ---------- ---------- ------- <b r /><br /> '';\r\n mo dules_err( "FuncUpdat e(): exec( {$PHPBIN} -f phpmc_r egister.cm d.php ".$c ommandLine Args->GetC ommandLine ().") retu rned ".$sc riptReturn Value);\r\ n } \r \n}\r\nels e \r\n{\r\ n modules_ err("FuncU pdate(): c hdir({$dir [''root''] }{$mods['' phpmc''][' 'ChatDirec tory'']} r eturned fa lse");\r\n }', '/**\r \n* FuncBl ock proced ure for ph pMyChat\r\ n* \r\n* @ param st ring $Use rIdentifie r member I D or admin name (dep end on $Is Admin para meter)\r\n */\r\n\r\n global $di r;\r\nglob al $mods;\ r\nglobal $site;\r\n global $PH PBIN;\r\n\ r\n$comman dLineArgs = new CCom mandLineAr gs;\r\n\r\ n$commandL ineArgs->A ddArgument (''block'' ); // acti on\r\n\r\n // $UserId entifier i s interpre ted as a p rofile ID\ r\n$UserId entifier = (int)$Use rIdentifie r;\r\n \r\n$u serInfo = db_arr("SE LECT `Nick Name`\r\n FROM ` Profiles`\ r\n WHERE `ID` = {$UserI dentifier} ");\r\nif (! $userIn fo)\r\n{\r \n module s_err("Fun cBlock err or: Unknow n user ID [{$UserIde ntifier}]" );\r\n}\r\ n\r\n$comm andLineArg s->AddArgu ment($user Info[''Nic kName'']); \r\n\r\nif (chdir($d ir[''root' '] . $mods [''phpmc'' ][''ChatDi rectory''] ))\r\n{\r\ n $s criptRetur nValue = ' 'value_was _not_set'' ; \r\n exec(" {$PHPBIN} -f phpmc_b lock.cmd.p hp ".$comm andLineArg s->GetComm andLine(), $scriptOu tput, $scr iptReturnV alue);\r\n if ($s criptRetur nValue !== 0)\r\n {\r\n echo "phpm c_block.cm d.php outp ut: <br /> \\n";\r\n foreac h ($script Output as $outputLin e)\r\n {\r\n echo $ outputLine .''<br />\ \n'';\r\n }\r\n ec ho ''----- ---------- ---------- ---------- ------- <b r /><br /> '';\r\n mo dules_err( "FuncBlock (): exec({ $PHPBIN}-f phpmc_blo ck.cmd.php ".$comman dLineArgs- >GetComman dLine().") returned ".$scriptR eturnValue );\r\n }\r\n}\r \nelse \r\ n{\r\n module s_err("Fun cBlock(): chdir({$di r[''root'' ]}{$mods[' 'phpmc''][ ''ChatDire ctory'']} returned f alse");\r\ n}', '/**\ r\n* FuncU nblock pro cedure for phpMyChat \r\n* \r\n * @param string $U serIdentif ier member ID or adm in name (d epend on $ IsAdmin pa rameter)\r \n*/\r\n\r \nglobal $ dir;\r\ngl obal $mods ;\r\ngloba l $site;\r \nglobal $ PHPBIN;\r\ n\r\n$comm andLineArg s = new CC ommandLine Args;\r\n\ r\n$comman dLineArgs- >AddArgume nt(''unblo ck''); // action\r\n \r\n// $Us erIdentifi er is inte rpreted as a profile ID\r\n$Us erIdentifi er = (int) $UserIdent ifier;\r\n \r\n $userInfo = db_arr(" SELECT `Ni ckName`\r\ n FROM `Profiles `\r\n WHERE `I D` = {$Use rIdentifie r}");\r\ni f (! $user Info)\r\n{ \r\n modu les_err("F uncUnblock error: Un known user ID [{$Use rIdentifie r}]");\r\n }\r\n\r\n$ commandLin eArgs->Add Argument($ userInfo[' 'NickName' ']);\r\n\r \nif (chdi r($dir[''r oot''] . $ mods[''php mc''][''Ch atDirector y'']))\r\n {\r\n $scriptRet urnValue = ''value_w as_not_set ''; \r \n exec ("{$PHPBIN } -f phpmc _block.cmd .php ".$co mmandLineA rgs->GetCo mmandLine( ), $script Output, $s criptRetur nValue);\r \n if ( $scriptRet urnValue ! == 0)\r\n {\r\ n echo "ph pmc_block. cmd.php ou tput: <br /> \\n";\r \n fore ach ($scri ptOutput a s $outputL ine)\r\n {\r\n echo $outputLi ne.''<br / >\\n'';\r\ n }\r\n echo ''--- ---------- ---------- ---------- --------- <br /><br />'';\r\n modules_er r("FuncUnb lock(): ex ec({$PHPBI N} -f phpm c_block.cm d.php ".$c ommandLine Args->GetC ommandLine ().") retu rned ".$sc riptReturn Value);\r\ n } \r\n}\r\ne lse \r\n{\ r\n module s_err("Fun cUnblock() : chdir({$ dir[''root '']}{$mods [''phpmc'' ][''ChatDi rectory''] } returned false");\ r\n}', '', 'global $ mods;\r\n\ r\n$POSTPa rams = arr ay();\r\n$ userData = array();\ r\n\r\nif ($IsAdmin) \r\n{\r\n // $UserId entifier i s interpre ted as an admin name \r\n $arr Admin = db _arr("SELE CT `Name`, \r\n `Passwor d`\r\n F ROM `Admin s`\r\n WHERE ` Name` = '' ".addslash es($UserId entifier). "''");\r\n if ( ! $arrAdmi n)\r\n {\r\n modu les_err("F uncLogin e rror: Unkn own admin name ''{$U serIdentif ier}''");\ r\n }\r\ n \r\n $POSTPar ams[''AUTH _USERNAME' '] = $arrA dmin[''Nam e''];\r\n $POS TParams['' AUTH_PASSW ORD''] = $ arrAdmin[' 'Password' '];\r\n \r\n Re direct($mo ds[''phpmc ''][''Chat Directory' '].''admin .php3'', $ POSTParams , "post"); \r\n}\r\ne lse \r\n{\ r\n // $UserId entifier i s interpre ted as a p rofile ID\ r\n $arr Member = d b_arr("SEL ECT `NickN ame`,\r\n `Password `\r\n FROM `Profiles `\r\n WHERE `ID` = ".(int) $UserIdent ifier);\r\ n if (! $arrMe mber)\r\n {\r\n mo dules_err( "FuncLogin error: Un known user ID [{$Use rIdentifie r}]");\r\n }\ r\n \r\n $POSTPar ams[''U''] = $arrMem ber[''Nick Name''];\r \n $P OSTParams[ ''PASSWORD ''] = $arr Member[''P assword''] ;\r\n $POSTPar ams[''Form _Send''] = 1;\r\n $POSTPar ams[''N''] = 20;\r\n \r\n Redirect ($mods[''p hpmc'']['' ChatDirect ory''].''i ndex.php3' ', $POSTPa rams, "pos t");\r\n}\ r\n', 'cha t', 'phpMy Chat'); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2007 Araxis Ltd (www.araxis.com). All rights reserved.