From: Paul J R Date: Tue, 18 Sep 2012 19:17:09 +0000 (+1000) Subject: added some git repo create validation X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=commitdiff_plain;h=42069486556c27a9ceff2108970c6fe1c5333bfd added some git repo create validation --- diff --git a/data/gwvpmini.db b/data/gwvpmini.db deleted file mode 100644 index f64baa6..0000000 Binary files a/data/gwvpmini.db and /dev/null differ diff --git a/data/repos/qwer.git/HEAD b/data/repos/qwer.git/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/data/repos/qwer.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/data/repos/qwer.git/config b/data/repos/qwer.git/config deleted file mode 100644 index 07d359d..0000000 --- a/data/repos/qwer.git/config +++ /dev/null @@ -1,4 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true diff --git a/data/repos/qwer.git/description b/data/repos/qwer.git/description deleted file mode 100644 index 498b267..0000000 --- a/data/repos/qwer.git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/data/repos/qwer.git/hooks/applypatch-msg.sample b/data/repos/qwer.git/hooks/applypatch-msg.sample deleted file mode 100755 index 8b2a2fe..0000000 --- a/data/repos/qwer.git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 --git a/data/repos/qwer.git/hooks/commit-msg.sample b/data/repos/qwer.git/hooks/commit-msg.sample deleted file mode 100755 index b58d118..0000000 --- a/data/repos/qwer.git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 --git a/data/repos/qwer.git/hooks/post-update.sample b/data/repos/qwer.git/hooks/post-update.sample deleted file mode 100755 index ec17ec1..0000000 --- a/data/repos/qwer.git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 --git a/data/repos/qwer.git/hooks/pre-applypatch.sample b/data/repos/qwer.git/hooks/pre-applypatch.sample deleted file mode 100755 index b1f187c..0000000 --- a/data/repos/qwer.git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 --git a/data/repos/qwer.git/hooks/pre-commit.sample b/data/repos/qwer.git/hooks/pre-commit.sample deleted file mode 100755 index 18c4829..0000000 --- a/data/repos/qwer.git/hooks/pre-commit.sample +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# 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" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable 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 there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/data/repos/qwer.git/hooks/pre-rebase.sample b/data/repos/qwer.git/hooks/pre-rebase.sample deleted file mode 100755 index 33730ca..0000000 --- a/data/repos/qwer.git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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"` - /usr/bin/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 - -<<\DOC_END - -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". - -DOC_END diff --git a/data/repos/qwer.git/hooks/prepare-commit-msg.sample b/data/repos/qwer.git/hooks/prepare-commit-msg.sample deleted file mode 100755 index f093a02..0000000 --- a/data/repos/qwer.git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/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 --git a/data/repos/qwer.git/hooks/update.sample b/data/repos/qwer.git/hooks/update.sample deleted file mode 100755 index 71ab04e..0000000 --- a/data/repos/qwer.git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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 diff --git a/data/repos/qwer.git/info/exclude b/data/repos/qwer.git/info/exclude deleted file mode 100644 index a5196d1..0000000 --- a/data/repos/qwer.git/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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 --git a/data/repos/qwer.git/info/refs b/data/repos/qwer.git/info/refs deleted file mode 100644 index ee5ce9e..0000000 --- a/data/repos/qwer.git/info/refs +++ /dev/null @@ -1 +0,0 @@ -756c1add57e06a607772ab479a849314bec41fe9 refs/heads/master diff --git a/data/repos/qwer.git/objects/40/97f8848b4b638854909fb4cc1232f23d4bc891 b/data/repos/qwer.git/objects/40/97f8848b4b638854909fb4cc1232f23d4bc891 deleted file mode 100644 index 7d5bd65..0000000 Binary files a/data/repos/qwer.git/objects/40/97f8848b4b638854909fb4cc1232f23d4bc891 and /dev/null differ diff --git a/data/repos/qwer.git/objects/75/6c1add57e06a607772ab479a849314bec41fe9 b/data/repos/qwer.git/objects/75/6c1add57e06a607772ab479a849314bec41fe9 deleted file mode 100644 index 875c96d..0000000 --- a/data/repos/qwer.git/objects/75/6c1add57e06a607772ab479a849314bec41fe9 +++ /dev/null @@ -1,3 +0,0 @@ -xŽM -Â0F]ç³$“LÛD\»oL&¶bˆ)âí-ž@¾í{¼çq*C»ZD€´ï²sä"ÅÖ:א×>GbFcM66QdçQ-¡ÈT2Ō) Û– §®i¬hl%IãºMM­ -kíç×°>á78Žr^åÀ|´Ôykm‹°G­µâß«*ÿòŠû0Ý%AÞ“¼! E¸Îå¯ZV®kõ¤ÈD‹ \ No newline at end of file diff --git a/data/repos/qwer.git/objects/b1/bb4a245007dd9a1e1a43b2d1d7db304ec3edf0 b/data/repos/qwer.git/objects/b1/bb4a245007dd9a1e1a43b2d1d7db304ec3edf0 deleted file mode 100644 index 535bbeb..0000000 Binary files a/data/repos/qwer.git/objects/b1/bb4a245007dd9a1e1a43b2d1d7db304ec3edf0 and /dev/null differ diff --git a/data/repos/qwer.git/objects/da/ef7b14a99501d69a28cd0ce4d2991b1fe5898d b/data/repos/qwer.git/objects/da/ef7b14a99501d69a28cd0ce4d2991b1fe5898d deleted file mode 100644 index e75767b..0000000 --- a/data/repos/qwer.git/objects/da/ef7b14a99501d69a28cd0ce4d2991b1fe5898d +++ /dev/null @@ -1,2 +0,0 @@ -xÍÍ -‚@…áÖ^Å”¤Sí#4&,PkÕ:~ÙÐ03i5Atïaå¾íá=<™PŒFƒVŒ¦äW¤²àAIë7i…@ª’¡X*2Áu…®Qå¹Ò)CR˜»&ÆÍ'¾ „=—9>¶ž>iÏ6a?Ø5ÅTÉ:ϘFkš¬³yH—þ‚¾ íÿhò¦ùJ]ÏéÙðñjnrÛÃڋ¿6­7+ÍJÒ \ No newline at end of file diff --git a/data/repos/qwer.git/objects/info/packs b/data/repos/qwer.git/objects/info/packs deleted file mode 100644 index 2911f65..0000000 --- a/data/repos/qwer.git/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.pack - diff --git a/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.idx b/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.idx deleted file mode 100644 index 1b5356c..0000000 Binary files a/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.idx and /dev/null differ diff --git a/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.pack b/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.pack deleted file mode 100644 index 3decc2b..0000000 Binary files a/data/repos/qwer.git/objects/pack/pack-d07d7771496ba63a1ed21b17101b417ae41c7c9a.pack and /dev/null differ diff --git a/data/repos/qwer.git/refs/heads/master b/data/repos/qwer.git/refs/heads/master deleted file mode 100644 index d55b3f8..0000000 --- a/data/repos/qwer.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -756c1add57e06a607772ab479a849314bec41fe9 diff --git a/gwvpmini/gwvpmini_admin.php b/gwvpmini/gwvpmini_admin.php index 353749a..f1ad347 100644 --- a/gwvpmini/gwvpmini_admin.php +++ b/gwvpmini/gwvpmini_admin.php @@ -40,7 +40,8 @@ function gwvpmini_AdminMainPageBody() { global $BASE_URL; - echo "

