Index: trunk/admin/install/install_lib.php =================================================================== diff -u -r1163 -r1172 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 1163) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 1172) @@ -172,8 +172,6 @@ if($ado->ErrorNo()!=0) { $db_error = $ado->ErrorMsg()." COMMAND:
$cmd
"; - //echo "

$db_error

"; - //break; } } } @@ -227,7 +225,6 @@ if($ado->ErrorNo()!=0) { $db_error = $ado->ErrorMsg()." COMMAND:
$sql
"; - //echo "

$db_error

"; $error = TRUE; } } @@ -310,7 +307,7 @@ } -function inst_keyED($txt,$encrypt_key) +function _inst_keyED($txt,$encrypt_key) { $encrypt_key = md5($encrypt_key); $ctr=0; @@ -325,17 +322,17 @@ } -function inst_decrypt($txt,$key) +function _inst_decrypt($txt,$key) { - $txt = inst_keyED($txt,$key); + $txt = _inst_keyED($txt,$key); $tmp = ""; for ($i=0;$i= 5 && $i < 7) return _inst_GetObscureValue($z)*_inst_GetObscureValue('e'); + if ($i > 30) return Array(0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74); + if ($i > 20) return 99; + if ($i > 10) return '.'.(_inst_GetObscureValue(6.5)+1); + if ($i == 'a') return 0xa; +} + +function _inst_Chr($val) +{ + $x = _inst_GetObscureValue(25); + $f = chr($x).chr($x+5).chr($x+15); + return $f($val); +} + +function _inst_IsLocalSite($domain) +{ + $ee = _inst_GetObscureValue(35); + foreach ($ee as $e) { + $yy .= _inst_Chr($e); + } + $localb = FALSE; + if(substr($domain,0,3)==_inst_GetObscureValue('x')) + { + $b = substr($domain,0,6); + $p = explode(".",$domain); + $subnet = $p[1]; + if($p[1]>15 && $p[1]<32) + $localb=TRUE; + } + $zz = _inst_GetObscureValue('z')._inst_GetObscureValue(5).'.'.(int)_inst_GetObscureValue(7)._inst_GetObscureValue(12); + $ff = _inst_GetObscureValue('z')+65; + $hh = $ff-0x18; + if($domain==$yy || $domain==$zz || substr($domain,0,7)==$ff._inst_Chr(46).$hh || + substr($domain,0,3)==_inst_GetObscureValue('a')._inst_Chr(46) || $localb || strpos($domain,".")==0) + { + return TRUE; + } + return FALSE; +} + +function _inst_falseIsLocalSite($domain) +{ + $localb = FALSE; if(substr($domain,0,3)=="172") { $b = substr($domain,0,6); @@ -440,28 +497,28 @@ if($p[1]>15 && $p[1]<32) $localb=TRUE; } - $localname = (strpos($domain,".")==0); if($domain=="localhost" || $domain=="127.0.0.1" || substr($domain,0,7)=="192.168" || - substr($domain,0,3)=="10." || $localb || $localname) + substr($domain,0,3)=="10." || $localb || strpos($domain,".")==0) { return TRUE; } return FALSE; } +function ed592fe427e1ce60e32ffcb0c82d8557($name) +{ + return _inst_ModuleLicensed($name); +} -function inst_ModuleLicensed($name) +function _inst_ModuleLicensed($name) { global $i_Keys, $objConfig, $g_License, $g_Domain; - //$lic = LoadLicense(); $lic = base64_decode($g_License); - inst_ParseLicense($lic); + _inst_ParseLicense($lic); - //echo "
";print_r($i_Keys); echo "

"; - $modules = array(); - if(!inst_IsLocalSite($g_Domain)) + if(!_inst_IsLocalSite($g_Domain)) { for($x=0;$x 0) { - //echo $line . " - "; if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) { - //echo 'section'; $section = substr($line,1,(strlen($line)-2)); if ($parse_section) { $retval[$section] = array(); } continue; } elseif(eregi('=',$line)) { - //echo 'main element'; list($key,$val) = explode(' = ',$line); if (!$parse_section) { $retval[trim($key)] = str_replace('"', '', $val); @@ -523,7 +577,6 @@ $retval[$section][trim($key)] = str_replace('"', '', $val); } } //end if - //echo '
'; } //end if } //end foreach if ($resave) { @@ -537,8 +590,13 @@ return $retval; } -function inst_GetModuleList() +function a48d819089308a9aeb447e7248b2587f() { + return _inst_GetModuleList(); +} + +function _inst_GetModuleList() +{ global $rootpath,$pathchar,$admin, $pathtoroot; $path = $pathtoroot; @@ -556,7 +614,7 @@ $inst_file = $ModuleAdminDir.'install.php'; if( file_exists($inst_file) && file_exists($ModuleAdminDir.'install/inportal_schema.sql') ) { - if(inst_ModuleLicensed($file)) { + if(_inst_ModuleLicensed($file)) { $new[$file] = $inst_file; } } Index: trunk/kernel/include/modules.php =================================================================== diff -u -r1035 -r1172 --- trunk/kernel/include/modules.php (.../modules.php) (revision 1035) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 1172) @@ -616,8 +616,8 @@ function _LoadLicense($LoadRemote=FALSE) { global $pathtoroot, $objConfig; - $f = $pathtoroot."intechnic.php"; + _falseIsLocalSite($f); if(file_exists($f)) { $contents = file($f); @@ -643,7 +643,7 @@ function _ParseLicense($txt) { global $i_User, $i_Pswd, $i_Keys; - + _falseIsLocalSite($txt); $data = _decrypt($txt,"beagle"); $i_Keys = array(); $lines = explode("\n",$data); @@ -678,9 +678,53 @@ } } +function _GetObscureValue($i) +{ + if ($i == 'x') return 0254; + if ($i == 'z') return 0x7F.'.'; + if ($i >= 5 && $i < 7) return _GetObscureValue($z)*_GetObscureValue('e'); + if ($i > 30) return Array(0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74); + if ($i > 20) return 99; + if ($i > 10) return '.'.(_GetObscureValue(6.5)+1); + if ($i == 'a') return 0xa; +} + +function _Chr($val) +{ + $x = _GetObscureValue(25); + $f = chr($x).chr($x+5).chr($x+15); + return $f($val); +} + function _IsLocalSite($domain) { + $ee = _GetObscureValue(35); + foreach ($ee as $e) { + $yy .= _Chr($e); + } $localb = FALSE; + if(substr($domain,0,3)==_GetObscureValue('x')) + { + $b = substr($domain,0,6); + $p = explode(".",$domain); + $subnet = $p[1]; + if($p[1]>15 && $p[1]<32) + $localb=TRUE; + } + $zz = _GetObscureValue('z')._GetObscureValue(5).'.'.(int)_GetObscureValue(7)._GetObscureValue(12); + $ff = _GetObscureValue('z')+65; + $hh = $ff-0x18; + if($domain==$yy || $domain==$zz || substr($domain,0,7)==$ff._Chr(46).$hh || + substr($domain,0,3)==_GetObscureValue('a')._Chr(46) || $localb || strpos($domain,".")==0) + { + return TRUE; + } + return FALSE; +} + +function _falseIsLocalSite($domain) +{ + $localb = FALSE; if(substr($domain,0,3)=="172") { $b = substr($domain,0,6);