-const char w32log_rcs[] = "$Id: w32log.c,v 1.6 2001/05/26 00:31:30 jongfoster Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.13 2001/07/19 19:15:14 haroon Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Revisions :
* $Log: w32log.c,v $
+ * Revision 1.13 2001/07/19 19:15:14 haroon
+ * - Added a FIXME for EditFile but didn't fix :-)
+ *
+ * Revision 1.12 2001/07/13 14:04:59 oes
+ * Removed all #ifdef PCRS
+ *
+ * Revision 1.11 2001/06/07 23:08:12 jongfoster
+ * Forward and ACL edit options removed.
+ *
+ * Revision 1.10 2001/05/31 21:37:11 jongfoster
+ * GUI changes to rename "permissions file" to "actions file".
+ *
+ * Revision 1.9 2001/05/31 17:33:13 oes
+ *
+ * CRLF -> LF
+ *
+ * Revision 1.8 2001/05/29 09:50:24 jongfoster
+ * Unified blocklist/imagelist/permissionslist.
+ * File format is still under discussion, but the internal changes
+ * are (mostly) done.
+ *
+ * Also modified interceptor behaviour:
+ * - We now intercept all URLs beginning with one of the following
+ * prefixes (and *only* these prefixes):
+ * * http://i.j.b/
+ * * http://ijbswa.sf.net/config/
+ * * http://ijbswa.sourceforge.net/config/
+ * - New interceptors "home page" - go to http://i.j.b/ to see it.
+ * - Internal changes so that intercepted and fast redirect pages
+ * are not replaced with an image.
+ * - Interceptors now have the option to send a binary page direct
+ * to the client. (i.e. ijb-send-banner uses this)
+ * - Implemented show-url-info interceptor. (Which is why I needed
+ * the above interceptors changes - a typical URL is
+ * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
+ * The previous mechanism would not have intercepted that, and
+ * if it had been intercepted then it then it would have replaced
+ * it with an image.)
+ *
+ * Revision 1.7 2001/05/26 01:26:34 jongfoster
+ * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
+ * This #define cannot be set from ./configure - there's no point, it
+ * doesn't work yet. See feature request # 425722
+ *
* Revision 1.6 2001/05/26 00:31:30 jongfoster
* Fixing compiler warning about comparing signed/unsigned.
*
#include "jcc.h"
#include "miscutil.h"
#include "errlog.h"
+#include "loadcfg.h"
const char w32res_h_rcs[] = W32RES_H_VERSION;
/* FIXME: this is a kludge */
-const char * g_blockfile = NULL;
-const char * g_permissions_file = NULL;
-const char * g_forwardfile = NULL;
-#ifdef ACL_FILES
-const char * g_aclfile = NULL;
-#endif /* def ACL_FILES */
-#ifdef USE_IMAGE_LIST
-const char * g_imagefile = NULL;
-#endif /* def USE_IMAGE_LIST */
-#ifdef PCRS
+const char * g_actions_file = NULL;
const char * g_re_filterfile = NULL;
-#endif
#ifdef TRUST_FILES
const char * g_trustfile = NULL;
#endif /* def TRUST_FILES */
* Function : EditFile
*
* Description : Opens the specified setting file for editing.
+ * FIXME: What if the file has no associated application. Check for return values
+* from ShellExecute??
*
* Parameters :
* 1 : filename = filename from the config (aka junkbstr.txt) file.
if (hMenu != NULL)
{
HMENU hMenuPopup = GetSubMenu(hMenu, 0);
-#ifdef WIN_GUI_EDIT\r
+#ifdef WIN_GUI_EDIT
char *szURL;
-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */
/* Check if there is a selection */
CHARRANGE range;
{
EnableMenuItem(hMenuPopup, ID_EDIT_COPY, MF_BYCOMMAND | MF_ENABLED);
}
-\r
-#ifdef WIN_GUI_EDIT\r
+
+#ifdef WIN_GUI_EDIT
/* Check if cursor is over a link */
szURL = LogGetURLUnderCursor();
if (szURL)
free(szURL);
}
-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */
/* Display the popup */
TrackPopupMenu(hMenuPopup, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, x, y, 0, g_hwndLogFrame, NULL);
EditFile(configfile);
break;
- case ID_TOOLS_EDITBLOCKERS:
- EditFile(g_blockfile);
+ case ID_TOOLS_EDITACTIONS:
+ EditFile(g_actions_file);
break;
- case ID_TOOLS_EDITPERMISSIONS:
- EditFile(g_permissions_file);
- break;
-
- case ID_TOOLS_EDITFORWARD:
- EditFile(g_forwardfile);
- break;
-
-#ifdef ACL_FILES
- case ID_TOOLS_EDITACLS:
- EditFile(g_aclfile);
- break;
-#endif /* def ACL_FILES */
-
-#ifdef USE_IMAGE_LIST
- case ID_TOOLS_EDITIMAGE:
- EditFile(g_imagefile);
- break;
-#endif /* def USE_IMAGE_LIST */
-
-#ifdef PCRS
case ID_TOOLS_EDITPERLRE:
EditFile(g_re_filterfile);
break;
-#endif
#ifdef TRUST_FILES
case ID_TOOLS_EDITTRUST:
break;
#endif /* def TRUST_FILES */
-#ifdef WIN_GUI_EDIT\r
+#ifdef WIN_GUI_EDIT
case ID_NEW_BLOCKER:
ShowRulesDialog(g_hwndLogFrame);
break;
-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */
case ID_HELP_GPL:
ShellExecute(g_hwndLogFrame, "open", "gpl.html", NULL, NULL, SW_SHOWNORMAL);
void OnLogInitMenu(HMENU hmenu)
{
/* Only enable editors if there is a file to edit */
- EnableMenuItem(hmenu, ID_TOOLS_EDITPERMISSIONS, MF_BYCOMMAND | (g_permissions_file ? MF_ENABLED : MF_GRAYED));
- EnableMenuItem(hmenu, ID_TOOLS_EDITBLOCKERS, MF_BYCOMMAND | (g_blockfile ? MF_ENABLED : MF_GRAYED));
- EnableMenuItem(hmenu, ID_TOOLS_EDITFORWARD, MF_BYCOMMAND | (g_forwardfile ? MF_ENABLED : MF_GRAYED));
-#ifdef ACL_FILES
- EnableMenuItem(hmenu, ID_TOOLS_EDITACLS, MF_BYCOMMAND | (g_aclfile ? MF_ENABLED : MF_GRAYED));
-#endif /* def ACL_FILES */
-#ifdef USE_IMAGE_LIST
- EnableMenuItem(hmenu, ID_TOOLS_EDITIMAGE, MF_BYCOMMAND | (g_imagefile ? MF_ENABLED : MF_GRAYED));
-#endif /* def USE_IMAGE_LIST */
-#ifdef PCRS
+ EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
-#endif
#ifdef TRUST_FILES
EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED));
#endif /* def TRUST_FILES */
projects / privoxy.git / blobdiff