Index: branches/unlabeled/unlabeled-1.20.4/admin/install/install_lib.php
===================================================================
diff -u -r543 -r795
--- branches/unlabeled/unlabeled-1.20.4/admin/install/install_lib.php (.../install_lib.php) (revision 543)
+++ branches/unlabeled/unlabeled-1.20.4/admin/install/install_lib.php (.../install_lib.php) (revision 795)
@@ -457,8 +457,10 @@
//$lic = LoadLicense();
$lic = base64_decode($g_License);
inst_ParseLicense($lic);
-// echo "Checking $g_Domain..
\n";
-// echo "
";print_r($i_Keys); echo "
";
+
+ //echo "Checking $g_Domain..
\n";
+ //echo "";print_r($i_Keys); echo "
";
+
$modules = array();
if(!inst_IsLocalSite($g_Domain))
{
@@ -470,16 +472,14 @@
$modules = explode(",",strtolower($key["mod"]));
}
}
- if(in_array($name,$modules))
- {
-// echo "Module $name is licensed
\n";
- return TRUE;
- }
- else
- {
- // echo "Module $name is not licensed
\n";
- return FALSE;
- }
+ if(in_array(strtolower($name),$modules))
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
}
else
return TRUE;
@@ -557,9 +557,9 @@
$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: branches/unlabeled/unlabeled-1.3.4/admin/modules/addmodule.php
===================================================================
diff -u -r554 -r795
--- branches/unlabeled/unlabeled-1.3.4/admin/modules/addmodule.php (.../addmodule.php) (revision 554)
+++ branches/unlabeled/unlabeled-1.3.4/admin/modules/addmodule.php (.../addmodule.php) (revision 795)
@@ -88,6 +88,7 @@
$pathtolocal = $pathtoroot."kernel/";
require_once ($pathtoroot.$admin."/include/elements.php");
+require_once ($pathtoroot.$admin."/install/install_lib.php");
require_once ($pathtoroot."kernel/admin/include/navmenu.php");
require_once ($pathtolocal."admin/include/navmenu.php");
require_once($pathtoroot.$admin."/toolbar.php");
@@ -148,7 +149,6 @@
closedir($dir);
}
-
foreach($new as $mod => $file)
{
$m = new clsModule();
@@ -166,7 +166,7 @@
$mod_tmp_name = substr($mod_tmp_name, 0, strlen($mod_tmp_name) - 1);
- if (_ModuleLicensed($mod_tmp_name)) {
+ if (inst_ModuleLicensed($mod_tmp_name)) {
$data["Url"] = "$status";
}
else {