From 6b55a115b09350dadcc4702cc2f2c524a25dee40 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 12 Mar 2008 13:14:05 +0000 Subject: [PATCH] Updated language editor. --- README.txt | 5 -- conf/authz | 21 -------- conf/passwd | 8 --- conf/svnserve.conf | 30 ----------- db/current | 1 - db/format | 1 - db/fs-type | 1 - db/revprops/0 | 5 -- db/revs/0 | 11 ---- db/uuid | 1 - db/write-lock | 0 format | 1 - hooks/post-commit.tmpl | 51 ------------------- hooks/post-lock.tmpl | 44 ---------------- hooks/post-revprop-change.tmpl | 56 --------------------- hooks/post-unlock.tmpl | 42 ---------------- hooks/pre-commit.tmpl | 70 -------------------------- hooks/pre-lock.tmpl | 64 ----------------------- hooks/pre-revprop-change.tmpl | 66 ------------------------ hooks/pre-unlock.tmpl | 60 ---------------------- hooks/start-commit.tmpl | 54 -------------------- interface/lib/lang/de.lng | 33 +++++------- interface/lib/lang/en.lng | 26 ++++------ interface/web/admin/language_add.php | 3 ++ interface/web/admin/language_edit.php | 12 ++++- interface/web/admin/language_list.php | 14 +++++- interface/web/themes/default/style.css | 8 ++- locks/db-logs.lock | 3 -- locks/db.lock | 3 -- 29 files changed, 54 insertions(+), 640 deletions(-) delete mode 100644 README.txt delete mode 100644 conf/authz delete mode 100644 conf/passwd delete mode 100644 conf/svnserve.conf delete mode 100644 db/current delete mode 100644 db/format delete mode 100644 db/fs-type delete mode 100644 db/revprops/0 delete mode 100644 db/revs/0 delete mode 100644 db/uuid delete mode 100644 db/write-lock delete mode 100644 format delete mode 100644 hooks/post-commit.tmpl delete mode 100644 hooks/post-lock.tmpl delete mode 100644 hooks/post-revprop-change.tmpl delete mode 100644 hooks/post-unlock.tmpl delete mode 100644 hooks/pre-commit.tmpl delete mode 100644 hooks/pre-lock.tmpl delete mode 100644 hooks/pre-revprop-change.tmpl delete mode 100644 hooks/pre-unlock.tmpl delete mode 100644 hooks/start-commit.tmpl delete mode 100644 locks/db-logs.lock delete mode 100644 locks/db.lock diff --git a/README.txt b/README.txt deleted file mode 100644 index c93ca33f78..0000000000 --- a/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -This is a Subversion repository; use the 'svnadmin' tool to examine -it. Do not add, delete, or modify files here unless you know how -to avoid corrupting the repository. - -Visit http://subversion.tigris.org/ for more information. diff --git a/conf/authz b/conf/authz deleted file mode 100644 index 3407445f09..0000000000 --- a/conf/authz +++ /dev/null @@ -1,21 +0,0 @@ -### This file is an example authorization file for svnserve. -### Its format is identical to that of mod_authz_svn authorization -### files. -### As shown below each section defines authorizations for the path and -### (optional) repository specified by the section name. -### The authorizations follow. An authorization line can refer to a -### single user, to a group of users defined in a special [groups] -### section, or to anyone using the '*' wildcard. Each definition can -### grant read ('r') access, read-write ('rw') access, or no access -### (''). - -[groups] -# harry_and_sally = harry,sally - -# [/foo/bar] -# harry = rw -# * = - -# [repository:/baz/fuz] -# @harry_and_sally = rw -# * = r diff --git a/conf/passwd b/conf/passwd deleted file mode 100644 index d22bafc5be..0000000000 --- a/conf/passwd +++ /dev/null @@ -1,8 +0,0 @@ -### This file is an example password file for svnserve. -### Its format is similar to that of svnserve.conf. As shown in the -### example below it contains one section labelled [users]. -### The name and password for each user follow, one account per line. - -[users] -# harry = harryssecret -# sally = sallyssecret diff --git a/conf/svnserve.conf b/conf/svnserve.conf deleted file mode 100644 index 089b0d0ecd..0000000000 --- a/conf/svnserve.conf +++ /dev/null @@ -1,30 +0,0 @@ -### This file controls the configuration of the svnserve daemon, if you -### use it to allow access to this repository. (If you only allow -### access through http: and/or file: URLs, then this file is -### irrelevant.) - -### Visit http://subversion.tigris.org/ for more information. - -[general] -### These options control access to the repository for unauthenticated -### and authenticated users. Valid values are "write", "read", -### and "none". The sample settings below are the defaults. -# anon-access = read -# auth-access = write -### The password-db option controls the location of the password -### database file. Unless you specify a path starting with a /, -### the file's location is relative to the conf directory. -### Uncomment the line below to use the default password file. -# password-db = passwd -### The authz-db option controls the location of the authorization -### rules for path-based access control. Unless you specify a path -### starting with a /, the file's location is relative to the conf -### directory. If you don't specify an authz-db, no path-based access -### control is done. -### Uncomment the line below to use the default authorization file. -# authz-db = authz -### This option specifies the authentication realm of the repository. -### If two repositories have the same authentication realm, they should -### have the same password database, and vice versa. The default realm -### is repository's uuid. -# realm = My First Repository diff --git a/db/current b/db/current deleted file mode 100644 index c435b766cd..0000000000 --- a/db/current +++ /dev/null @@ -1 +0,0 @@ -0 1 1 diff --git a/db/format b/db/format deleted file mode 100644 index 0cfbf08886..0000000000 --- a/db/format +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/db/fs-type b/db/fs-type deleted file mode 100644 index 4fdd95313f..0000000000 --- a/db/fs-type +++ /dev/null @@ -1 +0,0 @@ -fsfs diff --git a/db/revprops/0 b/db/revprops/0 deleted file mode 100644 index b98531c49f..0000000000 --- a/db/revprops/0 +++ /dev/null @@ -1,5 +0,0 @@ -K 8 -svn:date -V 27 -2008-03-12T08:27:04.109375Z -END diff --git a/db/revs/0 b/db/revs/0 deleted file mode 100644 index 10f5c45f9d..0000000000 --- a/db/revs/0 +++ /dev/null @@ -1,11 +0,0 @@ -PLAIN -END -ENDREP -id: 0.0.r0/17 -type: dir -count: 0 -text: 0 0 4 4 2d2977d1c96f487abe4a1e202dd03b4e -cpath: / - - -17 107 diff --git a/db/uuid b/db/uuid deleted file mode 100644 index 447e3b9c18..0000000000 --- a/db/uuid +++ /dev/null @@ -1 +0,0 @@ -0fabb406-36e8-374a-a0f3-cc3ced6fbdc5 diff --git a/db/write-lock b/db/write-lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/format b/format deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/format +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/hooks/post-commit.tmpl b/hooks/post-commit.tmpl deleted file mode 100644 index c1bfc3556f..0000000000 --- a/hooks/post-commit.tmpl +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# POST-COMMIT HOOK -# -# The post-commit hook is invoked after a commit. Subversion runs -# this hook by invoking a program (script, executable, binary, etc.) -# named 'post-commit' (for which this file is a template) with the -# following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] REV (the number of the revision just committed) -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# Because the commit has already completed and cannot be undone, -# the exit code of the hook program is ignored. The hook program -# can use the 'svnlook' utility to help it examine the -# newly-committed tree. -# -# On a Unix system, the normal procedure is to have 'post-commit' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'post-commit' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'post-commit.bat' or 'post-commit.exe', -# but the basic idea is the same. -# -# The hook program typically does not inherit the environment of -# its parent process. For example, a common problem is for the -# PATH environment variable to not be set to its usual value, so -# that subprograms fail to launch unless invoked via absolute path. -# If you're having unexpected problems with a hook program, the -# culprit may be unusual (or missing) environment variables. -# -# Here is an example hook script, for a Unix /bin/sh interpreter. -# For more examples and pre-written hooks, see those in -# the Subversion repository at -# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and -# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ - - -REPOS="$1" -REV="$2" - -commit-email.pl "$REPOS" "$REV" commit-watchers@example.org -log-commit.py --repository "$REPOS" --revision "$REV" diff --git a/hooks/post-lock.tmpl b/hooks/post-lock.tmpl deleted file mode 100644 index 65a7d40ead..0000000000 --- a/hooks/post-lock.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# POST-LOCK HOOK -# -# The post-lock hook is run after a path is locked. Subversion runs -# this hook by invoking a program (script, executable, binary, etc.) -# named 'post-lock' (for which this file is a template) with the -# following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] USER (the user who created the lock) -# -# The paths that were just locked are passed to the hook via STDIN (as -# of Subversion 1.2, only one path is passed per invocation, but the -# plan is to pass all locked paths at once, so the hook program -# should be written accordingly). -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# Because the lock has already been created and cannot be undone, -# the exit code of the hook program is ignored. The hook program -# can use the 'svnlook' utility to help it examine the -# newly-created lock. -# -# On a Unix system, the normal procedure is to have 'post-lock' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'post-lock' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'post-lock.bat' or 'post-lock.exe', -# but the basic idea is the same. -# -# Here is an example hook script, for a Unix /bin/sh interpreter: - -REPOS="$1" -USER="$2" - -# Send email to interested parties, let them know a lock was created: -mailer.py lock "$REPOS" "$USER" /path/to/mailer.conf diff --git a/hooks/post-revprop-change.tmpl b/hooks/post-revprop-change.tmpl deleted file mode 100644 index 395201a918..0000000000 --- a/hooks/post-revprop-change.tmpl +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# POST-REVPROP-CHANGE HOOK -# -# The post-revprop-change hook is invoked after a revision property -# has been added, modified or deleted. Subversion runs this hook by -# invoking a program (script, executable, binary, etc.) named -# 'post-revprop-change' (for which this file is a template), with the -# following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] REV (the revision that was tweaked) -# [3] USER (the username of the person tweaking the property) -# [4] PROPNAME (the property that was changed) -# [5] ACTION (the property was 'A'dded, 'M'odified, or 'D'eleted) -# -# [STDIN] PROPVAL ** the old property value is passed via STDIN. -# -# Because the propchange has already completed and cannot be undone, -# the exit code of the hook program is ignored. The hook program -# can use the 'svnlook' utility to help it examine the -# new property value. -# -# On a Unix system, the normal procedure is to have 'post-revprop-change' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'post-revprop-change' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'post-revprop-change.bat' or 'post-revprop-change.exe', -# but the basic idea is the same. -# -# The hook program typically does not inherit the environment of -# its parent process. For example, a common problem is for the -# PATH environment variable to not be set to its usual value, so -# that subprograms fail to launch unless invoked via absolute path. -# If you're having unexpected problems with a hook program, the -# culprit may be unusual (or missing) environment variables. -# -# Here is an example hook script, for a Unix /bin/sh interpreter. -# For more examples and pre-written hooks, see those in -# the Subversion repository at -# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and -# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ - - -REPOS="$1" -REV="$2" -USER="$3" -PROPNAME="$4" -ACTION="$5" - -propchange-email.pl "$REPOS" "$REV" "$USER" "$PROPNAME" watchers@example.org diff --git a/hooks/post-unlock.tmpl b/hooks/post-unlock.tmpl deleted file mode 100644 index 5821be83e1..0000000000 --- a/hooks/post-unlock.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# POST-UNLOCK HOOK -# -# The post-unlock hook runs after a path is unlocked. Subversion runs -# this hook by invoking a program (script, executable, binary, etc.) -# named 'post-unlock' (for which this file is a template) with the -# following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] USER (the user who destroyed the lock) -# -# The paths that were just unlocked are passed to the hook via STDIN -# (as of Subversion 1.2, only one path is passed per invocation, but -# the plan is to pass all unlocked paths at once, so the hook program -# should be written accordingly). -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# Because the lock has already been destroyed and cannot be undone, -# the exit code of the hook program is ignored. -# -# On a Unix system, the normal procedure is to have 'post-unlock' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'post-unlock' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'post-unlock.bat' or 'post-unlock.exe', -# but the basic idea is the same. -# -# Here is an example hook script, for a Unix /bin/sh interpreter: - -REPOS="$1" -USER="$2" - -# Send email to interested parties, let them know a lock was removed: -mailer.py unlock "$REPOS" "$USER" /path/to/mailer.conf diff --git a/hooks/pre-commit.tmpl b/hooks/pre-commit.tmpl deleted file mode 100644 index 4ac8669ea7..0000000000 --- a/hooks/pre-commit.tmpl +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# PRE-COMMIT HOOK -# -# The pre-commit hook is invoked before a Subversion txn is -# committed. Subversion runs this hook by invoking a program -# (script, executable, binary, etc.) named 'pre-commit' (for which -# this file is a template), with the following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] TXN-NAME (the name of the txn about to be committed) -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# If the hook program exits with success, the txn is committed; but -# if it exits with failure (non-zero), the txn is aborted, no commit -# takes place, and STDERR is returned to the client. The hook -# program can use the 'svnlook' utility to help it examine the txn. -# -# On a Unix system, the normal procedure is to have 'pre-commit' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# *** NOTE: THE HOOK PROGRAM MUST NOT MODIFY THE TXN, EXCEPT *** -# *** FOR REVISION PROPERTIES (like svn:log or svn:author). *** -# -# This is why we recommend using the read-only 'svnlook' utility. -# In the future, Subversion may enforce the rule that pre-commit -# hooks should not modify the versioned data in txns, or else come -# up with a mechanism to make it safe to do so (by informing the -# committing client of the changes). However, right now neither -# mechanism is implemented, so hook writers just have to be careful. -# -# Note that 'pre-commit' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'pre-commit.bat' or 'pre-commit.exe', -# but the basic idea is the same. -# -# The hook program typically does not inherit the environment of -# its parent process. For example, a common problem is for the -# PATH environment variable to not be set to its usual value, so -# that subprograms fail to launch unless invoked via absolute path. -# If you're having unexpected problems with a hook program, the -# culprit may be unusual (or missing) environment variables. -# -# Here is an example hook script, for a Unix /bin/sh interpreter. -# For more examples and pre-written hooks, see those in -# the Subversion repository at -# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and -# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ - - -REPOS="$1" -TXN="$2" - -# Make sure that the log message contains some text. -SVNLOOK=/usr/local/bin/svnlook -$SVNLOOK log -t "$TXN" "$REPOS" | \ - grep "[a-zA-Z0-9]" > /dev/null || exit 1 - -# Check that the author of this commit has the rights to perform -# the commit on the files and directories being modified. -commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1 - -# All checks passed, so allow the commit. -exit 0 diff --git a/hooks/pre-lock.tmpl b/hooks/pre-lock.tmpl deleted file mode 100644 index f4c43d25d5..0000000000 --- a/hooks/pre-lock.tmpl +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -# PRE-LOCK HOOK -# -# The pre-lock hook is invoked before an exclusive lock is -# created. Subversion runs this hook by invoking a program -# (script, executable, binary, etc.) named 'pre-lock' (for which -# this file is a template), with the following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] PATH (the path in the repository about to be locked) -# [3] USER (the user creating the lock) -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# If the hook program exits with success, the lock is created; but -# if it exits with failure (non-zero), the lock action is aborted -# and STDERR is returned to the client. - -# On a Unix system, the normal procedure is to have 'pre-lock' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'pre-lock' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'pre-lock.bat' or 'pre-lock.exe', -# but the basic idea is the same. -# -# Here is an example hook script, for a Unix /bin/sh interpreter: - -REPOS="$1" -PATH="$2" -USER="$3" - -# If a lock exists and is owned by a different person, don't allow it -# to be stolen (e.g., with 'svn lock --force ...'). - -# (Maybe this script could send email to the lock owner?) -SVNLOOK=/usr/local/bin/svnlook -GREP=/bin/grep -SED=/bin/sed - -LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \ - $GREP '^Owner: ' | $SED 's/Owner: //'` - -# If we get no result from svnlook, there's no lock, allow the lock to -# happen: -if [ "$LOCK_OWNER" = "" ]; then - exit 0 -fi - -# If the person locking matches the lock's owner, allow the lock to -# happen: -if [ "$LOCK_OWNER" = "$USER" ]; then - exit 0 -fi - -# Otherwise, we've got an owner mismatch, so return failure: -echo "Error: $PATH already locked by ${LOCK_OWNER}." 1>&2 -exit 1 diff --git a/hooks/pre-revprop-change.tmpl b/hooks/pre-revprop-change.tmpl deleted file mode 100644 index 9e284a917d..0000000000 --- a/hooks/pre-revprop-change.tmpl +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -# PRE-REVPROP-CHANGE HOOK -# -# The pre-revprop-change hook is invoked before a revision property -# is added, modified or deleted. Subversion runs this hook by invoking -# a program (script, executable, binary, etc.) named 'pre-revprop-change' -# (for which this file is a template), with the following ordered -# arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] REVISION (the revision being tweaked) -# [3] USER (the username of the person tweaking the property) -# [4] PROPNAME (the property being set on the revision) -# [5] ACTION (the property is being 'A'dded, 'M'odified, or 'D'eleted) -# -# [STDIN] PROPVAL ** the new property value is passed via STDIN. -# -# If the hook program exits with success, the propchange happens; but -# if it exits with failure (non-zero), the propchange doesn't happen. -# The hook program can use the 'svnlook' utility to examine the -# existing value of the revision property. -# -# WARNING: unlike other hooks, this hook MUST exist for revision -# properties to be changed. If the hook does not exist, Subversion -# will behave as if the hook were present, but failed. The reason -# for this is that revision properties are UNVERSIONED, meaning that -# a successful propchange is destructive; the old value is gone -# forever. We recommend the hook back up the old value somewhere. -# -# On a Unix system, the normal procedure is to have 'pre-revprop-change' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'pre-revprop-change' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'pre-revprop-change.bat' or 'pre-revprop-change.exe', -# but the basic idea is the same. -# -# The hook program typically does not inherit the environment of -# its parent process. For example, a common problem is for the -# PATH environment variable to not be set to its usual value, so -# that subprograms fail to launch unless invoked via absolute path. -# If you're having unexpected problems with a hook program, the -# culprit may be unusual (or missing) environment variables. -# -# Here is an example hook script, for a Unix /bin/sh interpreter. -# For more examples and pre-written hooks, see those in -# the Subversion repository at -# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and -# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ - - -REPOS="$1" -REV="$2" -USER="$3" -PROPNAME="$4" -ACTION="$5" - -if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi - -echo "Changing revision properties other than svn:log is prohibited" >&2 -exit 1 diff --git a/hooks/pre-unlock.tmpl b/hooks/pre-unlock.tmpl deleted file mode 100644 index 1298e80502..0000000000 --- a/hooks/pre-unlock.tmpl +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# PRE-UNLOCK HOOK -# -# The pre-unlock hook is invoked before an exclusive lock is -# destroyed. Subversion runs this hook by invoking a program -# (script, executable, binary, etc.) named 'pre-unlock' (for which -# this file is a template), with the following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] PATH (the path in the repository about to be unlocked) -# [3] USER (the user destroying the lock) -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# If the hook program exits with success, the lock is destroyed; but -# if it exits with failure (non-zero), the unlock action is aborted -# and STDERR is returned to the client. - -# On a Unix system, the normal procedure is to have 'pre-unlock' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'pre-unlock' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'pre-unlock.bat' or 'pre-unlock.exe', -# but the basic idea is the same. -# -# Here is an example hook script, for a Unix /bin/sh interpreter: - -REPOS="$1" -PATH="$2" -USER="$3" - -# If a lock is owned by a different person, don't allow it be broken. -# (Maybe this script could send email to the lock owner?) - -SVNLOOK=/usr/local/bin/svnlook -GREP=/bin/grep -SED=/bin/sed - -LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \ - $GREP '^Owner: ' | $SED 's/Owner: //'` - -# If we get no result from svnlook, there's no lock, return success: -if [ "$LOCK_OWNER" = "" ]; then - exit 0 -fi -# If the person unlocking matches the lock's owner, return success: -if [ "$LOCK_OWNER" = "$USER" ]; then - exit 0 -fi - -# Otherwise, we've got an owner mismatch, so return failure: -echo "Error: $PATH locked by ${LOCK_OWNER}." 1>&2 -exit 1 diff --git a/hooks/start-commit.tmpl b/hooks/start-commit.tmpl deleted file mode 100644 index e7707482b4..0000000000 --- a/hooks/start-commit.tmpl +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -# START-COMMIT HOOK -# -# The start-commit hook is invoked before a Subversion txn is created -# in the process of doing a commit. Subversion runs this hook -# by invoking a program (script, executable, binary, etc.) named -# 'start-commit' (for which this file is a template) -# with the following ordered arguments: -# -# [1] REPOS-PATH (the path to this repository) -# [2] USER (the authenticated user attempting to commit) -# -# The default working directory for the invocation is undefined, so -# the program should set one explicitly if it cares. -# -# If the hook program exits with success, the commit continues; but -# if it exits with failure (non-zero), the commit is stopped before -# a Subversion txn is created, and STDERR is returned to the client. -# -# On a Unix system, the normal procedure is to have 'start-commit' -# invoke other programs to do the real work, though it may do the -# work itself too. -# -# Note that 'start-commit' must be executable by the user(s) who will -# invoke it (typically the user httpd runs as), and that user must -# have filesystem-level permission to access the repository. -# -# On a Windows system, you should name the hook program -# 'start-commit.bat' or 'start-commit.exe', -# but the basic idea is the same. -# -# The hook program typically does not inherit the environment of -# its parent process. For example, a common problem is for the -# PATH environment variable to not be set to its usual value, so -# that subprograms fail to launch unless invoked via absolute path. -# If you're having unexpected problems with a hook program, the -# culprit may be unusual (or missing) environment variables. -# -# Here is an example hook script, for a Unix /bin/sh interpreter. -# For more examples and pre-written hooks, see those in -# the Subversion repository at -# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and -# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ - - -REPOS="$1" -USER="$2" - -commit-allower.pl --repository "$REPOS" --user "$USER" || exit 1 -special-auth-check.py --user "$USER" --auth-level 3 || exit 1 - -# All checks passed, so allow the commit. -exit 0 diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index db49eeae2c..b4aba43533 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -1,21 +1,12 @@ - \ No newline at end of file + diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 3c2811924c..724ac0df28 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -1,16 +1,10 @@ - \ No newline at end of file + diff --git a/interface/web/admin/language_add.php b/interface/web/admin/language_add.php index 3b66fb6efe..5d1d34cba3 100644 --- a/interface/web/admin/language_add.php +++ b/interface/web/admin/language_add.php @@ -49,6 +49,8 @@ $language_option = ''; $error = ''; $msg = ''; $selected_language = (isset($_REQUEST['lng_select']))?substr($_REQUEST['lng_select'],0,2):'en'; +if(!preg_match("/^[a-z]{2}$/i", $selected_language)) die('unallowed characters in selected language name.'); + $handle = opendir(ISPC_ROOT_PATH.'/lib/lang/'); while ($file = readdir ($handle)) { if ($file != '.' && $file != '..') { @@ -68,6 +70,7 @@ if(isset($_POST['lng_new']) && strlen($_POST['lng_new']) == 2 && $error == '') { if(!preg_match("/^[a-z]{2}$/i", $lng_new)) die('unallowed characters in language name.'); //* Make a copy of every language file + copy(ISPC_WEB_PATH."/$module/lib/lang/$selected_language.lng",ISPC_WEB_PATH."/$module/lib/lang/$lng_new.lng"); $bgcolor = '#FFFFFF'; $language_files_list = array(); $handle = @opendir(ISPC_WEB_PATH); diff --git a/interface/web/admin/language_edit.php b/interface/web/admin/language_edit.php index 6329339153..f2b7be5e1c 100644 --- a/interface/web/admin/language_edit.php +++ b/interface/web/admin/language_edit.php @@ -65,13 +65,21 @@ if(isset($_POST['records']) && is_array($_POST['records'])) { $msg = 'File saved.'; } $file_content .= "?>\n"; - file_put_contents(ISPC_WEB_PATH."/$module/lib/lang/$lang_file" ,$file_content); + if($module == 'global') { + file_put_contents(ISPC_LIB_PATH."/lang/$lang_file" ,$file_content); + } else { + file_put_contents(ISPC_WEB_PATH."/$module/lib/lang/$lang_file" ,$file_content); + } } $app->tpl->setVar(array('module' => $module,'lang_file' => $lang_file, 'lang' => $lang, 'msg' => $msg)); -include(ISPC_WEB_PATH."/$module/lib/lang/$lang_file"); +if($module == 'global') { + include(ISPC_LIB_PATH."/lang/$lang_file"); +} else { + include(ISPC_WEB_PATH."/$module/lib/lang/$lang_file"); +} $keyword_list = array(); if(isset($wb) && is_array($wb)) { diff --git a/interface/web/admin/language_list.php b/interface/web/admin/language_list.php index 17eab0ef1b..47368c58f7 100644 --- a/interface/web/admin/language_list.php +++ b/interface/web/admin/language_list.php @@ -44,6 +44,8 @@ $app->uses('tpl'); $app->tpl->newTemplate('form.tpl.htm'); $app->tpl->setInclude('content_tpl', 'templates/language_list.htm'); +$language_files_list = array(); +$bgcolor = '#FFFFFF'; //* reading languages $language_option = ''; @@ -55,6 +57,16 @@ while ($file = readdir ($handle)) { if($tmp_lng !='') { $selected = ($tmp_lng == $selected_language)?'SELECTED':''; $language_option .= ""; + + //$bgcolor = ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF'; + if($file == $selected_language.'.lng') { + $language_files_list[] = array( 'module' => 'global', + 'lang_file' => $file, + 'bgcolor' => $bgcolor, + 'lang' => $selected_language); + } + + } } } @@ -62,8 +74,6 @@ $app->tpl->setVar('language_option',$language_option); // $app->tpl->setLoop('records', $language_list); //* list all language files of the selected language -$bgcolor = '#FFFFFF'; -$language_files_list = array(); $handle = @opendir(ISPC_WEB_PATH); while ($file = @readdir ($handle)) { if ($file != '.' && $file != '..') { diff --git a/interface/web/themes/default/style.css b/interface/web/themes/default/style.css index 46303b0050..af57b5fac3 100644 --- a/interface/web/themes/default/style.css +++ b/interface/web/themes/default/style.css @@ -1,5 +1,11 @@ +html, body{ + height: 100%; + margin: 0; + padding: 0; +} + body{ - margin: 0px auto; + /*margin: 0px auto;*/ background-color: #ffffff; font-family: sans-serif; } diff --git a/locks/db-logs.lock b/locks/db-logs.lock deleted file mode 100644 index 536ac36a73..0000000000 --- a/locks/db-logs.lock +++ /dev/null @@ -1,3 +0,0 @@ -This file is not used by Subversion 1.3.x or later. -However, its existence is required for compatibility with -Subversion 1.2.x or earlier. diff --git a/locks/db.lock b/locks/db.lock deleted file mode 100644 index 536ac36a73..0000000000 --- a/locks/db.lock +++ /dev/null @@ -1,3 +0,0 @@ -This file is not used by Subversion 1.3.x or later. -However, its existence is required for compatibility with -Subversion 1.2.x or earlier. -- GitLab