Index: trunk/admin/install.php =================================================================== diff -u -r383 -r402 --- trunk/admin/install.php (.../install.php) (revision 383) +++ trunk/admin/install.php (.../install.php) (revision 402) @@ -128,7 +128,7 @@ $mods[3] = "In-Portal"; // simulate rootURL variable: begin - $rootURL = 'http://'.dirname($_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']); + $rootURL = 'http://'.dirname($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']); $tmp = explode('/', $rootURL); if( $tmp[ count($tmp) - 1 ] == $admin) unset( $tmp[ count($tmp) - 1 ] ); $rootURL = implode('/', $tmp).'/'; @@ -342,7 +342,7 @@ if (ConvertVersion($g_InPortal) >= ConvertVersion("1.0.5")) { $act = 'check'; } - $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { $login_err_mesg = "Unable to connect to the Intechnic server!"; $LoggedIn = false; @@ -689,7 +689,7 @@ if ($lic_login != '' && $lic_password != '') { // Here we determine weather login is ok & check available licenses - $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { $get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; $state = "get_license"; @@ -1464,8 +1464,8 @@ $sitepath = $pathguess; $esc_path = str_replace("\\","/",$pathtoroot); $esc_path = str_replace("/","\\",$esc_path); - //set_ini_value("Site","DomainName",$_SERVER["SERVER_NAME"]); - //$g_DomainName= $_SERVER["SERVER_NAME"]; + //set_ini_value("Site","DomainName",$_SERVER["HTTP_HOST"]); + //$g_DomainName= $_SERVER["HTTP_HOST"]; save_values(); $ado =& inst_GetADODBConnection(); @@ -1500,7 +1500,7 @@ } $modules_str = substr($modules_str, 0, strlen($modules_str) - 1); - $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".md5($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['HTTP_HOST'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".md5($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { //$get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; //$state = "postconfig_1"; Index: trunk/kernel/include/usersession.php =================================================================== diff -u -r357 -r402 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 357) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 402) @@ -42,7 +42,7 @@ if( !isset($_SERVER['HTTP_REFERER']) ) $_SERVER['HTTP_REFERER'] = ''; if(!isset($_GET['destform'])) $_GET['destform'] = null; if(!isset($_GET['continue_sess'])) $_GET['continue_sess'] = null; - if( strlen($id) && (strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path")) || $_GET['destform'] == 'popup' || $_GET['continue_sess'] == 1)) + if( strlen($id) && (strstr($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'].$objConfig->Get("Site_Path")) || $_GET['destform'] == 'popup' || $_GET['continue_sess'] == 1)) { $this->Set("SessionKey",$id); return $this->LoadFromDatabase($id); @@ -298,7 +298,7 @@ $this->UseTempKeys=TRUE; } - if (!$this->Get("CurrentTempKey") || !strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path"))) { + if (!$this->Get("CurrentTempKey") || !strstr($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'].$objConfig->Get("Site_Path"))) { //$this->Set("PrevTempKey",$this->Get("CurrentTempKey")); //$this->Set("CurrentTempKey",$this->GetUniqueKey()); $this->UseTempKeys=FALSE; Index: trunk/admin/install/settings.php =================================================================== diff -u -r41 -r402 --- trunk/admin/install/settings.php (.../settings.php) (revision 41) +++ trunk/admin/install/settings.php (.../settings.php) (revision 402) @@ -16,7 +16,7 @@ Enter the URL which the In-Portal root directory () corresponds to on your web server. http:// - "> + Index: trunk/kernel/include/portalgroup.php =================================================================== diff -u -r348 -r402 --- trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 348) +++ trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 402) @@ -57,11 +57,14 @@ { $sql = "UPDATE ".GetTablePrefix()."Permissions SET PermissionValue=$Value "; $sql .=" WHERE Type=1 AND Permission='$PermName' AND GroupId=".$this->Get("GroupId"); + + //echo "UPDATE SQL: $sql
"; } else { $sql = "INSERT INTO ".GetTablePrefix()."Permissions (Permission, GroupId, PermissionValue, Type, CatId) "; $sql .="VALUES ('$PermName',".$this->Get("GroupId").",$Value,1,0)"; + //echo "INSERT SQL: $sql
"; } $this->adodbConnection->Execute($sql); //echo $sql."
\n"; @@ -70,8 +73,8 @@ { $sql = "DELETE FROM ".GetTablePrefix()."Permissions "; $sql .=" WHERE Type=1 AND Permission='$PermName' AND GroupId=".$this->Get("GroupId"); + //echo "DELETE SQL: $sql
"; $this->adodbConnection->Execute($sql); - //echo $sql."
\n"; } } } Index: trunk/admin/users/adduser.php =================================================================== diff -u -r374 -r402 --- trunk/admin/users/adduser.php (.../adduser.php) (revision 374) +++ trunk/admin/users/adduser.php (.../adduser.php) (revision 402) @@ -299,7 +299,7 @@ > - "> + "> Index: trunk/admin/install/download_license.php =================================================================== diff -u -r315 -r402 --- trunk/admin/install/download_license.php (.../download_license.php) (revision 315) +++ trunk/admin/install/download_license.php (.../download_license.php) (revision 402) @@ -16,7 +16,7 @@ - + Index: trunk/admin/include/elements.php =================================================================== diff -u -r348 -r402 --- trunk/admin/include/elements.php (.../elements.php) (revision 348) +++ trunk/admin/include/elements.php (.../elements.php) (revision 402) @@ -1,4 +1,3 @@ - SourceTable = $objSession->GetEditTable("PortalUser"); @@ -259,15 +259,16 @@ if(!is_object($g)) $g = $u->GetPersonalGroup(TRUE); - $value = 0; + $value = 0; if(is_array($_POST["permvalue"])) { if(in_array($PermList[$i],$_POST["permvalue"])) $value =1; $g->SetSystemPermission($PermList[$i],$value); } - else - $g->SetSystemPermission($PermList[$i],-1); + else { + $g->SetSystemPermission($PermList[$i], 0); + } } else { Index: trunk/kernel/include/searchitems.php =================================================================== diff -u -r271 -r402 --- trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 271) +++ trunk/kernel/include/searchitems.php (.../searchitems.php) (revision 402) @@ -88,6 +88,88 @@ } } +class clsEmailLog extends clsItemDB +{ + function clsEmailLog($id=NULL) + { + $this->clsItemDB(); + $this->tablename = GetTablePrefix()."SearchLog"; + $this->id_field = "SearchLogId"; + $this->NoResourceId = 1; + if($id) + $this->LoadFromDatabase($id); + } + + function LoadFromDatabase($Id) + { + global $Errors; + + if(!isset($Id)) + { + $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase"); + return false; + } + $sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ".$this->IdField()." = '%s'",$Id); + $result = $this->adodbConnection->Execute($sql); + if ($result === false) + { + $Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase"); + return false; + } + + $data = $result->fields; + + $this->SetFromArray($data); + $this->Clean(); + return true; + } +} + +class clsEmailLogList extends clsItemCollection +{ + var $Page; + var $PerPageVar; + + function clsEmailLogList() + { + $this->clsItemCollection(); + $this->SourceTable = GetTablePrefix()."SearchLog"; + $this->classname = "clsEmailLog"; + $this->Page=1; + $this->PerPageVar = "Perpage_EmailsL"; + $this->AdminSearchFields = array("event", "fromuser", "addressto", "subject"); + } + + function UpdateKeyword($keyword,$SearchType) + { + $sql = "UPDATE ".$this->SourceTable." SET Indices = Indices+1 WHERE Keyword='$keyword' AND SearchType=$SearchType"; + //echo $sql."
\n"; + $this->adodbConnection->Execute($sql); + if($this->adodbConnection->Affected_Rows()==0) + { + //echo "Creating Keyword record..
\n"; + $k = new clsSearchLog(); + $k->Set("Keyword",$keyword); + $k->Set("Indices",1); + $k->Set("SearchType",$SearchType); + $k->Create(); + } + } + + function AddKeywords($Keywords) + { + if(is_array($Keywords)) + { + for($i=0;$iUpdateKeyword($Keywords[$i]); + } + } + else + $this->UpdateKeyword($Keywords); + } +} + class clsSearchResults extends clsItemCollection { var $ResultTable; Index: trunk/admin/users/user_list.php =================================================================== diff -u -r374 -r402 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 374) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 402) @@ -271,7 +271,7 @@ $objListView = new clsListView($objListToolBar); $objListView->CurrentPageVar = $CurrentPageVar; $objListView->PerPageVar = $PerPageVar; - //echo "SQL: $sql
"; + //echo "SQL: $sql
"; $objUsers->Query_Item($sql, false, 'set_first'); $objSession->SetVariable($CurrentPageVar, 1); @@ -297,7 +297,7 @@ $objListView->ColumnHeaders->Add("FirstName",admin_language("la_prompt_First_Name"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"FirstName"); $objListView->ColumnHeaders->Add("Email",admin_language("la_prompt_Email"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"Email"); $objListView->ColumnHeaders->Add("GroupName",admin_language("la_prompt_PrimaryGroup"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"GroupName"); -$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"u.DateCreated"); +$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"u.CreatedOn"); $objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); Index: trunk/admin/logs/email_log.php =================================================================== diff -u -r374 -r402 --- trunk/admin/logs/email_log.php (.../email_log.php) (revision 374) +++ trunk/admin/logs/email_log.php (.../email_log.php) (revision 402) @@ -143,12 +143,13 @@ if($_GET["resetpage"]==1) $objSession->SetVariable("Page_EmailsL","1"); +$objEmailLogList = new clsEmailLogList(); $order = $objConfig->Get("EmailsL_SortOrder"); $SearchWords = $objSession->GetVariable("EmailsLSearchWord"); if(strlen($SearchWords)) { - $where = $objSession->AdminSearchWhereClause($SearchWords); + $where = $objEmailLogList->AdminSearchWhereClause($SearchWords); } else $where = ""; @@ -164,7 +165,7 @@ $sql = "SELECT EmailLogId, fromuser, addressto, subject, event, FROM_UNIXTIME(timestamp,'%m-%d-%Y %H:%i:%s') as time_sent FROM ".GetTablePrefix()."EmailLog"; if(strlen($where)) { - $sql .= "AND ".$where; + $sql .= " WHERE ".$where; } $orderBy = trim($objConfig->Get("EmailsL_SortField")." ".$objConfig->Get("EmailsL_SortOrder")); Index: trunk/admin/users/user_addpermission.php =================================================================== diff -u -r374 -r402 --- trunk/admin/users/user_addpermission.php (.../user_addpermission.php) (revision 374) +++ trunk/admin/users/user_addpermission.php (.../user_addpermission.php) (revision 402) @@ -174,7 +174,7 @@ $ado = GetADODBConnection(); $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig AS pc LEFT JOIN ".GetTablePrefix()."Phrase AS p ON pc.Description = p.Phrase WHERE pc.ModuleId='$PermModule' AND p.LanguageId = ".$objSession->Get("Language")." ORDER BY p.Translation ASC"; -//echo $sql; + if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; @@ -187,12 +187,17 @@ echo ""; $checked = ""; + if($UserGroupExists) { + //echo "GroupPermission on $Permission: ".$UserGroup->HasSystemPermission($Permission)."
"; + //echo "UserPermission on $Permission: ".$c->HasSystemPermission($Permission)."
"; $Inherit = ($UserGroup->HasSystemPermission($Permission)==-1); } - else + else { $Inherit =TRUE; + } + if($Inherit) { $checked = " CHECKED"; Index: trunk/kernel/include/portaluser.php =================================================================== diff -u -r289 -r402 --- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 289) +++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 402) @@ -343,7 +343,8 @@ @field:user.password @description:User password */ - $ret = $this->Get("Password"); + $ret = $objSession->Get("password"); + $objSession->Set("password", ''); break; case "email": $ret = $this->Get("Email"); Index: trunk/kernel/searchaction.php =================================================================== diff -u -r282 -r402 --- trunk/kernel/searchaction.php (.../searchaction.php) (revision 282) +++ trunk/kernel/searchaction.php (.../searchaction.php) (revision 402) @@ -195,5 +195,17 @@ case 'm_adv_view_search_reset': ResetAdvView_SearchWord('m'); break; + + case 'm_emaillog_search': + $searchlist = trim( $objSession->GetVariable("EmailsLSearchWord") ); + if(strlen($searchlist) > 0) $searchlist = ","; + $searchlist = $_POST["list_search"]; + $objSession->SetVariable("EmailsLSearchWord",$searchlist); + $objSession->SetVariable("Page_EmailsL",1); + break; + case 'm_emaillog_search_reset': + $objSession->SetVariable("EmailsLSearchWord",""); + $objSession->SetVariable("Page_EmailsL",1); + break; } ?> Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql =================================================================== diff -u -r361 -r402 --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 361) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 402) @@ -22,5 +22,6 @@ INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'time_sent', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); +UPDATE ConfigurationValues SET VariableValue = 'u.CreatedOn' WHERE VariableName = 'User_SortField'; UPDATE Modules SET Version = '1.0.7' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/admin/help/install_help.php =================================================================== diff -u -r374 -r402 --- trunk/admin/help/install_help.php (.../install_help.php) (revision 374) +++ trunk/admin/help/install_help.php (.../install_help.php) (revision 402) @@ -64,7 +64,7 @@ } $path_char = GetPathChar(); -$rootURL = 'http://'.dirname($_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']); +$rootURL = 'http://'.dirname($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']); $rootURL = str_replace('/help','',$rootURL); $tmp = explode('/', $rootURL); Index: trunk/kernel/startup.php =================================================================== diff -u -r396 -r402 --- trunk/kernel/startup.php (.../startup.php) (revision 396) +++ trunk/kernel/startup.php (.../startup.php) (revision 402) @@ -144,4 +144,4 @@ } } -?> +?> \ No newline at end of file Index: trunk/kernel/frontaction.php =================================================================== diff -u -r293 -r402 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 293) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 402) @@ -369,6 +369,7 @@ if($objConfig->Get("User_Password_Auto")) { $password = makepassword(); + $objSession->Set("password", $password); } else $password = $_POST["password"]; Index: trunk/kernel/include/modules.php =================================================================== diff -u -r361 -r402 --- trunk/kernel/include/modules.php (.../modules.php) (revision 361) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 402) @@ -792,7 +792,7 @@ $CookieTest = isset($_COOKIE["CookiesTest"]) ? $_COOKIE["CookiesTest"] : ''; $HTTP_REFERER = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''; -if ( ($CookieTest == 1) || !strstr($HTTP_REFERER, $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path"))) { +if ( ($CookieTest == 1) || !strstr($HTTP_REFERER, $_SERVER['HTTP_HOST'].$objConfig->Get("Site_Path"))) { $SessionQueryString = FALSE; } @@ -903,4 +903,4 @@ if( !isset($SearchPerformed) ) $SearchPerformed = false; if($SearchPerformed == true) $objSearch->BuildIndexes(); LogEntry("Finished Loading Module action scripts\n"); -?> +?> \ No newline at end of file Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r361 -r402 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 361) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 402) @@ -57,7 +57,7 @@ INSERT INTO ConfigurationValues VALUES ('Suggest_MinInterval', '3600', 'inportal', '') INSERT INTO ConfigurationValues VALUES ('SubCat_ListCount', '3', 'inportal', '') INSERT INTO ConfigurationValues VALUES ('Timeout_Rating', '3600', 'In-Portal', 'System') -INSERT INTO ConfigurationValues VALUES ('User_SortField', 'DateCreated', 'In-Portal', '') +INSERT INTO ConfigurationValues VALUES ('User_SortField', 'u.CreatedOn', 'In-Portal', '') INSERT INTO ConfigurationValues VALUES ('Perpage_Relations', '10', 'In-Portal', '') INSERT INTO ConfigurationValues VALUES ('Group_SortField', 'GroupName', 'In-Portal', '') INSERT INTO ConfigurationValues VALUES ('Group_SortOrder', 'asc', 'In-Portal', '')
Domain:
Available licenses: "; echo prompt_language($desc)."