Users

"; + $totalusers = gwvpmini_GetNUsers(); + echo "

Users - $totalusers

"; echo ""; echo ""; foreach(gwvpmini_GetUsers() as $key => $val) { @@ -52,6 +53,19 @@ function gwvpmini_AdminMainPageBody() echo ""; } echo "
UsernameEmail AddressFull NameDescriptionControl
$un$em$fn$dsRemove Disable
"; + + $totalrepos = gwvpmini_GetNRepos(); + echo "

Repo's - $totalrepos

"; + echo ""; + echo ""; + foreach(gwvpmini_GetRepos() as $key => $val) { + $id = $key; + $rn = $val["name"]; + $ds = $val["desc"]; + $ow = $val["owner"]; + echo ""; + } + echo "
Repo NameRepo DescOwnerControl
$rn$ds$owRemove Disable
"; } ?> \ No newline at end of file diff --git a/gwvpmini/gwvpmini_db.php b/gwvpmini/gwvpmini_db.php index cf1f6d5..4408014 100644 --- a/gwvpmini/gwvpmini_db.php +++ b/gwvpmini/gwvpmini_db.php @@ -84,6 +84,30 @@ function gwvpmini_ConnectDB() } return $DB_CONNECTION; +} + +function gwvpmini_AddUser($username, $password, $fullname, $email, $desc, $level, $status) +{ + + + + $conn = gwvpmini_ConnectDB(); + + $sql = "insert into 'users' values ( null, '$fullname', '".sha1($password)."', '$username', '$email', '$desc', '$level', '$status')"; + + $res = $conn->query($sql); + if(!$res) return -1; + + $sql = "select user_id from users where user_username='$username'"; + $res = $conn->query($sql); + if(!$res) return -1; + + $retval = -1; + foreach($res as $row) { + $retval = $row[0]; + } + + return $retval; } @@ -98,7 +122,8 @@ function gwvpmini_dbCreateSQLiteStructure($dbloc) "user_email" TEXT, "user_desc" TEXT, "user_level" TEXT, - "user_status" TEXT + "user_status" TEXT, + UNIQUE(user_username) )'; $initialuser_admin = ' @@ -114,7 +139,9 @@ function gwvpmini_dbCreateSQLiteStructure($dbloc) "repos_id" INTEGER PRIMARY KEY AUTOINCREMENT, "repos_name" TEXT, "repos_description" TEXT, - "repos_owner" INTEGER + "repos_owner" INTEGER, + "repos_readperms" TEXT, + UNIQUE(repos_name) )'; // this looks like null, , , user:|group:|authed|anon @@ -234,13 +261,13 @@ function gwvpmini_setConfigVal($confname, $confval) return $conn->query($sql); } -function gwvpmini_AddRepo($name, $desc, $ownerid) +function gwvpmini_AddRepo($name, $desc, $ownerid, $perms = "perms-public") { error_log("addrepo in db for $name, $desc, $ownerid"); $conn = gwvpmini_ConnectDB(); - $sql = "insert into repos values (null, '$name', '$desc', '$ownerid')"; + $sql = "insert into repos values (null, '$name', '$desc', '$ownerid', '$perms')"; $conn->query($sql); } @@ -310,7 +337,7 @@ function gwvpmini_userLevel($id) return $lev; } -function gwvpmini_GetUsers() +function gwvpmini_GetUsers($startat = 0, $num = 10) { $conn = gwvpmini_ConnectDB(); @@ -327,7 +354,7 @@ function gwvpmini_GetUsers() */ - $sql = "select * from users"; + $sql = "select * from users where user_id>'$startat' order by user_id asc limit $num"; $res = $conn->query($sql); @@ -345,5 +372,69 @@ function gwvpmini_GetUsers() return $retval; } +function gwvpmini_GetRepos($startat=0, $num=200) +{ + $conn = gwvpmini_ConnectDB(); + + /* + * CREATE TABLE "repos" ( + "repos_id" INTEGER PRIMARY KEY AUTOINCREMENT, + "repos_name" TEXT, + "repos_description" TEXT, + "repos_owner" INTEGER + )'; + + */ + + $sql = "select * from repos where repos_id > '$startat' order by repos_id asc limit $num"; + + $res = $conn->query($sql); + + $retval = false; + foreach($res as $row) { + $id = $row["repos_id"]; + $retval[$id]["name"] = $row["repos_name"]; + $retval[$id]["desc"] = $row["repos_description"]; + $retval[$id]["owner"] = $row["repos_owner"]; + } + + return $retval; + + +} + +function gwvpmini_GetNRepos() +{ + $conn = gwvpmini_ConnectDB(); + + $sql = "select count(*) from repos"; + + $res = $conn->query($sql); + + $retval = -1; + foreach($res as $row) { + $retval = $row[0]; + } + + return $retval; +} + + +function gwvpmini_GetNUsers() +{ + $conn = gwvpmini_ConnectDB(); + + $sql = "select count(*) from users"; + + $res = $conn->query($sql); + + $retval = -1; + foreach($res as $row) { + $retval = $row[0]; + } + + return $retval; +} + ?> \ No newline at end of file diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php index 1f42a7f..6f9264b 100644 --- a/gwvpmini/gwvpmini_gitrepo.php +++ b/gwvpmini/gwvpmini_gitrepo.php @@ -124,17 +124,41 @@ function gwvpmini_GitCreateRepoForm() echo "Create Repo"; echo "Repo Name"; echo "Repo Description"; + echo "Read Permissions"; + echo ""; + echo ""; echo ""; echo ""; echo ""; -} +} function gwvpmini_RepoCreate() { global $BASE_URL; - if(gwvpmini_isLoggedIn()) { + // TODO: check the stuff out + // first reponame + $inputcheck = true; + + // remove a .git at the end if it was input + $_REQUEST["reponame"] = preg_replace("/\.git$/", "", $_REQUEST["reponame"]); + + // check for valid chars + $replcheck = preg_replace("/[a-zA-Z0-9_\-\.]/", "", $_REQUEST["reponame"]); + if(strlen($replcheck)>0) { + $inputcheck = false; + $inputcheckerror = "Repo name contains invalid characters, repos can only contain a-z, A-Z, 0-9, _, - and ."; + } + + if(!$inputcheck) { + gwvpmini_SendMessage("error", "$inputcheckerror"); + header("Location: $BASE_URL/repos"); + } else if(gwvpmini_isLoggedIn()) { //gwvpmini_createGitRepo($name, $ownerid, $desc, $bundle=null, $defaultperms=0) if(gwvpmini_HaveRepo($_REQUEST["reponame"])) { gwvpmini_SendMessage("error", "Repo ".$_REQUEST["reponame"]." already exists"); diff --git a/unittests/createlotsofreposandusers.php b/unittests/createlotsofreposandusers.php index e69de29..f75e664 100644 --- a/unittests/createlotsofreposandusers.php +++ b/unittests/createlotsofreposandusers.php @@ -0,0 +1,67 @@ +"; + } + + for($i = 0; $i < $nrepos; $i++) { + $reponame = randomStr(rand(6,12)); + $repodesc = "desc"; + $uid = rand(10,$nusers-1); + gwvpmini_createGitRepo($reponame, $uid, $repodesc); + echo "Created repo, $reponame owned by $uid as $repodesc
"; + } +} else { + echo "click Go to populate"; +} + +function randomStr($len) +{ + $strl = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + + $retval = ""; + for($i=0; $i<$len; $i++) { + $retval .= $strl[rand(0,strlen($strl)-1)]; + } + + return $retval; +} +?> \ No newline at end of file diff --git a/unittests/inputcheck.php b/unittests/inputcheck.php new file mode 100644 index 0000000..7f9bc54 --- /dev/null +++ b/unittests/inputcheck.php @@ -0,0 +1,22 @@ +0) { + $inputcheck = false; + return "failed repl check ($in)"; + } + + return $in; +} + +?> \ No newline at end of file