Index: trunk/admin/users/user_list.php =================================================================== diff -u -N -r267 -r278 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 267) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 278) @@ -221,11 +221,8 @@ $SearchWords = $objSession->GetVariable("UserSearchWord"); $where = "(ug.PrimaryGroup!=0 OR ug.PrimaryGroup IS NULL)"; -if(strlen($SearchWords)) -{ - $SearchWhere = $objUsers->AdminSearchWhereClause($SearchWords); -} +$SearchWhere = $SearchWords ? $objUsers->AdminSearchWhereClause($SearchWords) : ''; if(strlen($SearchWhere)) { $where .= " AND (".$SearchWhere.")"; @@ -250,17 +247,17 @@ if(strlen($orderBy)) $sql .=" ORDER BY ".$orderBy; -if((int)$_GET["resetpage"]) +if( GetVar('resetpage') ) { $page = 1; $objSession->SetVariable($CurrentPageVar,1); } else { - if((int)$_GET["lpn"]) + if( GetVar('lpn') ) { - $objSession->SetVariable($CurrentPageVar,(int)$_GET["lpn"]); - $page = (int)$_GET["lpn"]; + $page = GetVar('lpn'); + $objSession->SetVariable($CurrentPageVar, $page); } else { Index: trunk/kernel/admin/include/toolbar/edituser_general.php =================================================================== diff -u -N --- trunk/kernel/admin/include/toolbar/edituser_general.php (revision 13) +++ trunk/kernel/admin/include/toolbar/edituser_general.php (revision 0) @@ -1,5 +0,0 @@ - \ No newline at end of file Index: trunk/admin/users/adduser_images.php =================================================================== diff -u -N -r13 -r278 --- trunk/admin/users/adduser_images.php (.../adduser_images.php) (revision 13) +++ trunk/admin/users/adduser_images.php (.../adduser_images.php) (revision 278) @@ -93,7 +93,7 @@ $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); //Multiedit init -$en = (int)$_GET["en"]; +$en = GetVar('en'); $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); $objEditItems->EnablePaging = FALSE; $itemcount=$objEditItems->NumItems(); @@ -197,7 +197,7 @@ $FilterLabels[1] = admin_language("la_Text_Disabled"); $ImgView = $objConfig->Get($CurrentFilterVar); - +$imgFilter = ''; if(!is_numeric($ImgView)) { $ImgView = $Img_AllValue; Index: trunk/globals.php =================================================================== diff -u -N -r256 -r278 --- trunk/globals.php (.../globals.php) (revision 256) +++ trunk/globals.php (.../globals.php) (revision 278) @@ -645,8 +645,7 @@ $found = FALSE; if(is_array($_FILES)) { - if($_FILES[$r]["size"]>0) - $found=TRUE; + if( isset($_FILES[$r]) && $_FILES[$r]['size'] > 0 ) $found = TRUE; } if(!strlen(trim($_POST[$r])) && !$found) Index: trunk/admin/listview/viewmenu.php =================================================================== diff -u -N -r13 -r278 --- trunk/admin/listview/viewmenu.php (.../viewmenu.php) (revision 13) +++ trunk/admin/listview/viewmenu.php (.../viewmenu.php) (revision 278) @@ -43,7 +43,7 @@ { $FilterVal = (int)$this->CurrentFilter; $FilterVar = $this->FilterVar; - $fMax = $this->Filtermax; + $fMax = $this->FilterMax; $sOrder = $this->CurrentSortOrder; $sOrderVar = $this->OrderVar; $sField = $this->CurrentSortField; Index: trunk/kernel/admin/include/toolbar/edituser_items.php =================================================================== diff -u -N -r13 -r278 --- trunk/kernel/admin/include/toolbar/edituser_items.php (.../edituser_items.php) (revision 13) +++ trunk/kernel/admin/include/toolbar/edituser_items.php (.../edituser_items.php) (revision 278) @@ -7,6 +7,7 @@ $cat_select = $adminURL."/cat_select.php"; $NumItems = 0; +$Item_AllValue = 0; for($i=0;$i<$objItemTypes->NumItems(); $i++) { if($objItemTypes->Items[$i]->Get("PrimaryItem")=="1") Index: trunk/kernel/include/portalgroup.php =================================================================== diff -u -N -r271 -r278 --- trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 271) +++ trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 278) @@ -6,7 +6,7 @@ function clsPortalGroup($GroupId=NULL) { - $this->clsParsedItem($Groupid); + $this->clsParsedItem($GroupId); $this->tablename=GetTablePrefix()."PortalGroup"; $this->type=7; $this->BasePermission="GROUP"; Index: trunk/admin/users/adduser_custom.php =================================================================== diff -u -N -r104 -r278 --- trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 104) +++ trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 278) @@ -100,7 +100,7 @@ $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); $objEditItems->EnablePaging = FALSE; //Multiedit init -$en = (int)$_GET["en"]; +$en = GetVar('en'); $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); $itemcount=$objEditItems->NumItems(); Index: trunk/admin/users/adduser.php =================================================================== diff -u -N -r267 -r278 --- trunk/admin/users/adduser.php (.../adduser.php) (revision 267) +++ trunk/admin/users/adduser.php (.../adduser.php) (revision 278) @@ -96,7 +96,7 @@ //$objUserGroupsList = new clsUserGroupList(); //Multiedit init -if ($_GET["new"] == 1) +if ( GetVar('new') == 1) { $c = new clsPortalUser(NULL); $c->Set("CreatedOn", time()); @@ -111,7 +111,7 @@ } else { - $en = (int)$_GET["en"]; + $en = GetVar('en'); if (isset($_POST["itemlist"])) { $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]); @@ -190,7 +190,7 @@ > - "> + "> @@ -199,7 +199,7 @@ - + Index: trunk/admin/users/adduser_items.php =================================================================== diff -u -N -r13 -r278 --- trunk/admin/users/adduser_items.php (.../adduser_items.php) (revision 13) +++ trunk/admin/users/adduser_items.php (.../adduser_items.php) (revision 278) @@ -100,7 +100,7 @@ $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); $objEditItems->EnablePaging = FALSE; //Multiedit init -$en = (int)$_GET["en"]; +$en = GetVar('en'); $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); @@ -168,7 +168,7 @@ SetVariable("Page_Items",(int)$_GET["lpn"]); $page = (int)$_GET["lpn"]; Index: trunk/kernel/action.php =================================================================== diff -u -N -r276 -r278 --- trunk/kernel/action.php (.../action.php) (revision 276) +++ trunk/kernel/action.php (.../action.php) (revision 278) @@ -37,8 +37,8 @@ { case "m_add_user": $dupe_user = ''; - $user_pending = (int)$_POST["user_pending"]; - $user_enabled = (int)$_POST["user_enabled"]; + //$user_pending = (int)$_POST["user_pending"]; + //$user_enabled = (int)$_POST["user_enabled"]; $CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat()); $dob = DateTimestamp($_POST["user_dob"],GetDateFormat()); @@ -94,9 +94,9 @@ $dob = DateTimestamp($_POST["user_dob"],GetDateFormat()); $objEditItems = new clsUserManager(); $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); - $user_pending = (int)$_POST["user_pending"]; - $user_enabled = (int)$_POST["user_enabled"]; - $UserId=(int)$_POST["user_id"]; + //$user_pending = (int)$_POST["user_pending"]; + //$user_enabled = (int)$_POST["user_enabled"]; + $UserId = (int)$_POST["user_id"]; //echo $UserId."
\n"; if(!strlen($_POST["user_login"])) $dob = 0; Index: trunk/admin/users/adduser_groups.php =================================================================== diff -u -N -r13 -r278 --- trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 13) +++ trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 278) @@ -101,7 +101,7 @@ $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); $objEditItems->EnablePaging = FALSE; //Multiedit init -$en = (int)$_GET["en"]; +$en = GetVar('en'); $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); $itemcount=$objEditItems->NumItems(); @@ -145,7 +145,7 @@ $objListToolBar->Set("CheckForm",$ListForm); $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','UserEditStatus','".$admin."/users/user_list.php',1);","tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','UserEditStatus','".admin."/users/user_list.php',2);","tool_cancel.gif"); +$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','UserEditStatus','".$admin."/users/user_list.php',2);","tool_cancel.gif"); if($itemcount == 1) $objListToolBar->Add("divider"); Index: trunk/admin/users/adduser_permissions.php =================================================================== diff -u -N -r13 -r278 --- trunk/admin/users/adduser_permissions.php (.../adduser_permissions.php) (revision 13) +++ trunk/admin/users/adduser_permissions.php (.../adduser_permissions.php) (revision 278) @@ -101,7 +101,7 @@ $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser"); $objEditItems->EnablePaging = FALSE; //Multiedit init -$en = (int)$_GET["en"]; +$en = GetVar('en'); $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); $itemcount=$objEditItems->NumItems();