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 | vbull.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 ( '', 'vbull ', 'global $mods;\r\ n\r\n/**\r \n* ''Mod uleDirecto ry''\r\n* Specif ies name o f director y, where f orum is lo cated\r\n* (s tring)\r\n */\r\n\r\n $mods[''vb ull''][''M oduleDirec tory''] = ''forum/'' ;\r\n\r\n\ r\n// Misc elleneous settings\r \n\r\n/** \r\n* ''C ookieMembe r''\r\n* Whether or not to se nd cookies when logi n\r\n* (b oolean)\r\ n*/\r\n$mo ds[''vbull ''][''Cook ieMember'' ] = false; \r\n\r\n/* * \r\n* ' 'RedirectM ethod''\r\ n* Defines me thod of re directing after logi n procedur e.\r\n* (enum) \r\n* Possible v alues:\r\n * ''SendHe ader'' - f ast redire ct, thru s ending ''L ocation... '' header\ r\n* ''SubmitFo rm'' - red irect thru submittin g of the f orm. Greet ing messag e is displ ayed\r\n*/ \r\n$mods[ ''vbull''] [''Redirec tMethod''] = ''Submi tForm'';\r \n\r\n/**\ r\n* ''Sh owEMail''\ r\n* Whether or not to show e-mai ls to all members. B y default depends on aeDating ''Anonymou s mode'' g lobal sett ing.\r\n* (boolean )\r\n*/\r\ n$mods[''v bull'']['' ShowEMail' '] = ! (bo ol)getPara m(''anon_m ode'');\r\ n\r\n/**\r \n* ''Rec eiveMailFr omAdmin''\ r\n* Wh ether or n ot to forc e members receive e- mails from forum adm inistrator \r\n* (b oolean)\r\ n*/\r\n$mo ds[''vbull ''][''Rece iveMailFro mAdmin''] = 1;\r\n\r \n \r\n// The following is the def ault membe r data: da ta that ca nnot be ex tracted fr om aeDatin g profile and will b e set only \r\n// once: on member registrati on. During further u pdates thi s data wil l not be c hanged to prevent me mber own d ata loss. \r\n\r \n/** \r\n* ''S howBirthda y''\r\n* Whether or not to show membe r birthday to all me mbers\r\n* (boo lean)\r\n* /\r\n$mods [''vbull'' ][''ShowBi rthday''] = 1;\r\n\r \n/**\r\n* ''DSTMod e''\r\n* Defines Daylight S aving Time mode\r\n* (enum)\r \n* Po ssible val ues:\r\n* 0 - DST co rrections always off \r\n* 1 - DST corr ections al ways on\r\ n* 2 - Automatica lly detect DST setti ngs\r\n*/\ r\n$mods[' 'vbull''][ ''DSTMode' '] = 2;\r\ n\r\n/**\r \n* ''Tim eZoneOffse t''\r\n* Define s time zon e offset\r \n* (enu m)\r\n* Possible values:\r \n* -12 - GMT -1 2:00\r\n* ...\r\ n* 0 - GM T \r\n* ...\r\n* 12 - GMT +1 2:00\r\n*/ \r\n$mods[ ''vbull''] [''TimeZon eOffset''] = 0;', '/ **\n* Func Add proced ure for vB ulletin mo dule\n* \n * @param string $U serIdentif ier member ID or adm in name (d epend on $ IsAdmin pa rameter)\n * \n* @par am bool ean $IsAdm in Defines wh ether user is a simp le member or admin\n */\n\n/* I f you modi fy this fu nction, do not forge t to modif y FuncUpda te in same way (thes e function s are almo st equal) */\n\nglob al $dir;\n global $mo ds;\ngloba l $site;\n global $PH PBIN;\n\n$ CommandLin eArgs = ne w CCommand LineArgs;\ n\n$Comman dLineArgs- >AddArgume nt(''add'' ); // Acti on\n$Comma ndLineArgs ->AddArgum ent((int)$ IsAdmin);\ n\nif ($Is Admin)\n{ \n // $UserIden tifier is interprete d as an ad min name\n $Admin Info = db_ arr("SELEC T `Name`,\ n `Password` \n FRO M Admins\n WHERE ` Name` = '' ".$UserIde ntifier."' '");\n\n if (! $Adm inInfo)\n {\n modules_er r("FuncAdd error: Un known admi n ID [{$Us erIdentifi er}]");\n }\n\n $CommandLi neArgs->Ad dArgument( $AdminInfo [''Name''] );\n $Com mandLineAr gs->AddArg ument($Adm inInfo[''P assword''] );\n $CommandLi neArgs->Ad dArgument( $site[''em ail'']);\n \n // F ill dummy data\n $CommandLi neArgs->Ad dArgument( 2000); // BirthYear\ n $Com mandLineAr gs->AddArg ument(1); // BirthMo nth\n $Command LineArgs-> AddArgumen t(1); // B irthDay\n $CommandLi neArgs->Ad dArgument( ''''); // AvatarImag ePath (no avatar)\n $Command LineArgs-> AddArgumen t(_t(''_Do lphin Admi nistrator' '));\n}\ne lse \n{\n // $User Identifier is interp reted as a profile I D\n $U serIdentif ier = (int )$UserIden tifier;\n \n $UserI nfo = db_a rr("SELECT `NickName `, \n `Passwo rd`, \n `Emai l`, \n Y EAR(`DateO fBirth`) A S `BirthYe ar`, \n MONTH (`DateOfBi rth`) AS ` BirthMonth `, \n DAYOFMONT H(`DateOfB irth`) AS `BirthDay` ,\n `Pic _0_addon` AS `Avatar ImagePath` \n FROM P rofiles\n WHERE `ID` = {$UserI dentifier} ");\n\n if (! $Use rInfo)\n modules_ err("FuncA dd error: Unknown us er ID [{$U serIdentif ier}]");\n \n $Comma ndLineArgs ->AddArgum ent($UserI nfo[''Nick Name'']);\ n $C ommandLine Args->AddA rgument($U serInfo['' Password'' ]);\n $Command LineArgs-> AddArgumen t($UserInf o[''Email' ']);\n $C ommandLine Args->AddA rgument($U serInfo['' BirthYear' ']);\n $Command LineArgs-> AddArgumen t($UserInf o[''BirthM onth'']);\ n $Com mandLineAr gs->AddArg ument($Use rInfo[''Bi rthDay'']) ;\n $CommandLi neArgs->Ad dArgument( $UserInfo[ ''AvatarIm agePath''] );\n\n // Set m embership name as us er group t itle\n $Membershi pInfo = ge tMemberMem bershipInf o($UserIde ntifier);\ n $Comma ndLineArgs ->AddArgum ent($Membe rshipInfo[ ''Name'']) ; \n }\n\n$Comm andLineArg s->AddArgu ment($mods [''vbull'' ][''ShowEM ail'']);\n $CommandLi neArgs->Ad dArgument( $mods[''vb ull''][''R eceiveMail FromAdmin' ']);\n$Com mandLineAr gs->AddArg ument($mod s[''vbull' '][''ShowB irthday''] );\n$Comma ndLineArgs ->AddArgum ent($mods[ ''vbull''] [''DSTMode '']);\n$Co mmandLineA rgs->AddAr gument($mo ds[''vbull ''][''Time ZoneOffset '']);\n\ni f (chdir($ dir[''root ''] . $mod s[''vbull' '][''Modul eDirectory '']))\n{\n $scriptR eturnValue = ''value was not s et'';\n exec("{$PH PBIN} -f v bregister. php ".$Com mandLineAr gs->GetCom mandLine() , $scriptO utput, $sc riptReturn Value);\n if ($scr iptReturnV alue !== 0 )\n {\n echo "--- script out put dump - -- <br />\ \n";\n fore ach ($scri ptOutput a s $outputL ine)\n {\n echo $outputLi ne.''<br / >'';\n } \n ec ho "--- en d --- <br />\\n";\n mo dules_err( "FuncAdd() : exec({$P HPBIN} -f vbregister .php ".$Co mmandLineA rgs->GetCo mmandLine( ).") retur ned ".$scr iptReturnV alue);\n } \n}\nels e \n{\n mo dules_err( "FuncAdd() : chdir({$ dir[''root '']}{$mods [''vbull'' ][''Module Directory' ']} return ed false") ;\n}', '/* * * FuncDe l procedur e for vBul letin modu le * * @p aram stri ng $UserI dentifier member ID */ global $dir; glo bal $mods; global $P HPBIN; $C ommandLine Args = new CCommandL ineArgs; $CommandLi neArgs->Ad dArgument( ''delete'' ); // Acti on $Comman dLineArgs- >AddArgume nt((int)$I sAdmin); if ($IsAdm in) { // $Us erIdentifi er is inte rpreted as an admin name $AdminInfo = db_arr( "SELECT * FROM `A dmins` W HERE `Name ` = ''{$Us erIdentifi er}''"); if ( ! $AdminIn fo) mo dules_err( "FuncDel e rror: Unkn own admin (''{$UserI dentifier} '')"); $Com mandLineAr gs->AddArg ument($Use rIdentifie r); } else { // $UserId entifier i s interpre ted as a p rofile ID $Use rIdentifie r = (int)$ UserIdenti fier; $UserInf o = db_arr ("SELECT ` NickName` FR OM `Profil es` WHERE `I D` = ''{$U serIdentif ier}''"); if (! $Use rInfo) modules_ err("FuncD el error: Unknown us er ID [{$U serIdentif ier}]"); $Command LineArgs-> AddArgumen t($UserInf o[''NickNa me'']); } if (chdi r($dir[''r oot''] . $ mods[''vbu ll''][''Mo duleDirect ory''])) { $s criptRetur nValue = ' 'value was not set'' ; exec ("{$PHPBIN } -f vbreg ister.php ".$Command LineArgs-> GetCommand Line(), $s criptOutpu t, $script ReturnValu e); if ($scriptR eturnValue !== 0) { echo "--- scri pt output dump --- < br />\\n"; foreach ($scriptOu tput as $o utputLine) { echo $ outputLine .''<br />' '; } echo "--- end --- <br /> \\n"; modu les_err("F uncDel(): exec({$PHP BIN} -f vb register.p hp ".$Comm andLineArg s->GetComm andLine(). ") returne d ".$scrip tReturnVal ue); } } else { modu les_err("F uncDel(): chdir({$di r[''root'' ]}{$mods[' 'vbull''][ ''ModuleDi rectory''] } returned false"); } ', '\n/* *\n* FuncU pdate proc edure for vBulletin module\n* \n* @param string $UserIdent ifier memb er ID or a dmin name (depend on $IsAdmin parameter) \n* \n* @p aram bo olean $IsA dmin Defines whether us er is a si mple membe r or admin \n*/\n\n/* If you mo dify this function, do not for get to mod ify FuncAd d in same way (these functions are almos t equal) * /\n\ngloba l $dir;\ng lobal $mod s;\nglobal $site;\ng lobal $PHP BIN;\n\n$C ommandLine Args = new CCommandL ineArgs;\n \n$Command LineArgs-> AddArgumen t(''update ''); // Ac tion\n$Com mandLineAr gs->AddArg ument((int )$IsAdmin) ;\n\nif ($ IsAdmin)\n { \n // $UserId entifier i s interpre ted as an admin name \n $Adm inInfo = d b_arr("SEL ECT `Name` ,\n `Passwor d`\n F ROM Admins \n WHERE `Name` = ''".$UserI dentifier. "''");\n\n if (! $A dminInfo)\ n {\n modules_ err("FuncU pdate erro r: Unknown admin ID [{$UserIde ntifier}]" );\n }\n\n $CommandLi neArgs->Ad dArgument( $AdminInfo [''Name''] );\n $Com mandLineAr gs->AddArg ument($Adm inInfo[''P assword''] );\n $CommandLi neArgs->Ad dArgument( $site[''em ail'']);\n \n // F ill dummy data\n $CommandLi neArgs->Ad dArgument( 2000); // BirthYear\ n $Com mandLineAr gs->AddArg ument(1); // BirthMo nth\n $Command LineArgs-> AddArgumen t(1); // B irthDay\n $CommandLi neArgs->Ad dArgument( ''''); // AvatarImag ePath (no avatar)\n $Command LineArgs-> AddArgumen t(_t(''_ae Dating Adm inistrator ''));\n}\n else \n{\n // $User Identifier is interp reted as a profile I D\n $U serIdentif ier = (int )$UserIden tifier;\n \n $UserI nfo = db_a rr("SELECT `NickName `, \n `Passwo rd`, \n `Emai l`, \n Y EAR(`DateO fBirth`) A S `BirthYe ar`, \n MONTH (`DateOfBi rth`) AS ` BirthMonth `, \n DAYOFMONT H(`DateOfB irth`) AS `BirthDay` ,\n `Pic _0_addon` AS `Avatar ImagePath` \n FROM P rofiles\n WHERE `ID` = {$UserI dentifier} ");\n\n if (! $Use rInfo)\n modules_ err("FuncU pdate erro r: Unknown user ID [ {$UserIden tifier}]") ;\n\n $Command LineArgs-> AddArgumen t($UserInf o[''NickNa me'']);\n $Com mandLineAr gs->AddArg ument($Use rInfo[''Pa ssword'']) ;\n $CommandLi neArgs->Ad dArgument( $UserInfo[ ''Email''] );\n $Com mandLineAr gs->AddArg ument($Use rInfo[''Bi rthYear''] );\n $CommandLi neArgs->Ad dArgument( $UserInfo[ ''BirthMon th'']);\n $Comma ndLineArgs ->AddArgum ent($UserI nfo[''Birt hDay'']);\ n $C ommandLine Args->AddA rgument($U serInfo['' AvatarImag ePath'']); \n\n // Set mem bership na me as user group tit le\n $M embershipI nfo = getM emberMembe rshipInfo( $UserIdent ifier);\n $Command LineArgs-> AddArgumen t($Members hipInfo['' Name'']); \n}\ n\n$Comman dLineArgs- >AddArgume nt($mods[' 'vbull''][ ''ShowEMai l'']);\n$C ommandLine Args->AddA rgument($m ods[''vbul l''][''Rec eiveMailFr omAdmin''] );\n$Comma ndLineArgs ->AddArgum ent($mods[ ''vbull''] [''ShowBir thday'']); \n$Command LineArgs-> AddArgumen t($mods['' vbull''][' 'DSTMode'' ]);\n$Comm andLineArg s->AddArgu ment($mods [''vbull'' ][''TimeZo neOffset'' ]);\n\nif (chdir($di r[''root'' ] . $mods[ ''vbull''] [''ModuleD irectory'' ]))\n{\n $scriptRet urnValue = ''value w as not set '';\n ex ec("{$PHPB IN} -f vbr egister.ph p ".$Comma ndLineArgs ->GetComma ndLine(), $scriptOut put, $scri ptReturnVa lue);\n if ($scrip tReturnVal ue !== 0)\ n {\n ec ho "--- sc ript outpu t dump --- <br />\\n ";\n foreac h ($script Output as $outputLin e)\n {\n echo $ outputLine .''<br />' ';\n } \n echo "--- end --- <br /> \\n";\n modu les_err("F uncUpdate( ): exec({$ PHPBIN} -f vbregiste r.php ".$C ommandLine Args->GetC ommandLine ().") retu rned ".$sc riptReturn Value);\n } \n}\nelse \n{\n modu les_err("F uncUpdate( ): chdir({ $dir[''roo t'']}{$mod s[''vbull' '][''Modul eDirectory '']} retur ned false" );\n}', '/ **\n* Func Block proc edure for vBulletin module\n* \n* @param string $UserIdent ifier memb er ID\n*/\ n\nglobal $mods;\ngl obal $dir; \nglobal $ PHPBIN;\n\ n$CommandL ineArgs = new CComma ndLineArgs ;\n\n$Comm andLineArg s->AddArgu ment(''blo ck''); // Action\n\n $UserInfo = db_arr(" SELECT `Ni ckName`\n FROM Profiles\ n WHERE `ID` = ".( int)$UserI dentifier) ;\nif (! $ UserInfo)\ n{\n mo dules_err( "FuncBlock error: Un known user ID [{$Use rIdentifie r}]");\n}\ n\n$Comman dLineArgs- >AddArgume nt($UserIn fo[''NickN ame'']); \n\n$C ommandLine Args->AddA rgument(_t (''_You ha ve been bl ocked by a eDating'') ); // Reas on of bloc king\n$Com mandLineAr gs->AddArg ument(_t(' '_Blocked by aeDatin g'')); // Usergroup title\n\ni f (chdir($ dir[''root ''] . $mod s[''vbull' '][''Modul eDirectory '']))\n{\n $s criptRetur nValue = ' 'value was not set'' ;\n exec ("{$PHPBIN } -f vbblo ck.php ".$ CommandLin eArgs->Get CommandLin e(), $scri ptOutput, $scriptRet urnValue); \n if ($scriptR eturnValue !== 0)\n {\n echo "--- scri pt output dump --- < br />\\n"; \n foreach ($scriptOu tput as $o utputLine) \n {\ n echo $ou tputLine.' '<br />''; \n } \n echo " --- end -- - <br />\\ n";\n module s_err("Fun cBlock(): exec({$PHP BIN} -f vb block.php ".$Command LineArgs-> GetCommand Line().") returned " .$scriptRe turnValue) ;\n } \n }\nelse \n {\n module s_err("Fun cBlock(): chdir({$di r[''root'' ]}{$mods[' 'vbull''][ ''ModuleDi rectory''] } returned false");\ n}', '/**\ n* FuncUnb lock proce dure for v Bulletin m odule\n* \ n* @param string $U serIdentif ier member ID\n*/\n\ nglobal $m ods;\nglob al $dir;\n global $PH PBIN;\n\n$ CommandLin eArgs = ne w CCommand LineArgs;\ n\n$Comman dLineArgs- >AddArgume nt(''unblo ck''); // Action\n\n $UserInfo = db_arr(" SELECT `Ni ckName`\n FROM P rofiles\n WHERE `I D` = ".(in t)$UserIde ntifier);\ nif (! $Us erInfo)\n{ \n modu les_err("F uncUnblock error: Un known user ID [{$Use rIdentifie r}]");\n}\ n\n$Comman dLineArgs- >AddArgume nt($UserIn fo[''NickN ame'']);\n \nif (chdi r($dir[''r oot''] . $ mods[''vbu ll''][''Mo duleDirect ory'']))\n {\n $scrip tReturnVal ue = ''val ue was not set'';\n exec("{$ PHPBIN} -f vbblock.p hp ".$Comm andLineArg s->GetComm andLine(), $scriptOu tput, $scr iptReturnV alue);\n if ($s criptRetur nValue !== 0)\n { \n ec ho "--- sc ript outpu t dump --- <br />\\n ";\n foreac h ($script Output as $outputLin e)\n {\n echo $ outputLine .''<br />' ';\n } \n echo "--- end --- <br /> \\n";\n modu les_err("F uncUnblock (): exec({ $PHPBIN} - f vbblock. php ".$Com mandLineAr gs->GetCom mandLine() .") return ed ".$scri ptReturnVa lue);\n }\n}\nel se \n{\n modu les_err("F uncUnblock (): chdir( {$dir[''ro ot'']}{$mo ds[''vbull ''][''Modu leDirector y'']}) ret urned fals e");\n}', '', '\n/** \n* FuncLo gin proced ure for vB ulletin mo dule\n* \n * @param string $U serIdentif ier member ID or adm in name (d epend on $ IsAdmin pa rameter)\n * \n* @par am bool ean $IsAdm in Defines wh ether user is a simp le member or admin\n */\n\nglob al $mods;\ n\n$POSTPa rams = arr ay();\n\ni f ($IsAdmi n)\n{\n // $UserId entifier i s interpre ted as an admin name \n $Adm inInfo = d b_arr("SEL ECT `Name` \n FRO M `Admins` \n WHERE `Na me` = ''{$ UserIdenti fier}''"); \n if (! $Admin Info)\n modules_er r("FuncAdd error: Un known admi n ID [{$Us erIdentifi er}]");\n $POSTPar ams[''User Identifier ''] = $Adm inInfo[''N ame''];\n} \nelse \n{ \n // $Us erIdentifi er is inte rpreted as a profile ID\n $UserInfo = db_arr(" SELECT `Ni ckName` \n FROM Profiles\ n WHERE `I D` = ".$Us erIdentifi er);\n if (! $U serInfo)\n module s_err("Fun cAdd error : Unknown user ID [{ $UserIdent ifier}]"); \n $POS TParams['' UserIdenti fier''] = $UserInfo[ ''NickName ''];\n}\n\ n$POSTPara ms[''Login Message''] = _t("_lo gged in fo rum as");\ n$POSTPara ms[''Confi g''] = $mo ds[''vbull ''];\n\nRe direct($mo ds[''vbull ''][''Modu leDirector y''].''vbl ogin.php'' , $POSTPar ams, "post ");\n', 'f orum', 'vB ulletin'); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2007 Araxis Ltd (www.araxis.com). All rights reserved.