Index: trunk/admin/config/addlang_labels.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/config/addlang_labels.php (.../addlang_labels.php) (revision 624) +++ trunk/admin/config/addlang_labels.php (.../addlang_labels.php) (revision 822) @@ -348,10 +348,39 @@ $objListView->RowIcons[] = $objPhrases->Items[$i]->AdminIcon(); } +$filter = false; // always initialize variables before use +if($objSession->GetVariable("PhraseSearchWord") != '') { + $filter = true; +} +else { + if ($LangView != $Bit_All) { + $filter = true; + } +} + $title = $title = GetTitle("la_Text_Pack", "la_tab_Labels", $c->Get('LanguageId'), $c->Get('LocalName'));///admin_language("la_Text_Configuration")." - '".$name."' ".admin_language("la_Text_Pack")." - ".admin_language("la_tab_Labels")." ($itemcount)"; $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); + +if ($objSession->GetVariable("HasChanges") == 1) { ?> + + + + +
+ +
+ + + + + + +
+ +
+
" method=POST> Index: trunk/admin/users/adduser.php =================================================================== diff -u -N -r745 -r822 --- trunk/admin/users/adduser.php (.../adduser.php) (revision 745) +++ trunk/admin/users/adduser.php (.../adduser.php) (revision 822) @@ -180,9 +180,17 @@ } int_header($objCatToolBar,NULL,$title); -?> - +if ($objSession->GetVariable("HasChanges") == 1) { +?> +
+ + + +
+ +
+ Index: trunk/admin/config/edit_banlist.php =================================================================== diff -u -N -r374 -r822 --- trunk/admin/config/edit_banlist.php (.../edit_banlist.php) (revision 374) +++ trunk/admin/config/edit_banlist.php (.../edit_banlist.php) (revision 822) @@ -200,10 +200,25 @@ // $title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_BanRules"); +$objSession->SetVariable("HasChanges", 0); + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("RuleSearchWord") != '') { + $filter = true; +} + $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ " method=POST> Index: trunk/admin/logs/searchlog.php =================================================================== diff -u -N -r374 -r822 --- trunk/admin/logs/searchlog.php (.../searchlog.php) (revision 374) +++ trunk/admin/logs/searchlog.php (.../searchlog.php) (revision 822) @@ -182,10 +182,23 @@ $objListView->ConfigureViewMenu("SearchLog_SortField","SearchLog_SortOrder","TextType","","",0); +$filter = false; +if ($SearchWords != '') { + $filter = true; +} + $title = admin_language("la_Show_Log")." (".$itemcount.")"; $h = "\n\n\n"; int_header($objListToolBar,NULL,$title, NULL, $h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ PrintList(); Index: trunk/admin/users/adduser_items.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/adduser_items.php (.../adduser_items.php) (revision 624) +++ trunk/admin/users/adduser_items.php (.../adduser_items.php) (revision 822) @@ -159,10 +159,34 @@ $objListToolBar->AddToInitScript($listImages); $objListToolBar->AddToInitScript("fwLoadMenus();"); +$filter = false; // always initialize variables before use +if ($UserView != $Bit_All) { + $filter = true; +} + + $title = admin_language("la_Text_Editing")." ".admin_language("la_Text_User")." '".$c->Get("Login")."' - ".admin_language("la_tab_ItemList"); int_header($objListToolBar,NULL, $title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> + + + + +
+ +
+ + + + + + +
+ +
+ " method=POST> Index: trunk/admin/config/config_lang.php =================================================================== diff -u -N -r534 -r822 --- trunk/admin/config/config_lang.php (.../config_lang.php) (revision 534) +++ trunk/admin/config/config_lang.php (.../config_lang.php) (revision 822) @@ -206,12 +206,27 @@ $ado->Execute("DROP TABLE IF EXISTS $EventTable"); } +$objSession->SetVariable("HasChanges", 0); + +$filter = false; +if ($SearchWords != '') { + $filter = true; +} + $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); $title = prompt_language("la_Text_Configuration")." - ".prompt_language("la_tab_Regional")." ".prompt_language("la_Text_Settings"); $h = "\n\n\n"; int_header($objListToolBar,NULL,$title, NULL, $h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ " method=POST> Index: trunk/admin/include/elements.php =================================================================== diff -u -N -r820 -r822 --- trunk/admin/include/elements.php (.../elements.php) (revision 820) +++ trunk/admin/include/elements.php (.../elements.php) (revision 822) @@ -314,7 +314,6 @@ { int_table_color(1); print << Index: trunk/admin/users/group_addpermission.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/group_addpermission.php (.../group_addpermission.php) (revision 624) +++ trunk/admin/users/group_addpermission.php (.../group_addpermission.php) (revision 822) @@ -135,7 +135,16 @@ } int_header($objCatToolBar,NULL,$title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
$caption
+ + + +
+ +
+ Index: trunk/admin/users/adduser_permissions.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/adduser_permissions.php (.../adduser_permissions.php) (revision 624) +++ trunk/admin/users/adduser_permissions.php (.../adduser_permissions.php) (revision 822) @@ -146,7 +146,16 @@ int_header($objCatToolBar,NULL,$title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ Index: trunk/kernel/include/itemdb.php =================================================================== diff -u -N -r810 -r822 --- trunk/kernel/include/itemdb.php (.../itemdb.php) (revision 810) +++ trunk/kernel/include/itemdb.php (.../itemdb.php) (revision 822) @@ -269,6 +269,9 @@ $this->SetModified($UpdatedBy); $sql = "UPDATE ".$this->tablename ." SET "; $first = 1; + + $this->DetectChanges(); + foreach ($this->m_dirtyFieldsMap as $key => $value) { if(!is_numeric($key) && $key != $this->IdField() && $key!='ResourceId') @@ -288,12 +291,7 @@ else $sql = sprintf("%s, %s=%s",$sql,$key,$this->adodbConnection->qstr(stripslashes($value))); } - } - if (!(($value == '' || $value == 0) && ($this->Data[$key] == 'NULL' || $this->Data[$key] == '0' || $this->Data[$key] == ''))) { - if (!strstr($key, 'Modif') && $key != 'CreatedOn') { - $objSession->SetVariable("HasChanges", 1); - } - } + } } $sql = sprintf("%s WHERE %s = '%s'",$sql, $this->IdField(), $this->UniqueId()); @@ -376,6 +374,19 @@ return $sql; } + function DetectChanges() + { + global $objSession; +print_pre($this->m_dirtyFieldsMap); + foreach ($this->m_dirtyFieldsMap as $key => $value) { + //if ($this->Data[$key] != $this->m_dirtyFieldsMap[$key]) { + if ((!strstr($key, 'Modif') && $key != 'CreatedOn')) { + $objSession->SetVariable("HasChanges", 1); + } + //} + } + } + function Create() { global $Errors, $objSession; @@ -398,10 +409,10 @@ $this->SetUniqueId($this->adodbConnection->Insert_ID()); - - if ($this->adodbConnection->Affected_Rows() > 0) { + $this->DetectChanges(); + /*if ($this->adodbConnection->Affected_Rows() > 0) { $objSession->SetVariable("HasChanges", 1); - } + } */ return true; } Index: trunk/admin/logs/email_log.php =================================================================== diff -u -N -r446 -r822 --- trunk/admin/logs/email_log.php (.../email_log.php) (revision 446) +++ trunk/admin/logs/email_log.php (.../email_log.php) (revision 822) @@ -123,7 +123,7 @@ $objListToolBar->Add("log_reset","la_ToolTip_Reset","#", "swap('log_reset','toolbar/tool_reset_f2.gif');", "swap('log_reset', 'toolbar/tool_reset.gif');","$CheckClass.check_submit('email_log', 'm_purge_email_log');", - "tool_reset.gif",TRUE,TRUE); + "tool_reset.gif",FALSE,TRUE); //$listImages[] = "$CheckClass.addImage('log_reset','$imagesURL/toolbar/tool_disconnect.gif','$imagesURL/toolbar/tool_disconnect_f3.gif',1);\n "; //$listImages[] = "$CheckClass.addImage('log_reset','$imagesURL/toolbar/tool_disconnect.gif','$imagesURL/toolbar/tool_disconnect_f3.gif',1);\n "; @@ -212,11 +212,24 @@ $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField, $CurrentFilterVar,$SessionView,$Bit_All); + +$filter = false; +if ($SearchWords != '') { + $filter = true; +} $title = admin_language("la_Show_EmailLog")." (".$objUsers->NumItems().")"; $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ PrintList(); Index: trunk/admin/config/addlang.php =================================================================== diff -u -N -r642 -r822 --- trunk/admin/config/addlang.php (.../addlang.php) (revision 642) +++ trunk/admin/config/addlang.php (.../addlang.php) (revision 822) @@ -1,322 +1,652 @@ -Get("Site_Path"); - -$admin = $objConfig->Get("AdminDirectory"); -if(!strlen($admin)) - $admin = "admin"; - -$localURL=$rootURL."kernel/"; -$adminURL = $rootURL.$admin; -$imagesURL = $adminURL."/images"; -$browseURL = $adminURL."/browse"; - -$pathtolocal = $pathtoroot."kernel/"; -require_once ($pathtoroot.$admin."/include/elements.php"); -require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); -require_once($pathtoroot.$admin."/browse/toolbar.php"); -require_once($pathtoroot.$admin."/listview/listview.php"); - -$m = GetModuleArray(); -foreach($m as $key=>$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$objMessages = new clsEmailMessageList(); - -unset($objEditItems); - -$objEditItems = new clsLanguageList(); -$objEditItems->SourceTable = $objSession->GetEditTable("Language"); -$objEditItems->EnablePaging = FALSE; -$objPhraseList = new clsPhraseList(); -$objPhraseList->EnablePaging = FALSE; -if ($_GET["new"] == 1) -{ - $c = new clsLanguage(NULL); - $c->Set("DecimalPoint","."); - $c->Set("ThousandSep",","); - $c->Set("DateFormat","m-d-Y"); - $c->Set("TimeFormat","g:i:s a"); - $en = 0; - $action = "m_lang_add"; - $name = prompt_language("la_Text_New"); - $objLanguages->CreateEmptyEditTable("LanguageId"); - $objPhraseList->CreateEmptyEditTable("PhraseId"); - $objMessages->CreateEmptyEditTable($_POST["itemlist"]); -} -else -{ - $en = (int)$_GET["en"]; - - if (isset($_POST["itemlist"])) - { - $objLanguages->CopyToEditTable("LanguageId",$_POST["itemlist"]); - $objPhraseList->CopyToEditTable("LanguageId",$_POST["itemlist"]); - $objMessages->CopyToEditTable("LanguageId",$_POST["itemlist"]); - } - $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); - $itemcount=$objEditItems->NumItems(); - - $c = $objEditItems->GetItemByIndex($en); - - if($itemcount>1) - { - if ($en+1 == $itemcount) - $en_next = -1; - else - $en_next = $en+1; - - if ($en == 0) - $en_prev = -1; - else - $en_prev = $en-1; - } - $action = "m_lang_edit"; - $name = $c->Get("LocalName"); -} - -$section = "in-portal:lang_general"; - -$envar = "env=".BuildEnv(); - -$title = $title = GetTitle("la_Text_Pack", "la_tab_General", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General"); - -//Display header -$sec = $objSections->GetSection($section); -$objListToolbar = new clsToolBar(); -$objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',1);",$imagesURL."/toolbar/tool_select.gif"); -$objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); - -if ( isset($en_prev) || isset($en_next) ) -{ - $url = $admin."/config/addlang.php"; - $objListToolbar->Add("divider"); - $form = "language"; - if($en_prev>-1) - { - $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; - $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $onClick= $sec->Get("onclick"); - $var="env=".BuildEnv()."&en=$en_prev"; - $link = "javascript:edit_submit('$form','$url',0,'$var');"; - $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_prev.gif"); - } - else - { - $MouseOver=""; - $MouseOut=""; - $onClick=""; - $link="#"; - $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),"#","","","","toolbar/tool_prev_f3.gif"); - - } - if($en_next>-1) - { - $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; - $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; - $onClick=$sec->Get("onclick"); - $var="env=".BuildEnv()."&en=$en_next"; - $link = "javascript:edit_submit('$form','$url',0,'$var');"; - $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next.gif"); - } - else - { - $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next_f3.gif"); - } -} - - int_header($objListToolbar,NULL,$title); -?> - - - -Data=inp_htmlize($c->Data);?> - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - -> - - - - - -> - - - - -> - - - - - "> - - - -
Get("LanguageId"); ?>
">
">
">
"> - Get("DateFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("DateFormat")); ?> -
"> - Get("TimeFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("TimeFormat")); ?> -
">
">
- Get("Enabled") == 1) echo "checked"; ?>> -  
- Get("PrimaryLang") == 1) echo "checked"; ?>> -  
- - - - -
-
- -
" name="viewmenu"> - - - - -
- - +Get("Site_Path"); + + + +$admin = $objConfig->Get("AdminDirectory"); + +if(!strlen($admin)) + + $admin = "admin"; + + + +$localURL=$rootURL."kernel/"; + +$adminURL = $rootURL.$admin; + +$imagesURL = $adminURL."/images"; + +$browseURL = $adminURL."/browse"; + + + +$pathtolocal = $pathtoroot."kernel/"; + +require_once ($pathtoroot.$admin."/include/elements.php"); + +require_once ($pathtoroot."kernel/admin/include/navmenu.php"); + +require_once ($pathtolocal."admin/include/navmenu.php"); + +require_once($pathtoroot.$admin."/browse/toolbar.php"); + +require_once($pathtoroot.$admin."/listview/listview.php"); + + + +$m = GetModuleArray(); + +foreach($m as $key=>$value) + +{ + + $path = $pathtoroot. $value."admin/include/parser.php"; + + if(file_exists($path)) + + { + + include_once($path); + + } + +} + + + +$objMessages = new clsEmailMessageList(); + + + +unset($objEditItems); + + + +$objEditItems = new clsLanguageList(); + +$objEditItems->SourceTable = $objSession->GetEditTable("Language"); + +$objEditItems->EnablePaging = FALSE; + +$objPhraseList = new clsPhraseList(); + +$objPhraseList->EnablePaging = FALSE; + +if ($_GET["new"] == 1) + +{ + + $c = new clsLanguage(NULL); + + $c->Set("DecimalPoint","."); + + $c->Set("ThousandSep",","); + + $c->Set("DateFormat","m-d-Y"); + + $c->Set("TimeFormat","g:i:s a"); + + $en = 0; + + $action = "m_lang_add"; + + $name = prompt_language("la_Text_New"); + + $objLanguages->CreateEmptyEditTable("LanguageId"); + + $objPhraseList->CreateEmptyEditTable("PhraseId"); + + $objMessages->CreateEmptyEditTable($_POST["itemlist"]); + +} + +else + +{ + + $en = (int)$_GET["en"]; + + + + if (isset($_POST["itemlist"])) + + { + + $objLanguages->CopyToEditTable("LanguageId",$_POST["itemlist"]); + + $objPhraseList->CopyToEditTable("LanguageId",$_POST["itemlist"]); + + $objMessages->CopyToEditTable("LanguageId",$_POST["itemlist"]); + + } + + $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); + + $itemcount=$objEditItems->NumItems(); + + + + $c = $objEditItems->GetItemByIndex($en); + + + + if($itemcount>1) + + { + + if ($en+1 == $itemcount) + + $en_next = -1; + + else + + $en_next = $en+1; + + + + if ($en == 0) + + $en_prev = -1; + + else + + $en_prev = $en-1; + + } + + $action = "m_lang_edit"; + + $name = $c->Get("LocalName"); + +} + + + +$section = "in-portal:lang_general"; + + + +$envar = "env=".BuildEnv(); + + + +$title = $title = GetTitle("la_Text_Pack", "la_tab_General", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General"); + + + +//Display header + +$sec = $objSections->GetSection($section); + +$objListToolbar = new clsToolBar(); + +$objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',1);",$imagesURL."/toolbar/tool_select.gif"); + +$objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); + + + +if ( isset($en_prev) || isset($en_next) ) + +{ + + $url = $admin."/config/addlang.php"; + + $objListToolbar->Add("divider"); + + $form = "language"; + + if($en_prev>-1) + + { + + $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; + + $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; + + $onClick= $sec->Get("onclick"); + + $var="env=".BuildEnv()."&en=$en_prev"; + + $link = "javascript:edit_submit('$form','$url',0,'$var');"; + + $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_prev.gif"); + + } + + else + + { + + $MouseOver=""; + + $MouseOut=""; + + $onClick=""; + + $link="#"; + + $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),"#","","","","toolbar/tool_prev_f3.gif"); + + + + } + + if($en_next>-1) + + { + + $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; + + $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; + + $onClick=$sec->Get("onclick"); + + $var="env=".BuildEnv()."&en=$en_next"; + + $link = "javascript:edit_submit('$form','$url',0,'$var');"; + + $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next.gif"); + + } + + else + + { + + $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next_f3.gif"); + + } + +} + + + + int_header($objListToolbar,NULL,$title); + +if ($objSession->GetVariable("HasChanges") == 1) { +?> + + + + +
+ +
+ + +
+ + + + + +Data=inp_htmlize($c->Data);?> + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + + > + + + + + + + + + + + +> + + + + + + + + + + + +> + + + + + + + + + +> + + + + + + + + + + "> + + + + + + + +
Get("LanguageId"); ?>
">
">
">
"> + + Get("DateFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("DateFormat")); ?> + +
"> + + Get("TimeFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("TimeFormat")); ?> + +
">
">
+ + Get("Enabled") == 1) echo "checked"; ?>> + +  
+ + Get("PrimaryLang") == 1) echo "checked"; ?>> + +  
+ + + + + + + + + +
+ +
+ + + +
" name="viewmenu"> + + + + + + + + + +
+ + + + \ No newline at end of file Index: trunk/admin/config/addtheme_templates.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/config/addtheme_templates.php (.../addtheme_templates.php) (revision 624) +++ trunk/admin/config/addtheme_templates.php (.../addtheme_templates.php) (revision 822) @@ -271,11 +271,35 @@ $objListView->ConfigureViewMenu("Template_LV_Sortfield","Template_LV_Sortorder","Module", "",0,0); + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("TemplateSearchWord") != '') { + $filter = true; +} $title = GetTitle("la_Text_Theme", "la_tab_Template", $c->Get('ThemeId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Template"); $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); + +if ($objSession->GetVariable("HasChanges") == 1) { ?> + + + + +
+ +
+ + + + + + +
+ +
+
" method=POST> Index: trunk/admin/category/addcategory_relations.php =================================================================== diff -u -N -r661 -r822 --- trunk/admin/category/addcategory_relations.php (.../addcategory_relations.php) (revision 661) +++ trunk/admin/category/addcategory_relations.php (.../addcategory_relations.php) (revision 822) @@ -382,6 +382,18 @@ } $objListToolBar->AddToInitScript("fwLoadMenus();\n"); + + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("CatRelSearchWord") != '') { + $filter = true; +} +else { + if ($RelView != $Rel_AllValue) { + $filter = true; + } +} + $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); if ($objSession->GetVariable("HasChanges") == 1) { @@ -394,6 +406,15 @@
+ + + + + +
+ +
+ PrintList(); Index: trunk/admin/logs/summary.php =================================================================== diff -u -N -r374 -r822 --- trunk/admin/logs/summary.php (.../summary.php) (revision 374) +++ trunk/admin/logs/summary.php (.../summary.php) (revision 822) @@ -191,10 +191,23 @@ $objListView->ConfigureViewMenu("Summary_SortField","Summary_SortOrder","Module", "",0,0); +$filter = false; +if ($SearchWords != '') { + $filter = true; +} + $title = admin_language("la_Showing_Stats")." (".$itemcount.")"; $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> + + + + +
+ +
+ PrintList(); ?> Index: trunk/admin/config/addtheme.php =================================================================== diff -u -N -r766 -r822 --- trunk/admin/config/addtheme.php (.../addtheme.php) (revision 766) +++ trunk/admin/config/addtheme.php (.../addtheme.php) (revision 822) @@ -172,7 +172,17 @@ int_header($objCatToolBar,NULL,$title); $c->Data=inp_htmlize($c->Data); -?> + +if ($objSession->GetVariable("HasChanges") == 1) { +?> + + + + +
+ +
+ Index: trunk/admin/users/adduser_custom.php =================================================================== diff -u -N -r777 -r822 --- trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 777) +++ trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 822) @@ -144,7 +144,16 @@ int_header($objListToolbar,NULL,$title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ Logout(); - header("Location: ".$adminURL."/login.php"); - die(); - //require_once($pathtoroot."admin/login.php"); -} - -//admin only util -$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); -$admin = $objConfig->Get("AdminDirectory"); -if(!strlen($admin)) - $admin = "admin"; - -$localURL=$rootURL."kernel/"; -$adminURL = $rootURL.$admin; -$imagesURL = $adminURL."/images"; - -require_once ($pathtoroot.$admin."/include/elements.php"); -require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once($pathtoroot.$admin."/toolbar.php"); -require_once($pathtoroot.$admin."/listview/listview.php"); - -$m = GetModuleArray(); -foreach($m as $key=>$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -unset($objEditItems); - -//$objEditItems = new clsPhraseList(); -//$objEditItems->SourceTable = $objSession->GetEditTable("Language"); - -/* -------------------------------------- Section configuration ------------------------------------------- */ -$section = $_GET["section"]; -$sec = $objSections->GetSection($section); - -$module = $_GET["module"]; -$envar = "env=" . BuildEnv()."&module=$module§ion=$section"; - -//$title = prompt_language("la_Text_Configuration")." - '".$module."' - ".prompt_language("la_tab_EmailEvents"); - -$SortFieldVar = "Event_LV_SortField"; -$SortOrderVar = "Event_LV_SortOrder"; -$DefaultSortField = "Description"; -$PerPageVar = "Perpage_Event"; -$CurrentPageVar = "Page_Event"; -$CurrentFilterVar = "EmailEvent_View"; - -$ListForm = "language"; -$CheckClass = "EmailChecks"; - - -//echo $envar."
\n"; -/* ------------------------------------- Configure the toolbar ------------------------------------------- */ -$objListToolBar = new clsToolBar(); -$objListToolBar->Set("section",$section); -$objListToolBar->Set("load_menu_func",""); -$objListToolBar->Set("CheckClass","EmailChecks"); -$objListToolBar->Set("CheckClass",$CheckClass); -$objListToolBar->Set("CheckForm",$ListForm); - -$listImages = array(); - -/* -$objListToolBar->Add("email_edit", "la_ToolTip_Edit","#","if (EmailChecks.itemChecked()) swap('email_edit','toolbar/tool_edit_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_edit', 'toolbar/tool_edit.gif');", - "EmailChecks.check_submit('email_edit', '');", - "tool_edit.gif"); -$listImages[] = "EmailChecks.addImage('email_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; -*/ - -$EditVar = "env=".BuildEnv(); - -$objListToolBar->Add("email_user", "la_ToolTip_Email_UserSelect","#","if (EmailChecks.itemChecked()) swap('email_user','toolbar/tool_usertogroup_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_user', 'toolbar/tool_usertogroup.gif');", - "OpenUserSelector('EventId',$CheckClass,'".$EditVar."&Selector=radio&destform=userpopup&destfield=FromUserId&IdField=PortalUserId&dosubmit=1');", - "tool_usertogroup.gif",TRUE,TRUE); - -$listImages[] = "EmailChecks.addImage('email_user','$imagesURL/toolbar/tool_usertogroup.gif','$imagesURL/toolbar/tool_usertogroup_f3.gif',1); "; - -$objListToolBar->Add("email_enable", "la_ToolTip_Email_Enable","#","if (EmailChecks.itemChecked()) swap('email_enable','toolbar/tool_approve_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_enable', 'toolbar/tool_approve.gif');", - "EmailChecks.check_submit('module_email', 'm_emailevent_enable');", - "tool_approve.gif",FALSE,TRUE); - -$listImages[] = "EmailChecks.addImage('email_enable','$imagesURL/toolbar/tool_approve.gif','$imagesURL/toolbar/tool_approve_f3.gif',1); "; - -$objListToolBar->Add("email_disable", "la_ToolTip_Email_Disable","#","if (EmailChecks.itemChecked()) swap('email_disable','toolbar/tool_deny_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_disable', 'toolbar/tool_deny.gif');", - "EmailChecks.check_submit('module_email', 'm_emailevent_disable');", - "tool_deny.gif",FALSE,TRUE); - -$listImages[] = "EmailChecks.addImage('email_disable','$imagesURL/toolbar/tool_deny.gif','$imagesURL/toolbar/tool_deny_f3.gif',1); "; - -$objListToolBar->Add("email_front", "la_ToolTip_Email_FrontOnly","#","if (EmailChecks.itemChecked()) swap('email_front','toolbar/tool_frontend_mail_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_front', 'toolbar/tool_frontend_mail.gif');", - "EmailChecks.check_submit('module_email', 'm_emailevent_frontonly');", - "tool_frontend_mail.gif",FALSE,TRUE); - -$listImages[] = "EmailChecks.addImage('email_front','$imagesURL/toolbar/tool_frontend_mail.gif','$imagesURL/toolbar/tool_frontend_mail_f3.gif',1); "; - - -$objListToolBar->Add("divider"); - -$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ", - "swap('viewmenubutton', 'toolbar/tool_view.gif');", - "ShowViewMenu();","tool_view.gif"); - - -$objListToolBar->AddToInitScript($listImages); -$objListToolBar->AddToInitScript("fwLoadMenus();"); - -$objEvents = new clsEventList(); -//$objEvents->SourceTable = $objSession->GetEditTable("Events"); - -$order = trim($objConfig->Get("Event_LV_SortField")." ".$objConfig->Get("Event_LV_SortOrder")); - -$SearchWords = $objSession->GetVariable("EmailEventSearchWord"); -$where = "(Module='$module')"; -if(strlen($SearchWords)) - $where .= ' AND '.$objEvents->AdminSearchWhereClause($SearchWords); - -/* ----------------------------------------- Set the View Filter ---------------------------------------- */ -$ViewNormal=1; -$Bit_Disabled=2; -$Bit_Enabled=1; -$Bit_FrontOnly=4; -$Bit_All = 7; -$FilterLabels[0] = admin_language("la_Text_Enabled"); -$FilterLabels[1] = admin_language("la_Text_Disabled"); -$FilterLabels[2] = admin_language("la_Text_FrontOnly"); - -/* determine current view menu settings */ -$MsgView = $objConfig->Get("EmailEvent_View"); - -$ViewNormal=0; - -if(!is_numeric($MsgView)) -{ - $MsgView = $Bit_All; //Set all bits ON - $MsgFilter = ""; -} -unset($Status); -$Status = array(); - -if($MsgView & $Bit_Disabled) - $Status[] = 0; - -if($MsgView & $Bit_Enabled) - $Status[] = 1; - -if($MsgView & $Bit_FrontOnly) - $Status[] = 2; - -if(count($Status)>0) -{ - $MsgFilter = "Enabled IN (".implode(",",$Status).")"; -} -else - $MsgFilter = "Enabled = -1"; - -$UserTable = GetTablePrefix()."PortalUser"; -$EventTable = GetTablePrefix()."Events"; -$MessageTable = GetTablePrefix()."EmailMessage"; - -$sql = "SELECT e.Description as Description, e.Module as Module, e.EventId as EventId, "; -$sql .="ELT(e.Enabled+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")."','".admin_language("la_Text_FrontOnly")." ') as EmailStatus, "; -$sql .="ELT(e.Type+1,'".admin_language("la_Text_User")." ','".admin_language("la_Text_Admin")." ') as EventType, "; -$sql .="u.Login as FromUser FROM $EventTable as e LEFT JOIN $UserTable as u ON (e.FromUserId=u.PortalUserId) WHERE $where "; -if(strlen($MsgFilter)) - $sql .= "AND $MsgFilter "; - -if(strlen(trim($objConfig->Get($SortFieldVar)))) -{ - $order = " ORDER BY ".$objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar); -} -else - $order = ""; - -if($objConfig->Get($CurrentPageVar)>0) -{ - $objEvents->Page = $objConfig->Get($CurrentPageVar); -} - -if($objConfig->Get($PerPageVar)>0) -{ - $objListView->PerPage = $objConfig->Get($PerPageVar); -} - -$sql .= $order." "; - -if($objSession->HasSystemPermission("DEBUG.LIST")) - echo htmlentities($sql,ENT_NOQUOTES)."
\n"; - -$objListView = new clsListView($objListToolBar); -$objListView->CurrentPageVar = $CurrentPageVar; -$objListView->PerPageVar = $PerPageVar; - -$objEvents->Query_Item($sql, $objListView->GetLimitSQL() ); -//$itemcount = TableCount($objEvents->SourceTable, $where, 0); -$itemcount = QueryCount($sql); - -$objListView->SetListItems($objEvents); -$objListView->IdField = "EventId"; - -$order = $objConfig->Get($PerPageVar); - -$objListView->ColumnHeaders->Add("Description",admin_language("la_prompt_Description"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"Description"); -//$objListView->ColumnHeaders->Add("Module",admin_language("la_prompt_Module"),1,0,$order,"width=\"10%\"","Email_LV_SortField","Email_LV_SortOrder","Module"); -$objListView->ColumnHeaders->Add("EventType",admin_language("la_prompt_Type"),1,0,$order,"width=\"10%\"",$SortFieldVar,$SortOrderVar,"EventType"); -$objListView->ColumnHeaders->Add("EmailStatus",admin_language("la_prompt_Status"),1,0,$order,"width=\"10%\"",$SortFieldVar,$SortOrderVar,"EmailStatus"); -$objListView->ColumnHeaders->Add("FromUser",admin_language("la_prompt_FromUser"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"FromUser"); - -$objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); - -$objListView->PrintToolBar = FALSE; -$objListView->checkboxes = TRUE; -$objListView->CheckboxName = "itemlist[]"; -$objListView->SearchBar = TRUE; -$objListView->SearchKeywords = $SearchWords; -$objListView->SearchAction="m_emailevent_search"; - -$objListView->TotalItemCount = $itemcount; - -$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField, - $CurrentFilterVar,$MsgView,$Bit_All); - -foreach($FilterLabels as $Bit=>$Label) -{ - $objListView->AddViewMenuFilter($Label,$Bit); -} - -for($i=0;$iItems);$i++) -{ - $e =& $objEvents->GetItemRefByIndex($i); - $e->Set("Description",prompt_language($e->Get("Description"))); -} - -$h = "\n\n\n"; -int_header($objListToolBar,NULL, $title,NULL,$h); -?> -" method=POST> - - -PrintList(); -?> - - - - - - > - - - -
-
- - -
" name="viewmenu"> - - - - -
-
"> - - -
- -
" ID="popup"> - - - - - - - -
- -
" ID="userpopup"> - - - -
- - - - +Logout(); + + header("Location: ".$adminURL."/login.php"); + + die(); + + //require_once($pathtoroot."admin/login.php"); + +} + + + +//admin only util + +$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); + +$admin = $objConfig->Get("AdminDirectory"); + +if(!strlen($admin)) + + $admin = "admin"; + + + +$localURL=$rootURL."kernel/"; + +$adminURL = $rootURL.$admin; + +$imagesURL = $adminURL."/images"; + + + +require_once ($pathtoroot.$admin."/include/elements.php"); + +require_once ($pathtoroot."kernel/admin/include/navmenu.php"); + +require_once($pathtoroot.$admin."/toolbar.php"); + +require_once($pathtoroot.$admin."/listview/listview.php"); + + + +$m = GetModuleArray(); + +foreach($m as $key=>$value) + +{ + + $path = $pathtoroot. $value."admin/include/parser.php"; + + if(file_exists($path)) + + { + + include_once($path); + + } + +} + + + +unset($objEditItems); + + + +//$objEditItems = new clsPhraseList(); + +//$objEditItems->SourceTable = $objSession->GetEditTable("Language"); + + + +/* -------------------------------------- Section configuration ------------------------------------------- */ + +$section = $_GET["section"]; + +$sec = $objSections->GetSection($section); + + + +$module = $_GET["module"]; + +$envar = "env=" . BuildEnv()."&module=$module§ion=$section"; + + + +//$title = prompt_language("la_Text_Configuration")." - '".$module."' - ".prompt_language("la_tab_EmailEvents"); + + + +$SortFieldVar = "Event_LV_SortField"; + +$SortOrderVar = "Event_LV_SortOrder"; + +$DefaultSortField = "Description"; + +$PerPageVar = "Perpage_Event"; + +$CurrentPageVar = "Page_Event"; + +$CurrentFilterVar = "EmailEvent_View"; + + + +$ListForm = "language"; + +$CheckClass = "EmailChecks"; + + + + + +//echo $envar."
\n"; + +/* ------------------------------------- Configure the toolbar ------------------------------------------- */ + +$objListToolBar = new clsToolBar(); + +$objListToolBar->Set("section",$section); + +$objListToolBar->Set("load_menu_func",""); + +$objListToolBar->Set("CheckClass","EmailChecks"); + +$objListToolBar->Set("CheckClass",$CheckClass); + +$objListToolBar->Set("CheckForm",$ListForm); + + + +$listImages = array(); + + + +/* + +$objListToolBar->Add("email_edit", "la_ToolTip_Edit","#","if (EmailChecks.itemChecked()) swap('email_edit','toolbar/tool_edit_f2.gif');", + + "if (EmailChecks.itemChecked()) swap('email_edit', 'toolbar/tool_edit.gif');", + + "EmailChecks.check_submit('email_edit', '');", + + "tool_edit.gif"); + +$listImages[] = "EmailChecks.addImage('email_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; + +*/ + + + +$EditVar = "env=".BuildEnv(); + + + +$objListToolBar->Add("email_user", "la_ToolTip_Email_UserSelect","#","if (EmailChecks.itemChecked()) swap('email_user','toolbar/tool_usertogroup_f2.gif');", + + "if (EmailChecks.itemChecked()) swap('email_user', 'toolbar/tool_usertogroup.gif');", + + "OpenUserSelector('EventId',$CheckClass,'".$EditVar."&Selector=radio&destform=userpopup&destfield=FromUserId&IdField=PortalUserId&dosubmit=1');", + + "tool_usertogroup.gif",TRUE,TRUE); + + + +$listImages[] = "EmailChecks.addImage('email_user','$imagesURL/toolbar/tool_usertogroup.gif','$imagesURL/toolbar/tool_usertogroup_f3.gif',1); "; + + + +$objListToolBar->Add("email_enable", "la_ToolTip_Email_Enable","#","if (EmailChecks.itemChecked()) swap('email_enable','toolbar/tool_approve_f2.gif');", + + "if (EmailChecks.itemChecked()) swap('email_enable', 'toolbar/tool_approve.gif');", + + "EmailChecks.check_submit('module_email', 'm_emailevent_enable');", + + "tool_approve.gif",FALSE,TRUE); + + + +$listImages[] = "EmailChecks.addImage('email_enable','$imagesURL/toolbar/tool_approve.gif','$imagesURL/toolbar/tool_approve_f3.gif',1); "; + + + +$objListToolBar->Add("email_disable", "la_ToolTip_Email_Disable","#","if (EmailChecks.itemChecked()) swap('email_disable','toolbar/tool_deny_f2.gif');", + + "if (EmailChecks.itemChecked()) swap('email_disable', 'toolbar/tool_deny.gif');", + + "EmailChecks.check_submit('module_email', 'm_emailevent_disable');", + + "tool_deny.gif",FALSE,TRUE); + + + +$listImages[] = "EmailChecks.addImage('email_disable','$imagesURL/toolbar/tool_deny.gif','$imagesURL/toolbar/tool_deny_f3.gif',1); "; + + + +$objListToolBar->Add("email_front", "la_ToolTip_Email_FrontOnly","#","if (EmailChecks.itemChecked()) swap('email_front','toolbar/tool_frontend_mail_f2.gif');", + + "if (EmailChecks.itemChecked()) swap('email_front', 'toolbar/tool_frontend_mail.gif');", + + "EmailChecks.check_submit('module_email', 'm_emailevent_frontonly');", + + "tool_frontend_mail.gif",FALSE,TRUE); + + + +$listImages[] = "EmailChecks.addImage('email_front','$imagesURL/toolbar/tool_frontend_mail.gif','$imagesURL/toolbar/tool_frontend_mail_f3.gif',1); "; + + + + + +$objListToolBar->Add("divider"); + + + +$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ", + + "swap('viewmenubutton', 'toolbar/tool_view.gif');", + + "ShowViewMenu();","tool_view.gif"); + + + + + +$objListToolBar->AddToInitScript($listImages); + +$objListToolBar->AddToInitScript("fwLoadMenus();"); + + + +$objEvents = new clsEventList(); + +//$objEvents->SourceTable = $objSession->GetEditTable("Events"); + + + +$order = trim($objConfig->Get("Event_LV_SortField")." ".$objConfig->Get("Event_LV_SortOrder")); + + + +$SearchWords = $objSession->GetVariable("EmailEventSearchWord"); + +$where = "(Module='$module')"; + +if(strlen($SearchWords)) + + $where .= ' AND '.$objEvents->AdminSearchWhereClause($SearchWords); + + + +/* ----------------------------------------- Set the View Filter ---------------------------------------- */ + +$ViewNormal=1; + +$Bit_Disabled=2; + +$Bit_Enabled=1; + +$Bit_FrontOnly=4; + +$Bit_All = 7; + +$FilterLabels[0] = admin_language("la_Text_Enabled"); + +$FilterLabels[1] = admin_language("la_Text_Disabled"); + +$FilterLabels[2] = admin_language("la_Text_FrontOnly"); + + + +/* determine current view menu settings */ + +$MsgView = $objConfig->Get("EmailEvent_View"); + + + +$ViewNormal=0; + + + +if(!is_numeric($MsgView)) + +{ + + $MsgView = $Bit_All; //Set all bits ON + + $MsgFilter = ""; + +} + +unset($Status); + +$Status = array(); + + + +if($MsgView & $Bit_Disabled) + + $Status[] = 0; + + + +if($MsgView & $Bit_Enabled) + + $Status[] = 1; + + + +if($MsgView & $Bit_FrontOnly) + + $Status[] = 2; + + + +if(count($Status)>0) + +{ + + $MsgFilter = "Enabled IN (".implode(",",$Status).")"; + +} + +else + + $MsgFilter = "Enabled = -1"; + + + +$UserTable = GetTablePrefix()."PortalUser"; + +$EventTable = GetTablePrefix()."Events"; + +$MessageTable = GetTablePrefix()."EmailMessage"; + + + +$sql = "SELECT e.Description as Description, e.Module as Module, e.EventId as EventId, "; + +$sql .="ELT(e.Enabled+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")."','".admin_language("la_Text_FrontOnly")." ') as EmailStatus, "; + +$sql .="ELT(e.Type+1,'".admin_language("la_Text_User")." ','".admin_language("la_Text_Admin")." ') as EventType, "; + +$sql .="u.Login as FromUser FROM $EventTable as e LEFT JOIN $UserTable as u ON (e.FromUserId=u.PortalUserId) WHERE $where "; + +if(strlen($MsgFilter)) + + $sql .= "AND $MsgFilter "; + + + +if(strlen(trim($objConfig->Get($SortFieldVar)))) + +{ + + $order = " ORDER BY ".$objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar); + +} + +else + + $order = ""; + + + +if($objConfig->Get($CurrentPageVar)>0) + +{ + + $objEvents->Page = $objConfig->Get($CurrentPageVar); + +} + + + +if($objConfig->Get($PerPageVar)>0) + +{ + + $objListView->PerPage = $objConfig->Get($PerPageVar); + +} + + + +$sql .= $order." "; + + + +if($objSession->HasSystemPermission("DEBUG.LIST")) + + echo htmlentities($sql,ENT_NOQUOTES)."
\n"; + + + +$objListView = new clsListView($objListToolBar); + +$objListView->CurrentPageVar = $CurrentPageVar; + +$objListView->PerPageVar = $PerPageVar; + + + +$objEvents->Query_Item($sql, $objListView->GetLimitSQL() ); + +//$itemcount = TableCount($objEvents->SourceTable, $where, 0); + +$itemcount = QueryCount($sql); + + + +$objListView->SetListItems($objEvents); + +$objListView->IdField = "EventId"; + + + +$order = $objConfig->Get($PerPageVar); + + + +$objListView->ColumnHeaders->Add("Description",admin_language("la_prompt_Description"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"Description"); + +//$objListView->ColumnHeaders->Add("Module",admin_language("la_prompt_Module"),1,0,$order,"width=\"10%\"","Email_LV_SortField","Email_LV_SortOrder","Module"); + +$objListView->ColumnHeaders->Add("EventType",admin_language("la_prompt_Type"),1,0,$order,"width=\"10%\"",$SortFieldVar,$SortOrderVar,"EventType"); + +$objListView->ColumnHeaders->Add("EmailStatus",admin_language("la_prompt_Status"),1,0,$order,"width=\"10%\"",$SortFieldVar,$SortOrderVar,"EmailStatus"); + +$objListView->ColumnHeaders->Add("FromUser",admin_language("la_prompt_FromUser"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"FromUser"); + + + +$objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); + + + +$objListView->PrintToolBar = FALSE; + +$objListView->checkboxes = TRUE; + +$objListView->CheckboxName = "itemlist[]"; + +$objListView->SearchBar = TRUE; + +$objListView->SearchKeywords = $SearchWords; + +$objListView->SearchAction="m_emailevent_search"; + + + +$objListView->TotalItemCount = $itemcount; + + + +$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField, + + $CurrentFilterVar,$MsgView,$Bit_All); + + + +foreach($FilterLabels as $Bit=>$Label) + +{ + + $objListView->AddViewMenuFilter($Label,$Bit); + +} + + + +for($i=0;$iItems);$i++) + +{ + + $e =& $objEvents->GetItemRefByIndex($i); + + $e->Set("Description",prompt_language($e->Get("Description"))); + +} + +$filter = false; // always initialize variables before use + +if($objSession->GetVariable("EmailEventSearchWord") != '') { + $filter = true; +} +else { + if ($MsgView != $Bit_All) { + $filter = true; + } +} + + +$h = "\n\n\n"; + +int_header($objListToolBar,NULL, $title,NULL,$h); + +if ($filter) { ?> + + + + +
+ +
+ + +
" method=POST> + + + + + +PrintList(); + +?> + + + + + + + + + + + + > + + + + + + + +
+ +
+ + + + + +
" name="viewmenu"> + + + + + + + + + +
+ +
"> + + + + + +
+ + + +
" ID="popup"> + + + + + + + + + + + + + + + +
+ + + +
" ID="userpopup"> + + + + + + + +
+ + + + + + + + + Index: trunk/admin/config/config_theme.php =================================================================== diff -u -N -r374 -r822 --- trunk/admin/config/config_theme.php (.../config_theme.php) (revision 374) +++ trunk/admin/config/config_theme.php (.../config_theme.php) (revision 822) @@ -195,10 +195,25 @@ $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); +$objSession->SetVariable("HasChanges", 0); + +$filter = false; +if ($SearchWords != '') { + $filter = true; +} + $title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Theme"); $h = "\n\n\n"; int_header($objListToolBar,NULL,$title, NULL, $h); -?> +if ($filter) { ?> + + + + +
+ +
+
" method=POST> Index: trunk/admin/toolbar.php =================================================================== diff -u -N -r721 -r822 --- trunk/admin/toolbar.php (.../toolbar.php) (revision 721) +++ trunk/admin/toolbar.php (.../toolbar.php) (revision 822) @@ -174,22 +174,29 @@ function GetActionHandlerScript() { $o = ''; - if(strlen($this->DoubleClickAction)>0) + + $o .= "function handleDoubleClick()\n{\n"; + + if(strlen($this->DoubleClickAction)>0) { - $o .= "function handleDoubleClick()\n{\n"; $o .= " ".$this->DoubleClickAction."\n"; - $o .= "}\n\n"; } - if(count($this->ContextMenu)) + else { + $o .= 'return'; + } + + $o .= "}\n\n"; + + if(count($this->ContextMenu)) + { + $o .= "function initContextMenu()\n{\n"; + $o .= " window.contextMenu = new Menu(\"Context\");"; + for($x=0;$xContextMenu);$x++) { - $o .= "function initContextMenu()\n{\n"; - $o .= " window.contextMenu = new Menu(\"Context\");"; - for($x=0;$xContextMenu);$x++) - { - $o .= " ".$this->ContextMenu[$x]."\n"; - } - $o .= " window.triedToWriteMenus = false;\n window.contextMenu.writeMenus();\n return true;\n}\n"; + $o .= " ".$this->ContextMenu[$x]."\n"; } + $o .= " window.triedToWriteMenus = false;\n window.contextMenu.writeMenus();\n return true;\n}\n"; + } return $o; } Index: trunk/admin/users/adduser_images.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/adduser_images.php (.../adduser_images.php) (revision 624) +++ trunk/admin/users/adduser_images.php (.../adduser_images.php) (revision 822) @@ -294,9 +294,33 @@ $objListToolBar->AddToInitScript("fwLoadMenus();\n"); +$filter = false; // always initialize variables before use + +if ($ImgView != $Img_AllValue) { + $filter = true; +} + $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ + + + + + +
+ +
+ " method=POST> Index: trunk/admin/users/user_groups.php =================================================================== diff -u -N -r724 -r822 --- trunk/admin/users/user_groups.php (.../user_groups.php) (revision 724) +++ trunk/admin/users/user_groups.php (.../user_groups.php) (revision 822) @@ -250,10 +250,30 @@ } */ $objListToolBar->AddToInitScript("fwLoadMenus();"); + +$objSession->SetVariable("HasChanges", 0); + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("GroupSearchWord") != '') { + $filter = true; +} +else { + if ($GroupView != $Bit_All) { + $filter = true; + } +} $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ PageLinks = $objListView->PrintPageLinks(); /* call this before we slice! */ Index: trunk/admin/logs/session_list.php =================================================================== diff -u -N -r746 -r822 --- trunk/admin/logs/session_list.php (.../session_list.php) (revision 746) +++ trunk/admin/logs/session_list.php (.../session_list.php) (revision 822) @@ -257,12 +257,30 @@ foreach($FilterLabels as $Bit=>$Label) { $objListView->AddViewMenuFilter($Label,$Bit); - } + } + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("SessionSearchWord") != '') { + $filter = true; +} +else { + if ($SessionView != $Bit_All) { + $filter = true; + } +} $title = admin_language("la_Show_Log")." (".$objUsers->NumItems().")"; $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> + + + + +
+ +
+ PrintList(); Index: trunk/admin/users/user_addimage.php =================================================================== diff -u -N -r705 -r822 --- trunk/admin/users/user_addimage.php (.../user_addimage.php) (revision 705) +++ trunk/admin/users/user_addimage.php (.../user_addimage.php) (revision 822) @@ -178,7 +178,16 @@ //echo "
"; print_r($objCatToolBar); echo "
"; int_header($objCatToolBar,NULL,$title); -?> +if ($objSession->GetVariable("HasChanges") == 1) { +?> + + + + +
+ +
+ Index: trunk/admin/category/addcategory_images.php =================================================================== diff -u -N -r374 -r822 --- trunk/admin/category/addcategory_images.php (.../addcategory_images.php) (revision 374) +++ trunk/admin/category/addcategory_images.php (.../addcategory_images.php) (revision 822) @@ -298,6 +298,11 @@ $objListToolBar->AddToInitScript("fwLoadMenus();\n"); +$filter = false; // always initialize variables before use +if ($ImgView != $Img_AllValue) { + $filter = true; +} + $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); if ($objSession->GetVariable("HasChanges") == 1) { @@ -310,6 +315,15 @@
+ + + + + +
+ +
+ " method=POST> Index: trunk/admin/config/addlang_email.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/config/addlang_email.php (.../addlang_email.php) (revision 624) +++ trunk/admin/config/addlang_email.php (.../addlang_email.php) (revision 822) @@ -338,11 +338,41 @@ } +$filter = false; // always initialize variables before use +if($objSession->GetVariable("LangEmailEventSearchWord") != '') { + $filter = true; +} +else { + if ($MsgView != $Bit_All) { + $filter = true; + } +} + + $title = $title = GetTitle("la_Text_Pack", "la_tab_EmailEvents", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - '".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_EmailEvents"); $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); + +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ + + + + + +
+ +
+ " method=POST> Index: trunk/admin/users/user_list.php =================================================================== diff -u -N -r603 -r822 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 603) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 822) @@ -266,6 +266,8 @@ } //$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar)); +$objSession->SetVariable("HasChanges", 0); + if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; $objListView = new clsListView($objListToolBar); @@ -323,9 +325,27 @@ } $objListToolBar->AddToInitScript("fwLoadMenus();"); +$filter = false; // always initialize variables before use +if($objSession->GetVariable("UserSearchWord") != '') { + $filter = true; +} +else { + if ($UserView != $Bit_All) { + $filter = true; + } +} + $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); -?> +if ($filter) { ?> +
+ + + +
+ +
+ PrintList(); Index: trunk/admin/users/user_addpermission.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/user_addpermission.php (.../user_addpermission.php) (revision 624) +++ trunk/admin/users/user_addpermission.php (.../user_addpermission.php) (revision 822) @@ -148,7 +148,16 @@ //echo "
"; print_r($objCatToolBar); echo "
"; int_header($objCatToolBar,NULL,$title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> + + + + +
+ +
+ Index: trunk/admin/users/addgroup.php =================================================================== diff -u -N -r738 -r822 --- trunk/admin/users/addgroup.php (.../addgroup.php) (revision 738) +++ trunk/admin/users/addgroup.php (.../addgroup.php) (revision 822) @@ -170,7 +170,16 @@ } int_header($objCatToolBar,NULL,$title); -?> +if ($objSession->GetVariable("HasChanges") == 1) { +?> +
+ + + +
+ +
+ Index: trunk/admin/users/addgroup_permissions.php =================================================================== diff -u -N -r624 -r822 --- trunk/admin/users/addgroup_permissions.php (.../addgroup_permissions.php) (revision 624) +++ trunk/admin/users/addgroup_permissions.php (.../addgroup_permissions.php) (revision 822) @@ -138,7 +138,16 @@ } int_header($objCatToolBar,NULL,$title); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ Index: trunk/admin/users/adduser_groups.php =================================================================== diff -u -N -r724 -r822 --- trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 724) +++ trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 822) @@ -276,10 +276,33 @@ }*/ $objListToolBar->AddToInitScript("fwLoadMenus();"); + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("GroupSearchWord") != '') { + $filter = true; +} $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); +if ($objSession->GetVariable("HasChanges") == 1) { ?> +
+ + + +
+ +
+ + + + + + +
+ +
+ PageLinks = $objListView->PrintPageLinks(); /* call this before we slice! */ Index: trunk/admin/users/addgroup_users.php =================================================================== diff -u -N -r738 -r822 --- trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 738) +++ trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 822) @@ -278,12 +278,41 @@ { $objListView->AddViewMenuFilter($Label,$Bit); } + +$filter = false; // always initialize variables before use +if($objSession->GetVariable("UserGroupSearchWord") != '') { + $filter = true; +} +else { + if ($UserView != $Bit_All) { + $filter = true; + } +} + $title = GetTitle("la_Text_Group", "la_tab_Users", $c->Get('GroupId'), $c->Get('Name'));//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_Group")." '".$c->Get("Name")."' - ".prompt_language("la_tab_Users"); $h = "\n\n\n"; int_header($objListToolBar,NULL, $title,NULL,$h); +if ($objSession->GetVariable("HasChanges") == 1) { ?> + + + + +
+ +
+ + + + + + +
+ +
+ PrintList();