[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm archive.c, 1.15, 1.16 back-ldbm.h, 1.12, 1.13 dblayer.c, 1.26, 1.27 import.c, 1.10, 1.11 ldif2ldbm.c, 1.15, 1.16
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/slapd/back-ldbm
Modified Files:
archive.c back-ldbm.h dblayer.c import.c ldif2ldbm.c
Log Message:
Resolves: 439907
Summary: Enhanced SLAPI task API and ported existing tasks to use new API.
Index: archive.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/archive.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- archive.c 4 Dec 2007 17:52:56 -0000 1.15
+++ archive.c 3 Apr 2008 16:52:47 -0000 1.16
@@ -61,7 +61,7 @@
slapi_pblock_get( pb, SLAPI_BACKEND_INSTANCE_NAME, &backendname);
slapi_pblock_get( pb, SLAPI_BACKEND_TASK, &task );
slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags );
- li->li_flags = run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ li->li_flags = run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
if ( !rawdirectory || !*rawdirectory ) {
LDAPDebug( LDAP_DEBUG_ANY, "archive2db: no archive name\n",
@@ -273,7 +273,7 @@
slapi_pblock_get( pb, SLAPI_PLUGIN_PRIVATE, &li );
slapi_pblock_get( pb, SLAPI_SEQ_VAL, &rawdirectory );
slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags );
- li->li_flags = run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ li->li_flags = run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
slapi_pblock_get( pb, SLAPI_BACKEND_TASK, &task );
Index: back-ldbm.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- back-ldbm.h 19 Oct 2007 02:09:24 -0000 1.12
+++ back-ldbm.h 3 Apr 2008 16:52:47 -0000 1.13
@@ -513,10 +513,10 @@
int li_legacy_errcode; /* 615428 -- in case legacy err code is expected */
};
-/* li_flags could store these bits defined in ../slap.h
+/* li_flags could store these bits defined in ../slapi-plugin.h
* task flag (pb_task_flags) *
- * #define TASK_RUNNING_AS_TASK 0x0
- * #define TASK_RUNNING_FROM_COMMANDLINE 0x1
+ * SLAPI_TASK_RUNNING_AS_TASK
+ * SLAPI_TASK_RUNNING_FROM_COMMANDLINE
*/
/* allow conf w/o CONFIG_FLAG_ALLOW_RUNNING_CHANGE to be updated */
#define LI_FORCE_MOD_CONFIG 0x10
Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dblayer.c 4 Dec 2007 00:50:19 -0000 1.26
+++ dblayer.c 3 Apr 2008 16:52:47 -0000 1.27
@@ -1954,7 +1954,7 @@
oflags |= DB_PRIVATE;
}
PR_Lock(li->li_config_mutex);
- if ((li->li_flags & TASK_RUNNING_FROM_COMMANDLINE) &&
+ if ((li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) &&
(li->li_import_cache_autosize)) /* Autosizing importCache
* Need to re-eval every time
* to guarantee the memory is
@@ -5678,7 +5678,7 @@
* dse_conf_verify may need to have db started, as well. */
/* If no logfiles were stored, then fatal recovery isn't required */
- if (li->li_flags & TASK_RUNNING_FROM_COMMANDLINE)
+ if (li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE)
{
/* command line mode; no need to run db threads */
dbmode |= DBLAYER_NO_DBTHREADS_MODE;
@@ -5707,7 +5707,7 @@
"Warning: Unable to verify the index configuration\n", 0, 0, 0);
}
- if (li->li_flags & TASK_RUNNING_FROM_COMMANDLINE) {
+ if (li->li_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) {
/* command line: close the database down again */
tmp_rval = dblayer_close(li, dbmode);
if (0 != tmp_rval) {
Index: import.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.c 18 Oct 2007 00:08:34 -0000 1.10
+++ import.c 3 Apr 2008 16:52:47 -0000 1.11
@@ -197,29 +197,19 @@
buffer, 0);
}
-static int import_task_destroy(Slapi_Task *task)
+static void import_task_destroy(Slapi_Task *task)
{
- ImportJob *job = (ImportJob *)task->task_private;
-
- if (task->task_log) {
- slapi_ch_free((void **)&task->task_log);
- }
-
- if (task->task_status) {
- slapi_ch_free((void **)&task->task_status);
- }
-
+ ImportJob *job = (ImportJob *)slapi_task_get_data(task);
if (job && job->task_status) {
slapi_ch_free((void **)&job->task_status);
job->task_status = NULL;
}
FREE(job);
- task->task_private = NULL;
- return 0;
+ slapi_task_set_data(task, NULL);
}
-static int import_task_abort(Slapi_Task *task)
+static void import_task_abort(Slapi_Task *task)
{
ImportJob *job;
@@ -227,9 +217,8 @@
* DSE lock for modify...
*/
- if (task->task_state == SLAPI_TASK_FINISHED) {
+ if (slapi_task_get_state(task) == SLAPI_TASK_FINISHED) {
/* too late */
- return 0;
}
/*
@@ -238,14 +227,12 @@
* because it will free the job.
*/
- job = (ImportJob *)task->task_private;
+ job = (ImportJob *)slapi_task_get_data(task);
import_abort_all(job, 0);
- while (task->task_state != SLAPI_TASK_FINISHED)
+ while (slapi_task_get_state(task) != SLAPI_TASK_FINISHED)
DS_Sleep(PR_MillisecondsToInterval(100));
-
- return 0;
}
@@ -1042,13 +1029,8 @@
slapi_ch_free_string(&inst_dirp);
}
- if (job->task != NULL && 0 == job->task->task_refcount) {
- /* exit code */
- job->task->task_exitcode = ret;
- job->task->task_state = SLAPI_TASK_FINISHED;
- job->task->task_progress = job->task->task_work;
- job->task->task_private = NULL;
- slapi_task_status_changed(job->task);
+ if ((job->task != NULL) && (0 == slapi_task_get_refcount(job->task))) {
+ slapi_task_finish(job->task, ret);
}
if (job->flags & FLAG_ONLINE) {
@@ -1093,7 +1075,7 @@
ImportWorkerInfo *producer = NULL;
if (job->task)
- job->task->task_refcount++;
+ slapi_task_inc_refcount(job->task);
PR_ASSERT(inst != NULL);
time(&beginning);
@@ -1364,13 +1346,11 @@
if (0 != ret) {
import_log_notice(job, "Import failed.");
if (job->task != NULL) {
- job->task->task_state = SLAPI_TASK_FINISHED;
- job->task->task_exitcode = ret;
- slapi_task_status_changed(job->task);
+ slapi_task_finish(job->task, ret);
}
} else {
if (job->task)
- job->task->task_refcount--;
+ slapi_task_dec_refcount(job->task);
import_all_done(job, ret);
}
@@ -1471,15 +1451,17 @@
/* add 1 to account for post-import cleanup (which can take a
* significant amount of time)
*/
+ /* NGK - This should eventually be cleaned up to use the public
+ * task API. */
if (0 == total_files) /* reindexing */
job->task->task_work = 2;
else
job->task->task_work = total_files + 1;
job->task->task_progress = 0;
job->task->task_state = SLAPI_TASK_RUNNING;
- job->task->task_private = job;
- job->task->destructor = import_task_destroy;
- job->task->cancel = import_task_abort;
+ slapi_task_set_data(job->task, job);
+ slapi_task_set_destructor_fn(job->task, import_task_destroy);
+ slapi_task_set_cancel_fn(job->task, import_task_abort);
job->flags |= FLAG_ONLINE;
/* create thread for import_main, so we can return */
Index: ldif2ldbm.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ldif2ldbm.c 13 Oct 2007 01:49:32 -0000 1.15
+++ ldif2ldbm.c 3 Apr 2008 16:52:47 -0000 1.16
@@ -568,7 +568,7 @@
/* hopefully this will go away once import is not run standalone... */
slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags);
- if (task_flags & TASK_RUNNING_FROM_COMMANDLINE) {
+ if (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE) {
/* initialize UniqueID generator - must be done once backends are started
and event queue is initialized but before plugins are started */
Slapi_DN *sdn = slapi_sdn_new_dn_byval ("cn=uniqueid generator,cn=config");
@@ -581,7 +581,7 @@
return -1;
}
- li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE;
+ li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE;
ldbm_config_load_dse_info(li);
autosize_import_cache(li);
}
@@ -604,7 +604,7 @@
/***** prepare & init libdb and dblayer *****/
- if (! (task_flags & TASK_RUNNING_FROM_COMMANDLINE)) {
+ if (! (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE)) {
/* shutdown this instance of the db */
LDAPDebug(LDAP_DEBUG_ANY, "Bringing %s offline...\n",
instance_name, 0, 0);
@@ -778,11 +778,11 @@
slapi_pblock_get( pb, SLAPI_TASK_FLAGS, &task_flags );
slapi_pblock_get( pb, SLAPI_DB2LDIF_DECRYPT, &decrypt );
slapi_pblock_get( pb, SLAPI_DB2LDIF_SERVER_RUNNING, &server_running );
- run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
dump_replica = pb->pb_ldif_dump_replica;
if (run_from_cmdline) {
- li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE;
+ li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE;
if (!dump_replica) {
we_start_the_backends = 1;
}
@@ -1298,12 +1298,12 @@
slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_name);
slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li);
slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags);
- run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
slapi_pblock_get(pb, SLAPI_BACKEND_TASK, &task);
if (run_from_cmdline) {
/* No ldbm backend exists until we process the config info. */
- li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE;
+ li->li_flags |= SLAPI_TASK_RUNNING_FROM_COMMANDLINE;
ldbm_config_load_dse_info(li);
txn.back_txn_txn = NULL; /* no transaction */
}
@@ -1764,6 +1764,8 @@
percent = (ep->ep_id*100 / (lastid ? lastid : 1));
}
if (task) {
+ /* NGK - This should eventually be cleaned up to use the
+ * public task API */
task->task_progress = (idl ? idindex : ep->ep_id);
task->task_work = (idl ? idl->b_nids : lastid);
slapi_task_status_changed(task);
@@ -1970,7 +1972,7 @@
slapi_pblock_get(pb, SLAPI_BACKEND_TASK, &task);
slapi_pblock_get(pb, SLAPI_DB2LDIF_SERVER_RUNNING, &server_running);
- run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li);
if (run_from_cmdline)
{
@@ -2435,7 +2437,7 @@
int run_from_cmdline = 0;
slapi_pblock_get(pb, SLAPI_TASK_FLAGS, &task_flags);
- run_from_cmdline = (task_flags & TASK_RUNNING_FROM_COMMANDLINE);
+ run_from_cmdline = (task_flags & SLAPI_TASK_RUNNING_FROM_COMMANDLINE);
be = inst->inst_be;
slapi_log_error(SLAPI_LOG_FATAL, "upgrade DB",
16 years, 2 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.4, 1.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174/ldap/servers/plugins/memberof
Modified Files:
memberof.c
Log Message:
Resolves: 439907
Summary: Enhanced SLAPI task API and ported existing tasks to use new API.
Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- memberof.c 28 Mar 2008 21:45:52 -0000 1.4
+++ memberof.c 3 Apr 2008 16:52:46 -0000 1.5
@@ -49,10 +49,10 @@
*
* To start the memberof task add an entry like:
*
- * dn: cn=memberof task 2, cn=memberof task, cn=tasks, cn=config
+ * dn: cn=mytask, cn=memberof task, cn=tasks, cn=config
* objectClass: top
* objectClass: extensibleObject
- * cn: sample task
+ * cn: mytask
* basedn: dc=example, dc=com
* filter: (uid=test4)
*
@@ -75,7 +75,6 @@
#define MEMBEROF_GROUP_ATTR "member"
#define MEMBEROF_ATTR "memberof"
#define MEMBEROF_GROUP_ATTR_IS_DN 1
-#define MEMBEROF_GROUP_ATTR_TYPE "uid"
#define MEMBEROF_GROUP_FILTER "(" MEMBEROF_GROUP_ATTR "=*)"
#define MEMBEROF_PLUGIN_SUBSYSTEM "memberof-plugin" /* used for logging */
@@ -92,50 +91,6 @@
void *next;
} memberofstringll;
-
-
-/****** secrets *********/
-
-/*from FDS slap.h
- * until we get a proper api for access
- */
-#define TASK_RUNNING_AS_TASK 0x0
-
-/*from FDS slapi-private.h
- * until we get a proper api for access
- */
-
-
-#define SLAPI_DSE_CALLBACK_OK (1)
-#define SLAPI_DSE_CALLBACK_ERROR (-1)
-#define SLAPI_DSE_CALLBACK_DO_NOT_APPLY (0)
-
-/******************************************************************************
- * Online tasks interface (to support import, export, etc)
- * After some cleanup, we could consider making these public.
- */
-struct _slapi_task {
- struct _slapi_task *next;
- char *task_dn;
- int task_exitcode; /* for the end user */
- int task_state; /* (see above) */
- int task_progress; /* number between 0 and task_work */
- int task_work; /* "units" of work to be done */
- int task_flags; /* (see above) */
-
- /* it is the task's responsibility to allocate this memory & free it: */
- char *task_status; /* transient status info */
- char *task_log; /* appended warnings, etc */
-
- void *task_private; /* for use by backends */
- TaskCallbackFn cancel; /* task has been cancelled by user */
- TaskCallbackFn destructor; /* task entry is being destroyed */
- int task_refcount;
-};
-
-/****** secrets ********/
-
-
/*** function prototypes ***/
/* exported functions */
@@ -169,7 +124,7 @@
static int memberof_del_attr_list(Slapi_PBlock *pb, char *groupdn, Slapi_Attr *attr);
static int memberof_moddn_attr_list(Slapi_PBlock *pb, char *pre_dn, char *post_dn,
Slapi_Attr *attr);
-static int memberofd_replace_list(Slapi_PBlock *pb, char *group_dn);
+static int memberof_replace_list(Slapi_PBlock *pb, char *group_dn);
static void memberof_set_plugin_id(void * plugin_id);
static void *memberof_get_plugin_id();
static int memberof_compare(const void *a, const void *b);
@@ -195,9 +150,10 @@
static int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e,
Slapi_Entry *eAfter, int *returncode, char *returntext,
void *arg);
+static void memberof_task_destructor(Slapi_Task *task);
static const char *fetch_attr(Slapi_Entry *e, const char *attrname,
const char *default_val);
-static void memberof_memberof_fixup_task_thread(void *arg);
+static void memberof_fixup_task_thread(void *arg);
static int memberof_fix_memberof(char *dn, char *filter_str);
static int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data);
@@ -511,6 +467,8 @@
memberof_lock();
+ /* get a list of member attributes present in the group
+ * entry that is being renamed. */
if(0 == slapi_entry_attr_find(post_e, MEMBEROF_GROUP_ATTR, &attr))
{
memberof_moddn_attr_list(pb, pre_dn, post_dn, attr);
@@ -656,7 +614,7 @@
{
/* If there are no values in the smod, we should
* just do a replace instead. The user is just
- * trying to delete all members from this this
+ * trying to delete all members from this group
* entry, which the replace code deals with. */
if (slapi_mod_get_num_values(smod) == 0)
{
@@ -673,7 +631,7 @@
case LDAP_MOD_REPLACE:
{
/* replace current values */
- memberofd_replace_list(pb, dn);
+ memberof_replace_list(pb, dn);
break;
}
@@ -877,6 +835,14 @@
{
op_str = "ADD";
}
+ else if(LDAP_MOD_REPLACE == mod_op)
+ {
+ op_str = "REPLACE";
+ }
+ else
+ {
+ op_str = "UNKNOWN";
+ }
slapi_log_error( SLAPI_LOG_PLUGIN, MEMBEROF_PLUGIN_SUBSYSTEM,
"memberof_modop_one_r: %s %s in %s\n"
@@ -1347,7 +1313,7 @@
return rc;
}
-/* memberof_memberof_search_callback()
+/* memberof_test_membership()
* for each attribute in the memberof attribute
* determine if the entry is still a member
*
@@ -1517,7 +1483,7 @@
* Perform replace the group DN list in the memberof attribute of the list of targets
*
*/
-int memberofd_replace_list(Slapi_PBlock *pb, char *group_dn)
+int memberof_replace_list(Slapi_PBlock *pb, char *group_dn)
{
struct slapi_entry *pre_e = NULL;
struct slapi_entry *post_e = NULL;
@@ -1876,29 +1842,22 @@
slapi_unlock_mutex(memberof_operation_lock);
}
-/*
- *
- */
-
typedef struct _task_data
{
char *dn;
char *filter_str;
- Slapi_Task *task;
} task_data;
-void memberof_memberof_fixup_task_thread(void *arg)
+void memberof_fixup_task_thread(void *arg)
{
- task_data *td = (task_data *)arg;
- Slapi_Task *task = td->task;
+ Slapi_Task *task = (Slapi_Task *)arg;
+ task_data *td = NULL;
int rc = 0;
- task->task_work = 1;
- task->task_progress = 0;
- task->task_state = SLAPI_TASK_RUNNING;
-
- slapi_task_status_changed(task);
+ /* Fetch our task data from the task */
+ td = (task_data *)slapi_task_get_data(task);
+ slapi_task_begin(task, 1);
slapi_task_log_notice(task, "Memberof task starts (arg: %s) ...\n",
td->filter_str);
@@ -1907,20 +1866,10 @@
slapi_task_log_notice(task, "Memberof task finished.");
slapi_task_log_status(task, "Memberof task finished.");
+ slapi_task_inc_progress(task);
- task->task_progress = 1;
- task->task_exitcode = rc;
- task->task_state = SLAPI_TASK_FINISHED;
- slapi_task_status_changed(task);
-
- slapi_ch_free_string(&td->dn);
- slapi_ch_free_string(&td->filter_str);
-
- {
- /* make the compiler happy */
- void *ptd = td;
- slapi_ch_free(&ptd);
- }
+ /* this will queue the destruction of the task */
+ slapi_task_finish(task, rc);
}
/* extract a single value from the entry (as a string) -- if it's not in the
@@ -1966,13 +1915,7 @@
goto out;
}
- /* allocate new task now */
- task = slapi_new_task(slapi_entry_get_ndn(e));
- task->task_state = SLAPI_TASK_SETUP;
- task->task_work = 1;
- task->task_progress = 0;
-
- /* create a pblock to pass the necessary info to the task thread */
+ /* setup our task data */
mytaskdata = (task_data*)slapi_ch_malloc(sizeof(task_data));
if (mytaskdata == NULL)
{
@@ -1982,11 +1925,19 @@
}
mytaskdata->dn = slapi_ch_strdup(dn);
mytaskdata->filter_str = slapi_ch_strdup(filter);
- mytaskdata->task = task;
+
+ /* allocate new task now */
+ task = slapi_new_task(slapi_entry_get_ndn(e));
+
+ /* register our destructor for cleaning up our private data */
+ slapi_task_set_destructor_fn(task, memberof_task_destructor);
+
+ /* Stash a pointer to our data in the task */
+ slapi_task_set_data(task, mytaskdata);
/* start the sample task as a separate thread */
- thread = PR_CreateThread(PR_USER_THREAD, memberof_memberof_fixup_task_thread,
- (void *)mytaskdata, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ thread = PR_CreateThread(PR_USER_THREAD, memberof_fixup_task_thread,
+ (void *)task, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL)
{
@@ -1994,28 +1945,29 @@
"unable to create task thread!\n");
*returncode = LDAP_OPERATIONS_ERROR;
rv = SLAPI_DSE_CALLBACK_ERROR;
-
- slapi_ch_free_string(&mytaskdata->dn);
- slapi_ch_free_string(&mytaskdata->filter_str);
-
- {
- void *ptask = mytaskdata;
- slapi_ch_free(&ptask);
- goto out;
- }
+ slapi_task_finish(task, *returncode);
+ } else {
+ rv = SLAPI_DSE_CALLBACK_OK;
}
- /* thread successful -- don't free the pb, let the thread do that. */
- return SLAPI_DSE_CALLBACK_OK;
-
out:
- if (task)
- {
- slapi_destroy_task(task);
- }
return rv;
}
+void
+memberof_task_destructor(Slapi_Task *task)
+{
+ if (task) {
+ task_data *mydata = (task_data *)slapi_task_get_data(task);
+ if (mydata) {
+ slapi_ch_free_string(&mydata->dn);
+ slapi_ch_free_string(&mydata->filter_str);
+ /* Need to cast to avoid a compiler warning */
+ slapi_ch_free((void **)&mydata);
+ }
+ }
+}
+
int memberof_fix_memberof(char *dn, char *filter_str)
{
int rc = 0;
16 years, 2 months
- 1
- 0
[Fedora-directory-commits] dsgw/orgbin myorg.in, 1.4, 1.5 org.in, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw/orgbin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/dsgw/orgbin
Modified Files:
myorg.in org.in
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the third pass, fixing the orgchart.
Nothing really major, just fixing mostly table, tr, td, and img attributes. Tried to be a little smarter about when to actually create table rows - html tidy does not like empty table rows.
Platforms tested: RHEL5 x86_64
Flag day: no
Doc: none yet
Index: myorg.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/myorg.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- myorg.in 20 Mar 2008 02:18:43 -0000 1.4
+++ myorg.in 1 Apr 2008 20:10:11 -0000 1.5
@@ -160,7 +160,7 @@
print "
<body bgcolor=\"#FFFFFF\" style=\"leftmargin:0; topmargin:0; marginwidth:0; marginheight:0\" onLoad=\"initValues()\">
-<FORM name=\"customize\">
+<FORM name=\"customize\" action=\"javascript:void();\">
<table width=\"500\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" align=\"center\">
@@ -176,7 +176,7 @@
<tr>
<td height=\"236\" valign=\"top\">
<table width=\"100%\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\">
- <tr height=\"7\"></tr>
+ <tr style=\"height:7\"><td></td></tr>
";
@@ -193,7 +193,7 @@
<td width=\"28\" height=\"21\" valign=\"top\"> </td>
<td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Icon Settings</td>
</tr>
- <tr height =\"7\"></tr>
+ <tr style=\"height:7\"><td></td></tr>
<tr>
<td width=\"35\" height=\"21\"></td>
<td width=\"35\" valign=\"top\" class=\"prefsPageData\">Icon:</td>
@@ -213,14 +213,14 @@
print "
- <tr height=\"6\"></tr>
+ <tr style=\"height:6\"><td></td></tr>
<tr>
<td width=\"33\" height=\"21\"></td>
<td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri(a)/mail.gif\" alt=\"\" width=\"14\" height=\"16\" border=\"0\"></td>
<td width=\"25\"></td>
<td width=\"105\" valign=\"top\" class=\"prefsPageData\">EMail</td>
<td width=\"21\"></td>
- <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"email\">
+ <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"email\">
";
# --------------------------------------------
@@ -248,14 +248,14 @@
if ( $config_tokens{"icons-phonebook-visible"} ne "disabled" )
{
print "
- <tr height=\"6\"></tr>
+ <tr style=\"height:6\"><td></td></tr>
<tr>
<td width=\"33\" height=\"21\"></td>
<td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri(a)/ldap-person.gif\" alt=\"\" width=\"12\" height=\"16\" border=\"0\"></td>
<td width=\"25\"></td>
<td width=\"125\" valign=\"top\" class=\"prefsPageData\" nowrap>Phonebook Entry</td>
<td width=\"21\"></td>
- <td width=\"205\" valign=\"center\" class=\"prefsPageData\"><select NAME=\"phonebook\">
+ <td width=\"205\" valign=\"middle\" class=\"prefsPageData\"><select NAME=\"phonebook\">
";
# --------------------------------------------
@@ -284,7 +284,7 @@
print "
- <tr height=\"6\"></tr>
+ <tr style=\"height:6\"><td></td></tr>
<tr>
<td width=\"33\" height=\"21\"></td>
<td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri(a)/mag.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td>
@@ -320,7 +320,7 @@
{
print "
- <tr height=\"6\"></tr>
+ <tr style=\"height:6\"><td></td></tr>
<tr>
<td width=\"33\" height=\"21\"></td>
<td width=\"20\" valign=\"top\" class=\"prefsPageData\"> <img src=\"@orguri(a)/aim-online.gif\" alt=\"\" width=\"15\" height=\"15\" border=\"0\"></td>
@@ -356,7 +356,7 @@
if ( "$all_icons_disabled" eq "no" )
{
print "
- <tr height=\"15\">
+ <tr style=\"height:15\"><td></td>
</tr>
<tr>
<td width=\"28\" height=\"21\" valign=\"top\"> </td>
@@ -370,7 +370,7 @@
<td width=\"28\" height=\"21\" valign=\"top\"> </td>
<td valign=\"top\" colspan=\"4\" class=\"prefsPageHead\">Organization Chart Depth</td>
</tr>
- <tr height=\"10\">
+ <tr style=\"height:10\"><td></td>
</tr>
<tr>
<td width=\"35\" height=\"28\"></td>
@@ -394,7 +394,7 @@
</select></td>
<td width=\"350\" colspan=\"3\" class=\"prefsPageData\"> levels of organization depth</td>
</tr>
- <td height=\"30\"></td>
+ <tr style=\"height:30\"><td></td></tr>
</table>
</td>
</tr>
@@ -406,7 +406,7 @@
<td height=\"20\"> </td></tr>
<tr>
<td align=\"right\"><input type=\"button\" name=\"save\" value=\" Finished \" onClick=\"saveSettings();\"></td>
- <td width=\"20\"</td>
+ <td width=\"20\"></td>
<td><input type=\"button\" name=\"del_cookie\" value=\"Restore Defaults\" onClick=\"deleteCookie();\"></td>
</tr>
</table>
Index: org.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/org.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- org.in 6 Mar 2008 22:00:39 -0000 1.6
+++ org.in 1 Apr 2008 20:10:11 -0000 1.7
@@ -364,6 +364,7 @@
#
##########################################
+my $need_end_td_tag = 0;
&draw_remaining_branches();
##########################################
@@ -374,11 +375,15 @@
#
##########################################
-print "</TD></TR></TABLE></center>";
+if ($need_end_td_tag) {
+ print "</TD></TR></TABLE></center>";
+}
+
print "\n\n";
print "<BR><BR><HR>\n$fontstring";
print "Total number of reports shown above: " . $total . "\n</font><BR><BR><BR><BR><BR><BR><BR><BR>";
-print "</TD><TD NOWRAP> </TD></TABLE></CENTER></BODY></HTML>\n";
+print "</TD></TR>\n";
+print "</TABLE></CENTER></BODY></HTML>\n";
exit;
@@ -550,7 +555,7 @@
if ( ($visible eq "forefront") && (!($print_mode)) )
{
print " <a href=\"$config_tokens{\"url-locator-base\"}";
- print "$locator\"><img src=\"@orguri(a)/mag.gif\" border=0 align=TEXTTOP></a>";
+ print "$locator\"><img src=\"@orguri(a)/mag.gif\" border=0 align=\"top\"></a>";
}
return;
@@ -574,7 +579,7 @@
print " <a href=\"$config_tokens{'url-phonebook-base'}";
print "$dn\">";
- print "<img src=\"@orguri(a)/ldap-person.gif \" border=0 align=TEXTTOP>";
+ print "<img src=\"@orguri(a)/ldap-person.gif \" border=0 align=\"top\">";
print "</a>";
}
@@ -597,7 +602,7 @@
if ( ($visible eq "forefront") && ( $email =~ /@/ ) && (!($print_mode)) )
{
print " <a href=\"mailto:$email\">";
- print "<img src=\"@orguri(a)/mail.gif \" border=0 align=TEXTTOP>";
+ print "<img src=\"@orguri(a)/mail.gif \" border=0 align=\"top\">";
print "</a>";
}
@@ -635,7 +640,7 @@
{
$screenname =~ tr/ /+/;
print " <a href=\"aim:goim?Screenname=$screenname\">";
- print "<img src=\"@orguri(a)/aim-online.gif\" border=0 align=TEXTTOP></a>";
+ print "<img src=\"@orguri(a)/aim-online.gif\" border=0 align=\"top\"></a>";
}
}
@@ -774,7 +779,7 @@
sub print_javascript
{
-print "<SCRIPT>
+print "<SCRIPT type=\"text/javascript\">
var left = 0;
@@ -837,8 +842,8 @@
hideLayer();
finalhtml = '<TABLE border=1 CELLPADDING=15 BGCOLOR=\"#CCCCCC\"><TR><TD><TABLE BORDER=0>';
- finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '</B></font></TD></TR>';
- finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '</font></TD></TR>';
+ finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring<B>' + unescape(cn) + '<\\/B><\\/font><\\/TD><\\/TR>';
+ finalhtml += '<TR><TD COLSPAN=2 NOWRAP>$fontstring' + title + '<\\/font><\\/TD><\\/TR>';
finalhtml += '<TR><TD COLSPAN=2 NOWRAP>';
if ( (mail == '(none)') && (dn == '(none)') && (locator == '(none)') && (aimid == '(none)') )
@@ -850,47 +855,47 @@
finalhtml += '<HR>';
}
- finalhtml += '</TD></TR>';
+ finalhtml += '<\\/TD><\\/TR>';
if ( mail != '(none)' )
{
finalhtml += '<TR><TD align=center><a href=\"mailto:' + mail + '\">';
- finalhtml += '<img src=\"@orguri(a)/mail.gif\" border=0 align=TEXTTOP></a></TD>';
+ finalhtml += '<img src=\"@orguri(a)/mail.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
finalhtml += '<TD NOWRAP>$fontstring ';
- finalhtml += '<a href=\"mailto:' + mail + '\">Email</a></font></TD></TR>';
+ finalhtml += '<a href=\"mailto:' + mail + '\">Email<\\/a><\\/font><\\/TD><\\/TR>';
}
if ( dn != '(none)' )
{
finalhtml += '<TR><TD align=center>';
finalhtml += '<a href=\"$config_tokens{\"url-phonebook-base\"}';
- finalhtml += dn + '\"><img src=\"@orguri(a)/ldap-person.gif\" border=0 align=TEXTTOP></a></TD>';
+ finalhtml += dn + '\"><img src=\"@orguri(a)/ldap-person.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
finalhtml += '<TD NOWRAP>$fontstring ';
finalhtml += '<a href=\"$config_tokens{\"url-phonebook-base\"}' + dn + '\">';
- finalhtml += 'Phonebook</a></font></TD></TR>';
+ finalhtml += 'Phonebook<\\/a><\\/font><\\/TD><\\/TR>';
}
if ( locator != '(none)' )
{
finalhtml += '<TR><TD align=center>';
finalhtml += '<a href=\"$config_tokens{\"url-locator-base\"}';
- finalhtml += locator + '\"><img src=\"@orguri(a)/mag.gif\" border=0 align=TEXTTOP></a></TD>';
+ finalhtml += locator + '\"><img src=\"@orguri(a)/mag.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
finalhtml += '<TD NOWRAP>$fontstring ';
finalhtml += '<a href=\"$config_tokens{\"url-locator-base\"}' + locator + '\">';
- finalhtml += 'Locator</a></font></TD></TR>';
+ finalhtml += 'Locator<\\/a><\\/font><\\/TD><\\/TR>';
}
if ( aimid != '(none)' )
{
finalhtml += '<TR><TD align=center>';
finalhtml += '<a href=\"aim:goim?Screenname=' + aimid + '\">';
- finalhtml += '<img src=\"@orguri(a)/aim-online.gif\" border=0 align=TEXTTOP></a></TD>';
+ finalhtml += '<img src=\"@orguri(a)/aim-online.gif\" border=0 align=\"top\"><\\/a><\\/TD>';
finalhtml += '<TD NOWRAP>$fontstring ';
finalhtml += '<a href=\"aim:goim?Screenname=' + aimid + '\">';
- finalhtml += 'Currently online</a></font></TD></TR>';
+ finalhtml += 'Currently online<\\/a><\\/font><\\/TD><\\/TR>';
}
- finalhtml += '</TABLE></TD></TR></TABLE>';
+ finalhtml += '<\\/TABLE><\\/TD><\\/TR><\\/TABLE>';
if ( W3C )
@@ -1341,7 +1346,7 @@
}
else
{
- $results[$anothertempnum][2] = " ";
+ $results[$anothertempnum][2] = " ";
}
if ( $entry->{mail}[0] ne "" )
@@ -1353,7 +1358,7 @@
}
else
{
- $results[$anothertempnum][3] = " ";
+ $results[$anothertempnum][3] = " ";
}
if ( $entry->{businesscategory}[0] ne "" )
@@ -1362,7 +1367,7 @@
}
else
{
- $results[$anothertempnum][4] = " ";
+ $results[$anothertempnum][4] = " ";
}
@@ -1372,7 +1377,7 @@
}
else
{
- $results[$anothertempnum][5] = " ";
+ $results[$anothertempnum][5] = " ";
}
$lastentry = $entry;
@@ -1407,14 +1412,14 @@
print "
<br>
-<table cellspacing=\"-1\" cellpadding=\"2\" border=\"0\" width=\"100%\">
+<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" width=\"100%\">
<tr>
<td align=\"left\" class=\"pageHeader\">Search Results: $anothertempnum users</td>
<td align=\"right\" class=\"searchHelp\"><img src=\"@orguri(a)/orgicon.gif\" width=\"16\" height=\"14\" border=\"0\"> = view organization chart</td>
</tr>
<tr><td> </td></tr>
</table>
-<table bgcolor=\"#FFFFFF\" cellspacing=\"-1\" cellpadding=\"3\" border=\"1\" width=\"100%\">
+<table bgcolor=\"#FFFFFF\" cellspacing=\"0\" cellpadding=\"3\" border=\"1\" width=\"100%\">
<tr>
<th align=\"left\" class=\"resultsHeader\">Name</th>
<th align=\"left\" class=\"resultsHeader\">Phone</th>
@@ -1473,13 +1478,11 @@
#
print "<font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\">";
- print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($uid) . "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>";
+ print "<a href=\"org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($uid) . "&print=yes\" target=\"org_print_window\">Prepare this page for printing</A><BR>";
print "</font>";
}
- print "<CENTER><table border=0><tr><td NOWRAP>";
-
- print "<center>";
+ print "<CENTER><table border=0><tr><td NOWRAP align=center>";
#
# special exception: seems like when hardcopy printing org chart from IE browser,
@@ -1492,16 +1495,16 @@
}
else
{
- print "<table border=0 CELLSPACING=1 > \n";
+ print "<table border=0 CELLSPACING=1 > \n";
}
print "<tr>\n";
print "<td ALIGN=CENTER BGCOLOR=\"#000000\" NOWRAP>\n";
print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n";
print "<tr>\n";
- print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER NOWRAP>\n";
+ print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE NOWRAP>\n";
print "<table cellspacing=0 border=0><tr><td NOWRAP>";
- print "$fontstring<center>";
+ print "<center>$fontstring";
$tempstr = url_encode($entry->{dn});
$tempstr2 = url_encode($entry->{cn}[0]);
@@ -1514,8 +1517,8 @@
if ( !($print_mode) )
{
- print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
- print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=TEXTTOP>";
+ print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$title','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+ print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=\"top\">";
print "</A> \n";
}
@@ -1559,8 +1562,8 @@
if ( !($print_mode) )
{
- print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
- print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=TEXTTOP>";
+ print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$tempstr2','$managertitle','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+ print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=\"top\">";
print "</A> \n";
}
@@ -1568,22 +1571,21 @@
if ( !($print_mode) )
{
- print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+ print " <A HREF=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($manager) . "><img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
}
print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, $managerEntry->{nsAIMStatusText}[0], $managerEntry->{nsaimid}[0] );
print_email_icon_if_outside_layer( $config_tokens{"icons-email-visible"}, $managerEntry->{mail}[0] );
print_pb_icon_if_outside_layer( $config_tokens{"icons-phonebook-visible"}, $tempstr );
print_locator_icon_if_outside_layer( $config_tokens{"icons-locator-visible"}, $tempstr2 );
-
- print "</font>";
}
if (!$managerEntry)
{
print "<B>(no manager listed)</B>";
}
-
+ print "</font>";
+
print"</center></td> </tr> </table> </td> </tr> </table> </td> </tr> </table> <BR>";
}
@@ -1634,7 +1636,7 @@
if ( "$entry" ne "$nextentry" )
{
print "$fontstring";
- print "\n<img SRC=\"@orguri(a)/new-branch-first.gif\" align=TEXTTOP>";
+ print "\n<img SRC=\"@orguri(a)/new-branch-first.gif\" align=\"top\">";
$aimid = is_aimid_in_layer ( $config_tokens{"icons-aim-visible"} , "discover" , $sortedPeople[$tempnum][5] );
$emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $sortedPeople[$tempnum][3] );
@@ -1643,8 +1645,8 @@
if ( !($print_mode) )
{
- print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
- print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=TEXTTOP>";
+ print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+ print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=\"top\">";
print "</A> \n";
}
@@ -1658,7 +1660,7 @@
# to the person's name, to indicate they have people below them.
#
print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">";
- print "<img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+ print "<img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
}
print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, "discover", $sortedPeople[$tempnum][5] );
@@ -1798,9 +1800,7 @@
sub draw_remaining_branches()
{
-
- print "\n";
- print "<center><table border=0 cellpadding=10><tr VALIGN=top>";
+ my $start_center_table_tr = "\n<center><table border=0 cellpadding=10><tr VALIGN=top>";
$current_indent = 1;
$one_time_td = 0;
@@ -1829,6 +1829,7 @@
{
if ( $one_time_td == 0 )
{
+ print $start_center_table_tr;
print "<TD NOWRAP>\n";
$one_time_td = 1;
}
@@ -1836,6 +1837,7 @@
{
print "</TD><TD NOWRAP>\n";
}
+ $need_end_td_tag = 1; # have a begin TD tag, need to close it
}
@@ -1858,9 +1860,11 @@
print "<td ALIGN=CENTER BGCOLOR=\"#000000\">\n";
print "<table border=0 CELLSPACING=0 CELLPADDING=6 >\n";
print "<tr>\n";
- print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=CENTER>\n";
+ print "<td BGCOLOR=\"#CCCCCC\" ALIGN=CENTER VALIGN=MIDDLE>\n";
print "<table cellspacing=0 border=0><tr><td NOWRAP><CENTER>";
+ $need_end_td_tag = 1; # have a begin TD tag, need to close it
+
#
# See comment just a few lines below about being careful on
# not moving this font tag past the IMG SRC tags
@@ -1881,25 +1885,25 @@
{
for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ )
{
- print "<img SRC=\"@orguri(a)/new-branch-blank.gif\" align=TEXTTOP>";
+ print "<img SRC=\"@orguri(a)/new-branch-blank.gif\" align=\"top\">";
}
}
else
{
for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ )
{
- print "<img SRC=\"@orguri(a)/new-branch-straight.gif\" align=TEXTTOP>";
+ print "<img SRC=\"@orguri(a)/new-branch-straight.gif\" align=\"top\">";
}
}
if ( ("$sortedPeople[$tempnum][8]" eq "cc1") || ( $sortedPeople[$tempnum][8] =~ /rounded/ ) )
{
- print "<img SRC=\"@orguri(a)/branch-cc1.gif\" align=TEXTTOP>";
+ print "<img SRC=\"@orguri(a)/branch-cc1.gif\" align=\"top\">";
}
else
{
- print "<img SRC=\"@orguri(a)/new-branch-first.gif\" align=TEXTTOP>";
+ print "<img SRC=\"@orguri(a)/new-branch-first.gif\" align=\"top\">";
}
}
@@ -1911,8 +1915,8 @@
if ( !($print_mode) )
{
- print "\n\n <A HREF='javascript:return false;' target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
- print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=TEXTTOP>";
+ print "\n\n <A HREF=\"javascript:return%20false;\" target=_top onMouseOver=\"showLayer('$sortedPeople[$tempnum][6]','$sortedPeople[$tempnum][4]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">";
+ print "<img src=\"@orguri(a)/arrow.gif\" border=0 align=\"top\">";
print "</A> \n";
}
@@ -1954,7 +1958,7 @@
if ( !( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]\/$/ ) )
{
print "<a href=org?${contextParamString}" . $config_tokens{'attrib-farleft-rdn'} . "=" . url_encode($sortedPeople[$tempnum][1]) . ">";
- print "<img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=TEXTTOP></a>";
+ print "<img src=\"@orguri(a)/orgicon.gif\" border=0 height=15 width=17 align=\"top\"></a>";
}
}
}
16 years, 2 months
- 1
- 0
[Fedora-directory-commits] dsgw/orghtml botframe.html, 1.2, 1.3 topframe.html.in, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw/orghtml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/dsgw/orghtml
Modified Files:
botframe.html topframe.html.in
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the third pass, fixing the orgchart.
Nothing really major, just fixing mostly table, tr, td, and img attributes. Tried to be a little smarter about when to actually create table rows - html tidy does not like empty table rows.
Platforms tested: RHEL5 x86_64
Flag day: no
Doc: none yet
Index: botframe.html
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/botframe.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- botframe.html 28 Jan 2008 21:22:48 -0000 1.2
+++ botframe.html 1 Apr 2008 20:10:11 -0000 1.3
@@ -42,7 +42,7 @@
<LINK REL=stylesheet TYPE="text/css" HREF="styles.css">
</head>
<body bgcolor="#FFFFFF">
-<table cellspacing="-1" cellpadding="2" border="0" width="100%">
+<table cellspacing="0" cellpadding="2" border="0" width="100%">
<tr>
<td align="left" class="pageHeader">Welcome!<br><br></td>
</tr>
@@ -53,10 +53,10 @@
Below is a sample of an organization chart, with a description of the<br>
types of actions you can take<BR><BR>
Thank you for using the Directory Server Org Chart!
+<br><br>
</td>
</tr>
+<tr align="center"><td><img src="starthelp.gif" border="0" alt=""></td></tr>
</table>
-<br><br>
-<tr align="center"><img src="starthelp.gif" border="0" alt=""></tr>
</body>
</html>
Index: topframe.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/topframe.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- topframe.html.in 6 Mar 2008 22:00:39 -0000 1.3
+++ topframe.html.in 1 Apr 2008 20:10:11 -0000 1.4
@@ -38,6 +38,7 @@
"http://www.w3.org/TR/html4/strict.dtd">
<HTML>
<HEAD>
+<title>Org Chart</title>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
<META HTTP-EQUIV="Expires" CONTENT="Thu, 01 Feb 1996 00:00:00 GMT">
<SCRIPT type="text/javascript">
@@ -63,7 +64,7 @@
}
else
{
- totalInput = "<HTML><BODY><BR><BR><BR><BR><font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\"><B>Generating...</B></font></BODY></HTML>";
+ totalInput = "<HTML><BODY><BR><BR><BR><BR><font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 14px\"><B>Generating...<\/B><\/font><\/BODY><\/HTML>";
viewFrame = self.parent.output_window.document;
viewFrame.open();
@@ -99,14 +100,14 @@
<span class="apptext"> Search for:</span>
</TD>
<TD nowrap valign="middle">
- <span class="apptext">
<FORM name="form2" Method=POST action="@cgiuri@/org" target="output_window" onsubmit="return doSearch(document.form2.data.value)">
+ <span class="apptext">
<font face="verdana, Arial, Helvetica, sans-serif" style="font-size: 12px">
<INPUT TYPE="TEXT" NAME="data" SIZE=20 MAXLENGTH=20>
<input type="submit" name="Submit" value="Go">
</font>
- </FORM>
</span>
+ </FORM>
</TD>
</TR></TABLE>
</TD>
16 years, 2 months
- 1
- 0