Index: trunk/admin/users/user_list.php =================================================================== diff -u -r13 -r137 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 13) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 137) @@ -266,13 +266,18 @@ $page = $objSession->GetVariable($CurrentPageVar); } } -$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar)); +//$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar)); if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; -//echo "SQL: $sql
"; -$objUsers->Query_Item($sql); +$objListView = new clsListView($objListToolBar); +$objListView->CurrentPageVar = $CurrentPageVar; +$objListView->PerPageVar = $PerPageVar; + //echo "SQL: $sql
"; +$objUsers->Query_Item($sql, false, 'set_first'); +$objSession->SetVariable($CurrentPageVar, 1); + $itemcount = QueryCount($sql); //$title = prompt_language("la_Text_ShowingUsers")." (".$objUsers->NumItems().")"; //removed by PSK 2004-10-21 @@ -283,9 +288,9 @@ else $title = prompt_language("la_Text_ShowingUsers")." (".$itemcount.")"; - + $objListView->SetListItems($objUsers); /* ---------------------------------------- Configure the list view ---------------------------------------- */ -$objListView = new clsListView($objListToolBar,$objUsers); + $objListView->IdField = "ResourceId"; $objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl"; @@ -302,8 +307,6 @@ $objListView->SearchBar = TRUE; $objListView->SearchKeywords = $SearchWords; $objListView->SearchAction="m_user_search"; -$objListView->CurrentPageVar = $CurrentPageVar; -$objListView->PerPageVar = $PerPageVar; $objListView->CheckboxName = "itemlist[]"; $objListView->TotalItemCount = $itemcount; Index: trunk/admin/install.php =================================================================== diff -u -r120 -r137 --- trunk/admin/install.php (.../install.php) (revision 120) +++ trunk/admin/install.php (.../install.php) (revision 137) @@ -3,7 +3,8 @@ //$new_version = '1.0.2'; -define("GET_LICENSE_URL", "http://www.intechnic.com/myaccount/license.php"); +//define("GET_LICENSE_URL", "http://www.intechnic.com/myaccount/license.php"); +define("GET_LICENSE_URL", "http://maris.prod.intechnic.lv/in-business/license.php"); define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named $general_error = ''; @@ -108,7 +109,7 @@ { foreach($section as $key => $value) { - $key = "g_".$key; + $key = "g_".str_replace('-', '', $key); global $$key; $$key = $value; } @@ -125,7 +126,7 @@ set_ini_value("Database", "DBUser", ""); set_ini_value("Database", "DBUserPassword", ""); set_ini_value("Database", "DBName", ""); - set_ini_value("Modules", "In-Portal", ""); + set_ini_value("Module Versions", "In-Portal", ""); save_values(); } } @@ -318,8 +319,8 @@ } if($installed) - { - $state="reinstall"; + { + $state="reinstall"; } else { $state="dbinfo"; @@ -352,7 +353,11 @@ } else { - $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=check&license_code=".base64_encode($g_LicenseCode)."&version=".str_replace('.', '', GetMaxPortalVersion($pathtoroot.$admin))."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); + $act = ''; + if (str_replace('.', '', $g_InPortal) >= 105) { + $act = 'check'; + } + $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".str_replace('.', '', GetMaxPortalVersion($pathtoroot.$admin))."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); if (!$rfile) { $LoggedIn = false; } @@ -558,7 +563,7 @@ if(file_exists($filename)) { RunSQLFile($ado, $filename); - set_ini_value("Modules", $p, $try_version); + set_ini_value("Module Versions", $p, $try_version); save_values(); } } @@ -1075,7 +1080,7 @@ $sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = 'In-Portal'"; $rs = $ado->Execute($sql); - set_ini_value("Modules", "In-Portal", $rs->fields['Version']); + set_ini_value("Module Versions", "In-Portal", $rs->fields['Version']); save_values(); require_once $pathtoroot.'kernel/include/tag-class.php'; @@ -1469,7 +1474,7 @@ if(file_exists($filename)) { RunSQLFile($ado, $filename); - set_ini_value("Modules", $p, $try_version); + set_ini_value("Module Versions", $p, $try_version); save_values(); } } Index: trunk/admin/install/install_lib.php =================================================================== diff -u -r116 -r137 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 116) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 137) @@ -453,7 +453,7 @@ $line = eregi_replace(';[.]*','',$line); if(strlen($line) > 0) { //echo $line . " - "; - if(eregi('^[[a-z]+]$',$line)) { + if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) { //echo 'section'; $section = substr($line,1,(strlen($line)-2)); if ($parse_section) { Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r133 -r137 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 133) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 137) @@ -976,8 +976,8 @@ function Query_Item($sql, $offset=-1,$rows=-1) { global $Errors; - - $dummy =& $this->GetDummy(); + + $dummy =& $this->GetDummy(); if( !$dummy->TableExists() ) { if($this->debuglevel) echo "ERROR: table ".$dummy->tablename." missing.
"; @@ -1571,13 +1571,13 @@ // or first possible "set_first" $PerPage = $this->GetPerPage(); $NumPages = ceil( $this->GetNumPages($PerPage) ); - /* +/* echo "=====
"; echo "Class ".get_class($this).": Page ".$this->Page." of $NumPages
"; echo "PerPage: $PerPage
"; echo "Items Queries: ".$this->QueryItemCount."
"; echo "=====
"; - */ +*/ if($this->Page > $NumPages) { switch($fix_method) Index: trunk/admin/listview/listview.php =================================================================== diff -u -r104 -r137 --- trunk/admin/listview/listview.php (.../listview.php) (revision 104) +++ trunk/admin/listview/listview.php (.../listview.php) (revision 137) @@ -309,7 +309,7 @@ for($p=$StartPage;$p<=$EndPage;$p++) { - if($p!=$this->CurrentPage) + if($p!=$this->CurrentPage) { $href = str_replace("{TargetPage}",$p,$url); $o .= " $p "; Index: trunk/globals.php =================================================================== diff -u -r122 -r137 --- trunk/globals.php (.../globals.php) (revision 122) +++ trunk/globals.php (.../globals.php) (revision 137) @@ -47,7 +47,7 @@ $line = eregi_replace(';[.]*','',$line); if(strlen($line) > 0) { //echo $line . " - "; - if(eregi('^[[a-z]+]$',$line)) { + if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) { //echo 'section'; $section = substr($line,1,(strlen($line)-2)); if ($parse_section) { Index: trunk/kernel/include/portaluser.php =================================================================== diff -u -r133 -r137 --- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 133) +++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 137) @@ -690,7 +690,10 @@ $this->clsItemCollection(); // clsItemList() // need to use this, but double limit clause being created (normal+default 0,100) $this->classname = "clsPortalUser"; $this->SourceTable = GetTablePrefix()."PortalUser"; - $this->AdminSearchFields = array("Login","FirstName","LastName","Email","Street","City","State","Zip","Country","Phone"); + $this->Page = $_GET['lpn']; + $this->EnablePaging = true; + $this->PerPageVar = "Perpage_User"; + $this->AdminSearchFields = array("Login","FirstName","LastName","Email","Street","City", "State","Zip","Country","Phone"); } function GetPageLinkList($dest_template=NULL,$link_template=NULL,$page = "") Index: trunk/admin/install/langpacks/english.lang =================================================================== diff -u -r113 -r137 --- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 113) +++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 137) @@ -978,7 +978,7 @@ TG9jay9VbmxvY2s= SXRlbXM= RW5hYmxlIFRhZyBDYWNoaW5n -UmVtZWJlciBMb2dpbg== +UmVtZW1iZXIgTG9naW4= SW1wb3J0IExhbmd1YWdlIFBhY2s= SW5zdGFsbCBMYW5ndWFnZSBQYWNr TGFuZ3VhZ2UgRmlsZQ== @@ -1527,6 +1527,9 @@ SW5zdGFsbGF0aW9uIEhlbHA= SW5zdGFsbA== UmVhZC1Pbmx5IEFjY2VzcyBUbyBEYXRhYmFzZQ== +QmFja3VwIFBhdGg= +QmFja3VwIFBhdGg= +RWRpdG9yJ3MgUGlja3M= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gYWRkZWQKCkEgbmV3IHVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBhZGRlZC4= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==