diff -upNr ../blank/.git/COMMIT_EDITMSG ./.git/COMMIT_EDITMSG --- ../blank/.git/COMMIT_EDITMSG 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/COMMIT_EDITMSG 2010-03-02 01:15:07.000000000 -0600 @@ -0,0 +1 @@ +some additional alterations to the user add plugin. Working on segmenting various portions of the form so that they can be turned on/off. All but roles seems to be working at this point. diff -upNr ../blank/.git/HEAD ./.git/HEAD --- ../blank/.git/HEAD 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/HEAD 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1 @@ +ref: refs/heads/master diff -upNr ../blank/.git/config ./.git/config --- ../blank/.git/config 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/config 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1,12 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + fetch = +refs/heads/*:refs/remotes/origin/* + url = git@github.com:EclipseGc/context-admin.git +[branch "master"] + remote = origin + merge = refs/heads/master diff -upNr ../blank/.git/description ./.git/description --- ../blank/.git/description 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/description 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff -upNr ../blank/.git/hooks/applypatch-msg.sample ./.git/hooks/applypatch-msg.sample --- ../blank/.git/hooks/applypatch-msg.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/applypatch-msg.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff -upNr ../blank/.git/hooks/commit-msg.sample ./.git/hooks/commit-msg.sample --- ../blank/.git/hooks/commit-msg.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/commit-msg.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by git-commit with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff -upNr ../blank/.git/hooks/post-commit.sample ./.git/hooks/post-commit.sample --- ../blank/.git/hooks/post-commit.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/post-commit.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script that is called after a successful +# commit is made. +# +# To enable this hook, rename this file to "post-commit". + +: Nothing diff -upNr ../blank/.git/hooks/post-receive.sample ./.git/hooks/post-receive.sample --- ../blank/.git/hooks/post-receive.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/post-receive.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script for the "post-receive" event. +# +# The "post-receive" script is run after receive-pack has accepted a pack +# and the repository has been updated. It is passed arguments in through +# stdin in the form +# +# For example: +# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master +# +# see contrib/hooks/ for an sample, or uncomment the next line and +# rename the file to "post-receive". + +#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff -upNr ../blank/.git/hooks/post-update.sample ./.git/hooks/post-update.sample --- ../blank/.git/hooks/post-update.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/post-update.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git-update-server-info diff -upNr ../blank/.git/hooks/pre-applypatch.sample ./.git/hooks/pre-applypatch.sample --- ../blank/.git/hooks/pre-applypatch.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/pre-applypatch.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff -upNr ../blank/.git/hooks/pre-commit.sample ./.git/hooks/pre-commit.sample --- ../blank/.git/hooks/pre-commit.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/pre-commit.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,43 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by git-commit with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +# If you want to allow non-ascii filenames set this variable to true. +allownonascii=$(git config hooks.allownonascii) + +# Cross platform projects tend to avoid non-ascii filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + test "$(git diff --cached --name-only --diff-filter=A -z | + LC_ALL=C tr -d '[ -~]\0')" +then + echo "Error: Attempt to add a non-ascii filename." + echo + echo "This can cause problems if you want to work together" + echo "with people on other platforms than you." + echo + echo "To be portable it is adviseable to rename the file ..." + echo + echo "If you know what you are doing you can disable this" + echo "check using:" + echo + echo " git config hooks.allownonascii true" + echo + exit 1 +fi + +if git-rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +exec git diff-index --check --cached $against -- diff -upNr ../blank/.git/hooks/pre-rebase.sample ./.git/hooks/pre-rebase.sample --- ../blank/.git/hooks/pre-rebase.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/pre-rebase.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git-rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git-rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git-rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git-rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git-rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git-rev-list --pretty=oneline ^${publish} "$topic"` + perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git-rev-list ^master ^topic next + git-rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git-rev-list master..topic + + if this is empty, it is fully merged to "master". diff -upNr ../blank/.git/hooks/prepare-commit-msg.sample ./.git/hooks/prepare-commit-msg.sample --- ../blank/.git/hooks/prepare-commit-msg.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/prepare-commit-msg.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by git-commit with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -upNr ../blank/.git/hooks/update.sample ./.git/hooks/update.sample --- ../blank/.git/hooks/update.sample 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/hooks/update.sample 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by git-receive-pack with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git-cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 Binary files ../blank/.git/index and ./.git/index differ diff -upNr ../blank/.git/info/exclude ./.git/info/exclude --- ../blank/.git/info/exclude 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/info/exclude 2010-02-22 14:47:16.000000000 -0600 @@ -0,0 +1,6 @@ +# git-ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff -upNr ../blank/.git/logs/HEAD ./.git/logs/HEAD --- ../blank/.git/logs/HEAD 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/logs/HEAD 2010-03-02 01:15:07.000000000 -0600 @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 Kris 1266871642 -0600 clone: from git@github.com:EclipseGc/context-admin.git +f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 f11c136231583ba3d871d3693fd1c1395e24de41 Kris 1266872092 -0600 commit: added a new access handler based on taxonomy term parent, and altered term_options_menu to allow for term additions. This will parent the new term to an existing term if added from a taxonomy term page. +f11c136231583ba3d871d3693fd1c1395e24de41 75839bbacb339899d77cba04c86adc8178f57d22 Kris 1267038720 -0600 commit: Reworked the includes to be legitimate ctools plugins. Have updated the core module to allow plugins to invoke hook_form_alter and hook_nodeapi as necessary. More testing will be required on this before I am confident in it. +75839bbacb339899d77cba04c86adc8178f57d22 8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 Kris 1267384102 -0600 commit: task_handler updated to handle page_manager variants properly, ctools plugin architecture fully implemented and tested. +8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 62e4061b7c25cdd1e1a4880505a0f2260f22ea26 Kris 1267399128 -0600 commit: minor fixes to node_menu.inc +62e4061b7c25cdd1e1a4880505a0f2260f22ea26 7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 Kris 1267399799 -0600 commit: more minor fixes to node_menu.inc plugin. Errors should now be gone. +7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 bbac71bc45de9e370ff3b37b3d95b39d7ab4050c Kris 1267464714 -0600 commit: Fix for VBO based node administration plugin. Previous exported plugins of this type would not work on load and needed to be resaved. +bbac71bc45de9e370ff3b37b3d95b39d7ab4050c bd1f492a82c2fb11172337e548081969ec1693dd Kris 1267486040 -0600 commit: initial commit of new users creation plugin. Not very well tested yet, but seems to work for the most part. There are additional details that need attention specifically how roles will be implemented. +bd1f492a82c2fb11172337e548081969ec1693dd 0063d527a2a5f732cfc8c832b47830a8ad578150 Kris 1267514107 -0600 commit: some additional alterations to the user add plugin. Working on segmenting various portions of the form so that they can be turned on/off. All but roles seems to be working at this point. diff -upNr ../blank/.git/logs/refs/heads/master ./.git/logs/refs/heads/master --- ../blank/.git/logs/refs/heads/master 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/logs/refs/heads/master 2010-03-02 01:15:07.000000000 -0600 @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 Kris 1266871642 -0600 clone: from git@github.com:EclipseGc/context-admin.git +f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 f11c136231583ba3d871d3693fd1c1395e24de41 Kris 1266872092 -0600 commit: added a new access handler based on taxonomy term parent, and altered term_options_menu to allow for term additions. This will parent the new term to an existing term if added from a taxonomy term page. +f11c136231583ba3d871d3693fd1c1395e24de41 75839bbacb339899d77cba04c86adc8178f57d22 Kris 1267038720 -0600 commit: Reworked the includes to be legitimate ctools plugins. Have updated the core module to allow plugins to invoke hook_form_alter and hook_nodeapi as necessary. More testing will be required on this before I am confident in it. +75839bbacb339899d77cba04c86adc8178f57d22 8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 Kris 1267384102 -0600 commit: task_handler updated to handle page_manager variants properly, ctools plugin architecture fully implemented and tested. +8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 62e4061b7c25cdd1e1a4880505a0f2260f22ea26 Kris 1267399128 -0600 commit: minor fixes to node_menu.inc +62e4061b7c25cdd1e1a4880505a0f2260f22ea26 7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 Kris 1267399799 -0600 commit: more minor fixes to node_menu.inc plugin. Errors should now be gone. +7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 bbac71bc45de9e370ff3b37b3d95b39d7ab4050c Kris 1267464714 -0600 commit: Fix for VBO based node administration plugin. Previous exported plugins of this type would not work on load and needed to be resaved. +bbac71bc45de9e370ff3b37b3d95b39d7ab4050c bd1f492a82c2fb11172337e548081969ec1693dd Kris 1267486040 -0600 commit: initial commit of new users creation plugin. Not very well tested yet, but seems to work for the most part. There are additional details that need attention specifically how roles will be implemented. +bd1f492a82c2fb11172337e548081969ec1693dd 0063d527a2a5f732cfc8c832b47830a8ad578150 Kris 1267514107 -0600 commit: some additional alterations to the user add plugin. Working on segmenting various portions of the form so that they can be turned on/off. All but roles seems to be working at this point. diff -upNr ../blank/.git/logs/refs/remotes/origin/HEAD ./.git/logs/refs/remotes/origin/HEAD --- ../blank/.git/logs/refs/remotes/origin/HEAD 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/logs/refs/remotes/origin/HEAD 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 Kris 1266871642 -0600 clone: from git@github.com:EclipseGc/context-admin.git diff -upNr ../blank/.git/logs/refs/remotes/origin/master ./.git/logs/refs/remotes/origin/master --- ../blank/.git/logs/refs/remotes/origin/master 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/logs/refs/remotes/origin/master 2010-03-02 01:15:23.000000000 -0600 @@ -0,0 +1,6 @@ +f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 f11c136231583ba3d871d3693fd1c1395e24de41 Kris 1266872108 -0600 update by push +f11c136231583ba3d871d3693fd1c1395e24de41 8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 Kris 1267384114 -0600 update by push +8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 Kris 1267399804 -0600 update by push +7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 bbac71bc45de9e370ff3b37b3d95b39d7ab4050c Kris 1267464724 -0600 update by push +bbac71bc45de9e370ff3b37b3d95b39d7ab4050c bd1f492a82c2fb11172337e548081969ec1693dd Kris 1267486052 -0600 update by push +bd1f492a82c2fb11172337e548081969ec1693dd 0063d527a2a5f732cfc8c832b47830a8ad578150 Kris 1267514123 -0600 update by push Binary files ../blank/.git/objects/00/63d527a2a5f732cfc8c832b47830a8ad578150 and ./.git/objects/00/63d527a2a5f732cfc8c832b47830a8ad578150 differ Binary files ../blank/.git/objects/02/2590cbf18807d029f07dfc493400d1d72c936e and ./.git/objects/02/2590cbf18807d029f07dfc493400d1d72c936e differ diff -upNr ../blank/.git/objects/04/cfedb89971f8da6d11e53118b34b9a74b88396 ./.git/objects/04/cfedb89971f8da6d11e53118b34b9a74b88396 --- ../blank/.git/objects/04/cfedb89971f8da6d11e53118b34b9a74b88396 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/04/cfedb89971f8da6d11e53118b34b9a74b88396 2010-02-24 13:10:21.000000000 -0600 @@ -0,0 +1,4 @@ +xSM0_$*V BZ +m^Ĭc[h7BySC'y3V޾yŇOvUn+7=#wNC;C l1 Qv#RDO}?Hgh[ u"spvWՅP2(pa-> +N? hx_x~F7K 8ۛ_J&GE27\ 59v)YژmZe"]w? \ No newline at end of file Binary files ../blank/.git/objects/09/afe7ef4c3450fe7d97d9b353c4db444229624a and ./.git/objects/09/afe7ef4c3450fe7d97d9b353c4db444229624a differ Binary files ../blank/.git/objects/0f/7fc06e7f582707987d2b3032323c009b94c0f6 and ./.git/objects/0f/7fc06e7f582707987d2b3032323c009b94c0f6 differ Binary files ../blank/.git/objects/11/56cdb8fcc58f9649c0b3d241aede7027b9198e and ./.git/objects/11/56cdb8fcc58f9649c0b3d241aede7027b9198e differ Binary files ../blank/.git/objects/11/9a58644dc912265f6562d4dd44af2738b26918 and ./.git/objects/11/9a58644dc912265f6562d4dd44af2738b26918 differ Binary files ../blank/.git/objects/16/2bfaefa14b929c91174681ccea98913e77f9bc and ./.git/objects/16/2bfaefa14b929c91174681ccea98913e77f9bc differ Binary files ../blank/.git/objects/16/b8672bb7577fbdf05379be7548ee1613795481 and ./.git/objects/16/b8672bb7577fbdf05379be7548ee1613795481 differ Binary files ../blank/.git/objects/19/7edbb55f31a36a80f34c764284765316efd007 and ./.git/objects/19/7edbb55f31a36a80f34c764284765316efd007 differ Binary files ../blank/.git/objects/21/3e82f786688f06a1a9007fbce451e7fecbdac8 and ./.git/objects/21/3e82f786688f06a1a9007fbce451e7fecbdac8 differ Binary files ../blank/.git/objects/23/1d86f2bc88ac94a10751d3dd0cfbd5fb44ab31 and ./.git/objects/23/1d86f2bc88ac94a10751d3dd0cfbd5fb44ab31 differ Binary files ../blank/.git/objects/28/22a7121f8f565dd5cb3134946e2988ce7924cd and ./.git/objects/28/22a7121f8f565dd5cb3134946e2988ce7924cd differ Binary files ../blank/.git/objects/2d/b52405fd1fa44a8fe65cebc9aabf0be3156637 and ./.git/objects/2d/b52405fd1fa44a8fe65cebc9aabf0be3156637 differ Binary files ../blank/.git/objects/2e/7f9f64c361730e96e4eb8d61990317e076d440 and ./.git/objects/2e/7f9f64c361730e96e4eb8d61990317e076d440 differ Binary files ../blank/.git/objects/2f/0ab476a163cc93d5af02986aa129ce67c35f93 and ./.git/objects/2f/0ab476a163cc93d5af02986aa129ce67c35f93 differ Binary files ../blank/.git/objects/31/6402cbf20f5fef4d61e8c6849c33aaf3eefc47 and ./.git/objects/31/6402cbf20f5fef4d61e8c6849c33aaf3eefc47 differ Binary files ../blank/.git/objects/3e/7b06839bdbd8bba8ee79a96c1daebbce9ce4c0 and ./.git/objects/3e/7b06839bdbd8bba8ee79a96c1daebbce9ce4c0 differ Binary files ../blank/.git/objects/46/f4240473e24423472ed13834e9a012c5acdc7f and ./.git/objects/46/f4240473e24423472ed13834e9a012c5acdc7f differ Binary files ../blank/.git/objects/47/3b124fc5f8644ff47a73d4ff28e95bfdf1b23a and ./.git/objects/47/3b124fc5f8644ff47a73d4ff28e95bfdf1b23a differ diff -upNr ../blank/.git/objects/48/c4769dd00012e167b7f9395e6e9a9f91d6e126 ./.git/objects/48/c4769dd00012e167b7f9395e6e9a9f91d6e126 --- ../blank/.git/objects/48/c4769dd00012e167b7f9395e6e9a9f91d6e126 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/48/c4769dd00012e167b7f9395e6e9a9f91d6e126 2010-02-24 13:12:00.000000000 -0600 @@ -0,0 +1 @@ +x+)JMU01a040031QM+O+I(Kf5pqVg2`_m \ No newline at end of file Binary files ../blank/.git/objects/54/79f9ffe52697120832fb498b53c18747db80d6 and ./.git/objects/54/79f9ffe52697120832fb498b53c18747db80d6 differ Binary files ../blank/.git/objects/5f/253ad36493d7835969bd7cf46848829eaeb037 and ./.git/objects/5f/253ad36493d7835969bd7cf46848829eaeb037 differ Binary files ../blank/.git/objects/5f/5bf7215fd68bf255a288dc17ba15c953d4043e and ./.git/objects/5f/5bf7215fd68bf255a288dc17ba15c953d4043e differ diff -upNr ../blank/.git/objects/62/e4061b7c25cdd1e1a4880505a0f2260f22ea26 ./.git/objects/62/e4061b7c25cdd1e1a4880505a0f2260f22ea26 --- ../blank/.git/objects/62/e4061b7c25cdd1e1a4880505a0f2260f22ea26 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/62/e4061b7c25cdd1e1a4880505a0f2260f22ea26 2010-02-28 17:18:49.000000000 -0600 @@ -0,0 +1 @@ +xA E]s@ J!1ƽ034J/Wp?}95DJy(RDEր(D,ea>ؤtl/f$b [t@7BNj UxWmhi{=KK1a~o`faNk5q˟3S-}e^(,8bK \ No newline at end of file Binary files ../blank/.git/objects/68/dad3c75a7a42c6a7415cd9200c7a57001cffed and ./.git/objects/68/dad3c75a7a42c6a7415cd9200c7a57001cffed differ Binary files ../blank/.git/objects/69/b7970f698b1260e098281f5559cf90d6b92448 and ./.git/objects/69/b7970f698b1260e098281f5559cf90d6b92448 differ Binary files ../blank/.git/objects/6a/a0c4e0fc0533fa57ce78a2438cbef39218cdc1 and ./.git/objects/6a/a0c4e0fc0533fa57ce78a2438cbef39218cdc1 differ Binary files ../blank/.git/objects/6a/ce3ab67361fd05aa351a4e0c961616660de74a and ./.git/objects/6a/ce3ab67361fd05aa351a4e0c961616660de74a differ Binary files ../blank/.git/objects/71/60c436451db6134f5640186a0ac725aa604cc9 and ./.git/objects/71/60c436451db6134f5640186a0ac725aa604cc9 differ Binary files ../blank/.git/objects/75/839bbacb339899d77cba04c86adc8178f57d22 and ./.git/objects/75/839bbacb339899d77cba04c86adc8178f57d22 differ Binary files ../blank/.git/objects/78/f93171bc5acb8ce26d143d528d6a8da65cd1c0 and ./.git/objects/78/f93171bc5acb8ce26d143d528d6a8da65cd1c0 differ diff -upNr ../blank/.git/objects/7c/10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 ./.git/objects/7c/10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 --- ../blank/.git/objects/7c/10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/7c/10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 2010-02-28 17:29:59.000000000 -0600 @@ -0,0 +1,2 @@ +xKn!D}dYdCD (,`?޼SB9 @߭Ez)hV=* +ʠŦ7*4S*(Hxi-W\y#ȣf૥kbj@mVsps6<7˵TޞèPjLXR |TjxV -kWc \ No newline at end of file Binary files ../blank/.git/objects/81/799e0bce9064d7f5b9d59e8d311ea9bf010619 and ./.git/objects/81/799e0bce9064d7f5b9d59e8d311ea9bf010619 differ Binary files ../blank/.git/objects/82/1875fa7c53595b828cdd48fab4b1af0b033487 and ./.git/objects/82/1875fa7c53595b828cdd48fab4b1af0b033487 differ Binary files ../blank/.git/objects/87/aaa4959813b02f203a18a590c3c1ed63dee134 and ./.git/objects/87/aaa4959813b02f203a18a590c3c1ed63dee134 differ Binary files ../blank/.git/objects/88/ae3107fca3eaa600edf58163cc93c032b415a7 and ./.git/objects/88/ae3107fca3eaa600edf58163cc93c032b415a7 differ diff -upNr ../blank/.git/objects/8c/35e86f1eda9b3087afd66c9bbcfba6c4834bb3 ./.git/objects/8c/35e86f1eda9b3087afd66c9bbcfba6c4834bb3 --- ../blank/.git/objects/8c/35e86f1eda9b3087afd66c9bbcfba6c4834bb3 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/8c/35e86f1eda9b3087afd66c9bbcfba6c4834bb3 2010-02-28 13:08:22.000000000 -0600 @@ -0,0 +1,2 @@ +xaj0 ;NCVZS;62' Bz|PKI F7D:VT6,3ưn&GO_z KyIE$.X'e8| ^[p |Z嘱bC]A*5N8+41韱% goSR#5ܹ!Z`[\fF\tja;u <FU巉k KXHG+xF6qG \ No newline at end of file diff -upNr ../blank/.git/objects/bd/1f492a82c2fb11172337e548081969ec1693dd ./.git/objects/bd/1f492a82c2fb11172337e548081969ec1693dd --- ../blank/.git/objects/bd/1f492a82c2fb11172337e548081969ec1693dd 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/bd/1f492a82c2fb11172337e548081969ec1693dd 2010-03-01 17:27:20.000000000 -0600 @@ -0,0 +1,3 @@ +xKN0 YQDB=+.KI*qXp6^Xٿ/9Gƨ'DpiVvF_&w3^Q{[Cf+,Р<nnfr +8)ٝR^c][C)/U +'uUOkhx+_r,+ |7J L)A 3Qn;fyB.! U*@lcp,vh6qަRԒሢwDYf)fR \ No newline at end of file Binary files ../blank/.git/objects/be/7215c7f88322464f237e6b49c8e9dc5ba16689 and ./.git/objects/be/7215c7f88322464f237e6b49c8e9dc5ba16689 differ Binary files ../blank/.git/objects/c5/0b14c491e0fd4254592faefac2c5948d4313dc and ./.git/objects/c5/0b14c491e0fd4254592faefac2c5948d4313dc differ Binary files ../blank/.git/objects/c6/1614c7965dbead338ce5e0f7d9a3c0c54f03a1 and ./.git/objects/c6/1614c7965dbead338ce5e0f7d9a3c0c54f03a1 differ Binary files ../blank/.git/objects/cb/39a087c58b67b7f3d19fa653d5e19757947d0b and ./.git/objects/cb/39a087c58b67b7f3d19fa653d5e19757947d0b differ Binary files ../blank/.git/objects/d7/695873295546614484e82c8dd12891336e2bdb and ./.git/objects/d7/695873295546614484e82c8dd12891336e2bdb differ Binary files ../blank/.git/objects/d9/2a6aa469b142a69bf6ce0267741cf4871a9431 and ./.git/objects/d9/2a6aa469b142a69bf6ce0267741cf4871a9431 differ Binary files ../blank/.git/objects/dc/364b9a97360f7ba82e4b0710b39bb90f5839b2 and ./.git/objects/dc/364b9a97360f7ba82e4b0710b39bb90f5839b2 differ Binary files ../blank/.git/objects/e1/06982c0440d7a725fb7e4a4afb500ef2b07dd3 and ./.git/objects/e1/06982c0440d7a725fb7e4a4afb500ef2b07dd3 differ Binary files ../blank/.git/objects/e6/23c977d32acfaa9aa204abce34cab5ae0a1ce5 and ./.git/objects/e6/23c977d32acfaa9aa204abce34cab5ae0a1ce5 differ Binary files ../blank/.git/objects/ee/5ba7a3ae7133dd2376a3da94519714cd2e95c3 and ./.git/objects/ee/5ba7a3ae7133dd2376a3da94519714cd2e95c3 differ Binary files ../blank/.git/objects/ef/5ee9802a81a3e12f6683352ffa164af9a158b4 and ./.git/objects/ef/5ee9802a81a3e12f6683352ffa164af9a158b4 differ diff -upNr ../blank/.git/objects/f1/1c136231583ba3d871d3693fd1c1395e24de41 ./.git/objects/f1/1c136231583ba3d871d3693fd1c1395e24de41 --- ../blank/.git/objects/f1/1c136231583ba3d871d3693fd1c1395e24de41 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/objects/f1/1c136231583ba3d871d3693fd1c1395e24de41 2010-02-22 14:54:52.000000000 -0600 @@ -0,0 +1 @@ +xOn0 4d(w"U R8 8s9PaPn~Bel|OQ=Nf4`H7Nfײt :%56xK} ^dEL*G+tj࠴R\%\$bW@X0*F3rrh \$;pr*5 +xiS GE]úA]x3| P~Qfr \ No newline at end of file Binary files ../blank/.git/objects/fd/8fef5f48e4287e1b7488d3156fd338b622cd18 and ./.git/objects/fd/8fef5f48e4287e1b7488d3156fd338b622cd18 differ Binary files ../blank/.git/objects/pack/pack-89fcad1e8d4f851d8c974abd722c9156b5bb8de6.idx and ./.git/objects/pack/pack-89fcad1e8d4f851d8c974abd722c9156b5bb8de6.idx differ Binary files ../blank/.git/objects/pack/pack-89fcad1e8d4f851d8c974abd722c9156b5bb8de6.pack and ./.git/objects/pack/pack-89fcad1e8d4f851d8c974abd722c9156b5bb8de6.pack differ diff -upNr ../blank/.git/packed-refs ./.git/packed-refs --- ../blank/.git/packed-refs 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/packed-refs 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1,7 @@ +# pack-refs with: peeled +c4fd13e0cf9896a403fcdf34d79607eb60ccd215 refs/tags/drupal-6--1-0-alpha4 +b6e1575ff5301ea9332cdf8be280b19df97414e5 refs/tags/drupal-6--1-0-alpha3 +f6493bd7637d173a44ed66459d4f111b2a92bd6b refs/tags/drupal-6--1-0-alpha2 +0dbdc5ea56126ecb013dbf417139ef07dc14a5b4 refs/tags/drupal-6--1-0-alpha1 +^2c9e0b682e1b8b2836871bb9bb0cff25cfb0c629 +f90bc1ef62e61d63c8f47acf078d78d5a6da8d48 refs/remotes/origin/master diff -upNr ../blank/.git/refs/heads/master ./.git/refs/heads/master --- ../blank/.git/refs/heads/master 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/heads/master 2010-03-02 01:15:07.000000000 -0600 @@ -0,0 +1 @@ +0063d527a2a5f732cfc8c832b47830a8ad578150 diff -upNr ../blank/.git/refs/remotes/origin/HEAD ./.git/refs/remotes/origin/HEAD --- ../blank/.git/refs/remotes/origin/HEAD 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/remotes/origin/HEAD 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff -upNr ../blank/.git/refs/remotes/origin/master ./.git/refs/remotes/origin/master --- ../blank/.git/refs/remotes/origin/master 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/remotes/origin/master 2010-03-02 01:15:23.000000000 -0600 @@ -0,0 +1 @@ +0063d527a2a5f732cfc8c832b47830a8ad578150 diff -upNr ../blank/.git/refs/tags/drupal-6--1-0-alpha5 ./.git/refs/tags/drupal-6--1-0-alpha5 --- ../blank/.git/refs/tags/drupal-6--1-0-alpha5 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/tags/drupal-6--1-0-alpha5 2010-02-22 14:55:39.000000000 -0600 @@ -0,0 +1 @@ +f11c136231583ba3d871d3693fd1c1395e24de41 diff -upNr ../blank/.git/refs/tags/drupal-6--1-0-alpha6 ./.git/refs/tags/drupal-6--1-0-alpha6 --- ../blank/.git/refs/tags/drupal-6--1-0-alpha6 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/tags/drupal-6--1-0-alpha6 2010-02-28 13:09:20.000000000 -0600 @@ -0,0 +1 @@ +8c35e86f1eda9b3087afd66c9bbcfba6c4834bb3 diff -upNr ../blank/.git/refs/tags/drupal-6--1-0-alpha7 ./.git/refs/tags/drupal-6--1-0-alpha7 --- ../blank/.git/refs/tags/drupal-6--1-0-alpha7 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/tags/drupal-6--1-0-alpha7 2010-02-28 17:31:28.000000000 -0600 @@ -0,0 +1 @@ +7c10c1326dbcf6dbebfbedf2dae2a7c6711c8a41 diff -upNr ../blank/.git/refs/tags/drupal-6--1-0-alpha8 ./.git/refs/tags/drupal-6--1-0-alpha8 --- ../blank/.git/refs/tags/drupal-6--1-0-alpha8 1969-12-31 18:00:00.000000000 -0600 +++ ./.git/refs/tags/drupal-6--1-0-alpha8 2010-03-01 11:32:27.000000000 -0600 @@ -0,0 +1 @@ +bbac71bc45de9e370ff3b37b3d95b39d7ab4050c diff -upNr ../blank/LICENSE.txt ./LICENSE.txt --- ../blank/LICENSE.txt 1969-12-31 18:00:00.000000000 -0600 +++ ./LICENSE.txt 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1,274 @@ +GNU GENERAL PUBLIC LICENSE + + Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute +verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The licenses for most software are designed to take away your freedom to +share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software--to +make sure the software is free for all its users. This General Public License +applies to most of the Free Software Foundation's software and to any other +program whose authors commit to using it. (Some other Free Software +Foundation software is covered by the GNU Library General Public License +instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this service if +you wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems +introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND + MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such +program or work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is to say, a work +containing the Program or a portion of it, either verbatim or with +modifications and/or translated into another language. (Hereinafter, translation +is included without limitation in the term "modification".) Each licensee is +addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made +by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in +part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print such +an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be +reasonably considered independent and separate works in themselves, then +this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part +of a whole which is a work based on the Program, the distribution of the +whole must be on the terms of this License, whose permissions for other +licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to +work written entirely by you; rather, the intent is to exercise the right to +control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the scope +of this License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 +and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 above +on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for +noncommercial distribution and only if you received the program in object +code or executable form with such an offer, in accord with Subsection b +above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, +and so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will automatically +terminate your rights under this License. However, parties who have received +copies, or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the +Program (or any work based on the Program), you indicate your acceptance +of this License to do so, and all its terms and conditions for copying, +distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be +similar in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If +the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make +exceptions for this. Our decision will be guided by the two goals of +preserving the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally. + + NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT +PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR +ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES +SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN +IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff -upNr ../blank/README.txt ./README.txt --- ../blank/README.txt 1969-12-31 18:00:00.000000000 -0600 +++ ./README.txt 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1,26 @@ + +Context admin provides .... + +INSTALLATION +============ + + +CONFIGURATION +============= + + +THEMING +======= + + +NOTE +==== + + +AUTHORS & COPYRIGHT +=================== +Context admin was written by Kristopher Vanderwater + +Context admin Copyright (c) 2010 Meridian Data Systems, Inc. (dba The Worx Company) + +This module is licensed under the GPL v2. See LICENSE.txt for details. diff -upNr ../blank/context_admin.info ./context_admin.info --- ../blank/context_admin.info 1969-12-31 18:00:00.000000000 -0600 +++ ./context_admin.info 2010-02-22 14:47:22.000000000 -0600 @@ -0,0 +1,6 @@ +name = Contextual Administration +description = A module for building and exporting menu items for a given contextual area of a site. +core = 6.x +package = Chaos tool suite +version = "6.x-1.0 alpha1" +dependencies[] = page_manager \ No newline at end of file diff -upNr ../blank/context_admin.module ./context_admin.module --- ../blank/context_admin.module 1969-12-31 18:00:00.000000000 -0600 +++ ./context_admin.module 2010-03-02 00:52:16.000000000 -0600 @@ -0,0 +1,123 @@ + 2, + 'path' => drupal_get_path('module', 'context_admin') . '/includes', + ); +} + +function context_admin_ctools_plugin_directory($module, $plugin) { + if ($module == 'page_manager' || $module == 'ctools' || $module == 'context_admin') { + return 'plugins/' . $plugin; + } +} + +function context_admin_get_path($file, $base_path = FALSE, $module = 'context_admin') { + $output = $base_path ? base_path() : ''; + return $output . drupal_get_path('module', $module) . '/' . $file; +} + +function context_admin_load($name) { + $cache = new stdClass(); + $cache->task_name = $name; + return $cache; +} + +function context_admin_get_page_cache($name) { + ctools_include('object-cache'); + $cache = ctools_object_cache_get('context_admin', $name); + if (!$cache) { + $cache = context_admin_load($name); + $cache->locked = ctools_object_cache_test('context_admin', $name); + } + + return $cache; +} + +/** + * Store changes to a task handler in the object cache. + */ +function context_admin_set_page_cache($name, $page) { + $page->changed = TRUE; + ctools_include('object-cache'); + $cache = ctools_object_cache_set('context_admin', $name, $page); +} + +/** + * Remove an item from the object cache. + */ +function context_admin_clear_page_cache($name) { + ctools_include('object-cache'); + ctools_object_cache_clear('context_admin', $name); +} + +function context_admin_get_plugins($type, $options = array()) { + $id = $options['id'] ? $options['id'] : NULL; + $context = $options['context'] ? $options['context'] : 'global'; + if (is_null($id)) { + ctools_include('plugins'); + $plugins = ctools_get_plugins('context_admin', $type); + foreach ($plugins as $key => $plugin) { + if (!is_array($plugin['context'])) { + $plugin['context'] = array($plugin['context']); + } + if (!in_array($context, $plugin['context'])) { + unset($plugins[$key]); + } + if ($plugin['restriction arguments'] && $plugin['restriction callback']) { + // Probably need some sort of loading mechanism in case the function is in an include somewhere. + $access = call_user_func_array($plugin['restriction callback'], $plugin['restriction arguments']); + } + elseif ($plugin['restriction arguments']) { + $access = module_exists($plugin['restriction arguments'][0]); + } + else { + $access = TRUE; + } + if (!$access) { + unset($plugins[$key]); + } + } + } + else { + $plugins = ctools_get_plugins('context_admin', $type, $id); + } + return $plugins; +} + +function context_admin_form_alter(&$form, $form_state, $form_id) { + // Checking to make sure that we're on a context_admin generated node form + $page = page_manager_get_current_page(); + if ($page) { + $callback = $page['handler']->conf['context_admin_options']; + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + if (function_exists($plugin['module'] .'_'. $callback .'_form_alter')) { + $function = $plugin['module'] .'_'. $callback .'_form_alter'; + $function($form, $form_state, $form_id); + } + } +} + +function context_admin_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { + $page = page_manager_get_current_page(); + if ($page && ($op != 'load')) { + $callback = $page['handler']->conf['context_admin_options']; + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + module_invoke($plugin['module'] .'_'. $callback, 'nodeapi', $node, $op, $a3, $a4); + } + elseif ($page && $op == 'load') { + $callback = $page['handler']->conf['context_admin_options']; + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + return module_invoke($plugin['module'] .'_'. $callback, 'nodeapi', $node, $op, $a3, $a4); + } +} diff -upNr ../blank/includes/context_admin.views_default.inc ./includes/context_admin.views_default.inc --- ../blank/includes/context_admin.views_default.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./includes/context_admin.views_default.inc 2010-03-01 11:28:15.000000000 -0600 @@ -0,0 +1,328 @@ + $task) { + $tasks['page-'. $task_id] = $task; + } + foreach ($tasks as $task_id => $task) { + $cache = page_manager_cache_load($task_id); + page_manager_clear_page_cache($task_id); + foreach ($cache->handlers as $handler) { + if ($handler->conf['context_admin_options'] == 'views_bulk_menu') { + $view_name = $handler->name; + $type = $handler->conf['context_admin_views_bulk_node_type']; + $pub = $handler->conf['context_admin_views_bulk_published']; + if ($pub == 'published') { + $pub = TRUE; + } + elseif ($pub == 'unpublished') { + $pub = FALSE; + } + $view = context_admin_default_view($view_name, $type, $pub); + $views[$view->name] = $view; + } + } + } + return $views; +} + +function context_admin_default_view($view_name, $type, $pub) { + $view = new view; + $view->name = $view_name; + $view->description = ''; + $view->tag = ''; + $view->view_php = ''; + $view->base_table = 'node'; + $view->is_cacheable = FALSE; + $view->api_version = 2; + $view->disabled = FALSE; + $handler = $view->new_display('default', 'Defaults', 'default'); + $handler->override_option('fields', array( + 'title' => array( + 'label' => 'Title', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'link_to_node' => 1, + 'exclude' => 0, + 'id' => 'title', + 'table' => 'node', + 'field' => 'title', + 'relationship' => 'none', + ), + 'created' => array( + 'label' => 'Post date', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'date_format' => 'small', + 'custom_date_format' => '', + 'exclude' => 0, + 'id' => 'created', + 'table' => 'node', + 'field' => 'created', + 'relationship' => 'none', + ), + 'status' => array( + 'label' => 'Published', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'type' => 'yes-no', + 'not' => 0, + 'exclude' => 0, + 'id' => 'status', + 'table' => 'node', + 'field' => 'status', + 'relationship' => 'none', + ), + 'promote' => array( + 'label' => 'Promoted', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'type' => 'yes-no', + 'not' => 0, + 'exclude' => 0, + 'id' => 'promote', + 'table' => 'node', + 'field' => 'promote', + 'relationship' => 'none', + ), + 'sticky' => array( + 'label' => 'Sticky', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'type' => 'yes-no', + 'not' => 0, + 'exclude' => 0, + 'id' => 'sticky', + 'table' => 'node', + 'field' => 'sticky', + 'relationship' => 'none', + ), + 'edit_node' => array( + 'label' => '', + 'alter' => array( + 'alter_text' => 0, + 'text' => '', + 'make_link' => 0, + 'path' => '', + 'link_class' => '', + 'alt' => '', + 'prefix' => '', + 'suffix' => '', + 'target' => '', + 'help' => '', + 'trim' => 0, + 'max_length' => '', + 'word_boundary' => 1, + 'ellipsis' => 1, + 'strip_tags' => 0, + 'html' => 0, + ), + 'empty' => '', + 'hide_empty' => 0, + 'empty_zero' => 0, + 'text' => '', + 'exclude' => 0, + 'id' => 'edit_node', + 'table' => 'node', + 'field' => 'edit_node', + 'relationship' => 'none', + ), + )); + if ($pub === FALSE || $pub === TRUE) { + $handler->override_option('filters', array( + 'status' => array( + 'operator' => '=', + 'value' => $pub, + 'group' => '0', + 'exposed' => FALSE, + 'expose' => array( + 'operator' => FALSE, + 'label' => '', + ), + 'id' => 'status', + 'table' => 'node', + 'field' => 'status', + 'relationship' => 'none', + ), + 'type' => array( + 'operator' => 'in', + 'value' => array( + $type => $type, + ), + 'group' => '0', + 'exposed' => FALSE, + 'expose' => array( + 'operator' => FALSE, + 'label' => '', + ), + 'id' => 'type', + 'table' => 'node', + 'field' => 'type', + 'relationship' => 'none', + ), + )); + } + else { + $handler->override_option('filters', array( + 'type' => array( + 'operator' => 'in', + 'value' => array( + $type => $type, + ), + 'group' => '0', + 'exposed' => FALSE, + 'expose' => array( + 'operator' => FALSE, + 'label' => '', + ), + 'id' => 'type', + 'table' => 'node', + 'field' => 'type', + 'relationship' => 'none', + ), + )); + } + $handler->override_option('access', array( + 'type' => 'none', + )); + $handler->override_option('cache', array( + 'type' => 'none', + )); + $handler->override_option('style_plugin', 'bulk'); + $handler->override_option('style_options', array( + 'execution_type' => '1', + 'display_type' => '0', + 'hide_select_all' => 0, + 'skip_confirmation' => 0, + 'display_result' => 1, + 'merge_single_action' => 1, + 'selected_operations' => array( + 'views_bulk_operations_delete_node_action' => 'views_bulk_operations_delete_node_action', + 'node_make_sticky_action' => 'node_make_sticky_action', + 'node_make_unsticky_action' => 'node_make_unsticky_action', + 'node_promote_action' => 'node_promote_action', + 'node_publish_action' => 'node_publish_action', + 'node_unpromote_action' => 'node_unpromote_action', + 'node_unpublish_action' => 'node_unpublish_action', + 'node_assign_owner_action' => 0, + 'node_mass_update:a27b9efabcd054685a549378b174ad11' => 0, + 'system_message_action' => 0, + 'views_bulk_operations_script_action' => 0, + 'node_mass_update:c4d3b28efb86fd703619a50b74d43794' => 0, + 'views_bulk_operations_taxonomy_action' => 0, + 'views_bulk_operations_argument_selector_action' => 0, + 'node_mass_update:14de7d028b4bffdf2b4a266562ca18ac' => 0, + 'node_mass_update:9c585624b9b3af0b4687d5f97f35e047' => 0, + 'system_goto_action' => 0, + 'node_mass_update:8ce21b08bb8e773d10018b484fe4815e' => 0, + 'node_save_action' => 0, + 'system_send_email_action' => 0, + 'node_mass_update:0ccad85c1ebe4c9ceada1aa64293b080' => 0, + 'node_unpublish_by_keyword_action' => 0, + ), + )); + return $view; +} + + diff -upNr ../blank/plugins/access/node_menu.inc ./plugins/access/node_menu.inc --- ../blank/plugins/access/node_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/access/node_menu.inc 2010-02-28 17:28:49.000000000 -0600 @@ -0,0 +1,103 @@ + t("Node: In Menu"), + 'description' => t('Control access based on whether the current node exists in a particular menu.'), + 'callback' => 'context_access_node_menu_access_check', + 'default' => array('menu' => array()), + 'settings form' => 'context_access_node_menu_access_settings', + 'settings form submit' => 'context_access_node_menu_access_settings_submit', + 'summary' => 'context_access_node_menu_access_summary', + 'required context' => new ctools_context_required(t('Node'), 'node'), + 'restrictions' => 'context_access_node_menu_access_restrictions', +); + +function context_access_node_menu_get_menus() { + $system_menus = menu_list_system_menus(); + $custom_menus = menu_get_menus(); + foreach ($system_menus as $name) { + $options[$name] = ucfirst(str_replace('-', ' ', $system_menus)); + } + foreach ($custom_menus as $name => $title) { + $options[$name] = $title; + } + return $options; +} + +/** + * Settings form for the 'by node_type' access plugin + */ +function context_access_node_menu_access_settings(&$form, &$form_state, $conf) { + $options = context_access_node_menu_get_menus(); + + $form['settings']['menu'] = array( + '#title' => t('Menu'), + '#type' => 'select', + '#options' => $options, + '#description' => t('Only the checked menus will be valid.'), + '#default_value' => $conf['menu'], + ); +} + +/** + * Compress the node_types allowed to the minimum. + */ +function context_access_node_menu_access_settings_submit(&$form, &$form_state) { + +} + +/** + * Check for access. + */ +function context_access_node_menu_access_check($conf, $context) { + // Per the example in node type in core ctools + if (empty($context) || empty($context->data) || empty($context->data->nid)) { + return FALSE; + } + + $results = db_query("SELECT menu_name FROM {menu_links} WHERE link_path = 'node/%d' AND module = 'menu'", $context->data->nid); + while ($result = db_fetch_object($results)) { + if ($result->menu_name == $conf['menu']) { + return TRUE; + } + } + + if (empty($conf['menu'])) { + return FALSE; + } + + return FALSE; +} + +/** + * Inform the UI that we've eliminated a bunch of possibilities for this + * context. + */ +function context_access_node_menu_access_restrictions($conf, &$context) { + if (isset($context->restrictions['menu'])) { + $context->restrictions['menu'] = array_unique(array_merge($context->restrictions['menu'], array_keys(array_filter($conf['menu'])))); + } + else { + $context->restrictions['menu'] = $conf['menu']; + } +} + +/** + * Provide a summary description based upon the checked node_types. + */ +function context_access_node_menu_access_summary($conf, $context) { + if (!isset($conf['menu'])) { + return t('No menu context has been selected for @identifier', array('@identifier' => $context->identifier)); + } + + return t('@identifier is in the "@menu" menu', array('@menu' => $conf['menu'], '@identifier' => $context->identifier)); +} \ No newline at end of file diff -upNr ../blank/plugins/access/term_parent.inc ./plugins/access/term_parent.inc --- ../blank/plugins/access/term_parent.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/access/term_parent.inc 2010-02-23 10:59:32.000000000 -0600 @@ -0,0 +1,92 @@ + t("Term: Parent"), + 'description' => t('Control access based upon the parent of the current term.'), + 'callback' => 'context_access_term_parent_access_check', + 'default' => array('menu' => array()), + 'settings form' => 'context_access_term_parent_access_settings', + 'settings form submit' => 'context_access_term_parent_access_settings_submit', + 'summary' => 'context_access_term_parent_access_summary', + 'required context' => new ctools_context_required(t('Term'), array('term', 'terms')), + 'restrictions' => 'context_access_term_parent_access_restrictions', +); + +/** + * Settings form for the 'by node_type' access plugin + */ +function context_access_term_parent_access_settings(&$form, &$form_state, $conf) { + $form['settings']['parent'] = array( + '#title' => t('Term parent'), + '#type' => 'textfield', + '#description' => t('Enter a numeric value for the parent of the term you wish to utilize. Multiple terms may be comma separated.'), + '#default_value' => $conf['parent'], + ); +} + +/** + * Compress the node_types allowed to the minimum. + */ +function context_access_term_parent_access_settings_submit(&$form, &$form_state) { + +} + +/** + * Check for access. + */ +function context_access_term_parent_access_check($conf, $context) { + // Per the example in node type in core ctools + if (empty($context) || empty($context->data) || empty($context->data->tid)) { + return FALSE; + } + + $acceptable_parents = explode(',', $conf['parent']); + $results = db_query("SELECT parent FROM {term_hierarchy} WHERE tid = %d", $context->data->tid); + while ($result = db_fetch_object($results)) { + if (in_array($result->parent, $acceptable_parents)) { + return TRUE; + } + } + + if (empty($conf['parent'])) { + return FALSE; + } + + return FALSE; +} + +/** + * Inform the UI that we've eliminated a bunch of possibilities for this + * context. + */ +function context_access_term_parent_access_restrictions($conf, &$context) { + if (!is_array($conf['parent'])) { + $conf['parent'] = array($conf['parent']); + } + if (isset($context->restrictions['parent'])) { + $context->restrictions['parent'] = array_unique(array_merge($context->restrictions['parent'], array_keys(array_filter($conf['parent'])))); + } + else { + $context->restrictions['parent'] = array_keys(array_filter($conf['parent'])); + } +} + +/** + * Provide a summary description based upon the checked node_types. + */ +function context_access_term_parent_access_summary($conf, $context) { + if (!isset($conf['parent'])) { + return t('No parent context has been selected for @identifier', array('@identifier' => $context->identifier)); + } + + return t('@identifier is a child of term "@parent"', array('@parent' => $conf['parent'], '@identifier' => $context->identifier)); +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/admin_section.inc ./plugins/administrations/admin_section.inc --- ../blank/plugins/administrations/admin_section.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/admin_section.inc 2010-02-24 11:11:18.000000000 -0600 @@ -0,0 +1,25 @@ + t('Administrative Section'), + 'description' => t('Administrative sections add additional holders to the /admin page automatically, allowing for easy creation of new administration sections.'), + 'context' => 'global', +); + +function context_admin_admin_section_content_form(&$form, &$form_state, $cache = NULL) { + $form['admin_section_info'] = array( + '#type' => 'markup', + '#value' => t('Administrative sections are meant to be used in conjuncture with the /admin screen. These allow you to add this item to /admin/my-path and add it to the navigation menu, and then as you add new items to this sub section of the navigation menu, this parent item will display them all properly on a sub page.'), + ); + return $form; +} + +function context_admin_admin_section_render_page($handler, $base_contexts, $args, $test = TRUE) { + module_load_include('inc', 'system', 'system.admin'); + return system_admin_menu_block_page(); +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/node_create_menu.inc ./plugins/administrations/node_create_menu.inc --- ../blank/plugins/administrations/node_create_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/node_create_menu.inc 2010-02-28 17:18:07.000000000 -0600 @@ -0,0 +1,120 @@ + t('Create Node'), + 'description' => t('Allows the creation of a particular node type. This circumvents the typical drupal access controls on node creation.'), + 'context' => 'global', +); + + +function context_admin_node_create_menu_content_form(&$form, &$form_state, $cache = NULL) { + if (!is_null($form_state['handler_id'])) { + $default = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_options_items']; + } + else { + $default = $form_state['page']->new_handler->conf['context_admin_options_items']; + } + $types = node_get_types(); + foreach ($types as $key => $type) { + $options[$key] = $type->name; + } + $form['context_admin_options_items'] = array( + '#type' => 'radios', + '#title' => t('Select the node type you would like to create'), + '#required' => TRUE, + '#options' => $options, + '#default_value' => $default, + ); + foreach($form_state['page']->subtask['subtask']->arguments as $context => $args) { + if ($context == 'node') { + if (!is_null($form_state['handler_id'])) { + $sub = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_sub_page'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_sub_page'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_sub_page']; + } + else { + $sub = $form_state['page']->new_handler->conf['context_admin_sub_page']; + } + $form['context_admin_sub_page'] = array( + '#type' => 'checkbox', + '#title' => t('Create as sub node'), + '#description' => t('Creates a node as a sub node of the currently viewed node within the menu system.'), + '#default_value' => $sub, + ); + } + } + return $form; +} + +function context_admin_node_create_menu_content_form_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items'] = $form_state['values']['context_admin_options_items']; + } + else { + $form_state['page']->new_handler->conf['context_admin_options_items'] = $form_state['values']['context_admin_options_items']; + } + if ($form_state['values']['context_admin_sub_page']) { + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_sub_page'] = $form_state['values']['context_admin_sub_page']; + } + else { + $form_state['page']->new_handler->conf['context_admin_sub_page'] = $form_state['values']['context_admin_sub_page']; + } + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); + return $form_state; +} + +function context_admin_node_create_menu_render_page($handler, $base_contexts, $args, $test = TRUE) { + $type = $handler->conf['context_admin_options_items']; + module_load_include('inc', 'node', 'node.pages'); + /** + * For those who are wondering, we're circumventing node_add() + * in order to get around the extra user_access check it does. + * We don't want it, so node_add() is basically duplicated + * here minus that small amount of code + */ + global $user; + + $types = node_get_types(); + $type = isset($type) ? str_replace('-', '_', $type) : NULL; + // If a node type has been specified, validate its existence. + if (isset($types[$type])) { + // Initialize settings: + $node = array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => ''); + + drupal_set_title(t('Create @name', array('@name' => $types[$type]->name))); + $output = drupal_get_form($type .'_node_form', $node); + } + return $output; +} + +function context_admin_node_create_menu_nodeapi(&$node, $op, $a3, $a4) { + switch ($op) { + case 'insert': + $page = page_manager_get_current_page(); + if ($page['handler']->conf['context_admin_sub_page']) { + foreach ($page['contexts'] as $context) { + if ($context->type == 'node') { + $parent_id = $context->argument; + $results = db_query("SELECT menu_name, mlid FROM {menu_links} WHERE link_path = 'node/%d' AND module = 'menu'", $parent_id); + $result = db_fetch_object($results); + if ($result) { + $item = array( + 'link_title' => $node->title, + 'menu_name' => $result->menu_name, + 'plid' => $result->mlid, + 'link_path' => 'node/'. $node->nid, + ); + menu_link_save($item); + } + } + } + } + break; + } +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/taxonomy_list_menu.inc ./plugins/administrations/taxonomy_list_menu.inc --- ../blank/plugins/administrations/taxonomy_list_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/taxonomy_list_menu.inc 2010-02-28 11:09:46.000000000 -0600 @@ -0,0 +1,93 @@ + t('Vocabulary Options'), + 'description' => t('Provides a number of different vocabulary related functions to allow for contextualized vocabulary maintenance.'), + 'context' => 'global', +); + +function context_admin_taxonomy_list_menu_content_form(&$form, &$form_state, $cache = NULL) { + if (!is_null($form_state['handler_id'])) { + $default = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary']; + $default_option = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary_options'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary_options'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary_options']; + } + else { + $default = $form_state['page']->new_handler->conf['context_admin_vocabulary']; + $default_option = $form_state['page']->new_handler->conf['context_admin_vocabulary_options']; + } + $types = taxonomy_get_vocabularies(); + foreach ($types as $type) { + $options[$type->vid] = $type->name; + } + $form['context_admin_vocabulary'] = array( + '#type' => 'radios', + '#title' => t('Vocabulary'), + '#description' => t('Select the vocabulary list you would like.'), + '#required' => TRUE, + '#options' => $options, + '#default_value' => $default, + ); + $form['context_admin_vocabulary_options'] = array( + '#type' => 'radios', + '#title' => t('Vocabulary Option'), + '#required' => TRUE, + '#options' => array( + 'edit' => 'Edit Vocabulary', + 'list' => 'List Terms', + 'add' => 'Add Terms', + ), + '#default_value' => $default_option, + ); + return $form; +} + +function context_admin_taxonomy_list_menu_content_form_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if ($form_state['handler_id']) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary'] = $form_state['values']['context_admin_vocabulary']; + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_vocabulary_options'] = $form_state['values']['context_admin_vocabulary_options']; + } + else { + $form_state['page']->new_handler->conf['context_admin_vocabulary'] = $form_state['values']['context_admin_vocabulary']; + $form_state['page']->new_handler->conf['context_admin_vocabulary_options'] = $form_state['values']['context_admin_vocabulary_options']; + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); + return $form_state; +} + +function context_admin_taxonomy_list_menu_render_page($handler, $base_contexts, $args, $test = TRUE) { + module_load_include('inc', 'taxonomy', 'taxonomy.admin'); + if (is_numeric($handler->conf['context_admin_vocabulary'])) { + $vocabulary = taxonomy_vocabulary_load($handler->conf['context_admin_vocabulary']); + } + switch($handler->conf['context_admin_vocabulary_options']) { + case 'edit': + $form = drupal_get_form('context_admin_taxonomy_list_menu_taxonomy_form_vocabulary', (array)$vocabulary); + return $form; + case 'list': + return drupal_get_form('taxonomy_overview_terms', $vocabulary); + case 'add': + return taxonomy_add_term_page($vocabulary); + } +} + +function context_admin_taxonomy_list_menu_taxonomy_form_vocabulary($form_state, $vocabulary) { + $form = taxonomy_form_vocabulary($form_state, $vocabulary); + return $form; +} + +function context_admin_taxonomy_list_menu_taxonomy_form_vocabulary_submit($form, &$form_state) { + taxonomy_form_vocabulary_submit($form, $form_state); + $form_state['redirect'] = $_GET['q']; +} + +function context_admin_taxonomy_list_menu_form_alter(&$form, $form_state, $form_id) { + if ($form_id == 'context_admin_taxonomy_list_menu_taxonomy_form_vocabulary') { + unset($form['delete']); + } +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/term_options_menu.inc ./plugins/administrations/term_options_menu.inc --- ../blank/plugins/administrations/term_options_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/term_options_menu.inc 2010-03-03 11:25:07.000000000 -0600 @@ -0,0 +1,103 @@ + t('Taxonomy Term Options'), + 'description' => t('Provides a number of different term related functions to allow for contextualized taxonomy term maintenance.'), + 'context' => 'term', +); + +function context_admin_term_options_menu_content_form(&$form, &$form_state, $cache = NULL) { + if (!is_null($form_state['handler_id'])) { + $default_options = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_term_options'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_term_options'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_term_options']; + } + else { + $default_options = $form_state['page']->new_handler->conf['context_admin_term_options']; + } + $form['help'] = array( + '#type' => 'markup', + '#value' => t('Taxonomy edit tabs can be limited via the access controls/selection criteria. If they are not limited, they will apply to ALL terms within your site.'), + ); + $form['context_admin_term_options'] = array( + '#type' => 'radios', + '#title' => t('Term Options'), + '#required' => TRUE, + '#options' => array( + 'add' => t('Add Term'), + 'term' => t('Edit Term'), + 'vocabulary' => t('Edit Vocabulary'), + ), + '#default_value' => $default_options, + ); + return $form; +} + +function context_admin_term_options_menu_content_form_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_term_options'] = $form_state['values']['context_admin_term_options']; + } + else { + $form_state['page']->new_handler->conf['context_admin_term_options'] = $form_state['values']['context_admin_term_options']; + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); + return $form_state; +} + +function context_admin_term_options_menu_render_page($handler, $base_contexts, $args, $test = TRUE) { + module_load_include('inc', 'taxonomy', 'taxonomy.admin'); + switch($handler->conf['context_admin_term_options']) { + case 'add': + return context_admin_term_options_menu_admin_term_edit($args[0], TRUE); + case 'term': + return context_admin_term_options_menu_admin_term_edit($args[0]); + case 'vocabulary': + $dir = module_invoke('context_admin', 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include('taxonomy_list_menu', 'context_admin', $dir); + if ($term = (array)taxonomy_get_term($args[0])) { + $form = drupal_get_form('context_admin_taxonomy_list_menu_taxonomy_form_vocabulary', (array)taxonomy_vocabulary_load($term['vid'])); + return $form; + } + return drupal_not_found(); + } +} + +function context_admin_term_options_menu_admin_term_edit($tid, $add = NULL) { + if (!is_numeric($tid)) { + $tid = db_result(db_query("SELECT tid FROM {term_data} WHERE name = '%s'", $tid)); + } + if ($term = (array)taxonomy_get_term($tid)) { + if (!is_null($add)) { + return drupal_get_form('context_admin_term_options_menu_taxonomy_form_term', taxonomy_vocabulary_load($term['vid']), array(), TRUE); + } + else { + return drupal_get_form('context_admin_term_options_menu_taxonomy_form_term', taxonomy_vocabulary_load($term['vid']), $term); + } + } + return drupal_not_found(); +} + +function context_admin_term_options_menu_taxonomy_form_term(&$form_state, $vocabulary, $edit = array(), $add = NULL) { + $form = taxonomy_form_term($form_state, $vocabulary, $edit); + if ($add) { + $form['#add'] = TRUE; + } + return $form; +} + +function context_admin_term_options_menu_taxonomy_form_term_submit($form, &$form_state) { + taxonomy_form_term_submit($form, $form_state); + $form_state['redirect'] = $_GET['q']; +} + +function context_admin_term_options_menu_form_alter(&$form, $form_state, $form_id) { + if ($form_id == 'context_admin_term_options_menu_taxonomy_form_term') { + if ($form['#add'] && arg(2)) { + $form['advanced']['parent']['#default_value'] = array(arg(2)); + } + } +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/user_create_menu.inc ./plugins/administrations/user_create_menu.inc --- ../blank/plugins/administrations/user_create_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/user_create_menu.inc 2010-03-06 19:27:19.000000000 -0600 @@ -0,0 +1,255 @@ + t('Create User'), + 'description' => t('Allows the creation of a user. This circumvents the typical drupal access controls on user creation.'), + 'context' => 'global', +); + + +function context_admin_user_create_menu_content_form(&$form, &$form_state, $cache = NULL) { + if (!is_null($form_state['handler_id'])) { + $default = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_roles']; + $default_alter = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles_alter'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles_alter'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_roles_alter']; + $default_status = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_status'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_status'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_status']; + $default_status_alter = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_status_alter'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_status_alter'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_status_alter']; + $default_help = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_registration_help'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_registration_help'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_registration_help']; + $default_notify = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_notify'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_notify'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_user_notify']; + } + else { + $default = $form_state['page']->new_handler->conf['context_admin_user_roles']; + $default_alter = $form_state['page']->new_handler->conf['context_admin_user_roles_alter']; + $default_status = $form_state['page']->new_handler->conf['context_admin_user_status']; + $default_status_alter = $form_state['page']->new_handler->conf['context_admin_user_status_alter']; + $default_help = $form_state['page']->new_handler->conf['context_admin_user_registration_help']; + $default_notify = $form_state['page']->new_handler->conf['context_admin_user_notify']; + } + $roles = user_roles(TRUE); + $options = array(); + foreach ($roles as $key => $role) { + $options[$key] = $role; + } + $form['context_admin_user_roles'] = array( + '#type' => 'checkboxes', + '#title' => t('Select the a default role for users created from this administration, if necessary.'), + '#options' => $options, + '#default_value' => is_array($default) ? $default : array($default), + ); + $form['context_admin_user_roles_alter'] = array( + '#type' => 'checkbox', + '#title' => t('Alter Roles'), + '#description' => t('Allow users of this form to set any role. *NOTE: This is HUGELY dangerous. Use with care.'), + '#default_value' => $default_alter, + ); + $form['context_admin_user_status'] = array( + '#type' => 'radios', + '#title' => 'Default Status', + '#default_value' => 1, + '#options' => array( + 0 => 'Blocked', + 1 => 'Active', + ), + '#default_value' => isset($default_status) ? $default_status : 1, + '#description' => t('Set the default user status for users created from this form.'), + ); + $form['context_admin_user_status_alter'] = array( + '#type' => 'checkbox', + '#title' => t('Alter Status'), + '#description' => t('Allow users of this form to determine if users will be active or blocked when created.'), + '#default_value' => $default_status_alter, + ); + /*$form['context_admin_user_registration_help'] = array( + '#type' => 'checkbox', + '#title' => t('Registration Help'), + '#description' => t('Includes the User Registration Help for this instance of user registration.'), + '#default_value' => $default_help, + );*/ + $form['context_admin_user_notify'] = array( + '#type' => 'checkbox', + '#title' => t('User Notification'), + '#description' => t('Include the User Notification option.'), + '#default_value' => $default_notify, + ); + return $form; +} + +function context_admin_user_create_menu_content_form_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles'] = $form_state['values']['context_admin_user_roles']; + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_roles_alter'] = $form_state['values']['context_admin_user_roles_alter']; + //$form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_registration_help'] = $form_state['values']['context_admin_user_registration_help']; + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_user_notify'] = $form_state['values']['context_admin_user_notify']; + } + else { + $form_state['page']->new_handler->conf['context_admin_options_items'] = $form_state['values']['context_admin_options_items']; + $form_state['page']->new_handler->conf['context_admin_options_items_alter'] = $form_state['values']['context_admin_options_items_alter']; + //$form_state['page']->new_handler->conf['context_admin_user_registration_help'] = $form_state['values']['context_admin_user_registration_help']; + $form_state['page']->new_handler->conf['context_admin_user_notify'] = $form_state['values']['context_admin_user_notify']; + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); + return $form_state; +} + +function context_admin_user_create_menu_render_page($handler, $base_contexts, $args, $test = TRUE) { + return drupal_get_form('context_admin_user_create_menu_render_form', $handler, $base_contexts, $args, $test); +} + +function context_admin_user_create_menu_render_form($form_state, $handler, $base_contexts, $args, $test = TRUE) { + $form = array(); + + // Display the registration form. + if ($handler->conf['context_admin_user_registration_help']) { + $form['user_registration_help'] = array( + '#value' => filter_xss_admin(variable_get('user_registration_help', '')), + // Ensure that user registration help appears above profile fields. + '#weight' => -20, + ); + } + + // Merge in the default user edit fields. + $form = array_merge($form, user_edit_form($form_state, NULL, NULL, TRUE)); + if ($handler->conf['context_admin_user_notify']) { + $form['account']['notify'] = array( + '#type' => 'checkbox', + '#title' => t('Notify user of new account') + ); + } + // Redirect back to page which initiated the create request; + $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']); + + + // Create a dummy variable for pass-by-reference parameters. + $null = NULL; + $extra = _user_forms($null, NULL, NULL, 'register'); + + // Remove form_group around default fields if there are no other groups. + if (!$extra) { + foreach (array('name', 'mail', 'pass', 'status', 'roles', 'notify') as $key) { + if (isset($form['account'][$key])) { + $form[$key] = $form['account'][$key]; + } + } + unset($form['account']); + } + else { + $form = array_merge($form, $extra); + } + + if (variable_get('configurable_timezones', 1)) { + // Override field ID, so we only change timezone on user registration, + // and never touch it on user edit pages. + $form['timezone'] = array( + '#type' => 'hidden', + '#default_value' => variable_get('date_default_timezone', NULL), + '#id' => 'edit-user-register-timezone', + ); + + // Add the JavaScript callback to automatically set the timezone. + drupal_add_js(' +// Global Killswitch +if (Drupal.jsEnabled) { + $(document).ready(function() { + Drupal.setDefaultTimezone(); + }); +}', 'inline'); + } + + $form['submit'] = array('#type' => 'submit', '#value' => t('Create new account'), '#weight' => 30); + $form['#validate'][] = 'user_register_validate'; + $form['#submit'][] = 'context_admin_user_create_menu_render_form_submit'; + + return $form; +} + +function context_admin_user_create_menu_render_form_submit($form, &$form_state) { + global $base_url; + $page = page_manager_get_current_page(); + $admin = user_access('administer users'); + + $mail = $form_state['values']['mail']; + $name = $form_state['values']['name']; + if (!$form_state['#handler']->conf['exclude_password']) { + $pass = $form_state['values']['pass']; + } + else { + $pass = user_password(); + }; + $notify = isset($form_state['values']['notify']) ? $form_state['values']['notify'] : NULL; + $from = variable_get('site_mail', ini_get('sendmail_from')); + if (isset($form_state['values']['roles']) || isset($page['handler']->conf['context_admin_user_roles'])) { + // Remove unset roles. + if (isset($form_state['values']['roles'])) { + $roles = array_filter($form_state['values']['roles']); + } + if (isset($page['handler']->conf['context_admin_user_roles'])) { + $roles += array_filter($page['handler']->conf['context_admin_user_roles']); + } + } + else { + $roles = array(); + } + // The unset below is needed to prevent these form values from being saved as + // user data. + unset($form_state['values']['form_token'], $form_state['values']['submit'], $form_state['values']['op'], $form_state['values']['notify'], $form_state['values']['form_id'], $form_state['values']['affiliates'], $form_state['values']['destination']); + + $merge_data = array('pass' => $pass, 'init' => $mail, 'roles' => $roles); + if (!$admin) { + // Set the user's status because it was not displayed in the form. + $merge_data['status'] = variable_get('user_register', 1) == 1; + } + $account = user_save('', array_merge($form_state['values'], $merge_data)); + // Terminate if an error occured during user_save(). + if (!$account) { + drupal_set_message(t("Error saving user account."), 'error'); + $form_state['redirect'] = ''; + return; + } + $form_state['user'] = $account; + + watchdog('user', 'New user: %name (%email).', array('%name' => $name, '%email' => $mail), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit')); + + // Add plain text password into user account to generate mail tokens. + $account->password = $pass; + if (!$notify) { + drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + } + else if ($account->status || $notify) { + // Create new user account, no administrator approval required. + $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; + _user_mail_notify($op, $account); + if ($notify) { + drupal_set_message(t('Password and further instructions have been e-mailed to the new user %name.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + } + else { + drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.')); + $form_state['redirect'] = ''; + return; + } + } + else { + // Create new user account, administrator approval required. + _user_mail_notify('register_pending_approval', $account); + drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, a welcome message with further instructions has been sent to your e-mail address.')); + $form_state['redirect'] = ''; + return; + } +} + + +function context_admin_user_create_menu_form_alter(&$form, $form_state, $form_id) { + $page = page_manager_get_current_page(); + if ($form_id == 'context_admin_user_create_menu_render_form' && $page) { + //drupal_set_message('
'. var_export($form['status'], TRUE) .'
'); + $form['roles']['#value'] = $page['handler']->conf['context_admin_user_roles']; + $form['roles']['#value'][2] = TRUE; + if (!$page['handler']->conf['context_admin_user_roles_alter']) { + $form['roles']['#disabled'] = TRUE; + } + } +} \ No newline at end of file diff -upNr ../blank/plugins/administrations/views_bulk_menu.inc ./plugins/administrations/views_bulk_menu.inc --- ../blank/plugins/administrations/views_bulk_menu.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/administrations/views_bulk_menu.inc 2010-03-01 11:29:06.000000000 -0600 @@ -0,0 +1,73 @@ + t('Views Administration'), + 'description' => t('Provides a generic Views Bulk Operations based view that should work for most node type needs.'), + 'context' => 'global', + 'restriction arguments' => array('views_bulk_operations'), +); + +function context_admin_views_bulk_menu_content_form(&$form, &$form_state, $cache = NULL) { + if (!is_null($form_state['handler_id'])) { + $default_type = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_node_type'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_node_type'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_node_type']; + $default_pub = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_published'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_published'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_published']; + } + else { + $default_type = $form_state['page']->new_handler->conf['context_admin_views_bulk_node_type']; + $default_pub = $form_state['page']->new_handler->conf['context_admin_views_bulk_published']; + } + $types = node_get_types(); + foreach ($types as $key => $type) { + $options[$key] = $type->name; + } + $form['context_admin_views_bulk_node_type'] = array( + '#type' => 'radios', + '#title' => t('Node Type'), + '#required' => TRUE, + '#options' => $options, + '#default_value' => $default_type, + ); + $form['context_admin_views_bulk_published'] = array( + '#type' => 'radios', + '#title' => t('Published Options'), + '#required' => TRUE, + '#options' => array( + 'published' => t('Published'), + 'unpublished' => t('Unpublished'), + 'both' => t('both'), + ), + '#default_value' => $default_pub, + ); + return $form; +} + +function context_admin_views_bulk_menu_content_form_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_node_type'] = $form_state['values']['context_admin_views_bulk_node_type']; + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_views_bulk_published'] = $form_state['values']['context_admin_views_bulk_published']; + } + else { + $form_state['page']->new_handler->conf['context_admin_views_bulk_node_type'] = $form_state['values']['context_admin_views_bulk_node_type']; + $form_state['page']->new_handler->conf['context_admin_views_bulk_published'] = $form_state['values']['context_admin_views_bulk_published']; + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); + return $form_state; +} + +function context_admin_views_bulk_menu_render_page($handler, $base_contexts, $args, $test = TRUE) { + return views_embed_view($handler->name); +} + +function context_admin_views_bulk_menu_save($handler, $update) { + views_invalidate_cache(); +} + +function context_admin_views_bulk_menu_delete($handler, $update) { + views_invalidate_cache(); +} \ No newline at end of file diff -upNr ../blank/plugins/task_handlers/menu_context.inc ./plugins/task_handlers/menu_context.inc --- ../blank/plugins/task_handlers/menu_context.inc 1969-12-31 18:00:00.000000000 -0600 +++ ./plugins/task_handlers/menu_context.inc 2010-02-28 12:25:26.000000000 -0600 @@ -0,0 +1,403 @@ + 'context', + 'visible' => TRUE, // may be added up front. + + // Administrative fields. + 'title' => t('Context Admin'), + 'admin summary' =>'context_admin_menu_context_admin_summary', + 'admin title' => 'context_admin_menu_context_title', + 'admin css' => array( + context_admin_get_path('css/context_admin.css'), + ), + /*'admin js' => array( + panels_get_path('js/layout.js'), + ),*/ + 'operations' => array( + 'settings' => array( + 'title' => t('General'), + 'description' => t('Change general settings about this variant.'), + 'form' => 'context_admin_menu_context_edit_settings', + ), + 'criteria' => array( + 'title' => t('Selection rules'), + 'description' => t('Control the criteria used to decide whether or not this variant is used.'), + 'ajax' => FALSE, + 'form' => array( + 'order' => array( + 'form' => t('Selection rules'), + ), + 'forms' => array( + 'form' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_criteria', + ), + ), + ), + ), + 'content' => array( + 'title' => t('Content'), + 'description' => t('Select the sort of content this particular administration menu item will contain.'), + 'ajax' => FALSE, + 'form' => array( + 'order' => array( + 'form' => t('Content'), + ), + 'forms' => array( + 'form' => array( + 'form id' => 'context_admin_menu_context_edit_content', + 'no blocks' => TRUE, + ), + ), + ), + ), + 'content_settings' => array( + 'title' => t('Content Setting'), + 'ajax' => FALSE, + 'form' => array( + 'order' => array( + 'form' => t('Content Settings'), + ), + 'forms' => array( + 'form' => array( + 'form id' => 'context_admin_menu_context_edit_content_settings', + 'no blocks' => TRUE, + ), + ), + ), + ), + ), + + // Callback to render the data. + 'render' => 'context_admin_menu_context_render', + + // Various callbacks for operations performed on the handler to ensure + // related data is updated properly. + 'save' => 'context_admin_menu_context_save', + 'delete' => 'context_admin_menu_context_delete', + 'export' => 'context_admin_menu_context_export', + 'clone' => 'context_admin_menu_context_clone', + + 'add features' => array( + 'criteria' => t('Selection rules'), + ), + + // Where to go when finished. + 'add finish' => 'content', + + 'required forms' => array( + 'content' => t('Content'), + 'content_settings' => t('Content Settings'), + ), + + 'edit forms' => array( + 'settings' => t('General'), + 'criteria' => t('Selection rules'), + 'content' => t('Content'), + 'content_settings' => t('Content Settings'), + ), + 'forms' => array( + 'settings' => array( + 'form id' => 'context_admin_menu_context_edit_settings', + ), + 'content' => array( + 'form id' => 'context_admin_menu_context_edit_content', + 'no blocks' => TRUE, + ), + 'content_settings' => array( + 'form id' => 'context_admin_menu_context_edit_content_settings', + ), + 'context' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_context', + ), + 'criteria' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_criteria', + ), + ), + 'default conf' => array( + 'title' => t('Contextual Administration'), + 'no_blocks' => FALSE, + 'css_id' => '', + 'css' => '', + 'contexts' => array(), + 'relationships' => array(), + ), +); + +function context_admin_menu_context_title($handler, $task, $subtask) { + if (isset($handler->conf['title'])) { + return check_plain($handler->conf['title']); + } + else { + return t('Contextual Administration'); + } +} + +function context_admin_menu_context_admin_summary($handler, $task, $subtask, $page, $show_title = TRUE) { + $task_name = page_manager_make_task_name($task['name'], $subtask['name']); + $output = ''; + + ctools_include('context'); + ctools_include('context-task-handler'); + + $plugin = page_manager_get_task_handler($handler->handler); + + // Get the operations + $operations = page_manager_get_operations($page); + + // Get operations for just this handler. + $operations = $operations['handlers']['children'][$handler->name]['children']['actions']['children']; + $args = array('handlers', $handler->name, 'actions'); + $rendered_operations = page_manager_render_operations($page, $operations, array(), array('class' => 'actions'), 'actions', $args); + + $object = ctools_context_handler_get_task_object($task, $subtask, $handler); + $context = ctools_context_load_contexts($object, TRUE); + + $access = ctools_access_group_summary(!empty($handler->conf['access']) ? $handler->conf['access'] : array(), $context); + if ($access) { + $access = t('This contextual administration menu will be visible if @conditions.', array('@conditions' => $access)); + } + else { + $access = t('This contextual administration menu will always be visible.'); + } + + $rows = array(); + + $type = $handler->type == t('Default') ? t('In code') : $handler->type; + $rows[] = array( + array('class' => t('page-summary-label'), 'data' => t('Storage')), + array('class' => t('page-summary-data'), 'data' => $type), + array('class' => t('page-summary-operation'), 'data' => ''), + ); + + if (!empty($handler->disabled)) { + $link = l(t('Enable'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'actions', 'enable'))); + $text = t('Disabled'); + } + else { + $link = l(t('Disable'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'actions', 'disable'))); + $text = t('Enabled'); + } + + $rows[] = array( + array('class' => t('page-summary-label'), 'data' => t('Status')), + array('class' => t('page-summary-data'), 'data' => $text), + array('class' => t('page-summary-operation'), 'data' => $link), + ); + + $link = l(t('Edit'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'criteria'))); + $rows[] = array( + array('class' => t('page-summary-label'), 'data' => t('Selection rule')), + array('class' => t('page-summary-data'), 'data' => $access), + array('class' => t('page-summary-operation'), 'data' => $link), + ); + + $content_link = ' [' . l(t('Edit'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'content'))) . ']'; + + $info = theme('table', array(), $rows, array('class' => 'page-manager-handler-summary')); + + $contexts = theme('ctools_context_list_no_table', $object); + if (empty($contexts)) { + $contexts = t('This contextual administration menu has no contexts.'); + } + + $title = $handler->conf['title']; + if ($title != t('Context Admin')) { + $title = t('Contex Admin: @title', array('@title' => $title)); + } + + $output .= '
'; + if ($show_title) { + $output .= '
'; + $output .= '
' . $rendered_operations['actions'] . '
'; + $output .= '' . $title . ''; + } + + $output .= '
'; + $output .= $info; + $output .= '
'; + return $output; +} + +function context_admin_menu_context_edit_settings(&$form, &$form_state) { + $conf = $form_state['handler']->conf; + $form['conf']['title'] = array( + '#type' => 'textfield', + '#default_value' => $conf['title'], + '#title' => t('Administrative title'), + '#description' => t('Administrative title of this variant.'), + ); + + $form['conf']['no_blocks'] = array( + '#type' => 'checkbox', + '#default_value' => $conf['no_blocks'], + '#title' => t('Disable Drupal blocks/regions'), + '#description' => t('Check this to have the page disable all regions displayed in the theme. Note that some themes support this setting better than others. If in doubt, try with stock themes to see.'), + ); + + $form['conf']['css_id'] = array( + '#type' => 'textfield', + '#size' => 35, + '#default_value' => $conf['css_id'], + '#title' => t('CSS ID'), + '#description' => t('The CSS ID to apply to this page'), + ); + + $form['conf']['css'] = array( + '#type' => 'textarea', + '#title' => t('CSS code'), + '#description' => t('Enter well-formed CSS code here; this code will be embedded into the page, and should only be used for minor adjustments; it is usually better to try to put CSS for the page into the theme if possible. This CSS will be filtered for safety so some CSS may not work.'), + '#default_value' => $conf['css'], + ); +} + +function context_admin_menu_context_edit_content(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + $cache2 = page_manager_get_page_cache('page-'. $form_state['page']->subtask_id); + $arguments = $cache2->subtask['subtask']->arguments; + $arguments['global'] = array(); + if (!is_null($form_state['handler_id'])) { + $default = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_options']; + } + else { + $default = $form_state['page']->new_handler->conf['context_admin_options']; + } + $contexts = array(); + $options = array(); + foreach ($arguments as $key => $argument) { + $contexts[$key] = context_admin_get_plugins('administrations', array('context' => $key)); + foreach($contexts[$key] as $callback => $admin) { + $options[$callback] = $admin['title']; + } + } + $form['context_admin_options'] = array( + '#title' => t('Choose a contextual administration type'), + '#type' => 'radios', + '#options' => $options, + '#required' => TRUE, + '#default_value' => $default, + ); +} + +function context_admin_menu_context_edit_content_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] = $form_state['values']['context_admin_options']; + } + else { + $form_state['page']->new_handler->conf['context_admin_options'] = $form_state['values']['context_admin_options']; + } + context_admin_set_page_cache($form_state['page']->subtask_id, $form_state['page']); +} + +function context_admin_menu_context_edit_content_settings(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $callback = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_options']; + } + else { + $callback = $form_state['page']->new_handler->conf['context_admin_options']; + } + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + $form += module_invoke($plugin['module'] .'_'. $callback, 'content_form', $form, $form_state, $cache); +} + +/** + * Since each administration type provides its own settings, the submission function depends on + * the type's submission function to manage the object-cache for the individual items that are + * pertinant to it. + */ + +function context_admin_menu_context_edit_content_settings_submit(&$form, &$form_state) { + $cache = context_admin_get_page_cache($form_state['page']->subtask_id); + if (!is_null($form_state['handler_id'])) { + $callback = $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] ? $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options'] : $cache->handlers[$form_state['handler_id']]->conf['context_admin_options']; + } + else { + $callback = $form_state['page']->new_handler->conf['context_admin_options']; + } + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + if (function_exists($plugin['module'] .'_'. $callback .'_content_form_submit')) { + $form_state += module_invoke($plugin['module'] .'_'. $callback, 'content_form_submit', $form, $form_state); + } +} + +function context_admin_menu_context_save(&$handler, $update) { + $callback = $handler->conf['context_admin_options']; + if ($callback) { + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + module_invoke($plugin['module'] .'_'. $callback, 'save', $handler, $update); + } + context_admin_clear_page_cache('context_admin', $handler->subtask); +} + +function context_admin_menu_context_delete(&$handler) { + $callback = $handler->conf['context_admin_options']; + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + module_invoke($plugin['module'] .'_'. $callback, 'delete', $handler, $update); + context_admin_clear_page_cache('context_admin', $handler->subtask); +} + +function context_admin_menu_context_clone(&$handler) { + $callback = $handler->conf['context_admin_options']; + if ($callback) { + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + module_invoke($plugin['module'] .'_'. $callback, 'clone', $handler); + } +} + +function context_admin_menu_context_export(&$handler, $indent) { + $callback = $handler->conf['context_admin_options']; + if ($callback) { + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + module_invoke($plugin['module'] .'_'. $callback, 'export', $handler, $indent); + } +} + +function context_admin_menu_context_render($handler, $base_contexts, $args, $test = TRUE) { + // Go through arguments and see if they match. + ctools_include('context'); + ctools_include('context-task-handler'); + // Add my contexts + $contexts = ctools_context_handler_get_handler_contexts($base_contexts, $handler); + + // Test. + if ($test && !ctools_context_handler_select($handler, $contexts)) { + return; + } + + if (isset($handler->handler)) { + ctools_context_handler_pre_render($handler, $contexts, $args); + } + + page_manager_get_current_page(array( + 'name' => $handler->name, + 'task' => $handler->task, + 'subtask' => $handler->subtask, + 'contexts' => $base_contexts, + 'arguments' => $args, + 'handler' => $handler, + )); + $callback = $handler->conf['context_admin_options']; + $plugin = context_admin_get_plugins('administrations', array('id' => $callback)); + $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'administrations'); + ctools_include($plugin['name'], $plugin['module'], $dir); + $info['content'] = module_invoke($plugin['module'] .'_'. $callback, 'render_page', $handler, $base_contexts, $args, $test); + return $info; +} \ No newline at end of file